diff --git a/app/Services/PdfMaker/Design.php b/app/Services/PdfMaker/Design.php
index 7a2272012794..f24aebd1d148 100644
--- a/app/Services/PdfMaker/Design.php
+++ b/app/Services/PdfMaker/Design.php
@@ -432,10 +432,6 @@ class Design extends BaseDesign
             ? $this->context['variables']
             : ['values' => ['$entity.public_notes' => $this->entity->public_notes, '$entity.terms' => $this->entity->terms, '$entity_footer' => $this->entity->footer], 'labels' => []];
 
-        if ($this->type == 'delivery_note') {
-            return [];
-        }
-
         $variables = $this->context['pdf_variables']['total_columns'];
 
         $elements = [
@@ -453,6 +449,10 @@ class Design extends BaseDesign
             ['element' => 'div', 'properties' => ['class' => 'totals-table-right-side'], 'elements' => []],
         ];
 
+        if ($this->type == 'delivery_note') {
+            return $elements;
+        }
+
         foreach (['discount'] as $property) {
             $variable = sprintf('%s%s', '$', $property);
 
diff --git a/database/migrations/2021_05_19_115919_update_designs.php b/database/migrations/2021_05_20_115919_update_designs.php
similarity index 100%
rename from database/migrations/2021_05_19_115919_update_designs.php
rename to database/migrations/2021_05_20_115919_update_designs.php
diff --git a/resources/views/pdf-designs/bold.html b/resources/views/pdf-designs/bold.html
index 3e3852ff00af..2059b0e9b235 100644
--- a/resources/views/pdf-designs/bold.html
+++ b/resources/views/pdf-designs/bold.html
@@ -141,6 +141,7 @@
     }
 
     #table-totals {
+        margin-top: 1rem;
         display: grid;
         grid-template-columns: 2fr 1fr;
         padding-top: .5rem;
@@ -241,6 +242,17 @@
             <div class="footer-wrapper" id="footer">
                 <div>
                     <p data-ref="total_table-footer">$entity_footer</p>
+
+                    <script>
+                        // Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present.
+                        document.addEventListener('DOMContentLoaded', () => {
+                            ['product-table', 'task-table', 'delivery-note-table'].forEach((tableIdentifier) => {
+                                document.getElementById(tableIdentifier).childElementCount === 0
+                                    ? document.getElementById(tableIdentifier).style.display = 'none'
+                                    : '';
+                            });
+                        });
+                    </script>
                 </div>
                 <div> <!-- #2 column --> </div>
                 <div> <!-- #3 column --> </div>
@@ -269,10 +281,10 @@
 
             <table id="task-table" cellspacing="0"></table>
 
-            <div id="table-totals" cellspacing="0"></div>
-
             <table id="delivery-note-table" cellspacing="0"></table>
+
+            <div id="table-totals" cellspacing="0"></div>
         </td>
     </tr>
     </tbody>
-</table>
+</table>
\ No newline at end of file
diff --git a/resources/views/pdf-designs/business.html b/resources/views/pdf-designs/business.html
index 5ac9da42a04a..b8b5a0478bba 100644
--- a/resources/views/pdf-designs/business.html
+++ b/resources/views/pdf-designs/business.html
@@ -177,6 +177,7 @@
     }
 
     #table-totals {
+        margin-top: 1rem;
         display: grid;
         grid-template-columns: 2fr 1fr;
         gap: 80px;
@@ -222,6 +223,10 @@
     [data-ref="total_table-footer"] {
         padding-left: 1rem
     }
+
+    #footer {
+        margin-top: 30px;
+    }
 </style>
 
 <div id="header"></div>
@@ -251,11 +256,22 @@
 
     <table id="task-table" cellspacing="0"></table>
 
-    <div id="table-totals" cellspacing="0"></div>
-
     <table id="delivery-note-table" cellspacing="0"></table>
+    
+    <div id="table-totals" cellspacing="0"></div>
 </div>
 
 <div id="footer">
     <p data-ref="total_table-footer">$entity_footer</p>
+
+    <script>
+        // Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present.
+        document.addEventListener('DOMContentLoaded', () => {
+            ['product-table', 'task-table', 'delivery-note-table'].forEach((tableIdentifier) => {
+                document.getElementById(tableIdentifier).childElementCount === 0
+                    ? document.getElementById(tableIdentifier).style.display = 'none'
+                    : '';
+            });
+        });
+    </script>
 </div>
diff --git a/resources/views/pdf-designs/clean.html b/resources/views/pdf-designs/clean.html
index 218bb503a556..589b6f232416 100644
--- a/resources/views/pdf-designs/clean.html
+++ b/resources/views/pdf-designs/clean.html
@@ -148,6 +148,7 @@
     }
 
     #table-totals {
