diff --git a/admin-dev/themes/default/template/controllers/orders/_customized_data.tpl b/admin-dev/themes/default/template/controllers/orders/_customized_data.tpl
index 1a18959e9..aa43c31b8 100755
--- a/admin-dev/themes/default/template/controllers/orders/_customized_data.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/_customized_data.tpl
@@ -23,7 +23,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 {if $product['customizedDatas']}
-	<tbody>
+	
 		<tr class="customized customized-{$product['id_order_detail']|intval}">
 			<td align="center">
 				<input type="hidden" class="edit_product_id_order_detail" value="{$product['id_order_detail']|intval}" />
@@ -152,5 +152,5 @@
 				</tr>
 			{/foreach}
 		{/foreach}
-	</tbody>
+	
 {/if}
diff --git a/admin-dev/themes/default/template/controllers/orders/_discount_form.tpl b/admin-dev/themes/default/template/controllers/orders/_discount_form.tpl
index dc71b2c44..aec626895 100644
--- a/admin-dev/themes/default/template/controllers/orders/_discount_form.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/_discount_form.tpl
@@ -23,54 +23,66 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-	<label>{l s='Name'}</label>
-	<div class="margin-form">
+<div class="row">
+	<label class="control-label col-lg-3">
+		{l s='Name'}
 		<input type="text" name="discount_name" value="" />
-	</div>
+	</label>
 
-	<label>{l s='Type'}</label>
-	<div class="margin-form">
+	<label class="control-label col-lg-3">
+		{l s='Type'}
 		<select name="discount_type" id="discount_type">
 			<option value="1">{l s='Percent'}</option>
 			<option value="2">{l s='Amount'}</option>
 			<option value="3">{l s='Free shipping'}</option>
 		</select>
-	</div>
+	</label>
 
 	<div id="discount_value_field">
-		<label>{l s='Value'}</label>
-		<div class="margin-form">
+		<label class="control-label col-lg-3">
+			{l s='Value'}
+			
 			{if ($currency->format % 2)}
 				<span id="discount_currency_sign" style="display: none;">{$currency->sign}</span>
+			{else}
+				<span id="discount_percent_symbol">%</span>
 			{/if}
-			<input type="text" name="discount_value" size="3" />
 			{if !($currency->format % 2)}
 				<span id="discount_currency_sign" style="display: none;">{$currency->sign}</span>
 			{/if}
-			<span id="discount_percent_symbol">%</span>
-			<p class="preference_description" id="discount_value_help" style="width: 95%;display: none;">
+			<input type="text" name="discount_value" size="3" />
+			<p class="text-muted" id="discount_value_help" style="display: none;">
 				{l s='This value must include taxes.'}
 			</p>
-		</div>
+		</label>
 	</div>
 
 	{if $order->hasInvoice()}
-	<label>{l s='Invoice'}</label>
-	<div class="margin-form">
+	<label class="control-label col-lg-3">
+		{l s='Invoice'}
 		<select name="discount_invoice">
 			{foreach from=$invoices_collection item=invoice}
 				<option value="{$invoice->id}" selected="selected">{$invoice->getInvoiceNumberFormatted($current_id_lang)} - {displayPrice price=$invoice->total_paid_tax_incl currency=$order->id_currency}</option>
 			{/foreach}
-		</select><br />
-		<input type="checkbox" name="discount_all_invoices" id="discount_all_invoices" value="1" /> <label class="t" for="discount_all_invoices">{l s='Apply on all invoices'}</label>
-		<p class="preference_description" style="width: 95%">
+		</select>
+		<p class="checkbox">
+			<label class="control-label" for="discount_all_invoices">
+				<input type="checkbox" name="discount_all_invoices" id="discount_all_invoices" value="1" /> 
+				{l s='Apply on all invoices'}
+			</label>
+		</p>
+		<p class="text-muted">
 			{l s='If you chooses to create this discount for all invoices, only one discount will be created per order invoice.'}
 		</p>
-	</div>
+	</label>
 	{/if}
 
-	<p class="center">
-		<input class="button" type="submit" name="submitNewVoucher" value="{l s='Add'}" />&nbsp;
-		<a href="#" id="cancel_add_voucher">{l s='Cancel'}</a>
+	<p class="col-lg-12 text-right">
+		<input class="btn btn-default" type="submit" name="submitNewVoucher" value="{l s='Add'}" />
+		<a href="#" id="cancel_add_voucher" class="btn btn-default">
+			<i class="icon-remove"></i>
+			{l s='Cancel'}
+		</a>
 	</p>
+</div>
 
diff --git a/admin-dev/themes/default/template/controllers/orders/_documents.tpl b/admin-dev/themes/default/template/controllers/orders/_documents.tpl
index 320fc718c..f75665ac8 100644
--- a/admin-dev/themes/default/template/controllers/orders/_documents.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/_documents.tpl
@@ -83,7 +83,10 @@
 							{/if}
 						{elseif get_class($document) eq 'OrderSlip'}
 							#{Configuration::get('PS_CREDIT_SLIP_PREFIX', $current_id_lang)}{'%06d'|sprintf:$document->id}
-						{/if} <i class="icon-search"></i>
+						{/if} 	<span class="btn btn-default btn-small">
+									<i class="icon-search"></i>
+									{l s='See the document'}
+								</span>
 							</a>
 					</td>
 					<td>
@@ -106,14 +109,23 @@
 						{displayPrice price=$document->amount currency=$currency->id}
 					{/if}
 					</td>
-					<td>
+					<td class="text-right document_action">
 					{if get_class($document) eq 'OrderInvoice'}
 						{if !isset($document->is_delivery)}
 							{if $document->getRestPaid()}
-								<a href="#" class="js-set-payment" data-amount="{$document->getRestPaid()}" data-id-invoice="{$document->id}" title="{l s='Set payment form'}"><img src="../img/admin/money_add.png" alt="{l s='Set payment form'}" /></a>
+								<a href="#" class="js-set-payment btn btn-default btn-small" data-amount="{$document->getRestPaid()}" data-id-invoice="{$document->id}" title="{l s='Set payment form'}">
+									<i class="icon-pencil"></i>
+									{l s='Set payment form'}
+								</a>
 							{/if}
