diff --git a/app/DataMapper/EmailTemplateDefaults.php b/app/DataMapper/EmailTemplateDefaults.php
index bd281b4d87bf..e4f8c0c6ebc2 100644
--- a/app/DataMapper/EmailTemplateDefaults.php
+++ b/app/DataMapper/EmailTemplateDefaults.php
@@ -123,7 +123,7 @@ class EmailTemplateDefaults
 
     public static function emailInvoiceTemplate()
     {
-        $invoice_message = '<p>'.self::transformText('invoice_message').'</p><div class="center">$view_link</div>';
+        $invoice_message = '<p>'.self::transformText('invoice_message').'</p><div class="center">$view_button</div>';
 
         return $invoice_message;
     }
@@ -135,7 +135,7 @@ class EmailTemplateDefaults
 
     public static function emailQuoteTemplate()
     {
-        $quote_message = '<p>'.self::transformText('quote_message').'</p><div class="center">$view_link</div>';
+        $quote_message = '<p>'.self::transformText('quote_message').'</p><div class="center">$view_button</div>';
 
         return $quote_message;
     }
@@ -147,21 +147,21 @@ class EmailTemplateDefaults
 
     public static function emailPaymentTemplate()
     {
-        $payment_message = '<p>'.self::transformText('payment_message').'</p><div class="center">$view_link</div>';
+        $payment_message = '<p>'.self::transformText('payment_message').'</p><div class="center">$view_button</div>';
 
         return $payment_message;
     }
 
     public static function emailCreditTemplate()
     {
-        $credit_message = '<p>'.self::transformText('credit_message').'</p><div class="center">$view_link</div>';
+        $credit_message = '<p>'.self::transformText('credit_message').'</p><div class="center">$view_button</div>';
 
         return $credit_message;
     }
 
     public static function emailPaymentPartialTemplate()
     {
-        $payment_message = '<p>'.self::transformText('payment_message').'</p><div class="center">$view_link</div>';
+        $payment_message = '<p>'.self::transformText('payment_message').'</p><div class="center">$view_button</div>';
 
         return $payment_message;
     }
diff --git a/app/Mail/Engine/PaymentEmailEngine.php b/app/Mail/Engine/PaymentEmailEngine.php
index 85caa5de8ff2..a582822e6bf6 100644
--- a/app/Mail/Engine/PaymentEmailEngine.php
+++ b/app/Mail/Engine/PaymentEmailEngine.php
@@ -227,6 +227,7 @@ class PaymentEmailEngine extends BaseEmailEngine
         $data['$company4'] = ['value' => $this->helpers->formatCustomFieldValue($this->company->custom_fields, 'company4', $this->settings->custom_value4, $this->client) ?: '&nbsp;', 'label' => $this->helpers->makeCustomField($this->company->custom_fields, 'company4')];
 
         $data['$view_link'] = ['value' => '<a class="button" href="'.$this->payment->getLink().'">'.ctrans('texts.view_payment').'</a>', 'label' => ctrans('texts.view_payment')];
+        $data['$view_button'] = &$data['$view_link'];
         $data['$paymentLink'] = &$data['$view_link'];
         $data['$portalButton'] = ['value' => "<a href='{$this->payment->getPortalLink()}'>".ctrans('texts.login')."</a>", 'label' =>''];
         $data['$portal_url'] = &$data['$portalButton'];
diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php
index a678ce62721e..a6f494eab814 100644
--- a/app/Utils/HtmlEngine.php
+++ b/app/Utils/HtmlEngine.php
@@ -132,6 +132,7 @@ class HtmlEngine
             $data['$view_link'] = ['value' => '<a class="button" href="'.$this->invitation->getLink().'">'.ctrans('texts.view_invoice').'</a>', 'label' => ctrans('texts.view_invoice')];
             $data['$viewLink'] = &$data['$view_link'];
             $data['$viewButton'] = &$data['$view_link'];
+            $data['$view_button'] = &$data['$view_link'];
             $data['$paymentButton'] = &$data['$view_link'];
             $data['$view_url'] = ['value' => $this->invitation->getLink(), 'label' => ctrans('texts.view_invoice')];
             $data['$date'] = ['value' => $this->translateDate($this->entity->date, $this->entity->client->date_format(), $this->entity->client->locale()) ?: '&nbsp;', 'label' => ctrans('texts.invoice_date')];