diff --git a/resources/views/email/auth/verify.blade.php b/resources/views/email/auth/verify.blade.php
index 4c3e94fe5..b786b3457 100644
--- a/resources/views/email/auth/verify.blade.php
+++ b/resources/views/email/auth/verify.blade.php
@@ -2,20 +2,29 @@
     <div class="center">
         <p>{{ ctrans('texts.confirmation_message') }}</p>
 
-        <!-- <a href="{{ url("/user/confirm/{$user->confirmation_code}") }}" target="_blank" class="button">
-            {{ ctrans('texts.confirm') }}
-        </a> -->
-
-        <table border="0" cellspacing="0" cellpadding="0" align="center">
-            <tr style="border: 0 !important; ">
-                <td class="new_button" style="padding: 12px 18px 12px 18px; border-radius:5px;" align="center"> 
-                <a href="{{ url("/user/confirm/{$user->confirmation_code}") }}" target="_blank" style="border: 0 !important;font-size: 18px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; display: inline-block;">
-                    {{ ctrans('texts.confirm') }}
-                </a>
-                </td>
-            </tr>
-        </table>
-
+        <div>
+            <!--[if (gte mso 9)|(IE)]>
+                <table align="center" cellspacing="0" cellpadding="0" style="width: 600px;">
+                    <tr>
+                        <td align="center" valign="top">
+                            <![endif]-->        
+                            <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" >
+                                <tbody>
+                                    <tr>
+                                    <td align="center" class="new_button" style="border-radius: 2px; background-color: '.$this->settings->primary_color.'">
+                                        <a href="{{ url("/user/confirm/{$user->confirmation_code}") }}" target="_blank" class="new_button" style="text-decoration: none; border: 1px solid '.$this->settings->primary_color.'; display: inline-block; border-radius: 2px; padding-top: 15px; padding-bottom: 15px; padding-left: 25px; padding-right: 25px; font-size: 20px; color: #fff">
+                                        <singleline label="cta button">{{ ctrans('texts.confirm') }}</singleline>
+                                        </a>
+                                    </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                            <!--[if (gte mso 9)|(IE)]>
+                        </td>
+                    </tr>
+                </table>
+            <![endif]-->
+        </div>
 
     </div>
 @endcomponent
diff --git a/resources/views/email/billing/passwordless-login.blade.php b/resources/views/email/billing/passwordless-login.blade.php
index b9bb67677..095c5f996 100644
--- a/resources/views/email/billing/passwordless-login.blade.php
+++ b/resources/views/email/billing/passwordless-login.blade.php
@@ -3,17 +3,29 @@
         <h1>{{ ctrans('texts.login_link_requested_label') }}</h1>
         <p>{{ ctrans('texts.login_link_requested') }}</p>
 
-        <!-- <a href="{{ $url }}" target="_blank" class="button"> {{ ctrans('texts.login')}}</a> -->
-
-        <table border="0" cellspacing="0" cellpadding="0" align="center">
-            <tr style="border: 0 !important; ">
-                <td class="new_button" style="padding: 12px 18px 12px 18px; border-radius:5px;" align="center"> 
-                <a href="{{ $url }}") }}" target="_blank" style="border: 0 !important;font-size: 18px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; display: inline-block;">
-                    {{ ctrans('texts.login')}}                
-                </a>
-                </td>
-            </tr>
-        </table>
+        <div>
+            <!--[if (gte mso 9)|(IE)]>
+                <table align="center" cellspacing="0" cellpadding="0" style="width: 600px;">
+                    <tr>
+                        <td align="center" valign="top">
+                            <![endif]-->        
+                            <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" >
+                                <tbody>
+                                    <tr>
+                                    <td align="center" class="new_button" style="border-radius: 2px; background-color: '.$this->settings->primary_color.'">
+                                        <a href="{{ $url }}" target="_blank" class="new_button" style="text-decoration: none; border: 1px solid '.$this->settings->primary_color.'; display: inline-block; border-radius: 2px; padding-top: 15px; padding-bottom: 15px; padding-left: 25px; padding-right: 25px; font-size: 20px; color: #fff">
+                                        <singleline label="cta button">{{ ctrans('texts.login') }}</singleline>
+                                        </a>
+                                    </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                            <!--[if (gte mso 9)|(IE)]>
+                        </td>
+                    </tr>
+                </table>
+            <![endif]-->
+        </div>
 
     </div>
 @endcomponent
