diff --git a/bigbluebutton-html5/app/client/globals.coffee b/bigbluebutton-html5/app/client/globals.coffee
index 513acd61d937..ff9f75f97914 100755
--- a/bigbluebutton-html5/app/client/globals.coffee
+++ b/bigbluebutton-html5/app/client/globals.coffee
@@ -182,6 +182,12 @@ Handlebars.registerHelper 'whiteboardSize', (section) ->
 Handlebars.registerHelper "getPollQuestions", ->
   polls = BBB.getCurrentPoll(getInSession('userId'))
   if polls? and polls isnt undefined
+    number = polls.poll_info.poll.answers.length
+    widthStyle = "width: calc(75%/" + number + ");"
+    marginStyle = "margin-left: calc(25%/" + (number*2) + ");" + "margin-right: calc(23%/" + (number*2) + ");"
+    buttonStyle = widthStyle + marginStyle
+    for answer in polls.poll_info.poll.answers
+      answer.style = buttonStyle
     return polls.poll_info.poll.answers
 
 @getSortedUserList = (users) ->
diff --git a/bigbluebutton-html5/app/client/stylesheets/whiteboard.less b/bigbluebutton-html5/app/client/stylesheets/whiteboard.less
index 1009e4f36274..42940d199655 100755
--- a/bigbluebutton-html5/app/client/stylesheets/whiteboard.less
+++ b/bigbluebutton-html5/app/client/stylesheets/whiteboard.less
@@ -102,6 +102,7 @@
   padding-top:10px;
   padding-bottom:10px;
   border-top: 1px solid extract(@lightGrey, 3);
+  font-size: 0; /* to remove default 4px gaps between the buttons caused by display: inline-block */
 }
 
 .pollButtons {
@@ -110,9 +111,17 @@
   font-weight: bold;
   border: 1px solid extract(@lightGrey, 3);
   height: 100%;
-  margin: 0 1rem 0 1rem;
-  padding: auto;
-  
+  padding-left: 0rem !important;  /*overwriting the default foundation padding */
+  padding-right: 0rem !important; /*overwriting the default foundation padding */
+  max-width: calc(~'100%/6');     /* the actual width and margins are calculated in the code */
+  /* truncating the text inside the buttons */
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  /* the end of truncating */
+  span {
+    max-width: 80%;
+  }
   &:hover {
     background: #3A82D4;
   }
@@ -225,6 +234,7 @@
   padding: 0;
   border-radius: 50%;
   background: #3896D3;
+  opacity: 0.55;
   &:hover {
     background: #3A82D4;
   }
diff --git a/bigbluebutton-html5/app/client/views/whiteboard/whiteboard.html b/bigbluebutton-html5/app/client/views/whiteboard/whiteboard.html
index f72ada56a5f3..711ad5b857a2 100755
--- a/bigbluebutton-html5/app/client/views/whiteboard/whiteboard.html
+++ b/bigbluebutton-html5/app/client/views/whiteboard/whiteboard.html
@@ -18,7 +18,7 @@
     {{#if isPollStarted}}
       <div class="polling">
         {{#each getPollQuestions}}
-          {{> makeButton btn_class="pollButtons" rel="tooltip" data_placement="top" label=key answer=id}}
+          {{> makeButton btn_class="pollButtons" rel="tooltip" data_placement="top" label=key answer=id style=style }}
         {{/each}}
       </div>
     {{/if}}
diff --git a/bigbluebutton-html5/app/client/whiteboard_models/whiteboard_poll.coffee b/bigbluebutton-html5/app/client/whiteboard_models/whiteboard_poll.coffee
index c38ee0db5219..0e8009e9775c 100755
--- a/bigbluebutton-html5/app/client/whiteboard_models/whiteboard_poll.coffee
+++ b/bigbluebutton-html5/app/client/whiteboard_models/whiteboard_poll.coffee
@@ -26,13 +26,13 @@ class @WhiteboardPollModel extends WhiteboardToolModel
     backgroundColor = "#ffffff"
     verticalPadding = 0
     horizontalPadding = 0
-    calcFontSize = 20
+    calcFontSize = 30
     votesTotal = 0
     maxNumVotes = 0
     textArray = []
 
     #creating an array of text objects for the labels, percentages and number inside line bars
-    if startingData.result? and startingData.result.length > 1
+    if startingData.result?
       #counting the total number of votes and finding the biggest number of votes
       for i in [0..startingData.result.length-1]
         votesTotal += startingData.result[i].num_votes
@@ -236,7 +236,7 @@ calculateFontAndWidth = (textArray, calcFontSize, width, height, x, y) ->
           test = getRenderedTextSize(textArray[i][j], calcFontSize)
           spanWidth = test[0]
           spanHeight = test[1]
-          if spanWidth > 40 or spanWidth > maxLineWidth or spanHeight > maxLineHeight
+          if spanWidth > maxLineWidth or spanHeight > maxLineHeight
             calcFontSize -= 1
             flag = true
     calculatedData.push calcFontSize