diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php
index 5b1100cdcb5b..b8a476bba0e7 100644
--- a/app/Utils/HtmlEngine.php
+++ b/app/Utils/HtmlEngine.php
@@ -117,6 +117,8 @@ class HtmlEngine
         $data['$global_margin'] = ['value' => '6.35mm', 'label' => ''];
         $data['$company_logo_size'] = ['value' => $this->resolveCompanyLogoSize(), 'label' => ''];
         $data['$show_shipping_address'] = ['value' => $this->settings?->show_shipping_address ? 'flex' : 'none', 'label' => ''];
+        $data['$show_shipping_address_visibility'] = ['value' => $this->settings?->show_shipping_address ? 'visible' : 'hidden', 'label' => ''];
+        
         $data['$tax'] = ['value' => '', 'label' => ctrans('texts.tax')];
         $data['$app_url'] = ['value' => $this->generateAppUrl(), 'label' => ''];
         $data['$from'] = ['value' => '', 'label' => ctrans('texts.from')];
diff --git a/resources/views/pdf-designs/business.html b/resources/views/pdf-designs/business.html
index 4cebdaac2310..4931ac855eb3 100644
--- a/resources/views/pdf-designs/business.html
+++ b/resources/views/pdf-designs/business.html
@@ -89,6 +89,12 @@
         color: var(--primary-color);
     }
 
+    #shipping-details {
+        display: $show_shipping_address;
+        flex-direction: column;
+        line-height: var(--line-height);
+    }
+
     #entity-details {
         background-color: var(--primary-color);
         padding: 1.2rem;
@@ -382,6 +388,7 @@
                <div class="client-and-entity-wrapper">
                   <div id="client-details"></div>
                   <div id="vendor-details"></div>
+                <div id="shipping-details"></div>
                   <div class="entity-details-wrapper">
                      <table id="entity-details" cellspacing="0" dir="$dir"></table>
                   </div>
diff --git a/resources/views/pdf-designs/calm.html b/resources/views/pdf-designs/calm.html
index 8ded6355e52b..6a155307d77d 100644
--- a/resources/views/pdf-designs/calm.html
+++ b/resources/views/pdf-designs/calm.html
@@ -45,7 +45,7 @@
 
     .header-wrapper2 {
         display: grid;
-        grid-template-columns: 1fr 0.5fr;
+        grid-template-columns: 1fr 1fr 1fr;
         margin-top: 2rem;
         min-width: 100%;
     }
@@ -97,6 +97,12 @@
         line-height: var(--line-height);
     }
 
+    #shipping-details {
+        display: $show_shipping_address;
+        flex-direction: column;
+        line-height: var(--line-height);
+    }
+
     [data-ref="table"] {
         margin-top: 2rem;
         min-width: 100%;
@@ -368,6 +374,7 @@
                <div class="header-wrapper2">
                <div id="client-details"></div>
                <div id="vendor-details"></div>
+               <div id="shipping-details"></div>
 
                <div>
                <p class="entity-label" style="font-size:32px; font-weight: bold; color:$primary_color;">$entity_label</p>
diff --git a/resources/views/pdf-designs/creative.html b/resources/views/pdf-designs/creative.html
index 4e6e77ddda6c..fadc311d251e 100644
--- a/resources/views/pdf-designs/creative.html
+++ b/resources/views/pdf-designs/creative.html
@@ -40,14 +40,15 @@
 
     .header-wrapper {
         display: grid;
-        grid-template-columns: 1fr 1fr 1fr;
-        gap: 20px;
+        grid-template-columns: 0.3fr 0.3fr 0.3fr 0.3fr; 
         line-height: var(--line-height);
     }
 
     .company-logo {
 /*        max-width: 65%;*/
         max-width: $company_logo_size;
+                float:right;
+
     }
 
     #entity-details p { margin-top: 5px; }
@@ -95,6 +96,12 @@
         text-align: left;
     }
 
+    #shipping-details {
+        visibility: $show_shipping_address_visibility; 
+        flex-direction: column;
+        line-height: var(--line-height);
+    }
+
     .entity-label-wrapper #entity-details > tr,
     .entity-label-wrapper #entity-details th {
         font-weight: normal;
@@ -327,6 +334,8 @@
                <div class="header-wrapper">
                   <div id="client-details"></div>
                   <div id="vendor-details"></div>
+                  <div id="shipping-details"></div>
+
                   <div class="company-info-wrapper">
                      <div id="company-details"></div>
                      <div id="company-address"></div>