diff --git a/views/create.html b/views/create.html
index 8eb69a1bf..b7ff312ff 100644
--- a/views/create.html
+++ b/views/create.html
@@ -21,7 +21,10 @@
         <div class="large-12 columns">
           <div class="panel">
             <label><span translate>Wallet name</span>
-              <input type="text" placeholder="{{'Family vacation funds'|translate}}" class="form-control" ng-model="walletName" auto-focus>
+              <div class="input">
+                <input type="text" placeholder="{{'Family vacation funds'|translate}}" class="form-control" ng-model="walletName" auto-focus>
+                <i class="icon-wallet"></i>
+              </div>
             </label>
             <div class="row">
               <div class="large-6 medium-6 columns">
diff --git a/views/import.html b/views/import.html
index c03d31f67..d5ac13454 100644
--- a/views/import.html
+++ b/views/import.html
@@ -52,7 +52,10 @@
 
             <label for="password"><span translate>Password</span>  <small translate>Required</small>
             </label>
-            <input type="password" class="form-control" placeholder="{{'Your wallet password'|translate}}" name="password" ng-model="password" required>
+            <div class="input">
+              <input type="password" class="form-control" placeholder="{{'Your wallet password'|translate}}" name="password" ng-model="password" required>
+              <i class="fi-lock"></i>
+            </div>
 
             <div class="line-dashed-h m10b m20t"></div>
 
diff --git a/views/join.html b/views/join.html
index b7bd203e6..cbd22bce7 100644
--- a/views/join.html
+++ b/views/join.html
@@ -33,10 +33,11 @@
               </span>
               <small class="icon-input right" ng-show="joinForm.connectionId.$valid
                     && !joinForm.connectionId.$pristine"><i class="fi-check"></i></small>
+            </div>
 
-
-              <div class="pr">
-                <input id="connectionId" type="text" class="columns" placeholder="{{'Paste wallet secret here'|translate}}" name="connectionId" ng-model="connectionId" wallet-secret required>
+              <div class="input">
+                <input id="connectionId" type="text" placeholder="{{'Paste wallet secret here'|translate}}" name="connectionId" ng-model="connectionId" wallet-secret required>
+                <i class="icon-wallet"></i>
                 <div ng-hide="showScanner || disableScanner">
                   <a class="postfix button black" ng-click="openScanner()"><i class="fi-camera">&nbsp;</i></a>
                 </div>
@@ -48,9 +49,8 @@
               <div id="scanner" 
                 class="row" 
                 ng-if="showScanner"
-                ng-include="'views/includes/scanner.html'"></div>
-              
-            </div>
+                ng-include="'views/includes/scanner.html'">
+              </div>
 
             <div class="line-dashed-h"></div>