diff --git a/public/built.js b/public/built.js
index ad547c62ab7b..ea4e49549805 100644
--- a/public/built.js
+++ b/public/built.js
@@ -31394,12 +31394,15 @@ NINJA.invoiceLines = function(invoice) {
             row.push({style:["quantity", rowStyle], text:qty || ' '});
         }
         if (showItemTaxes) {
-            var str = '';
+            var str = ' ';
             if (tax1) {
-                str += tax1.toString() + '% ';
+                str += tax1.toString() + '%';
             }
             if (tax2) {
-                str += tax2.toString() + '% ';
+                if (tax1) {
+                    str += '  ';
+                }
+                str += tax2.toString() + '%';
             }
             row.push({style:["tax", rowStyle], text:str});
         }
diff --git a/public/js/pdf.pdfmake.js b/public/js/pdf.pdfmake.js
index 77a3c254c787..afabd47f8875 100644
--- a/public/js/pdf.pdfmake.js
+++ b/public/js/pdf.pdfmake.js
@@ -395,12 +395,15 @@ NINJA.invoiceLines = function(invoice) {
             row.push({style:["quantity", rowStyle], text:qty || ' '});
         }
         if (showItemTaxes) {
-            var str = '';
+            var str = ' ';
             if (tax1) {
-                str += tax1.toString() + '% ';
+                str += tax1.toString() + '%';
             }
             if (tax2) {
-                str += tax2.toString() + '% ';
+                if (tax1) {
+                    str += '  ';
+                }
+                str += tax2.toString() + '%';
             }
             row.push({style:["tax", rowStyle], text:str});
         }
diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index cd8e56ad5985..c78d9aa8abdd 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -286,8 +286,8 @@
 
                       <ul class="nav nav-tabs" role="tablist" style="border: none">
                         <li role="presentation" class="active"><a href="#notes" aria-controls="notes" role="tab" data-toggle="tab">{{ trans('texts.note_to_client') }}</a></li>
-                        <li role="presentation"><a href="#terms" aria-controls="terms" role="tab" data-toggle="tab">{{ trans("texts.{$entityType}_terms") }}</a></li>
-                        <li role="presentation"><a href="#footer" aria-controls="footer" role="tab" data-toggle="tab">{{ trans("texts.{$entityType}_footer") }}</a></li>
+                        <li role="presentation"><a href="#terms" aria-controls="terms" role="tab" data-toggle="tab">{{ trans("texts.terms") }}</a></li>
+                        <li role="presentation"><a href="#footer" aria-controls="footer" role="tab" data-toggle="tab">{{ trans("texts.footer") }}</a></li>
                         @if ($account->isPro())
                             <li role="presentation"><a href="#attached-documents" aria-controls="attached-documents" role="tab" data-toggle="tab">{{ trans("texts.invoice_documents") }}</a></li>
                         @endif