diff --git a/dev/Styles/_FontasticToBoot.less b/dev/Styles/_FontasticToBoot.less
index 92a7645b3..a7f883ed6 100644
--- a/dev/Styles/_FontasticToBoot.less
+++ b/dev/Styles/_FontasticToBoot.less
@@ -9,7 +9,6 @@
 [class*=" icon-"] {
 	display: inline-block;
 	width: 1em;
-	vertical-align: text-top;
 
 	.disabled &,
 	.btn[disabled] & {
@@ -44,6 +43,8 @@
 	border: 3px solid #aaa;
 	border-top-color: #333;
 	border-radius: 100%;
+
+	vertical-align: text-top;
 }
 
 .icon-spinner:not(.not-animated),
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html
index 6f7a08741..378efa1c0 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html
@@ -27,7 +27,7 @@
 					<br />
 					<span data-bind="if: coreWarning">
 						<br />
-						<i class="icon-warning" style="color: red"></i>
+						<i class="fontastic" style="color:red">⚠</i>
 						<b data-i18n="HINTS/WARNING"></b>
 						<span data-i18n="TAB_ABOUT/HINT_READ_CHANGE_LOG"></span>
 						<br />
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html
index 7d480a68d..8089dcbb2 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html
@@ -26,14 +26,10 @@
 	<div class="b-content show-on-panel-disabled" data-bind="click: leftPanelDisabled.toggle()"></div>
 	<div class="b-footer btn-toolbar hide-mobile">
 		<div class="btn-group">
-			<a class="btn" data-bind="click: leftPanelDisabled.toggle()">
-				<i data-bind="css: {'icon-resize-out': leftPanelDisabled(), 'icon-resize-in': !leftPanelDisabled()}"></i>
-			</a>
+			<a class="btn" data-bind="click: leftPanelDisabled.toggle(), css: {'icon-resize-out': leftPanelDisabled(), 'icon-resize-in': !leftPanelDisabled()}"></a>
 		</div>
 		<div class="btn-group hide-on-panel-disabled">
-			<a class="btn" data-bind="click: createFolder" data-i18n="[title]POPUPS_CREATE_FOLDER/TITLE_CREATE_FOLDER">
-				<i class="icon-folder-add"></i>
-			</a>
+			<a class="btn icon-folder-add" data-bind="click: createFolder" data-i18n="[title]POPUPS_CREATE_FOLDER/TITLE_CREATE_FOLDER"></a>
 			<a class="btn fontastic" data-bind="click: configureFolders">⚙</a>
 		</div>
 	</div>
diff --git a/vendors/fontastic/fonts/snappymail.woff b/vendors/fontastic/fonts/snappymail.woff
index 4ee416c82..5e11cf6d5 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 e66aa6fa1..219bcb83c 100644
Binary files a/vendors/fontastic/fonts/snappymail.woff2 and b/vendors/fontastic/fonts/snappymail.woff2 differ