diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ff7baa5ea39..bc886d8586e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## [Unreleased (daily channel)](https://github.com/invoiceninja/invoiceninja/tree/v5-develop)
 - Add Cache-control: no-cache to prevent overaggressive caching of assets
 - Client portal: Multiple accounts access improvements (#5703)
+- Client portal: "Credits" updates (#5734)
 
 ## [v5.1.56-release](https://github.com/invoiceninja/invoiceninja/releases/tag/v5.1.56-release)
 ## Fixed:
diff --git a/app/Http/Controllers/ClientPortal/CreditController.php b/app/Http/Controllers/ClientPortal/CreditController.php
index ea2eefcb2c74..4d09ef3ecc71 100644
--- a/app/Http/Controllers/ClientPortal/CreditController.php
+++ b/app/Http/Controllers/ClientPortal/CreditController.php
@@ -22,8 +22,15 @@ class CreditController extends Controller
 
     public function show(ShowCreditRequest $request, Credit $credit)
     {
-        return $this->render('credits.show', [
-            'credit' => $credit,
-        ]);
+        set_time_limit(0);
+
+        $data = ['credit' => $credit];
+
+
+        if ($request->query('mode') === 'fullscreen') {
+            return render('credits.show-fullscreen', $data);
+        }
+
+        return $this->render('credits.show', $data);
     }
 }
diff --git a/resources/views/portal/ninja2020/components/livewire/credits-table.blade.php b/resources/views/portal/ninja2020/components/livewire/credits-table.blade.php
index e2ae75bafb0f..f3b0eb07f150 100644
--- a/resources/views/portal/ninja2020/components/livewire/credits-table.blade.php
+++ b/resources/views/portal/ninja2020/components/livewire/credits-table.blade.php
@@ -59,7 +59,7 @@
                                 {{ $credit->formatDate($credit->date, $credit->client->date_format()) }}
                             </td>
                             <td class="px-6 py-4 whitespace-no-wrap text-sm leading-5 text-gray-500">
-                                {{ empty($credit->public_notes) ? '/' : $credit->public_notes }}
+                                {{ $credit->public_notes }}
                             </td>
                             <td class="px-6 py-4 whitespace-no-wrap text-sm leading-5 text-gray-500">
                                 <a href="{{ route('client.credit.show', $credit->hashed_id) }}" class="button-link text-primary">
diff --git a/resources/views/portal/ninja2020/credits/show-fullscreen.blade.php b/resources/views/portal/ninja2020/credits/show-fullscreen.blade.php
new file mode 100644
index 000000000000..438899646beb
--- /dev/null
+++ b/resources/views/portal/ninja2020/credits/show-fullscreen.blade.php
@@ -0,0 +1,2 @@
+<iframe src="{{ $credit->pdf_file_path(null, 'url', true) }}"
+        style="position:fixed; top:0; left:0; bottom:0; right:0; width:100%; height:100%; border:none; margin:0; padding:0; overflow:hidden; z-index:999999;"></iframe>
diff --git a/resources/views/portal/ninja2020/credits/show.blade.php b/resources/views/portal/ninja2020/credits/show.blade.php
index fd792226c636..569e1cde527f 100644
--- a/resources/views/portal/ninja2020/credits/show.blade.php
+++ b/resources/views/portal/ninja2020/credits/show.blade.php
@@ -7,121 +7,84 @@
 @endpush
 
 @section('body')
-    <div class="container mx-auto" x-data="{ tab: 'overview' }">
-        <div class="flex mb-4">
-            <button class="button button-primary text-black mr-4" x-on:click="tab = 'overview'" x-bind:class="{ 'border border-black': tab == 'overview' }">
-                Overview
-            </button>
-            <button class="button button-primary text-black" x-on:click="tab = 'pdf'" x-bind:class="{ 'border border-black': tab == 'pdf' }">
-                PDF
-            </button>
-        </div>
-        <div class="bg-white shadow overflow-hidden sm:rounded-lg" x-show="tab == 'overview'">
-            <div class="px-4 py-5 border-b border-gray-200 sm:px-6">
-                <h3 class="text-lg leading-6 font-medium text-gray-900">
-                    {{ ctrans('texts.credit') }}
-                </h3>
-                <p class="mt-1 max-w-2xl text-sm leading-5 text-gray-500" translate>
-
-                </p>
+    <div class="flex items-center justify-between">
+        <section class="flex items-center">
+            <div class="items-center" style="display: none" id="pagination-button-container">
+                <button class="input-label focus:outline-none hover:text-blue-600 transition ease-in-out duration-300"
+                        id="previous-page-button" title="Previous page">
+                    <svg class="w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7"/>
+                    </svg>
+                </button>
+                <button class="input-label focus:outline-none hover:text-blue-600 transition ease-in-out duration-300"
+                        id="next-page-button" title="Next page">
+                    <svg class="w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7"/>
+                    </svg>
+                </button>
             </div>
-            <div>
-                <dl>
-                    <div class="bg-gray-50 px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-                        <dt class="text-sm leading-5 font-medium text-gray-500">
-                            {{ ctrans('texts.amount') }}
-                        </dt>
-                        <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                            {{ App\Utils\Number::formatMoney($credit->amount, $credit->client) }}
-                        </dd>
-                    </div>
-                    <div class="bg-white px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-                        <dt class="text-sm leading-5 font-medium text-gray-500">
-                            {{ ctrans('texts.balance') }}
-                        </dt>
-                        <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                            {{ App\Utils\Number::formatMoney($credit->balance, $credit->client) }}
-                        </dd>
-                    </div>
-                    <div class="bg-gray-50 px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-                        <dt class="text-sm leading-5 font-medium text-gray-500">
-                            {{ ctrans('texts.credit_date') }}
-                        </dt>
-                        <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                            {{ $credit->formatDate($credit->date, $credit->client->date_format()) }}
-                        </dd>
-                    </div>
-                    <div class="bg-white px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-                        <dt class="text-sm leading-5 font-medium text-gray-500">
-                            {{ ctrans('texts.public_notes') }}
-                        </dt>
-                        <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                            {{ $credit->public_notes }}
-                        </dd>
-                    </div>
-                </dl>
+            <span class="text-sm text-gray-700 ml-2 lg:hidden">{{ ctrans('texts.page') }}:
+                <span id="current-page-container"></span>
+                <span>{{ strtolower(ctrans('texts.of')) }}</span>
+                <span id="total-page-container"></span>
+            </span>
+        </section>
+        <section class="flex items-center space-x-1">
+            <div class="flex items-center mr-4 space-x-1 lg:hidden">
+                <span class="text-gray-600 mr-2" id="zoom-level">100%</span>
+                <a href="#" id="zoom-in">
+                    <svg class="text-gray-400 hover:text-gray-600 focus:outline-none focus:text-gray-600 cursor-pointer"
+                         xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none"
+                         stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+                        <circle cx="11" cy="11" r="8"></circle>
+                        <line x1="21" y1="21" x2="16.65" y2="16.65"></line>
+                        <line x1="11" y1="8" x2="11" y2="14"></line>
+                        <line x1="8" y1="11" x2="14" y2="11"></line>
+                    </svg>
+                </a>
+                <a href="#" id="zoom-out">
+                    <svg class="text-gray-400 hover:text-gray-600 focus:outline-none focus:text-gray-600 cursor-pointer"
+                         xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none"
+                         stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+                        <circle cx="11" cy="11" r="8"></circle>
+                        <line x1="21" y1="21" x2="16.65" y2="16.65"></line>
+                        <line x1="8" y1="11" x2="14" y2="11"></line>
+                    </svg>
+                </a>
             </div>
-        </div>
-        <div class="flex items-center justify-between" x-show="tab == 'pdf'">
-            <section class="flex items-center">
-                <div class="items-center" style="display: none" id="pagination-button-container">
-                    <button class="input-label focus:outline-none hover:text-blue-600 transition ease-in-out duration-300" id="previous-page-button" title="Previous page">
-                        <svg class="w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7" />
-                        </svg>
-                    </button>
-                    <button class="input-label focus:outline-none hover:text-blue-600 transition ease-in-out duration-300" id="next-page-button" title="Next page">
-                        <svg class="w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7" />
+            <div x-data="{ open: false }" @keydown.escape="open = false" @click.away="open = false"
+                 class="relative inline-block text-left">
+                <div>
+                    <button @click="open = !open"
+                            class="flex items-center text-gray-400 hover:text-gray-600 focus:outline-none focus:text-gray-600">
+                        <svg class="h-5 w-5" fill="currentColor" viewBox="0 0 20 20">
+                            <path
+                                d="M10 6a2 2 0 110-4 2 2 0 010 4zM10 12a2 2 0 110-4 2 2 0 010 4zM10 18a2 2 0 110-4 2 2 0 010 4z"/>
                         </svg>
                     </button>
                 </div>
-                <span class="text-sm text-gray-700 ml-2">{{ ctrans('texts.page') }}:
-                    <span id="current-page-container"></span>
-                    <span>{{ strtolower(ctrans('texts.of')) }}</span>
-                    <span id="total-page-container"></span>
-                </span>
-            </section>
-            <section class="flex items-center space-x-1">
-                <div class="flex items-center mr-4 space-x-1">
-                    <span class="text-gray-600 mr-2" id="zoom-level">100%</span>
-                    <a href="#" id="zoom-in">
-                        <svg class="text-gray-400 hover:text-gray-600 focus:outline-none focus:text-gray-600 cursor-pointer" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                            <circle cx="11" cy="11" r="8"></circle>
-                            <line x1="21" y1="21" x2="16.65" y2="16.65"></line>
-                            <line x1="11" y1="8" x2="11" y2="14"></line>
-                            <line x1="8" y1="11" x2="14" y2="11"></line>
-                        </svg>
-                    </a>
-                    <a href="#" id="zoom-out">
-                        <svg class="text-gray-400 hover:text-gray-600 focus:outline-none focus:text-gray-600 cursor-pointer" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                            <circle cx="11" cy="11" r="8"></circle>
-                            <line x1="21" y1="21" x2="16.65" y2="16.65"></line>
-                            <line x1="8" y1="11" x2="14" y2="11"></line>
-                        </svg>
-                    </a>
-                </div>
-                <div x-data="{ open: false }" @keydown.escape="open = false" @click.away="open = false" class="relative inline-block text-left">
-                    <div>
-                        <button @click="open = !open" class="flex items-center text-gray-400 hover:text-gray-600 focus:outline-none focus:text-gray-600">
-                            <svg class="h-5 w-5" fill="currentColor" viewBox="0 0 20 20">
-                                <path d="M10 6a2 2 0 110-4 2 2 0 010 4zM10 12a2 2 0 110-4 2 2 0 010 4zM10 18a2 2 0 110-4 2 2 0 010 4z" />
-                            </svg>
-                        </button>
-                    </div>
-                    <div x-show="open" x-transition:enter="transition ease-out duration-100" x-transition:enter-start="transform opacity-0 scale-95" x-transition:enter-end="transform opacity-100 scale-100" x-transition:leave="transition ease-in duration-75" x-transition:leave-start="transform opacity-100 scale-100" x-transition:leave-end="transform opacity-0 scale-95" class="origin-top-right absolute right-0 mt-2 w-56 rounded-md shadow-lg">
-                        <div class="rounded-md bg-white shadow-xs">
-                            <div class="py-1">
-                                <a target="_blank" href="?mode=fullscreen" class="block px-4 py-2 text-sm leading-5 text-gray-700 hover:bg-gray-100 hover:text-gray-900 focus:outline-none focus:bg-gray-100 focus:text-gray-900">{{ ctrans('texts.open_in_new_tab') }}</a>
-                            </div>
+                <div x-show="open" x-transition:enter="transition ease-out duration-100"
+                     x-transition:enter-start="transform opacity-0 scale-95"
+                     x-transition:enter-end="transform opacity-100 scale-100"
+                     x-transition:leave="transition ease-in duration-75"
+                     x-transition:leave-start="transform opacity-100 scale-100"
+                     x-transition:leave-end="transform opacity-0 scale-95"
+                     class="origin-top-right absolute right-0 mt-2 w-56 rounded-md shadow-lg">
+                    <div class="rounded-md bg-white shadow-xs">
+                        <div class="py-1">
+                            <a target="_blank" href="?mode=fullscreen"
+                               class="block px-4 py-2 text-sm leading-5 text-gray-700 hover:bg-gray-100 hover:text-gray-900 focus:outline-none focus:bg-gray-100 focus:text-gray-900">{{ ctrans('texts.open_in_new_tab') }}</a>
                         </div>
                     </div>
                 </div>
-            </section>
-        </div>
-        <div class="flex justify-center" x-show="tab == 'pdf'">
-            <canvas id="pdf-placeholder" class="shadow rounded-lg bg-white mt-4 p-4"></canvas>
-        </div>
+            </div>
+        </section>
+    </div>
+
+    <iframe src="{{ $credit->pdf_file_path(null, 'url', true) }}" class="h-screen w-full border-0 hidden lg:block mt-4"></iframe>
+
+    <div class="flex justify-center">
+        <canvas id="pdf-placeholder" class="shadow rounded-lg bg-white lg:hidden mt-4 p-4"></canvas>
     </div>
 @endsection