diff --git a/themes/default/product.tpl b/themes/default/product.tpl
index c7aa80b55..57d465a85 100644
--- a/themes/default/product.tpl
+++ b/themes/default/product.tpl
@@ -363,6 +363,11 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
 		<div class="content_prices clearfix">
 			<!-- prices -->
 			{if $product->show_price AND !isset($restricted_country_mode) AND !$PS_CATALOG_MODE}
+
+			{if $product->online_only}
+			<p class="online_only">{l s='Online only'}</p>
+			{/if}
+			
 			<div class="price">
 				{if !$priceDisplay || $priceDisplay == 2}
 					{assign var='productPrice' value=$product->getPrice(true, $smarty.const.NULL)}
@@ -428,10 +433,6 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
 			{/if}
 			{*close if for show price*}
 			{/if}
-
-			{if $product->online_only}
-				<p class="online_only">{l s='Online only'}</p>
-			{/if}
 			
 			<p{if (!$allow_oosp && $product->quantity > 0) OR !$product->available_for_order OR (isset($restricted_country_mode) AND $restricted_country_mode) OR $PS_CATALOG_MODE} style="display: none;"{/if} id="add_to_cart" class="buttons_bottom_block"><span></span><input type="submit" name="Submit" value="{l s='Add to cart'}" class="exclusive" /></p>
 			
@@ -528,10 +529,10 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
 								{if $accessory.show_price AND !isset($restricted_country_mode) AND !$PS_CATALOG_MODE}<span class="price">{if $priceDisplay != 1}{displayWtPrice p=$accessory.price}{else}{displayWtPrice p=$accessory.price_tax_exc}{/if}</span>{/if}
 								<a class="button" href="{$accessoryLink|escape:'htmlall':'UTF-8'}" title="{l s='View'}">{l s='View'}</a>
 								{if ($accessory.allow_oosp || $accessory.quantity > 0) AND $accessory.available_for_order AND !isset($restricted_country_mode) AND !$PS_CATALOG_MODE}
-									<a class="exclusive button ajax_add_to_cart_button" href="{$link->getPageLink('cart', true, NULL, "qty=1&amp;id_product={$accessory.id_product|intval}&amp;token={$static_token}&amp;add")}" rel="ajax_id_product_{$accessory.id_product|intval}" title="{l s='Add to cart'}">{l s='Add to cart'}</a>
+								<a class="exclusive button ajax_add_to_cart_button" href="{$link->getPageLink('cart', true, NULL, "qty=1&amp;id_product={$accessory.id_product|intval}&amp;token={$static_token}&amp;add")}" rel="ajax_id_product_{$accessory.id_product|intval}" title="{l s='Add to cart'}">{l s='Add to cart'}</a>
 								{else}
-									<span class="exclusive">{l s='Add to cart'}</span>
-									<span class="availability">{if (isset($accessory.quantity_all_versions) && $accessory.quantity_all_versions > 0)}{l s='Product available with different options'}{else}{l s='Out of stock'}{/if}</span>
+								<span class="exclusive">{l s='Add to cart'}</span>
+								<span class="availability">{if (isset($accessory.quantity_all_versions) && $accessory.quantity_all_versions > 0)}{l s='Product available with different options'}{else}{l s='Out of stock'}{/if}</span>
 								{/if}
 							</p>
 						</li>
diff --git a/themes/default/shopping-cart.tpl b/themes/default/shopping-cart.tpl
index 4fe781b09..ff12f90db 100644
--- a/themes/default/shopping-cart.tpl
+++ b/themes/default/shopping-cart.tpl
@@ -82,8 +82,26 @@
 			</tr>
 		</thead>
 		<tfoot>
+		{if $use_taxes}
+			{if $priceDisplay}
+				<tr class="cart_total_price">
+					<td colspan="5">{l s='Total products'}{if $display_tax_label} {l s='(tax excl.)'}{/if}{l s=':'}</td>
+					<td colspan="2" class="price" id="total_product">{displayPrice price=$total_products}</td>
+				</tr>
+			{else}
+				<tr class="cart_total_price">
+					<td colspan="5">{l s='Total products'}{if $display_tax_label} {l s='(tax incl.)'}{/if}{l s=':'}</td>
+					<td colspan="2" class="price" id="total_product">{displayPrice price=$total_products_wt}</td>
+				</tr>
+			{/if}
+		{else}
+			<tr class="cart_total_price">
+				<td colspan="5">{l s='Total products:'}</td>
+				<td colspan="2" class="price" id="total_product">{displayPrice price=$total_products}</td>
+			</tr>
+		{/if}
 			<tr class="cart_total_voucher" {if $total_discounts == 0}style="display: none;"{/if}>