diff --git a/resources/views/email/gateways/ach-verification-notification.blade.php b/resources/views/email/gateways/ach-verification-notification.blade.php
index 6c75d66bf..ac01d0384 100644
--- a/resources/views/email/gateways/ach-verification-notification.blade.php
+++ b/resources/views/email/gateways/ach-verification-notification.blade.php
@@ -3,17 +3,29 @@
         <h1>{{ ctrans('texts.ach_verification_notification_label') }}</h1>
         <p>{{ ctrans('texts.ach_verification_notification') }}</p>
 
-        <!-- <a class="button" href="{{ $url }}">{{ ctrans('texts.complete_verification') }}</a> -->
-
-        <table border="0" cellspacing="0" cellpadding="0" align="center">
-            <tr style="border: 0 !important; ">
-                <td class="new_button" style="padding: 12px 18px 12px 18px; border-radius:5px;" align="center"> 
-                <a href="{{ $url }}") }}" target="_blank" style="border: 0 !important;font-size: 18px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; display: inline-block;">
-                    {{ ctrans('texts.complete_verification') }}        
-                </a>
-                </td>
-            </tr>
-        </table>
+        <div>
+            <!--[if (gte mso 9)|(IE)]>
+                <table align="center" cellspacing="0" cellpadding="0" style="width: 600px;">
+                    <tr>
+                        <td align="center" valign="top">
+                            <![endif]-->        
+                            <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" >
+                                <tbody>
+                                    <tr>
+                                    <td align="center" class="new_button" style="border-radius: 2px; background-color: '.$this->settings->primary_color.'">
+                                        <a href="{{ $url }}" target="_blank" class="new_button" style="text-decoration: none; border: 1px solid '.$this->settings->primary_color.'; display: inline-block; border-radius: 2px; padding-top: 15px; padding-bottom: 15px; padding-left: 25px; padding-right: 25px; font-size: 20px; color: #fff">
+                                        <singleline label="cta button">{{ ctrans('texts.complete_verification') }}</singleline>
+                                        </a>
+                                    </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                            <!--[if (gte mso 9)|(IE)]>
+                        </td>
+                    </tr>
+                </table>
+            <![endif]-->
+        </div>
 
     </div>
 @endcomponent
diff --git a/resources/views/email/import/completed.blade.php b/resources/views/email/import/completed.blade.php
index 6883db8ac..f9b4ed355 100644
--- a/resources/views/email/import/completed.blade.php
+++ b/resources/views/email/import/completed.blade.php
@@ -96,17 +96,29 @@
             </table>
         @endif
 
-        <!-- <a href="{{ url('/') }}" target="_blank" class="button">{{ ctrans('texts.account_login')}}</a> -->
-
-        <table border="0" cellspacing="0" cellpadding="0" align="center">
-            <tr style="border: 0 !important; ">
-                <td class="new_button" style="padding: 12px 18px 12px 18px; border-radius:5px;" align="center"> 
-                <a href="{{ url('/') }}") }}" target="_blank" style="border: 0 !important;font-size: 18px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; display: inline-block;">
-                    {{ ctrans('texts.account_login') }}        
-                </a>
-                </td>
-            </tr>
-        </table>
+        <div>
+            <!--[if (gte mso 9)|(IE)]>
+                <table align="center" cellspacing="0" cellpadding="0" style="width: 600px;">
+                    <tr>
+                        <td align="center" valign="top">
+                            <![endif]-->        
+                            <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" >
+                                <tbody>
+                                    <tr>
+                                    <td align="center" class="new_button" style="border-radius: 2px; background-color: '.$this->settings->primary_color.'">
+                                        <a href="{{ url('/') }}" target="_blank" class="new_button" style="text-decoration: none; border: 1px solid '.$this->settings->primary_color.'; display: inline-block; border-radius: 2px; padding-top: 15px; padding-bottom: 15px; padding-left: 25px; padding-right: 25px; font-size: 20px; color: #fff">
+                                        <singleline label="cta button">{{ ctrans('texts.account_login') }}</singleline>
+                                        </a>
+                                    </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                            <!--[if (gte mso 9)|(IE)]>
+                        </td>
+                    </tr>
+                </table>
+            <![endif]-->
+        </div>
 
         <p>{{ ctrans('texts.email_signature')}}</p>
         <p>{{ ctrans('texts.email_from') }}</p>
