diff --git a/addons/delivery/data/mail_template_data.xml b/addons/delivery/data/mail_template_data.xml
index 14e566c5213..e8b6f08ebfc 100644
--- a/addons/delivery/data/mail_template_data.xml
+++ b/addons/delivery/data/mail_template_data.xml
@@ -1,30 +1,39 @@
 <?xml version='1.0' encoding='utf-8'?>
-<odoo>
-  <data noupdate="1">
+<odoo><data noupdate="1">
     <record id="mail_template_data_delivery_confirmation" model="mail.template">
-      <field name="name">Delivery: Send by Email</field>
-      <field name="subject">${object.company_id.name} Delivery Order (Ref ${object.name or 'n/a' })</field>
-      <field name="partner_to">${object.partner_id.id}</field>
-      <field name="model_id" ref="delivery.model_stock_picking"/>
-      <field name="report_template" ref="stock.action_report_delivery"/>
-      <field name="report_name">${(object.name or '').replace('/','_')}</field>
-      <field name="lang">${object.partner_id.lang}</field>
-      <field name="body_html" type="xml">
-<p>Dear ${object.partner_id.name},</p>
-<p>We are glad to inform you that your order has been shipped.</p>
-<p>
-%if object.carrier_tracking_ref:
-  Your tracking reference:
-  %if object.carrier_tracking_url:
-    <a href="${object.carrier_tracking_url}" target="_blank">${object.carrier_tracking_ref}</a>.
-  %else:
-    ${object.carrier_tracking_ref}.
-  %endif
-%endif
-</p>
-<p>Find your delivery order attached for more details.</p>
-<p>Thank you,</p>
-      </field>
+        <field name="name">Delivery: Send by Email</field>
+        <field name="model_id" ref="delivery.model_stock_picking"/>
+        <field name="subject">${object.company_id.name} Delivery Order (Ref ${object.name or 'n/a' })</field>
+        <field name="partner_to">${object.partner_id.id}</field>
+        <field name="body_html" type="html">
+<div style="margin: 0px; padding: 0px;">
+    <p style="margin: 0px; padding: 0px; font-size: 13px;">
+        Hello ${object.partner_id.name},<br/><br/>
+        We are glad to inform you that your order has been shipped.
+        %if object.carrier_tracking_ref:
+            Your tracking reference is
+            <strong>
+            %if object.carrier_tracking_url:
+                <a href="${object.carrier_tracking_url}" target="_blank">${object.carrier_tracking_ref}</a>.
+            %else:
+                ${object.carrier_tracking_ref}.
+            %endif
+            </strong>
+        %endif
+        <br/><br/>
+        Please find your delivery order attached for more details.<br/><br/>
+        Thank you,<br/>
+        % if user and user.signature:
+          ${user.signature | safe}
+        % endif
+    </p>
+</div>
+        </field>
+        <field name="report_template" ref="stock.action_report_delivery"/>
+        <field name="report_name">${(object.name or '').replace('/','_')}</field>
+        <field name="lang">${object.partner_id.lang}</field>
+        <field name="auto_delete" eval="True"/>
+        <field name="user_signature" eval="False"/>
     </record>
-  </data>
+</data>
 </odoo>
diff --git a/addons/delivery/models/stock_picking.py b/addons/delivery/models/stock_picking.py
index 7eddcc52d04..ca8d41cca67 100644
--- a/addons/delivery/models/stock_picking.py
+++ b/addons/delivery/models/stock_picking.py
@@ -141,7 +141,7 @@ class StockPicking(models.Model):
             default_model='stock.picking',
             default_use_template=bool(delivery_template_id),
             default_template_id=delivery_template_id,
-            custom_layout='mail.mail_notification_borders'
+            custom_layout='mail.mail_notification_light'
         )
         return {
             'type': 'ir.actions.act_window',