diff --git a/app/assets/stylesheets/base.css.scss b/app/assets/stylesheets/base.css.scss
index 3df35521..6e179afb 100644
--- a/app/assets/stylesheets/base.css.scss
+++ b/app/assets/stylesheets/base.css.scss
@@ -60,4 +60,15 @@ body {
 .text-muted a, .text-muted a:hover {
   color: $gray-dark;
   text-decoration: none;
-}
\ No newline at end of file
+}
+
+.navbar .nav .badge {
+  padding: 3px 6px 3px;
+  background-color: $navbar-inverse-link-active-bg;
+}
+
+.navbar .nav .active .badge {
+  padding: 3px 6px 3px;
+  background-color: $navbar-inverse-bg;
+}
+
diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
index 7d558a00..48d2ad76 100644
--- a/app/views/layouts/_header.html.haml
+++ b/app/views/layouts/_header.html.haml
@@ -12,7 +12,7 @@
         %ul.nav.navbar-nav
           = nav_entry "Timeline", root_path
         %ul.nav.navbar-nav
-          = nav_entry "Inbox", "/inbox", badge: inbox_count, badge_color: 'danger'
+          = nav_entry "Inbox", "/inbox", badge: inbox_count
         %ul.nav.navbar-nav.navbar-right
           %li.dropdown
             %a.dropdown-toggle{href: "#", "data-toggle" => "dropdown"}