diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss
index 466afb22557..edd8e832c46 100644
--- a/app/assets/stylesheets/common/base/discourse.scss
+++ b/app/assets/stylesheets/common/base/discourse.scss
@@ -1,3 +1,18 @@
+.container {
+  @extend .clearfix;
+  margin-right: auto;
+  margin-left: auto;
+}
+
+.full-width {
+  margin-left: 12px;
+}
+
+blockquote {
+  background-color: scale-color-diff();
+  border-left: 5px solid darken(scale-color-diff(), 10%);
+}
+
     a.no-href {
   cursor: pointer;
 }
diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss
index 7dd4f244b37..344f7804c73 100644
--- a/app/assets/stylesheets/desktop/discourse.scss
+++ b/app/assets/stylesheets/desktop/discourse.scss
@@ -9,15 +9,11 @@ body {
 }
 
 .container {
-  @extend .clearfix;
   max-width: $large-width;
-  margin-right: auto;
-  margin-left: auto;
 }
 
 .full-width {
   width: $large-width;
-  margin-left: 12px;
 }
 
 @include medium-width {
@@ -127,8 +123,6 @@ body {
 blockquote {
   /* 13px left is intentional here to properly align with post quotes */
   padding: 10px 4px 4px 13px;
-  background-color: scale-color-diff();
-  border-left: 5px solid darken(scale-color-diff(), 10%);
 }
 
 .topic-statuses {
diff --git a/app/assets/stylesheets/mobile/discourse.scss b/app/assets/stylesheets/mobile/discourse.scss
index 03c4c9f5d90..ad033812e2e 100644
--- a/app/assets/stylesheets/mobile/discourse.scss
+++ b/app/assets/stylesheets/mobile/discourse.scss
@@ -6,16 +6,6 @@ body {
   background-color: $secondary;
 }
 
-.container {
-  @extend .clearfix;
-  margin-right: auto;
-  margin-left: auto;
-}
-
-.full-width {
-  margin-left: 12px;
-}
-
 body {
 
   .boxed {
@@ -94,8 +84,6 @@ body {
 blockquote {
   /* 13px left is intentional here to properly align with post quotes */
   padding: 10px 8px 10px 13px;
-  background-color: scale-color($primary, $lightness: 95%);
-  border-left: 5px solid scale-color($primary, $lightness: 75%);
   p {
     margin: 0 0 10px 0;
   }
diff --git a/app/assets/stylesheets/mobile/topic-list.scss b/app/assets/stylesheets/mobile/topic-list.scss
index 1d479ca6092..53f89c75246 100644
--- a/app/assets/stylesheets/mobile/topic-list.scss
+++ b/app/assets/stylesheets/mobile/topic-list.scss
@@ -120,11 +120,9 @@
   }
   .badge-notification {
     position: relative;
+    padding: 4px 4px 4px 3px;
     top: -1px;
-    color: $tertiary !important;
-    /* this important is a terrible hack but the badge colors are
-    being overridden in a way I can't figure out on mobile, appears
-    to be a CSS precedence problem */
+      i {color: $secondary;}
   }
 
   .topic-item-stats {
@@ -295,7 +293,7 @@
     repeat: no-repeat;
     position: 10px 50%;
     size: 25px;
-  };
+  }
   @include border-radius-all(12px);
 }
 
@@ -359,7 +357,7 @@ span.posted {
   height: 15px;
   background: {
     image: image-url("posted.png");
-  };
+  }
 }
 
 
@@ -452,7 +450,7 @@ ol.category-breadcrumb {
   overflow-x: hidden;
   overflow-y: scroll;
   position: absolute;
-  border: 1px solid scale-color-diff();;
+  border: 1px solid scale-color-diff();
   background-color: $secondary;
   height: 200px;
   padding: 8px 5px 0 7px;
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index dd7cbd57a30..1eaaf47b985 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -1,5 +1,5 @@
 .gap {
-  background-color: scale-color($primary, $lightness: 95%);
+  background-color: scale-color-diff();
   padding: 5px 15px;
   color: $primary;
   text-align: center;
@@ -7,14 +7,14 @@
 }
 
 .topic-post {
-  border-top: 1px solid scale-color($primary, $lightness: 95%);
+  border-top: 1px solid sscale-color-diff();
   padding: 6px 0 3px 0;
 }
 
 nav.post-controls {
   background-color: $secondary;
   padding: 0;
-  border-right: 1px solid scale-color($primary, $lightness: 95%);
+  border-right: 1px solid scale-color-diff();
   clear: both;
   button {color: scale-color($primary, $lightness: 50%);
 }
@@ -164,7 +164,7 @@ a.star {
 
   border-radius: 5px;
   margin: 30px 10px 20px 10px;
-  border: 1px solid scale-color($primary, $lightness: 95%);
+  border: 1px solid scale-color-diff();
 
   h3 {
     margin-bottom: 4px;
@@ -244,7 +244,7 @@ a.star {
   }
 
   .information {
-    border-top: 1px solid scale-color($primary, $lightness: 95%);
+    border-top: 1px solid scale-color-diff();
   }
 
   .domain {
@@ -260,15 +260,15 @@ a.star {
     float: right;
     .btn {
       border: 0;
-      border-bottom: 1px solid scale-color($primary, $lightness: 95%);;
-      border-left: 1px solid scale-color($primary, $lightness: 95%);;
+      border-bottom: 1px solid scale-color-diff();
+      border-left: 1px solid scale-color-diff();
       padding: 0 23px;
       color: $primary;
       background: scale-color-diff();
       &:hover {
         background: scale-color($primary, $lightness: 75%);
         color: $primary;
-        border-bottom: 1px solid scale-color($primary, $lightness: 95%);
+        border-bottom: 1px solid scale-color-diff();
 
       }
       .fa {
@@ -281,7 +281,7 @@ a.star {
 }
 
 #topic-footer-buttons {
-  border-top: 1px solid scale-color($primary, $lightness: 95%);;
+  border-top: 1px solid scale-color-diff();
   padding: 20px 10px 0 10px;
 }
 
@@ -527,7 +527,7 @@ blockquote {
 
 .quote .title {
   border-left: 5px solid scale-color($primary, $lightness: 75%);
-  background-color: scale-color($primary, $lightness: 95%);
+  background-color: scale-color-diff();
   padding: 10px 10px 10px 12px;
   clear: both;
   .avatar { margin-right: 7px; }