diff --git a/app/Utils/TemplateEngine.php b/app/Utils/TemplateEngine.php
index 14ce8fb1fa52..8a90ab4430fb 100644
--- a/app/Utils/TemplateEngine.php
+++ b/app/Utils/TemplateEngine.php
@@ -37,6 +37,8 @@ class TemplateEngine
 
     private $settings_entity;
 
+    private $settings;
+
     public function __construct($body, $subject, $entity, $entity_id, $template)
     {
         $this->body = $body;
@@ -77,8 +79,10 @@ class TemplateEngine
     {
         if ($this->entity_obj) {
             $this->settings_entity = $this->entity_obj->client;
+            $this->settings = $this->settings_entity->getMergedSettings();
         } else {
             $this->settings_entity = auth()->user()->company();
+            $this->settings = $this->settings_entity->settings;
         }
 
         return $this;
@@ -168,6 +172,7 @@ class TemplateEngine
         $data['body'] = '$body';
         $data['footer'] = '';
         $data['signature'] = $this->settings_entity->getSetting('email_signature');
+        $data['settings'] = $this->settings;
 
         if ($email_style == 'custom') {
             $wrapper = $this->settings_entity->getSetting('email_style_custom');
diff --git a/resources/views/email/template/light.blade.php b/resources/views/email/template/light.blade.php
index 704568b2f099..e1f47a55794f 100644
--- a/resources/views/email/template/light.blade.php
+++ b/resources/views/email/template/light.blade.php
@@ -1,10 +1,10 @@
-@component('email.template.master', ['design' => 'light'])
+@component('email.template.master', ['design' => 'light', 'settings' => $settings])
 
 @slot('header')
     @component('email.components.header', ['p' => $body, 'logo' => 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png'])
         
         @if(isset($title))
-        {{$title}}
+            {{$title}}
         @endif
 
     @endcomponent
diff --git a/resources/views/email/template/master.blade.php b/resources/views/email/template/master.blade.php
index 8e7ae0f9b7f6..0c3dc3ef5428 100644
--- a/resources/views/email/template/master.blade.php
+++ b/resources/views/email/template/master.blade.php
@@ -1,5 +1,5 @@
 @php
-  if(!isset($design)) $design = 'light';
+if(!isset($design)) $design = 'light';
 @endphp
 
 <!DOCTYPE html>
@@ -11,36 +11,46 @@
   <title>@yield('title')</title>
 </head>
 
-  @if($design == 'dark')
-    <style>
-      * {
-        color: #cbd5e0 !important;
-      }
-    </style>
-  @endif
+<style>
+  :root {
+    --primary-color: {{ $settings->primary_color }};
+  }
+
+  .border-primary {
+    border-color: var(--primary-color);
+  }
+</style>
+
+@if($design == 'dark')
+<style>
+  * {
+    color: #cbd5e0 !important;
+  }
+</style>
+@endif
 
 <body class="{{ $design == 'light' ? 'bg-gray-200' : 'bg-gray-800' }} my-10 font-sans {{ $design == 'light' ? 'text-gray-700' : 'text-gray-400' }}">
   <div class="grid grid-cols-6">
-    <div class="col-start-2 col-span-4">
-      <div class="{{ $design == 'light' ? 'bg-white' : 'bg-gray-900' }} shadow border-t-2 {{ $design == 'light' ? 'border-green-500' : 'border-gray-800' }}">
+    <div class="col-span-4 col-start-2">
+      <div class="{{ $design == 'light' ? 'bg-white' : 'bg-gray-900' }} shadow border-t-2 {{ $design == 'light' ? 'border-primary' : 'border-gray-800' }}">
         <div class="px-10">
           {{ $header }}
         </div>
-        <div id="text" class="px-10 py-6 flex flex-col">
+        <div id="text" class="flex flex-col px-10 py-6">
           @isset($greeting)
-            {{ $greeting }}
+          {{ $greeting }}
           @endisset
-          
-            {{ $slot }}
-          
+
+          {{ $slot }}
+
           @isset($signature)
-            {{ $signature }}
+          {{ $signature }}
           @endisset
         </div>
       </div>
 
       @isset($below_card)
-      <div id="bottomText" class="text-center my-4 px-10">
+      <div id="bottomText" class="px-10 my-4 text-center">
         {{ $below_card }}
       </div>
       @endisset
