diff --git a/app/assets/stylesheets/common/base/alert.scss b/app/assets/stylesheets/common/base/alert.scss
index c662ec7dba5..fe80bb2ebaf 100644
--- a/app/assets/stylesheets/common/base/alert.scss
+++ b/app/assets/stylesheets/common/base/alert.scss
@@ -39,7 +39,7 @@
     color: $primary;
   }
   &.alert-info {
-    background-color: dark-light-diff($tertiary, $secondary, 90%, -40%);
+    background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
     color: $primary;
   }
 }
diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index f4f7dad9d56..6078bda7214 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -27,7 +27,7 @@
           vertical-align: middle;
         }
         &.selected {
-          background-color: dark-light-diff($tertiary, $secondary, 90%, -60%);
+          background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
         }
         @include hover {
           background-color: dark-light-diff($highlight, $secondary, 90%, -80%);
diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss
index a5ac8d24139..f19fe23076c 100644
--- a/app/assets/stylesheets/common/base/header.scss
+++ b/app/assets/stylesheets/common/base/header.scss
@@ -186,7 +186,7 @@
   }
 
   .selected {
-    background-color: dark-light-diff($tertiary, $secondary, 90%, -60%);
+    background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
   }
 
 
@@ -195,7 +195,7 @@
     .fa { color: scale-color($primary, $lightness: 50%); }
     .icon { color: scale-color($primary, $lightness: 30%); }
     li {
-      background-color: dark-light-diff($tertiary, $secondary, 90%, -60%);
+      background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
       i {
         float: left;
         margin-right: 5px;
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 572f70cadea..a41cf5a58ef 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -72,7 +72,7 @@ aside.quote {
 }
 
 .cooked .highlight {
-  background-color: dark-light-diff($tertiary, $secondary, 90%, -40%);
+  background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
   padding: 2px;
   margin: -2px;
 }
diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss
index 29ffd35ab16..ceaa92c1d69 100644
--- a/app/assets/stylesheets/desktop/topic-list.scss
+++ b/app/assets/stylesheets/desktop/topic-list.scss
@@ -56,7 +56,7 @@
 
   > tbody > tr {
     &.highlighted {
-        background-color: dark-light-diff($tertiary, $secondary, 90%, -41%);
+        background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
     }
   }
   button.bulk-select {
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 01c75c452c5..9763f9274af 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -112,7 +112,7 @@ nav.post-controls {
   button.create {
     margin-right: 0;
     color: $tertiary;
-    background: dark-light-diff($tertiary, $secondary, 90%, -65%);
+    background: dark-light-diff($tertiary, $secondary, 85%, -65%);
     padding: 8px 20px;
     margin-left: 10px;
 
@@ -711,7 +711,7 @@ $topic-avatar-width: 45px;
   border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -75%);
   padding: 12px $topic-body-width-padding 15px $topic-body-width-padding;
   &.highlighted {
-    background-color: dark-light-diff($tertiary, $secondary, 90%, -40%);
+    background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
   }
 }
 .topic-avatar {
@@ -793,7 +793,7 @@ $topic-avatar-width: 45px;
 .dropdown-menu .disabled > a:hover {
   text-decoration: none;
   color: $primary;
-  background-color: dark-light-diff($tertiary, $secondary, 90%, -60%);
+  background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
   cursor: default;
 }
 
@@ -816,7 +816,7 @@ $topic-avatar-width: 45px;
   position: fixed;
   z-index: 1000;
   left: 50%;
-  background-color: dark-light-diff($tertiary, $secondary, 90%, -40%);
+  background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
   border: 1px solid $tertiary;
   padding: 5px;
   margin-bottom: 5px;
@@ -957,7 +957,7 @@ a.attachment:before {
 }
 
 span.highlighted {
-  background-color: dark-light-diff($tertiary, $secondary, 90%, -40%);
+  background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
 }
 
 .username.new-user a {
diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss
index 7707ec90560..622f2591645 100644
--- a/app/assets/stylesheets/desktop/topic.scss
+++ b/app/assets/stylesheets/desktop/topic.scss
@@ -80,7 +80,7 @@ a.reply-new {
 a:hover.reply-new {
   color: $tertiary;
   i {
-    background: dark-light-diff($tertiary, $secondary, 90%, -65%);
+    background: dark-light-diff($tertiary, $secondary, 85%, -65%);
   }
 }
 
@@ -166,8 +166,10 @@ a:hover.reply-new {
     display: none;
   }
   border: none;
-  background-color: scale-color-diff();
-  color: scale-color($primary, $lightness: 50%);
+  background-color: $secondary;
+  color: $tertiary;
+  border: 1px solid dark-light-diff($tertiary, $secondary, 85%, -65%);
+  border-bottom: none;
   width: 145px;
   height: 34px;
 
@@ -200,8 +202,8 @@ a:hover.reply-new {
     top: 0;
     bottom: 0;
     width: 0;
-    border-right: 1px solid  scale-color-diff();
-    background-color:  desaturate(dark-light-diff($success, $secondary, 60%, -35%), 30%);
+    border-right: 1px solid  dark-light-diff($tertiary, $secondary, 85%, -65%);
+    background-color:  dark-light-diff($tertiary, $secondary, 85%, -65%);
     transition: width .75s;
 
   }
diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss
index f6506a89a33..8cf10696740 100644
--- a/app/assets/stylesheets/desktop/user.scss
+++ b/app/assets/stylesheets/desktop/user.scss
@@ -470,7 +470,7 @@
     }
     .notification {
       &.unread {
-        background-color: dark-light-diff($tertiary, $secondary, 90%, -60%);
+        background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
       }
 
       li { display: inline-block; }
diff --git a/app/assets/stylesheets/mobile/discourse.scss b/app/assets/stylesheets/mobile/discourse.scss
index 729896c9673..30ebb6a6ee8 100644
--- a/app/assets/stylesheets/mobile/discourse.scss
+++ b/app/assets/stylesheets/mobile/discourse.scss
@@ -19,7 +19,6 @@ body {
   }
   #main {
     position: relative;
-
     img.avatar {
       &.header {
         width: 45px;
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index 0a21d580b99..9d122122864 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -387,7 +387,7 @@ iframe {
   float: left;
   width: 97%;
   padding-left: 3%;
-  background-color: dark-light-diff($tertiary, $secondary, 90%, -40%);
+  background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
   .btn {
     margin-bottom: 10px;
     color: $secondary;
diff --git a/app/assets/stylesheets/mobile/user.scss b/app/assets/stylesheets/mobile/user.scss
index 61f415b2067..272ee387b80 100644
--- a/app/assets/stylesheets/mobile/user.scss
+++ b/app/assets/stylesheets/mobile/user.scss
@@ -465,7 +465,7 @@
     }
     .notification {
       &.unread {
-        background-color: dark-light-diff($tertiary, $secondary, 90%, -60%);
+        background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
       }
 
       li { display: inline-block; }