diff --git a/assets/stylesheets/bootstrap/_navs.scss b/assets/stylesheets/bootstrap/_navs.scss
index a31616b715..a53a19f53c 100644
--- a/assets/stylesheets/bootstrap/_navs.scss
+++ b/assets/stylesheets/bootstrap/_navs.scss
@@ -106,13 +106,6 @@
       border-radius: 0;
       background-color: $nav-tabs-link-bg;
       color: $nav-tabs-link-color;
-
-      &:active,
-      [data-hover-visible] &:hover,
-      [data-focus-visible] &:focus {
-        color: $nav-tabs-link-color;
-        background-color: $nav-tabs-link-hover-bg;
-      }
     }
 
     // Active state, and its :hover to override normal :hover
diff --git a/assets/stylesheets/bootstrap/_variables.scss b/assets/stylesheets/bootstrap/_variables.scss
index 708894db3e..d233760730 100644
--- a/assets/stylesheets/bootstrap/_variables.scss
+++ b/assets/stylesheets/bootstrap/_variables.scss
@@ -254,9 +254,9 @@ $dropdown-divider-bg:            #e5e5e5 !default;
 //** Dropdown link text color.
 $dropdown-link-color:            $text-color !default;
 //** Hover color for dropdown links.
-$dropdown-link-hover-color:      darken($text-color, 5%) !default;
+$dropdown-link-hover-color:      $component-active-color !default;
 //** Hover background for dropdown links.
-$dropdown-link-hover-bg:         #f5f5f5 !default;
+$dropdown-link-hover-bg:         $component-active-bg !default;
 
 //** Active dropdown menu item text color.
 $dropdown-link-active-color:     $component-active-color !default;
diff --git a/assets/stylesheets/bootstrap/mixins/_buttons.scss b/assets/stylesheets/bootstrap/mixins/_buttons.scss
index ef10d2c35c..e0e39e17aa 100644
--- a/assets/stylesheets/bootstrap/mixins/_buttons.scss
+++ b/assets/stylesheets/bootstrap/mixins/_buttons.scss
@@ -7,17 +7,11 @@
   color: $color;
   background-color: $background;
   border-color: $border;
+  border-bottom-color: darken($border, 5%);
 
+  [data-hover-visible] &:hover,
   [data-focus-visible] &:focus {
     color: $color;
-    background-color: darken($background, 5%);
-        border-color: darken($border, 5%);
-  }
-
-  [data-hover-visible] &:hover {
-    color: $color;
-    background-color: darken($background, 5%);
-        border-color: darken($border, 5%);
   }
 
   &:active,
@@ -26,28 +20,13 @@
     color: $color;
     background-color: darken($background, 10%);
         border-color: darken($border, 10%);
-
-    [data-hover-visible] &:hover,
-    [data-focus-visible] &:focus {
-      color: $color;
-      background-color: darken($background, 10%);
-          border-color: darken($border, 10%);
-    }
+        border-top-color: darken($border, 15%);
   }
   &:active,
   &.active,
   .open > &.dropdown-toggle {
     background-image: none;
   }
-  &.disabled,
-  &[disabled],
-  fieldset[disabled] & {
-    [data-hover-visible] &:hover,
-    [data-focus-visible] &:focus {
-      background-color: $background;
-          border-color: $border;
-    }
-  }
 
   .badge {
     color: $background;