diff --git a/resources/views/layouts/guest.blade.php b/resources/views/layouts/guest.blade.php
index 6db093859999..7447cfb82f88 100644
--- a/resources/views/layouts/guest.blade.php
+++ b/resources/views/layouts/guest.blade.php
@@ -28,8 +28,10 @@
     <meta charset="utf-8">
     <title>@yield('meta_title', 'Invoice Ninja') | {{ config('app.name') }}</title>
     <meta name="description" content="@yield('meta_description')"/>
-    <link href="{{ asset('favicon.png') }}" rel="shortcut icon" type="image/png">
 
+    @if(auth()->guard('contact')->user() && !auth()->guard('contact')->user()->user->account->isPaid())
+        <link href="{{ asset('favicon.png') }}" rel="shortcut icon" type="image/png">
+    @endif
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
     <meta name="csrf-token" content="{{ csrf_token() }}">
diff --git a/resources/views/layouts/master.blade.php b/resources/views/layouts/master.blade.php
index e4aef481b2e3..ac7a393cadb0 100644
--- a/resources/views/layouts/master.blade.php
+++ b/resources/views/layouts/master.blade.php
@@ -28,29 +28,9 @@
     <meta charset="utf-8">
     <title>@yield('meta_title', 'Invoice Ninja') | {{ config('app.name') }}</title>
     <meta name="description" content="@yield('meta_description')"/>
-    <link href="{{ asset('favicon.png') }}" rel="shortcut icon" type="image/png">
-
-    <!--
-    TODO Setup social sharing info
-    <meta property="og:site_name" content="Invoice Ninja"/>
-    <meta property="og:url" content="{{ config('ninja.app_url') }}"/>
-    <meta property="og:title" content="Invoice Ninja"/>
-    <meta property="og:image" content="{{ config('ninja.app_url') }}images/logo.png"/>
-    <meta property="og:description" content="Create. Send. Get Paid."/>
-    --/>
-    <!-- http://realfavicongenerator.net -->
-    <!--
-    TODO Setup favicon
-    <link rel="apple-touch-icon" sizes="180x180" href="{{ url('apple-touch-icon.png') }}">
-    <link rel="icon" type="image/png" href="{{ url('favicon-32x32.png') }}" sizes="32x32">
-    <link rel="icon" type="image/png" href="{{ url('favicon-16x16.png') }}" sizes="16x16">
-    <link rel="manifest" href="{{ url('manifest.json') }}">
-    <link rel="mask-icon" href="{{ url('safari-pinned-tab.svg') }}" color="#3bc65c">
-    <link rel="shortcut icon" href="{{ url('favicon.ico') }}">
-    <meta name="apple-mobile-web-app-title" content="Invoice Ninja">
-    <meta name="application-name" content="Invoice Ninja">
-    <meta name="theme-color" content="#ffffff">
-    -->
+    @if(auth()->guard('contact')->user() && !auth()->guard('contact')->user()->user->account->isPaid())
+        <link href="{{ asset('favicon.png') }}" rel="shortcut icon" type="image/png">
+    @endif
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
     <meta name="csrf-token" content="{{ csrf_token() }}">
diff --git a/resources/views/portal/ninja2020/layout/clean.blade.php b/resources/views/portal/ninja2020/layout/clean.blade.php
index 17ee40e4947f..805429cb1ed0 100644
--- a/resources/views/portal/ninja2020/layout/clean.blade.php
+++ b/resources/views/portal/ninja2020/layout/clean.blade.php
@@ -91,7 +91,9 @@
 
         <!-- Styles -->
         <link href="{{ mix('css/app.css') }}" rel="stylesheet">
+        @if(auth()->guard('contact')->user() && !auth()->guard('contact')->user()->user->account->isPaid())
         {{-- <link href="{{ mix('favicon.png') }}" rel="shortcut icon" type="image/png"> --}}
+        @endif
 
         <link rel="canonical" href="{{ config('ninja.app_url') }}/{{ request()->path() }}"/>
 
diff --git a/resources/views/portal/ninja2020/layout/clean_setup.blade.php b/resources/views/portal/ninja2020/layout/clean_setup.blade.php
index a6781bd4fbc9..2083e6ff5b0a 100644
--- a/resources/views/portal/ninja2020/layout/clean_setup.blade.php
+++ b/resources/views/portal/ninja2020/layout/clean_setup.blade.php
@@ -89,7 +89,10 @@
         @else
             <link href="{{ str_replace("setup", "", Request::url())}}css/app.css" rel="stylesheet">
         @endif
+        
+        @if(auth()->guard('contact')->user() && !auth()->guard('contact')->user()->user->account->isPaid())
         {{-- <link href="{{ mix('favicon.png') }}" rel="shortcut icon" type="image/png"> --}}
+        @endif
 
         <link rel="canonical" href="{{ config('ninja.app_url') }}/{{ request()->path() }}"/>
 
diff --git a/resources/views/themes/ninja2020/clean.blade.php b/resources/views/themes/ninja2020/clean.blade.php
index f58c8f7ffab1..66ac3ebda118 100644
--- a/resources/views/themes/ninja2020/clean.blade.php
+++ b/resources/views/themes/ninja2020/clean.blade.php
@@ -78,7 +78,9 @@
         
         <!-- Styles -->
         <link href="{{ mix('css/app.css') }}" rel="stylesheet">
+        @if(auth()->guard('contact')->user() && !auth()->guard('contact')->user()->user->account->isPaid())
         {{-- <link href="{{ mix('favicon.png') }}" rel="shortcut icon" type="image/png"> --}}
+        @endif
 
         <link rel="canonical" href="{{ config('ninja.app_url') }}/{{ request()->path() }}"/>