diff --git a/templates/default/account.html b/templates/default/account.html
index 639ea25a2..73da05a66 100644
--- a/templates/default/account.html
+++ b/templates/default/account.html
@@ -156,7 +156,7 @@
                                 <tr>
                                     <td>{$REF}</td>
                                     <td>{format_date date=$CREATE_DATE}</td>
-                                    <td>{loop type="currency" name="order.currency" id={$CURRENCY}}{$SYMBOL}{/loop} {format_number number=$TOTAL_TAXED_AMOUNT}</td>
+                                    <td>{format_number number=$TOTAL_TAXED_AMOUNT} {loop type="currency" name="order.currency" id={$CURRENCY}}{$SYMBOL}{/loop}</td>
                                     <td><span class="label-delivered">{loop type="order-status" name="order.status" id={$STATUS}}{$TITLE}{/loop}</span></td>
                                     <td><a href="#" class="btn btn-order-details" data-toggle="tooltip" title="{intl l="View order %ref as pdf document" ref={$REF}}"><span class="icon-cloud-download"></span> {intl l="Order details"}</a></td>
                                 </tr>
diff --git a/templates/default/cart.html b/templates/default/cart.html
index 73cd57ddc..592b5f34c 100644
--- a/templates/default/cart.html
+++ b/templates/default/cart.html
@@ -89,11 +89,11 @@
                         <td class="unitprice">
                             {if $IS_PROMO == 1}
                                 {assign "real_price" $PROMO_TAXED_PRICE}
-                                <div class="special-price"><span class="price">{currency attr="symbol"} {$PROMO_TAXED_PRICE}</span></div>
-                                <small class="old-price">{intl l="instead of"} <span class="price">{currency attr="symbol"} {$TAXED_PRICE}</span></small>
+                                <div class="special-price"><span class="price">{$PROMO_TAXED_PRICE} {currency attr="symbol"}</span></div>
+                                <small class="old-price">{intl l="instead of"} <span class="price">{$TAXED_PRICE} {currency attr="symbol"}</span></small>
                             {else}
                                 {assign "real_price" $TAXED_PRICE}
-                                <div class="special-price"><span class="price">{currency attr="symbol"} {$TAXED_PRICE}</span></div>
+                                <div class="special-price"><span class="price">{$TAXED_PRICE} {currency attr="symbol"}</span></div>
                             {/if}
                         </td>
                         <td class="qty">
@@ -109,7 +109,7 @@
                             </div>
                         </td>
                         <td class="subprice">
-                            <span class="price">{currency attr="symbol"} {$real_price * $QUANTITY}</span>
+                            <span class="price">{$real_price * $QUANTITY} {currency attr="symbol"}</span>
                         </td>
                     </tr>
 
@@ -121,7 +121,7 @@
                     <th class="total">{intl l="Total"}</th>
                     <td class="total">
                         <div class="total-price">
-                            <span class="price">{currency attr="symbol"} {cart attr="total_taxed_price"}</span>
+                            <span class="price">{cart attr="total_taxed_price"} {currency attr="symbol"}</span>
                         </div>
                     </td>
                 </tr>
diff --git a/templates/default/includes/addedToCart.html b/templates/default/includes/addedToCart.html
index 273162529..e90fc6029 100644
--- a/templates/default/includes/addedToCart.html
+++ b/templates/default/includes/addedToCart.html
@@ -18,11 +18,11 @@
 
                     {if $IS_PROMO == 1}
                         {assign "real_price" $PROMO_TAXED_PRICE}
-                        <div class="special-price"><span class="price">{currency attr="symbol"} {$PROMO_TAXED_PRICE}</span></div>
-                        <small class="old-price"> <span class="price">{currency attr="symbol"} {$TAXED_PRICE}</span></small>
+                        <div class="special-price"><span class="price">{$PROMO_TAXED_PRICE} {currency attr="symbol"}</span></div>
+                        <small class="old-price"> <span class="price">{$TAXED_PRICE} {currency attr="symbol"}</span></small>
                     {else}
                         {assign "real_price" $TAXED_PRICE}
-                        <div class="special-price"><span class="price">{currency attr="symbol"} {$TAXED_PRICE}</span></div>
+                        <div class="special-price"><span class="price">{$TAXED_PRICE} {currency attr="symbol"}</span></div>
                     {/if}
 
                 </td>
diff --git a/templates/default/includes/mini-cart.html b/templates/default/includes/mini-cart.html
index 2858d535b..96e0126b7 100644
--- a/templates/default/includes/mini-cart.html
+++ b/templates/default/includes/mini-cart.html
@@ -34,7 +34,7 @@
                             {else}
                                 {assign "real_price" $TAXED_PRICE}
                             {/if}
