diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php
index b8a476bba0e7..bbd897b4079c 100644
--- a/app/Utils/HtmlEngine.php
+++ b/app/Utils/HtmlEngine.php
@@ -587,6 +587,8 @@ class HtmlEngine
         $data['$thanks'] = ['value' => '', 'label' => ctrans('texts.thanks')];
         $data['$from'] = ['value' => '', 'label' => ctrans('texts.from')];
         $data['$to'] = ['value' => '', 'label' => ctrans('texts.to')];
+        $data['$shipping'] = ['value' => '', 'label' => ctrans('texts.ship_to')];
+
         $data['$details'] = ['value' => '', 'label' => ctrans('texts.details')];
 
         $data['_rate1'] = ['value' => '', 'label' => ctrans('texts.tax')];
diff --git a/lang/en/texts.php b/lang/en/texts.php
index 96c46d70285d..3db8fac5acec 100644
--- a/lang/en/texts.php
+++ b/lang/en/texts.php
@@ -4954,6 +4954,7 @@ $LANG = [
     'unlock_pro' => 'Unlock Pro',
     'preferences' => 'Preferences',
     'click_to_variables' => 'Client here to see all variables.',
+    'ship_to' => 'Ship to',
 ];
 
 
diff --git a/resources/views/pdf-designs/elegant.html b/resources/views/pdf-designs/elegant.html
index 69543d71e2e1..7a53503960a5 100644
--- a/resources/views/pdf-designs/elegant.html
+++ b/resources/views/pdf-designs/elegant.html
@@ -60,19 +60,30 @@
     }
 
     #entity-details p { margin-right: 20px; margin-top: 5px; }
-
+    
     .client-entity-wrapper .wrapper-info-text {
         display: block;
         font-size: 1.5rem;
         font-weight: normal;
     }
+    
+    .client-entity-wrapper .shipping-info-text {
+        display: block;
+        font-size: 1.5rem;
+        font-weight: normal;
+        display: $show_shipping_address;
+    }
 
     .client-entity-wrapper .wrapper-left-side {
         display: grid;
-        grid-template-columns: 1fr 1fr;
+        grid-template-columns: auto auto ;
+        grid-template-areas: "a b c d";
+        grid-auto-columns: minmax(0, 1fr);
+        grid-auto-flow: column;
+        justify-content:left;
     }
 
-     .text-with-client  { margin-right: 15px; }
+     .text-with-client  { margin-right: 1px; }
 
     .client-entity-wrapper .wrapper-left-side #client-details,
     .client-entity-wrapper .wrapper-left-side #company-details,
@@ -82,6 +93,12 @@
         margin-top: 0.5rem;
     }
 
+    .client-entity-wrapper .wrapper-left-side #shipping-details {
+        display: $show_shipping_address;
+        flex-direction: column;
+        margin-top: 0.5rem;
+    }
+
     .client-entity-wrapper .wrapper-left-side .company-info {
         border-left: 1px solid;
         padding-left: 1rem;
@@ -90,7 +107,7 @@
     .client-entity-wrapper #entity-details {
         text-align: left;
         margin-top: 0.5rem;
-        min-width: 100%;
+        /* min-width: 100%; */
     }
 
     .client-entity-wrapper #entity-details > tr,
@@ -142,6 +159,10 @@
         text-align: right;
     }
 
+    [data-ref="shipping_address-label"] {
+        display: none;
+    }
+
     #table-totals {
         margin-top: 0.5rem;
         display: grid;
@@ -331,23 +352,27 @@
                   <img class="company-logo" src="$company.logo" alt="$company.name logo">
                </div>
                <hr class="double-border">
-               <div class="client-entity-wrapper">
+               <div class="client-entity-wrapper" style="">
                   <div class="wrapper-left-side">
                      <div class="text-with-client">
                         <h2 class="wrapper-info-text">$to_label</h2>
                         <div id="client-details"></div>
                         <div id="vendor-details"></div>
                      </div>
-                     <div class="company-info">
+                     <div class="shipping-info" style="">
+                        <h2 class="shipping-info-text">$shipping_label</h2>
+                        <div id="shipping-details"></div>
+                     </div>
+                     <div class="company-info" style="">
                         <h2 class="wrapper-info-text">$from_label</h2>
                         <div id="company-details"></div>
                         <div id="company-address"></div>
                      </div>
-                  </div>
-                  <div class="wrapper-right-side">
-                     <h2 class="wrapper-info-text">$details_label</h2>
-                     <table id="entity-details" cellspacing="0" dir="$dir"></table>
-                  </div>
+                    <div class="wrapper-right-side">
+                        <h2 class="wrapper-info-text">$details_label</h2>
+                        <table id="entity-details" cellspacing="0" dir="$dir"></table>
+                    </div>
+                </div>
                </div>
                <table id="product-table" cellspacing="0" data-ref="table"></table>
                <table id="task-table" cellspacing="0" data-ref="table"></table>
@@ -358,7 +383,7 @@
                <div id="statement-payment-table-totals" data-ref="statement-totals"></div>
                <table id="statement-aging-table" cellspacing="0" data-ref="table"></table>
                <div id="statement-aging-table-totals" data-ref="statement-totals"></div>
-               <div id="table-totals" cellspacing="0"></div>
+               <div id="table-totals" cellspacing="0">$status_logo</div>
             </div>
          </td>
       </tr>