diff --git a/plugins/poll/assets/stylesheets/common/poll.scss b/plugins/poll/assets/stylesheets/common/poll.scss
index e78fdad11e..0953710582 100644
--- a/plugins/poll/assets/stylesheets/common/poll.scss
+++ b/plugins/poll/assets/stylesheets/common/poll.scss
@@ -7,6 +7,8 @@ $option-shadow: dark-light-diff($option-background, $primary, 10%, -10%);
 
 div.poll {
 
+  border: 1px solid $border-color;
+
   ul, ol {
     margin: 0;
     padding: 0;
@@ -83,8 +85,6 @@ div.poll {
   }
 
   .poll-buttons {
-    padding: 10px;
-
     button {
       float: none;
     }
diff --git a/plugins/poll/assets/stylesheets/desktop/poll.scss b/plugins/poll/assets/stylesheets/desktop/poll.scss
index 3391016ff9..e875c29a03 100644
--- a/plugins/poll/assets/stylesheets/desktop/poll.scss
+++ b/plugins/poll/assets/stylesheets/desktop/poll.scss
@@ -1,6 +1,5 @@
 div.poll {
   display: table;
-  border: 1px solid $border-color;
   width: 500px;
   max-width: 500px;
 
@@ -26,6 +25,7 @@ div.poll {
 
   .poll-buttons {
     border-top: 1px solid $border-color;
+    padding: 10px;
 
     .toggle-status {
       float: right;
diff --git a/plugins/poll/assets/stylesheets/mobile/poll.scss b/plugins/poll/assets/stylesheets/mobile/poll.scss
index c574f4e4d1..1dc4c95caa 100644
--- a/plugins/poll/assets/stylesheets/mobile/poll.scss
+++ b/plugins/poll/assets/stylesheets/mobile/poll.scss
@@ -1,7 +1,9 @@
 div.poll {
   .poll-buttons {
+    padding: 0 5px 5px 5px;
+
     button {
-      margin: 3px 0;
+      margin: 4px 2px;
     }
   }
 }