diff --git a/resources/views/portal/ninja2020/components/livewire/invoices-table.blade.php b/resources/views/portal/ninja2020/components/livewire/invoices-table.blade.php
index 68b58c067..baf97af90 100644
--- a/resources/views/portal/ninja2020/components/livewire/invoices-table.blade.php
+++ b/resources/views/portal/ninja2020/components/livewire/invoices-table.blade.php
@@ -104,8 +104,8 @@
                                         </button>
                                     </form>
                                 @endif
-                                <a href="{{ route('client.invoice.show', $invoice->hashed_id) }}" class="button-link text-primary">
-                                    @lang('texts.view')
+                                <a href="{{ route('client.invoice.show', $invoice->hashed_id) }}?mode=fullscreen" class="button-link text-primary">
+                                    {{ ctrans('texts.view') }}
                                 </a>
                             </td>
                         </tr>
@@ -132,4 +132,4 @@
 
 @push('footer')
     <script src="{{ asset('js/clients/invoices/action-selectors.js') }}"></script>
-@endpush
\ No newline at end of file
+@endpush
diff --git a/resources/views/portal/ninja2020/components/primary-color.blade.php b/resources/views/portal/ninja2020/components/primary-color.blade.php
index 4aaa3b76b..550e2a8e8 100644
--- a/resources/views/portal/ninja2020/components/primary-color.blade.php
+++ b/resources/views/portal/ninja2020/components/primary-color.blade.php
@@ -1,6 +1,6 @@
 <style>
     :root {
-        --primary-color: {{ $settings->primary_color }};
+        --primary-color: {{ isset($settings) ? optional($settings)->primary_color : '#1c64f2' }};
     }
 
     .bg-primary {
@@ -8,11 +8,11 @@
     }
 
     .bg-primary-darken {
-        background-color: vaR(--primary-color);
+        background-color: var(--primary-color);
         filter: brightness(90%);
     }
 
     .text-primary {
         color: var(--primary-color);
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/resources/views/portal/ninja2020/invoices/show/fullscreen.blade.php b/resources/views/portal/ninja2020/invoices/show/fullscreen.blade.php
index 63c9cc238..5a49f24d9 100644
--- a/resources/views/portal/ninja2020/invoices/show/fullscreen.blade.php
+++ b/resources/views/portal/ninja2020/invoices/show/fullscreen.blade.php
@@ -15,12 +15,15 @@
                             <div class="mt-2 max-w-xl text-sm leading-5 text-gray-500">
                                 <p translate>
                                     {{ ctrans('texts.invoice_still_unpaid') }}
-                                    <!-- This invoice is still not paid. Click the button to complete the payment. -->
                                 </p>
                             </div>
                         </div>
                         <div class="mt-5 sm:mt-0 sm:ml-6 sm:flex-shrink-0 sm:flex sm:items-center">
-                            <div class="inline-flex rounded-md shadow-sm">
+                            <a href="{{ route('client.invoice.show', $invoice->hashed_id) }}" class="mr-4 text-primary">
+                                &#8592; {{ ctrans('texts.client_portal') }}
+                            </a>
+
+                            <div class="inline-flex items-center rounded-md shadow-sm">
                                 <input type="hidden" name="invoices[]" value="{{ $invoice->hashed_id }}">
                                 <input type="hidden" name="action" value="payment">
                                 <button class="button button-primary bg-primary">{{ ctrans('texts.pay_now') }}</button>
@@ -33,4 +36,4 @@
     @endif
 
     <iframe src="{{ $invoice->pdf_file_path() }}" class="h-screen w-full border-0"></iframe>
-@endsection
\ No newline at end of file
+@endsection
diff --git a/resources/views/portal/ninja2020/layout/clean.blade.php b/resources/views/portal/ninja2020/layout/clean.blade.php
index 2d975801c..86f21c40f 100644
--- a/resources/views/portal/ninja2020/layout/clean.blade.php
+++ b/resources/views/portal/ninja2020/layout/clean.blade.php
@@ -66,6 +66,8 @@
         <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/cookieconsent@3/build/cookieconsent.min.css" />
     </head>
 
+    @include('portal.ninja2020.components.primary-color')
+
     <body class="antialiased {{ $custom_body_class ?? '' }}">
         @yield('body')