diff --git a/build/scss/_cards.scss b/build/scss/_cards.scss
index edb23bf2f..dc764e899 100644
--- a/build/scss/_cards.scss
+++ b/build/scss/_cards.scss
@@ -354,3 +354,13 @@ html.maximized-card {
 @each $name, $color in $colors {
   @include cards-variant($name, $color);
 }
+
+
+// Nav Tabs override
+.card-default {
+  .nav-item {
+    &:first-child .nav-link {
+      border-left: 0;
+    }
+  }
+}
diff --git a/build/scss/_mixins.scss b/build/scss/_mixins.scss
index ccc29460b..0ebc93d0f 100644
--- a/build/scss/_mixins.scss
+++ b/build/scss/_mixins.scss
@@ -22,19 +22,43 @@
       }
     }
 
-
     &.card-outline {
       border-top: 3px solid $color;
+
+      .nav-item {
+        border-bottom: 0;
+
+        &:first-child .nav-link {
+          margin-left: -1px;
+          border-left: 0;
+        }
+      }
     }
 
     &.card-outline-tabs {
       border-top: 0;
 
       > .card-header {
+        .nav-item {
+          &:first-child .nav-link {
+            margin-left: -1px;
+            border-left: 0;
+          }
+        }
+
         a {
           border-top: 3px solid transparent;
 
+          &:hover {
+            border-top: $nav-tabs-border-width solid $nav-tabs-border-color;
+            margin-top: 2px;
+          }
+
           &.active {
+            &:hover {
+              margin-top: 0;
+            }
+
             border-top: 3px solid $color;
           }
         }