diff --git a/admin-dev/themes/default/template/controllers/shipping/content.tpl b/admin-dev/themes/default/template/controllers/shipping/content.tpl
index 520f25aff..27a1b0dca 100644
--- a/admin-dev/themes/default/template/controllers/shipping/content.tpl
+++ b/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}
diff --git a/admin-dev/themes/default/template/helpers/options/options.tpl b/admin-dev/themes/default/template/helpers/options/options.tpl
index e25764fcd..b22385e72 100644
--- a/admin-dev/themes/default/template/helpers/options/options.tpl
+++ b/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">
diff --git a/controllers/admin/AdminRangePriceController.php b/controllers/admin/AdminRangePriceController.php
index 51de218fe..1cc087515 100644
--- a/controllers/admin/AdminRangePriceController.php
+++ b/controllers/admin/AdminRangePriceController.php
@@ -62,7 +62,7 @@ class AdminRangePriceControllerCore extends AdminController
 		$this->fields_form = array(
 			'legend' => array(
 				'title' => $this->l('Price ranges'),
-				'image' => '../img/t/AdminRangePrice.gif'
+				'icon' => 'icon-money'
 			),
 			'input' => array(
 				array(
@@ -70,13 +70,13 @@ class AdminRangePriceControllerCore extends AdminController
 					'label' => $this->l('Carrier:'),
 					'name' => 'id_carrier',
 					'required' => false,
-					'desc' => $this->l('You can apply this range to a different carrier by selecting its name.'),
+					'hint' => $this->l('You can apply this range to a different carrier by selecting its name.'),
 					'options' => array(
 						'query' => $carriers,
 						'id' => 'id_carrier',
 						'name' => 'name'
 					),
-					'empty_message' => '<div style="margin:5px 0 10px 0">'.$this->l('There is no carrier available for this price range.').'</div>'
+					'empty_message' => '<p class="alert alert-block">'.$this->l('There is no carrier available for this price range.').'</p>'
 				),
 				array(
 					'type' => 'text',
@@ -84,7 +84,7 @@ class AdminRangePriceControllerCore extends AdminController
 					'name' => 'delimiter1',
 					'required' => true,
 					'suffix' => $currency->getSign('right').' '.$this->l('(Tax Incl.)'),
-					'desc' => $this->l('Start range (included)'),
+					'hint' => $this->l('Start range (included)'),
 					'string_format' => '%.2f'
 				),
 				array(
@@ -93,13 +93,13 @@ class AdminRangePriceControllerCore extends AdminController
 					'name' => 'delimiter2',
 					'required' => true,
 					'suffix' => $currency->getSign('right').' '.$this->l('(Tax Incl.)'),
-					'desc' => $this->l('End range (excluded)'),
+					'hint' => $this->l('End range (excluded)'),
 					'string_format' => '%.2f'
 				),
 			),
 			'submit' => array(
-				'title' => $this->l('   Save   '),
-				'class' => 'button'
+				'title' => $this->l('Save'),
+				'class' => 'btn btn-default'
 			)
 		);
 
diff --git a/controllers/admin/AdminRangeWeightController.php b/controllers/admin/AdminRangeWeightController.php
index a26f7c21d..71d119a14 100644
--- a/controllers/admin/AdminRangeWeightController.php
+++ b/controllers/admin/AdminRangeWeightController.php
@@ -60,7 +60,7 @@ class AdminRangeWeightControllerCore extends AdminController
 		$this->fields_form = array(
 			'legend' => array(
 				'title' => $this->l('Weight ranges'),
-				'image' => '../img/t/AdminRangeWeight.gif'
+				'icon' => 'icon-suitcase'
 			),
 			'input' => array(
 				array(
@@ -68,36 +68,34 @@ class AdminRangeWeightControllerCore extends AdminController
 					'label' => $this->l('Carrier:'),
 					'name' => 'id_carrier',
 					'required' => false,
-					'desc' => $this->l('You can apply this range to a different carrier by selecting its name.'),
+					'hint' => $this->l('You can apply this range to a different carrier by selecting its name.'),
 					'options' => array(
 						'query' => $carriers,
 						'id' => 'id_carrier',
 						'name' => 'name'
 					),
-					'empty_message' => '<div style="margin:5px 0 10px 0">'.$this->l('There is no carrier available for this weight range.').'</div>'
+					'empty_message' => '<p class="alert alert-block">'.$this->l('There is no carrier available for this weight range.').'</p>'
 				),
 				array(
 					'type' => 'text',
 					'label' => $this->l('From:'),
 					'name' => 'delimiter1',
-					'size' => 5,
 					'required' => true,
 					'suffix' => Configuration::get('PS_WEIGHT_UNIT'),
-					'desc' => $this->l('Start range (included)'),
+					'hint' => $this->l('Start range (included)'),
 				),
 				array(
 					'type' => 'text',
 					'label' => $this->l('To:'),
 					'name' => 'delimiter2',
-					'size' => 5,
 					'required' => true,
 					'suffix' => Configuration::get('PS_WEIGHT_UNIT'),
-					'desc' => $this->l('End range (excluded)'),
+					'hint' => $this->l('End range (excluded)'),
 				),
 			),
 			'submit' => array(
 				'title' => $this->l('   Save   '),
-				'class' => 'button'
+				'class' => 'btn btn-default'
 			)
 		);