diff --git a/resources/views/email/import/csv_completed.blade.php b/resources/views/email/import/csv_completed.blade.php
index 9b915a9e6..7a77de0aa 100644
--- a/resources/views/email/import/csv_completed.blade.php
+++ b/resources/views/email/import/csv_completed.blade.php
@@ -91,17 +91,30 @@
             </table>
         @endif
 
-        <!-- <a href="{{ url('/') }}" target="_blank" class="button">{{ ctrans('texts.account_login')}}</a> -->
-        
-        <table border="0" cellspacing="0" cellpadding="0" align="center">
-            <tr style="border: 0 !important; ">
-                <td class="new_button" style="padding: 12px 18px 12px 18px; border-radius:5px;" align="center"> 
-                <a href="{{ url('/') }}") }}" target="_blank" style="border: 0 !important;font-size: 18px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; display: inline-block;">
-                    {{ ctrans('texts.account_login') }}        
-                </a>
-                </td>
-            </tr>
-        </table>
+        <div>
+            <!--[if (gte mso 9)|(IE)]>
+                <table align="center" cellspacing="0" cellpadding="0" style="width: 600px;">
+                    <tr>
+                        <td align="center" valign="top">
+                            <![endif]-->        
+                            <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" >
+                                <tbody>
+                                    <tr>
+                                    <td align="center" class="new_button" style="border-radius: 2px; background-color: '.$this->settings->primary_color.'">
+                                        <a href="{{ url('/') }}" target="_blank" class="new_button" style="text-decoration: none; border: 1px solid '.$this->settings->primary_color.'; display: inline-block; border-radius: 2px; padding-top: 15px; padding-bottom: 15px; padding-left: 25px; padding-right: 25px; font-size: 20px; color: #fff">
+                                        <singleline label="cta button">{{ ctrans('texts.account_login') }}</singleline>
+                                        </a>
+                                    </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                            <!--[if (gte mso 9)|(IE)]>
+                        </td>
+                    </tr>
+                </table>
+            <![endif]-->
+        </div>
+
 
         <p>{{ ctrans('texts.email_signature')}}</p>
         <p>{{ ctrans('texts.email_from') }}</p>
diff --git a/resources/views/email/migration/completed.blade.php b/resources/views/email/migration/completed.blade.php
index d6879ef6d..6bdd41abc 100644
--- a/resources/views/email/migration/completed.blade.php
+++ b/resources/views/email/migration/completed.blade.php
@@ -2,20 +2,30 @@
     <div class="center">
         <h1>{{ ctrans('texts.migration_completed')}}</h1>
         <p>{{ ctrans('texts.migration_completed_description')}}</p>
-<!-- 
-        <a href="{{ url('/') }}" target="_blank" class="button">
-            {{ ctrans('texts.account_login')}}
-        </a> -->
-        <table border="0" cellspacing="0" cellpadding="0" align="center">
-            <tr style="border: 0 !important; ">
-                <td class="new_button" style="padding: 12px 18px 12px 18px; border-radius:5px;" align="center"> 
-                <a href="{{ url('/') }}") }}" target="_blank" style="border: 0 !important;font-size: 18px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; display: inline-block;">
-                    {{ ctrans('texts.account_login') }}        
-                </a>
-                </td>
-            </tr>
-        </table>
 
+                <div>
+            <!--[if (gte mso 9)|(IE)]>
+                <table align="center" cellspacing="0" cellpadding="0" style="width: 600px;">
+                    <tr>
+                        <td align="center" valign="top">
+                            <![endif]-->        
+                            <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" >
+                                <tbody>
+                                    <tr>
+                                    <td align="center" class="new_button" style="border-radius: 2px; background-color: '.$this->settings->primary_color.'">
+                                        <a href="{{ url('/') }}" target="_blank" class="new_button" style="text-decoration: none; border: 1px solid '.$this->settings->primary_color.'; display: inline-block; border-radius: 2px; padding-top: 15px; padding-bottom: 15px; padding-left: 25px; padding-right: 25px; font-size: 20px; color: #fff">
+                                        <singleline label="cta button">{{ ctrans('texts.account_login') }}</singleline>
+                                        </a>
+                                    </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                            <!--[if (gte mso 9)|(IE)]>
+                        </td>
+                    </tr>
+                </table>
+            <![endif]-->
+        </div>
 
         <p>{{ ctrans('texts.email_signature')}}<br/> {{ ctrans('texts.email_from') }}</p>
     </div>