diff --git a/Application/views/admin/de/pdfdocuments_lang.php b/Application/views/admin/de/pdfdocuments_lang.php
index bf3d76d..89aa105 100644
--- a/Application/views/admin/de/pdfdocuments_lang.php
+++ b/Application/views/admin/de/pdfdocuments_lang.php
@@ -22,10 +22,8 @@ $aLang     = array(
     'ORDER_OVERVIEW_PDF_auftragsbestaetigung'            => 'Auftragsbestätigung',
     'ORDER_OVERVIEW_PDF_auftragsbestaetigung_TEXTAREA'   => 'Text für Auftragsbestätigung',
     'ORDER_OVERVIEW_PDF_AUFTRAGSNUMMER'                  => 'Auftragsbestätigung:',
-    //'ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_1'           => 'Herzlichen Dank für Ihre Bestellung! Bitte empfehlen Sie uns weiter.',
     'ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_1'             => 'Vielen Dank für Ihren Einkauf!',
-    'ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_2'             => 'Ihr Elektroversand Schmidt',
-    //'ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_2'           => '',
+    'ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_2'             => 'Ihr Team von ',
     'ORDER_OVERVIEW_PDF_auftragsbestaetigung_Alternativtext' => 'Alle Artikel sind ab Lager lieferbar und gehen schnellstmöglich in den Versand.',
     'ORDER_OVERVIEW_PDF_bestellbestaetitung_TEXTAREA'    => 'Individueller Zahlungstext',
     'PAYMENT_MAIN_D3SHORTDESCPDF'                        => 'Rechnungstext',
diff --git a/Application/views/tpl/documents/deliverynote/deliverynoteNoLogo.tpl b/Application/views/tpl/documents/deliverynote/deliverynoteNoLogo.tpl
index 1af284c..cb28af1 100644
--- a/Application/views/tpl/documents/deliverynote/deliverynoteNoLogo.tpl
+++ b/Application/views/tpl/documents/deliverynote/deliverynoteNoLogo.tpl
@@ -26,7 +26,7 @@
     [{/block}]
 	[{* +++++Artikeltabelle+++++*}]
     [{block name="articleListing"}]
-        <table class="order_article_marginTop10 border-bottom">
+        <table class="border-bottom">
             <tr>
                 <td class="border-bottom order_article_PaddingBottom5 "><div class="vertical-a order_article_listing_fontSize deliverynote_width_amount">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_AMOUNT"}]</div></td>
 								<td class="border-bottom order_article_PaddingBottom5 paddingLeft"><div class="order_article_listing_fontSize deliverynote_width_artnum">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}]</div></td>
diff --git a/Application/views/tpl/documents/deliverynote/includingFiles/pdfPastThank.tpl b/Application/views/tpl/documents/deliverynote/includingFiles/conclusion.tpl
similarity index 100%
rename from Application/views/tpl/documents/deliverynote/includingFiles/pdfPastThank.tpl
rename to Application/views/tpl/documents/deliverynote/includingFiles/conclusion.tpl
diff --git a/Application/views/tpl/documents/deliverynote/includingFiles/pdfHeader.tpl b/Application/views/tpl/documents/deliverynote/includingFiles/recipientAddress.tpl
similarity index 92%
rename from Application/views/tpl/documents/deliverynote/includingFiles/pdfHeader.tpl
rename to Application/views/tpl/documents/deliverynote/includingFiles/recipientAddress.tpl
index 91a16ce..662a120 100644
--- a/Application/views/tpl/documents/deliverynote/includingFiles/pdfHeader.tpl
+++ b/Application/views/tpl/documents/deliverynote/includingFiles/recipientAddress.tpl
@@ -45,7 +45,7 @@
 	<table class="fontSize12" cellspacing="0">
 		<tr>
 			<td>
-				<div style="width: 300px; padding-bottom: 20px" class="heading_order_paddingTop22 heading_order_fontSize15"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DELIVERYNOTE"}][{$order->oxorder__oxordernr->value}]</strong></div>
+				<div style="width: 300px; padding-bottom: 20px"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DELIVERYNOTE"}][{$order->oxorder__oxordernr->value}]</strong></div>
 			</td>
 		</tr>
 		<tr>
