diff --git a/app/Jobs/Document/ZipDocuments.php b/app/Jobs/Document/ZipDocuments.php
index 4ff689e97173..810c9c2359b5 100644
--- a/app/Jobs/Document/ZipDocuments.php
+++ b/app/Jobs/Document/ZipDocuments.php
@@ -21,19 +21,23 @@ use App\Mail\DownloadInvoices;
 use App\Models\Company;
 use App\Models\Document;
 use App\Models\User;
+use App\Utils\Ninja;
 use App\Utils\TempFile;
+use App\Utils\Traits\MakesDates;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Storage;
 use ZipArchive;
 
 class ZipDocuments implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, MakesDates;
 
     public $document_ids;
 
@@ -77,6 +81,11 @@ class ZipDocuments implements ShouldQueue
     {
         MultiDB::setDb($this->company->db);
 
+        App::setLocale($this->company->locale());
+        App::forgetInstance('translator');
+        $t = app('translator');
+        $t->replace(Ninja::transformTranslations($this->company->settings));
+
         # create new zip object
         $zipFile = new \PhpZip\ZipFile();
         $file_name = date('Y-m-d').'_'.str_replace(' ', '_', trans('texts.documents')).'.zip';
@@ -119,5 +128,13 @@ class ZipDocuments implements ShouldQueue
     {
         $filename = $document->name;
 
+        $date = $this->formatDate(Carbon::createFromTimestamp($document->created_at), 'Y-m-d');
+
+        $number = "_";
+
+        if(isset($document->documentable->number))
+            $number = "_".$document->documentable->number;
+
+        return "{$date}_{$document->documentable->translate_entity()}{$number}_{$filename}";
     }
 }
diff --git a/app/Models/Document.php b/app/Models/Document.php
index a6ff0fba4c32..7ebf62c77aaa 100644
--- a/app/Models/Document.php
+++ b/app/Models/Document.php
@@ -140,4 +140,9 @@ class Document extends BaseModel
     {
         return Storage::get($this->url);
     }
+
+    public function translate_entity()
+    {
+        return ctrans('texts.document');
+    }
 }
diff --git a/resources/views/portal/ninja2020/quotes/show.blade.php b/resources/views/portal/ninja2020/quotes/show.blade.php
index 71dfa0553fdd..4330e5ff1b10 100644
--- a/resources/views/portal/ninja2020/quotes/show.blade.php
+++ b/resources/views/portal/ninja2020/quotes/show.blade.php
@@ -44,7 +44,19 @@
                             </div>
                             @endif
 
+
+
                     </div>
+
+
+
+                                @if($quote->invoice_id) 
+                                    <div class="mt-5 sm:mt-0 sm:ml-6 flex justify-end">
+                                        <div class="inline-flex rounded-md shadow-sm">
+                                            <a class="button button-primary bg-primary" href="/client/invoices/{{ $quote->invoice->hashed_id }}">{{ ctrans('texts.view_invoice') }}</a>
+                                        </div>
+                                    </div>
+                                @endif
                 </div>
             </div>
         </div>
@@ -71,6 +83,7 @@
                 </div>
             </div>
         </div>
+
     @else
 
         <div class="bg-white shadow sm:rounded-lg mb-4">