diff --git a/src/assets/emails/genericTemplate.html b/src/assets/emails/genericTemplate.html
index 9ea9190..0c5955f 100644
--- a/src/assets/emails/genericTemplate.html
+++ b/src/assets/emails/genericTemplate.html
@@ -53,7 +53,8 @@
         color: #fff !important;
         font-weight: 700 !important;
       }
-      td strong {
+      td strong,
+      td b {
         font-weight: 700 !important;
         color: #9D6FF3 !important;
       }
@@ -113,14 +114,10 @@
       }
     }
 
-    td.primary a,
-    td.secondary a,
-    td.primary span,
-    td.secondary span,
-    u+.email-body td.primary a,
-    u+.email-body td.secondary a,
-    u+.email-body td.primary span,
-    u+.email-body td.secondary span {
+    td.button a,
+    td.button span,
+    u+.email-body td.button a,
+    u+.email-body td.button span {
       text-decoration: none !important;
     }
 
diff --git a/src/mailer.ts b/src/mailer.ts
index 4cdd85c..630c3e4 100644
--- a/src/mailer.ts
+++ b/src/mailer.ts
@@ -113,15 +113,20 @@ export class CreateEmail {
 			});
 		}
 
+		// wrap <b> and <strong> in a <span> element, to fix color on thunderbird and weight on icloud mail web
+		const bRegex = /<b ?>.*?<\/b>|<strong ?>.*?<\/strong>/g;
+
+		if (!plainText) {
+			c.text = c.text.replace(bRegex, el => `<span style="color:#fff;font-weight:bold;">${el}</span>`);
+		}
+
 		// replace [links](https://example.com) with html anchor tags or a plaintext representation
 		const linkRegex = /\[(?<linkText>.*?)\]\((?<linkAddress>.*?)\)/g;
 
-		if (linkRegex.test(c.text)) {
-			if (plainText) {
-				c.text = c.text.replace(linkRegex, '$<linkText> ($<linkAddress>)');
-			} else {
-				c.text = c.text.replace(linkRegex, '<a href="$<linkAddress>" style="text-decoration:underline;font-weight:700;color:#fff;"><u>$<linkText></u></a>');
-			}
+		if (plainText) {
+			c.text = c.text.replace(linkRegex, '$<linkText> ($<linkAddress>)');
+		} else {
+			c.text = c.text.replace(linkRegex, '<a href="$<linkAddress>" style="text-decoration:underline;font-weight:700;color:#fff;"><u>$<linkText></u></a>');
 		}
 	}
 
@@ -159,7 +164,7 @@ export class CreateEmail {
 					} else {
 						el = `<span style="color:#fff;" width="100%">${el}</span>`;
 					}
-					innerHTML += `\n<tr><td ${c.primary ? 'class="primary" bgcolor="#673db6"' : 'class="secondary" bgcolor="#373C65"'} style="font-weight:700;border-radius:10px;padding:12px" align="center">${el}</td></tr>`;
+					innerHTML += `\n<tr><td ${c.primary ? 'class="primary button" bgcolor="#673db6"' : 'class="secondary button" bgcolor="#373C65"'} style="font-weight:700;border-radius:10px;padding:12px" align="center">${el}</td></tr>`;
 					break;
 			}
 		});