diff --git a/addons/l10n_ch/report/swissqr_report.xml b/addons/l10n_ch/report/swissqr_report.xml
index 28a46d0a56a..d8615d244d0 100644
--- a/addons/l10n_ch/report/swissqr_report.xml
+++ b/addons/l10n_ch/report/swissqr_report.xml
@@ -14,9 +14,8 @@
 
         <template id="l10n_ch_swissqr_template">
             <t t-set="o" t-value="o.with_context(lang=lang)"/>
-            <t t-call="web.external_layout">
-                <!-- TODO master: remove this -->
-                <script t-if="0">document.body.className += " l10n_ch_qr";</script>
+            <t t-set="company" t-value="o.company_id"/>
+            <t t-call="web.external_layout_standard">
                 <!-- add default margin for header (matching A4 European margin) -->
                 <t t-set="report_header_style">padding-top:6.2mm; padding-left:8.2mm; padding-right:8.2mm;</t>
 
diff --git a/addons/l10n_ch/static/src/scss/report_swissqr.scss b/addons/l10n_ch/static/src/scss/report_swissqr.scss
index 9e137a11495..2637e9ecebc 100644
--- a/addons/l10n_ch/static/src/scss/report_swissqr.scss
+++ b/addons/l10n_ch/static/src/scss/report_swissqr.scss
@@ -10,7 +10,7 @@
 
 $l10n-ch-qr-ratio: 1.25;
 
-body.l10n_ch_qr, body[data-oe-report="l10n_ch.l10n_ch_qr_report"] {
+body.l10n_ch_qr{
     padding: 0;
     span{
         padding-left: 10mm;
diff --git a/addons/l10n_din5008/report/din5008_report.xml b/addons/l10n_din5008/report/din5008_report.xml
index 6d18c683dbc..03c07325bf9 100644
--- a/addons/l10n_din5008/report/din5008_report.xml
+++ b/addons/l10n_din5008/report/din5008_report.xml
@@ -35,7 +35,7 @@
         <template id="external_layout_din5008">
             <div>
                 <div t-attf-class="header din_page o_company_#{company.id}_layout">
-                        <table class="company_header" t-att-style="'height: %dmm;' % (din_header_spacing or 27)">
+                        <table class="company_header table-borderless" t-att-style="'height: %dmm;' % (din_header_spacing or 27)">
                             <tr>
                                 <td><h3 class="mt0" t-field="company.report_header"/></td>
                                 <td><img t-if="company.logo" t-att-src="image_data_uri(company.logo)" t-att-style="'max-height: %dmm;' % (din_header_spacing or 27)"/></td>
@@ -44,7 +44,7 @@
                 </div>
 
                 <div t-attf-class="din_page invoice_note article o_company_#{company.id}_layout" t-att-data-oe-model="o and o._name" t-att-data-oe-id="o and o.id">
-                    <table>
+                    <table class="table-borderless">
                         <tr>
                             <td>
                                 <div class="address">
@@ -117,7 +117,7 @@
                         </div>
                     </div>
                     <div class="company_details">
-                        <table>
+                        <table class="table-borderless">
                             <tr>
                                 <td>
                                     <ul class="list-inline">