diff --git a/addons/account/views/report_invoice.xml b/addons/account/views/report_invoice.xml
index f700f57a940..d300b50bcb4 100644
--- a/addons/account/views/report_invoice.xml
+++ b/addons/account/views/report_invoice.xml
@@ -9,7 +9,7 @@
                 <div name="invoice_address" class="col-xs-5 col-xs-offset-7">
                     <address t-field="o.partner_id"
                         t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}' />
-                    <span t-if="o.partner_id.vat">VAT: <span t-field="o.partner_id.vat"/></span>
+                    <div t-if="o.partner_id.vat" class="mt16">VAT: <span t-field="o.partner_id.vat"/></div>
                 </div>
             </div>
 
diff --git a/addons/sale/report/invoice_report_templates.xml b/addons/sale/report/invoice_report_templates.xml
index ef26e950a8f..df610331062 100644
--- a/addons/sale/report/invoice_report_templates.xml
+++ b/addons/sale/report/invoice_report_templates.xml
@@ -77,19 +77,19 @@
             <attribute name="groups">!sale.group_delivery_invoice_address</attribute>
         </xpath>
         <xpath expr="//div[@name='invoice_address']" position="before">
-            <div class="col-xs-5 col-xs-offset-7" groups="sale.group_delivery_invoice_address">
-                <strong t-if="o.partner_shipping_id == o.partner_id">Invoicing and shipping address:</strong>
-                <strong t-if="o.partner_shipping_id != o.partner_id">Invoicing address:</strong>
-                <div t-field="o.partner_id"
-                    t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}'/>
-                <span t-if="o.partner_id.vat">TIN: <span t-field="o.partner_id.vat"/></span>
-                <div t-if="o.partner_shipping_id != o.partner_id" class="mt8">
+            <div class="col-xs-6" groups="sale.group_delivery_invoice_address">
+                <div t-if="o.partner_shipping_id and (o.partner_shipping_id != o.partner_id)">
                     <strong>Shipping address:</strong>
                     <div t-field="o.partner_shipping_id"
                         t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}'/>
-                    <span t-if="o.partner_id.vat">TIN: <span t-field="o.partner_id.vat"/></span>
                 </div>
             </div>
+
+            <div class="col-xs-5 col-xs-offset-1" groups="sale.group_delivery_invoice_address">
+                <div t-field="o.partner_id"
+                    t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}'/>
+                <div t-if="o.partner_id.vat" class="mt16">VAT: <span t-field="o.partner_id.vat"/></div>
+            </div>
         </xpath>
     </template>
 </odoo>