diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php
index c37d944c5d81..f8b2fd4b7c13 100644
--- a/app/Utils/HtmlEngine.php
+++ b/app/Utils/HtmlEngine.php
@@ -118,7 +118,7 @@ class HtmlEngine
         $data['$invoice.total_taxes']    = &$data['$total_taxes'];
 
         if ($this->entity_string == 'invoice') {
-            $data['$entity_label']       = ['value' => '', 'label' => ctrans('texts.invoice')];
+            $data['$entity']             = ['value' => '', 'label' => ctrans('texts.invoice')];
             $data['$number']             = ['value' => $this->entity->number ?: ' ', 'label' => ctrans('texts.invoice_number')];
             $data['$entity.terms']       = ['value' => $this->entity->terms ?: ' ', 'label' => ctrans('texts.invoice_terms')];
             $data['$terms']              = &$data['$entity.terms'];
@@ -126,7 +126,7 @@ class HtmlEngine
        }
 
         if ($this->entity_string == 'quote') {
-            $data['$entity_label']       = ['value' => '', 'label' => ctrans('texts.quote')];
+            $data['$entity']             = ['value' => '', 'label' => ctrans('texts.quote')];
             $data['$number']             = ['value' => $this->entity->number ?: ' ', 'label' => ctrans('texts.quote_number')];
             $data['$entity.terms']       = ['value' => $this->entity->terms ?: ' ', 'label' => ctrans('texts.quote_terms')];
             $data['$terms']              = &$data['$entity.terms'];
@@ -134,7 +134,7 @@ class HtmlEngine
        }
 
         if ($this->entity_string == 'credit') {
-            $data['$entity_label']       = ['value' => '', 'label' => ctrans('texts.credit')];
+            $data['$entity']             = ['value' => '', 'label' => ctrans('texts.credit')];
             $data['$number']             = ['value' => $this->entity->number ?: ' ', 'label' => ctrans('texts.credit_number')];
             $data['$entity.terms']       = ['value' => $this->entity->terms ?: ' ', 'label' => ctrans('texts.credit_terms')];
             $data['$terms']              = &$data['$entity.terms'];
@@ -177,9 +177,8 @@ class HtmlEngine
         $data['$invoice.public_notes']   = ['value' => $this->entity->public_notes ?: ' ', 'label' => ctrans('texts.public_notes')];
         $data['$entity.public_notes']    = &$data['$invoice.public_notes'];
 
-        $data['$entity_issued_to']      = ['value' => '', 'label' => ctrans("texts.{$this->entity_string}_issued_to")];
-        
-        $data['$your_' . $this->entity_string] = ['value' => '', 'label' => ctrans("texts.your_{$this->entity_string}")];
+        $data['$entity_issued_to']       = ['value' => '', 'label' => ctrans("texts.{$this->entity_string}_issued_to")];
+        $data['$your_entity']            = ['value' => '', 'label' => ctrans("texts.your_{$this->entity_string}")];
 
         $data['$quote.date']             = ['value' => $this->entity->date ?: ' ', 'label' => ctrans('texts.quote_date')];
         $data['$quote.number']           = ['value' => $this->entity->number ?: ' ', 'label' => ctrans('texts.quote_number')];
diff --git a/resources/views/pdf-designs/clean.html b/resources/views/pdf-designs/clean.html
index 77b3847c70e2..df44b4a7b642 100644
--- a/resources/views/pdf-designs/clean.html
+++ b/resources/views/pdf-designs/clean.html
@@ -34,7 +34,7 @@
         </div>
 
         <!-- Entity labels, client details -->
-        <p class="mt-10 text-xl text-blue-500 uppercase">$entity_label</p>
+        <p class="mt-10 px-2 text-xl text-blue-500 uppercase">$entity_label</p>
         <div class="grid grid-cols-12 px-2 py-3 mt-4 border-t border-b">
             <div class="col-span-6">
                 <table id="entity-details"></table>
diff --git a/resources/views/pdf-designs/elegant.html b/resources/views/pdf-designs/elegant.html
index ad8e72c47bba..4bb0858a619f 100644
--- a/resources/views/pdf-designs/elegant.html
+++ b/resources/views/pdf-designs/elegant.html
@@ -24,6 +24,9 @@
             <div class="flex flex-col items-end col-span-6">
                 <table id="entity-details"></table>
             </div>
+            <div class="col-span-6">
+                <p class="text-xl font-semibold uppercase">$your_entity_label</p>
+              </div>
         </div>
 
         <!-- Client details, company details -->
diff --git a/resources/views/pdf-designs/modern.html b/resources/views/pdf-designs/modern.html
index 4807d549b3ef..22ec9df4c304 100644
--- a/resources/views/pdf-designs/modern.html
+++ b/resources/views/pdf-designs/modern.html
@@ -30,6 +30,11 @@
 
         <div class="$global-margin">
             <!-- Company logo, client details -->
+            <div class="col-span-12 mb-10">
+                <p class="text-xl text-orange-600 font-semibold uppercase">
+                    $your_entity_label
+                </p>
+            </div>
             <div class="grid grid-cols-12">
                 <img
                     src="$company.logo"
diff --git a/resources/views/pdf-designs/plain.html b/resources/views/pdf-designs/plain.html
index 55af58327409..2e1a70647f31 100644
--- a/resources/views/pdf-designs/plain.html
+++ b/resources/views/pdf-designs/plain.html
@@ -34,6 +34,11 @@
 
         <!-- Client details -->
         <div class="grid grid-cols-12 mt-12">
+            <div class="col-span-12 mb-10">
+                <p class="text-xl text-black font-semibold uppercase">
+                    $your_entity_label
+                </p>
+            </div>
             <div class="col-span-6" id="client-details"></div>
         </div>
 
diff --git a/resources/views/pdf-designs/playful.html b/resources/views/pdf-designs/playful.html
index 692076442896..beeee6b5bba6 100644
--- a/resources/views/pdf-designs/playful.html
+++ b/resources/views/pdf-designs/playful.html
@@ -15,7 +15,7 @@
         #product-table tbody > tr > td:first-child {
             color: #9b2c2c;
         }
-        
+
         #product-table tbody > tr > td:last-child {
             color: #9b2c2c;
             font-weight: bold;
@@ -39,6 +39,11 @@
 
         <!-- Company details, client details -->
         <div class="grid grid-cols-12 gap-12 mt-12">
+            <div class="col-span-12">
+                <p class="text-xl text-teal-600 font-semibold uppercase">
+                    $your_entity_label
+                </p>
+            </div>
             <div class="col-span-6">
                 <p class="px-4 font-semibold text-teal-600">$to_label:</p>
                 <div