diff --git a/core/lib/Thelia/Controller/Front/CustomerController.php b/core/lib/Thelia/Controller/Front/CustomerController.php
index 2bb01a94a..7f956287e 100755
--- a/core/lib/Thelia/Controller/Front/CustomerController.php
+++ b/core/lib/Thelia/Controller/Front/CustomerController.php
@@ -104,6 +104,24 @@ class CustomerController extends BaseFrontController
 
                 $this->dispatch(TheliaEvents::CUSTOMER_CREATEACCOUNT, $customerCreateEvent);
 
+                $newCustomer = $customerCreateEvent->getCustomer();
+
+                // Newsletter
+                if (true === $form->get('newsletter')->getData()) {
+                    $newsletterEmail = $newCustomer->getEmail();
+                    $nlEvent = new NewsletterEvent($newsletterEmail, $this->getRequest()->getSession()->getLang()->getLocale());
+                    $nlEvent->setFirstname($newCustomer->getFirstname());
+                    $nlEvent->setLastname($newCustomer->getLastname());
+
+                    // Security : Check if this new Email address already exist
+                    if (null !== $newsletter = NewsletterQuery::create()->findOneByEmail($newsletterEmail)) {
+                        $nlEvent->setId($newsletter->getId());
+                        $this->dispatch(TheliaEvents::NEWSLETTER_UPDATE, $nlEvent);
+                    } else {
+                        $this->dispatch(TheliaEvents::NEWSLETTER_SUBSCRIBE, $nlEvent);
+                    }
+                }
+
                 $this->processLogin($customerCreateEvent->getCustomer());
 
                 $cart = $this->getCart($this->getRequest());
diff --git a/core/lib/Thelia/Form/CustomerCreateForm.php b/core/lib/Thelia/Form/CustomerCreateForm.php
index 38da394cc..35954dc88 100755
--- a/core/lib/Thelia/Form/CustomerCreateForm.php
+++ b/core/lib/Thelia/Form/CustomerCreateForm.php
@@ -89,6 +89,14 @@ class CustomerCreateForm extends AddressCreateForm
                     "for" => "password_confirmation"
                 )
             ))
