diff --git a/addons/payment/models/payment_acquirer.py b/addons/payment/models/payment_acquirer.py
index 625c443777b..1e717d139a5 100644
--- a/addons/payment/models/payment_acquirer.py
+++ b/addons/payment/models/payment_acquirer.py
@@ -123,7 +123,7 @@ class PaymentAcquirer(osv.Model):
         'pending_msg': '<i>Pending,</i> Your online payment has been successfully processed. But your order is not validated yet.',
         'done_msg': '<i>Done,</i> Your online payment has been successfully processed. Thank you for your order.',
         'cancel_msg': '<i>Cancel,</i> Your payment has been cancelled.',
-        'error_msg': '<i>Error,</i> An error occurred. We cannot process your payment for the moment, please try again later.'
+        'error_msg': "<i>Error,</i> Please be aware that an error occurred during the transaction. The order has been confirmed but won't be paid. Don't hesitate to contact us if you have any questions on the status of your order."
     }
 
     def _check_required_if_provider(self, cr, uid, ids, context=None):
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 86073774f6c..9c7da70e2e2 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -1291,7 +1291,7 @@
                         <tbody>
                             <tr>
                                 <td colspan="2">
-                                    <t t-call="website_sale.payment_confirmation_status"/>
+                                    <strong>Payment Method:</strong> <t t-esc="order.payment_acquirer_id.name"/>
                                 </td>
                                 <td class="text-right" width="100"><strong>Total:</strong></td>
                                 <td class="text-right" width="100">
@@ -1301,6 +1301,7 @@
                             </tr>
                         </tbody>
                     </table>
+                    <t t-call="website_sale.payment_confirmation_status"/>
                 </div>
               </div>
               <div class="col-md-3 col-md-offset-1 text-muted">
@@ -1394,23 +1395,31 @@
 
 <!-- payment acquirer information -->
 <template id="payment_confirmation_status">
-    <strong>Payment Method:</strong> <t t-esc="order.payment_acquirer_id.name"/><br />
-    <strong>Payment Status:</strong>
     <t t-if="order.payment_acquirer_id.auto_confirm == 'none'">
+      <div class="alert alert-info" role="alert">
         <t t-raw="order.payment_acquirer_id.pending_msg"/>
+      </div>
     </t>
     <t t-if="order.payment_acquirer_id.auto_confirm == 'at_pay_confirm'">
         <t t-if="order.payment_tx_id.state == 'pending'">
+          <div class="alert alert-info" role="alert">
             <t t-raw="order.payment_acquirer_id.pending_msg"/>
+          </div>
         </t>
         <t t-if="order.payment_tx_id.state == 'done'">
+          <div class="alert alert-success" role="alert">
             <t t-raw="order.payment_acquirer_id.done_msg"/>
+          </div>
         </t>
         <t t-if="order.payment_tx_id.state == 'cancel'">
+          <div class="alert alert-danger" role="alert">
             <t t-raw="order.payment_acquirer_id.cancel_msg"/>
+          </div>
         </t>
         <t t-if="order.payment_tx_id.state == 'error'">
+          <div class="alert alert-danger" role="alert">
             <t t-raw="order.payment_acquirer_id.error_msg"/>
+          </div>
         </t>
     </t>
 </template>