diff --git a/Application/views/tpl/documents/inc/elements/articlecostssummary.tpl b/Application/views/tpl/documents/inc/elements/articlecostssummary.tpl
new file mode 100644
index 0000000..a440358
--- /dev/null
+++ b/Application/views/tpl/documents/inc/elements/articlecostssummary.tpl
@@ -0,0 +1,26 @@
+[{* ++++++Beschreibung der Kostensummierung++++++ *}]
+<td class="article_costs_table_paddingRight article_costs_table_desc_width70 ">
+    <div class="order_sum paddingTopBottom5 fontSize12 border-bottom">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMBRUTTO"}]</div>
+    [{if $order->getFormattedDiscount() != 0}]
+    <div class="order_sum paddingTopBottom5 fontSize12 border-bottom">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DISCOUNT"}]</div>
+    [{/if}]
+    <div class="order_sum order_article_PaddingTop5 fontSize12">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMNETTO"}]</div>
+    [{foreach from=$productVats key=VatKey item=oVat}]
+    <div class="order_sum paddingTopBottom5 fontSize12 border-bottom">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAX"}] [{$VatKey}] [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_PERCENTAGE"}] [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAXPERCVALUE"}]</div>
+    [{/foreach}]
+    <div class="order_sum order_article_PaddingTop5 fontSize12">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DELIVERY"}]</div>
+    <div class="order_sum paddingTopBottom5 fontSize12 border-bottom">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAX"}] [{$VatKey}] [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_PERCENTAGE"}] [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAXPERCVALUE"}]</div>
+    <div class="order_sum paddingTopBottom5 fontSize12"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TOTALSUMBRUT"}]</strong></div>
+</td>
+[{* ++++++Kostensummierung++++++ *}]
+<td class="article_costs_table_sum_width30">
+    <div class="order_sumNum paddingTopBottom5 aligning fontSize12 border-bottom">[{$order->getFormattedTotalBrutSum()}] [{$currency->name}]</div>
+    [{if $order->getFormattedDiscount() != 0}]
+    <div class="order_sumNum paddingTopBottom5 aligning fontSize12 border-bottom">-[{$order->getFormattedDiscount()}] [{$currency->name}]</div>
+    [{/if}]
+    <div class="order_sumNum order_article_PaddingTop5 aligning fontSize12">[{$order->getFormattedTotalNetSum()}] [{$currency->name}]</div>
+    <div class="order_sumNum paddingTopBottom5 aligning fontSize12 border-bottom">[{$lang->formatCurrency($oVat, $currency)}] [{$currency->name}]</div>
+    <div class="order_sumNum order_article_PaddingTop5 aligning fontSize12">[{$lang->formatCurrency($deliveryPrice->getNettoPrice(), $currency)}] [{$currency->name}]</div>
+    <div class="order_sumNum paddingTopBottom5 aligning fontSize12 border-bottom">[{$lang->formatCurrency($deliveryPrice->getVATValue(), $currency)}] [{$currency->name}]</div>
+    <div class="order_sumNum paddingTopBottom5 aligning fontSize12"><strong>[{$order->getFormattedTotalOrderSum()}] [{$currency->name}]</strong></div>
+</td>
\ No newline at end of file
diff --git a/Application/views/tpl/documents/inc/elements/articlelist.tpl b/Application/views/tpl/documents/inc/elements/articlelist.tpl
new file mode 100644
index 0000000..7f407f5
--- /dev/null
+++ b/Application/views/tpl/documents/inc/elements/articlelist.tpl
@@ -0,0 +1,53 @@
+[{block name="articlelist"}]
+    <table class="article_table">
+        <tr>
+            <th class="amount">
+                [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_AMOUNT"}]
+            </th>
+            <th class="description">
+                [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DESCRIPTION"}]
+            </th>
+            <th class="tax">
+                [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTPERCENTAGE"}]
+            </th>
+            <th class="unitPrice">
+                [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_UNITPRICE"}]
+            </th>
+            <th class="totalPrice">
+                [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_TOTALPRICE"}]
+            </th>
+        </tr>
+        [{foreach from=$order->getOrderArticles(true) item=oOrderArticle}]
+            <tr>
+                <td class="amount">
+                    [{$oOrderArticle->oxorderarticles__oxamount->value }]
+                </td>
+                <td class="description">
+                    [{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{ $oOrderArticle->oxorderarticles__oxselvariant->getRawValue() }]
+                    <br>
+                    <span class="artnr">
+                        [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}] [{$oOrderArticle->oxorderarticles__oxartnum->value }]
+                    </span>
+                </td>
+                <td class="tax">
+                    [{$oOrderArticle->oxorderarticles__oxvat->value }]
+                </td>
+                <td class="unitPrice">
+                    [{$oOrderArticle->getBrutPriceFormated()}] [{$currency->name}]
+                </td>
+                <td class="totalPrice">
+                    [{$oOrderArticle->getTotalBrutPriceFormated()}] [{$currency->name}]
+                </td>
+            </tr>
+        [{/foreach}]
+    </table>
+[{/block}]
+[{block name="articleCosts"}]
+    <table class="article_costs_table border-bottom">
+        <tr>
+            [{block name="d3_article_costs_summary"}]
+                [{include file="d3pdfarticlecostsummary.tpl"}]
+            [{/block}]
+        </tr>
+    </table>
+[{/block}]
\ No newline at end of file
diff --git a/Application/views/tpl/documents/inc/elements/deliveryaddress.tpl b/Application/views/tpl/documents/inc/elements/deliveryaddress.tpl
new file mode 100644
index 0000000..a9ad966
--- /dev/null
+++ b/Application/views/tpl/documents/inc/elements/deliveryaddress.tpl
@@ -0,0 +1,17 @@
+[{block name="deliveryaddress"}]
+    [{if $order->getFieldData('oxdelstreet')}]
+        <div class="deliveryaddress">
+            <div class="heading_order_fontSize10 heading_order_paddingBottom8">
+                [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DELIVERYADDRESS"}]
+            </div>
+            [{if $order->getFieldData('oxdelcompany')}]
+                <div>[{$order->getFieldData('oxdelcompany')}]</div>
+            [{/if}]
+            <div>[{$order->getFieldData('oxdelfname')}] [{$order->getFieldData('oxdellname')}]</div>
+            <div>[{$order->getFieldData('oxdelstreet')}] [{$order->getFieldData('oxdelstreetnr')}]</div>
+            <div><strong>[{$order->getFieldData('oxdelzip')}] [{$order->getFieldData('oxdelcity')}]</strong></div>
+            <div>[{$shop->getFieldData('oxcountry')}]</div>
+            <div>[{$shop->getFieldData('oxdeladdinfo')}]</div>
+        </div>
+    [{/if}]
+[{/block}]
\ No newline at end of file
diff --git a/Application/views/tpl/documents/inc/elements/foldmarks.tpl b/Application/views/tpl/documents/inc/elements/foldmarks.tpl
index 07f3668..34a9218 100644
--- a/Application/views/tpl/documents/inc/elements/foldmarks.tpl
+++ b/Application/views/tpl/documents/inc/elements/foldmarks.tpl
@@ -1,4 +1,4 @@
-[{assign var="defaultPagePadding" value=","|explode:"45,20,10,25"}]
+[{assign var="defaultPagePadding" value=","|explode:"45,20,10,25"}] [{* top, right, bottom, left *}]
 [{assign var="pagePadding" value=$pagePadding|default:$defaultPagePadding}]
 
 <style type="text/css">
diff --git a/Application/views/tpl/documents/inc/helper/rulers.tpl b/Application/views/tpl/documents/inc/helper/rulers.tpl
index d8b2824..0517781 100644
--- a/Application/views/tpl/documents/inc/helper/rulers.tpl
+++ b/Application/views/tpl/documents/inc/helper/rulers.tpl
@@ -1,4 +1,4 @@
-[{assign var="defaultPagePadding" value=","|explode:"45,20,10,25"}]
+[{assign var="defaultPagePadding" value=","|explode:"45,20,10,25"}] [{* top, right, bottom, left *}]
 [{assign var="pagePadding" value=$pagePadding|default:$defaultPagePadding}]
 
 [{* rulers *}]
diff --git a/Application/views/tpl/documents/inc/page/base.tpl b/Application/views/tpl/documents/inc/page/base.tpl
index 351bee6..a47f43a 100644
--- a/Application/views/tpl/documents/inc/page/base.tpl
+++ b/Application/views/tpl/documents/inc/page/base.tpl
@@ -1,7 +1,7 @@
 [{assign var="pageset" value=$pageset|default:"new"}]
 [{assign var="orientation" value=$orientation|default:"P"}]
 [{assign var="format" value=$format|default:"A4"}]
-[{assign var="defaultPagePadding" value=","|explode:"45,20,10,25"}]
+[{assign var="defaultPagePadding" value=","|explode:"45,20,10,25"}] [{* top, right, bottom, left *}]
 [{assign var="pagePadding" value=$pagePadding|default:$defaultPagePadding}]
 
 <style type="text/css">
diff --git a/Application/views/tpl/documents/inc/page/footer.tpl b/Application/views/tpl/documents/inc/page/footer.tpl
index 2471363..54e05ad 100644
--- a/Application/views/tpl/documents/inc/page/footer.tpl
+++ b/Application/views/tpl/documents/inc/page/footer.tpl
@@ -1,8 +1,8 @@
-[{assign var="defaultPagePadding" value=","|explode:"45,20,10,25"}]
+[{assign var="defaultPagePadding" value=","|explode:"45,20,10,25"}] [{* top, right, bottom, left *}]
 [{assign var="pagePadding" value=$pagePadding|default:$defaultPagePadding}]
 
 [{block name="pdfFooter"}]
-    <div class="footer" style="padding: 0 [{$pagePadding.1}]mm [{$pagePadding.2}]mm [{$pagePadding.3}]mm">
+    <div class="footer" style="margin: 0 [{$pagePadding.1}]mm [{$pagePadding.2}]mm [{$pagePadding.3}]mm">
         <table>
             <tr>
                 [{block name="pdfFooterLeft"}]
diff --git a/Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl b/Application/views/tpl/documents/invoice/includingFiles/conclusion.tpl
similarity index 51%
rename from Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl
rename to Application/views/tpl/documents/invoice/includingFiles/conclusion.tpl
index fa53c98..c463cb6 100644
--- a/Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl
+++ b/Application/views/tpl/documents/invoice/includingFiles/conclusion.tpl
@@ -1,20 +1,13 @@
-[{block name="pdfPastThankFile"}]
+[{block name="conclusion"}]
     <table class="past_thank_width100 borderSpacingUnset paddingTop10">
         <tr>
             <td class="paddingTop15 past_thank_width100 fontSize12">
-                [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USED_PAYMENTMETHOD"}]
-                [{$payment->getFieldData('oxdesc')}]
+                [{block name="conclusion_paymethod"}]
+                    [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USED_PAYMENTMETHOD"}]
+                    [{$payment->getFieldData('oxdesc')}]
+                [{/block}]
             </td>
         </tr>
-    [{* +++++++Individueller Zahlungstext+++++++ *}]
-    [{if $order->getFieldData('d3pdftextbestellbestaetigung')}]
-        <tr>
-            <td class="past_thank_width100 fontSize12">
-                [{$order->getFieldData('d3pdftextbestellbestaetigung')|nl2br}]
-            </td>
-        </tr>
-    [{/if}]
-        [{**Schlusstext/ Abschied***}]
         <tr>
             <td class="past_thank_width100 fontSize12">
                 [{oxmultilang ident="ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_1"}]
@@ -22,7 +15,7 @@
         </tr>
         <tr>
             <td class="past_thank_width100 fontSize12">
-                [{oxmultilang ident="ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_2"}]
+                [{oxmultilang ident="ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_2"}] [{$shop->oxshops__oxname->value}]
             </td>
         </tr>
     </table>
diff --git a/Application/views/tpl/documents/invoice/includingFiles/pdfHeader.tpl b/Application/views/tpl/documents/invoice/includingFiles/recipientAddress.tpl
similarity index 100%
rename from Application/views/tpl/documents/invoice/includingFiles/pdfHeader.tpl
rename to Application/views/tpl/documents/invoice/includingFiles/recipientAddress.tpl
diff --git a/Application/views/tpl/documents/invoice/includingFiles/salutation.tpl b/Application/views/tpl/documents/invoice/includingFiles/salutation.tpl
new file mode 100644
index 0000000..e7c3b74
--- /dev/null
+++ b/Application/views/tpl/documents/invoice/includingFiles/salutation.tpl
@@ -0,0 +1,6 @@
+[{block name="salutation"}]
+    <div class="salutation">
+        <div class="documentnumber">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERNR"}][{$order->getFieldData('oxordernr')}]</div>
+        <div>[{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSINCERELY"}][{$order->getFieldData('oxorderdate')|date_format:"%d.%m.%Y"}][{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSAT"}] [{$shop->oxshops__oxname->value}]</div>
+    </div>
+[{/block}]
\ No newline at end of file
diff --git a/Application/views/tpl/documents/invoice/invoice.tpl b/Application/views/tpl/documents/invoice/invoice.tpl
index 5df4998..641b3a2 100644
--- a/Application/views/tpl/documents/invoice/invoice.tpl
+++ b/Application/views/tpl/documents/invoice/invoice.tpl
@@ -1,7 +1,7 @@
 [{assign var="currency"      value=$order->getOrderCurrency()}]
 [{assign var="deliveryPrice" value= $order->getOrderDeliveryPrice()}]
 [{assign var="productVats"   value= $order->getProductVats(false)}]
-[{assign var="pagePadding"   value=","|explode:"45,20,10,25"}]
+[{assign var="pagePadding"   value=","|explode:"45,15,10,25"}] [{* top, right, bottom, left *}]
 
 [{capture append="pdfBlock_style"}]
     [{block name="pdfStyles"}]
@@ -27,65 +27,21 @@
         [{include file="d3pdfinformations.tpl"}]
     [{/block}]
 
-    <div>
-        [{* +++++++Lieferadressen dynamisch+++++++ *}]
-        [{if $order->getFieldData('oxdelstreet')}]
-            <div class="heading_order_fontSize10 heading_order_paddingBottom8">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DELIVERYADDRESS"}]</div>
-            [{if $order->getFieldData('oxdelcompany')}]<div>[{$order->getFieldData('oxdelcompany')}]</div>[{/if}]
-            <div>[{$order->getFieldData('oxdelfname')}] [{$order->getFieldData('oxdellname')}]</div>
-            <div>[{$order->getFieldData('oxdelstreet')}] [{$order->getFieldData('oxdelstreetnr')}]</div>
-            <div><strong>[{$order->getFieldData('oxdelzip')}] [{$order->getFieldData('oxdelcity')}]</strong></div>
-            <div>[{$shop->getFieldData('oxcountry')}]</div>
-            <div>[{$shop->getFieldData('oxdeladdinfo')}]</div>
-        [{/if}]
-    </div>
-
-    <div>
-        [{*Bestellnummer,Rechnungsvermerk, 'Ihre bestellung vom...'*}]
-        <div class="heading_order_paddingTop22 heading_order_fontSize15"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERNR"}][{$order->getFieldData('oxordernr')}]</strong></div>
-        [{if $order->getFieldData('d3pdftextkostenstelle_kunden')}]<div>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_INVOICENOTE"}][{$order->getFieldData('d3pdftextkostenstelle_kunden')}]</div>[{/if}]
-        <div class="heading_order_paddingTop1">[{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSINCERELY"}][{$order->getFieldData('oxorderdate')|date_format:"%d.%m.%Y"}][{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSAT"}]</div>
-    </div>
-
-    [{* +++++Artikeltabelle+++++*}]
-    [{block name="articleListing"}]
-        <table class="order_article_marginTop10" cellspacing="0">
-            <tr>
-                <td class="border-bottom order_article_PaddingBottom5 "><div class="vertical-a order_article_listing_fontSize order_article_listing_width_amount">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_AMOUNT"}]</div></td>
-                <td class="border-bottom order_article_PaddingBottom5 "><div class="order_article_listing_fontSize order_article_listing_width_desc">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DESCRIPTION"}]</div></td>
-                <td class="border-bottom order_article_PaddingBottom5 "><div class="aligning order_article_listing_fontSize order_article_listing_width_ust">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTPERCENTAGE"}]</div></td>
-                <td class="border-bottom order_article_PaddingBottom5 "><div class="aligning order_article_listing_fontSize order_article_listing_width_unitPrice">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_UNITPRICE"}]</div></td>
-                <td class="border-bottom order_article_PaddingBottom5 "><div class="aligning order_article_listing_fontSize order_article_listing_width_total_Price">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_TOTALPRICE"}]</div></td>
-            </tr>
-            [{foreach from=$order->getOrderArticles(true) item=oOrderArticle}]
-                <tr>
-                    <td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='fontSize12 aligning order_article_listing_width_amount order_article_listing_paddingRight52'>[{$oOrderArticle->oxorderarticles__oxamount->value }]</div></td>
-                    <td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='fontSize12 order_article_listing_width_desc'>
-                            [{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{ $oOrderArticle->oxorderarticles__oxselvariant->getRawValue() }]
-                            <br>
-                            <span class="order_article_listing_fontSize9">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}] [{$oOrderArticle->oxorderarticles__oxartnum->value }]</span>
-                        </div></td>
-                    <td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='aligning fontSize12 order_article_listing_width_ust'>[{$oOrderArticle->oxorderarticles__oxvat->value }]</div></td>
-                    <td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='aligning fontSize12 order_article_listing_width_unitPrice'>[{$oOrderArticle->getBrutPriceFormated()}] [{$currency->name}]</div></td>
-                    <td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='aligning fontSize12 order_article_listing_width_total_Price'>[{$oOrderArticle->getTotalBrutPriceFormated()}] [{$currency->name}]</div></td>
-                </tr>
-            [{/foreach}]
-        </table>
+    [{block name="pdfDeliveryAddress"}]
+        [{include file="d3pdfdeladdress.tpl"}]
+    [{/block}]
+
+    [{block name="pdfSalutation"}]
+        [{include file="d3invoice_pdf_salutation.tpl"}]
+    [{/block}]
+
+    [{block name="pdfArticleList"}]
+        [{include file="d3pdfarticlelist.tpl"}]
+    [{/block}]
+
+    [{block name="pdfConclusion"}]
+        [{include file="d3invoice_pdf_conclusion.tpl"}]
     [{/block}]
-    <nobreak>
-        [{block name="articleCosts"}]
-            <table class="article_costs_table border-bottom">
-                <tr>
-                    [{block name="d3_article_costs_summary"}]
-                        [{include file="d3_article_costs_summary.tpl"}]
-                    [{/block}]
-                </tr>
-            </table>
-        [{/block}]
-        [{block name="pdfPastThankFile"}]
-            [{include file="d3invoice_pdf_conclusion.tpl"}]
-        [{/block}]
-    </nobreak>
 [{/capture}]
 
 [{capture append="pdfBlock_footer"}]
diff --git a/metadata.php b/metadata.php
index a9b5e4c..4ca27c6 100644
--- a/metadata.php
+++ b/metadata.php
@@ -51,14 +51,15 @@ $aModule = [
 
         'd3deliverynote_pdf.tpl'        => 'd3/pdfdocuments/Application/views/tpl/documents/deliverynote/deliverynote.tpl',
         'd3deliverynoteNoLogo_pdf.tpl'  => 'd3/pdfdocuments/Application/views/tpl/documents/deliverynote/deliverynoteNoLogo.tpl',
-        'd3delnote_pdf_addressarea.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/deliverynote/includingFiles/pdfHeader.tpl',
-        'd3delnote_pdf_conclusion.tpl'  => 'd3/pdfdocuments/Application/views/tpl/documents/deliverynote/includingFiles/pdfPastThank.tpl',
+        'd3delnote_pdf_addressarea.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/deliverynote/includingFiles/recipientAddress.tpl',
+        'd3delnote_pdf_conclusion.tpl'  => 'd3/pdfdocuments/Application/views/tpl/documents/deliverynote/includingFiles/conclusion.tpl',
         'd3delnote_pdf_style.css'       => 'd3/pdfdocuments/out/src/css/deliverynote.css',
 
         'd3invoice_pdf.tpl'             => 'd3/pdfdocuments/Application/views/tpl/documents/invoice/invoice.tpl',
         'd3invoiceNoLogo_pdf.tpl'       => 'd3/pdfdocuments/Application/views/tpl/documents/invoice/invoiceNoLogo.tpl',
-        'd3invoice_pdf_addressarea.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/invoice/includingFiles/pdfHeader.tpl',
-        'd3invoice_pdf_conclusion.tpl'  => 'd3/pdfdocuments/Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl',
+        'd3invoice_pdf_addressarea.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/invoice/includingFiles/recipientAddress.tpl',
+        'd3invoice_pdf_salutation.tpl'  => 'd3/pdfdocuments/Application/views/tpl/documents/invoice/includingFiles/salutation.tpl',
+        'd3invoice_pdf_conclusion.tpl'  => 'd3/pdfdocuments/Application/views/tpl/documents/invoice/includingFiles/conclusion.tpl',
 
         'd3pdfbase.tpl'                 => 'd3/pdfdocuments/Application/views/tpl/documents/inc/page/base.tpl',
         'd3pdfheader.tpl'               => 'd3/pdfdocuments/Application/views/tpl/documents/inc/page/header.tpl',
@@ -67,6 +68,9 @@ $aModule = [
 
         'd3pdfaddressarea.tpl'          => 'd3/pdfdocuments/Application/views/tpl/documents/inc/elements/addressarea.tpl',
         'd3pdfinformations.tpl'         => 'd3/pdfdocuments/Application/views/tpl/documents/inc/elements/informations.tpl',
+        'd3pdfdeladdress.tpl'           => 'd3/pdfdocuments/Application/views/tpl/documents/inc/elements/deliveryaddress.tpl',
+        'd3pdfarticlelist.tpl'          => 'd3/pdfdocuments/Application/views/tpl/documents/inc/elements/articlelist.tpl',
+        'd3pdfarticlecostsummary.tpl'   => 'd3/pdfdocuments/Application/views/tpl/documents/inc/elements/articlecostssummary.tpl',
         'd3pdffoldmarks.tpl'            => 'd3/pdfdocuments/Application/views/tpl/documents/inc/elements/foldmarks.tpl',
 
         'd3pdfstyles.css'               => 'd3/pdfdocuments/out/src/css/pdfStyling.css',
diff --git a/out/src/css/pdfStyling.css b/out/src/css/pdfStyling.css
index 85d1cca..e5044c5 100644
--- a/out/src/css/pdfStyling.css
+++ b/out/src/css/pdfStyling.css
@@ -2,20 +2,20 @@
   padding: 5mm;
   height: 35mm;
   width: 100%;
-  background-color: lightgreen;
   position: relative;
 }
 
 .header img.logo {
   float: right;
   margin: 10mm;
+  margin-right: 0;
 }
 
-.addressarea {
+.addressarea,
+.deliveryaddress {
   left: 0;
   width: 80mm;
   height: 45mm;
-  background-color: lightpink;
   position: relative;
 }
 
@@ -26,7 +26,6 @@
 
 .addressarea .returnAddress {
   height: 17.7mm;
-  background-color: lightyellow;
   font-size: 8px;
 }
 
@@ -36,27 +35,39 @@
 
 .addressarea .recipientAddress {
   height: 27.3mm;
-  background-color: lightcyan;
 }
 
 .informations {
   width: 75mm;
-  background-color: greenyellow;
-  left: 100mm;
+  right: 0;
   top: 5mm;
   position: absolute;
 }
 
+.deliveryaddress {
+  margin-top: 10mm;
+  height: 27.3mm;
+}
+
+.salutation {
+  margin-top: 5mm;
+}
+
+.salutation .documentnumber {
+  font-weight: bold;
+}
+
 .footer{
-  width: 100%;
+  width: 173mm;
   font-size: 9px;
-  margin: 0;
   position: relative;
+  margin: 0;
+  padding: 0;
 }
 
 .footer table {
   border-top: solid 1px #000;
-  width: 165mm;
+  width: 100%;
   position: relative;
 }
 
@@ -144,9 +155,6 @@ table{
 .heading_order_paddingTopSub5{
   padding-top: -5px;
 }
-.heading_order_paddingTop1{
-  padding-top: 1mm;
-}
 .heading_order_fontSize15{
   font-size: 15px;
 }
@@ -170,6 +178,61 @@ table{
 }
 
 /*order_article_listing*/
+.article_table {
+  width: 100%;
+  margin-top: 5mm;
+  border-spacing: 0;
+  border-collapse: collapse;
+}
+.article_table th,
+.article_table td {
+  padding-bottom: 2mm;
+  vertical-align: top;
+}
+.article_table th {
+  border-bottom: solid 0.15mm #000;
+  font-weight: normal;
+  font-size: 11px;
+}
+.article_table td {
+  padding-top: 2mm;
+  font-size: 12px;
+}
+.article_table th.amount,
+.article_table td.amount,
+.article_table th.tax,
+.article_table td.tax {
+  width: 10%;
+}
+.article_table th.tax,
+.article_table td.tax {
+  text-align: right;
+  padding-right: 0;
+}
+.article_table th.description,
+.article_table td.description {
+  width: 50%;
+}
+.article_table td.description .artnr {
+  font-size: 9px;
+}
+.article_table th.unitPrice,
+.article_table td.unitPrice,
+.article_table th.totalPrice,
+.article_table td.totalPrice {
+  width: 15%;
+  text-align: right;
+}
+.article_table td.amount {
+  text-align: right;
+  padding-right: 10mm;
+}
+.article_table td.unitPrice,
+.article_table td.totalPrice {
+  text-align: right;
+  padding-right: 0;
+}
+
 .order_article_listing_width_amount{
   width: 20px;
 }