diff --git a/src/components/passphrase/passphrase.css b/src/components/passphrase/passphrase.css
index c0dbbb35f..4a709d46f 100644
--- a/src/components/passphrase/passphrase.css
+++ b/src/components/passphrase/passphrase.css
@@ -26,6 +26,3 @@ hr {
 .templateItem {
     min-height: 130px;
 }
-:global .box {
-    box-shadow: none !important;
-}
diff --git a/src/components/passphrase/passphrase.js b/src/components/passphrase/passphrase.js
index 23c58b3a7..3ef51cf9f 100644
--- a/src/components/passphrase/passphrase.js
+++ b/src/components/passphrase/passphrase.js
@@ -57,9 +57,7 @@ class Passphrase extends React.Component {
       <div>
         <section className={`${styles.templateItem} ${grid['middle-xs']}`}>
           <div className={grid['col-xs-12']}>
-            <div className='box'>
-              { templates[current] }
-            </div>
+            { templates[current] }
           </div>
         </section>
 
diff --git a/src/components/tabs/tabs.css b/src/components/tabs/tabs.css
index 316aca99f..6ceb3a9f8 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;
 }