diff --git a/local/modules/MondialRelay/templates/email/default/mondial-relay-tracking-message.html b/local/modules/MondialRelay/templates/email/default/mondial-relay-tracking-message.html
index e34603f3..19182d50 100644
--- a/local/modules/MondialRelay/templates/email/default/mondial-relay-tracking-message.html
+++ b/local/modules/MondialRelay/templates/email/default/mondial-relay-tracking-message.html
@@ -15,8 +15,6 @@
 
 {* Content  *}
 {block name="email-content"}
-{view_url}
-
 {loop type="order" name="order" id=$order_id}
     {loop type="customer" name="customer.order" current=false id=$CUSTOMER backend_context="1"}
         <p>{intl l="Dear %first %last" last=$LASTNAME first=$FIRSTNAME},</p>
diff --git a/templates/frontOffice/default2020/I18n/en_US.php b/templates/frontOffice/default2020/I18n/en_US.php
index b488d822..87c007e4 100644
--- a/templates/frontOffice/default2020/I18n/en_US.php
+++ b/templates/frontOffice/default2020/I18n/en_US.php
@@ -264,4 +264,5 @@ return array(
     'per page' => 'per page',
     'update' => 'update',
     'with:' => 'with:',
+    'bypass-estimation' => 'Shipping cost will be calculated on step 2 : to proceed your order, press button ',
 );
diff --git a/templates/frontOffice/default2020/I18n/fr_FR.php b/templates/frontOffice/default2020/I18n/fr_FR.php
index 496523cf..9329b32a 100644
--- a/templates/frontOffice/default2020/I18n/fr_FR.php
+++ b/templates/frontOffice/default2020/I18n/fr_FR.php
@@ -260,4 +260,5 @@ return array(
     'update' => 'mettre à jour',
     'with:' => 'avec :',
     '404' => '404',
+    'bypass-estimation' => 'Les frais de livraison seront calculés à l\'étape 2 : pour poursuivre, cliquez sur le bouton ',
 );
diff --git a/templates/frontOffice/default2020/assets/dist/css/custom.min.css b/templates/frontOffice/default2020/assets/dist/css/custom.min.css
index 71c38e85..11e958cb 100644
--- a/templates/frontOffice/default2020/assets/dist/css/custom.min.css
+++ b/templates/frontOffice/default2020/assets/dist/css/custom.min.css
@@ -1 +1 @@
-div.container{width:90%!important}.container{width:95%}.navbar li.cart-not-empty>a.cart:before{color:#fff}h2.name{line-height:1}.logo-custom img{width:250px}.texte-complementaire-module{padding-left:30px;font-style:italic;font-weight:400}.table-delivery tbody>tr>td.module-mondialrelay{padding-left:0;padding-right:0;padding-top:0;width:67%}#delivery-method.panel .image.module-mondialrelay{text-align:left}body>div.bootbox.modal.fade.in>div>div>div>div>div>table>tbody>tr:nth-child(2)>td:nth-child(1)>img{width:300px}
\ No newline at end of file
+div.container{width:90%!important}.container{width:95%}.navbar li.cart-not-empty>a.cart:before{color:#fff}h2.name{line-height:1}.logo-custom img{width:250px}.texte-complementaire-module{padding-left:30px;font-style:italic;font-weight:400}.table-delivery tbody>tr>td.module-mondialrelay{padding-left:0;padding-right:0;padding-top:0;width:67%}#delivery-method.panel .image.module-mondialrelay{text-align:left}body>div.bootbox.modal.fade.in>div>div>div>div>div>table>tbody>tr:nth-child(2)>td:nth-child(1)>img{width:300px}.table-cart tbody>tr>td.bypass-estimation{text-align:right;font-size:larger}
\ No newline at end of file
diff --git a/templates/frontOffice/default2020/assets/src/css/custom.css b/templates/frontOffice/default2020/assets/src/css/custom.css
index eb6da3ca..44f96909 100644
--- a/templates/frontOffice/default2020/assets/src/css/custom.css
+++ b/templates/frontOffice/default2020/assets/src/css/custom.css
@@ -40,4 +40,9 @@ header .logo-custom {
 
 body > div.bootbox.modal.fade.in > div > div > div > div > div > table > tbody > tr:nth-child(2) > td:nth-child(1) > img {
     width: 300px;
+}
+
+.table-cart tbody>tr>td.bypass-estimation {
+    text-align: right;
+    font-size: larger;
 }
\ No newline at end of file
diff --git a/templates/frontOffice/default2020/cart.html b/templates/frontOffice/default2020/cart.html
index e703a460..848a8522 100644
--- a/templates/frontOffice/default2020/cart.html
+++ b/templates/frontOffice/default2020/cart.html
@@ -130,7 +130,7 @@
                         {if {cart attr="is_virtual"} != 1}
                         {postage}
                         {assign var="postageAmount" value=$postage }
-                        <tr>
+                       <!-- <tr>
                             <td class="product" colspan="2">
                                 <form action="{url path="/cart/country"}" class="form-inline" method="post">
                                     <h3>
@@ -167,6 +167,10 @@
                             <td class="qty">-</td>
                             <td class="subprice">{format_money number=$postage}</td>
                         </tr>
+                        //-->
+                        <tr>
+                            <td class="bypass-estimation" colspan="5">{intl l="bypass-estimation"}<b>{intl l="Proceed checkout"}</b></td>
+                        </tr>
                         {/postage}
                         {else}
                         {assign var="postageAmount" value=0 }