diff --git a/public/templates/bootstrap/register/default.tpl b/public/templates/bootstrap/register/default.tpl
index fe8df99d..b8b6f225 100644
--- a/public/templates/bootstrap/register/default.tpl
+++ b/public/templates/bootstrap/register/default.tpl
@@ -16,27 +16,35 @@
         <i class="fa fa-edit fa-fw"></i> Register new account
       </div>
       <div class="panel-body">
-        <div class="form-group">
-          <label>Username</label>
-          <input type="text" class="form-control" name="username" value="{$smarty.post.username|escape|default:""}" size="15" maxlength="20" required>
+        <label>Username</label>
+        <div class="input-group margin-bottom-sm">
+          <span class="input-group-addon"><i class="fa fa-user fa-fw"></i></span>
+          <input type="text" class="form-control" name="username" placeholder="Usermane" value="{$smarty.post.username|escape|default:""}" size="15" maxlength="20" required>
         </div>
-        <div class="form-group">
-          <label>Password</label>
-          <span style="padding-right:10px;display:block;margin-top:1px;float:right;color:#999;" id="pw_strength">Strength</span>
-          <input type="password" class="form-control" name="password1" value="" size="15" maxlength="100" id="pw_field" required>
-          <label>Repeat Password</label>
-          <span style="padding-right:10px;display:block;margin-top:1px;float:right;" id="pw_match"></span>
-          <input type="password" class="form-control" name="password2" value="" size="15" maxlength="100" id="pw_field2" required>
+        <label>Password</label> (<span id="pw_strength">Strength</span>)
+        <div class="input-group">
+          <span class="input-group-addon"><i class="fa fa-key fa-fw"></i></span>
+          <input type="password" class="form-control" name="password1" placeholder="Password" value="" size="15" maxlength="100" id="pw_field" required>
         </div>
-        <div class="form-group">
-          <label>Email</label>
-          <input type="text" name="email1" class="form-control" value="{$smarty.post.email1|escape|default:""}" size="15" required>
-          <label>Email Repeat</label>
-          <input type="text" class="form-control" name="email2" value="{$smarty.post.email2|escape|default:""}" size="15" required>
+        <span id="pw_match"></span>
+        <div class="input-group margin-bottom-sm">
+          <span class="input-group-addon" id="pw_match"><i class="fa fa-key fa-fw"></i></span>
+          <input type="password" class="form-control" name="password2" placeholder="Repeat Password" value="" size="15" maxlength="100" id="pw_field2" required>
         </div>
-        <div class="form-group">
-          <label>PIN</label>
-          <input type="password" class="form-control" name="pin" value="" size="4" maxlength="4"><font size="1">Four digit number. <b>Remember this pin!</b></font>
+        <label>Email</label>
+        <div class="input-group">
+          <span class="input-group-addon"><i class="fa fa-envelope-o fa-fw"></i></span>
+          <input type="text" name="email1" placeholder="Email" class="form-control" value="{$smarty.post.email1|escape|default:""}" size="15" required>
+        </div>
+        <div class="input-group margin-bottom-sm">
+          <span class="input-group-addon"><i class="fa fa-envelope-o fa-fw"></i></span>
+          <input type="text" class="form-control" name="email2" placeholder="Repeat Email" value="{$smarty.post.email2|escape|default:""}" size="15" required>
+        </div>
+        <label>PIN</label>
+        <font size="1">Four digit number. <b>Remember this pin!</b></font>
+        <div class="input-group">
+          <span class="input-group-addon"><i class="fa fa-shield fa-fw"></i></span>
+          <input type="password" class="form-control" name="pin" placeholder="PIN" value="" size="4" maxlength="4" required>   
         </div>
         <div class="form-group">
           <div class="checkbox">