diff --git a/snippets/account.report_invoice_document.style_lapp.xml b/snippets/account.report_invoice_document.style_lapp.xml
new file mode 100644
index 00000000..1ac39604
--- /dev/null
+++ b/snippets/account.report_invoice_document.style_lapp.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="60">
+
+    <xpath expr="//table[@class='table table-sm o_main_table table-borderless']" position="attributes">
+        <attribute name="class">table table-sm o_main_table mt-4 custom-border</attribute>
+        <attribute name="style">border-top-width: 1px</attribute>
+    </xpath>
+
+    <xpath expr="//div[@id='right-elements']" position="attributes">
+        <attribute name="t-attf-class">float-end</attribute>
+        <attribute name="style">width: 280px</attribute>
+    </xpath>
+
+    <xpath expr="//span[@t-field='line.price_unit']" position="attributes">
+        <attribute name="t-options">{"widget": "monetary", "display_currency": o.currency_id}</attribute>
+    </xpath>
+
+</data>
diff --git a/snippets/l10n_din5008.external_layout_din5008.replace_information_block.xml b/snippets/l10n_din5008.external_layout_din5008.replace_information_block.xml
index 87f68460..75c8106d 100644
--- a/snippets/l10n_din5008.external_layout_din5008.replace_information_block.xml
+++ b/snippets/l10n_din5008.external_layout_din5008.replace_information_block.xml
@@ -1,20 +1,17 @@
-<?xml version="1.0"?>
 <data inherit_id="l10n_din5008.external_layout_din5008" priority="50">
     <xpath expr="//div[@class='information_block']/.." position="replace">
         <style>
-            div.information_block {
-                font-family: arial;
-            }
             div.information_block tr {
                 heigt: 30px;
             }
             .din_page.invoice_note tr .address, .din_page.invoice_note tr .shipping_address {
-                width: 77mm;
+                width: 76mm;
             }
             div.information_block {
                 line-height: 1.5;
             }
         </style>
+
         <td style="vertical-align: top;">
             <div class="information_block">
                 <t t-if="'l10n_din5008_template_data' in company" t-set="template_data" t-value="company.l10n_din5008_template_data"/>
@@ -34,20 +31,109 @@
                             </span>
                         </td>
                     </tr>
-                    <t t-foreach="template_data" t-as="row" t-index="i">
-                        <t t-if="template_data != template_data[0]">
-                            <tr>
-                                <td>
-                                    <t t-out="row[0]"/>
-                                </td>
-                                <td>
-                                    <t t-out="row[1]"/>
-                                </td>
-                            </tr>
-                        </t>
+
+                    <!-- Rechnung -->
+                    <t t-if="o.type_name == 'Ausgangsrechnung'">
+
+                        <tr>
+                            <td>
+                                <span>Invoice No.</span>
+                            </td>
+                            <td>
+                                <span t-field="o.name"/>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <span>Invoice Date</span>
+                            </td>
+                            <td>
+                                <span t-field="o.invoice_date"/>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <span>Payment Date</span>
+                            </td>
+                            <td>
+                                <span t-field="o.invoice_date_due"/>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <span>Source</span>
+                            </td>
+                            <td>
+                                <span t-field="o.invoice_origin"/>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <span>Reference</span>
+                            </td>
+                            <td>
+                                <span t-field="o.ref"/>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <span>Delivery Date</span>
+                            </td>
+                            <td>
+                                <span t-field="o.delivery_date"/>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <span>Incoterms</span>
+                            </td>
+                            <td>
+                                <span t-field="o.invoice_incoterm_id.code"/>
+                            </td>
+                        </tr>
                     </t>
+
+                    <!-- Verkaufsauftrag -->
+                    <t t-if="o.type_name == 'Verkaufsauftrag' or o.type_name == 'Bon de commande'">
+                        <tr>
+                            <td>
+                                <span>Order No.</span>
+                            </td>
+                            <td>
+                                <span t-field="o.name"/>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <span>Order Date</span>
+                            </td>
+                            <td>                               
+                                <span t-field="o.date_order" t-options="{'widget': 'date'}"/>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <span>Your reference</span>
+                            </td>
+                            <td>
+
+                                <span t-field="o.client_order_ref"/>
+
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <span>Incoterms</span>
+                            </td>
+                            <td>
+                                <span t-field="o.incoterm.code"/>
+                            </td>
+                        </tr>
+                    </t>
+
                 </table>
             </div>
         </td>
+
     </xpath>
 </data>
\ No newline at end of file
diff --git a/snippets/sale.report_saleorder_document.hide_product_packaging_id.xml b/snippets/sale.report_saleorder_document.hide_product_packaging_id.xml
new file mode 100644
index 00000000..2c1f5492
--- /dev/null
+++ b/snippets/sale.report_saleorder_document.hide_product_packaging_id.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.report_saleorder_document" priority="50">
+    <xpath expr="//span[@t-field='line.product_packaging_id']/.." position="replace"/>
+</data>