diff --git a/app/Composers/AppComposer.php b/app/Composers/AppComposer.php
index b01546ab..5a1679c7 100644
--- a/app/Composers/AppComposer.php
+++ b/app/Composers/AppComposer.php
@@ -30,10 +30,12 @@ class AppComposer
         $mailAddress = env('MAIL_ADDRESS', false);
         $mailFrom = env('MAIL_NAME', false);
 
-        $view->withSubscribersEnabled($isEnabled && $mailAddress && $mailFrom);
-        $view->withAppName(Setting::get('app_name'));
         $view->withAboutApp(Markdown::convertToHtml(Setting::get('app_about')));
+        $view->withAppBanner(Setting::get('app_banner'));
+        $view->withAppBannerType(Setting::get('app_banner_type'));
         $view->withAppDomain(Setting::get('app_domain'));
+        $view->withAppName(Setting::get('app_name'));
         $view->withShowSupport(Setting::get('show_support'));
+        $view->withSubscribersEnabled($isEnabled && $mailAddress && $mailFrom);
     }
 }
diff --git a/resources/views/dashboard/settings/theme.blade.php b/resources/views/dashboard/settings/theme.blade.php
index 011c6166..6eac5ae0 100644
--- a/resources/views/dashboard/settings/theme.blade.php
+++ b/resources/views/dashboard/settings/theme.blade.php
@@ -20,9 +20,9 @@
                             <div class="col-xs-12">
                                 <div class="form-group">
                                     <label>{{ trans('forms.settings.app-setup.banner') }}</label>
-                                    @if($banner = Setting::get('app_banner'))
+                                    @if($app_banner)
                                     <div id="banner-view" class="well">
-                                        <img src="data:{{ Setting::get('app_banner_type') }};base64,{{ $banner }}" style="max-width: 100%">
+                                        <img src="data:{{ $app_banner_type }};base64,{{ $app_banner }}" style="max-width: 100%">
                                         <br><br>
                                         <button id="remove-banner" class="btn btn-danger">{{ trans('forms.remove') }}</button>
                                     </div>
diff --git a/resources/views/layout/emails.blade.php b/resources/views/layout/emails.blade.php
index a973caaf..791bb412 100644
--- a/resources/views/layout/emails.blade.php
+++ b/resources/views/layout/emails.blade.php
@@ -13,13 +13,13 @@
         <tr>
             <td align="center" valign="top" class="body-cell">
                 <table width="544" border="0" cellpadding="0" cellspacing="0" class="box">
-                    @if($banner_image = Setting::get('app_banner'))
+                    @if($app_banner)
                     <tr>
                         <td class="header">
                             <table width="100%" border="0" cellpadding="0" cellspacing="0">
                                 <tr>
                                     <td class="header-logo">
-                                       <a href="{{ $app_domain }}"><img src="data:{{ Setting::get('app_banner_type') }};base64, {{ $banner_image}}"></a>
+                                       <a href="{{ $app_domain }}"><img src="data:{{ $app_banner_type }};base64, {{ $app_banner }}"></a>
                                     </td>
                                 </tr>
                             </table>
diff --git a/resources/views/partials/banner.blade.php b/resources/views/partials/banner.blade.php
index a706a09d..af301ba0 100644
--- a/resources/views/partials/banner.blade.php
+++ b/resources/views/partials/banner.blade.php
@@ -1,13 +1,12 @@
-@if($bannerImage = Setting::get('app_banner'))
+@if($app_banner = $app_banner)
 <div @if(Setting::get('style_fullwidth_header'))class="app-banner"@endif>
     <div class="container">
         <div class="row app-banner-padding  @if(!Setting::get('style_fullwidth_header')) app-banner @endif">
             <div class="col-md-12 text-center">
-                <?php $bannerType = Setting::get('app_banner_type') ?>
                 @if($app_domain)
-                    <a href="{{ $app_domain }}" class="links"><img src="data:{{ $bannerType }};base64, {{ $bannerImage}}" class="banner-image img-responsive"></a>
+                <a href="{{ $app_domain }}" class="links"><img src="data:{{ $app_banner_type }};base64, {{ $app_banner }}" class="banner-image img-responsive"></a>
                 @else
-                    <img src="data:{{ $bannerType }};base64, {{ $bannerImage}}" class="banner-image img-responsive">
+                <img src="data:{{ $app_banner_type }};base64, {{ $app_banner }}" class="banner-image img-responsive">
                 @endif
             </div>
         </div>
diff --git a/resources/views/partials/stylesheet.blade.php b/resources/views/partials/stylesheet.blade.php
index c348e617..087671d3 100644
--- a/resources/views/partials/stylesheet.blade.php
+++ b/resources/views/partials/stylesheet.blade.php
@@ -2,7 +2,7 @@
 body.status-page {
     background-color: {{ $theme_background_color }};
     color: {{ $theme_text_color }};
-    @if(Setting::get('app_banner'))
+    @if($app_banner)
     padding-top: 0;
     @endif
 }
diff --git a/resources/views/signup.blade.php b/resources/views/signup.blade.php
index 68d8b9e9..cd9c3a92 100644
--- a/resources/views/signup.blade.php
+++ b/resources/views/signup.blade.php
@@ -7,14 +7,13 @@
 
     <div class="clearfix"></div>
 
-    @if($bannerImage = Setting::get('app_banner'))
+    @if($app_banner)
     <div class="row app-banner">
         <div class="col-md-12 text-center">
-            <?php $bannerType = Setting::get('app_banner_type') ?>
             @if($app_domain)
-            <a href="{{ $app_domain }}"><img src="data:{{ $bannerType }};base64, {{ $bannerImage}}" class="banner-image img-responsive"></a>
+            <a href="{{ $app_domain }}"><img src="data:{{ $app_banner_type }};base64, {{ $app_banner }}" class="banner-image img-responsive"></a>
             @else
-            <img src="data:{{ $bannerType }};base64, {{ $bannerImage}}" class="banner-image img-responsive">
+            <img src="data:{{ $app_banner_type }};base64, {{ $app_banner }}" class="banner-image img-responsive">
             @endif
         </div>
     </div>
diff --git a/resources/views/subscribe.blade.php b/resources/views/subscribe.blade.php
index 04d042cd..9af85b15 100644
--- a/resources/views/subscribe.blade.php
+++ b/resources/views/subscribe.blade.php
@@ -7,14 +7,13 @@
 
     <div class="clearfix"></div>
 
-    @if($bannerImage = Setting::get('app_banner'))
+    @if($app_banner)
     <div class="row app-banner">
         <div class="col-md-12 text-center">
-            <?php $bannerType = Setting::get('app_banner_type') ?>
             @if($app_domain)
-            <a href="{{ $app_domain }}"><img src="data:{{ $bannerType }};base64, {{ $bannerImage}}" class="banner-image img-responsive"></a>
+            <a href="{{ $app_domain }}"><img src="data:{{ $app_banner_type }};base64, {{ $app_banner }}" class="banner-image img-responsive"></a>
             @else
-            <img src="data:{{ $bannerType }};base64, {{ $bannerImage}}" class="banner-image img-responsive">
+            <img src="data:{{ $app_banner_type }};base64, {{ $app_banner }}" class="banner-image img-responsive">
             @endif
         </div>
     </div>