-							<a href="#" onclick="$('#invoiceNote{$document->id}').show(); return false;" title="{if $document->note eq ''}{l s='Add note'}{else}{l s='Edit note'}{/if}">
-								<i class="icon-pencil"></i>
+							<a href="#" class="btn btn-default btn-small" onclick="$('#invoiceNote{$document->id}').show(); return false;" title="{if $document->note eq ''}{l s='Add note'}{else}{l s='Edit note'}{/if}">
+								{if $document->note eq ''}
+									<i class="icon-plus-sign-alt"></i>
+									{l s='Add note'}
+								{else}
+									<i class="icon-pencil"></i>
+									{l s='Edit note'}
+								{/if}
 							</a>
 						{/if}
 					{/if}
@@ -146,13 +158,13 @@
 			{/if}
 		{foreachelse}
 			<tr>
-				<td colspan="5" class="center">
+				<td colspan="5" class="text-center">
 					<h4>{l s='No documents are available'}</h4>
 					{if isset($invoice_management_active) && $invoice_management_active}
-					<a class="button" href="{$current_index}&viewOrder&submitGenerateInvoice&id_order={$order->id}{if isset($smarty.get.token)}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}{/if}">{l s='Generate invoice'}</a>
-						<i class="icon-repeat"></i>
-						{l s='Generate invoice'}
-					</a>
+						<a class="btn btn-default" href="{$current_index}&viewOrder&submitGenerateInvoice&id_order={$order->id}{if isset($smarty.get.token)}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}{/if}">
+							<i class="icon-repeat"></i>
+							{l s='Generate invoice'}
+						</a>
 					{/if}
 				</td>
 			</tr>
diff --git a/admin-dev/themes/default/template/controllers/orders/_new_product.tpl b/admin-dev/themes/default/template/controllers/orders/_new_product.tpl
index 40842f15a..cb7284b7f 100644
--- a/admin-dev/themes/default/template/controllers/orders/_new_product.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/_new_product.tpl
@@ -22,29 +22,47 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-<tbody>
-	<tr id="new_product" height="52" style="display:none;background-color:#e9f1f6">
-		<td style="display:none;" colspan="2">
+
+	<tr id="new_product" style="display:none;">
+		<td colspan="2">
 			<input type="hidden" id="add_product_product_id" name="add_product[product_id]" value="0" />
-			{l s='Product:'} <input type="text" id="add_product_product_name" value="" size="42" />
-			<div id="add_product_product_attribute_area" style="margin-top: 5px;display: none;">
-				{l s='Combinations'} <select name="add_product[product_attribute_id]" id="add_product_product_attribute_id"></select>
+			<label class="control-label col-lg-8">
+				{l s='Product:'} 
+				<input type="text" id="add_product_product_name" value="" />
+			</label>
+			<div id="add_product_product_attribute_area" style="display:none;">
+				<label class="control-label col-lg-8">
+					{l s='Combinations'} 
+					<select name="add_product[product_attribute_id]" id="add_product_product_attribute_id"></select>
+				</label>
 			</div>
-			<div id="add_product_product_warehouse_area" style="margin-top: 5px; display: none;">
-				{l s='Warehouse'} <select  id="add_product_warehouse" name="add_product_warehouse">
-				</select>
+			<div id="add_product_product_warehouse_area" style="display:none;">
+				<label class="control-label col-lg-8">
+					{l s='Warehouse'} 
+					<select  id="add_product_warehouse" name="add_product_warehouse"></select>
+				</label>
 			</div>
 		</td>
-		<td style="display:none;">
-			{if $currency->sign % 2}{$currency->sign}{/if}<input type="text" name="add_product[product_price_tax_excl]" id="add_product_product_price_tax_excl" value="" size="4" disabled="disabled" /> {if !($currency->sign % 2)}{$currency->sign}{/if} {l s='tax excl.'}<br />
-			{if $currency->sign % 2}{$currency->sign}{/if}<input type="text" name="add_product[product_price_tax_incl]" id="add_product_product_price_tax_incl" value="" size="4" disabled="disabled" /> {if !($currency->sign % 2)}{$currency->sign}{/if} {l s='tax incl.'}<br />
+		<td>
+			{if $currency->sign % 2}<span class="col-lg-2">{$currency->sign}</span>{/if}
+			<input class="col-lg-5" type="text" name="add_product[product_price_tax_excl]" id="add_product_product_price_tax_excl" value="" size="4" disabled="disabled" /> 
+			{if !($currency->sign % 2)}<span class="col-lg-2">{$currency->sign}</span>{/if} 
+			<span>{l s='tax excl.'}</span>
+			<span class="col-lg-12"></span>
+			{if $currency->sign % 2}<span class="col-lg-2">{$currency->sign}</span>{/if}
+			<input class="col-lg-5" type="text" name="add_product[product_price_tax_incl]" id="add_product_product_price_tax_incl" value="" size="4" disabled="disabled" /> 
+			{if !($currency->sign % 2)}<span class="col-lg-2">{$currency->sign}</span>{/if} 
+			<span>{l s='tax incl.'}</span>
 		</td>
-		<td style="display:none;" align="center" class="productQuantity"><input type="text" name="add_product[product_quantity]" id="add_product_product_quantity" value="1" size="3" disabled="disabled" /></td>
-		{if ($order->hasBeenPaid())}<td style="display:none;" align="center" class="productQuantity">&nbsp;</td>{/if}
-		{if ($order->hasBeenDelivered())}<td style="display:none;" align="center" class="productQuantity">&nbsp;</td>{/if}
-		<td style="display:none;" align="center" class="productQuantity" id="add_product_product_stock">0</td>
-		<td style="display:none;" align="center" id="add_product_product_total">{displayPrice price=0 currency=$currency->id}</td>
-		<td style="display:none;" align="center" colspan="2">
+		<td class="text-center" class="productQuantity">
+			<input type="text" name="add_product[product_quantity]" id="add_product_product_quantity" value="1" size="3" disabled="disabled" />
+		</td>
+
+		{if ($order->hasBeenPaid())}<td align="center" class="productQuantity">&nbsp;</td>{/if}
+		{if ($order->hasBeenDelivered())}<td align="center" class="productQuantity">&nbsp;</td>{/if}
+		<td class="text-center" class="productQuantity" id="add_product_product_stock">0</td>
+		<td class="text-right" id="add_product_product_total">{displayPrice price=0 currency=$currency->id}</td>
+		<td class="text-center" colspan="2">
 			{if sizeof($invoices_collection)}
 			<select name="add_product[invoice]" id="add_product_product_invoice" disabled="disabled">
 				<optgroup class="existing" label="{l s='Existing'}">
@@ -58,8 +76,8 @@
 			</select>
 			{/if}
 		</td>
