diff --git a/public/sass/components/_navs.scss b/public/sass/components/_navs.scss
index 938288e8953..4bb02d7b514 100644
--- a/public/sass/components/_navs.scss
+++ b/public/sass/components/_navs.scss
@@ -55,16 +55,15 @@
 
 // Actual tabs (as links)
 .nav-tabs > li > a {
-  color: $text-color;
-  padding-top: 8px;
-  padding-bottom: 8px;
+  padding: 0.40rem 1rem 0.35rem 1rem;
+  margin-right: $spacer/2;
   line-height: $line-height-base;
   border: 1px solid transparent;
-  @include border-radius(4px 4px 0 0);
+  position: relative;
+
   &:hover,
   &:focus {
-    border-color: $divider-border-color;
-    color: $link-color;
+    color: $link-hover-color;
   }
 }
 
@@ -73,8 +72,7 @@
 .nav-tabs > .active > a:hover,
 .nav-tabs > .active > a:focus {
   @include border-radius(3px);
-  border: 1px solid $divider-border-color;
-  background-color: transparent;
+  border-color: $divider-border-color;
   border-bottom: 1px solid $panel-bg;
   color: $link-color;
 }
diff --git a/public/sass/components/_tabbed_view.scss b/public/sass/components/_tabbed_view.scss
index 00fcf4c54ff..75a0c991d45 100644
--- a/public/sass/components/_tabbed_view.scss
+++ b/public/sass/components/_tabbed_view.scss
@@ -25,9 +25,10 @@
 }
 
 .tabbed-view-title {
-  margin-left: $spacer*2;
+  margin-left: $spacer*1.5;
   float: left;
   font-style: italic;
+  padding-top: 0.2rem;
 }
 
 .tabbed-view-close-btn {
@@ -47,7 +48,7 @@
 }
 
 .tabbed-view-body {
-  padding: $spacer*2;
+  padding: $spacer*1.5;
   min-height: 250px;
 }
 
diff --git a/public/sass/components/_tabs.scss b/public/sass/components/_tabs.scss
index 35db17bd3ac..05988c7c763 100644
--- a/public/sass/components/_tabs.scss
+++ b/public/sass/components/_tabs.scss
@@ -44,19 +44,18 @@
 }
 
 .gf-tabs-link {
-  padding: 0.80rem 1rem 0.60rem 1rem;
+  padding: 0.60rem 1rem 0.50rem 1rem;
   margin-right: $spacer/2;
   line-height: $line-height-base;
   border: 1px solid transparent;
   position: relative;
-  top: 3px;
+  top: 5px;
 
   @include border-radius(2px 2px 0 0);
 
   &:hover,
   &:focus {
-    border-color: rgba(216, 131, 40, 0.77);
-    color: $link-color;
+    color: $link-hover-color;
   }
 
   &.active,