+        margin-top: 1rem;
         display: grid;
         grid-template-columns: 2fr 1fr;
         padding-top: .5rem;
@@ -187,8 +188,8 @@
         padding-right: 1rem;
     }
 
-    [data-ref="total_table-footer"] {
-        padding-left: 1rem
+    #footer {
+        margin-top: 30px;
     }
 </style>
 
@@ -217,11 +218,22 @@
 
     <table id="task-table" cellspacing="0"></table>
 
-    <div id="table-totals" cellspacing="0"></div>
-
     <table id="delivery-note-table" cellspacing="0"></table>
+
+    <div id="table-totals" cellspacing="0"></div>
 </div>
 
 <div id="footer">
     <p data-ref="total_table-footer">$entity_footer</p>
+    
+    <script>
+        // Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present.
+        document.addEventListener('DOMContentLoaded', () => {
+            ['product-table', 'task-table', 'delivery-note-table'].forEach((tableIdentifier) => {
+                document.getElementById(tableIdentifier).childElementCount === 0
+                    ? document.getElementById(tableIdentifier).style.display = 'none'
+                    : '';
+            });
+        });
+    </script>
 </div>
diff --git a/resources/views/pdf-designs/creative.html b/resources/views/pdf-designs/creative.html
index 1392ba3a964a..56261297e6aa 100644
--- a/resources/views/pdf-designs/creative.html
+++ b/resources/views/pdf-designs/creative.html
@@ -144,6 +144,7 @@
     }
 
     #table-totals {
+        margin-top: 1rem;
         display: grid;
         grid-template-columns: 2fr 1fr;
         padding-top: 1rem;
@@ -182,6 +183,10 @@
     [data-ref="total_table-footer"] {
         padding-left: 1rem
     }
+
+    #footer {
+        margin-top: 30px;
+    }
 </style>
 
 <div id="header"></div>
@@ -215,11 +220,22 @@
 
     <table id="task-table" cellspacing="0"></table>
 
-    <div id="table-totals" cellspacing="0"></div>
-
     <table id="delivery-note-table" cellspacing="0"></table>
+    
+    <div id="table-totals" cellspacing="0"></div>
 </div>
 
 <div id="footer">
     <p data-ref="total_table-footer">$entity_footer</p>
+
+    <script>
+        // Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present.
+        document.addEventListener('DOMContentLoaded', () => {
+            ['product-table', 'task-table', 'delivery-note-table'].forEach((tableIdentifier) => {
+                document.getElementById(tableIdentifier).childElementCount === 0
+                    ? document.getElementById(tableIdentifier).style.display = 'none'
+                    : '';
+            });
+        });
+    </script>
 </div>
diff --git a/resources/views/pdf-designs/elegant.html b/resources/views/pdf-designs/elegant.html
index 18b1d9378d37..1b707c746c96 100644
--- a/resources/views/pdf-designs/elegant.html
+++ b/resources/views/pdf-designs/elegant.html
@@ -137,6 +137,7 @@
     }
 
     #table-totals {
+        margin-top: 1rem;
         display: grid;
         grid-template-columns: 2fr 1fr;
         padding-top: 0.5rem;
@@ -180,6 +181,10 @@
     [data-ref="total_table-footer"] {
         padding-left: 1rem
     }
+
+    #footer {
+        margin-top: 30px;
+    }
 </style>
 
 <div id="header"></div>
@@ -219,12 +224,23 @@
 
     <table id="task-table" cellspacing="0"></table>
 
-    <div id="table-totals" cellspacing="0"></div>
-
     <table id="delivery-note-table" cellspacing="0"></table>
+    
+    <div id="table-totals" cellspacing="0"></div>
 </div>
 
 <div id="footer">
     <p data-ref="total_table-footer">$entity_footer</p>
+
+    <script>
+        // Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present.
+        document.addEventListener('DOMContentLoaded', () => {
+            ['product-table', 'task-table', 'delivery-note-table'].forEach((tableIdentifier) => {
+                document.getElementById(tableIdentifier).childElementCount === 0
+                    ? document.getElementById(tableIdentifier).style.display = 'none'
+                    : '';
+            });
+        });
+    </script>
 </div>
 
diff --git a/resources/views/pdf-designs/hipster.html b/resources/views/pdf-designs/hipster.html
index 9fc25df7321e..6858e4bd681a 100644
--- a/resources/views/pdf-designs/hipster.html
+++ b/resources/views/pdf-designs/hipster.html
@@ -153,6 +153,7 @@
     }
 
     #table-totals {
+        margin-top: 1rem;
         display: grid;
         grid-template-columns: 2fr 1fr;
         padding-top: 0.5rem;
@@ -191,6 +192,10 @@
         text-align: right;
         padding-right: 1rem;
     }
+
+    #footer {
+        margin-top: 30px;
+    }
 </style>
 <div id="header"></div>
 
