diff --git a/app/DataMapper/EmailTemplateDefaults.php b/app/DataMapper/EmailTemplateDefaults.php
index b5f904cf4a..98b6f11c57 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><p>$view_link</p>';
+        $invoice_message = '<p>'.self::transformText('invoice_message').'</p><div class="center">$view_link</div>';
 
         return $invoice_message;
     }
@@ -135,7 +135,7 @@ class EmailTemplateDefaults
 
     public static function emailQuoteTemplate()
     {
-        $quote_message = '<p>'.self::transformText('quote_message').'</p><p>$view_link</p>';
+        $quote_message = '<p>'.self::transformText('quote_message').'</p><div class="center">$view_link</div>';
 
         return $quote_message;
     }
@@ -147,21 +147,21 @@ class EmailTemplateDefaults
 
     public static function emailPaymentTemplate()
     {
-        $payment_message = '<p>'.self::transformText('payment_message').'</p><p>$view_link</p>';
+        $payment_message = '<p>'.self::transformText('payment_message').'</p><div class="center">$view_link</div>';
 
         return $payment_message;
     }
 
     public static function emailCreditTemplate()
     {
-        $credit_message = '<p>'.self::transformText('credit_message').'</p><p>$view_link</p>';
+        $credit_message = '<p>'.self::transformText('credit_message').'</p><div class="center">$view_link</div>';
 
         return $credit_message;
     }
 
     public static function emailPaymentPartialTemplate()
     {
-        $payment_message = '<p>'.self::transformText('payment_message').'</p><p>$view_link</p>';
+        $payment_message = '<p>'.self::transformText('payment_message').'</p><div class="center">$view_link</div>';
 
         return $payment_message;
     }
diff --git a/resources/views/email/template/master.blade.php b/resources/views/email/template/master.blade.php
index d07a975a0b..642dcf589e 100644
--- a/resources/views/email/template/master.blade.php
+++ b/resources/views/email/template/master.blade.php
@@ -11,9 +11,10 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+    <title></title>
 </head>
 
-<style>
+<style type="text/css">
     :root {
         --primary-color: {{ isset($settings) ? $settings->primary_color : '#4caf50' }};
     }
@@ -46,6 +47,18 @@
     #email-content a, .link {
         word-break: break-all;
     }
+
+    #email-content .button {
+        position: center;
+    }
+
+    .center {
+        text-align: center;
+    }
+
+    p {
+        padding-bottom: 5px;
+    }
 </style>
 
 <body style="margin: 0; padding: 0; background-color: {{ $design == 'light' ? '#F9FAFB' : '#111827' }};">
@@ -63,7 +76,7 @@
                     <td bgcolor="{{ $design == 'light' ? '#ffffff' : '#1F2937'}}" style="padding: 40px 30px 40px 30px;">
                         <table cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;">
                             <tr>
-                                <td align="center" id="email-content">
+                                <td id="email-content">
                                     @yield('greeting')
 
                                     {{ $slot }}
