diff --git a/resources/views/email/components/header.blade.php b/resources/views/email/components/header.blade.php
index 75ee6c1031..b16e959e74 100644
--- a/resources/views/email/components/header.blade.php
+++ b/resources/views/email/components/header.blade.php
@@ -1,14 +1,3 @@
-
-
-
-
- {{ $slot }}
-
- @isset($p)
- {!! $p !!}
- @endisset
-
\ No newline at end of file
+@isset($logo)
+
+@endisset
diff --git a/resources/views/email/template/dark.blade.php b/resources/views/email/template/dark.blade.php
index 1ffda38a15..5686fde210 100644
--- a/resources/views/email/template/dark.blade.php
+++ b/resources/views/email/template/dark.blade.php
@@ -1,22 +1,15 @@
@component('email.template.master', ['design' => 'dark', 'settings' => $settings, 'whitelabel' => $whitelabel])
-@slot('header')
- @component('email.components.header', ['p' => $body, 'logo' => (strlen($settings->company_logo) > 1) ? url('') . $settings->company_logo : 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png'])
-
- @if(isset($title))
- {{$title}}
+ @slot('header')
+ @include('email.components.header', ['logo' => (strlen($settings->company_logo) > 1) ? url('') . $settings->company_logo : 'https://www.invoiceninja.com/wp-content/uploads/2015/10/logo-white-horizontal-1.png'])
+ @endslot
+
+ {!! $body !!}
+
+ @slot('below_card')
+ @if($signature)
+ {{ $signature }}
@endif
-
- @endcomponent
-
- @if($footer)
- @component('email.components.button', ['url' => $view_link])
- {{$view_text}}
- @endcomponent
- @endif
-
-
-@endslot
-
+ @endslot
@endcomponent
diff --git a/resources/views/email/template/light.blade.php b/resources/views/email/template/light.blade.php
index 3fcfa13940..071de7226d 100644
--- a/resources/views/email/template/light.blade.php
+++ b/resources/views/email/template/light.blade.php
@@ -1,30 +1,15 @@
@component('email.template.master', ['design' => 'light', 'settings' => $settings, 'whitelabel' => $whitelabel])
@slot('header')
- @component('email.components.header', ['p' => $body, 'logo' => (strlen($settings->company_logo) > 1) ? url('') . $settings->company_logo : 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png'])
-
- @if(isset($title))
- {{$title}}
- @endif
-
- @endcomponent
-
-
- @if($footer)
- @component('email.components.button', ['url' => $view_link])
- {{$view_text}}
- @endcomponent
- @endif
-
-
+ @include('email.components.header', ['logo' => (strlen($settings->company_logo) > 1) ? url('') . $settings->company_logo : 'https://www.invoiceninja.com/wp-content/uploads/2015/10/logo-white-horizontal-1.png'])
@endslot
-@slot('below_card')
+{!! $body !!}
+@slot('below_card')
@if($signature)
{{ $signature }}
@endif
-
-@endslot
+@endslot
@endcomponent
diff --git a/resources/views/email/template/plain.blade.php b/resources/views/email/template/plain.blade.php
index 21ed824491..797454851d 100644
--- a/resources/views/email/template/plain.blade.php
+++ b/resources/views/email/template/plain.blade.php
@@ -1,30 +1,47 @@
-
-
+
+
-
+
+
+ Invoice Ninja
-
- {!! $body !!}
-
- @if($signature)
-
- {!! $signature !!}
-
- @endif
+
+
-
+
-@if(!$whitelabel)
-
-@endif
-
-
\ No newline at end of file