diff --git a/css/src/main.css b/css/src/main.css
index 9b4e3a04a..476f9bd0b 100644
--- a/css/src/main.css
+++ b/css/src/main.css
@@ -1294,9 +1294,9 @@ a:hover .photo-container  {
 
 .input i {
   position: absolute;
-  top: 22%;
+  top: 25%;
   left: 10px;
-  font-size: 22px;
+  font-size: 18px;
   color: #CAD2DB;
   border-right: 1px solid #ccc;
   padding-right: 8px;
diff --git a/views/createProfile.html b/views/createProfile.html
index 776deab6b..bddc3738c 100644
--- a/views/createProfile.html
+++ b/views/createProfile.html
@@ -29,7 +29,7 @@
       </div>
       <form name="profileForm" ng-submit="createProfile(profileForm)" novalidate>
         <div class="row collapse">
-          <div class="small-12 columns">
+          <div class="row">
             <label class="left" for="insightLivenet">Email</label>
             <span translate class="has-error right size-12" ng-show="profileForm.email.$invalid &&
               !profileForm.email.$pristine || error">
@@ -38,17 +38,23 @@
             </span>
             <span class="icon-input right" ng-show="!profileForm.email.$invalid &&
               !profileForm.email.$pristine || error"><i class="fi-check"></i></span>
+          </div>
+          <div class="input pr">
             <input type="email" ng-model="email" class="form-control fi-email"
             name="email" placeholder="Email" required auto-focus>
+            <i class="fi-mail"></i>
           </div>
- 
         </div>
-        <label class="left" for="insightLivenet">Password</label>
-        <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">
+          <label for="insightLivenet">Password</label>
+          <div class="input pr">
+            <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: <b>{{passwordStrength}}</b><br/><span class='size-12'>Tip: Use lower and uppercase, numbers and symbols</span>" tooltip-trigger="focus" required tooltip-placement="right">
+            <i class="fi-lock"></i>
+          </div>
+
+        <div class="row">
           <label class="left" for="insightLivenet">Confirm Password</label>
           <span translate class="has-error right size-12" ng-show="profileForm.repeatpassword.$dirty &&
             profileForm.repeatpassword.$invalid">
@@ -56,12 +62,16 @@
             {{'Passwords must match'|translate}}
           </span>
           <span class="icon-input right" ng-show="profileForm.repeatpassword.$dirty &&
-            !profileForm.repeatpassword.$invalid"><i class="fi-check"></i></span>
-          <input type="password" ng-model="repeatpassword"
-          class="columns form-control" name="repeatpassword" 
-          placeholder="{{'Repeat password'|translate}}"
-          match="password" required >  
+            !profileForm.repeatpassword.$invalid"><i class="fi-check"></i></span>  
         </div>
+        <div class="input pr">
+          <input type="password" ng-model="repeatpassword"
+          class="form-control" name="repeatpassword" 
+          placeholder="{{'Repeat password'|translate}}"
+          match="password" required>
+          <i class="fi-lock"></i>
+        </div>
+
         <button translate type="submit" class="button primary radius expand m0"
           ng-disabled="profileForm.$invalid || loading">
           Create