diff --git a/ui/app/components/app/index.scss b/ui/app/components/app/index.scss
index 69ed2bb23..cff447a65 100644
--- a/ui/app/components/app/index.scss
+++ b/ui/app/components/app/index.scss
@@ -59,6 +59,7 @@
 @import '../ui/dropdown/dropdown';
 @import 'permissions-connect-header/index';
 @import 'permissions-connect-footer/index';
+@import 'tab-bar/index';
 @import 'wallet-overview/index';
 @import '../ui/account-mismatch-warning/index';
 @import '../ui/icon-border/icon-border';
diff --git a/ui/app/components/app/tab-bar/index.js b/ui/app/components/app/tab-bar/index.js
new file mode 100644
index 000000000..74f9a7529
--- /dev/null
+++ b/ui/app/components/app/tab-bar/index.js
@@ -0,0 +1 @@
+export { default } from './tab-bar'
diff --git a/ui/app/components/app/tab-bar/index.scss b/ui/app/components/app/tab-bar/index.scss
new file mode 100644
index 000000000..0b9d0605d
--- /dev/null
+++ b/ui/app/components/app/tab-bar/index.scss
@@ -0,0 +1,80 @@
+.tab-bar {
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
+
+
+  &__tab {
+    display: flex;
+    flex-flow: row nowrap;
+    align-items: flex-start;
+    min-width: 0;
+    flex: 0 0 auto;
+    box-sizing: border-box;
+    font-size: 16px;
+    padding: 16px 24px;
+    opacity: 0.5;
+    transition: opacity 200ms ease-in-out;
+
+    @media screen and (min-width: 576px) {
+      &:hover {
+        opacity: 0.4;
+      }
+
+      &:active {
+        opacity: 0.6;
+      }
+    }
+
+    @media screen and (max-width: 575px) {
+      font-size: 18px;
+      padding: 24px;
+      border-bottom: 1px solid $alto;
+      opacity: 1;
+    }
+
+    &__content {
+      flex: 1 1 auto;
+      width: 0;
+
+      &__description {
+        display: none;
+
+        @media screen and (max-width: 575px) {
+          display: block;
+          font-size: 14px;
+          font-weight: 300;
+          margin-top: 8px;
+          min-height: 14px;
+        }
+      }
+    }
+
+    &__caret {
+      display: none;
+
+      @media screen and (max-width: 575px) {
+        display: block;
+        background-image: url('/images/caret-right.svg');
+        width: 36px;
+        height: 36px;
+        opacity: 0.5;
+        background-size: contain;
+        background-repeat: no-repeat;
+        background-position: center;
+
+        [dir='rtl'] & {
+          transform: rotate(180deg);
+        }
+      }
+    }
+
+    &--active {
+      opacity: 1 !important;
+    }
+  }
+
+  &__grow-tab {
+    flex-grow: 1;
+  }
+}
diff --git a/ui/app/components/app/tab-bar.js b/ui/app/components/app/tab-bar/tab-bar.js
similarity index 100%
rename from ui/app/components/app/tab-bar.js
rename to ui/app/components/app/tab-bar/tab-bar.js
diff --git a/ui/app/css/itcss/components/index.scss b/ui/app/css/itcss/components/index.scss
index 1936706dc..f9ca7c41d 100644
--- a/ui/app/css/itcss/components/index.scss
+++ b/ui/app/css/itcss/components/index.scss
@@ -14,7 +14,6 @@
 // Tx List and Sections
 @import './menu';
 @import './gas-slider';
-@import './tab-bar';
 @import './simple-dropdown';
 @import './request-signature';
 @import './request-encryption-public-key';
diff --git a/ui/app/css/itcss/components/tab-bar.scss b/ui/app/css/itcss/components/tab-bar.scss
deleted file mode 100644
index 2579b279f..000000000
--- a/ui/app/css/itcss/components/tab-bar.scss
+++ /dev/null
@@ -1,79 +0,0 @@
-.tab-bar {
-  display: flex;
-  flex-direction: column;
-  justify-content: flex-start;
-}
-
-.tab-bar__tab {
-  display: flex;
-  flex-flow: row nowrap;
-  align-items: flex-start;
-  min-width: 0;
-  flex: 0 0 auto;
-  box-sizing: border-box;
-  font-size: 16px;
-  padding: 16px 24px;
-  opacity: 0.5;
-  transition: opacity 200ms ease-in-out;
-
-  @media screen and (min-width: 576px) {
-    &:hover {
-      opacity: 0.4;
-    }
-
-    &:active {
-      opacity: 0.6;
-    }
-  }
-
-  @media screen and (max-width: 575px) {
-    font-size: 18px;
-    padding: 24px;
-    border-bottom: 1px solid $alto;
-    opacity: 1;
-  }
-
-  &__content {
-    flex: 1 1 auto;
-    width: 0;
-
-    &__description {
-      display: none;
-
-      @media screen and (max-width: 575px) {
-        display: block;
-        font-size: 14px;
-        font-weight: 300;
-        margin-top: 8px;
-        min-height: 14px;
-      }
-    }
-  }
-
-  &__caret {
-    display: none;
-
-    @media screen and (max-width: 575px) {
-      display: block;
-      background-image: url('/images/caret-right.svg');
-      width: 36px;
-      height: 36px;
-      opacity: 0.5;
-      background-size: contain;
-      background-repeat: no-repeat;
-      background-position: center;
-
-      [dir='rtl'] & {
-        transform: rotate(180deg);
-      }
-    }
-  }
-
-  &--active {
-    opacity: 1 !important;
-  }
-}
-
-.tab-bar__grow-tab {
-  flex-grow: 1;
-}