diff --git a/app/Jobs/Entity/CreateRawPdf.php b/app/Jobs/Entity/CreateRawPdf.php
index 5914c5684e23..ebd2704c894f 100644
--- a/app/Jobs/Entity/CreateRawPdf.php
+++ b/app/Jobs/Entity/CreateRawPdf.php
@@ -13,7 +13,6 @@ namespace App\Jobs\Entity;
 
 use App\Exceptions\FilePermissionsFailure;
 use App\Libraries\MultiDB;
-use App\Models\Account;
 use App\Models\Credit;
 use App\Models\CreditInvitation;
 use App\Models\Design;
@@ -26,7 +25,6 @@ use App\Models\RecurringInvoiceInvitation;
 use App\Services\PdfMaker\Design as PdfDesignModel;
 use App\Services\PdfMaker\Design as PdfMakerDesign;
 use App\Services\PdfMaker\PdfMaker as PdfMakerService;
-use App\Services\Pdf\PdfService;
 use App\Utils\HostedPDF\NinjaPdf;
 use App\Utils\HtmlEngine;
 use App\Utils\Ninja;
@@ -42,15 +40,21 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\App;
-use Illuminate\Support\Facades\Lang;
-use Illuminate\Support\Facades\Storage;
 
 class CreateRawPdf implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, NumberFormatter, MakesInvoiceHtml, PdfMaker, MakesHash, PageNumbering;
+
+    public $entity;
+
+    public $company;
+
+    public $contact;
 
     public $invitation;
 
+    public $entity_string = '';
+
     /**
      * Create a new job instance.
      *
@@ -62,15 +66,146 @@ class CreateRawPdf implements ShouldQueue
 
         $this->invitation = $invitation;
 
+        if ($invitation instanceof InvoiceInvitation) {
+            $this->entity = $invitation->invoice;
+            $this->entity_string = 'invoice';
+        } elseif ($invitation instanceof QuoteInvitation) {
+            $this->entity = $invitation->quote;
+            $this->entity_string = 'quote';
+        } elseif ($invitation instanceof CreditInvitation) {
+            $this->entity = $invitation->credit;
+            $this->entity_string = 'credit';
+        } elseif ($invitation instanceof RecurringInvoiceInvitation) {
+            $this->entity = $invitation->recurring_invoice;
+            $this->entity_string = 'recurring_invoice';
+        }
+
+        $this->company = $invitation->company;
+
+        $this->contact = $invitation->contact;
     }
 
     public function handle()
     {
+        /* Forget the singleton*/
+        App::forgetInstance('translator');
 
-        $pdf = (new PdfService($this->invitation))->getPdf();
+        /* Init a new copy of the translator*/
+        $t = app('translator');
+        /* Set the locale*/
+        App::setLocale($this->contact->preferredLocale());
 
-        return $pdf;
+        /* Set customized translations _NOW_ */
+        $t->replace(Ninja::transformTranslations($this->entity->client->getMergedSettings()));
 
+        if (config('ninja.phantomjs_pdf_generation') || config('ninja.pdf_generator') == 'phantom') {
+            return (new Phantom)->generate($this->invitation, true);
+        }
+
+        $entity_design_id = '';
+
+        if ($this->entity instanceof Invoice) {
+            $path = $this->entity->client->invoice_filepath($this->invitation);
+            $entity_design_id = 'invoice_design_id';
+        } elseif ($this->entity instanceof Quote) {
+            $path = $this->entity->client->quote_filepath($this->invitation);
+            $entity_design_id = 'quote_design_id';
+        } elseif ($this->entity instanceof Credit) {
+            $path = $this->entity->client->credit_filepath($this->invitation);
+            $entity_design_id = 'credit_design_id';
+        } elseif ($this->entity instanceof RecurringInvoice) {
+            $path = $this->entity->client->recurring_invoice_filepath($this->invitation);
+            $entity_design_id = 'invoice_design_id';
+        }
+
+        $file_path = $path.$this->entity->numberFormatter().'.pdf';
+
+        $entity_design_id = $this->entity->design_id ? $this->entity->design_id : $this->decodePrimaryKey($this->entity->client->getSetting($entity_design_id));
+
+        $design = Design::find($entity_design_id);
+
+        /* Catch all in case migration doesn't pass back a valid design */
+        if (! $design) {
+            $design = Design::find(2);
+        }
+
+        $html = new HtmlEngine($this->invitation);
+
+        if ($design->is_custom) {
+            $options = [
+                'custom_partials' => json_decode(json_encode($design->design), true),
+            ];
+            $template = new PdfMakerDesign(PdfDesignModel::CUSTOM, $options);
+        } else {
+            $template = new PdfMakerDesign(strtolower($design->name));
+        }
+
+        $variables = $html->generateLabelsAndValues();
+
+        $state = [
+            'template' => $template->elements([
+                'client' => $this->entity->client,
+                'entity' => $this->entity,
+                'pdf_variables' => (array) $this->entity->company->settings->pdf_variables,
+                '$product' => $design->design->product,
+                'variables' => $variables,
+            ]),
+            'variables' => $variables,
+            'options' => [
+                'all_pages_header' => $this->entity->client->getSetting('all_pages_header'),
+                'all_pages_footer' => $this->entity->client->getSetting('all_pages_footer'),
+            ],
+            'process_markdown' => $this->entity->client->company->markdown_enabled,
+        ];
+
+        $maker = new PdfMakerService($state);
+
+        $maker
+            ->design($template)
+            ->build();
+
+        $pdf = null;
+
+        try {
+            if (config('ninja.invoiceninja_hosted_pdf_generation') || config('ninja.pdf_generator') == 'hosted_ninja') {
+                $pdf = (new NinjaPdf())->build($maker->getCompiledHTML(true));
+
+                $finfo = new \finfo(FILEINFO_MIME);
+
+                //fallback in case hosted PDF fails.
+                if ($finfo->buffer($pdf) != 'application/pdf; charset=binary') {
+                    $pdf = $this->makePdf(null, null, $maker->getCompiledHTML(true));
+
+                    $numbered_pdf = $this->pageNumbering($pdf, $this->company);
+
+                    if ($numbered_pdf) {
+                        $pdf = $numbered_pdf;
+                    }
+                }
+            } else {
+                $pdf = $this->makePdf(null, null, $maker->getCompiledHTML(true));
+
+                $numbered_pdf = $this->pageNumbering($pdf, $this->company);
+
+                if ($numbered_pdf) {
+                    $pdf = $numbered_pdf;
+                }
+            }
+        } catch (\Exception $e) {
+            nlog(print_r($e->getMessage(), 1));
+        }
+
+        if (config('ninja.log_pdf_html')) {
+            info($maker->getCompiledHTML());
+        }
+
+        if ($pdf) {
+            $maker =null;
+            $state = null;
+            return $pdf;
+        }
+
+        throw new FilePermissionsFailure('Unable to generate the raw PDF');
     }
 
     public function failed($e)