diff --git a/views/twig/admin/d3orderoverview_pdfform.html.twig b/views/twig/admin/d3orderoverview_pdfform.html.twig
deleted file mode 100644
index 592c8e9..0000000
--- a/views/twig/admin/d3orderoverview_pdfform.html.twig
+++ /dev/null
@@ -1 +0,0 @@
-new content here
\ No newline at end of file
diff --git a/views/twig/admin/documents/deliverynote/deliverynote.html.twig b/views/twig/admin/documents/deliverynote/deliverynote.html.twig
deleted file mode 100644
index 9dd4b8b..0000000
--- a/views/twig/admin/documents/deliverynote/deliverynote.html.twig
+++ /dev/null
@@ -1,46 +0,0 @@
-{% set pagePadding = ","|explode("45,15,30,25") %} {# top, right, bottom, left #}
-{% set showLogo = showLogo|default(true) %}
-
-{% capture append = "pdfBlock_style" %}
-    {% block pdfStyles %}
-        {% include "@d3PdfDocuments/assets/d3pdfstyles.css" %}
-    {% endblock %}
-{% endcapture %}
-
-{% capture append = "pdfBlock_header" %}
-    {% block pdfHeader %}
-        {% include "@d3PdfDocuments/documents/inc/page/header" with {showLogo: showLogo} %}
-    {% endblock %}
-{% endcapture %}
-
-{% capture append = "pdfBlock_content" %}
-    {% include "@d3PdfDocuments/documents/inc/elements/foldmarks" with {pagePadding: pagePadding} %}
-
-    {% block pdfAddressArea %}
-        {% include "@d3PdfDocuments/documents/inc/elements/addressarea" with {addressfile: "@d3PdfDocuments/documents/deliverynote/recipientAddress"} %}
-    {% endblock %}
-
-    {% block pdfInformations %}
-        {% include "@d3PdfDocuments/documents/inc/elements/informations" with {documentinformationfile: "@d3PdfDocuments/documents/deliverynote/informations"} %}
-    {% endblock %}
-
-    {% block pdfSalutation %}
-        {% include "@d3PdfDocuments/documents/deliverynote/salutation" %}
-    {% endblock %}
-
-    {% block pdfArticleList %}
-        {% include "@d3PdfDocuments/documents/inc/elements/articlelist" with {showPrices: false} %}
-    {% endblock %}
-
-    {% block pdfConclusion %}
-        {% include "@d3PdfDocuments/documents/deliverynote/conclusion" %}
-    {% endblock %}
-{% endcapture %}
-
-{% capture append = "pdfBlock_footer" %}
-    {% block pdfFooter %}
-        {% include "@d3PdfDocuments/documents/inc/page/footer" with {pagePadding: pagePadding} %}
-    {% endblock %}
-{% endcapture %}
-
-{% include "@d3PdfDocuments/documents/inc/page/base" with {pagePadding: pagePadding} %}
\ No newline at end of file
diff --git a/views/twig/admin/documents/deliverynote/deliverynoteNoLogo.html.twig b/views/twig/admin/documents/deliverynote/deliverynoteNoLogo.html.twig
deleted file mode 100644
index e61f005..0000000
--- a/views/twig/admin/documents/deliverynote/deliverynoteNoLogo.html.twig
+++ /dev/null
@@ -1 +0,0 @@
-{% include "@d3PdfDocuments/documents/deliverynote/deliverynote" with {showLogo: false} %}
\ No newline at end of file
diff --git a/views/twig/admin/documents/inc/page/header.html.twig b/views/twig/admin/documents/inc/page/header.html.twig
deleted file mode 100644
index 3a6ae75..0000000
--- a/views/twig/admin/documents/inc/page/header.html.twig
+++ /dev/null
@@ -1,13 +0,0 @@
-{% set showLogo = showLogo|default(true) %}
-
-{% block pdfHeader %}
-    <div class="header">
-        {% if showLogo %}
-            {# pdf logo is available only in non admin theme #}
-            {% set isAdmin = viewConfig.isAdmin() %}
-            {{ viewConfig.setAdminMode(false) }}
-            <img class="logo" alt="Logo" src="{{ viewConfig.getImageUrl('pdf_logo.jpg') }}">
-            {{ viewConfig.setAdminMode(isAdmin) }}
-        {% endif %}
-    </div>
-{% endblock %}
\ No newline at end of file
diff --git a/views/twig/admin/documents/invoice/invoice.html.twig b/views/twig/admin/documents/invoice/invoice.html.twig
deleted file mode 100644
index 281f190..0000000
--- a/views/twig/admin/documents/invoice/invoice.html.twig
+++ /dev/null
@@ -1,51 +0,0 @@
-{% set pagePadding = ","|explode("45,15,30,25") %} {# top, right, bottom, left #}
-{% set showLogo = showLogo|default(true) %}
-
-{% capture append = "pdfBlock_style" %}
-    {% block pdfStyles %}
-        {% include "@d3PdfDocuments/assets/d3pdfstyles.css" %}
-    {% endblock %}
-{% endcapture %}
-
-{% capture append = "pdfBlock_header" %}
-    {% block pdfHeader %}
-        {% include "@d3PdfDocuments/documents/inc/page/header" with {showLogo: showLogo} %}
-    {% endblock %}
-{% endcapture %}
-
-{% capture append = "pdfBlock_content" %}
-    {# include file="@d3PdfDocuments/documents/inc/helper/rulers" pagePadding=$pagePadding #}
-    {% include "@d3PdfDocuments/documents/inc/elements/foldmarks" with {pagePadding: pagePadding} %}
-
-    {% block pdfAddressArea %}
-        {% include "@d3PdfDocuments/documents/inc/elements/addressarea" %}
-    {% endblock %}
-
-    {% block pdfInformations %}
-        {% include "@d3PdfDocuments/documents/inc/elements/informations" with {documentinformationfile: "@d3PdfDocuments/documents/invoice/informations"} %}
-    {% endblock %}
-
-    {% block pdfDeliveryAddress %}
-        {% include "@d3PdfDocuments/documents/inc/elements/deliveryaddress" %}
-    {% endblock %}
-
-    {% block pdfSalutation %}
-        {% include "@d3PdfDocuments/documents/invoice/salutation" %}
-    {% endblock %}
-
-    {% block pdfArticleList %}
-        {% include "@d3PdfDocuments/documents/inc/elements/articlelist" %}
-    {% endblock %}
-
-    {% block pdfConclusion %}
-        {% include "@d3PdfDocuments/documents/invoice/conclusion" %}
-    {% endblock %}
-{% endcapture %}
-
-{% capture append = "pdfBlock_footer" %}
-    {% block pdfFooter %}
-        {% include "@d3PdfDocuments/documents/inc/page/footer" with {pagePadding: pagePadding} %}
-    {% endblock %}
-{% endcapture %}
-
-{% include "@d3PdfDocuments/documents/inc/page/base" with {pagePadding: pagePadding} %}
diff --git a/views/twig/admin/documents/invoice/invoiceNoLogo.html.twig b/views/twig/admin/documents/invoice/invoiceNoLogo.html.twig
deleted file mode 100644
index f33bd18..0000000
--- a/views/twig/admin/documents/invoice/invoiceNoLogo.html.twig
+++ /dev/null
@@ -1 +0,0 @@
-{% include "@d3PdfDocuments/documents/invoice/invoice" with {showLogo: false} %}
\ No newline at end of file
diff --git a/views/twig/documents/deliverynote/deliverynote.html.twig b/views/twig/documents/deliverynote/deliverynote.html.twig
new file mode 100644
index 0000000..312b082
--- /dev/null
+++ b/views/twig/documents/deliverynote/deliverynote.html.twig
@@ -0,0 +1,47 @@
+{% set pagePadding = "45,15,25,25"|split(",") %} {# top, right, bottom, left #}
+{% set showLogo = showLogo|default(1) %}
+
+{% set pdfBlock_style %}
+    {% block pdfStyles %}
+        {{ style({ include: oViewConf.getModuleUrl('d3PdfDocuments', 'out/src/css/pdfStyling.css') }) }}
+        {{ style() }}
+    {% endblock %}
+{% endset %}
+
+{% set pdfBlock_header %}
+    {% block pdfHeader %}
+        {% include "@d3PdfDocuments/documents/inc/page/header.html.twig" with {showLogo: showLogo} %}
+    {% endblock %}
+{% endset %}
+
+{% set pdfBlock_content %}
+    {% include "@d3PdfDocuments/documents/inc/elements/foldmarks.html.twig" with {pagePadding: pagePadding} %}
+
+    {% block pdfAddressArea %}
+        {% include "@d3PdfDocuments/documents/inc/elements/addressarea.html.twig" with {addressfile: "@d3PdfDocuments/documents/deliverynote/inc/recipientAddress.html.twig"} %}
+    {% endblock %}
+
+    {% block pdfInformations %}
+        {% include "@d3PdfDocuments/documents/inc/elements/informations.html.twig" with {documentinformationfile: "@d3PdfDocuments/documents/deliverynote/inc/informations.html.twig"} %}
+    {% endblock %}
+
+    {% block pdfSalutation %}
+        {% include "@d3PdfDocuments/documents/deliverynote/inc/salutation.html.twig" %}
+    {% endblock %}
+
+    {% block pdfArticleList %}
+        {% include "@d3PdfDocuments/documents/inc/elements/articlelist.html.twig" with {showPrices: 0} %}
+    {% endblock %}
+
+    {% block pdfConclusion %}
+        {% include "@d3PdfDocuments/documents/deliverynote/inc/conclusion.html.twig" %}
+    {% endblock %}
+{% endset %}
+
+{% set pdfBlock_footer %}
+    {% block pdfFooter %}
+        {% include "@d3PdfDocuments/documents/inc/page/footer.html.twig" with {pagePadding: pagePadding} %}
+    {% endblock %}
+{% endset %}
+
+{% include "@d3PdfDocuments/documents/inc/page/base.html.twig" with {pagePadding: pagePadding} %}
\ No newline at end of file
diff --git a/views/twig/documents/deliverynote/deliverynoteNoLogo.html.twig b/views/twig/documents/deliverynote/deliverynoteNoLogo.html.twig
new file mode 100644
index 0000000..a8961f5
--- /dev/null
+++ b/views/twig/documents/deliverynote/deliverynoteNoLogo.html.twig
@@ -0,0 +1 @@
+{% include "@d3PdfDocuments/documents/deliverynote/deliverynote.html.twig" with {showLogo: 0} %}
\ No newline at end of file
diff --git a/views/twig/admin/documents/deliverynote/inc/conclusion.html.twig b/views/twig/documents/deliverynote/inc/conclusion.html.twig
similarity index 100%
rename from views/twig/admin/documents/deliverynote/inc/conclusion.html.twig
rename to views/twig/documents/deliverynote/inc/conclusion.html.twig
diff --git a/views/twig/admin/documents/deliverynote/inc/informations.html.twig b/views/twig/documents/deliverynote/inc/informations.html.twig
similarity index 100%
rename from views/twig/admin/documents/deliverynote/inc/informations.html.twig
rename to views/twig/documents/deliverynote/inc/informations.html.twig
diff --git a/views/twig/admin/documents/deliverynote/inc/recipientAddress.html.twig b/views/twig/documents/deliverynote/inc/recipientAddress.html.twig
similarity index 100%
rename from views/twig/admin/documents/deliverynote/inc/recipientAddress.html.twig
rename to views/twig/documents/deliverynote/inc/recipientAddress.html.twig
diff --git a/views/twig/admin/documents/deliverynote/inc/salutation.html.twig b/views/twig/documents/deliverynote/inc/salutation.html.twig
similarity index 90%
rename from views/twig/admin/documents/deliverynote/inc/salutation.html.twig
rename to views/twig/documents/deliverynote/inc/salutation.html.twig
index 14d4a22..5ad8106 100644
--- a/views/twig/admin/documents/deliverynote/inc/salutation.html.twig
+++ b/views/twig/documents/deliverynote/inc/salutation.html.twig
@@ -5,7 +5,7 @@
 
         {% set dateFormat = 'D3_PDFDOCUMENTS_DATE_FORMAT'|translate %}
         {% set sArgs = order.getFieldData('oxorderdate')|date_format(dateFormat)|cat("//")|cat(shop.getFieldData('oxname')) %}
-        {% set aArgs = "//"|explode(sArgs) %}
+        {% set aArgs = sArgs|split("//") %}
 
         <div>{{ translate({ ident: "D3_PDFDOCUMENTS_ORDER_FROM_AT", args: aArgs }) }}</div>
     </div>
diff --git a/views/twig/admin/documents/inc/elements/addressarea.html.twig b/views/twig/documents/inc/elements/addressarea.html.twig
similarity index 60%
rename from views/twig/admin/documents/inc/elements/addressarea.html.twig
rename to views/twig/documents/inc/elements/addressarea.html.twig
index d61dfc7..82fe6de 100644
--- a/views/twig/admin/documents/inc/elements/addressarea.html.twig
+++ b/views/twig/documents/inc/elements/addressarea.html.twig
@@ -1,13 +1,13 @@
-{% set backaddressfile = backaddressfile|default("@d3PdfDocuments/documents/inc/page/returnaddress") %}
-{% set addressfile = addressfile|default("@d3PdfDocuments/documents/inc/elements/recipientAddress") %}
+{% set backaddressfile = backaddressfile|default("@d3PdfDocuments/documents/inc/page/returnaddress.html.twig") %}
+{% set addressfile = addressfile|default("@d3PdfDocuments/documents/inc/elements/recipientAddress.html.twig") %}
 
 <div class="addressarea">
     <div class="returnAddress">
         <div>
-            {% include $backaddressfile %}
+            {% include backaddressfile %}
         </div>
     </div>
     <div class="recipientAddress">
-        {% include $addressfile %}
+        {% include addressfile %}
     </div>
 </div>
\ No newline at end of file
diff --git a/views/twig/admin/documents/inc/elements/articlecostssummary.html.twig b/views/twig/documents/inc/elements/articlecostssummary.html.twig
similarity index 92%
rename from views/twig/admin/documents/inc/elements/articlecostssummary.html.twig
rename to views/twig/documents/inc/elements/articlecostssummary.html.twig
index cec824d..89dc06b 100644
--- a/views/twig/admin/documents/inc/elements/articlecostssummary.html.twig
+++ b/views/twig/documents/inc/elements/articlecostssummary.html.twig
@@ -1,4 +1,4 @@
-{% capture name = "sumnetto" %}
+{% set sumnetto %}
     {% block sumnetto %}
         <tr class="sumnetto">
             <td class="indent"></td>
@@ -10,9 +10,9 @@
             </td>
         </tr>
     {% endblock %}
-{% endcapture %}
+{% endset %}
 
-{% capture name = "discount" %}
+{% set discount %}
     {% block discount %}
         <tr class="discount">
             <td class="indent"></td>
@@ -24,9 +24,9 @@
             </td>
         </tr>
     {% endblock %}
-{% endcapture %}
+{% endset %}
 
-{% capture name = "producttax" %}
+{% set producttax %}
     {% block producttax %}
         {% for VatKey, oVat in order.getProductVats(false) %}
             <tr class="producttax">
@@ -35,14 +35,14 @@
                     {{ translate({ ident: "D3_PDFDOCUMENTS_TAX", args: VatKey, suffix: "COLON" }) }}
                 </td>
                 <td class="values">
-                    {{ lang.formatCurrency($oVat, currency) }} {{ currency.name }}
+                    {{ lang.formatCurrency(oVat, currency) }} {{ currency.name }}
                 </td>
             </tr>
         {% endfor %}
     {% endblock %}
-{% endcapture %}
+{% endset %}
 
-{% capture name = "sumbrutto" %}
+{% set sumbrutto %}
     {% block sumbrutto %}
         <tr class="sumbrutto">
             <td class="indent"></td>
@@ -54,24 +54,24 @@
             </td>
         </tr>
     {% endblock %}
-{% endcapture %}
+{% endset %}
 
 {% if order.getFieldData('oxdiscount') %}
     {% if order.isNettoMode() %}
-        {{ smarty.capture.sumnetto }}
-        {{ smarty.capture.discount }}
-        {{ smarty.capture.producttax }}
-        {{ smarty.capture.sumbrutto }}
+        {{ sumnetto }}
+        {{ discount }}
+        {{ producttax }}
+        {{ sumbrutto }}
     {% else %}
-        {{ smarty.capture.sumbrutto }}
-        {{ smarty.capture.discount }}
-        {{ smarty.capture.sumnetto }}
-        {{ smarty.capture.producttax }}
+        {{ sumbrutto }}
+        {{ discount }}
+        {{ sumnetto }}
+        {{ producttax }}
     {% endif %}
 {% else %}
-    {{ smarty.capture.sumnetto }}
-    {{ smarty.capture.producttax }}
-    {{ smarty.capture.sumbrutto }}
+    {{ sumnetto }}
+    {{ producttax }}
+    {{ sumbrutto }}
 {% endif %}
 
 {% if order.getFieldData('oxvoucherdiscount') %}
diff --git a/views/twig/admin/documents/inc/elements/articlelist.html.twig b/views/twig/documents/inc/elements/articlelist.html.twig
similarity index 96%
rename from views/twig/admin/documents/inc/elements/articlelist.html.twig
rename to views/twig/documents/inc/elements/articlelist.html.twig
index 15a8ff8..afedb33 100644
--- a/views/twig/admin/documents/inc/elements/articlelist.html.twig
+++ b/views/twig/documents/inc/elements/articlelist.html.twig
@@ -1,5 +1,5 @@
 {% set currency = order.getOrderCurrency() %}
-{% set showPrices = showPrices|default(true) %}
+{% set showPrices = showPrices|default(1) %}
 
 {% block articlelist %}
     <table class="article_table{% if showPrices %}_prices{% endif %}">
@@ -54,7 +54,7 @@
         <nobreak>
             <table class="article_costs_table">
                 {% block d3_article_costs_summary %}
-                    {% include "@d3PdfDocuments/documents/inc/elements/articlecostssummary" %}
+                    {% include "@d3PdfDocuments/documents/inc/elements/articlecostssummary.html.twig" %}
                 {% endblock %}
             </table>
         </nobreak>
diff --git a/views/twig/admin/documents/inc/elements/deliveryaddress.html.twig b/views/twig/documents/inc/elements/deliveryaddress.html.twig
similarity index 100%
rename from views/twig/admin/documents/inc/elements/deliveryaddress.html.twig
rename to views/twig/documents/inc/elements/deliveryaddress.html.twig
diff --git a/views/twig/admin/documents/inc/elements/foldmarks.html.twig b/views/twig/documents/inc/elements/foldmarks.html.twig
similarity index 54%
rename from views/twig/admin/documents/inc/elements/foldmarks.html.twig
rename to views/twig/documents/inc/elements/foldmarks.html.twig
index 703c1b0..73d69a7 100644
--- a/views/twig/admin/documents/inc/elements/foldmarks.html.twig
+++ b/views/twig/documents/inc/elements/foldmarks.html.twig
@@ -1,10 +1,10 @@
-{% set defaultPagePadding = ","|explode("45,15,25,25") %} {# top, right, bottom, left #}
+{% set defaultPagePadding = "45,15,25,25"|split(",") %} {# top, right, bottom, left #}
 {% set pagePadding = pagePadding|default(defaultPagePadding) %}
 
 <style>
     .marks {
         position: absolute;
-        left: {{ 5 - pagePadding.3 }}mm ;
+        left: {{ 5 - pagePadding.3|number_format }}mm ;
         margin-left: 0;
         width: 7px;
         height: 0;
@@ -12,15 +12,15 @@
     }
 
     .foldtop {
-        top: {{ 105 - pagePadding.0 }}mm
+        top: {{ 105 - pagePadding.0|number_format }}mm
     }
 
     .foldbottom {
-        top: {{ 210 - pagePadding.0 }}mm
+        top: {{ 210 - pagePadding.0|number_format }}mm
     }
 
     .punch {
-        top: {{ 148.5 - pagePadding.0 }}mm
+        top: {{ 148.5 - pagePadding.0|number_format }}mm
     }
 </style>
 
diff --git a/views/twig/admin/documents/inc/elements/informations.html.twig b/views/twig/documents/inc/elements/informations.html.twig
similarity index 96%
rename from views/twig/admin/documents/inc/elements/informations.html.twig
rename to views/twig/documents/inc/elements/informations.html.twig
index 233198f..b022370 100644
--- a/views/twig/admin/documents/inc/elements/informations.html.twig
+++ b/views/twig/documents/inc/elements/informations.html.twig
@@ -34,6 +34,6 @@
     </div>
 
     {% if documentinformationfile %}
-        {% include $documentinformationfile %}
+        {% include documentinformationfile %}
     {% endif %}
 </div>
\ No newline at end of file
diff --git a/views/twig/admin/documents/inc/elements/recipientAddress.html.twig b/views/twig/documents/inc/elements/recipientAddress.html.twig
similarity index 100%
rename from views/twig/admin/documents/inc/elements/recipientAddress.html.twig
rename to views/twig/documents/inc/elements/recipientAddress.html.twig
diff --git a/views/twig/admin/documents/inc/helper/rulers.html.twig b/views/twig/documents/inc/helper/rulers.html.twig
similarity index 82%
rename from views/twig/admin/documents/inc/helper/rulers.html.twig
rename to views/twig/documents/inc/helper/rulers.html.twig
index debd213..26318f2 100644
--- a/views/twig/admin/documents/inc/helper/rulers.html.twig
+++ b/views/twig/documents/inc/helper/rulers.html.twig
@@ -1,9 +1,6 @@
-{% set defaultPagePadding = ","|explode("45,15,25,25") %} {# top, right, bottom, left #}
+{% set defaultPagePadding = "45,15,25,25"|split(",") %} {# top, right, bottom, left #}
 {% set pagePadding = pagePadding|default(defaultPagePadding) %}
 
-{# rulers #}
-{# include file="@d3PdfDocuments/documents/inc/helper/rulers" pagePadding=$pagePadding #}
-
 <style>
     .rulerItemHorizontal {
         position: absolute;
diff --git a/views/twig/admin/documents/inc/page/base.html.twig b/views/twig/documents/inc/page/base.html.twig
similarity index 54%
rename from views/twig/admin/documents/inc/page/base.html.twig
rename to views/twig/documents/inc/page/base.html.twig
index de2b076..adfa28a 100644
--- a/views/twig/admin/documents/inc/page/base.html.twig
+++ b/views/twig/documents/inc/page/base.html.twig
@@ -1,29 +1,21 @@
 {% set pageset = pageset|default("new") %}
 {% set orientation = orientation|default("P") %}
 {% set format = format|default("A4") %}
-{% set defaultPagePadding = ","|explode("45,15,25,25") %} {# top, right, bottom, left #}
+{% set defaultPagePadding = "45,15,25,25"|split(",") %} {# top, right, bottom, left #}
 {% set pagePadding = pagePadding|default(defaultPagePadding) %}
 
 <style>
-    {% for _block in pdfBlock_style %}
-        {{ _block }}
-    {% endfor %}
+    {{ pdfBlock_style }}
 </style>
 
 <page backtop="{{ pagePadding.0 }}mm" backright="{{ pagePadding.1 }}mm" backbottom="{{ pagePadding.2 }}mm" backleft="{{ pagePadding.3 }}mm" pageset="{{ pageset }}" orientation="{{ orientation }}" format="{{ format }}">
     <page_header>
-        {% for _block in pdfBlock_header %}
-            {{ _block }}
-        {% endfor %}
+        {{ pdfBlock_header }}
     </page_header>
 
     <page_footer>
-        {% for _block in pdfBlock_footer %}
-            {{ _block }}
-        {% endfor %}
+        {{ pdfBlock_footer }}
     </page_footer>
 
-    {% for _block in pdfBlock_content %}
-        {{ _block }}
-    {% endfor %}
+    {{ pdfBlock_content }}
 </page>
\ No newline at end of file
diff --git a/views/twig/admin/documents/inc/page/footer.html.twig b/views/twig/documents/inc/page/footer.html.twig
similarity index 95%
rename from views/twig/admin/documents/inc/page/footer.html.twig
rename to views/twig/documents/inc/page/footer.html.twig
index 7c9d018..7a24afa 100644
--- a/views/twig/admin/documents/inc/page/footer.html.twig
+++ b/views/twig/documents/inc/page/footer.html.twig
@@ -1,4 +1,4 @@
-{% set defaultPagePadding = ","|explode("45,15,25,25") %} {# top, right, bottom, left #}
+{% set defaultPagePadding = "45,15,25,25"|split(",") %} {# top, right, bottom, left #}
 {% set pagePadding = pagePadding|default(defaultPagePadding) %}
 
 {% block pdfFooter %}
diff --git a/views/twig/documents/inc/page/header.html.twig b/views/twig/documents/inc/page/header.html.twig
new file mode 100644
index 0000000..3d76c6e
--- /dev/null
+++ b/views/twig/documents/inc/page/header.html.twig
@@ -0,0 +1,13 @@
+{% set showLogo = showLogo|default(1) %}
+
+{% block pdfHeader %}
+    <div class="header">
+        {% if showLogo %}
+            {# pdf logo is available only in non admin theme #}
+            {% set isAdmin = oViewConf.isAdmin() %}
+            {{ oViewConf.setAdminMode(false) }}
+            <img class="logo" alt="Logo" src="{{ oViewConf.getImageUrl('pdf_logo.jpg') }}">
+            {{ oViewConf.setAdminMode(isAdmin) }}
+        {% endif %}
+    </div>
+{% endblock %}
\ No newline at end of file
diff --git a/views/twig/admin/documents/inc/page/returnaddress.html.twig b/views/twig/documents/inc/page/returnaddress.html.twig
similarity index 100%
rename from views/twig/admin/documents/inc/page/returnaddress.html.twig
rename to views/twig/documents/inc/page/returnaddress.html.twig
diff --git a/views/twig/admin/documents/invoice/inc/conclusion.html.twig b/views/twig/documents/invoice/inc/conclusion.html.twig
similarity index 88%
rename from views/twig/admin/documents/invoice/inc/conclusion.html.twig
rename to views/twig/documents/invoice/inc/conclusion.html.twig
index 8cb9fb4..ef77f9e 100644
--- a/views/twig/admin/documents/invoice/inc/conclusion.html.twig
+++ b/views/twig/documents/invoice/inc/conclusion.html.twig
@@ -5,7 +5,7 @@
                 {{ translate({ ident: "D3_PDFDOCUMENTS_USED_PAYMENTMETHOD", suffix: "COLON" }) }}
                 {{ payment.getFieldData('oxdesc') }}<br>
 
-                {% include "@d3PdfDocuments/documents/invoice/payinfo" %}
+                {% include "@d3PdfDocuments/documents/invoice/inc/payinfo.html.twig" %}
             </div>
         {% endblock %}
 
diff --git a/views/twig/admin/documents/invoice/inc/informations.html.twig b/views/twig/documents/invoice/inc/informations.html.twig
similarity index 100%
rename from views/twig/admin/documents/invoice/inc/informations.html.twig
rename to views/twig/documents/invoice/inc/informations.html.twig
diff --git a/views/twig/admin/documents/invoice/inc/payinfo.html.twig b/views/twig/documents/invoice/inc/payinfo.html.twig
similarity index 100%
rename from views/twig/admin/documents/invoice/inc/payinfo.html.twig
rename to views/twig/documents/invoice/inc/payinfo.html.twig
diff --git a/views/twig/admin/documents/invoice/inc/salutation.html.twig b/views/twig/documents/invoice/inc/salutation.html.twig
similarity index 90%
rename from views/twig/admin/documents/invoice/inc/salutation.html.twig
rename to views/twig/documents/invoice/inc/salutation.html.twig
index b201bb8..f485af1 100644
--- a/views/twig/admin/documents/invoice/inc/salutation.html.twig
+++ b/views/twig/documents/invoice/inc/salutation.html.twig
@@ -5,7 +5,7 @@
 
         {% set dateFormat = 'D3_PDFDOCUMENTS_DATE_FORMAT'|translate %}
         {% set sArgs = order.getFieldData('oxorderdate')|date_format(dateFormat)|cat("//")|cat(shop.getFieldData('oxname')) %}
-        {% set aArgs = "//"|explode(sArgs) %}
+        {% set aArgs = sArgs|split("//") %}
 
         <div>{{ translate({ ident: "D3_PDFDOCUMENTS_ORDER_FROM_AT", args: aArgs }) }}</div>
     </div>
diff --git a/views/twig/documents/invoice/invoice.html.twig b/views/twig/documents/invoice/invoice.html.twig
new file mode 100644
index 0000000..5d70c83
--- /dev/null
+++ b/views/twig/documents/invoice/invoice.html.twig
@@ -0,0 +1,51 @@
+{% set pagePadding = "45,15,25,25"|split(",") %} {# top, right, bottom, left #}
+{% set showLogo = showLogo|default(1) %}
+
+{% set pdfBlock_style %}
+    {% block pdfStyles %}
+        {{ style({ include: oViewConf.getModuleUrl('d3PdfDocuments', 'out/src/css/pdfStyling.css') }) }}
+        {{ style() }}
+    {% endblock %}
+{% endset %}
+
+{% set pdfBlock_header %}
+    {% block pdfHeader %}
+        {% include "@d3PdfDocuments/documents/inc/page/header.html.twig" with {showLogo: showLogo} %}
+    {% endblock %}
+{% endset %}
+
+{% set pdfBlock_content %}
+    {% include "@d3PdfDocuments/documents/inc/elements/foldmarks.html.twig" with {pagePadding: pagePadding} %}
+
+    {% block pdfAddressArea %}
+        {% include "@d3PdfDocuments/documents/inc/elements/addressarea.html.twig" %}
+    {% endblock %}
+
+    {% block pdfInformations %}
+        {% include "@d3PdfDocuments/documents/inc/elements/informations.html.twig" with {documentinformationfile: "@d3PdfDocuments/documents/invoice/inc/informations.html.twig"} %}
+    {% endblock %}
+
+    {% block pdfDeliveryAddress %}
+        {% include "@d3PdfDocuments/documents/inc/elements/deliveryaddress.html.twig" %}
+    {% endblock %}
+
+    {% block pdfSalutation %}
+        {% include "@d3PdfDocuments/documents/invoice/inc/salutation.html.twig" %}
+    {% endblock %}
+
+    {% block pdfArticleList %}
+        {% include "@d3PdfDocuments/documents/inc/elements/articlelist.html.twig" %}
+    {% endblock %}
+
+    {% block pdfConclusion %}
+        {% include "@d3PdfDocuments/documents/invoice/inc/conclusion.html.twig" %}
+    {% endblock %}
+{% endset %}
+
+{% set pdfBlock_footer %}
+    {% block pdfFooter %}
+        {% include "@d3PdfDocuments/documents/inc/page/footer.html.twig" with {pagePadding: pagePadding} %}
+    {% endblock %}
+{% endset %}
+
+{% include "@d3PdfDocuments/documents/inc/page/base.html.twig" with {pagePadding: pagePadding} %}
\ No newline at end of file
diff --git a/views/twig/documents/invoice/invoiceNoLogo.html.twig b/views/twig/documents/invoice/invoiceNoLogo.html.twig
new file mode 100644
index 0000000..0e388db
--- /dev/null
+++ b/views/twig/documents/invoice/invoiceNoLogo.html.twig
@@ -0,0 +1 @@
+{% include "@d3PdfDocuments/documents/invoice/invoice.html.twig" with {showLogo: 0} %}
\ No newline at end of file