diff --git a/app/assets/javascripts/discourse/templates/search.js.handlebars b/app/assets/javascripts/discourse/templates/search.js.handlebars
index 2b1fbb1e8..a02b2bfa1 100644
--- a/app/assets/javascripts/discourse/templates/search.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/search.js.handlebars
@@ -1,6 +1,6 @@
 {{view 'search-text-field' value=term searchContextEnabled=searchContextEnabled searchContext=searchContext id="search-term"}}
 {{#if searchContext}}
-<div>
+<div class='search-context'>
   <label>
   {{input type="checkbox" name="searchContext" checked=searchContextEnabled}} {{searchContextDescription}}
   </label>
diff --git a/app/assets/javascripts/discourse/templates/topic-progress.js.handlebars b/app/assets/javascripts/discourse/templates/topic-progress.js.handlebars
index 422a30c5c..55b2fc5e6 100644
--- a/app/assets/javascripts/discourse/templates/topic-progress.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/topic-progress.js.handlebars
@@ -1,13 +1,13 @@
 {{#if expanded}}
   <nav id='topic-progress-expanded'>
-    <button {{action jumpTop}} {{bind-attr disabled=jumpTopDisabled}} class='btn full'>
+    <button {{action jumpTop}} {{bind-attr disabled=jumpTopDisabled}} class='btn full no-text'>
       <i class="fa fa-caret-up"></i>
       {{i18n topic.progress.go_top}}
     </button>
     <div class='jump-form'>
       {{input value=toPostNumber}} <button {{action jumpPost}} class='btn'>{{i18n topic.progress.go}}</button>
     </div>
-    <button {{action jumpBottom}} {{bind-attr disabled=jumpBottomDisabled}} class='btn full jump-bottom'>
+    <button {{action jumpBottom}} {{bind-attr disabled=jumpBottomDisabled}} class='btn full no-text jump-bottom'>
       {{i18n topic.progress.go_bottom}}
       <i class="fa fa-caret-down"></i>
     </button>
diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss
index dbbdc1899..6420fb4d9 100644
--- a/app/assets/stylesheets/common/base/header.scss
+++ b/app/assets/stylesheets/common/base/header.scss
@@ -236,6 +236,11 @@
     margin: 5px;
     padding: 5px;
   }
+
+  .search-context {
+    padding: 0 5px;
+  }
+
   .searching {
     display: block;
     position: absolute;
diff --git a/app/assets/stylesheets/common/base/user-badges.scss b/app/assets/stylesheets/common/base/user-badges.scss
index 15683b6d0..8c0cfd42c 100644
--- a/app/assets/stylesheets/common/base/user-badges.scss
+++ b/app/assets/stylesheets/common/base/user-badges.scss
@@ -4,7 +4,7 @@
   color: darken($primary, 40%);;
   border: 1px solid lighten($primary, 60%);
   font-size: $base-font-size * 0.86;
-  line-height: 16px;
+  line-height: 19px;
   margin: 0;
   display: inline-block;
   background-color: $secondary;
@@ -57,7 +57,7 @@
 /* Badge listing in /badges. */
 table.badges-listing {
   margin: 20px 0;
-  border-bottom: 1px solid $primary;
+  border-bottom: 1px solid scale-color-diff();
 
   .user-badge {
     font-size: $base-font-size;
@@ -78,7 +78,7 @@ table.badges-listing {
   }
 
   tr {
-    border-top: 1px solid $primary;
+    border-top: 1px solid scale-color-diff();
   }
 }
 
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index b7092dd07..4616f1360 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -850,7 +850,7 @@ blockquote { /* solo quotes */
 }
 .dropdown-menu a {
   display: block;
-  padding: 3px 15px;
+  padding: 3px 9px;
   clear: both;
   font-weight: normal;
   line-height: 18px;