diff --git a/css/src/main.css b/css/src/main.css
index e83fc982d..1d9e00e52 100644
--- a/css/src/main.css
+++ b/css/src/main.css
@@ -367,12 +367,10 @@ a:hover {
 }
 
 .box-setup {
-  margin-bottom: 7rem;
-  padding: 1.3rem; 
-  border-radius: 2px;
-  background: #FFFFFF;
-  -moz-box-shadow: 1px 1px 0px 0px #213140;
-  box-shadow: 1px 1px 0px 0px #213140;
+  margin-bottom: 1rem;
+  padding: 0.3rem; 
+  border-radius: 3px;
+  background: #fff;
 }
 
 .box-setup-footer {
@@ -1644,6 +1642,20 @@ a.text-warning:hover {color: #FD7262;}
 
 /*/////////////////////////////////////////////////*/
 
+.bg-circle {
+  background: #253547;
+  border-radius: 100%;
+  margin: .5rem 1rem 0.5rem 0;
+  padding: 0.75rem;
+  display: inline-block;
+  text-align: center;
+  vertical-align: middle;
+  color: #7A8C9E;
+  font-size: 30px;
+  width: 60px;
+  height: 60px;
+}
+
 .session-expired {
   background: rgba(32,48,64,0.90);
   width: 100%;
diff --git a/views/createProfile.html b/views/createProfile.html
index 7d04e7bdd..24bd03951 100644
--- a/views/createProfile.html
+++ b/views/createProfile.html
@@ -26,7 +26,6 @@
       <div ng-include="'views/includes/version.html'"></div>
     </div>
     <div class="box-setup">
-      <h1>Create Profile</h1>
       <div class="box-notification" ng-show="error">
         <div class="box-icon error">
           <i class="fi-x size-24"></i>
@@ -35,7 +34,46 @@
           {{error|translate}}
         </span>
       </div>
-      <form name="profileForm" ng-submit="createProfile(profileForm)" novalidate>
+
+
+      <form ng-show="0" name="profileForm" ng-submit="createProfile(profileForm)" novalidate>
+          <tabset>
+            <tab heading="In the cloud" style="width: 50%;">
+              <div class="line-b">
+                <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="bg-circle"><i class="icon-download"></i></div>
+                <span class="text-gray">Backups managed by the server</span>
+              </div>
+              <div class="">
+                <div class="bg-circle"><i class="icon-email"></i></div>
+                <span class="text-gray">Email address confirmation needed</span>
+              </div>
+            </tab>
+            <tab heading="In your device" style="width: 50%;">
+              <div class="line-b">
+                <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="bg-circle"><i class="icon-download"></i></div>
+                <span class="text-gray">Backups managed by the server</span>
+              </div>
+              <div class="">
+                <div class="bg-circle"><i class="icon-email"></i></div>
+                <span class="text-gray">Email address confirmation needed</span>
+              </div>
+            </tab>
+          </tabset>
+        <button translate type="submit" class="button primary radius expand m0" ng-disabled="profileForm.$invalid || loading">
+          Create
+        </button>
+      </form>
+
+      <form ng-show="0" name="profileForm" ng-submit="createProfile(profileForm)" novalidate>
+        <div class="box-setup">
         <div class="m5b text-right">
           <span translate class="has-error size-12" ng-show="profileForm.email.$invalid &&
             !profileForm.email.$pristine">
@@ -45,12 +83,20 @@
           <span class="icon-input" ng-show="!profileForm.email.$invalid &&
             !profileForm.email.$pristine"><i class="fi-check"></i></span>
         </div>
+        
         <div class="input">
           <input type="email" ng-model="email" class="form-control fi-email" name="email" placeholder="Email"
           show-focus="!isMobile" required>
           <i class="icon-email"></i>
         </div>
+        </div>
 
+        <button translate type="submit" class="button primary radius expand m0" ng-disabled="profileForm.$invalid || loading">
+          Create
+        </button>
+      </form>
+
+      <form ng-show="1" name="profileForm" ng-submit="createProfile(profileForm)" novalidate>
         <div class="input">
           <input id="password" type="password" ng-model="$parent.password" 
           class="form-control" name="password" placeholder="{{'Choose a password'|translate}}" check-strength="passwordStrength" 
@@ -77,6 +123,8 @@
           Create
         </button>
       </form>
+
+
       <div class="box-setup-footer">
         <div class="left">
           <a class="text-gray" href="#!/">