diff --git a/templates/default/account-password.html b/templates/default/account-password.html
index 2852113ac..1e67d4520 100644
--- a/templates/default/account-password.html
+++ b/templates/default/account-password.html
@@ -41,12 +41,14 @@
 
                     <div class="panel-body">
                         {form_field form=$form field="password_old"}
-                        <div class="form-group group-password_old {if $error}has-error{elseif $isPost && $value != "" && !$error}has-success{/if}">
+                        <div class="form-group group-password_old{if $error} has-error{/if}">
                             <label class="control-label" for="{$label_attr.for}">{$label}{if $required} <span class="required">*</span>{/if}</label>
                             <div class="control-input">
-                                <input type="password" name="{$name}" id="{$label_attr.for}" class="form-control" value="{$value}" {if $required} aria-required="true" required{/if}{if $error} autofocus{/if}>
-                                {if $error }
-                                    <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                <input type="password" name="{$name}" id="{$label_attr.for}" class="form-control" maxlength="255" value="{$value}" {if $required} aria-required="true" required{/if}{if !$value || $error} autofocus{/if}>
+                                {if $error}
+                                    <span class="help-block">{$message}</span>
+                                    {assign var="error_focus" value="true"}
+                                {elseif !$value}
                                     {assign var="error_focus" value="true"}
                                 {/if}
                             </div>
@@ -54,25 +56,24 @@
                         {/form_field}
 
                         {form_field form=$form field="password"}
-                        <div class="form-group group-password {if $error}has-error{elseif $isPost && $value != "" && !$error}has-success{/if}">
+                        <div class="form-group group-password{if $error} has-error{/if}">
                             <label class="control-label" for="{$label_attr.for}">{$label}{if $required} <span class="required">*</span>{/if}</label>
                             <div class="control-input">
