diff --git a/css/src/main.css b/css/src/main.css
index c1f1c83ab..91c84b376 100644
--- a/css/src/main.css
+++ b/css/src/main.css
@@ -352,7 +352,7 @@ a:hover {
 
 .main {
   margin-left: 250px;
-  padding: 85px 1.5rem;
+  padding: 95px 1.5rem;
   background-color: #F8F8FB;
 }
 
@@ -538,7 +538,7 @@ a.button-setup.add-wallet:hover {
 
 a.button-setup {
   border-radius: 3px;
-  border: 1px solid #B7C2CE;
+  border: 1px solid #3E5366;
   display: block;
   padding: 0.5rem;
   background: transparent;
@@ -1093,6 +1093,8 @@ button[disabled].warning:focus,
 .button[disabled].warning:focus {
   background-color: #95a5a6;
   color: #E6E6E6;
+  -moz-box-shadow:    none;
+  box-shadow:         none;
 }
 
 /* WHITE */
@@ -1384,9 +1386,10 @@ a:hover .photo-container  {
 }
 
 .icon-input .fi-check {
-  padding: .1rem .3rem;
+  padding: .2rem .3rem;
   background-color: #1ABC9C;
   border-radius: 100%;
+  display: block;
 }
 
 .icon-input .fi-x {
@@ -1688,7 +1691,7 @@ a.text-warning:hover {color: #FD7262;}
   margin-right: 14px;
   border: none;
   box-shadow: none;
-  top: 2px;
+  top: 0;
 }
 
 .createProfile .input, 
diff --git a/views/createProfile.html b/views/createProfile.html
index 1d79d6622..6cca20c91 100644
--- a/views/createProfile.html
+++ b/views/createProfile.html
@@ -20,7 +20,7 @@
     </div>
   </div>
 
-  <div class="large-5 large-centered medium-6 medium-centered columns m20b" ng-show="!loading  && !askForPin">
+  <div class="large-4 large-centered medium-7 medium-centered columns m20b" ng-show="!loading  && !askForPin">
     <div class="logo-setup hide-for-small-only">
       <img src="img/logo-negative-beta.svg" alt="Copay" width="100">
     </div>
@@ -131,17 +131,15 @@
         <div class="input" ng-if="useEmail">
           <input type="email" ng-model="email" class="form-control fi-email" name="email" placeholder="Email" required auto-focus="!isMobile">
           <i class="icon-email"></i>
-          <div class="icon-input m5b text-right" ng-if="useEmail">
+          <div class="icon-input" ng-if="useEmail">
             <span translate class="has-error size-12" ng-show="emailForm.email.$invalid &&
             !emailForm.email.$pristine">
-            <div class="">
               <i class="fi-x"></i>
               Not valid
-            </div>
             </span>
-            <div class="" ng-show="!emailForm.email.$invalid &&
+            <span ng-show="!emailForm.email.$invalid &&
             !emailForm.email.$pristine"><i class="fi-check"></i>
-            </div>
+            </span>
           </div>
         </div>
 
@@ -173,17 +171,15 @@
         <div class="input">
           <input type="password" ng-model="repeatpassword" class="input form-control" name="repeatpassword" placeholder="{{'Repeat password'|translate}}" match="password" required>
           <i class="icon-locked"></i>
-          <div class="icon-input m5b text-right">
+          <div class="icon-input">
             <span translate class="has-error size-12" ng-show="passForm.repeatpassword.$dirty &&
             passForm.repeatpassword.$invalid">
-              <div>
-                <i class="fi-x"></i>
-                {{'Passwords must match'|translate}}
-              </div>
+              <i class="fi-x"></i>
+              {{'Passwords must match'|translate}}
             </span>
-            <div class="" ng-show="passForm.repeatpassword.$dirty &&
+            <span ng-show="passForm.repeatpassword.$dirty &&
             !passForm.repeatpassword.$invalid"><i class="fi-check"></i>
-            </div>
+            </span>
           </div>
         </div>
 
diff --git a/views/history.html b/views/history.html
index cbac42e8a..5ef7cb102 100644
--- a/views/history.html
+++ b/views/history.html
@@ -60,7 +60,6 @@
     </div>
   </div>
   <div ng-show="blockchain_txs[0].txid">
-    <div class="line-white"></div>
     <div class="row">
       <div class="large-9 columns">
         <pagination page="currentPage" total-items="totalItems" items-per-page="itemsPerPage" on-select-page="selectPage(page)" max-size="10" />
diff --git a/views/home.html b/views/home.html
index ceb1f7bcc..e6d096795 100644
--- a/views/home.html
+++ b/views/home.html
@@ -20,7 +20,7 @@
     </div>
   </div>
 
-  <div class="large-5 large-centered medium-7 medium-centered columns" ng-show="!$root.starting">
+  <div class="large-4 large-centered medium-6 medium-centered columns" ng-show="!$root.starting">
     <div class="logo-setup" ng-show="!$root.iden">
       <img src="img/logo-negative-beta.svg" alt="Copay" width="100">
       <div ng-include="'views/includes/version.html'"></div>