diff --git a/css/src/main.css b/css/src/main.css
index 8a9430261..1d3bd7b73 100644
--- a/css/src/main.css
+++ b/css/src/main.css
@@ -175,18 +175,33 @@ a:hover {
 }
 
 .home input,
-.createProfile input,
+.box-setup input,
 .open input, 
 .join input, 
 .setup input,
 .import input,
 .import textarea, 
 .settings input {
-  background: #2C3E50 !important;
-  -moz-box-shadow:    inset 0px 0px 3px 0px rgba(0,0,0,0.10) !important;
-  box-shadow:         inset 0px 0px 3px 0px rgba(0,0,0,0.10) !important;
-  border: 0 !important;
-  color: #fff !important;
+  border-radius: 2px;
+  background: #EDEDED;
+  -moz-box-shadow:    0px 0px 0px 0px rgba(255,255,255,0.09), inset 1px 1px 0px 0px rgba(0,0,0,0.05);
+  box-shadow:         0px 0px 0px 0px rgba(255,255,255,0.09), inset 1px 1px 0px 0px rgba(0,0,0,0.05);
+  color: #2C3E42 !important;
+  padding: 1.2rem 0.7rem;
+  margin-bottom: 1.5rem;
+  border: 0;
+}
+
+.box-setup ::-webkit-input-placeholder {
+  color: #B7C2CD;
+}
+
+.box-setup :-ms-input-placeholder {
+  color: green !important;
+}
+
+.box-setup :-moz-placeholder {
+  color: red !important;
 }
 
 .home select,
@@ -248,7 +263,7 @@ a:hover {
 }
 
 .home, .createProfile, .settings {
-  margin-top: 15%;
+  margin-top: 8%;
   color: #fff;
 }
 
