diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
index 946f22824..6b460b28b 100644
--- a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
+++ b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
@@ -5,18 +5,18 @@
 					<td class="range_type"></td>
 					<td class="border_left border_bottom">>=</td>
 					{foreach from=$ranges key=r item=range}
-						<td class="border_bottom center"><input name="range_inf[{$range.id_range|intval}]" type="text" value="{$range.delimiter1|string_format:"%.6f"}" /><sup>*</sup></td>
+						<td class="border_bottom center"><input name="range_inf[{$range.id_range|intval}]" type="text" value="{$range.delimiter1|string_format:"%.6f"}" /><sup>*</sup><span class="weight_unit">&nbsp; {$PS_WEIGHT_UNIT}</span><span class="price_unit">&nbsp; {$currency_sign}</span></td>
 					{foreachelse}
-						<td class="border_bottom center"><input name="range_inf[{$range.id_range|intval}]" type="text" /><sup>*</sup></td>
+						<td class="border_bottom center"><input name="range_inf[{$range.id_range|intval}]" type="text" /><sup>*</sup><span class="weight_unit">&nbsp; {$PS_WEIGHT_UNIT}</span><span class="price_unit">&nbsp; {$currency_sign}</span></td>
 					{/foreach}
 				</tr>
 				<tr class="range_sup">
 					<td class="center range_type"></td>
 					<td class="border_left "><</td>
 					{foreach from=$ranges key=r item=range}
-						<td class="center"><input name="range_sup[{$range.id_range|intval}]" type="text" {if isset($form_id) && !$form_id} value="" {else} value="{$range.delimiter2|string_format:"%.6f"}" {/if}/><sup>*</sup></td>
+						<td class="center"><input name="range_sup[{$range.id_range|intval}]" type="text" {if isset($form_id) && !$form_id} value="" {else} value="{$range.delimiter2|string_format:"%.6f"}" {/if}/><sup>*</sup><span class="weight_unit">&nbsp; {$PS_WEIGHT_UNIT}</span><span class="price_unit">&nbsp; {$currency_sign}</span></td>
 					{foreachelse}
-						<td class="center"><input name="range_sup[{$range.id_range|intval}]" type="text" /><sup>*</sup></td>
+						<td class="center"><input name="range_sup[{$range.id_range|intval}]" type="text" /><sup>*</sup><span class="weight_unit">&nbsp; {$PS_WEIGHT_UNIT}</span><span class="price_unit">&nbsp; {$currency_sign}</span></td>
 					{/foreach}
 				</tr>
 				<tr class="fees_all">
@@ -24,12 +24,12 @@
 					<td></td>
 					{foreach from=$ranges key=r item=range}
 						<td class="center border_top border_bottom {if $range.id_range != -1} validated {/if}"  >
-							<input type="text" {if isset($form_id) &&  !$form_id} disabled="disabled"{/if} {if $range.id_range == -1} style="display:none"{/if} />
+							<input type="text" {if isset($form_id) &&  !$form_id} disabled="disabled"{/if} {if $range.id_range == -1} style="display:none"{/if} /><span id="currency_sign" style="display:none">&nbsp; {$currency_sign}</span>
 							{if $range.id_range == -1} <button class="button">{l s="Validate"}</button> {/if}
 						</td>
 					{foreachelse}
 						<td class="center border_top border_bottom">
-							<input style="display:none" type="text"  />
+							<input style="display:none" type="text"  /><span id="currency_sign" style="display:none">&nbsp; {$currency_sign}</span>
 							<button class="button">{l s="Validate"}</button>
 						</td>
 					{/foreach}
@@ -42,7 +42,7 @@
 					</td>
 					{foreach from=$ranges key=r item=range}
 						<td class="center">
-							<input name="fees[{$zone.id_zone|intval}][{$range.id_range|intval}]" {if (isset($form_id) &&  !$form_id) || isset($change_ranges) || (isset($fields_value[$input.name][$zone.id_zone]) && !$fields_value[$input.name][$zone.id_zone])} disabled="disabled"{/if} type="text" value="{if isset($price_by_range[$range.id_range][$zone.id_zone]) && $fields_value[$input.name][$zone.id_zone]} {$price_by_range[$range.id_range][$zone.id_zone]|string_format:"%.6f"} {/if}" />
+							<input name="fees[{$zone.id_zone|intval}][{$range.id_range|intval}]" {if (isset($form_id) &&  !$form_id) || isset($change_ranges) || (isset($fields_value[$input.name][$zone.id_zone]) && !$fields_value[$input.name][$zone.id_zone])} disabled="disabled"{/if} type="text" value="{if isset($price_by_range[$range.id_range][$zone.id_zone]) && $fields_value[$input.name][$zone.id_zone]} {$price_by_range[$range.id_range][$zone.id_zone]|string_format:"%.6f"} {/if}" />&nbsp; {$currency_sign}
 						</td>
 					{/foreach}
 				</tr>
diff --git a/controllers/admin/AdminCarrierWizardController.php b/controllers/admin/AdminCarrierWizardController.php
index 5e64982b7..37c91588a 100644
--- a/controllers/admin/AdminCarrierWizardController.php
+++ b/controllers/admin/AdminCarrierWizardController.php
@@ -309,6 +309,10 @@ class AdminCarrierWizardControllerCore extends AdminController
 				));
 		
 		$tpl_vars = array();
+		$tpl_vars['PS_WEIGHT_UNIT'] = Configuration::get('PS_WEIGHT_UNIT');
+		$currency = new Currency(Configuration::get('PS_CURRENCY_DEFAULT'));
+		$tpl_vars['currency_sign'] = $currency->sign;
+		
 		$fields_value = $this->getStepThreeFieldsValues($carrier);
 
 		$this->getTplRangesVarsAndValues($carrier, $tpl_vars, $fields_value);		
@@ -537,7 +541,11 @@ class AdminCarrierWizardControllerCore extends AdminController
 		
 		$template->assign('fields_value', $fields_value);
 		$template->assign('input', array('type' => 'zone',	'name' => 'zones'	));
-
+		
+		$currency = new Currency(Configuration::get('PS_CURRENCY_DEFAULT'));
+		$template->assign('currency_sign', $currency->sign);
+		$template->assign('PS_WEIGHT_UNIT', Configuration::get('PS_WEIGHT_UNIT'));
+		
 		die($template->fetch());
 	}
 	
diff --git a/js/admin_carrier_wizard.js b/js/admin_carrier_wizard.js
index 8e8a86244..9a413d23c 100644
--- a/js/admin_carrier_wizard.js
+++ b/js/admin_carrier_wizard.js
@@ -28,6 +28,7 @@ $(document).ready(function() {
 	bind_inputs();
 	initCarrierWizard();
 	is_freeClick($('input[name="is_free"]:checked'));
+	displayRangeType();
 });
 
 function initCarrierWizard()
@@ -49,9 +50,17 @@ function initCarrierWizard()
 function displayRangeType()
 {
 	if ($('input[name="shipping_method"]:checked').val() == 1)
+	{
 		string = string_weight;
+		$('.weight_unit').show();
+		$('.price_unit').hide();
+	}
 	else
+	{
 		string = string_price;
+		$('.price_unit').show();
+		$('.weight_unit').hide();
+	}
 	
 	$('.range_type').html(string);
 }
@@ -235,7 +244,10 @@ function bind_inputs()
 	$('tr.fees_all td button').off('click').on('click', function () {
 		index = $(this).parent('td').index();
 		if (validateRange(index))
+		{
 			enableRange(index);
+			$('#currency_sign').show();
+		}
 		else
 			disableRange(index);
 		return false;