diff --git a/Core/Notification/TweetNotification.cs b/Core/Notification/TweetNotification.cs
index b1d9057b..e9129a95 100644
--- a/Core/Notification/TweetNotification.cs
+++ b/Core/Notification/TweetNotification.cs
@@ -59,7 +59,7 @@ public string GenerateHtml(string bodyClasses, Control sync){
                 build.Append("<style type='text/css'>").Append(customCSS).Append("</style>");
             }
             
-            build.Append("</head><body class='scroll-styled-v system-font-stack");
+            build.Append("</head><body class='scroll-styled-v");
 
             if (!string.IsNullOrEmpty(bodyClasses)){
                 build.Append(' ').Append(bodyClasses);
diff --git a/Resources/Plugins/edit-design/browser.js b/Resources/Plugins/edit-design/browser.js
index 602e9b9c..014b0446 100644
--- a/Resources/Plugins/edit-design/browser.js
+++ b/Resources/Plugins/edit-design/browser.js
@@ -432,7 +432,8 @@ enabled(){
     }
     
     if (this.config.forceArialFont){
-      this.css.insert("#tduck .system-font-stack { font-family: Arial, sans-serif; font-weight: 400 }");
+      this.css.insert("#tduck { font-family: Arial, sans-serif; font-weight: 400 }");
+      this.css.insert("#tduck input, #tduck label, #tduck select, #tduck textarea { font-family: Arial }")
     }
     
     if (this.config.increaseQuoteTextSize){
@@ -603,7 +604,7 @@ html[data-td-font] { font-size: ${this.config.fontSize} !important }
 .avatar { border-radius: ${this.config.avatarRadius}% !important }
 
 ${this.config.forceArialFont ? `
-#tduck .system-font-stack { font-family: Arial, sans-serif; font-weight: 400 }
+#tduck { font-family: Arial, sans-serif; font-weight: 400 }
 ` : ``}
 
 ${this.config.increaseQuoteTextSize ? `