-                            <span class="qty">{$QUANTITY}</span> X <span class="price" style="font-size:1em;">{currency attr="symbol"}{$real_price}</span></div>
+                            <span class="qty">{$QUANTITY}</span> X <span class="price" style="font-size:1em;">{$real_price} {currency attr="symbol"}</span></div>
                             {assign "total_price" $total_price + ($QUANTITY * $real_price)}
                         </td>
                     </tr>
@@ -49,7 +49,7 @@
                         </td>
                         <td class="total">
                             <div class="total-price">
-                                <span class="price">{currency attr="symbol"}{$total_price}</span>
+                                <span class="price">{$total_price} {currency attr="symbol"}</span>
                             </div>
                         </td>
                     </tr>
diff --git a/templates/default/order-delivery.html b/templates/default/order-delivery.html
index c38b3fb0f..2576ee381 100644
--- a/templates/default/order-delivery.html
+++ b/templates/default/order-delivery.html
@@ -134,7 +134,7 @@
                                 {/if}
                                 <label for="delivery-method_{$ID}">
                                     <input type="radio" name="{$name}" id="delivery-method_{$ID}"{if $isDeliveryMethodChecked} checked="checked"{/if} value="{$ID}">
-                                    <strong>{$TITLE}</strong> / {currency attr="symbol"} {$POSTAGE}
+                                    <strong>{$TITLE}</strong> / {$POSTAGE} {currency attr="symbol"}
                                 </label>
                             {/form_field}
                         </div>
diff --git a/templates/default/order-invoice.html b/templates/default/order-invoice.html
index d75c08b78..83c71c485 100644
--- a/templates/default/order-invoice.html
+++ b/templates/default/order-invoice.html
@@ -103,18 +103,18 @@
                         <td class="unitprice">
                             {if $IS_PROMO == 1}
                                 {assign "real_price" $PROMO_TAXED_PRICE}
-                                <div class="special-price"><span class="price">{currency attr="symbol"} {$PROMO_TAXED_PRICE}</span></div>
-                                <small class="old-price">{intl l="instead of"} <span class="price">{currency attr="symbol"} {$TAXED_PRICE}</span></small>
+                                <div class="special-price"><span class="price">{$PROMO_TAXED_PRICE} {currency attr="symbol"}</span></div>
+                                <small class="old-price">{intl l="instead of"} <span class="price">{$TAXED_PRICE} {currency attr="symbol"}</span></small>
                             {else}
                                 {assign "real_price" $TAXED_PRICE}
-                                <div class="special-price"><span class="price">{currency attr="symbol"} {$TAXED_PRICE}</span></div>
+                                <div class="special-price"><span class="price">{$TAXED_PRICE} {currency attr="symbol"} </span></div>
                             {/if}
                         </td>
                         <td class="qty">
                             <span class="price">{$QUANTITY}</span>
                         </td>
                         <td class="subprice">
-                            <span class="price">{currency attr="symbol"} {$real_price * $QUANTITY}</span>
+                            <span class="price">{$real_price * $QUANTITY} {currency attr="symbol"}</span>
                         </td>
                     </tr>
 
@@ -127,7 +127,7 @@
                         <th class="shipping">{intl l="Shipping Tax"}</th>
                         <td class="shipping">
                             <div class="shipping-price">
-                                <span class="price">{currency attr="symbol"} {order attr="postage"}</span>
+                                <span class="price">{order attr="postage"} {currency attr="symbol"}</span>
                             </div>
                         </td>
                     </tr>
@@ -153,7 +153,7 @@
                         <th class="total">{intl l="Total"}</th>
                         <td class="total">
                             <div class="total-price">
-                                <span class="price">{currency attr="symbol"} {{cart attr="total_taxed_price"} + {order attr="postage"}}</span>
+                                <span class="price">{{cart attr="total_taxed_price"} + {order attr="postage"}} {currency attr="symbol"}</span>
                             </div>
                         </td>
                     </tr>
diff --git a/templates/default/order-placed.html b/templates/default/order-placed.html
index 4931896f5..c8a1a24f2 100644
--- a/templates/default/order-placed.html
+++ b/templates/default/order-placed.html
@@ -42,7 +42,7 @@
                         <dt>{intl l="Date"} : </dt>
                         <dd>{format_date date=$CREATE_DATE output="date"}</dd>
                         <dt>{intl l="Total"} : </dt>
-                        <dd>{loop type="currency" name="order-currency" id=$CURRENCY}{$SYMBOL}{/loop} {$TOTAL_TAXED_AMOUNT}</dd>
+                        <dd>{$TOTAL_TAXED_AMOUNT} {loop type="currency" name="order-currency" id=$CURRENCY}{$SYMBOL}{/loop}</dd>
                     </dl>
                 </div>
             </div>