diff --git a/xmodule/static/css-builtin-blocks/PollBlockDisplay.css b/xmodule/static/css-builtin-blocks/PollBlockDisplay.css
index 1061e6198512..f617dc960d38 100644
--- a/xmodule/static/css-builtin-blocks/PollBlockDisplay.css
+++ b/xmodule/static/css-builtin-blocks/PollBlockDisplay.css
@@ -23,13 +23,13 @@
 
 .xmodule_display.xmodule_PollBlock div.poll_question h3 {
     margin-top: 0;
-    margin-bottom: 15px;
+    margin-bottom: calc((var(--baseline) * 0.75));
     color: #fe57a1;
     font-size: 1.9em;
 }
 
 .xmodule_display.xmodule_PollBlock div.poll_question h3.problem-header div.staff {
-    margin-top: 30px;
+    margin-top: calc((var(--baseline) * 1.5));
     font-size: 80%;
 }
 
@@ -47,7 +47,7 @@
 }
 
 .xmodule_display.xmodule_PollBlock div.poll_question .poll_answer {
-    margin-bottom: 20px;
+    margin-bottom: var(--baseline);
 }
 
 .xmodule_display.xmodule_PollBlock div.poll_question .poll_answer.short {
@@ -109,7 +109,7 @@
     font-weight: bold;
     letter-spacing: normal;
     line-height: 25.59375px;
-    margin-bottom: 15px;
+    margin-bottom: calc((var(--baseline) * 0.75));
     margin: 0;
     padding: 0px;
     text-align: center;
@@ -145,9 +145,9 @@
     width: 80%;
     text-align: left;
     min-height: 30px;
-    margin-left: 20px;
+    margin-left: var(--baseline);
     height: auto;
-    margin-bottom: 20px;
+    margin-bottom: var(--baseline);
 }
 
 .xmodule_display.xmodule_PollBlock div.poll_question .poll_answer .question .text.short {
@@ -156,7 +156,7 @@
 
 .xmodule_display.xmodule_PollBlock div.poll_question .poll_answer .stats {
     min-height: 40px;
-    margin-top: 20px;
+    margin-top: var(--baseline);
     clear: both;
 }
 
@@ -174,7 +174,7 @@
     border: 1px solid black;
     display: inline;
     float: left;
-    margin-right: 10px;
+    margin-right: calc((var(--baseline) / 2));
 }
 
 .xmodule_display.xmodule_PollBlock div.poll_question .poll_answer .stats .bar.short {