+            // Add Newsletter
+            ->add("newsletter", "checkbox", array(
+                "label" => Translator::getInstance()->trans('I would like to receive the newsletter or the latest news.'),
+                "label_attr" => array(
+                    "for" => "newsletter"
+                ),
+                "required" => false
+            ))
             // Add terms & conditions
             ->add("agreed", "checkbox", array(
                 "constraints" => array(
diff --git a/core/lib/Thelia/Form/CustomerProfileUpdateForm.php b/core/lib/Thelia/Form/CustomerProfileUpdateForm.php
index c7ebd2c43..3bf0c372a 100755
--- a/core/lib/Thelia/Form/CustomerProfileUpdateForm.php
+++ b/core/lib/Thelia/Form/CustomerProfileUpdateForm.php
@@ -55,16 +55,7 @@ class CustomerProfileUpdateForm extends CustomerCreateForm
             ->remove("password")
             ->remove("password_confirm")
             // Remove Terms & conditions
-            ->remove("agreed")
-
-            // Add Newsletter
-            ->add("newsletter", "checkbox", array(
-                "label" => Translator::getInstance()->trans('I would like to receive the newsletter or the latest news.'),
-                "label_attr" => array(
-                    "for" => "newsletter"
-                ),
-                "required" => false
-            ));
+            ->remove("agreed");
     }
 
     /**
diff --git a/core/lib/Thelia/Form/NewsletterForm.php b/core/lib/Thelia/Form/NewsletterForm.php
index ad0aab5a4..2dc910c1d 100644
--- a/core/lib/Thelia/Form/NewsletterForm.php
+++ b/core/lib/Thelia/Form/NewsletterForm.php
@@ -83,7 +83,7 @@ class NewsletterForm extends BaseForm
     {
         $customer = NewsletterQuery::create()->findOneByEmail($value);
         if ($customer) {
-            $context->addViolation("You are already subscribed!");
+            $context->addViolation("You are already registered!");
         }
     }
 
diff --git a/templates/admin/default/I18n/fr_FR.php b/templates/admin/default/I18n/fr_FR.php
index 2de503905..edccca64e 100755
--- a/templates/admin/default/I18n/fr_FR.php
+++ b/templates/admin/default/I18n/fr_FR.php
@@ -79,7 +79,7 @@ return array (
     'Address Line 2' => 'Adresse suite',
     'Additional address' => 'Adresse complémentaire',
     'Address Line 3' => 'Adresse suite',
-    'Zip code' => 'Code posta',
+    'Zip code' => 'Code postal',
     'City' => 'Ville',
     'Country' => 'Pays',
     'Email Address' => 'Adresse e-mail',
diff --git a/templates/default/I18n/fr_FR.php b/templates/default/I18n/fr_FR.php
index 2aaec2b6e..82a4581c4 100755
--- a/templates/default/I18n/fr_FR.php
+++ b/templates/default/I18n/fr_FR.php
@@ -148,7 +148,7 @@ return array(
     'Rating' => 'Avis',
     'Ref.' => '',
     'Register!' => 'S\'inscrire !',
-    'Register' => 'Se connecter',
+    'Register' => 'S\'inscrire',
     'Regular Price:' => 'Prix :',
     'Related' => 'Liés', // voir le contexte pour l'accord
     'Remove this address' => 'Supprimer cette adresse',
@@ -165,7 +165,7 @@ return array(
     'Send' => 'Envoyer',
     'Shipping Tax' => 'Frais de livraison',
     'Show' => 'Voir',
-    'Sign In' => 'S\'inscrire',
+    'Sign In' => 'Se connecter',
     'Sign up to receive our latest news.' => 'Inscrivez-vous pour recevoir nos actualités.',
     'Skip to content' => 'Aller au contenu',
     'Sort By' => 'Trier par',
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/includes/toolbar.html b/templates/default/includes/toolbar.html
index ff8b0d69b..967c63b8d 100644
--- a/templates/default/includes/toolbar.html
+++ b/templates/default/includes/toolbar.html
@@ -41,25 +41,11 @@
         <div class="pagination-container" role="pagination" aria-labelledby="pagination-label-{$toolbar}}">
             <strong id="pagination-label-{$toolbar}}" class="pagination-label">{intl l="Pagination"}</strong>
             <ul class="pagination">
-
-                {if $product_page > 1}
-                    <li><a href="{url path={navigate to="current"} page={$product_page-1} }" title="{intl l="Previous"}" class="prev"><i class="icon-prev"></i></a></li>
-                {else}
-                    <li><a href="#" title="{intl l="Previous"}" class="prev"><i class="icon-prev"></i></a></li>
-                {/if}
+                <li{if $product_page le 1} class="disabled"{/if}><a href="{url path={navigate to="current"} page={$product_page-1} }" title="{intl l="Previous"}" class="prev"><i class="icon-prev"></i></a></li>
                 {pageloop rel="product_list"}
-                {if $PAGE != $CURRENT}
-                    <li><a href="{url path={navigate to="current"} page=$PAGE }"> {$PAGE} </a></li>
-                {else}
-                    <li class="active"><a href="#" tabindex="-1">{$PAGE}</a></li>
-                {/if}
-                {if $PAGE == $LAST}
-                    {if $CURRENT < $LAST}
-                        <li><a href="{url path={navigate to="current"} page={$CURRENT+1} }"  title="{intl l="Next"}" class="next"><i class="icon-next"></i></a></li>
-                    {else}
-                        <li><a href="#" title="{intl l="Next"}" class="next"><i class="icon-next"></i></a></li>
-                    {/if}
-
+                    <li{if $PAGE eq $CURRENT} class="active"{/if}><a href="{url path={navigate to="current"} page=$PAGE }"> {$PAGE} </a></li>
+                {if $PAGE eq $LAST}
+                    <li{if $CURRENT eq $LAST} class="disabled"{/if}><a href="{url path={navigate to="current"} page={$CURRENT+1} }"  title="{intl l="Next"}" class="next"><i class="icon-next"></i></a></li>
                 {/if}
                 {/pageloop}
             </ul>
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>
diff --git a/templates/default/register.html b/templates/default/register.html
index 66fd5e052..50a20f2ee 100644
--- a/templates/default/register.html
+++ b/templates/default/register.html
@@ -245,6 +245,21 @@
                     </div>
                 </fieldset>
 
+                {form_field form=$form field="newsletter"}
+                    <div class="form-group group-newsletter{if $error} has-error{/if}">
+                        <div class="control-input">
+                            <div class="checkbox">
+                                <label class="control-label" for="{$label_attr.for}">
+                                    <input type="checkbox" name="{$name}" id="{$label_attr.for}" value="{$value}"{if $checked} checked{/if}  {if $required} aria-required="true" required{/if}>{$label}
+                                </label>
+                                {if $error }
+                                    <span class="help-block">{$message}</span>
+                                {/if}
+                            </div>
+                        </div>
+                    </div><!--/.form-group-->
+                {/form_field}
+
                 {form_field form=$form field="agreed"}
                 <div class="form-group group-agreed{if $error} has-error{/if}">
                     <div class="control-input">
@@ -262,7 +277,7 @@
 
                 <div class="form-group group-btn">
                     <div class="control-btn">
-                        <button type="submit" class="btn btn-register">{intl l="Sign In"}</button>
+                        <button type="submit" class="btn btn-register">{intl l="Register"}</button>
                     </div>
                 </div><!--/.form-group-->
             </form>