// update shipping tab

admin-dev/themes/default/template/controllers/shipping/content.tpl

@@ -27,10 +27,10 @@
 
 <form action="{$action_fees}" id="fees" name="fees" method="post" class="form-horizontal">
 	<fieldset class="col-lg-12">
-		<legend>
+		<h3>
 			<i class="icon-truck"></i>
 			{l s='Fees by carrier, geographical zone and ranges'}
-		</legend>
+		</h3>
 		{if empty($carriers)}
 			{l s='If you only have free carriers, there\'s no need to configure delivery prices.'}
 		{else}

admin-dev/themes/default/template/helpers/options/options.tpl

@@ -141,21 +141,21 @@
 										</div>
 									{elseif $field['type'] == 'text'}
 										<div class="col-lg-9 {if isset($field['suffix'])}input-group{/if}">
-											
 											{if isset($field['suffix'])}
 											<span class="input-group-addon">
 												{$field['suffix']|strval}
 											</span>
 											{/if}
-
 											<input type="{$field['type']}"{if isset($field['id'])} id="{$field['id']}"{/if} size="{if isset($field['size'])}{$field['size']|intval}{else}5{/if}" name="{$key}" value="{$field['value']|escape:'htmlall':'UTF-8'}" {if isset($field['autocomplete']) && !$field['autocomplete']}autocomplete="off"{/if}/>
-											
-
 										</div>
 									{elseif $field['type'] == 'password'}
-										<div class="col-lg-9">
+										<div class="col-lg-9 {if isset($field['suffix'])}input-group{/if}">
+											{if isset($field['suffix'])}
+											<span class="input-group-addon">
+												{$field['suffix']|strval}
+											</span>
+											{/if}
 											<input type="{$field['type']}"{if isset($field['id'])} id="{$field['id']}"{/if} size="{if isset($field['size'])}{$field['size']|intval}{else}5{/if}" name="{$key}" value="" {if isset($field['autocomplete']) && !$field['autocomplete']}autocomplete="off"{/if} />
-											{if isset($field['suffix'])}&nbsp;{$field['suffix']|strval}{/if}
 										</div>
 									{elseif $field['type'] == 'textarea'}
 										<div class="col-lg-9">