-		<td style="display:none;">
-			<input type="button" class="button" id="submitAddProduct" value="{l s='Add product'}" disabled="disabled" />
+		<td>
+			<input type="button" class="btn btn-default" id="submitAddProduct" value="{l s='Add product'}" disabled="disabled" />
 		</td>
 	</tr>
 	<tr id="new_invoice" style="display:none;background-color:#e9f1f6;">
@@ -76,4 +94,3 @@
 			</div>
 		</td>
 	</tr>
-</tbody>
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/orders/_product_line.tpl b/admin-dev/themes/default/template/controllers/orders/_product_line.tpl
index d2f8a25db..cf4a7f4b1 100755
--- a/admin-dev/themes/default/template/controllers/orders/_product_line.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/_product_line.tpl
@@ -31,25 +31,27 @@
 {/if}
 
 {if ($product['product_quantity'] > $product['customizationQuantityTotal'])}
-<tbody>
+
 	<tr{if isset($product.image) && $product.image->id && isset($product.image_size)} height="{$product['image_size'][1] + 7}"{/if}>
 		<td align="center">{if isset($product.image) && $product.image->id}{$product.image_tag}{/if}</td>
-		<td><a href="index.php?controller=adminproducts&id_product={$product['product_id']}&updateproduct&token={getAdminToken tab='AdminProducts'}">
-			<span class="productName">{$product['product_name']}</span><br />
-			{if $product.product_reference}{l s='Ref:'} {$product.product_reference}<br />{/if}
-			{if $product.product_supplier_reference}{l s='Ref Supplier:'} {$product.product_supplier_reference}{/if}
-		</a></td>
+		<td>
+			<a href="index.php?controller=adminproducts&id_product={$product['product_id']}&updateproduct&token={getAdminToken tab='AdminProducts'}">
+				<span class="productName">{$product['product_name']}</span><br />
+				{if $product.product_reference}{l s='Ref:'} {$product.product_reference}<br />{/if}
+				{if $product.product_supplier_reference}{l s='Ref Supplier:'} {$product.product_supplier_reference}{/if}
+			</a>
+		</td>
 		<td>
 			<span class="product_price_show">{displayPrice price=$product_price currency=$currency->id}</span>
 			{if $can_edit}
-			<span class="product_price_edit" style="display:none;">
-				<input type="hidden" name="product_id_order_detail" class="edit_product_id_order_detail" value="{$product['id_order_detail']}" />
-				{if $currency->sign % 2}{$currency->sign}{/if}<input type="text" name="product_price_tax_excl" class="edit_product_price_tax_excl edit_product_price" value="{Tools::ps_round($product['unit_price_tax_excl'], 2)}" size="5" /> {if !($currency->sign % 2)}{$currency->sign}{/if} {l s='tax excl.'}<br />
-				{if $currency->sign % 2}{$currency->sign}{/if}<input type="text" name="product_price_tax_incl" class="edit_product_price_tax_incl edit_product_price" value="{Tools::ps_round($product['unit_price_tax_incl'], 2)}" size="5" /> {if !($currency->sign % 2)}{$currency->sign}{/if} {l s='tax incl.'}
-			</span>
+				<span class="product_price_edit" style="display:none;">
+					<input type="hidden" name="product_id_order_detail" class="edit_product_id_order_detail" value="{$product['id_order_detail']}" />
+					{if $currency->sign % 2}{$currency->sign}{/if}<input type="text" name="product_price_tax_excl" class="edit_product_price_tax_excl edit_product_price" value="{Tools::ps_round($product['unit_price_tax_excl'], 2)}" size="5" /> {if !($currency->sign % 2)}{$currency->sign}{/if} {l s='tax excl.'}<br />
+					{if $currency->sign % 2}{$currency->sign}{/if}<input type="text" name="product_price_tax_incl" class="edit_product_price_tax_incl edit_product_price" value="{Tools::ps_round($product['unit_price_tax_incl'], 2)}" size="5" /> {if !($currency->sign % 2)}{$currency->sign}{/if} {l s='tax incl.'}
+				</span>
 			{/if}
 		</td>
-		<td align="center" class="productQuantity">
+		<td class="text-center" class="productQuantity">
 			<span class="product_quantity_show{if (int)$product['product_quantity'] > 1} red bold{/if}">{$product['product_quantity']}</span>
 			{if $can_edit}
 			<span class="product_quantity_edit" style="display:none;">
@@ -58,23 +60,19 @@
 			{/if}
 		</td>
 		{if ($order->hasBeenPaid())}
-			<td align="center" class="productQuantity">
+			<td class="text-center" class="productQuantity">
 				{$product['product_quantity_refunded']}
 				{if count($product['refund_history'])}
-					<span class="tooltip">
-						<span class="tooltip_label tooltip_button">+</span>
-						<div class="tooltip_content">
-						<span class="title">{l s='Refund history'}</span>
-						{foreach $product['refund_history'] as $refund}
-							{l s='%1s - %2s' sprintf=[{dateFormat date=$refund.date_add}, {displayPrice price=$refund.amount_tax_incl}]}<br />
-						{/foreach}
-						</div>
-					</span>
+					<label class="control-label">
+						<span title="" data-toggle="tooltip" class="label-tooltip" data-original-title="{l s='Refund history:'} {foreach $product['refund_history'] as $refund}{l s='%1s - %2s' sprintf=[{dateFormat date=$refund.date_add}, {displayPrice price=$refund.amount_tax_incl}]}{/foreach}">
+							+
+						</span>
+					</label>
 				{/if}
 			</td>
 		{/if}
 		{if $order->hasBeenDelivered() || $order->hasProductReturned()}
-			<td align="center" class="productQuantity">
+			<td class="text-center" class="productQuantity">
 				{$product['product_quantity_return']}
 				{if count($product['return_history'])}
 					<span class="tooltip">
@@ -89,12 +87,12 @@
 				{/if}
 			</td>
 		{/if}
-		{if $stock_management}<td align="center" class="productQuantity product_stock">{$product['current_stock']}</td>{/if}
+		{if $stock_management}<td class="text-center" class="productQuantity product_stock">{$product['current_stock']}</td>{/if}
 		<td class="total_product text-right">
 			{displayPrice price=(Tools::ps_round($product_price, 2) * ($product['product_quantity'] - $product['customizationQuantityTotal'])) currency=$currency->id}
 		</td>
 		<td colspan="2" style="display: none;" class="add_product_fields">&nbsp;</td>
