diff --git a/src/components/tabs/tabs.css b/src/components/tabs/tabs.css
index c1a2fa824..ea3f3a08b 100644
--- a/src/components/tabs/tabs.css
+++ b/src/components/tabs/tabs.css
@@ -5,6 +5,16 @@
   padding-left: 24px;
 }
 
+.navigationContainer {
+  overflow: hidden;
+  margin-left: -2px;
+}
+.navigationContainer .navigation {
+  padding-left: 0;
+  box-shadow: 0px 1px 1px 1px rgba(0, 0, 0, 0.12);
+  margin-left: 2px;
+}
+
 .tabs nav {
   overflow: hidden;
 }
diff --git a/src/components/tabs/tabs.js b/src/components/tabs/tabs.js
index 6ff9e1c7f..0b91f5dd7 100644
--- a/src/components/tabs/tabs.js
+++ b/src/components/tabs/tabs.js
@@ -16,6 +16,7 @@ const getIndex = history => (
 
 const Tabs = props => (
   <ToolboxTabs index={getIndex(props.history)}
+    theme={styles}
     onChange={index => props.history.push(`${tabs[index].toLowerCase()}`)}
     className={`${styles.tabs} main-tabs`}>
     {getTabs(props.isDelegate).map((tab, index) =>