diff --git a/common/lib/xmodule/xmodule/css/html/display.scss b/common/lib/xmodule/xmodule/css/html/display.scss
index 8c81516a64..27e358cb3b 100644
--- a/common/lib/xmodule/xmodule/css/html/display.scss
+++ b/common/lib/xmodule/xmodule/css/html/display.scss
@@ -7,7 +7,7 @@ h1 {
     color: $baseFontColor;
     font: normal 2em/1.4em $sans-serif;
     letter-spacing: 1px;
-    margin: 0 0 1.416em 0;
+    @include margin(0, 0, 1.416em, 0);
   }
 
 h2 {
@@ -19,7 +19,7 @@ h2 {
 }
 
 h3, h4, h5, h6 {
-  margin: 0 0 ($baseline/2) 0;
+  @include margin(0, 0, ($baseline/2), 0);
   font-weight: 600;
 }
 
@@ -71,8 +71,9 @@ blockquote {
 }
 
 ol, ul {
+  // Using the lower level Bi App Sass mixin to avoid @padding conflicts with bourbon.
+  @include bi-app-compact(padding, 0, 0, 0, 1em);
   margin: 1em 0;
-  padding: 0 0 0 1em;
   color: $baseFontColor;
 
   li {
diff --git a/lms/static/sass/base/_reset.scss b/lms/static/sass/base/_reset.scss
index 11a4fd1ff8..c15a10c1bf 100644
--- a/lms/static/sass/base/_reset.scss
+++ b/lms/static/sass/base/_reset.scss
@@ -29,7 +29,7 @@ sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: b
 sup { top: -0.5em; }
 sub { bottom: -0.25em; }
 
-ul, ol { margin: 1em 0; padding: 0 0 0 40px; }
+ul, ol { @include padding(0, 0, 0, 40px); margin: 1em 0; }
 dd { margin: 0 0 0 40px; }
 nav ul, nav ol { list-style: none; list-style-image: none; margin: 0; padding: 0; }