diff --git a/scss/_nav.scss b/scss/_nav.scss
index 9508c1af3..efc8a9634 100644
--- a/scss/_nav.scss
+++ b/scss/_nav.scss
@@ -100,15 +100,27 @@
 //
 
 .nav-underline {
+  .nav-item + .nav-item,
+  .nav-link + .nav-link {
+    margin-left: $nav-link-padding-x;
+  }
+
   .nav-link {
+    padding-right: 0;
+    padding-left: 0;
     border-bottom: .125rem solid transparent;
+
+    &:hover,
+    &:focus {
+      border-bottom-color: currentColor;
+    }
   }
 
   .nav-link.active,
   .show > .nav-link {
     font-weight: $font-weight-bold;
     color: $dark;
-    border-bottom-color: $dark;
+    border-bottom-color: currentColor;
   }
 }