-				<td colspan="6">
+				<td colspan="5">
 				{if $use_taxes}
 					{if $priceDisplay}
 						{l s='Total vouchers'}{if $display_tax_label} {l s='(tax excl.)'}{/if}{l s=':'}
@@ -94,7 +112,7 @@
 					{l s='Total vouchers:'}
 				{/if}
 				</td>
-				<td class="price-discount" id="total_discount">
+				<td colspan="2" class="price-discount" id="total_discount">
 				{if $use_taxes}
 					{if $priceDisplay}
 						{displayPrice price=$total_discounts_tax_exc}
@@ -107,7 +125,7 @@
 				</td>
 			</tr>
 			<tr class="cart_total_voucher" {if $total_wrapping == 0}style="display: none;"{/if}>
-				<td colspan="6">
+				<td colspan="5">
 				{if $use_taxes}
 					{if $priceDisplay}
 						{l s='Total gift-wrapping'}{if $display_tax_label} {l s='(tax excl.)'}{/if}{l s=':'}
@@ -118,7 +136,7 @@
 					{l s='Total gift-wrapping:'}
 				{/if}
 				</td>
-				<td class="price-discount" id="total_wrapping">
+				<td colspan="2" class="price-discount" id="total_wrapping">
 				{if $use_taxes}
 					{if $priceDisplay}
 						{displayPrice price=$total_wrapping_tax_exc}
@@ -133,23 +151,31 @@
 			{if $use_taxes}
 				{if $priceDisplay}
 					<tr class="cart_total_delivery" {if $shippingCost <= 0} style="display:none;"{/if}>
-						<td colspan="6">{l s='Total shipping'}{if $display_tax_label} {l s='(tax excl.)'}{/if}{l s=':'}</td>
-						<td class="price" id="total_shipping">{displayPrice price=$shippingCostTaxExc}</td>
+						<td colspan="5">{l s='Total shipping'}{if $display_tax_label} {l s='(tax excl.)'}{/if}{l s=':'}</td>
+						<td colspan="2" class="price" id="total_shipping">{displayPrice price=$shippingCostTaxExc}</td>
 					</tr>
 				{else}
 					<tr class="cart_total_delivery"{if $shippingCost <= 0} style="display:none;"{/if}>
-						<td colspan="6">{l s='Total shipping'}{if $display_tax_label} {l s='(tax incl.)'}{/if}{l s=':'}</td>
-						<td class="price" id="total_shipping" >{displayPrice price=$shippingCost}</td>
+						<td colspan="5">{l s='Total shipping'}{if $display_tax_label} {l s='(tax incl.)'}{/if}{l s=':'}</td>
+						<td colspan="2" class="price" id="total_shipping" >{displayPrice price=$shippingCost}</td>
 					</tr>
 				{/if}
 			{else}
 				<tr class="cart_total_delivery"{if $shippingCost <= 0} style="display:none;"{/if}>
-					<td colspan="6">{l s='Total shipping:'}</td>
-					<td class="price" id="total_shipping" >{displayPrice price=$shippingCostTaxExc}</td>
+					<td colspan="5">{l s='Total shipping:'}</td>
+					<td colspan="2" class="price" id="total_shipping" >{displayPrice price=$shippingCostTaxExc}</td>
 				</tr>
 			{/if}
 
 		{if $use_taxes}
+			<tr class="cart_total_price">
+				<td colspan="5">{l s='Total (tax excl.):'}</td>
+				<td colspan="2" class="price" id="total_price_without_tax">{displayPrice price=$total_price_without_tax}</td>
+			</tr>
+			<tr class="cart_total_tax">
+				<td colspan="5">{l s='Total tax:'}</td>
+				<td colspan="2" class="price" id="total_tax">{displayPrice price=$total_tax}</td>
+			</tr>
 			<tr class="cart_total_price">
 				<td colspan="5" id="cart_voucher" class="cart_voucher">
 				{if $voucherAllowed}