@@ -251,11 +256,22 @@
 
     <table id="task-table" cellspacing="0"></table>
 
-    <div id="table-totals" cellspacing="0"></div>
-
     <table id="delivery-note-table" cellspacing="0"></table>
+
+    <div id="table-totals" cellspacing="0"></div>
 </div>
 
 <div id="footer">
     <p data-ref="total_table-footer">$entity_footer</p>
+
+    <script>
+        // Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present.
+        document.addEventListener('DOMContentLoaded', () => {
+            ['product-table', 'task-table', 'delivery-note-table'].forEach((tableIdentifier) => {
+                document.getElementById(tableIdentifier).childElementCount === 0
+                    ? document.getElementById(tableIdentifier).style.display = 'none'
+                    : '';
+            });
+        });
+    </script>
 </div>
diff --git a/resources/views/pdf-designs/modern.html b/resources/views/pdf-designs/modern.html
index 8c9ccde274c4..c67320be38cd 100644
--- a/resources/views/pdf-designs/modern.html
+++ b/resources/views/pdf-designs/modern.html
@@ -249,6 +249,17 @@
                     <div class="footer-content">
                         <div>
                             <p data-ref="total_table-footer">$entity_footer</p>
+
+                            <script>
+                                // Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present.
+                                document.addEventListener('DOMContentLoaded', () => {
+                                    ['product-table', 'task-table', 'delivery-note-table'].forEach((tableIdentifier) => {
+                                        document.getElementById(tableIdentifier).childElementCount === 0
+                                            ? document.getElementById(tableIdentifier).style.display = 'none'
+                                            : '';
+                                    });
+                                });
+                            </script>
                         </div>
                         <div id="company-details"></div>
                         <div id="company-address"></div>
diff --git a/resources/views/pdf-designs/plain.html b/resources/views/pdf-designs/plain.html
index 53577cf89b9b..2ca23038e1a6 100644
--- a/resources/views/pdf-designs/plain.html
+++ b/resources/views/pdf-designs/plain.html
@@ -117,6 +117,7 @@
     }
 
     #table-totals {
+        margin-top: 1rem;
         display: grid;
         grid-template-columns: 2fr 1fr;
         padding-top: .5rem;
@@ -154,6 +155,10 @@
     [data-ref="total_table-footer"] {
         padding-left: 1rem
     }
+
+    #footer {
+        margin-top: 30px;
+    }
 </style>
 <div id="header"></div>
 
@@ -179,11 +184,22 @@
 
     <table id="task-table" cellspacing="0"></table>
 
-    <div id="table-totals" cellspacing="0"></div>
-
     <table id="delivery-note-table" cellspacing="0"></table>
+
+    <div id="table-totals" cellspacing="0"></div>
 </div>
 
 <div id="footer">
     <p data-ref="total_table-footer">$entity_footer</p>
+
+    <script>
+        // Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present.
+        document.addEventListener('DOMContentLoaded', () => {
+            ['product-table', 'task-table', 'delivery-note-table'].forEach((tableIdentifier) => {
+                document.getElementById(tableIdentifier).childElementCount === 0
+                    ? document.getElementById(tableIdentifier).style.display = 'none'
+                    : '';
+            });
+        });
+    </script>
 </div>
diff --git a/resources/views/pdf-designs/playful.html b/resources/views/pdf-designs/playful.html
index 39a4e01d55c1..0fa90fa45841 100644
--- a/resources/views/pdf-designs/playful.html
+++ b/resources/views/pdf-designs/playful.html
@@ -169,6 +169,7 @@
     }
 
     #table-totals {
+        margin-top: 1rem;
         display: grid;
         grid-template-columns: 2fr 1fr;
         gap: 80px;
@@ -227,6 +228,10 @@
         padding-left: 3rem;
         padding-right: 3rem;
     }
+
+    #footer {
+        margin-top: 1rem;
+    }
 </style>
 
 
@@ -275,12 +280,23 @@
 
     <table id="task-table" cellspacing="0"></table>
 
-    <div id="table-totals" cellspacing="0"></div>
-
     <table id="delivery-note-table" cellspacing="0"></table>
+
+    <div id="table-totals" cellspacing="0"></div>
 </div>
 
 <div id="footer">
-    <p data-ref="total_table-footer">$entity_footer/p>
+    <p data-ref="total_table-footer">$entity_footer</p>
+
+    <script>
+        // Clear up space a bit, if [product-table, tasks-table, delivery-note-table] isn't present.
+        document.addEventListener('DOMContentLoaded', () => {
+            ['product-table', 'task-table', 'delivery-note-table'].forEach((tableIdentifier) => {
+                document.getElementById(tableIdentifier).childElementCount === 0
+                    ? document.getElementById(tableIdentifier).style.display = 'none'
+                    : '';
+            });
+        });
+    </script>
 </div>