diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index fa42198a2ac..a329320ed1c 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -20,10 +20,10 @@
           font-size: 11px;
         }
         &.selected {
-          background-color: lighten($highlight, 23%);
+          background-color: scale-color($tertiary, $lightness: 90%);
         }
         @include hover {
-          background-color: lighten($highlight, 23%);
+          background-color: scale-color($highlight, $lightness: 60%);
           text-decoration: none;
         }
       }
diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss
index bde557cec71..efe7727e095 100644
--- a/app/assets/stylesheets/common/base/header.scss
+++ b/app/assets/stylesheets/common/base/header.scss
@@ -165,7 +165,9 @@
 
     }
 
-    &:hover a:not(.badge-notification) {background: scale-color-diff();}
+    &:hover a:not(.badge-notification) {
+      background-color: scale-color($highlight, $lightness: 60%);
+      }
     button {margin-left: 5px;}
 
   }
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 52790791777..d2172bccc80 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -563,6 +563,10 @@ iframe {
     margin: 5px 0 0 0;
     font-size: 1.8em;
     line-height: 1.2em;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+
   }
 
   a.star {
@@ -586,10 +590,6 @@ iframe {
   display: block;
 }
 
-.dropdown-menu li  {
-  margin: 5px 0;
-}
-
 .btn-group {
   margin-top: 25px;
   position: relative;
@@ -818,7 +818,6 @@ blockquote { /* solo quotes */
   display: none;
   float: left;
   width: 550px;
-  padding: 4px 0;
   margin: 1px 0 0;
   list-style: none;
   background-color: $secondary;
@@ -826,11 +825,11 @@ blockquote { /* solo quotes */
   box-shadow: 0 1px 5px rgba($primary, .4);
   background-clip: padding-box;
   span {font-size: 12px;}
-.title {font-weight: bold; display: block; font-size: 14px;}
+  .title {font-weight: bold; display: block; font-size: 14px;}
 }
 .dropdown-menu a {
   display: block;
-  padding: 3px 9px;
+  padding: 9px;
   clear: both;
   font-weight: normal;
   line-height: 18px;
@@ -843,16 +842,17 @@ blockquote { /* solo quotes */
 .dropdown-menu li > a:hover,
 .dropdown-menu .active > a,
 .dropdown-menu .active > a:hover {
-  color: $tertiary;
+  color: $primary;
   text-decoration: none;
-  background-color: scale-color($tertiary, $lightness: 90%);
+  background-color: scale-color($highlight, $lightness: 60%);
+
 }
 
 .dropdown-menu .disabled > a,
 .dropdown-menu .disabled > a:hover {
   text-decoration: none;
   color: $primary;
-  background-color: scale-color($highlight, $lightness: 25%);
+  background-color: scale-color($tertiary, $lightness: 90%);
   cursor: default;
 }