-		<td align="center" class="cancelCheck standard_refund_fields current-edit" style="display:none">
+		<td class="text-center" class="cancelCheck standard_refund_fields current-edit" style="display:none">
 			<input type="hidden" name="totalQtyReturn" id="totalQtyReturn" value="{$product['product_quantity_return']}" />
 			<input type="hidden" name="totalQty" id="totalQty" value="{$product['product_quantity']}" />
 			<input type="hidden" name="productName" id="productName" value="{$product['product_name']}" />
@@ -152,13 +150,38 @@
 			&nbsp;
 			{/if}
 		</td>
-		<td class="product_action" style="text-align:right">
-			<a href="#" class="edit_product_change_link"><img src="../img/admin/edit.gif" alt="{l s='Edit'}" /></a>
-			<input type="submit" class="button" name="submitProductChange" value="{l s='Update'}"  style="display: none;" />
-			<a href="#" class="cancel_product_change_link" style="display: none;"><img src="../img/admin/disabled.gif" alt="{l s='Cancel'}" /></a>
-			<a href="#" class="delete_product_line"><img src="../img/admin/delete.gif" alt="{l s='Delete'}" /></a>
+		<td class="product_action">
+			<div class="btn-group btn-group-action">
+				<span class="btn btn-default btn-small">{l s='Choose an action'}</span>
+				<button class="btn btn-default btn-small dropdown-toggle" data-toggle="dropdown">
+					<span class="caret"></span>&nbsp;
+				</button>
+				<ul class="dropdown-menu">
+					<li>
+						<a href="#" class="edit_product_change_link">
+							<i class="icon-pencil"></i>
+							{l s='Edit'}
+						</a>
+					</li>
+					<li>
+						<input type="submit" class="btn btn-default" name="submitProductChange" value="{l s='Update'}"  style="display: none;" />
+					</li>
+					<li>
+						<a href="#" class="cancel_product_change_link" style="display: none;">
+							<i class="icon-remove"></i>
+							{l s='Cancel'}
+						</a>
+					</li>
+					<li>
+						<a href="#" class="delete_product_line">
+							<i class="icon-trash"></i>
+							{l s='Delete'}
+						</a>
+					</li>
+				</ul>
+			</div>
 		</td>
 		{/if}
 	</tr>
-</tbody>
+
 {/if}
diff --git a/admin-dev/themes/default/template/controllers/orders/_shipping.tpl b/admin-dev/themes/default/template/controllers/orders/_shipping.tpl
index 8e8e52da8..10d490720 100644
--- a/admin-dev/themes/default/template/controllers/orders/_shipping.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/_shipping.tpl
@@ -66,16 +66,15 @@
 						<span class="shipping_number_edit" style="display:none;">
 							<input type="hidden" name="id_order_carrier" value="{$line.id_order_carrier|htmlentities}" />
 							<input type="text" name="tracking_number" value="{$line.tracking_number|htmlentities}" />
-							<button type="submit" class="btn btn-small" name="submitShippingNumber"> 
-								<i class="icon-refresh"></i>
-								{l s='Update'}
-							</button>
+							<input type="submit" class="btn btn-default" name="submitShippingNumber" value="{l s='Update'}" />
 						</span>
-						<a href="#" class="edit_shipping_number_link">
+						<a href="#" class="edit_shipping_number_link btn btn-default">
 							<i class="icon-search"></i>
+							{l s='Edit'}
 						</a>
-						<a href="#" class="cancel_shipping_number_link" style="display: none;">
+						<a href="#" class="cancel_shipping_number_link btn btn-default" style="display: none;">
 							<i class="icon-remove"></i>
+							{l s='Cancel'}
 						</a>
 					</form>
 				{/if}
diff --git a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
index 7da3bf8a6..962c44aea 100755
--- a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
@@ -152,7 +152,7 @@
 				</button>
 
 				<!-- History of status -->
-				<table cellspacing="0" cellpadding="0" class="table table-hover">
+				<table class="table">
 					<colgroup>
 						<col width="1%">
 						<col width="">
@@ -432,7 +432,7 @@
 						<i class="icon-shopping-cart"></i>
 						{l s='Linked orders'}
 					</legend>
-					<table class="table table-hover" width="100%;" cellspacing="0" cellpadding="0">
+					<table class="table">
 						<thead>
 							<tr>
 								<th width="15%">
@@ -473,7 +473,7 @@
 	{/if}
 
 	<!-- Documents block -->
-	<div class="col-lg-6">
+	<div class="col-lg-12">
 		<form action="" method="">
 			<fieldset class="well">
 				<legend>
@@ -487,7 +487,7 @@
 	</div>
 
 	<!-- Payments block -->
-	<div class="col-lg-6">
+	<div class="col-lg-12">
 		<form action="" method="">
 			<fieldset class="well">
 				<legend>
@@ -507,9 +507,7 @@
 							{/foreach}
 						</select>
 					</div>
-					<button type="submit" class="btn btn-default" name="submitChangeCurrency"> 
-						{l s='Change'}
-					</button>
+					<input type="submit" class="btn btn-default" name="submitChangeCurrency" value="{l s='Change'}" />
 				</form>
 				<hr/>
 				{/if}
@@ -530,7 +528,7 @@
 				</p>
 				{/if}
 				<form id="formAddPayment" method="post" action="{$current_index}&vieworder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
-					<table class="table table-hover" width="100%" cellspacing="0" cellpadding="0">
+					<table class="table">
 						<colgroup>
 							<col width="15%">
 							<col width="39%">
@@ -574,8 +572,9 @@
 								{/if}
 								</td>
 								<td class="text-right">
-									<a href="#" class="open_payment_information">
+									<a href="#" class="open_payment_information btn btn-default">
 										<i class="icon-search"></i>
+										{l s='See payment information'}
 									</a>
 								</td>
 							</tr>
@@ -657,9 +656,7 @@
 								</td>
 								{/if}
 								<td>
-									<button class="btn btn-default" type="submit" name="submitAddPayment"> 
-										{l s='Add'}
-									</button>
+									<input class="btn btn-default" type="submit" name="submitAddPayment" value="{l s='Add'}" />
 								</td>
 							</tr>
 						</tbody>
@@ -738,7 +735,7 @@
 					</legend>
 
 					{if $order->getReturn()|count > 0}
-					<table class="table table-hover" width="100%" cellspacing="0" cellpadding="0">
+					<table class="table">
 						<thead>
 							<tr>
 								<th width="30%">
