diff --git a/css/src/main.css b/css/src/main.css
index f975dc348..75844c607 100644
--- a/css/src/main.css
+++ b/css/src/main.css
@@ -534,23 +534,6 @@ ul.tx-copayers {
   background-color: #213140;
 }
 
-a.button-setup {
-  border-radius: 3px;
-  border: 1px solid #ccc;
-  display: block;
-  padding: 0.5rem;
-  background: transparent;
-  color: #A0A3A6;
-}
-
-.createProfile a.button-setup, .home a.button-setup, .settings a.button-setup, .import-profile a.button-setup {
-  border-radius: 3px;
-  border: 1px solid #3E5366;
-  display: block;
-  padding: 0.5rem;
-  background: transparent;
-}
-
 .dn {display: none;}
 .dni {display: none !important;}
 .pr {position: relative;}
@@ -989,6 +972,34 @@ input[type=date], input[type=datetime-local], input[type=datetime], input[type=e
   font-size: 13px;
 }
 
+/*////////////////////////////  BUTTON OUTLINE  ////////////////////////////*/
+
+.button.outline {
+  border-radius: 3px;
+  background: transparent;
+  text-transform: none;
+}
+
+.button.outline.dark-gray {
+  border: 1px solid #A5B2BF;
+  color: #A5B2BF;
+}
+
+.button.outline.light-gray {
+  border: 1px solid #CED5DC;
+  color: #7A8C9E;
+}
+
+.button.outline.light-gray:hover {
+  background: rgba(206,213,220,0.40);
+  color: #4B6178;
+}
+
+.button.outline.dark-gray:hover {
+  background: rgba(255,255,255,.1);
+  color: #fff;
+}
+
 /* SECONDARY */
 button.secondary, 
 .button.secondary { 
diff --git a/css/src/mobile.css b/css/src/mobile.css
index e6ca4b22a..6443f2654 100644
--- a/css/src/mobile.css
+++ b/css/src/mobile.css
@@ -328,17 +328,6 @@
     -webkit-tap-highlight-color:rgba(0,0,0,0);
   }
 
-  .add-wallet .button-setup {
-    border: 1px solid #A5B2BF;
-    border-radius: 5px;
-    color: #7A8C9E;
-    text-align: center;
-    padding: 2rem;
-    margin: 2rem 0;
-    text-transform: uppercase;
-    font-size: 16px;
-  }
-
   .modal.fade, .reveal-modal-bg {
     opacity: 1;
   }
diff --git a/views/create.html b/views/create.html
index e3cadd62e..084769dda 100644
--- a/views/create.html
+++ b/views/create.html
@@ -47,7 +47,7 @@
             <div class="line-dashed-h m20b"></div>
 
             <div class="m20b oh">
-              <a class="small left button-setup" ng-click="hideAdv=!hideAdv">
+              <a class="button outline light-gray tiny" ng-click="hideAdv=!hideAdv">
                 <i class="fi-widget m3r"></i>
                 <span translate ng-hide="!hideAdv">Show</span> 
                 <span translate ng-hide="hideAdv">Hide</span> 
diff --git a/views/createProfile.html b/views/createProfile.html
index fa970ea3d..ed2865995 100644
--- a/views/createProfile.html
+++ b/views/createProfile.html
@@ -97,13 +97,13 @@
 
         <div class="box-setup-footer">
           <div class="left">
-            <a class="button-setup text-gray" href="#!/">
-              <i class="icon-arrow-left4"></i> 
+            <a class="button outline dark-gray tiny" href="#!/">
+              <i class="icon-arrow-left4 size-10"></i> 
               <span translate>Back</span>
             </a>
           </div>
           <div class="right">
-            <a class="button-setup text-gray" 
+            <a class="button outline dark-gray tiny" 
               ng-click="$root.openExternalLink('https://copay.io/profile-storage.html')"> 
               Learn more about this option
             </a>
diff --git a/views/home.html b/views/home.html
index b11fd38f9..3ce87afe4 100644
--- a/views/home.html
+++ b/views/home.html
@@ -181,8 +181,6 @@
  {{hideAll}}
         </button>
       </form>
-
-aasdas
         <div ng-if="usingLocalStorage" class="text-gray size-12 m10v">
           * Using this device storage. Change to cloud storage on 'settings'.
         </div>
@@ -192,21 +190,21 @@ aasdas
       <div class="box-setup-footer">
 
         <div class="right">
-          <a class="button-setup text-gray"  ng-click="$root.go('/settings')">
-            <i class="icon-wrench"></i> 
+          <a class="button outline dark-gray tiny"  ng-click="$root.go('/settings')">
+            <i class="icon-wrench hide-for-small-only"></i> 
             <span translate>Settings</span>
           </a>
         </div>
 
         <div class="left m10r">
