diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
index bbe044c2..f21b9c34 100644
--- a/app/assets/stylesheets/application.css.scss
+++ b/app/assets/stylesheets/application.css.scss
@@ -28,10 +28,10 @@ $font-size-h6:            ceil(($font-size-base * 0.85)); // ~12px
 $brand-primary: #5e35b1;
 $navbar-inverse-bg: #5e35b1;
 $navbar-inverse-link-color: #ffffff;
-$navbar-inverse-link-hover-color: #bfbfbf;
+$navbar-inverse-link-hover-color: #ffffff;
 $navbar-inverse-link-hover-bg: transparent;
-$navbar-inverse-link-active-color: #bfbfbf;
-$navbar-inverse-link-active-bg: darken($navbar-inverse-bg, 6.5%);
+$navbar-inverse-link-active-color: #ffffff;
+$navbar-inverse-link-active-bg: transparent;
 $navbar-inverse-link-disabled-color: darken(#fff, 12.5%);
 $navbar-inverse-link-disabled-bg: transparent;
 $navbar-inverse-brand-color: $navbar-inverse-link-color;
diff --git a/app/assets/stylesheets/scss/navbar.scss b/app/assets/stylesheets/scss/navbar.scss
index 388d08de..249e28c9 100644
--- a/app/assets/stylesheets/scss/navbar.scss
+++ b/app/assets/stylesheets/scss/navbar.scss
@@ -126,9 +126,50 @@
   min-height: 50px;
   min-width: 50px;
   height: 50px;
-  width: 50px;  
+  width: 50px;
 }
 
 .navbar-inverse {
   border: none;
-}
\ No newline at end of file
+}
+
+nav.navbar .nav > li:not(.profile--image-dropdown) {
+  & > *:first-child {
+    -moz-osx-font-smoothing: grayscale;
+    position: relative;
+
+    &:before {
+        content: "";
+        position: absolute;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        background: $navbar-inverse-link-color;
+        height: 0px;
+        -webkit-transition-property: height;
+        transition-property: height;
+        -webkit-transition-duration: 0.3s;
+        transition-duration: 0.3s;
+        -webkit-transition-timing-function: ease-out;
+        transition-timing-function: ease-out;
+    }
+
+    &:hover, &:focus, &:active {
+      &:before {
+        height: 4px
+      }
+    }
+  }
+
+  &.active *:first-child:before {
+    height: 4px;
+  }
+
+  & > .btn {
+    line-height: 50px;
+    width: 44px;
+    margin: 0;
+    border: 0;
+    padding: 0;
+  }
+}