diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
index fe581278d..55507c655 100644
--- a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
@@ -35,5 +35,15 @@
 			<a href="#" onclick="add_new_range();return false;" class="button" id="add_new_range">{l s='Add new range'}<img src="../img/admin/add.gif"/></a>
 		</div>
 	{/if}
+	{if $input.name == 'logo'}
+		<div class="margin-form">
+			<input id="carrier_logo_input" type="file" onchange="uploadCarrierLogo();" name="carrier_logo_input" />
+			<input type="hidden" id="logo" name="logo" value="" />
+			<p class="preference_description">
+				{l s='Format:'} JPG, GIF, PNG. {l s='Filesize:'} {$max_image_size|string_format:"%.2f"} {l s='MB max.'}
+				<br />{l s='Current size:'} <span id="carrier_logo_size">{l s='undefined'}</span>.
+			</p>
+		</div>
+	{/if}
 	{$smarty.block.parent}
 {/block}
diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/logo.tpl b/admin-dev/themes/default/template/controllers/carrier_wizard/logo.tpl
index d8e5c69b6..e43d37114 100644
--- a/admin-dev/themes/default/template/controllers/carrier_wizard/logo.tpl
+++ b/admin-dev/themes/default/template/controllers/carrier_wizard/logo.tpl
@@ -25,15 +25,7 @@
 
 <div id="carrier_logo_block">
 	<img id="carrier_logo_img" src="{if $carrier_logo}{$carrier_logo}{else}../img/admin/carrier-default.jpg{/if}" />
-	<p>
-		<input id="carrier_logo_input" type="file" onchange="uploadCarrierLogo();" name="carrier_logo_input" />
-		<input type="hidden" id="logo" name="logo" value="" />
-	</p>
 	<a id="carrier_logo_remove" {if !$carrier_logo}style="display:none"{/if} href="javascript:removeCarrierLogo();"><img src="../img/admin/disabled.gif" /> {l s='Remove the logo'}</a>
-	<p class="preference_description">
-		{l s='Format:'} JPG, GIF, PNG. {l s='Filesize:'} {$max_image_size|string_format:"%.2f"} {l s='MB max.'}
-		<br />{l s='Current size:'} <span id="carrier_logo_size">{l s='undefined'}</span>.
-	</p>
 </div>
 
 <script type="text/javascript">
diff --git a/controllers/admin/AdminCarrierWizardController.php b/controllers/admin/AdminCarrierWizardController.php
index 6c62f86d7..cd966f2f7 100644
--- a/controllers/admin/AdminCarrierWizardController.php
+++ b/controllers/admin/AdminCarrierWizardController.php
@@ -125,7 +125,6 @@ class AdminCarrierWizardControllerCore extends AdminController
 			array_splice($this->tpl_view_vars['wizard_contents']['contents'], 1, 0, array(0 => $this->renderStepTwo($carrier)));
 			
 		$this->context->smarty->assign(array(
-			'max_image_size' => (int)Configuration::get('PS_PRODUCT_PICTURE_MAX_SIZE') / 1024 / 1024,
 			'carrier_logo' => (Validate::isLoadedObject($carrier) && file_exists(_PS_SHIP_IMG_DIR_.$carrier->id.'.jpg') ? _THEME_SHIP_DIR_.$carrier->id.'.jpg' : false)
 		));
 		$this->content .= $this->createTemplate('logo.tpl')->fetch();
@@ -188,6 +187,11 @@ class AdminCarrierWizardControllerCore extends AdminController
 						'size' => 1,
 						'desc' => $this->l('Enter "0" for a longest shipping delay, or "9" for the shortest shipping delay.')
 					),
+					array(
+						'type' => 'logo',
+						'label' => $this->l('Logo:'),
+						'name' => 'logo',
+					),
 					array(
 						'type' => 'text',
 						'label' => $this->l('Tracking URL:'),
@@ -197,9 +201,10 @@ class AdminCarrierWizardControllerCore extends AdminController
 					),
 				)),
 		);
-
+		
+		$tpl_vars = array('max_image_size' => (int)Configuration::get('PS_PRODUCT_PICTURE_MAX_SIZE') / 1024 / 1024);
 		$fields_value = $this->getStepOneFieldsValues($carrier);
-		return $this->renderGenericForm(array('form' => $this->fields_form), $fields_value);
+		return $this->renderGenericForm(array('form' => $this->fields_form), $fields_value, $tpl_vars);
 	}
 
 	public function renderStepTwo($carrier)
@@ -488,10 +493,12 @@ class AdminCarrierWizardControllerCore extends AdminController
 	{
 		$id_tax_rules_group = (is_object($this->object) && !$this->object->id) ? Carrier::getIdTaxRulesGroupMostUsed() : $this->getFieldValue($carrier, 'id_tax_rules_group');
 		
+		$shipping_handling = (is_object($this->object) && !$this->object->id) ? 0 : $this->getFieldValue($carrier, 'shipping_handling');
+		
 		return array(
 			'is_free' => $this->getFieldValue($carrier, 'is_free'),
 			'id_tax_rules_group' => (int)$id_tax_rules_group,
-			'shipping_handling' => $this->getFieldValue($carrier, 'shipping_handling'),
+			'shipping_handling' => $shipping_handling,
 			'shipping_method' => $this->getFieldValue($carrier, 'shipping_method'),
 			'range_behavior' =>  $this->getFieldValue($carrier, 'range_behavior'),
 			'zones' =>  $this->getFieldValue($carrier, 'zones'),