-          <a class="button-setup text-gray"  ng-click="$root.go('/createProfile')">
-            <i class="icon-person"></i> 
+          <a class="button outline dark-gray tiny"  ng-click="$root.go('/createProfile')">
+            <i class="icon-person hide-for-small-only"></i> 
             <span translate>Create profile</span>
           </a>
         </div>
         <div class="left">
-          <a class="button-setup text-gray"  ng-click="$root.go('/importProfile')">
-            <i class="icon-upload"></i> 
+          <a class="button outline dark-gray tiny"  ng-click="$root.go('/importProfile')">
+            <i class="icon-upload hide-for-small-only"></i> 
             <span translate>Import</span>
           </a>
         </div>
diff --git a/views/import.html b/views/import.html
index 495e9fda0..a47532a6e 100644
--- a/views/import.html
+++ b/views/import.html
@@ -55,7 +55,7 @@
             <div class="line-dashed-h m20b"></div>
 
             <div class="m20b oh">
-              <a class="small left button-setup" ng-click="hideAdv=!hideAdv">
+              <a class="button outline light-gray tiny" ng-click="hideAdv=!hideAdv">
                 <i class="fi-widget m3r"></i>
                 <span translate ng-hide="!hideAdv">Show</span> 
                 <span translate ng-hide="hideAdv">Hide</span> 
diff --git a/views/importProfile.html b/views/importProfile.html
index 591a36eac..cc0908c03 100644
--- a/views/importProfile.html
+++ b/views/importProfile.html
@@ -53,8 +53,8 @@
         </form>
         <div class="box-setup-footer">
           <div class="left">
-            <a class="button-setup text-gray" href="#!/">
-              <i class="icon-arrow-left4"></i> 
+            <a class="button outline dark-gray tiny" href="#!/">
+              <i class="icon-arrow-left4 size-10"></i> 
               <span translate>Back</span>
             </a>
           </div>
diff --git a/views/join.html b/views/join.html
index a9ef7b069..873042cb8 100644
--- a/views/join.html
+++ b/views/join.html
@@ -46,7 +46,7 @@
             <div class="line-dashed-h m20b"></div>
 
             <div class="m20b oh">
-              <a class="small left button-setup" ng-click="hideAdv=!hideAdv">
+              <a class="button outline light-gray tiny" ng-click="hideAdv=!hideAdv">
                 <i class="fi-widget m3r"></i>
                 <span translate ng-hide="!hideAdv">Show</span> 
                 <span translate ng-hide="hideAdv">Hide</span> 
diff --git a/views/more.html b/views/more.html
index 2bcb1cccd..194a33349 100644
--- a/views/more.html
+++ b/views/more.html
@@ -76,7 +76,7 @@
 
   <div class="m20b row">
     <div class="large-12 columns">
-      <a class="small left button-setup" ng-click="hideAdv=!hideAdv">
+      <a class="button outline light-gray tiny" ng-click="hideAdv=!hideAdv">
         <i class="fi-widget m3r"></i>
         <span translate ng-hide="!hideAdv">Show</span> 
         <span translate ng-hide="hideAdv">Hide</span> 
diff --git a/views/profile.html b/views/profile.html
index 96577c9a5..3cc2a4fe5 100644
--- a/views/profile.html
+++ b/views/profile.html
@@ -50,7 +50,7 @@
   
   <div class="row oh m20b">
     <div class="large-12 columns">
-      <a class="small left button-setup" ng-click="hideAdv=!hideAdv">
+      <a class="button outline light-gray tiny" ng-click="hideAdv=!hideAdv">
         <i class="fi-widget m3r"></i>
         <span translate ng-hide="!hideAdv">Show</span> 
         <span translate ng-hide="hideAdv">Hide</span> 
diff --git a/views/settings.html b/views/settings.html
index 69d554098..9f9ed7334 100644
--- a/views/settings.html
+++ b/views/settings.html
@@ -71,13 +71,13 @@
       </form>
       <div class="box-setup-footer">
         <div class="left">
-          <a class="button-setup text-gray" href="#!/">
-            <i class="icon-arrow-left4"></i> 
+          <a class="button outline dark-gray tiny" href="#!/">
+            <i class="icon-arrow-left4 size-10"></i> 
             <span translate>Back</span>
           </a>
         </div>
         <div class="right">
-          <a class="button-setup text-gray" href="" ng-click="reset()">
+          <a class="button outline dark-gray tiny" href="" ng-click="reset()">
             <i class="fi-page-delete"></i> 
             <span translate>Reset settings</span>
           </a>