@@ -773,11 +770,13 @@
 											<input type="text" name="tracking_number" value="{$line.tracking_number|htmlentities}" />
 											<input type="submit" class="button" name="submitShippingNumber" value="{l s='Update'}" />
 										</span>
-										<a href="#" class="edit_shipping_number_link">
+										<a href="#" class="edit_shipping_number_link btn btn-default">
 											<i class="icon-pencil"></i>
+											{l s='Edit'}
 										</a>
-										<a href="#" class="cancel_shipping_number_link" style="display: none;">
+										<a href="#" class="cancel_shipping_number_link btn btn-default" style="display: none;">
 											<i class="icon-remove"></i>
+											{l s='Cancel'}
 										</a>
 									</form>
 									{/if}
@@ -809,22 +808,22 @@
 					<i class="icon-shopping-cart"></i>
 					{l s='Products:'}
 				</legend>
-				{if $can_edit}
-				{if !$order->hasBeenDelivered()}
-					<a href="#" class="add_product btn btn-default">
-						<i class="icon-plus-sign-alt"></i>
-						{l s='Add a product'}
-					</a>
-				{/if}
-				<div style="float: right; margin-right: 10px" id="refundForm">
-				
-					<!--<a href="#" class="standard_refund"><img src="../img/admin/add.gif" alt="{l s='Process a standard refund'}" /> {l s='Process a standard refund'}</a>
-					<a href="#" class="partial_refund"><img src="../img/admin/add.gif" alt="{l s='Process a partial refund'}" /> {l s='Process a partial refund'}</a>-->
-				
-				</div>
-				{/if}
 				<div class="col-lg-12">
-					<table cellspacing="0" cellpadding="0" class="table table-hover" id="orderProducts">
+					{if $can_edit}
+						{if !$order->hasBeenDelivered()}
+							<a href="#" class="add_product btn btn-default">
+								<i class="icon-plus-sign-alt"></i>
+								{l s='Add a product'}
+							</a>
+						{/if}
+						<div id="refundForm">
+							<!--<a href="#" class="standard_refund"><img src="../img/admin/add.gif" alt="{l s='Process a standard refund'}" /> {l s='Process a standard refund'}</a>
+							<a href="#" class="partial_refund"><img src="../img/admin/add.gif" alt="{l s='Process a partial refund'}" /> {l s='Process a partial refund'}</a>-->
+						</div>
+					{/if}
+				</div>
+				<div class="col-lg-12">
+					<table class="table" id="orderProducts">
 						<thead>
 							<tr>
 								<th height="39" width="7%">&nbsp;</th>
@@ -879,16 +878,18 @@
 								{/if}
 							</tr>
 						</thead>
-						{foreach from=$products item=product key=k}
-							{* Include customized datas partial *}
-							{include file='controllers/orders/_customized_data.tpl'}
+						<tbody>
+							{foreach from=$products item=product key=k}
+								{* Include customized datas partial *}
+								{include file='controllers/orders/_customized_data.tpl'}
 
-							{* Include product line partial *}
-							{include file='controllers/orders/_product_line.tpl'}
-						{/foreach}
-						{if $can_edit}
-							{include file='controllers/orders/_new_product.tpl'}
-						{/if}
+								{* Include product line partial *}
+								{include file='controllers/orders/_product_line.tpl'}
+							{/foreach}
+							{if $can_edit}
+								{include file='controllers/orders/_new_product.tpl'}
+							{/if}
+						</tbody>
 					</table>
 				</div>
 				<div class="col-lg-12">
@@ -907,7 +908,7 @@
 					</p>
 				</div>
 				<div class="col-lg-7 pull-right">
-					<table class="table table-hover" cellspacing="0" cellpadding="0">
+					<table class="table">
 						<tr id="total_products">
 							<td width="150">
 								<span><strong>{l s='Products:'}</strong></span>
@@ -959,62 +960,8 @@
 						</tr>
 					</table>
 				</div>
-
-				{if (sizeof($discounts) || $can_edit)}
-				<div class="col-lg-7 pull-right">
-					<table cellspacing="0" cellpadding="0" class="table table-hover" style="width:100%;">
-						<tr>
-							<th><img src="../img/admin/coupon.gif" alt="{l s='Discounts'}" />{l s='Discount name'}</th>
-							<th align="center" style="width: 100px">{l s='Value'}</th>
-							{if $can_edit}<th align="center" style="width: 30px">{l s='Action'}</th>{/if}
-						</tr>
-						{foreach from=$discounts item=discount}
-						<tr>
-							<td>{$discount['name']}</td>
-							<td align="center">
-							{if $discount['value'] != 0.00}
-								-
-							{/if}
-							{displayPrice price=$discount['value'] currency=$currency->id}
-							</td>
-							{if $can_edit}
-							<td class="text-center">
-								<a href="{$current_index}&submitDeleteVoucher&id_order_cart_rule={$discount['id_order_cart_rule']}&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}"><img src="../img/admin/delete.gif" alt="{l s='Delete voucher'}" /></a>
-							</td>
-							{/if}
-						</tr>
-						{/foreach}
-					{if $can_edit}
-						<tr>
-							<td colspan="3" class="text-center">
-								<a class="button" href="#" id="add_voucher"><img src="../img/admin/add.gif" alt="{l s='Add'}" /> {l s='Add a new discount'}</a>
-							</td>
-						</tr>
-						<tr style="display: none" >
-							<td colspan="3" class="current-edit" id="voucher_form">
-								{include file='controllers/orders/_discount_form.tpl'}
-							</td>
-						</tr>
-					{/if}
-					</table>
-				</div>
-				{/if}
-
-				<div style="display: none;" class="standard_refund_fields">
-					{if ($order->hasBeenDelivered() && Configuration::get('PS_ORDER_RETURN'))}
-						<input type="checkbox" name="reinjectQuantities" class="button" />&nbsp;<label for="reinjectQuantities" style="float:none; font-weight:normal;">{l s='Re-stock products'}</label><br />
-					{/if}
-					{if ((!$order->hasBeenDelivered() && $order->hasBeenPaid()) || ($order->hasBeenDelivered() && Configuration::get('PS_ORDER_RETURN')))}
-						<input type="checkbox" id="generateCreditSlip" name="generateCreditSlip" class="button" onclick="toggleShippingCost(this)" />&nbsp;<label for="generateCreditSlip" style="float:none; font-weight:normal;">{l s='Generate a credit card slip'}</label><br />
-						<input type="checkbox" id="generateDiscount" name="generateDiscount" class="button" onclick="toggleShippingCost(this)" />&nbsp;<label for="generateDiscount" style="float:none; font-weight:normal;">{l s='Generate a voucher'}</label><br />
-						<span id="spanShippingBack" style="display:none;"><input type="checkbox" id="shippingBack" name="shippingBack" class="button" />&nbsp;<label for="shippingBack" style="float:none; font-weight:normal;">{l s='Repay shipping costs'}</label><br /></span>
-					{/if}
-					{if (!$order->hasBeenDelivered() || ($order->hasBeenDelivered() && Configuration::get('PS_ORDER_RETURN')))}
-						<div style="text-align:center; margin-top:5px;">
-							<input type="submit" name="cancelProduct" value="{if $order->hasBeenDelivered()}{l s='Return products'}{elseif $order->hasBeenPaid()}{l s='Refund products'}{else}{l s='Cancel products'}{/if}" class="button" style="margin-top:8px;" />
-						</div>
-					{/if}
-				</div>
+				
+				<!-- Partial refund -->
 				<div style="display:none;" class="partial_refund_fields col-lg-7 pull-right">
 					<div class="checkbox">
 						<label for="reinjectQuantities" class="control-label">