-                                <input type="password" name="{$name}" id="{$label_attr.for}" class="form-control" value="{$value}" {if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
+                                <input type="password" name="{$name}" id="{$label_attr.for}" class="form-control" maxlength="255" value="{$value}" {if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                                 {if $error }
-                                    <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                    <span class="help-block">{$message}</span>
                                     {assign var="error_focus" value="true"}
                                 {/if}
                             </div>
                         </div><!--/.form-group-->
                         {/form_field}
                         {form_field form=$form field="password_confirm"}
-                        <div class="form-group group-password_confirm {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
+                        <div class="form-group group-password_confirm{if $error} has-error{/if}">
                             <label class="control-label" for="{$label_attr.for}">{$label}{if $required} <span class="required">*</span>{/if}</label>
                             <div class="control-input">
-                                <input type="password" name="{$name}" id="{$label_attr.for}" class="form-control" autocomplete="off"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
+                                <input type="password" name="{$name}" id="{$label_attr.for}" class="form-control" maxlength="255" autocomplete="off"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                                 {if $error }
-                                    <span class="help-block"><i class="icon-remove"></i> {$message}</span>
-                                    {assign var="error_focus" value="true"}
+                                    <span class="help-block">{$message}</span>
                                 {/if}
                             </div>
                         </div><!--/.form-group-->
diff --git a/templates/default/account-update.html b/templates/default/account-update.html
index 1cdb1c4cd..d7b38e773 100644
--- a/templates/default/account-update.html
+++ b/templates/default/account-update.html
@@ -24,7 +24,6 @@
             <h1 id="main-label" class="page-header">{intl l="Update Profile"}</h1>
 
             {form name="thelia.front.customer.profile.update"}
-                {assign var="isPost" value="{$smarty.post|count}"}
             <form id="form-register" class="form-horizontal" action="{url path="/account/update"}" method="post" role="form">
                 {form_field form=$form field='success_url'}
                     <input type="hidden" name="{$name}" value="{url path="/account"}" />
@@ -41,7 +40,7 @@
 
                     <div class="panel-body">
                         {form_field form=$form field="title"}
-                            <div class="form-group group-title {if $error}has-error{elseif $isPost && $value != "" && !$error}has-success{/if}">
+                            <div class="form-group group-title{if $error} has-error{/if}">
                                 <label class="control-label" for="{$label_attr.for}">{$label}{if $required} <span class="required">*</span>{/if}</label>
                                 <div class="control-input">
                                     <select name="{$name}" id="{$label_attr.for}" class="form-control"{if $required} aria-required="true" required{/if}{if !$value || $error} autofocus{/if}>
@@ -50,56 +49,48 @@
                                             <option value="{$ID}" {if $value == $ID}selected{/if} >{$LONG}</option>
                                         {/loop}
                                     </select>
-                                    {if $error }
-                                        <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                    {if $error}
+                                        <span class="help-block">{$message}</span>
                                         {assign var="error_focus" value="true"}
                                     {elseif !$value}
                                         {assign var="error_focus" value="true"}
-                                    {elseif $isPost &&  $value != "" && !$error}
-                                        <span class="help-block"><i class="icon-ok"></i></span>
                                     {/if}
                                 </div>
                             </div><!--/.form-group-->
                         {/form_field}
                         {form_field form=$form field="firstname"}
-                        <div class="form-group group-firstname {if $error}has-error{elseif $isPost && $value != "" && !$error}has-success{/if}">
+                        <div class="form-group group-firstname {if $error}has-error{/if}">
                             <label class="control-label" for="{$label_attr.for}">{$label}{if $required} <span class="required">*</span>{/if}</label>
                             <div class="control-input">
-                                <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="John" value="{$value}" {if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
+                                <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" maxlength="255" placeholder="{intl l="Placeholder firstname"}" value="{$value}"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                                 {if $error }
-                                    <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                    <span class="help-block">{$message}</span>
                                     {assign var="error_focus" value="true"}
-                                {elseif $isPost && $value != "" && !$error}
-                                    <span class="help-block"><i class="icon-ok"></i></span>
                                 {/if}
                             </div>
                         </div><!--/.form-group-->
                         {/form_field}
                         {form_field form=$form field="lastname"}
-                            <div class="form-group group-lastname {if $error}has-error{elseif $isPost && $value != "" && !$error}has-success{/if}">
+                            <div class="form-group group-lastname {if $error}has-error{/if}">
                                 <label class="control-label" for="{$label_attr.for}">{$label}{if $required} <span class="required">*</span>{/if}</label>
                                 <div class="control-input">
-                                    <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="Doe" value="{$value}" {if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
+                                    <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" maxlength="255" placeholder="{intl l="Placeholder lastname"}" value="{$value}" {if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                                     {if $error }
-                                        <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                        <span class="help-block">{$message}</span>
                                         {assign var="error_focus" value="true"}
-                                    {elseif $isPost && $value != "" && !$error}
-                                        <span class="help-block"><i class="icon-ok"></i></span>
                                     {/if}
                                 </div>
                             </div><!--/.form-group-->
                         {/form_field}
                         {form_field form=$form field="email"}
-                        <div class="form-group group-email {if $error}has-error{elseif $isPost && $value != "" && !$error}has-success{/if}">
+                        <div class="form-group group-email {if $error}has-error{/if}">
                             <label class="control-label" for="{$label_attr.for}">{$label}{if $required} <span class="required">*</span>{/if}</label>
 
                             <div class="control-input">
-                                <input type="email" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="johndoe@domain.com" value="{$smarty.get.email|default:$value}"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
+                                <input type="email" name="{$name}" id="{$label_attr.for}" class="form-control" maxlength="255" placeholder="{intl l="Placeholder email"}" value="{$smarty.get.email|default:$value}"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                                 {if $error }
-                                    <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                    <span class="help-block">{$message}</span>
                                     {assign var="error_focus" value="true"}
-                                {elseif $isPost && $value != "" && !$error}
-                                    <span class="help-block"><i class="icon-ok"></i></span>
                                 {/if}
                             </div>
                         </div><!--/.form-group-->
@@ -115,7 +106,7 @@
                                 <input type="checkbox" name="{$name}" id="{$label_attr.for}" value="{$value}"{if $checked} checked{/if}  {if $required} aria-required="true" required{/if}>{$label}
                             </label>
                             {if $error }
-                                <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                <span class="help-block">{$message}</span>
                             {/if}
                         </div>
                     </div>
diff --git a/templates/default/account.html b/templates/default/account.html
index a8298020e..6a666ed60 100644
--- a/templates/default/account.html
+++ b/templates/default/account.html
@@ -119,7 +119,7 @@
                                         <div class="group-btn">
                                             <a href="{url path="/address/update/{$ID}"}" class="btn btn-edit-address" data-toggle="tooltip" title="{intl l="Edit this address"}"><i class="icon-pencil"></i> <span>{intl l="Edit"}</span></a>
                                             {if $DEFAULT != 1}
-                                                <a href="{url path="/address/delete/{$ID}"}" class="btn btn-remove-address" data-toggle="popover" title="Do you really want to delete this address ?" data-content="And here's some amazing content. It's very engaging. right?" title="{intl l="Remove this address"}" ><i class="icon-remove"></i> <span>{intl l="Cancel"}</span></a>
+                                                <a href="{url path="/address/delete/{$ID}"}" class="btn btn-remove-address" data-toggle="confirm" data-confirm-title="{intl l="Do you really want to delete this address ?"}" title="{intl l="Remove this address"}" ><i class="icon-remove"></i> <span>{intl l="Cancel"}</span></a>
                                             {/if}
                                         </div>
                                     </td>
diff --git a/templates/default/address-update.html b/templates/default/address-update.html
index 8da324cb7..8ab66107d 100644
--- a/templates/default/address-update.html
+++ b/templates/default/address-update.html
@@ -12,7 +12,7 @@
 {block name='no-return-functions' append}
     {$breadcrumbs = [
         ['title' => {intl l="Account"}, 'url'=>{url path="/account"}],
-        ['title' => {intl l="Address Update"}, 'url'=>{url path="/address"}]
+        ['title' => {intl l="Address Update"}, 'url'=>{url path="/address/update/{$address_id}"}]
     ]}
 {/block}
 
@@ -23,14 +23,14 @@
 
     <h1 id="main-label" class="page-header">{intl l="Address Update"}</h1>
     {form name="thelia.front.address.update"}
-        {loop name="customer.update" type="address" customer="current" id="{$address_id}"}
+    {loop name="customer.update" type="address" customer="current" id="{$address_id}"}
         <form id="form-address" class="form-horizontal" action="{url path="/address/update/{$address_id}"}" method="post" role="form">
         {form_field form=$form field='success_url'}
-            <input type="hidden" name="{$name}" value="{url path="/account"}" /> {* the url the user is redirected to on login success *}
+            <input type="hidden" name="{$name}" value="{url path="/account"}" />
         {/form_field}
 
         {form_field form=$form field='error_message'}
-            <input type="hidden" name="{$name}" value="{intl l="missing or invalid data"}" /> {* the url the user is redirected to on login success *}
+            <input type="hidden" name="{$name}" value="{intl l="missing or invalid data"}" />
         {/form_field}
         {form_hidden_fields form=$form}
         {if $form_error}<div class="alert alert-danger">{$form_error_message}</div>{/if}
@@ -41,15 +41,16 @@
 
             <div class="panel-body">
                 {form_field form=$form field="label"}
-                    <div class="form-group group-label {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
-                        <label class="control-label" for="{$label_attr.for}">{$label}: <span class="required">*</span></label>
+                    <div class="form-group group-label{if $error} has-error{/if}">
+                        <label class="control-label" for="{$label_attr.for}">{$label}:{if $required} <span class="required">*</span>{/if}</label>
 
                         <div class="control-input">
-                            <input type="text" name="{$name}" value="{$value|default:{$LABEL}}" id="{$label_attr.for}" class="form-control" placeholder="{intl l="Home address"}" autofocus>
+                            <input type="text" name="{$name}" value="{$value|default:{$LABEL}}" id="{$label_attr.for}" class="form-control" minlength="2" maxlength="255" placeholder="{intl l="Placeholder address label"}"{if $required} aria-required="true" required{/if}{if !$value || $error} autofocus{/if}>
                             {if $error }
-                                <span class="help-block"><i class="icon-remove"></i> {$message}</span>
-                            {elseif $value != "" && !$error}
-                                <span class="help-block"><i class="icon-ok"></i></span>
+                                <span class="help-block">{$message}</span>
+                                {assign var="error_focus" value="true"}
+                            {elseif !$value}
+                                {assign var="error_focus" value="true"}
                             {/if}
                         </div>
                     </div>
@@ -58,34 +59,32 @@
 
                 {form_field form=$form field="title"}
                     {assign var="customer_title_id" value="{$value|default:$TITLE}"}
-                    <div class="form-group group-title {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
-                        <label class="control-label" for="{$label_attr.for}">{$label} <span class="required">*</span></label>
+                    <div class="form-group group-title{if $error} has-error{/if}">
+                        <label class="control-label" for="{$label_attr.for}">{$label}{if $required} <span class="required">*</span>{/if}</label>
                         <div class="control-input">
-                            <select name="{$name}" id="{$label_attr.for}" class="form-control" required autofocus>
+                            <select name="{$name}" id="{$label_attr.for}" class="form-control"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                                 <option value="">-- {intl l="Select Title"} --</option>
                                 {loop type="title" name="title.list"}
-                                    <option value="{$ID}" {if $customer_title_id == $ID}selected{/if} >{$LONG}</option>
+                                    <option value="{$ID}" {if $customer_title_id == $ID}selected{/if}>{$LONG}</option>
                                 {/loop}
                             </select>
                             {if $error }
-                                <span class="help-block"><i class="icon-remove"></i> {$message}</span>
-                            {elseif $value != "" && !$error}
-                                <span class="help-block"><i class="icon-ok"></i></span>
+                                <span class="help-block">{$message}</span>
+                                {assign var="error_focus" value="true"}
                             {/if}
                         </div>
                     </div><!--/.form-group-->
                 {/form_field}
 
                 {form_field form=$form field="firstname"}
-                    <div class="form-group group-firstname {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
-                        <label class="control-label" for="{$label_attr.for}">{$label}: <span class="required">*</span></label>
+                    <div class="form-group group-firstname {if $error}has-error{/if}">
+                        <label class="control-label" for="{$label_attr.for}">{$label}:{if $required} <span class="required">*</span>{/if}</label>
 
                         <div class="control-input">
-                            <input type="text" name="{$name}" value="{$value|default:{$FIRSTNAME}}" id="{$label_attr.for}" class="form-control" placeholder="John" required>
+                            <input type="text" name="{$name}" value="{$value|default:{$FIRSTNAME}}" id="{$label_attr.for}" class="form-control" maxlength="255" placeholder="{intl l="Placeholder firstname"}"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                             {if $error }
-                                <span class="help-block"><i class="icon-remove"></i> {$message}</span>
-                            {elseif $value != "" && !$error}
-                                <span class="help-block"><i class="icon-ok"></i></span>
+                                <span class="help-block">{$message}</span>
+                                {assign var="error_focus" value="true"}
                             {/if}
                         </div>
                     </div>
@@ -94,15 +93,14 @@
                 <!--/.form-group-->
 
                 {form_field form=$form field="lastname"}
-                    <div class="form-group group-lastname {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
-                        <label class="control-label" for="{$label_attr.for}">{$label}: <span class="required">*</span></label>
+                    <div class="form-group group-lastname {if $error}has-error{/if}">
+                        <label class="control-label" for="{$label_attr.for}">{$label}:{if $required} <span class="required">*</span>{/if}</label>
 
                         <div class="control-input">
-                            <input type="text" name="{$name}" value="{$value|default:{$LASTNAME}}" id="{$label_attr.for}" class="form-control" placeholder="Doe" required>
+                            <input type="text" name="{$name}" value="{$value|default:{$LASTNAME}}" id="{$label_attr.for}" class="form-control" maxlength="255" placeholder="{intl l="Placeholder lastname"}"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                             {if $error }
-                                <span class="help-block"><i class="icon-remove"></i> {$message}</span>
-                            {elseif $value != "" && !$error}
-                                <span class="help-block"><i class="icon-ok"></i></span>
+                                <span class="help-block">{$message}</span>
+                                {assign var="error_focus" value="true"}
                             {/if}
                         </div>
                     </div>
@@ -110,15 +108,14 @@
                 {/form_field}
 
                 {form_field form=$form field="address1"}
-                    <div class="form-group group-address1 {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
-                        <label class="control-label" for="{$label_attr.for}">{$label}: <span class="required">*</span></label>
+                    <div class="form-group group-address1 {if $error}has-error{/if}">
+                        <label class="control-label" for="{$label_attr.for}">{$label}:{if $required} <span class="required">*</span>{/if}</label>
 
                         <div class="control-input">
-                            <input type="text" name="{$name}" value="{$value|default:{$ADDRESS1}}" id="{$label_attr.for}" class="form-control" placeholder="Street address" required>
+                            <input type="text" name="{$name}" value="{$value|default:{$ADDRESS1}}" id="{$label_attr.for}" class="form-control" maxlength="255" placeholder="{intl l="Placeholder address1"}"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                             {if $error }
-                                <span class="help-block"><i class="icon-remove"></i> {$message}</span>
-                            {elseif $value != "" && !$error}
-                                <span class="help-block"><i class="icon-ok"></i></span>
+                                <span class="help-block">{$message}</span>
+                                {assign var="error_focus" value="true"}
                             {/if}
                         </div>
                     </div>
@@ -126,15 +123,14 @@
                 {/form_field}
 
                 {form_field form=$form field="address2"}
-                    <div class="form-group group-address2 {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
-                        <label class="control-label" for="{$label_attr.for}">{$label}: </label>
+                    <div class="form-group group-address2 {if $error}has-error{/if}">
+                        <label class="control-label" for="{$label_attr.for}">{$label}:{if $required} <span class="required">*</span>{/if} </label>
 
                         <div class="control-input">
-                            <input type="text" name="{$name}" value="{$value|default:{$ADDRESS2}}" id="{$label_attr.for}" class="form-control" placeholder="{intl l="Complementary address"}">
+                            <input type="text" name="{$name}" value="{$value|default:{$ADDRESS2}}" id="{$label_attr.for}" class="form-control" maxlength="255" placeholder="{intl l="Placeholder address2"}"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                             {if $error }
-                                <span class="help-block"><i class="icon-remove"></i> {$message}</span>
-                            {elseif $value != "" && !$error}
-                                <span class="help-block"><i class="icon-ok"></i></span>
+                                <span class="help-block">{$message}</span>
+                                {assign var="error_focus" value="true"}
                             {/if}
                         </div>
                     </div>
@@ -142,15 +138,14 @@
                 {/form_field}
 
                 {form_field form=$form field="zipcode"}
-                    <div class="form-group group-zipcode {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
-                        <label class="control-label" for="{$label_attr.for}">{$label}: <span class="required">*</span></label>
+                    <div class="form-group group-zipcode {if $error}has-error{/if}">
+                        <label class="control-label" for="{$label_attr.for}">{$label}:{if $required} <span class="required">*</span>{/if}</label>
 
                         <div class="control-input">
-                            <input type="text" name="{$name}" value="{$value|default:{$ZIPCODE}}" id="{$label_attr.for}" class="form-control" placeholder="H2T 2V6" required>
+                            <input type="text" name="{$name}" value="{$value|default:{$ZIPCODE}}" id="{$label_attr.for}" class="form-control" maxlength="10" placeholder="{intl l="Placeholder zipcode"}"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                             {if $error }
-                                <span class="help-block"><i class="icon-remove"></i> {$message}</span>
-                            {elseif $value != "" && !$error}
-                                <span class="help-block"><i class="icon-ok"></i></span>
+                                <span class="help-block">{$message}</span>
+                                {assign var="error_focus" value="true"}
                             {/if}
                         </div>
                     </div>
@@ -158,15 +153,14 @@
                 {/form_field}
 
                 {form_field form=$form field="city"}
-                    <div class="form-group group-city {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
-                        <label class="control-label" for="{$label_attr.for}">{$label}: <span class="required">*</span></label>
+                    <div class="form-group group-city {if $error}has-error{/if}">
+                        <label class="control-label" for="{$label_attr.for}">{$label}:{if $required} <span class="required">*</span>{/if}</label>
 
                         <div class="control-input">
-                            <input type="text" name="{$name}" value="{$value|default:{$CITY}}" id="{$label_attr.for}" class="form-control" placeholder="New York" required>
+                            <input type="text" name="{$name}" value="{$value|default:{$CITY}}" id="{$label_attr.for}" class="form-control" maxlength="255" placeholder="{intl l="Placeholder city"}"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                             {if $error }
-                                <span class="help-block"><i class="icon-remove"></i> {$message}</span>
-                            {elseif $value != "" && !$error}
-                                <span class="help-block"><i class="icon-ok"></i></span>
+                                <span class="help-block">{$message}</span>
+                                {assign var="error_focus" value="true"}
                             {/if}
                         </div>
                     </div>
@@ -174,35 +168,33 @@
                 {/form_field}
 
                 {form_field form=$form field="country"}
-                {assign var="customer_country_id" value="{$value|default:$COUNTRY}"}
-                    <div class="form-group group-country {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
-                        <label class="control-label" for="{$label_attr.for}">{$label} <span class="required">*</span></label>
+                    {assign var="customer_country_id" value="{$value|default:$COUNTRY}"}
+                    <div class="form-group group-country {if $error}has-error{/if}">
+                        <label class="control-label" for="{$label_attr.for}">{$label}{if $required} <span class="required">*</span>{/if}</label>
                         <div class="control-input">
-                            <select name="{$name}" id="{$label_attr.for}" class="form-control" required>
+                            <select name="{$name}" id="{$label_attr.for}" class="form-control"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                                 <option value="">-- {intl l="Select Country"} --</option>
                                 {loop type="country" name="country.list"}
-                                    <option value="{$ID}" {if $customer_country_id == $ID}selected{/if} >{$TITLE}</option>
+                                    <option value="{$ID}" {if $customer_country_id == $ID}selected{/if}>{$TITLE}</option>
                                 {/loop}
                             </select>
                             {if $error }
-                                <span class="help-block"><i class="icon-remove"></i> {$message}</span>
-                            {elseif $value != "" && !$error}
-                                <span class="help-block"><i class="icon-ok"></i></span>
+                                <span class="help-block">{$message}</span>
+                                {assign var="error_focus" value="true"}
                             {/if}
                         </div>
                     </div><!--/.form-group-->
                 {/form_field}
 
                 {form_field form=$form field="phone"}
-                    <div class="form-group group-phone {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
-                        <label class="control-label" for="{$label_attr.for}">{$label}: </label>
+                    <div class="form-group group-phone {if $error}has-error{/if}">
+                        <label class="control-label" for="{$label_attr.for}">{$label}:{if $required} <span class="required">*</span>{/if}</label>
 
                         <div class="control-input">
-                            <input type="text" name="{$name}" value="{$value|default:{$PHONE}}" id="{$label_attr.for}" class="form-control" placeholder="">
+                            <input type="text" name="{$name}" value="{$value|default:{$PHONE}}" id="{$label_attr.for}" class="form-control" maxlength="20" placeholder="{intl l="Placeholder phone"}"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                             {if $error }
-                                <span class="help-block"><i class="icon-remove"></i> {$message}</span>
-                            {elseif $value != "" && !$error}
-                                <span class="help-block"><i class="icon-ok"></i></span>
+                                <span class="help-block">{$message}</span>
+                                {assign var="error_focus" value="true"}
                             {/if}
                         </div>
                     </div>
@@ -210,15 +202,14 @@
                 {/form_field}
 
                 {form_field form=$form field="cellphone"}
-                    <div class="form-group group-cellphone {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
-                        <label class="control-label" for="{$label_attr.for}">{$label}: </label>
+                    <div class="form-group group-cellphone {if $error}has-error{/if}">
+                        <label class="control-label" for="{$label_attr.for}">{$label}:{if $required} <span class="required">*</span>{/if}</label>
 
                         <div class="control-input">
-                            <input type="text" name="{$name}" value="{$value|default:{$CELLPHONE}}" id="{$label_attr.for}" class="form-control" placeholder="">
+                            <input type="text" name="{$name}" value="{$value|default:{$CELLPHONE}}" id="{$label_attr.for}" class="form-control" maxlength="20" placeholder="{intl l="Placeholder cellphone"}"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                             {if $error }
-                                <span class="help-block"><i class="icon-remove"></i> {$message}</span>
-                            {elseif $value != "" && !$error}
-                                <span class="help-block"><i class="icon-ok"></i></span>
+                                <span class="help-block">{$message}</span>
+                                {assign var="error_focus" value="true"}
                             {/if}
                         </div>
                     </div>
@@ -228,21 +219,23 @@
         </fieldset>
 
         {form_field form=$form field="is_default"}
+            {if not $DEFAULT}
             <div class="form-group group-primary">
                 <div class="control-input">
                     <div class="checkbox">
                         <label class="control-label" for="{$label_attr.for}">
-                            <input type="checkbox" name="{$name}" id="{$label_attr.for}" value="1" {if $DEFAULT}checked{/if}> {$label}
+                            <input type="checkbox" name="{$name}" id="{$label_attr.for}" value="1"> {$label}
                         </label>
                     </div>
                 </div>
             </div>
             <!--/.form-group-->
+            {/if}
         {/form_field}
 
         <div class="form-group group-btn">
             <div class="control-btn">
-                <button type="submit" class="btn btn-submit">{intl l="Create"}</button>
+                <button type="submit" class="btn btn-submit">{intl l="Update"}</button>
             </div>
         </div>
         <!--/.form-group-->
diff --git a/templates/default/address.html b/templates/default/address.html
index c6186defb..fea5c5dd5 100644
--- a/templates/default/address.html
+++ b/templates/default/address.html
@@ -12,7 +12,7 @@
 {block name='no-return-functions' append}
     {$breadcrumbs = [
         ['title' => {intl l="Account"}, 'url'=>{url path="/account"}],
-        ['title' => {intl l="Address"}, 'url'=>{url path="/address"}]
+        ['title' => {intl l="Add a New Address"}, 'url'=>{url path="/address/create"}]
     ]}
 {/block}
 
@@ -25,11 +25,11 @@
         {form name="thelia.front.address.create"}
         <form id="form-address" class="form-horizontal" action="{url path="/address/create"}" method="post" role="form">
             {form_field form=$form field='success_url'}
-                <input type="hidden" name="{$name}" value="{url path="/account"}" /> {* the url the user is redirected to on login success *}
+                <input type="hidden" name="{$name}" value="{url path="/account"}" />
             {/form_field}
 
             {form_field form=$form field='error_message'}
-                <input type="hidden" name="{$name}" value="{intl l="missing or invalid data"}" /> {* the url the user is redirected to on login success *}
+                <input type="hidden" name="{$name}" value="{intl l="missing or invalid data"}" />
             {/form_field}
             {form_hidden_fields form=$form}
             {if $form_error}<div class="alert alert-danger">{$form_error_message}</div>{/if}
@@ -40,15 +40,16 @@
 
                 <div class="panel-body">
                     {form_field form=$form field="label"}
-                    <div class="form-group group-label {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
-                        <label class="control-label" for="{$label_attr.for}">{$label}: <span class="required">*</span></label>
+                    <div class="form-group group-label{if $error} has-error{/if}">
+                        <label class="control-label" for="{$label_attr.for}">{$label}:{if $required} <span class="required">*</span>{/if}</label>
 
                         <div class="control-input">
-                            <input type="text" name="{$name}" value="{$value}" id="{$label_attr.for}" class="form-control" placeholder="{intl l="Home address"}" autofocus>
+                            <input type="text" name="{$name}" value="{$value}" id="{$label_attr.for}" class="form-control" minlength="2" maxlength="255" placeholder="{intl l="Placeholder address label"}"{if $required} aria-required="true" required{/if}{if !$value || $error} autofocus{/if}>
                             {if $error }
-                                <span class="help-block"><i class="icon-remove"></i> {$message}</span>
-                            {elseif $value != "" && !$error}
-                                <span class="help-block"><i class="icon-ok"></i></span>
+                                <span class="help-block">{$message}</span>
+                                {assign var="error_focus" value="true"}
+                            {elseif !$value}
+                                {assign var="error_focus" value="true"}
                             {/if}
                         </div>
                     </div>
@@ -56,34 +57,32 @@
                     {/form_field}
 
                     {form_field form=$form field="title"}
-                        <div class="form-group group-title {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
-                            <label class="control-label" for="{$label_attr.for}">{$label} <span class="required">*</span></label>
+                        <div class="form-group group-title{if $error} has-error{/if}">
+                            <label class="control-label" for="{$label_attr.for}">{$label}{if $required} <span class="required">*</span>{/if}</label>
                             <div class="control-input">
-                                <select name="{$name}" id="{$label_attr.for}" class="form-control" required autofocus>
+                                <select name="{$name}" id="{$label_attr.for}" class="form-control"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                                     <option value="">-- {intl l="Select Title"} --</option>
                                     {loop type="title" name="title.list"}
                                         <option value="{$ID}" {if $value == $ID}selected{/if} >{$LONG}</option>
                                     {/loop}
                                 </select>
                                 {if $error }
-                                    <span class="help-block"><i class="icon-remove"></i> {$message}</span>
-                                {elseif $value != "" && !$error}
-                                    <span class="help-block"><i class="icon-ok"></i></span>
+                                    <span class="help-block">{$message}</span>
+                                    {assign var="error_focus" value="true"}
                                 {/if}
                             </div>
                         </div><!--/.form-group-->
                     {/form_field}
 
                     {form_field form=$form field="firstname"}
-                        <div class="form-group group-firstname {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
-                            <label class="control-label" for="{$label_attr.for}">{$label}: <span class="required">*</span></label>
+                        <div class="form-group group-firstname {if $error}has-error{/if}">
+                            <label class="control-label" for="{$label_attr.for}">{$label}:{if $required} <span class="required">*</span>{/if}</label>
 
                             <div class="control-input">
-                                <input type="text" name="{$name}" value="{$value}" id="{$label_attr.for}" class="form-control" placeholder="John" required>
+                                <input type="text" name="{$name}" value="{$value}" id="{$label_attr.for}" class="form-control" maxlength="255" placeholder="{intl l="Placeholder firstname"}"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                                 {if $error }
-                                    <span class="help-block"><i class="icon-remove"></i> {$message}</span>
-                                {elseif $value != "" && !$error}
-                                    <span class="help-block"><i class="icon-ok"></i></span>
+                                    <span class="help-block">{$message}</span>
+                                    {assign var="error_focus" value="true"}
                                 {/if}
                             </div>
                         </div>
@@ -92,15 +91,14 @@
                     <!--/.form-group-->
 
                     {form_field form=$form field="lastname"}
-                        <div class="form-group group-lastname {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
-                            <label class="control-label" for="{$label_attr.for}">{$label}: <span class="required">*</span></label>
+                        <div class="form-group group-lastname {if $error}has-error{/if}">
+                            <label class="control-label" for="{$label_attr.for}">{$label}:{if $required} <span class="required">*</span>{/if}</label>
 
                             <div class="control-input">
-                                <input type="text" name="{$name}" value="{$value}" id="{$label_attr.for}" class="form-control" placeholder="Doe" required>
+                                <input type="text" name="{$name}" value="{$value}" id="{$label_attr.for}" class="form-control" maxlength="255" placeholder="{intl l="Placeholder lastname"}"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                                 {if $error }
-                                    <span class="help-block"><i class="icon-remove"></i> {$message}</span>
-                                {elseif $value != "" && !$error}
-                                    <span class="help-block"><i class="icon-ok"></i></span>
+                                    <span class="help-block">{$message}</span>
+                                    {assign var="error_focus" value="true"}
                                 {/if}
                             </div>
                         </div>
@@ -108,15 +106,14 @@
                     {/form_field}
 
                     {form_field form=$form field="address1"}
-                        <div class="form-group group-address1 {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
-                            <label class="control-label" for="{$label_attr.for}">{$label}: <span class="required">*</span></label>
+                        <div class="form-group group-address1 {if $error}has-error{/if}">
+                            <label class="control-label" for="{$label_attr.for}">{$label}:{if $required} <span class="required">*</span>{/if}</label>
 
                             <div class="control-input">
-                                <input type="text" name="{$name}" value="{$value}" id="{$label_attr.for}" class="form-control" placeholder="Street address" required>
+                                <input type="text" name="{$name}" value="{$value}" id="{$label_attr.for}" class="form-control" maxlength="255" placeholder="{intl l="Placeholder address1"}"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                                 {if $error }
-                                    <span class="help-block"><i class="icon-remove"></i> {$message}</span>
-                                {elseif $value != "" && !$error}
-                                    <span class="help-block"><i class="icon-ok"></i></span>
+                                    <span class="help-block">{$message}</span>
+                                    {assign var="error_focus" value="true"}
                                 {/if}
                             </div>
                         </div>
@@ -124,15 +121,14 @@
                     {/form_field}
 
                     {form_field form=$form field="address2"}
-                        <div class="form-group group-address2 {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
-                            <label class="control-label" for="{$label_attr.for}">{$label}: </label>
+                        <div class="form-group group-address2 {if $error}has-error{/if}">
+                            <label class="control-label" for="{$label_attr.for}">{$label}:{if $required} <span class="required">*</span>{/if} </label>
 
                             <div class="control-input">
-                                <input type="text" name="{$name}" value="{$value}" id="{$label_attr.for}" class="form-control" placeholder="{intl l="Complementary address"}">
+                                <input type="text" name="{$name}" value="{$value}" id="{$label_attr.for}" class="form-control" maxlength="255" placeholder="{intl l="Placeholder address2"}"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                                 {if $error }
-                                    <span class="help-block"><i class="icon-remove"></i> {$message}</span>
-                                {elseif $value != "" && !$error}
-                                    <span class="help-block"><i class="icon-ok"></i></span>
+                                    <span class="help-block">{$message}</span>
+                                    {assign var="error_focus" value="true"}
                                 {/if}
                             </div>
                         </div>
@@ -140,15 +136,14 @@
                     {/form_field}
 
                     {form_field form=$form field="zipcode"}
-                        <div class="form-group group-zipcode {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
-                            <label class="control-label" for="{$label_attr.for}">{$label}: <span class="required">*</span></label>
+                        <div class="form-group group-zipcode {if $error}has-error{/if}">
+                            <label class="control-label" for="{$label_attr.for}">{$label}:{if $required} <span class="required">*</span>{/if}</label>
 
                             <div class="control-input">
-                                <input type="text" name="{$name}" value="{$value}" id="{$label_attr.for}" class="form-control" placeholder="H2T 2V6" required>
+                                <input type="text" name="{$name}" value="{$value}" id="{$label_attr.for}" class="form-control" maxlength="10" placeholder="{intl l="Placeholder zipcode"}"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                                 {if $error }
-                                    <span class="help-block"><i class="icon-remove"></i> {$message}</span>
-                                {elseif $value != "" && !$error}
-                                    <span class="help-block"><i class="icon-ok"></i></span>
+                                    <span class="help-block">{$message}</span>
+                                    {assign var="error_focus" value="true"}
                                 {/if}
                             </div>
                         </div>
@@ -156,15 +151,14 @@
                     {/form_field}
 
                     {form_field form=$form field="city"}
-                        <div class="form-group group-city {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
-                            <label class="control-label" for="{$label_attr.for}">{$label}: <span class="required">*</span></label>
+                        <div class="form-group group-city {if $error}has-error{/if}">
+                            <label class="control-label" for="{$label_attr.for}">{$label}:{if $required} <span class="required">*</span>{/if}</label>
 
                             <div class="control-input">
-                                <input type="text" name="{$name}" value="{$value}" id="{$label_attr.for}" class="form-control" placeholder="New York" required>
+                                <input type="text" name="{$name}" value="{$value}" id="{$label_attr.for}" class="form-control" maxlength="255" placeholder="{intl l="Placeholder city"}"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                                 {if $error }
-                                    <span class="help-block"><i class="icon-remove"></i> {$message}</span>
-                                {elseif $value != "" && !$error}
-                                    <span class="help-block"><i class="icon-ok"></i></span>
+                                    <span class="help-block">{$message}</span>
+                                    {assign var="error_focus" value="true"}
                                 {/if}
                             </div>
                         </div>
@@ -172,34 +166,32 @@
                     {/form_field}
 
                     {form_field form=$form field="country"}
-                        <div class="form-group group-country {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
-                            <label class="control-label" for="{$label_attr.for}">{$label} <span class="required">*</span></label>
+                        <div class="form-group group-country {if $error}has-error{/if}">
+                            <label class="control-label" for="{$label_attr.for}">{$label}{if $required} <span class="required">*</span>{/if}</label>
                             <div class="control-input">
-                                <select name="{$name}" id="{$label_attr.for}" class="form-control" required>
+                                <select name="{$name}" id="{$label_attr.for}" class="form-control"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                                     <option value="">-- {intl l="Select Country"} --</option>
                                     {loop type="country" name="country.list"}
                                         <option value="{$ID}" {if $value == $ID}selected{/if} >{$TITLE}</option>
                                     {/loop}
                                 </select>
                                 {if $error }
-                                    <span class="help-block"><i class="icon-remove"></i> {$message}</span>
-                                {elseif $value != "" && !$error}
-                                    <span class="help-block"><i class="icon-ok"></i></span>
+                                    <span class="help-block">{$message}</span>
+                                    {assign var="error_focus" value="true"}
                                 {/if}
                             </div>
                         </div><!--/.form-group-->
                     {/form_field}
 
                     {form_field form=$form field="phone"}
-                        <div class="form-group group-phone {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
-                            <label class="control-label" for="{$label_attr.for}">{$label}: </label>
+                        <div class="form-group group-phone {if $error}has-error{/if}">
+                            <label class="control-label" for="{$label_attr.for}">{$label}:{if $required} <span class="required">*</span>{/if}</label>
 
                             <div class="control-input">
-                                <input type="text" name="{$name}" value="{$value}" id="{$label_attr.for}" class="form-control" placeholder="">
+                                <input type="text" name="{$name}" value="{$value}" id="{$label_attr.for}" class="form-control" maxlength="20" placeholder="{intl l="Placeholder phone"}"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                                 {if $error }
-                                    <span class="help-block"><i class="icon-remove"></i> {$message}</span>
-                                {elseif $value != "" && !$error}
-                                    <span class="help-block"><i class="icon-ok"></i></span>
+                                    <span class="help-block">{$message}</span>
+                                    {assign var="error_focus" value="true"}
                                 {/if}
                             </div>
                         </div>
@@ -207,15 +199,14 @@
                     {/form_field}
 
                     {form_field form=$form field="cellphone"}
-                        <div class="form-group group-cellphone {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
-                            <label class="control-label" for="{$label_attr.for}">{$label}: </label>
+                        <div class="form-group group-cellphone {if $error}has-error{/if}">
+                            <label class="control-label" for="{$label_attr.for}">{$label}:{if $required} <span class="required">*</span>{/if}</label>
 
                             <div class="control-input">
-                                <input type="text" name="{$name}" value="{$value}" id="{$label_attr.for}" class="form-control" placeholder="">
+                                <input type="text" name="{$name}" value="{$value}" id="{$label_attr.for}" class="form-control" maxlength="20" placeholder="{intl l="Placeholder cellphone"}"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                                 {if $error }
-                                    <span class="help-block"><i class="icon-remove"></i> {$message}</span>
-                                {elseif $value != "" && !$error}
-                                    <span class="help-block"><i class="icon-ok"></i></span>
+                                    <span class="help-block">{$message}</span>
+                                    {assign var="error_focus" value="true"}
                                 {/if}
                             </div>
                         </div>
diff --git a/templates/default/assets/js/script.js b/templates/default/assets/js/script.js
index dd55f4cbb..ad7daead7 100644
--- a/templates/default/assets/js/script.js
+++ b/templates/default/assets/js/script.js
@@ -195,7 +195,7 @@
         });
 
         // Apply validation
-        $('#form-contact, #form-register').validate({
+        $('#form-contact, #form-register, #form-address').validate({
             highlight: function(element) {
                 $(element).closest('.form-group').addClass('has-error');
             },
@@ -203,14 +203,14 @@
                 $(element).closest('.form-group').removeClass('has-error');
             },
             errorElement: 'span',
-            errorClass: 'help-block',
+            errorClass: 'help-block'/*,
             errorPlacement: function(error, element) {
                 if(element.parent('.input-group').length || element.prop('type') === 'checkbox' || element.prop('type') === 'radio'){
                     error.prepend('<i class="icon-remove"></i> ').insertAfter(element.parent());
                 }else{
                     error.prepend('<i class="icon-remove"></i> ').insertAfter(element);
                 }
-            }
+            }*/
         });
 
 
diff --git a/templates/default/assets/themes/default/less/theme.less b/templates/default/assets/themes/default/less/theme.less
index f6e8e6787..b9e6689ef 100755
--- a/templates/default/assets/themes/default/less/theme.less
+++ b/templates/default/assets/themes/default/less/theme.less
@@ -25,6 +25,13 @@ body { padding-top: 80px; }
     }
 }
 
+.has-error .help-block {
+    &:before {
+        .icon(@remove);
+        margin-right: .3em;
+    }
+}
+
 label { font-weight: 600; }
 
 // Dropdowns
diff --git a/templates/default/contact.html b/templates/default/contact.html
index 2b0c7e7a9..022e150bc 100644
--- a/templates/default/contact.html
+++ b/templates/default/contact.html
@@ -25,12 +25,12 @@
                     <div class="panel-body">
                         <div class="row">
                         {form_field form=$form field="name"}
-                            <div class="form-group group-name col-sm-6 {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
+                            <div class="form-group group-name col-sm-6{if $error} has-error{/if}">
                                 <label class="control-label" for="{$label_attr.for}">{$label}{if $required} <span class="required">*</span>{/if}</label>
                                 <div class="control-input">
-                                    <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="{intl l="What's your name?"}" value="{$value}" {if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
+                                    <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" maxlength="255" placeholder="{intl l="Placeholder contact name"}" value="{$value}"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                                     {if $error }
-                                        <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                        <span class="help-block">{$message}</span>
                                         {assign var="error_focus" value="true"}
                                     {elseif $value != "" && !$error}
                                         <span class="help-block"><i class="icon-ok"></i></span>
@@ -39,44 +39,38 @@
                             </div><!--/.form-group-->
                         {/form_field}
                         {form_field form=$form field="email"}
-                            <div class="form-group group-email col-sm-6 {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
+                            <div class="form-group group-email col-sm-6{if $error} has-error{/if}">
                                 <label class="control-label" for="{$label_attr.for}">{$label}{if $required} <span class="required">*</span>{/if}</label>
                                 <div class="control-input">
-                                    <input type="email" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="{intl l="So I can get back to you."}" value="{$value}" {if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
+                                    <input type="email" name="{$name}" id="{$label_attr.for}" class="form-control" maxlength="255" placeholder="{intl l="Placeholder contact name"}" value="{$value}"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                                     {if $error }
-                                        <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                        <span class="help-block">{$message}</span>
                                         {assign var="error_focus" value="true"}
-                                    {elseif $value != "" && !$error}
-                                        <span class="help-block"><i class="icon-ok"></i></span>
                                     {/if}
                                 </div>
                             </div><!--/.form-group-->
                         {/form_field}
                         </div>
                         {form_field form=$form field="subject"}
-                            <div class="form-group group-firstname {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
+                            <div class="form-group group-firstname{if $error} has-error{/if}">
                                 <label class="control-label" for="{$label_attr.for}">{$label}{if $required} <span class="required">*</span>{/if}</label>
                                 <div class="control-input">
-                                    <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="{intl l="The subject of your message."}" value="{$value}" {if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
+                                    <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" maxlength="255" placeholder="{intl l="Placeholder contact subject"}" value="{$value}" {if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                                     {if $error }
-                                        <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                        <span class="help-block">{$message}</span>
                                         {assign var="error_focus" value="true"}
-                                    {elseif $value != "" && !$error}
-                                        <span class="help-block"><i class="icon-ok"></i></span>
                                     {/if}
                                 </div>
                             </div><!--/.form-group-->
                         {/form_field}
                         {form_field form=$form field="message"}
-                            <div class="form-group group-message {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
+                            <div class="form-group group-message{if $error} has-error{/if}">
                                 <label class="control-label" for="{$label_attr.for}">{$label}{if $required} <span class="required">*</span>{/if}</label>
                                 <div class="control-input">
-                                    <textarea name="{$name}" id="{$label_attr.for}" placeholder="{intl l='And your message...'}" rows="6" class="form-control"{if $required} aria-required="true" required{/if}>{$value}</textarea>
+                                    <textarea name="{$name}" id="{$label_attr.for}" placeholder="{intl l="Placeholder contact message"}" rows="6" class="form-control"{if $required} aria-required="true" required{/if}>{$value}</textarea>
                                     {if $error }
-                                        <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                        <span class="help-block">{$message}</span>
                                         {assign var="error_focus" value="true"}
-                                    {elseif $value != "" && !$error}
-                                        <span class="help-block"><i class="icon-ok"></i></span>
                                     {/if}
                                 </div>
                             </div><!--/.form-group-->
diff --git a/templates/default/login.html b/templates/default/login.html
index 956f25b27..e2bc572dd 100644
--- a/templates/default/login.html
+++ b/templates/default/login.html
@@ -31,9 +31,9 @@
                         <div class="form-group group-email{if $error} has-error{/if}">
                             <label for="{$label_attr.for}">{$label}</label>
                             <div class="control-input">
-                            <input type="email" name="{$name}" id="{$label_attr.for}" value="{$value}" class="form-control" {$attr} {if $required}aria-required="true" required{/if}{if !$value || $error} autofocus{/if}>
+                            <input type="email" name="{$name}" id="{$label_attr.for}" value="{$value}" class="form-control" maxlength="255" {$attr} {if $required}aria-required="true" required{/if}{if !$value || $error} autofocus{/if}>
                             {if $error}
-                                <span class="help-block"><span class="icon-remove"></span> {$message}</span>
+                                <span class="help-block">{$message}</span>
                                 {assign var="error_focus" value="true"}
                             {elseif !$value}
                                 {assign var="error_focus" value="true"}
@@ -57,9 +57,9 @@
                         <div class="form-group group-password{if $error} has-error{/if}">
                             <label for="{$label_attr.for}" class="sr-only">{$label}</label>
                             <div class="control-input">
-                            <input type="password" name="{$name}" id="{$label_attr.for}" class="form-control" autocomplete="off"{if !isset($error_focus)} autofocus{/if}>
+                            <input type="password" name="{$name}" id="{$label_attr.for}" class="form-control" maxlength="255" autocomplete="off"{if !isset($error_focus)} autofocus{/if}>
                             {if $error}
-                                <span class="help-block"><span class="icon-remove"></span> {$message}</span>
+                                <span class="help-block">{$message}</span>
                             {/if}
                             </div>
                         </div>
diff --git a/templates/default/newsletter.html b/templates/default/newsletter.html
index 149b85a21..b1e927678 100644
--- a/templates/default/newsletter.html
+++ b/templates/default/newsletter.html
@@ -18,7 +18,7 @@
                         <div class="form-group group-email {if $error}has-error{elseif !$error && $value != ""}has-success{/if}">
                             <label for="{$label_attr.for}">{$label}{if $required} <span class="required">*</span>{/if}</label>
                             <div class="control-input">
-                                <input type="email" name="{$name}" id="{$label_attr.for}" value="{$value}" class="form-control" {if $required} aria-required="true" required{/if} autofocus>
+                                <input type="email" name="{$name}" id="{$label_attr.for}" value="{$value}" class="form-control" maxlength="255" {if $required} aria-required="true" required{/if} autofocus>
                                 {if $error}
                                     <span class="help-block"><span class="icon-remove"></span> {$message}</span>
                                 {elseif !$error && $value != ""}
diff --git a/templates/default/password.html b/templates/default/password.html
index f3fbcf046..2d562ed27 100644
--- a/templates/default/password.html
+++ b/templates/default/password.html
@@ -23,9 +23,9 @@
                 <div class="form-group group-email {if $error}has-error{elseif !$error && $value != ""}has-success{/if}">
                     <label for="{$label_attr.for}">{$label}</label>
                     <div class="control-input">
-                    <input type="email" name="{$name}" value="{$value}" id="{$label_attr.for}" class="form-control" aria-required="true" autofocus required>
+                    <input type="email" name="{$name}" value="{$value}" id="{$label_attr.for}" class="form-control" maxlength="255" aria-required="true" autofocus required>
                     {if $error}
-                        <span class="help-block"><span class="icon-remove"></span> {$message}</span>
+                        <span class="help-block">{$message}</span>
                     {elseif !$error && $value != ""}
                         <span class="help-block"><span class="icon-ok"></span> {intl l="You will receive a link to reset your password."}</span>
                     {/if}
diff --git a/templates/default/register.html b/templates/default/register.html
index 82c93e4ea..0fda003b0 100644
--- a/templates/default/register.html
+++ b/templates/default/register.html
@@ -32,7 +32,7 @@
 
                     <div class="panel-body">
                         {form_field form=$form field="title"}
-                            <div class="form-group group-title {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
+                            <div class="form-group group-title{if $error} has-error{/if}">
                                 <label class="control-label" for="{$label_attr.for}">{$label}{if $required} <span class="required">*</span>{/if}</label>
                                 <div class="control-input">
                                     <select name="{$name}" id="{$label_attr.for}" class="form-control"{if $required} aria-required="true" required{/if}{if !$value || $error} autofocus{/if}>
@@ -42,83 +42,71 @@
                                         {/loop}
                                     </select>
                                     {if $error }
-                                        <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                        <span class="help-block">{$message}</span>
                                         {assign var="error_focus" value="true"}
                                     {elseif !$value}
                                         {assign var="error_focus" value="true"}
-                                    {elseif $value != "" && !$error}
-                                        <span class="help-block"><i class="icon-ok"></i></span>
                                     {/if}
                                 </div>
                             </div><!--/.form-group-->
                         {/form_field}
                         {form_field form=$form field="firstname"}
-                        <div class="form-group group-firstname {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
+                        <div class="form-group group-firstname{if $error} has-error{/if}">
                             <label class="control-label" for="{$label_attr.for}">{$label}{if $required} <span class="required">*</span>{/if}</label>
                             <div class="control-input">
-                                <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="John" value="{$value}" {if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
+                                <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" maxlength="255" placeholder="{intl l="Placeholder firstname"}" value="{$value}" {if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                                 {if $error }
-                                    <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                    <span class="help-block">{$message}</span>
                                     {assign var="error_focus" value="true"}
-                                {elseif $value != "" && !$error}
-                                    <span class="help-block"><i class="icon-ok"></i></span>
                                 {/if}
                             </div>
                         </div><!--/.form-group-->
                         {/form_field}
                         {form_field form=$form field="lastname"}
-                            <div class="form-group group-lastname {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
+                            <div class="form-group group-lastname{if $error} has-error{/if}">
                                 <label class="control-label" for="{$label_attr.for}">{$label}{if $required} <span class="required">*</span>{/if}</label>
                                 <div class="control-input">
-                                    <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="Doe" value="{$value}" {if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
+                                    <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" maxlength="255" placeholder="{intl l="Placeholder lastname"}" value="{$value}" {if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                                     {if $error }
-                                        <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                        <span class="help-block">{$message}</span>
                                         {assign var="error_focus" value="true"}
-                                    {elseif $value != "" && !$error}
-                                        <span class="help-block"><i class="icon-ok"></i></span>
                                     {/if}
                                 </div>
                             </div><!--/.form-group-->
                         {/form_field}
                         {form_field form=$form field="email"}
-                        <div class="form-group group-email {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
+                        <div class="form-group group-email{if $error} has-error{/if}">
                             <label class="control-label" for="{$label_attr.for}">{$label}{if $required} <span class="required">*</span>{/if}</label>
 
                             <div class="control-input">
-                                <input type="email" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="johndoe@domain.com" value="{$smarty.get.email|default:$value}"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
+                                <input type="email" name="{$name}" id="{$label_attr.for}" class="form-control" maxlength="255" placeholder="{intl l="Placeholder email"}" value="{$smarty.get.email|default:$value}"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                                 {if $error }
-                                    <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                    <span class="help-block">{$message}</span>
                                     {assign var="error_focus" value="true"}
-                                {elseif $value != "" && !$error}
-                                    <span class="help-block"><i class="icon-ok"></i></span>
                                 {/if}
                             </div>
                         </div><!--/.form-group-->
                         {/form_field}
                         {form_field form=$form field="phone"}
-                            <div class="form-group group-phone {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
+                            <div class="form-group group-phone{if $error} has-error{/if}">
                                 <label class="control-label" for="{$label_attr.for}">{$label}{if $required} <span class="required">*</span>{/if}</label>
                                 <div class="control-input">
-                                    <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="" value="{$value}"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
+                                    <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" maxlength="20" placeholder="{intl l="Placeholder phone"}" value="{$value}"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                                     {if $error }
-                                        <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                        <span class="help-block">{$message}</span>
                                         {assign var="error_focus" value="true"}
-                                    {elseif $value != "" && !$error}
-                                        <span class="help-block"><i class="icon-ok"></i></span>
                                     {/if}
                                 </div>
                             </div><!--/.form-group-->
                         {/form_field}
                         {form_field form=$form field="cellphone"}
-                            <div class="form-group group-cellphone {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
+                            <div class="form-group group-cellphone{if $error} has-error{/if}">
                                 <label class="control-label" for="{$label_attr.for}">{$label}{if $required} <span class="required">*</span>{/if}</label>
                                 <div class="control-input">
-                                    <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="" value="{$value}"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
+                                    <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" maxlength="20" placeholder="{intl l="Placeholder cellphone"}" value="{$value}"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                                     {if $error }
-                                        <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                        <span class="help-block">{$message}</span>
                                         {assign var="error_focus" value="true"}
-                                    {elseif $value != "" && !$error}
-                                        <span class="help-block"><i class="icon-ok"></i></span>
                                     {/if}
                                 </div>
                             </div><!--/.form-group-->
@@ -133,82 +121,72 @@
 
                     <div class="panel-body">
                         {form_field form=$form field="company"}
-                            <div class="form-group group-company {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
+                            <div class="form-group group-company{if $error} has-error{/if}">
                                 <label class="control-label" for="{$label_attr.for}">{$label}{if $required} <span class="required">*</span>{/if}</label>
                                 <div class="control-input">
-                                    <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="Google" value="{$value}"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
+                                    <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" maxlength="255" placeholder="{intl l="Placeholder company"}" value="{$value}"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                                     {if $error }
-                                        <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                        <span class="help-block">{$message}</span>
                                         {assign var="error_focus" value="true"}
-                                    {elseif $value != "" && !$error}
-                                        <span class="help-block"><i class="icon-ok"></i></span>
                                     {/if}
                                 </div>
                             </div><!--/.form-group-->
                         {/form_field}
 
                         {form_field form=$form field="address1"}
-                            <div class="form-group group-address1 {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
+                            <div class="form-group group-address1{if $error} has-error{/if}">
                                 <label class="control-label" for="{$label_attr.for}">{$label}{if $required} <span class="required">*</span>{/if}</label>
                                 <div class="control-input">
-                                    <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="76 Ninth Avenue" value="{$value}"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
+                                    <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" maxlength="255" placeholder="{intl l="Placeholder address1"}" value="{$value}"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                                     {if $error }
-                                        <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                        <span class="help-block">{$message}</span>
                                         {assign var="error_focus" value="true"}
-                                    {elseif $value != "" && !$error}
-                                        <span class="help-block"><i class="icon-ok"></i></span>
                                     {/if}
                                 </div>
                             </div><!--/.form-group-->
                         {/form_field}
 
                         {form_field form=$form field="address2"}
-                            <div class="form-group group-address2 {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
+                            <div class="form-group group-address2{if $error} has-error{/if}">
                                 <label class="control-label" for="{$label_attr.for}">{$label}{if $required} <span class="required">*</span>{/if}</label>
                                 <div class="control-input">
-                                    <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="" value="{$value}"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
+                                    <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" maxlength="255" placeholder="{intl l="Placeholder address2"}" value="{$value}"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                                     {if $error }
-                                        <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                        <span class="help-block">{$message}</span>
                                         {assign var="error_focus" value="true"}
-                                    {elseif $value != "" && !$error}
-                                        <span class="help-block"><i class="icon-ok"></i></span>
                                     {/if}
                                 </div>
                             </div><!--/.form-group-->
                         {/form_field}
 
                         {form_field form=$form field="city"}
-                            <div class="form-group group-city {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
+                            <div class="form-group group-city{if $error} has-error{/if}">
                                 <label class="control-label" for="{$label_attr.for}">{$label}{if $required} <span class="required">*</span>{/if}</label>
                                 <div class="control-input">
-                                    <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="New York" value="{$value}"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
+                                    <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" maxlength="255" placeholder="{intl l="Placeholder city"}" value="{$value}"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                                     {if $error }
-                                        <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                        <span class="help-block">{$message}</span>
                                         {assign var="error_focus" value="true"}
-                                    {elseif $value != "" && !$error}
-                                        <span class="help-block"><i class="icon-ok"></i></span>
                                     {/if}
                                 </div>
                             </div><!--/.form-group-->
                         {/form_field}
 
                         {form_field form=$form field="zipcode"}
-                            <div class="form-group group-zip {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
+                            <div class="form-group group-zip{if $error} has-error{/if}">
                                 <label class="control-label" for="{$label_attr.for}">{$label}{if $required} <span class="required">*</span>{/if}</label>
                                 <div class="control-input">
-                                    <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="NY 10011" value="{$value}"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
+                                    <input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" maxlength="10" placeholder="{intl l="Placeholder zipcode"}" value="{$value}"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                                     {if $error }
-                                        <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                        <span class="help-block">{$message}</span>
                                         {assign var="error_focus" value="true"}
-                                    {elseif $value != "" && !$error}
-                                        <span class="help-block"><i class="icon-ok"></i></span>
                                     {/if}
                                 </div>
                             </div><!--/.form-group-->
                         {/form_field}
 
                         {form_field form=$form field="country"}
-                            <div class="form-group group-country {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
+                            <div class="form-group group-country{if $error} has-error{/if}">
                                 <label class="control-label" for="{$label_attr.for}">{$label}{if $required} <span class="required">*</span>{/if}</label>
                                 <div class="control-input">
                                     <select name="{$name}" id="{$label_attr.for}" class="form-control"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
@@ -225,10 +203,8 @@
                                         {/loop}
                                     </select>
                                     {if $error }
-                                        <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                        <span class="help-block">{$message}</span>
                                         {assign var="error_focus" value="true"}
-                                    {elseif $value != "" && !$error}
-                                        <span class="help-block"><i class="icon-ok"></i></span>
                                     {/if}
                                 </div>
                             </div><!--/.form-group-->
@@ -242,30 +218,26 @@
 
                     <div class="panel-body">
                         {form_field form=$form field="password"}
-                            <div class="form-group group-password {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
+                            <div class="form-group group-password{if $error} has-error{/if}">
                                 <label class="control-label" for="{$label_attr.for}">{$label}{if $required} <span class="required">*</span>{/if}</label>
                                 <div class="control-input">
                                     <input type="password" name="{$name}" id="{$label_attr.for}" class="form-control" autocomplete="off"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                                     {if $error }
-                                        <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                        <span class="help-block">{$message}</span>
                                         {assign var="error_focus" value="true"}
-                                    {elseif $value != "" && !$error}
-                                        <span class="help-block"><i class="icon-ok"></i></span>
                                     {/if}
                                 </div>
                             </div><!--/.form-group-->
                         {/form_field}
 
                         {form_field form=$form field="password_confirm"}
-                            <div class="form-group group-password_confirm {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
+                            <div class="form-group group-password_confirm{if $error} has-error{/if}">
                                 <label class="control-label" for="{$label_attr.for}">{$label}{if $required} <span class="required">*</span>{/if}</label>
                                 <div class="control-input">
                                     <input type="password" name="{$name}" id="{$label_attr.for}" class="form-control" autocomplete="off"{if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
                                     {if $error }
-                                        <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                        <span class="help-block">{$message}</span>
                                         {assign var="error_focus" value="true"}
-                                    {elseif $value != "" && !$error}
-                                        <span class="help-block"><i class="icon-ok"></i></span>
                                     {/if}
                                 </div>
                             </div><!--/.form-group-->
@@ -281,7 +253,7 @@
                                 <input type="checkbox" name="{$name}" id="{$label_attr.for}" value="{$value}"{if $checked} checked{/if}  {if $required} aria-required="true" required{/if}>I've read and agreed on <a href="#">Terms &amp; Conditions</a></a>.
                             </label>
                             {if $error }
-                                <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                <span class="help-block">{$message}</span>
                             {/if}
                         </div>
                     </div>