diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php
index 9fd3ce7b33ec..7e0ab3229746 100644
--- a/app/Utils/HtmlEngine.php
+++ b/app/Utils/HtmlEngine.php
@@ -24,6 +24,7 @@ use App\Utils\Ninja;
 use App\Utils\Number;
 use App\Utils\Traits\AppSetup;
 use App\Utils\Traits\MakesDates;
+use App\Utils\Traits\MakesHash;
 use Exception;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Cache;
@@ -32,7 +33,8 @@ class HtmlEngine
 {
     use MakesDates;
     use AppSetup;
-    
+    use MakesHash;
+
     public $entity;
 
     public $invitation;
@@ -101,9 +103,9 @@ class HtmlEngine
     private function resolveCompanyLogoSize()
     {
         $design_map = [
-            "VolejRejNm" => "65%", // "Plain",
+            "VolejRejNm" => "5%", // "Plain",
             "Wpmbk5ezJn" => "65%", //"Clean",
-            "Opnel5aKBz" => "100%", //"Bold",
+            "Opnel5aKBz" => "65%", //"Bold",
             "wMvbmOeYAl" => "55%", //Modern",
             "4openRe7Az" => "65%", //"Business",
             "WJxbojagwO" => "65%", //"Creative",
@@ -112,24 +114,37 @@ class HtmlEngine
             "yMYerEdOBQ" => "65%", //"Playful",
             "gl9avmeG1v" => "65%", //"Tech",
             "7LDdwRb1YK" => "65%", //"Calm",
+            "APdRoy0eGy" => "65%", //"Calm-DB2",
+            "y1aK83rbQG" => "65%", //"Calm-DB1",
         ];
 
-        if(strlen($this->settings->company_logo_size) > 1)
-        {
-            return $this->settings->company_logo_size;
-        }
+        $design_int_map = [
+            "1" => "5%", // "Plain",
+            "2" => "65%", //"Clean",
+            "3" => "65%", //"Bold",
+            "4" => "55%", //Modern",
+            "5" => "65%", //"Business",
+            "6" => "65%", //"Creative",
+            "7" => "55%", //"Elegant",
+            "8" => "65%", //"Hipster",
+            "9" => "65%", //"Playful",
+            "10" => "65%", //"Tech",
+            "11" => "65%", //"Calm",
+            "6972" => "65%", //"C-DB2"
+            "11221" => "65%", //"C-DB1"
+        ];
 
-        if($this->entity->design_id && array_key_exists($this->entity->design_id, $design_map))
-        {    
-            return $design_map[$this->entity->design_id];
-        }
+        if(isset($this->settings->company_logo_size) && strlen($this->settings->company_logo_size) > 1)
+            return $this->settings->company_logo_size;
+
+        if($this->entity->design_id && array_key_exists($this->entity->design_id, $design_int_map))
+            return $design_map[$this->encodePrimaryKey($this->entity->design_id)];
 
         $default_design_id = $this->entity_string."_design_id";
-
         $design_id = $this->settings->{$default_design_id};
 
         if(array_key_exists($design_id, $design_map))
-            return $design_map[$this->entity->design_id];
+            return $design_map[$design_id];
 
         return '65%';
 
diff --git a/resources/views/pdf-designs/bold.html b/resources/views/pdf-designs/bold.html
index 28aa512019f9..cde5d824c301 100644
--- a/resources/views/pdf-designs/bold.html
+++ b/resources/views/pdf-designs/bold.html
@@ -59,6 +59,7 @@
     .company-logo {
         height: 100%;
         max-width: 100%;
+        /*        max-width: $company_logo_size;*/
         object-fit: contain;
         object-position: left center;
     }
diff --git a/resources/views/pdf-designs/business.html b/resources/views/pdf-designs/business.html
index d78cc61fed17..ae7925b0672e 100644
--- a/resources/views/pdf-designs/business.html
+++ b/resources/views/pdf-designs/business.html
@@ -41,6 +41,7 @@
 
     .company-logo {
         max-width: 65%;
+        /*        max-width: $company_logo_size;*/
     }
 
     .header-container > span {
diff --git a/resources/views/pdf-designs/calm.html b/resources/views/pdf-designs/calm.html
index 038450849e5b..5f14d226ef7b 100644
--- a/resources/views/pdf-designs/calm.html
+++ b/resources/views/pdf-designs/calm.html
@@ -47,6 +47,7 @@
     
     .company-logo {
         max-width: 65%;
+        /*        max-width: $company_logo_size;*/
     }
 
     .client-and-entity-wrapper {
diff --git a/resources/views/pdf-designs/clean.html b/resources/views/pdf-designs/clean.html
index 36b976946b9a..454fba5f3b71 100644
--- a/resources/views/pdf-designs/clean.html
+++ b/resources/views/pdf-designs/clean.html
@@ -53,6 +53,7 @@
 
     .company-logo {
         max-width: 65%;
+        /*        max-width: $company_logo_size;*/
     }
 
     #company-details {
diff --git a/resources/views/pdf-designs/creative.html b/resources/views/pdf-designs/creative.html
index fc21a3b9074d..bdb1ad20a1a7 100644
--- a/resources/views/pdf-designs/creative.html
+++ b/resources/views/pdf-designs/creative.html
@@ -42,6 +42,7 @@
 
     .company-logo {
         max-width: 65%;
+        /*        max-width: $company_logo_size;*/
     }
 
     #entity-details p { margin-top: 5px; }
diff --git a/resources/views/pdf-designs/elegant.html b/resources/views/pdf-designs/elegant.html
index 66e9475c0969..4fbc6154fe69 100644
--- a/resources/views/pdf-designs/elegant.html
+++ b/resources/views/pdf-designs/elegant.html
@@ -32,6 +32,7 @@
 
     .company-logo {
         max-width: 55%;
+        /*        max-width: $company_logo_size;*/
         margin-left: auto;
         margin-right: auto;
         display: block;
diff --git a/resources/views/pdf-designs/hipster.html b/resources/views/pdf-designs/hipster.html
index dcf869b0381c..0ea7231638a6 100644
--- a/resources/views/pdf-designs/hipster.html
+++ b/resources/views/pdf-designs/hipster.html
@@ -81,6 +81,7 @@
 
     .company-logo {
         max-width: 65%;
+        /*        max-width: $company_logo_size;*/
     }
 
     .entity-label {
diff --git a/resources/views/pdf-designs/modern.html b/resources/views/pdf-designs/modern.html
index 68d8171f623b..a923209cdba3 100644
--- a/resources/views/pdf-designs/modern.html
+++ b/resources/views/pdf-designs/modern.html
@@ -85,6 +85,7 @@
 
       .company-logo {
         max-width: 55%;
+        /*        max-width: $company_logo_size;*/
       }
 
       #client-details {
diff --git a/resources/views/pdf-designs/plain.html b/resources/views/pdf-designs/plain.html
index 69dab91793e5..4cedc8f519dd 100644
--- a/resources/views/pdf-designs/plain.html
+++ b/resources/views/pdf-designs/plain.html
@@ -42,6 +42,7 @@
 
     .company-logo {
         max-width: 65%;
+        /*        max-width: $company_logo_size;*/
     }
 
     .header-wrapper #company-address {
diff --git a/resources/views/pdf-designs/playful.html b/resources/views/pdf-designs/playful.html
index fde299ccbe99..aa4df869e4e0 100644
--- a/resources/views/pdf-designs/playful.html
+++ b/resources/views/pdf-designs/playful.html
@@ -63,6 +63,7 @@
 
     .company-logo {
         max-width: 65%;
+        /*        max-width: $company_logo_size;*/
     }
 
     .contacts-wrapper {
diff --git a/resources/views/pdf-designs/tech.html b/resources/views/pdf-designs/tech.html
index 2e206b4821a6..1a5babf4f9b7 100644
--- a/resources/views/pdf-designs/tech.html
+++ b/resources/views/pdf-designs/tech.html
@@ -68,6 +68,7 @@
 
     .company-logo {
         max-width: 65%;
+/*        max-width: $company_logo_size;*/
     }
 
     .header-invoice-number {