diff --git a/app/assets/stylesheets/header.scss b/app/assets/stylesheets/header.scss
index c20c69cab..692ed5908 100644
--- a/app/assets/stylesheets/header.scss
+++ b/app/assets/stylesheets/header.scss
@@ -1,6 +1,7 @@
-header > .dark-header > nav {
+.navbar.navbar-fixed-top {
   border-bottom: none;
   box-shadow: 1px 0 2px $black;
+  a:focus {outline: 0 none; }
 
   .navbar-brand {
     font-weight: bold;
@@ -11,11 +12,8 @@ header > .dark-header > nav {
     .col-lg-10 { padding: 0; }
     .navbar-header > .nav li { display: inline-block !important; }
     .nav-badge {
-      color: $navbar-inverse-link-color;
       padding-left: 12px;
       padding-right: 12px;
-      &:hover { color: $navbar-inverse-link-hover-color; }
-      &:hover, &:focus { background-color: transparent; }
     }
     #navbar-collapse {
       .form-group, .twitter-typeahead  {
@@ -60,8 +58,7 @@ header > .dark-header > nav {
 
   .navbar-nav:not(.nav-badges) > li > a { font-weight: bold; }
   .nav-badges {
-    & > li { height: 50px; }
-    .dropdown > a:focus { outline: 0px none; }
+    li { height: $navbar-height; }
     .dropdown-open {
       background-color: $dropdown-bg;
       & > a { color: $dropdown-link-color; }
diff --git a/app/assets/stylesheets/typeahead.scss b/app/assets/stylesheets/typeahead.scss
index 4c08bc219..3a46e14b6 100644
--- a/app/assets/stylesheets/typeahead.scss
+++ b/app/assets/stylesheets/typeahead.scss
@@ -1,6 +1,6 @@
 .tt-menu {
   width: 300px;
-  margin-top: 11px;
+  margin-top: ($navbar-height - $input-height-small) / 2;
   background-color: $navbar-inverse-bg;
   box-shadow: 0 5px 10px rgba(0,0,0,.2);
 }
@@ -14,6 +14,8 @@
     background-color: $brand-primary;
   }
 
+  &:hover { background-color: lighten($navbar-inverse-bg, 10%); }
+
   &.search-suggestion-person {
     padding: 8px;
     .avatar {