@@ -1028,14 +975,115 @@
 							{l s='Generate a voucher'}
 						</label>
 					</div>
-					<button type="submit" name="partialRefund" class="btn btn-default"> 
-						{l s='Partial refund'}
-					</button>
-					
+					<input type="submit" name="partialRefund" value="{l s='Partial refund'}" class="btn btn-default"/>
 				</div>
+				
+				<!-- Standard refund -->
+				<div style="display: none;" class="standard_refund_fields col-lg-7 pull-right">
+					{if ($order->hasBeenDelivered() && Configuration::get('PS_ORDER_RETURN'))}
+						<div class="checkbox">
+							<label for="reinjectQuantities" class="control-label">
+								<input type="checkbox" name="reinjectQuantities" class="button" />
+								{l s='Re-stock products'}
+							</label>
+						</div>
+					{/if}
+					{if ((!$order->hasBeenDelivered() && $order->hasBeenPaid()) || ($order->hasBeenDelivered() && Configuration::get('PS_ORDER_RETURN')))}
+							
+						<input type="checkbox" id="generateCreditSlip" name="generateCreditSlip" onclick="toggleShippingCost(this)" />
+						<label for="generateCreditSlip" class="control-label">{l s='Generate a credit card slip'}</label><br />
+
+						<input type="checkbox" id="generateDiscount" name="generateDiscount" onclick="toggleShippingCost(this)" />
+						<label for="generateCreditSlip" class="control-label">{l s='Generate a voucher'}</label><br />
+
+						<span id="spanShippingBack" style="display:none;">
+							<input type="checkbox" id="shippingBack" name="shippingBack" />
+							<label for="shippingBack" class="control-label">{l s='Repay shipping costs'}</label>
+						</span>
+					{/if}
+					{if (!$order->hasBeenDelivered() || ($order->hasBeenDelivered() && Configuration::get('PS_ORDER_RETURN')))}
+						<div>
+							<input type="submit" name="cancelProduct" value="{if $order->hasBeenDelivered()}{l s='Return products'}{elseif $order->hasBeenPaid()}{l s='Refund products'}{else}{l s='Cancel products'}{/if}" class="btn btn-default" />
+						</div>
+					{/if}
+				</div>
+
+				<!-- Discount block -->
+				{if (sizeof($discounts) || $can_edit)}
+				<div class="col-lg-12">
+					<legend>
+						<i class="icon-tag"></i>
+						{l s='Discounts'}
+					</legend>
+					{*
+						TO DO - Je voudrais placer le bouton ici mais l'apparition du formulaire ne fonctionne plus....
+						<a class="btn btn-default" href="#" id="add_voucher">
+							<i class="icon-plus-sign-alt"></i>
+							{l s='Add a new discount'}
+						</a>
+		
+					*}
+					<table class="table">
+						<thead>
+							<tr>
+								<th>
+									<span class="title_box ">{l s='Discount name'}</span>
+								</th>
+								<th class="text-center" width="100">
+									<span class="title_box ">{l s='Value'}</span>
+								</th>
+								{if $can_edit}
+									<th class="text-center" width="30">
+										<span class="title_box ">{l s='Action'}</span>
+									</th>
+								{/if}
+							</tr>
+						</thead>
+						<tbody>
+							{foreach from=$discounts item=discount}
+								<tr>
+									<td>{$discount['name']}</td>
+									<td class="text-center">
+										{if $discount['value'] != 0.00}
+											-
+										{/if}
+										{displayPrice price=$discount['value'] currency=$currency->id}
+									</td>
+									{if $can_edit}
+									<td class="text-center">
+										<a class="btn btn-default btn-small" href="{$current_index}&submitDeleteVoucher&id_order_cart_rule={$discount['id_order_cart_rule']}&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
+											<i class="icon-remove"></i>
+											{l s='Delete voucher'}
+										</a>
+									</td>
+									{/if}
+								</tr>
+							{/foreach}
+							{if $can_edit}
+								<tr>
+									<td colspan="3" class="text-right">
+										<a class="btn btn-default" href="#" id="add_voucher">
+											<i class="icon-plus-sign-alt"></i>
+											{l s='Add a new discount'}
+										</a>
+									</td>
+								</tr>
+								<tr style="display: none" >
+									<td colspan="3" class="current-edit" id="voucher_form">
+										{include file='controllers/orders/_discount_form.tpl'}
+									</td>
+								</tr>
+							{/if}
+						</tbody>
+					</table>
+				</div>
+				{/if}
 			</fieldset>
 		</form>
 	</div>
 </div>
-<a href="{$current_index}&token={$smarty.get.token}"><img src="../img/admin/arrow2.gif" /> {l s='Back to list'}</a><br />
+<a class="btn btn-default" href="{$current_index}&token={$smarty.get.token}">
+	<i class="icon-arrow-left"></i>
+	{l s='Back to list'}
+</a>
 {/block}
diff --git a/admin-dev/themes/default/template/controllers/products/combinations.tpl b/admin-dev/themes/default/template/controllers/products/combinations.tpl
index 3eaeda6e9..67bcc57a2 100644
--- a/admin-dev/themes/default/template/controllers/products/combinations.tpl
+++ b/admin-dev/themes/default/template/controllers/products/combinations.tpl
@@ -28,6 +28,7 @@
 	var msg_combination_2 = '{l s='Please choose a value.'}';
 	var msg_combination_3 = '{l s='You can only add one combination per attribute type.'}';
 	var msg_new_combination = '{l s='New combination'}';
