diff --git a/app/Http/Controllers/ClientPortal/InvoiceController.php b/app/Http/Controllers/ClientPortal/InvoiceController.php
index 9b7e3ef1697f..8eddfce00646 100644
--- a/app/Http/Controllers/ClientPortal/InvoiceController.php
+++ b/app/Http/Controllers/ClientPortal/InvoiceController.php
@@ -54,11 +54,11 @@ class InvoiceController extends Controller
             'invoice' => $invoice,
         ];
 
-        if ($request->query('mode') === 'portal') {
-            return $this->render('invoices.show', $data);
+        if ($request->query('mode') === 'fullscreen') {
+            return response()->file($invoice->pdf_file_path(null, 'path'));
         }
 
-        return $this->render('invoices.show.fullscreen', $data);
+        return $this->render('invoices.show', $data);
     }
 
     /**
diff --git a/app/Http/Controllers/ClientPortal/QuoteController.php b/app/Http/Controllers/ClientPortal/QuoteController.php
index 85e7ab4a07f6..e0c3a1ba99af 100644
--- a/app/Http/Controllers/ClientPortal/QuoteController.php
+++ b/app/Http/Controllers/ClientPortal/QuoteController.php
@@ -35,7 +35,7 @@ class QuoteController extends Controller
      *
      * @param ShowQuoteRequest $request
      * @param Quote $quote
-     * @return Factory|View
+     * @return Factory|View|\Symfony\Component\HttpFoundation\BinaryFileResponse
      */
     public function show(ShowQuoteRequest $request, Quote $quote)
     {
@@ -43,11 +43,11 @@ class QuoteController extends Controller
             'quote' => $quote,
         ];
 
-        if ($request->query('mode') === 'portal') {
-            return $this->render('quotes.show', $data);
+        if ($request->query('mode') === 'fullscreen') {
+            return response()->file($quote->pdf_file_path(null, 'path'));
         }
 
-        return $this->render('quotes.show.fullscreen', $data);
+        return $this->render('quotes.show', $data);
     }
 
     public function bulk(ProcessQuotesInBulkRequest $request)
diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index 55b12addcdba..8b5d33e6e6b8 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -367,13 +367,13 @@ class Invoice extends BaseModel
         return $invoice_calc->build();
     }
 
-    public function pdf_file_path($invitation = null)
+    public function pdf_file_path($invitation = null, string $type = 'url')
     {
         if (! $invitation) {
             $invitation = $this->invitations->first();
         }
 
-        $storage_path = Storage::url($this->client->invoice_filepath().$this->number.'.pdf');
+        $storage_path = Storage::$type($this->client->invoice_filepath().$this->number.'.pdf');
 
         if (! Storage::exists($this->client->invoice_filepath().$this->number.'.pdf')) {
             event(new InvoiceWasUpdated($this, $this->company, Ninja::eventVars()));
diff --git a/app/Models/Quote.php b/app/Models/Quote.php
index 8ce236a5574f..b02b0f99f7da 100644
--- a/app/Models/Quote.php
+++ b/app/Models/Quote.php
@@ -187,13 +187,13 @@ class Quote extends BaseModel
         return new QuoteService($this);
     }
 
-    public function pdf_file_path($invitation = null)
+    public function pdf_file_path($invitation = null, string $type = 'url')
     {
         if (! $invitation) {
             $invitation = $this->invitations->where('client_contact_id', $this->client->primary_contact()->first()->id)->first();
         }
 
-        $storage_path = Storage::url($this->client->quote_filepath().$this->number.'.pdf');
+        $storage_path = Storage::$type($this->client->quote_filepath().$this->number.'.pdf');
 
         if (Storage::exists($this->client->quote_filepath().$this->number.'.pdf')) {
             return $storage_path;
diff --git a/resources/views/portal/ninja2020/invoices/show.blade.php b/resources/views/portal/ninja2020/invoices/show.blade.php
index 24d83f95e5b3..604e2c350d6e 100644
--- a/resources/views/portal/ninja2020/invoices/show.blade.php
+++ b/resources/views/portal/ninja2020/invoices/show.blade.php
@@ -101,14 +101,14 @@
                     </svg>
                 </button>
             </div>
-            <span class="text-sm text-gray-700 ml-2">{{ ctrans('texts.page') }}:
+            <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">
+            <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>
@@ -136,8 +136,10 @@
         </section>
     </div>
 
+    <iframe src="{{ $invoice->pdf_file_path() }}" class="h-screen w-full border-0 sm:hidden lg:block mt-4"></iframe>
+
     <div class="flex justify-center">
-        <canvas id="pdf-placeholder" class="shadow rounded-lg bg-white mt-4 p-4"></canvas>
+        <canvas id="pdf-placeholder" class="shadow rounded-lg bg-white lg:hidden mt-4 p-4"></canvas>
     </div>
 @endsection
 
diff --git a/resources/views/portal/ninja2020/quotes/show.blade.php b/resources/views/portal/ninja2020/quotes/show.blade.php
index cc7232016a96..e53b9363a9d0 100644
--- a/resources/views/portal/ninja2020/quotes/show.blade.php
+++ b/resources/views/portal/ninja2020/quotes/show.blade.php
@@ -20,73 +20,48 @@
         </div>
     @endif
 
-    <div class="flex items-center justify-between">
+    <div class="flex items-center justify-between mt-4">
         <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">
+                <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">
+                <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>
-            <span class="text-sm text-gray-700 ml-2">{{ ctrans('texts.page') }}:
+            <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">
-                <span class="text-gray-600 mr-2" id="zoom-level">175%</span>
+            <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>
+                    <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>
+                    <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 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">
+                    <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"/>
+                            <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 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>
+                            <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>
@@ -94,9 +69,11 @@
         </section>
     </div>
 
-    <div class="flex justify-center">
+    <div class="flex justify-center lg:hidden">
         <canvas id="pdf-placeholder" class="shadow rounded-lg bg-white mt-4 p-4"></canvas>
     </div>
+
+    <iframe src="{{ $quote->pdf_file_path() }}" class="h-screen w-full border-0 mt-4"></iframe>
 @endsection
 
 @section('footer')