diff --git a/dev/View/User/MailBox/MessageView.js b/dev/View/User/MailBox/MessageView.js
index 0c7e90cf7..aca6556e9 100644
--- a/dev/View/User/MailBox/MessageView.js
+++ b/dev/View/User/MailBox/MessageView.js
@@ -162,9 +162,9 @@ export class MailMessageView extends AbstractViewRight {
 					case 'none':
 						return '';
 					case 'pass':
-						return 'icon-ok iconcolor-green';
+						return 'icon-ok iconcolor-green'; // ✔️
 					default:
-						return 'icon-warning-alt iconcolor-red';
+						return 'icon-cross iconcolor-red'; // ✖ ❌
 				}
 			},
 
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
index 93629708f..92091d5e8 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
@@ -142,7 +142,7 @@
 				</div>
 			</div>
 		</div>
-		<div id="messagesDragImage"><span class="text"></span>&nbsp;<i class="icon-mail"></i></div>
+		<div id="messagesDragImage"><span class="text"></span>&nbsp;<span class="fontastic">✉</span></div>
 	</div>
 	<div class="b-footer thm-message-list-bottom-toolbar">
 		<!-- ko if: userUsageProc() -->
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
index 56f40994a..c77d5d24b 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
@@ -98,10 +98,7 @@
 									</a>
 								</li>
 								<li role="presentation">
-									<a href="#" tabindex="-1" data-bind="click: popupMessage">
-										<i class="icon-popup"></i>
-										<span data-i18n="MESSAGE/BUTTON_IN_NEW_WINDOW"></span>
-									</a>
+									<a href="#" tabindex="-1" data-bind="click: popupMessage" data-icon="⧉" data-i18n="MESSAGE/BUTTON_IN_NEW_WINDOW"></a>
 								</li>
 								<li role="presentation" data-bind="visible: html() && !isHtml()">
 									<a href="#" tabindex="-1" data-bind="click: viewHtml" data-icon="👁" data-i18n="MESSAGE/HTML_VIEW"></a>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SystemDropDown.html b/snappymail/v/0.0.0/app/templates/Views/User/SystemDropDown.html
index ef5529923..6be176e63 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SystemDropDown.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SystemDropDown.html
@@ -39,10 +39,7 @@
 				<a href="#" tabindex="-1" data-bind="click: settingsClick" data-icon="⚙" data-i18n="TOP_TOOLBAR/BUTTON_SETTINGS"></a>
 			</li>
 			<li role="presentation">
-				<a href="#" tabindex="-1" data-bind="click: settingsHelp">
-					<i class="icon-help"></i>
-					<span data-i18n="TOP_TOOLBAR/BUTTON_HELP"></span>
-				</a>
+				<a href="#" tabindex="-1" data-bind="click: settingsHelp" data-icon="🛈" data-i18n="TOP_TOOLBAR/BUTTON_HELP"></a>
 			</li>
 			<li class="dividerbar" role="presentation">
 				<a href="#" tabindex="-1" data-bind="click: toggleLayout" data-icon="💻" class="show-mobile" data-i18n="MOBILE/BUTTON_DESKTOP_VERSION"></a>
diff --git a/vendors/fontastic/fonts/snappymail.woff b/vendors/fontastic/fonts/snappymail.woff
index d5f7689e5..a3d81b957 100644
Binary files a/vendors/fontastic/fonts/snappymail.woff and b/vendors/fontastic/fonts/snappymail.woff differ
diff --git a/vendors/fontastic/fonts/snappymail.woff2 b/vendors/fontastic/fonts/snappymail.woff2
index 812fbe14c..b83d9481c 100644
Binary files a/vendors/fontastic/fonts/snappymail.woff2 and b/vendors/fontastic/fonts/snappymail.woff2 differ
diff --git a/vendors/fontastic/styles.css b/vendors/fontastic/styles.css
index 01d4ac0e8..96db60630 100644
--- a/vendors/fontastic/styles.css
+++ b/vendors/fontastic/styles.css
@@ -41,13 +41,13 @@
   content: "\e007";
 }
 .icon-right-mini::before {
-  content: "\e01e"; /* › */
+  content: "›";
 }
 .icon-down-mini::before {
-  content: "\e01f"; /* › rotate 90 */
+  content: "⌄";
 }
-.icon-warning-alt::before {
-  content: "\e02a";
+.icon-cross::before {
+  content: "✖";
 }
 .icon-ok::before {
   content: "✔";
@@ -91,12 +91,6 @@
 .icon-lock::before {
   content: "🔒";
 }
-.icon-popup::before {
-  content: "\e045";
-}
-.icon-mail::before {
-  content: "✉";
-}
 .icon-filter::before {
   content: "\e061"; /* ⊆ */
 }
@@ -109,9 +103,6 @@
 .icon-copy::before {
   content: "\e068";
 }
-.icon-help::before {
-  content: "\e06b";
-}
 .icon-resize-in::before {
   content: "\e06c";
 }