+	var msg_cancel_combination = '{l s='Cancel combination'}';
 </script>
 
 {if isset($product->id) && !$product->is_virtual}
@@ -65,10 +66,10 @@
 	
 <div id="add_new_combination" class="panel" style="display: none;">
 
-	<div class="panel-heading">Panel heading</div>
+	<div class="panel-heading">{l s='Add or modify combinations for this product.'}</div>
 
 	<div class="row">
-		<label class="control-label col-lg-3">{l s='Attribute:'}</label>
+		<label class="control-label col-lg-3" for="attribute_group">{l s='Attribute:'}</label>
 		<div class="col-lg-5">
 			<select name="attribute_group" id="attribute_group" onchange="populate_attrs();">
 			{if isset($attributes_groups)}
@@ -81,7 +82,7 @@
 	</div>
 
 	<div class="row">
-		<label class="control-label col-lg-3">{l s='Value:'}</label>
+		<label class="control-label col-lg-3" for="attribute">{l s='Value:'}</label>
 		<div class="col-lg-9">
 			<div class="row">
 				<div class="col-lg-8">
@@ -113,7 +114,7 @@
 	<hr/>
 
 	<div class="row">
-		<label class="control-label col-lg-3">
+		<label class="control-label col-lg-3" for="attribute_reference">
 			<span class="label-tooltip" data-toggle="tooltip"
 				title="{l s='Special characters allowed:'} .-_#">
 				{l s='Reference:'}
@@ -125,7 +126,7 @@
 	</div>		
 
 	<div class="row">
-		<label class="control-label col-lg-3">
+		<label class="control-label col-lg-3" for="attribute_ean13">
 			{l s='EAN13:'}
 		</label>
 		<div class="col-lg-3">
@@ -134,7 +135,7 @@
 	</div>		
 
 	<div class="row">
-		<label class="control-label col-lg-3">
+		<label class="control-label col-lg-3" for="attribute_upc">
 			{l s='UPC:'}
 		</label>
 		<div class="col-lg-3">
@@ -146,7 +147,7 @@
 
 	<div class="row">
 		{include file="controllers/products/multishop/checkbox.tpl" field="attribute_wholesale_price" type="default"}
-		<label class="control-label col-lg-3">
+		<label class="control-label col-lg-3" for="attribute_wholesale_price">
 			<span class="label-tooltip" data-toggle="tooltip"
 				title="{l s='Leave blank if the price does not change'}">
 				{l s='Wholesale price:'}
@@ -166,7 +167,7 @@
 
 	<div class="row">
 		{include file="controllers/products/multishop/checkbox.tpl" field="attribute_price_impact" type="attribute_price_impact"}
-		<label class="control-label col-lg-3">
+		<label class="control-label col-lg-3" for="attribute_price_impact">
 			{l s='Impact on price:'}
 		</label>
 		<div class="col-lg-9">
@@ -180,7 +181,7 @@
 				</div>
 				<div id="span_impact" class="col-lg-8">
 					<div class="row">
-						<label class="control-label col-lg-1">
+						<label class="control-label col-lg-1" for="attribute_price">
 								{l s='of'}			
 						</label>
 						<div class="input-group col-lg-5">
@@ -195,7 +196,7 @@
 
 							<input type="text" id="attribute_price" value="0.00" onkeyup="$('#attribute_priceTEReal').val(this.value.replace(/,/g, '.')); if (isArrowKey(event)) return ;this.value = this.value.replace(/,/g, '.'); calcImpactPriceTI();"/>
 						</div>
-						<label class="control-label col-lg-1">
+						<label class="control-label col-lg-1" for="attribute_priceTI">
 								{l s='or'}
 						</label>
 						<div class="input-group col-lg-5">
@@ -225,7 +226,7 @@
 
 	<div class="row">
 		{include file="controllers/products/multishop/checkbox.tpl" field="attribute_weight_impact" type="attribute_weight_impact"}
-		<label class="control-label col-lg-3">
+		<label class="control-label col-lg-3" for="attribute_weight_impact">
 			{l s='Impact on weight:'}
 		</label>
 		<div class="col-lg-9">
@@ -239,7 +240,7 @@
 				</div>
 				<div id="span_weight_impact" class="col-lg-8">
 					<div class="row">
-						<label class="control-label col-lg-1">
+						<label class="control-label col-lg-1" for="attribute_weight">
 							{l s='of'}
 						</label>
 						<div class="input-group col-lg-5">
@@ -256,7 +257,7 @@
 
 	<div id="tr_unit_impact" class="row">
 		{include file="controllers/products/multishop/checkbox.tpl" field="attribute_unit_impact" type="attribute_unit_impact"}
-		<label class="control-label col-lg-3">{l s='Impact on unit price :'}</label>
+		<label class="control-label col-lg-3" for="attribute_unit_impact">{l s='Impact on unit price :'}</label>
 		<div class="col-lg-3">
 			<select name="attribute_unit_impact" id="attribute_unit_impact" onchange="check_unit_impact();">
 				<option value="0">{l s='None'}</option>
@@ -266,7 +267,7 @@
 		</div>
 		<div class="col-lg-6">
 			<div class="row">
-				<label class="control-label col-lg-1">
+				<label class="control-label col-lg-1" for="attribute_unity">
 					{l s='of'}
 				</label>
 				<div class="input-group col-lg-5">
@@ -284,7 +285,7 @@
 	{if $ps_use_ecotax}
 	<div class="row">
 		{include file="controllers/products/multishop/checkbox.tpl" field="attribute_ecotax" type="default"}
-		<label class="control-label col-lg-3">
+		<label class="control-label col-lg-3" for="attribute_ecotax">
 			<span class="label-tooltip" data-toggle="tooltip"
 				title="{l s='overrides Eco-tax in the "Information" tab'}">
 				{l s='Eco-tax (tax excl.):'}
@@ -302,7 +303,7 @@
 
 	<div class="row">
 		{include file="controllers/products/multishop/checkbox.tpl" field="attribute_minimal_quantity" type="default"}
-		<label class="control-label col-lg-3">
+		<label class="control-label col-lg-3" for="attribute_minimal_quantity">
 			<span class="label-tooltip" data-toggle="tooltip"
 				title="{l s='The minimum quantity to buy this product (set to 1 to disable this feature)'}">
 				{l s='Minimum quantity:'}
