diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index c655b6d0554..1908afc4dc6 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -169,7 +169,7 @@ pre {
     display: block;
     padding: 5px 10px;
     color: $primary;
-    background: dark-light-diff($primary, $secondary, 97%, -65%);
+    background: choose-grey(5%);
     max-height: 500px;
   }
 }
diff --git a/app/assets/stylesheets/common/components/badges.css.scss b/app/assets/stylesheets/common/components/badges.css.scss
index 0a03ef0aa07..d83ea438d93 100644
--- a/app/assets/stylesheets/common/components/badges.css.scss
+++ b/app/assets/stylesheets/common/components/badges.css.scss
@@ -265,9 +265,9 @@
 
   &.clicks {
     font-weight: normal;
-    background-color: dark-light-diff($primary, $secondary, 85%, -65%);
+    background-color: dark-light-diff($primary, $secondary, 85%, -60%);
     top: -1px;
-    color: dark-light-diff($primary, $secondary, 50%, -45%);
+    color: dark-light-diff($primary, $secondary, 50%, -20%);
     position: relative;
     margin-left: 2px;
     border: none;
diff --git a/app/assets/stylesheets/common/foundation/mixins.scss b/app/assets/stylesheets/common/foundation/mixins.scss
index 4b560cc46f9..25ec023f0af 100644
--- a/app/assets/stylesheets/common/foundation/mixins.scss
+++ b/app/assets/stylesheets/common/foundation/mixins.scss
@@ -98,5 +98,5 @@
 // Stuff we repeat
 @mixin post-aside {
   border-left: 5px solid dark-light-diff($primary, $secondary, 90%, -85%);
-  background-color: dark-light-diff($primary, $secondary, 97%, -75%);
+  background-color: choose-grey(5%);
 }
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 2a97d2dc9e0..7c389b38f62 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -308,7 +308,7 @@ a.star {
 
 .topic-map {
   margin: 20px 0 0 0;
-  background: dark-light-diff($primary, $secondary, 97%, -75%);
+  background: choose-grey(5%);
   border: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
   border-top: none; // would cause double top border
 
@@ -414,7 +414,7 @@ a.star {
       border: 0;
       padding: 0 23px;
       color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
-      background: dark-light-diff($primary, $secondary, 97%, -75%);
+      background: choose-grey(5%);
       border-left: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
       border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
       &:hover {
@@ -626,13 +626,13 @@ blockquote {
 .quote {
   &>blockquote {
     .onebox-result {
-      background-color: dark-light-diff($primary, $secondary, 97%, -45%);
+      background-color: choose-grey(5%);
     }
   }
 
   aside {
     .quote, .title, blockquote, .onebox, .onebox-result {
-      background: dark-light-diff($primary, $secondary, 97%, -45%);
+      background: choose-grey(5%);
       border-left: 5px solid dark-light-diff($primary, $secondary, 90%, -65%);
     }
 
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index 844b479d05c..050d6d6d6f7 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -168,7 +168,7 @@ a.star {
 .topic-map {
 
   margin: 10px 0;
-  background: dark-light-diff($primary, $secondary, 97%, -45%);
+  background: choose-grey(5%);
   border: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
   border-top: none; // would cause double top border
 
@@ -287,7 +287,7 @@ a.star {
       border: 0;
       padding: 0 15px;
       color: $primary;
-      background: dark-light-diff($primary, $secondary, 97%, -75%);
+      background: choose-grey(5%);
       border-left: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
       border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
       .fa {