diff --git a/app/email/email.go b/app/email/email.go
index 1bd25f999b..b0cd66e7dd 100644
--- a/app/email/email.go
+++ b/app/email/email.go
@@ -1037,7 +1037,7 @@ func (es *Service) SendNoCardPaymentFailedEmail(email string, locale string, sit
 func (es *Service) SendDelinquencyEmail7(email, locale, siteURL, planName string) error {
 	T := i18n.GetUserTranslations(locale)
 
-	subject := T("api.templates.payment_failed.subject")
+	subject := T("api.templates.payment_failed.subject", map[string]any{"Plan": planName})
 
 	data := es.NewEmailTemplateData(locale)
 	data.Props["SiteURL"] = siteURL
diff --git a/i18n/en.json b/i18n/en.json
index 4087b69144..365a0d2199 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -3265,7 +3265,7 @@
   },
   {
     "id": "api.templates.delinquency_14.subject",
-    "translation": "Payment is overdue for your Mattermost {{.Plan}}."
+    "translation": "Payment is overdue for your Mattermost {{.Plan}}"
   },
   {
     "id": "api.templates.delinquency_14.subtitle1",
@@ -3313,7 +3313,7 @@
   },
   {
     "id": "api.templates.delinquency_30.subtitle2",
-    "translation": "if no action is taken, your workspace will be downgraded and the following data may be archived:"
+    "translation": "If no action is taken, your workspace will be downgraded and the following data may be archived:"
   },
   {
     "id": "api.templates.delinquency_30.title",
@@ -3329,7 +3329,7 @@
   },
   {
     "id": "api.templates.delinquency_45.subtitle1",
-    "translation": "We've been unable to collect payment for outstanding invoices dated {{.DelinquencyDate}}. Your workspace is at risk of being downgraded."
+    "translation": "We've been unable to collect payment for outstanding invoices since {{.DelinquencyDate}}. Your workspace is at risk of being downgraded."
   },
   {
     "id": "api.templates.delinquency_45.subtitle2",
@@ -3377,7 +3377,7 @@
   },
   {
     "id": "api.templates.delinquency_7.subtitle1",
-    "translation": "We couldn't process your most recent payment"
+    "translation": "We couldn't process your most recent payment."
   },
   {
     "id": "api.templates.delinquency_7.subtitle2",
@@ -3401,7 +3401,7 @@
   },
   {
     "id": "api.templates.delinquency_75.subtitle1",
-    "translation": "This is a final reminder that we haven’t received payment for your Mattermost Cloud workspace since {{.DelinquencyDate}}"
+    "translation": "This is a final reminder that we haven’t received payment for your Mattermost Cloud workspace since {{.DelinquencyDate}}."
   },
   {
     "id": "api.templates.delinquency_75.subtitle2",
diff --git a/templates/cloud_30_day_arrears.html b/templates/cloud_30_day_arrears.html
index 19290dd87f..40cc01ef49 100644
--- a/templates/cloud_30_day_arrears.html
+++ b/templates/cloud_30_day_arrears.html
@@ -439,7 +439,7 @@
                                 </td>
                               </tr>
                               <tr>
-                                <td align="center" vertical-align="middle" class="button-cloud" style="font-size:0px;padding:0px;word-break:break-word;">
+                                <td align="center" vertical-align="middle" class="button-cloud" style="font-size:0px;padding:0px;padding-bottom:24px;word-break:break-word;">
                                   <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
                                     <tr>
                                       <td align="center" bgcolor="#FFFFFF" role="presentation" style="border:none;border-radius:4px;border-top:16px;cursor:auto;mso-padding-alt:10px 25px;background:#FFFFFF;" valign="middle">
diff --git a/templates/cloud_30_day_arrears.mjml b/templates/cloud_30_day_arrears.mjml
index eaff779310..1b3fb3bb3c 100644
--- a/templates/cloud_30_day_arrears.mjml
+++ b/templates/cloud_30_day_arrears.mjml
@@ -32,7 +32,7 @@
           <mj-button color="#1C58D9" padding-bottom="30px" align="left" href="{{.Props.SiteURL}}/admin_console/billing/subscription">
             {{.Props.LimitsDocs}}
           </mj-button>
-          <mj-button href="{{.Props.SiteURL}}/admin_console/billing/subscription" padding="0px" border-top="16px" font-weight="400 !important" css-class="button-cloud" font-family="Open Sans, sans-serif">
+          <mj-button href="{{.Props.SiteURL}}/admin_console/billing/subscription" padding="0px" padding-bottom="24px" border-top="16px" font-weight="400 !important" css-class="button-cloud" font-family="Open Sans, sans-serif">
             {{.Props.Button}}
           </mj-button>
         </mj-column>
diff --git a/templates/cloud_45_day_arrears.html b/templates/cloud_45_day_arrears.html
index 9c4af6731c..f868f37ab4 100644
--- a/templates/cloud_45_day_arrears.html
+++ b/templates/cloud_45_day_arrears.html
@@ -433,7 +433,7 @@
                                 </td>
                               </tr>
                               <tr>
-                                <td align="center" vertical-align="middle" style="font-size:0px;padding:0px;padding-top:12px;word-break:break-word;">
+                                <td align="center" vertical-align="middle" style="font-size:0px;padding:0px;padding-top:12px;padding-bottom:24px;word-break:break-word;">
                                   <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
                                     <tr>
                                       <td align="center" bgcolor="#FFFFFF" role="presentation" style="border:none;border-radius:4px;cursor:auto;mso-padding-alt:10px 25px;background:#FFFFFF;" valign="middle">
diff --git a/templates/cloud_90_day_arrears.html b/templates/cloud_90_day_arrears.html
index f63b2b2a07..21769839ca 100644
--- a/templates/cloud_90_day_arrears.html
+++ b/templates/cloud_90_day_arrears.html
@@ -433,7 +433,7 @@
                                 </td>
                               </tr>
                               <tr>
-                                <td align="center" vertical-align="middle" style="font-size:0px;padding:0px;padding-top:12px;word-break:break-word;">
+                                <td align="center" vertical-align="middle" style="font-size:0px;padding:0px;padding-top:12px;padding-bottom:24px;word-break:break-word;">
                                   <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
                                     <tr>
                                       <td align="center" bgcolor="#FFFFFF" role="presentation" style="border:none;border-radius:4px;cursor:auto;mso-padding-alt:10px 25px;background:#FFFFFF;" valign="middle">
diff --git a/templates/partials/cloud_title_3subtitles_button.mjml b/templates/partials/cloud_title_3subtitles_button.mjml
index 23681ab9e3..38c39071af 100644
--- a/templates/partials/cloud_title_3subtitles_button.mjml
+++ b/templates/partials/cloud_title_3subtitles_button.mjml
@@ -16,7 +16,7 @@
       {{.Props.Button}}
     </mj-button>
     {{if .IncludeSecondaryActionButton}}
-    <mj-button color="#166DE0" align="center" padding-top="12px"  font-weight="600" href="{{.Props.SiteURL}}/admin_console/billing/subscription?action=show_delinquency_modal">
+    <mj-button color="#166DE0" align="center" padding-top="12px" padding-bottom="24px" font-weight="600" href="{{.Props.SiteURL}}/admin_console/billing/subscription?action=show_delinquency_modal">
         {{.Props.SecondaryActionButtonText}}
     </mj-button>
     {{end}}