@@ -316,7 +317,7 @@
 
 	<div class="row">
 		{include file="controllers/products/multishop/checkbox.tpl" field="available_date_attribute" type="default"}
-		<label class="control-label col-lg-3">
+		<label class="control-label col-lg-3" for="available_date_attribute">
 			<span class="label-tooltip" data-toggle="tooltip"
 				title="{l s='The available date when this product is out of stock.'}">
 				{l s='Available date:'}
@@ -359,7 +360,7 @@
 
 	<div class="row">
 		{include file="controllers/products/multishop/checkbox.tpl" field="attribute_default" type="attribute_default"}
-		<label class="control-label col-lg-3">{l s='Default:'}</label>
+		<label class="control-label col-lg-3" for="attribute_default">{l s='Default:'}</label>
 		<div class="col-lg-9">
 			<p class="checkbox">
 			<label for="attribute_default">
@@ -372,7 +373,7 @@
 	
 	<div class="panel-footer">
 		<span id="ResetSpan">
-			<button type="reset" name="ResetBtn" id="ResetBtn" onclick="getE('id_product_attribute').value = 0;" class="btn btn-default">
+			<button type="reset" name="ResetBtn" id="ResetBtn" onclick="$('#desc-product-newCombination').click();" class="btn btn-default">
 				<i class="icon-undo"></i> {l s='Cancel modification'}
 			</button>
 		</span>
diff --git a/admin-dev/themes/default/template/controllers/products/shipping.tpl b/admin-dev/themes/default/template/controllers/products/shipping.tpl
index 122baca91..d0122d172 100644
--- a/admin-dev/themes/default/template/controllers/products/shipping.tpl
+++ b/admin-dev/themes/default/template/controllers/products/shipping.tpl
@@ -81,26 +81,31 @@
 </div>
 
 <div class="row">
-	<label class="control-label col-lg-5" for="carriers_restriction">
-		<span class="label-tooltip" data-toggle="tooltip"
-			title="{l s='If no carrier selected, all carriers can be used to ship this product.'}">
-			{l s='Carriers:'}
-		</span>
-		
-	</label>
-	<div class="col-lg-3">
-		<select name="carriers[]" id="carriers_restriction" multiple="multiple">
-			{foreach $carrier_list as $carrier}
-				<option value="{$carrier.id_reference}" {if isset($carrier.selected) && $carrier.selected}selected="selected"{/if}>{$carrier.name}</option>
-			{/foreach}
-		</select>
-		<button class="btn btn-default" onclick="unselectAllCarriers(); return false;">{l s='Unselect all'}</button>
+	<label class="control-label col-lg-5" for="availableCarriers">{l s='Carriers:'}</label>
+	<div class="input-group col-lg-7">
+		<div class="row">
+			<div class="col-lg-6">
+				<label for="availableCarriers">{l s='Available carriers'}</label>
+				<select multiple id="availableCarriers" name="availableCarriers">
+					{foreach $carrier_list as $carrier}
+						{if !isset($carrier.selected) || !$carrier.selected}
+							<option value="{$carrier.id_reference}">{$carrier.name}</option>
+						{/if}
+					{/foreach}
+				</select>
+				<a href="#" id="addCarrier" class="btn btn-default btn-block">{l s='Add'} <i class="icon-arrow-right"></i></a>
+			</div>
+			<div class="col-lg-6">
+				<label for="selectedCarriers">{l s='Selected carriers'}</label>
+				<select multiple id="selectedCarriers" name="selectedCarriers[]">
+					{foreach $carrier_list as $carrier}
+						{if isset($carrier.selected) && $carrier.selected}
+							<option value="{$carrier.id_reference}">{$carrier.name}</option>
+						{/if}
+					{/foreach}
+				</select>
+				<a href="#" id="removeCarrier" class="btn btn-default btn-block"><i class="icon-arrow-left"></i> {l s='Remove'}</a>
+			</div>
+		</div>
 	</div>
-</div>
-
-<script>
-	function unselectAllCarriers()
-	{ $('#carriers_restriction option').each(function () { $(this).removeAttr('selected')});
-		return false;
-	}
-</script>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 362a92562..4bd25af78 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -3603,8 +3603,9 @@ class AdminProductsControllerCore extends AdminController
 		{
 			$carriers = array();
 			
-			if (Tools::getValue('carriers'))
-				$carriers = Tools::getValue('carriers');
+			if (Tools::getValue('selectedCarriers'))
+				$carriers = Tools::getValue('selectedCarriers');
+
 			$product->setCarriers($carriers);
 		}
 	}
diff --git a/js/admin-products.js b/js/admin-products.js
index b148f7734..f13d8d0fa 100644
--- a/js/admin-products.js
+++ b/js/admin-products.js
@@ -191,11 +191,11 @@ product_tabs['Combinations'] = new function(){
 	};
 
 	this.removeButtonCombination = function(item)
-	{
+	{		
 		$('#add_new_combination').show();
 		$('.process-icon-newCombination').removeClass('toolbar-new');
 		$('.process-icon-newCombination').addClass('toolbar-cancel');
-		$('#desc-product-newCombination div').html($('#ResetBtn').val());
+		$('#desc-product-newCombination div').html(msg_cancel_combination);
 		$('id_product_attribute').val(0);
 		self.init_elems();
 	};
@@ -760,6 +760,32 @@ product_tabs['Attachments'] = new function(){
 	};
 }
 
+product_tabs['Shipping'] = new function(){
+	var self = this;
+
+	this.bindCarriersEvents = function (){
+		$("#addCarrier").live('click', function() {
+			$('#availableCarriers option:selected').each( function() {
+	                $('#selectedCarriers').append("<option value='"+$(this).val()+"'>"+$(this).text()+"</option>");
+	            $(this).remove();
+	        });
+	        $('#selectedCarriers option').prop('selected', true);
+		});
+
+		$("#removeCarrier").live('click', function() {
+			$('#selectedCarriers option:selected').each( function() {
+	            $('#availableCarriers').append("<option value='"+$(this).val()+"'>"+$(this).text()+"</option>");
+	            $(this).remove();
+	        });
+			$('#selectedCarriers option').prop('selected', true);
+		});
+	};
+
+	this.onReady = function(){
+		self.bindCarriersEvents();
+	};
+}
+
 product_tabs['Informations'] = new function(){
 	var self = this;
 	this.bindAvailableForOrder = function (){