diff --git a/css/src/main.css b/css/src/main.css
index 1d9e00e52..da4005c3c 100644
--- a/css/src/main.css
+++ b/css/src/main.css
@@ -992,7 +992,7 @@ input[type=date], input[type=datetime-local], input[type=datetime], input[type=e
   color: #343c43;
   margin-bottom: 1.3rem;
   height: 40px;
-  border-radius: 2px;
+  border-radius: 3px;
   background: #F2F5F8;
   -moz-box-shadow:    inset 1px 1px 0px 0px rgba(0,0,0,0.05);
   box-shadow:         inset 1px 1px 0px 0px rgba(0,0,0,0.05);
@@ -1035,8 +1035,8 @@ button.primary,
 .button.primary { 
   background-color: #1ABC9C;
   color: #fff;
-  border-radius: 2px;
-  border-radius: 2px;
+  border-radius: 3px;
+  border-radius: 3px;
   -moz-box-shadow:    1px 1px 0px 0px #16A085;
   box-shadow:         1px 1px 0px 0px #16A085;
 }
@@ -1070,7 +1070,7 @@ button.warning,
 .button.warning { 
   background-color: #C0392A;
   color: #fff;
-  border-radius: 2px;
+  border-radius: 3px;
   -moz-box-shadow:    1px 1px 0px 0px #A02F23;
   box-shadow:         1px 1px 0px 0px #A02F23;
 }
@@ -1419,6 +1419,7 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
 }
 
 .text-light {font-weight: 100;}
+.text-bold {font-weight: 700;}
 .text-gray {color: #8597A7;}
 .text-black {color: #2C3E50;}
 .text-primary {color: #1ABC9C;}
@@ -1642,10 +1643,51 @@ a.text-warning:hover {color: #FD7262;}
 
 /*/////////////////////////////////////////////////*/
 
+.tabbable {
+  border: 2px solid #213140;
+  border-radius: 3px;
+  margin-bottom: 1.2rem;
+}
+
+.tabs dd.active a {
+  color: #fff;
+  background-color: transparent;
+}
+
+.tabs dd>a {
+  background: #213140;
+  text-transform: uppercase;
+  color: #3E4F5D;
+  padding: 1rem;
+  text-align: center;
+  height: 64px;
+  font-size: 14px;
+  line-height: 15px;
+}
+
+.tabs dd>a:hover {
+  background: #1C2B39;
+}
+
+.tabs dd.active a:hover {
+  background: transparent;
+}
+
+.tabs-content {
+  margin-bottom: 0;
+}
+
+.content-item {
+  border-bottom: 1px solid rgba(32,48,64,0.30);
+  box-shadow: 0px 1px 0px 0px rgba(121,140,158,0.10);
+  margin: .5rem 1.3rem;
+  padding: 0.8rem 0;
+}
+
 .bg-circle {
   background: #253547;
   border-radius: 100%;
-  margin: .5rem 1rem 0.5rem 0;
+  margin: 0 1rem 0.3rem 0;
   padding: 0.75rem;
   display: inline-block;
   text-align: center;
diff --git a/views/createProfile.html b/views/createProfile.html
index d19e01ef5..ec8dcae57 100644
--- a/views/createProfile.html
+++ b/views/createProfile.html
@@ -25,7 +25,7 @@
       <img src="img/logo-negative-beta.svg" alt="Copay" width="146" height="59">
       <div ng-include="'views/includes/version.html'"></div>
     </div>
-    <div class="box-setup">
+    <div>
       <div class="box-notification" ng-show="error">
         <div class="box-icon error">
           <i class="fi-x size-24"></i>
@@ -38,52 +38,65 @@
 
       <form ng-show="createStep == 'storage' " novalidate>
         <tabset>
-          <tab heading="In the cloud" style="width: 50%;" ng-click="useLocalstorage=false">
+          <tab style="width: 50%;" ng-click="useLocalstorage=false">            
+            <tab-heading>
+              <span class="text-bold">In the Cloud </span><br>
+              <span class="size-10 text-gray">( Recommended )</span>
+            </tab-heading>
             <div ng-if="!useLocalstorage">
-              <div class="line-b">
+              <div class="content-item">
                 <div class="bg-circle"><i class="icon-wallet"></i>
                 </div>
                 <span class="text-gray">Access your wallets anywhere</span>
               </div>
-              <div class="line-b">
+              <div class="content-item">
                 <div class="bg-circle"><i class="icon-download"></i>
                 </div>
                 <span class="text-gray">Backups managed by the server</span>
               </div>
-              <div class="">
+              <div class="content-item">
                 <div class="bg-circle"><i class="icon-email"></i>
                 </div>
                 <span class="text-gray">Email address confirmation needed</span>
               </div>
             </div>
-            <button translate class="button primary radius expand m0" ng-click="setStorage(useLocalstorage)">
-              Create in the cloud
-            </button>
           </tab>
-          <tab heading="In this device" style="width: 50%;" ng-click="useLocalstorage=true">
+          
+          <tab style="width: 50%;" ng-click="useLocalstorage=true">
+            <tab-heading>
+              <div class="m5t text-bold">In this Device </div>
+            </tab-heading>
             <div ng-if="useLocalstorage">
-             <div class="line-b">
+              <div class="content-item">
                 <div class="bg-circle"><i class="icon-download"></i>
                 </div>
                 <span class="text-gray">Your private keys never leave this device</span>
               </div>
-              <div class="">
+              <div class="content-item">
                 <div class="bg-circle"><i class="icon-email"></i>
                 </div>
                 <span class="text-gray">No email required</span>
               </div>
-              <div class="line-b">
+              <div class="content-item">
                 <div class="bg-circle"><i class="icon-wallet"></i>
                 </div>
                 <span class="text-gray">Need to be careful with backups</span>
               </div>
             </div>
-            <button translate class="button primary radius expand m0" ng-click="setStorage(useLocalstorage)">
-              Create in this device
-            </button>
           </tab>
         </tabset>
 
+        <button ng-show="!useLocalstorage" translate class="button primary radius expand m0" ng-click="setStorage(useLocalstorage)">
+          Create in the cloud
+        </button>
+
+        <button ng-show="useLocalstorage" translate class="button primary radius expand m0" ng-click="setStorage(useLocalstorage)">
+          Create in this device
+        </button>
+
+
+        
+
         <div class="box-setup-footer">
           <div class="left">
             <a class="text-gray" href="#!/">