@@ -272,7 +287,7 @@ a:hover {
 
 .logo-setup {
   text-align: center;
-  margin-top: 9%;
+  margin-bottom: 2rem;
 }
 
 .setup .logo-setup, .join .logo-setup {
@@ -280,8 +295,21 @@ a:hover {
 }
 
 .box-setup {
-  padding: 20px 30px;
-  background: #34495E;
+  margin: 0 auto;
+  width: 310px;
+  padding: 1.3rem; 
+  border-radius: 2px;
+  background: #FFFFFF;
+  -moz-box-shadow:    1px 1px 0px 0px #213140;
+  box-shadow:         1px 1px 0px 0px #213140;
+}
+
+.box-setup-footer {
+  overflow: hidden;
+  margin-top: 2rem;
+  padding: 1rem 0 0;
+  border-top: 1px solid #E5E7EA;
+  font-size: 12px;
 }
 
 .box-setup label small.has-error {
@@ -393,23 +421,18 @@ table.last-transactions-content {
   margin-bottom: 10px;  
 }
 
-.button-setup a {
+a.button-setup {
+  border-radius: 3px;
+  border: 1px solid #B7C2CE;
   display: block;
-  padding: 20px 30px;
-  background: #34495E;
-  margin-bottom: 20px;
-  font-weight: 100;
-  font-size: 24px;
+  padding: 0.5rem;
+  background: transparent;
 }
 
 .button-setup a:hover {
   background: #3C4E60;
 }
 
-.footer-setup {
-  overflow: hidden;
-}
-
 .dn {display: none;}
 .pr {position: relative;}
 .pa {position: absolute;}
@@ -697,6 +720,10 @@ input[type=number]::-webkit-outer-spin-button {
   color: #1ABC9C;
 }
 
+.bg-success { 
+  background-color: #1ABC9C;
+}
+
 .label.success { 
   background-color: #1ABC9C;
 }
@@ -707,6 +734,10 @@ input[type=number]::-webkit-outer-spin-button {
   font-weight: 700;
 }
 
+.bg-alert {
+  background-color: #C0392A;
+}
+
 .dr-notification-text {
   font-size: 12px;
   line-height: 120%;
@@ -764,8 +795,8 @@ ul.pagination li.current a:hover, ul.pagination li.current a:focus {
 }
 
 button.radius, .button.radius {
-  -webkit-border-radius: 5px;
-  border-radius: 5px;
+  -webkit-border-radius: 3px;
+  border-radius: 3px;
 }
 
 /* SECONDARY */
@@ -810,7 +841,10 @@ button.primary,
 .button.primary { 
   background-color: #1ABC9C;
   color: #fff;
-  border-radius: 0;
+  border-radius: 2px;
+  border-radius: 2px;
+  -moz-box-shadow:    1px 1px 0px 0px #16A085;
+  box-shadow:         1px 1px 0px 0px #16A085;
 }
 button.primary:hover, 
 button.primary:focus, 
@@ -831,6 +865,8 @@ button[disabled].primary:focus,
 .button.disabled.primary:focus, 
 .button[disabled].primary:hover, 
 .button[disabled].primary:focus {
+  -moz-box-shadow:    1px 1px 0px 0px #687D80;
+  box-shadow:         1px 1px 0px 0px #687D80;
   background-color: #95a5a6;
   color: #E6E6E6;
 }
@@ -939,6 +975,11 @@ button.gray:focus,
   color: #2C3E50;
 }
 
+.button, button {
+  color: #FFFFFF;
+  text-transform: uppercase;
+}
+
 .side-nav {padding: 0;}
 
 .side-nav li {
@@ -1082,7 +1123,6 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
 .text-white {color: #fff;}
 .text-warning {color: #CA5649;}
 
-.footer-setup a.text-gray:hover {color: #fff;}
 a.text-gray:hover {color: #2C3E50;}
 a.text-black:hover {color: #213140;}
 a.text-primary:hover {color: #50E3C2;}
@@ -1120,6 +1160,18 @@ a.text-warning:hover {color: #FD7262;}
   color: #fff;
 }
 
+.box-setup h1 {
+  font-weight: 100;
+  font-size: 16px;
+  color: #2C3E50;
+  text-transform: uppercase;
+  text-align: center;
+}
+
+.box-setup form {
+  margin: 0;
+}
+
 .joyride-tip-guide {
   width: 150px;
   background: #213140;
diff --git a/css/src/mobile.css b/css/src/mobile.css
index b36b42fbe..2e639bf2a 100644
--- a/css/src/mobile.css
+++ b/css/src/mobile.css
@@ -180,7 +180,7 @@
   }
 
   .box-setup {
-    margin-bottom: 50px;
+    width: 100%;
   }
 
   .footer-setup {
diff --git a/views/createProfile.html b/views/createProfile.html
index 3da07d81a..c3116642b 100644
--- a/views/createProfile.html
+++ b/views/createProfile.html
@@ -1,70 +1,74 @@
 <div class="createProfile" ng-controller="CreateProfileController">
-  <div class="m30a" style="width:50%" ng-show="anyWallet && !anyProfile">
-      <div class="left">
-      <i class="size-36 fi-alert"></i>
-      </div>
-      <div>
-      Copay now needs a profile to access wallets. <br>
-      You can import current your wallets after creating your profile.
-      </div>
-  </div>
- 
-
   <div data-alert class="loading-screen" ng-show="retreiving">
     <i class="size-60 fi-bitcoin-circle icon-rotate spinner"></i>
     Retreiving information from storage...
   </div>
-  <div class="row" ng-show="!loading && !retreiving">
-    <div class="large-4 columns logo-setup">
+
+  <div class="large-12 medium-6 medium-centered columns" ng-show="!loading && !retreiving">
+    <div class="logo-setup">
       <img src="img/logo-negative-beta.svg" alt="Copay" width="146" height="59">
       <div ng-include="'views/includes/version.html'"></div>
     </div>
-    <div class="large-8 columns line-dashed-setup-v">
-      <div class="box-setup">
-        <h1 class="text-white line-sidebar-b" translate >Create Profile</h1>
-        <form name="profileForm" ng-submit="createProfile(profileForm)" novalidate>
-          <div class="row collapse">
-            <div class="small-12 columns">
-              <input type="email" ng-model="email" class="form-control"
-              name="email" placeholder="Email" required>
-              <small class="icon-input" ng-show="!profileForm.email.$invalid &&
-                !profileForm.email.$pristine"><i class="fi-check"></i></small>
-              <small class="icon-input" ng-show="profileForm.email.$invalid &&
-                !profileForm.email.$pristine"><i class="fi-x"></i></small>
-            </div>
+    <div class="p10 box-setup bg-success m10b" ng-show="anyWallet && !anyProfile">
+      <div class="left">
+      <i class="size-36 fi-alert m10r"></i>
+      </div>
+      <div class="size-12">
+        <b>Copay now needs a profile to access wallets. </b>
+        You can import your current wallets after creating your frofile
+      </div>
+    </div>
+    <div class="box-setup">
+      <h1 class="m20b" translate >Create Profile</h1>
+      <form name="profileForm" ng-submit="createProfile(profileForm)" novalidate>
+        <div class="row collapse">
+          <div class="small-12 columns">
+            <input type="email" ng-model="email" class="form-control fi-email"
+            name="email" placeholder="Email" required>
+            <small class="icon-input" ng-show="!profileForm.email.$invalid &&
+              !profileForm.email.$pristine"><i class="fi-check"></i></small>
+            <small class="icon-input" ng-show="profileForm.email.$invalid &&
+              !profileForm.email.$pristine"><i class="fi-x"></i></small>
           </div>
-          <input id="password" type="password" ng-model="$parent.password"
-          class="form-control" name="password" placeholder="{{'Choose a password'|translate}}" check-strength="passwordStrength" 
-          tooltip-html-unsafe="Password strength: <i>{{passwordStrength}}</i><br/><span class='size-12'>Tip: Use lower and uppercase, numbers and symbols</span>" tooltip-trigger="focus" required tooltip-placement="top">
+        </div>
+        <input id="password" type="password" ng-model="$parent.password"
+        class="form-control" name="password" placeholder="{{'Choose a password'|translate}}" check-strength="passwordStrength" 
+        tooltip-html-unsafe="Password strength: <i>{{passwordStrength}}</i><br/><span class='size-12'>Tip: Use lower and uppercase, numbers and symbols</span>" tooltip-trigger="focus" required tooltip-placement="right">
 
-          <div class="pr">
-            <input type="password" ng-model="repeatpassword"
-            class="form-control" name="repeatpassword" 
-            placeholder="{{'Repeat password'|translate}}"
-            match="password" required >
-            <small class="icon-input"
-              ng-show="profileForm.repeatpassword.$dirty &&
-              !profileForm.repeatpassword.$invalid"><i class="fi-check"></i></small>
-            <small class="icon-input"
-              ng-show="profileForm.repeatpassword.$dirty &&
-              profileForm.repeatpassword.$invalid"><i class="fi-x"></i></small>
-            <p class="m15b text-gray size-12"
+        <div class="pr">
+          <input type="password" ng-model="repeatpassword"
+          class="form-control" name="repeatpassword" 
+          placeholder="{{'Repeat password'|translate}}"
+          match="password" required >
+          <small class="icon-input"
             ng-show="profileForm.repeatpassword.$dirty &&
-            profileForm.repeatpassword.$invalid">
-            <i class="fi-x m5r"></i>
-            {{'Passwords must match'|translate}}
-            </p>
-          </div>
-
-
-          <div class="text-right">
-            <a href="#!/" class="back-button text-white m20r">&laquo; <span translate>Back</span></a>
-            <button translate type="submit" class="button primary m0"
-              ng-disabled="profileForm.$invalid || loading">
-             Create 
-            </button>
-          </div>
-        </form>
+            !profileForm.repeatpassword.$invalid"><i class="fi-check"></i></small>
+          <small class="icon-input"
+            ng-show="profileForm.repeatpassword.$dirty &&
+            profileForm.repeatpassword.$invalid"><i class="fi-x"></i></small>
+          <p class="m15b text-gray size-12"
+          ng-show="profileForm.repeatpassword.$dirty &&
+          profileForm.repeatpassword.$invalid">
+          <i class="fi-x m5r"></i>
+          {{'Passwords must match'|translate}}
+          </p>
+        </div>
+        <div class="text-right">
+          <button translate type="submit" class="button primary radius expand m0"
+            ng-disabled="profileForm.$invalid || loading">
+           Create 
+          </button>
+        </div>
+      </form>
+      <div class="box-setup-footer">
+        <div class="left">
+          <a translate class="text-gray" href="#"><i class="m5r
+              size-14 fi-arrow-left"></i>Back to Copay.io</a>
+        </div>
+        <div class="right">
+          <a class="right size-12 text-gray" href="#!/settings"><i class="m5r
+              size-14 fi-wrench"></i><span translate>Settings</span></a>
+        </div>
       </div>
     </div>
   </div>
diff --git a/views/home.html b/views/home.html
index 80400d903..eb8bb7812 100644
--- a/views/home.html
+++ b/views/home.html
@@ -4,35 +4,35 @@
     <i class="size-60 fi-bitcoin-circle icon-rotate spinner"></i>
     Retreiving information from storage...
   </div>
-  <div class="row" ng-show="!loading && !retreiving">
-    <div class="large-4 columns logo-setup">
+  <div class="large-12 medium-6 medium-centered columns" ng-show="!loading && !retreiving">
+    <div class="logo-setup">
       <img src="img/logo-negative-beta.svg" alt="Copay" width="146" height="59">
       <div ng-include="'views/includes/version.html'"></div>
     </div>
-    <div class="large-8 columns line-dashed-setup-v">
-      <div class="box-setup">
-        <h1 class="text-white line-sidebar-b" translate >Login </h1>
-        <form name="loginForm" ng-submit="openProfile(loginForm)" novalidate>
-          <input type="email" ng-model="email" class="form-control"
-            name="email" placeholder="Email" required>
-          <input type="password" ng-model="password" class="form-control"
-            name="password" placeholder="Password" required>
-            
-          <div class="text-right">
-            <button translate type="submit" class="button primary m0"
-              ng-disabled="loginForm.$invalid || loading">
-              Login 
-            </button>
-          </div>
-        </form>
-      </div>
-
-      <div class="button-setup">
-        <a translate class="text-secondary" href="#!/createProfile">Create a profile</a>
-      </div>
-      <div class="footer-setup">
-        <a class="right size-12 text-gray" href="#!/settings"><i class="m10r
-            size-14 fi-wrench"></i><span translate>Settings</span></a>
+    <div class="box-setup">
+      <h1 translate >Sign in to <b> Copay </b></h1>
+      <form name="loginForm" ng-submit="openProfile(loginForm)" novalidate>
+        <input type="email" ng-model="email" class="form-control"
+          name="email" placeholder="Email" required>
+        <input type="password" ng-model="password" class="form-control"
+          name="password" placeholder="Password" required>
+          
+        <div class="text-right">
+          <button translate type="submit" class="button primary radius expand m0"
+            ng-disabled="loginForm.$invalid || loading">
+            Sign in 
+          </button>
+        </div>
+      </form>
+      <div class="box-setup-footer">
+        <div class="left">
+          <a translate class="button-setup text-gray" href="#!/createProfile"><i class="m5r
+              size-14 fi-torso"></i>Create a profile</a>
+        </div>
+        <div class="right m5t">
+          <a class="right size-12 text-gray" href="#!/settings"><i class="m5r
+              size-14 fi-wrench"></i><span translate>Settings</span></a>
+        </div>
       </div>
     </div>
   </div>