diff --git a/assets/css/images/icon-message-notification.png b/assets/css/images/icon-message-notification.png
index 78ab30b38..8f6c40765 100644
Binary files a/assets/css/images/icon-message-notification.png and b/assets/css/images/icon-message-notification.png differ
diff --git a/dev/Styles/MessageList.less b/dev/Styles/MessageList.less
index a3e6a94f9..90f53c593 100644
--- a/dev/Styles/MessageList.less
+++ b/dev/Styles/MessageList.less
@@ -87,7 +87,7 @@ html.rl-no-preview-pane {
 		border-bottom: 1px solid #bbb;
 
 		.checkboxCheckAll {
-			margin: 5px 0;
+			line-height: 30px;
 		}
 	}
 
diff --git a/dev/Styles/_FontasticToBoot.less b/dev/Styles/_FontasticToBoot.less
index 5c68d6d61..a06313eb9 100644
--- a/dev/Styles/_FontasticToBoot.less
+++ b/dev/Styles/_FontasticToBoot.less
@@ -20,12 +20,6 @@
 	}
 }
 
-.icon-folder, .icon-folder-add {
-	font-size: 18px;
-	margin-top: -1px;
-	margin-left: -1px;
-}
-
 .iconsize20 {
 	font-size: 20px;
 }
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 14bc2f3e8..4350ab7f8 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
@@ -23,7 +23,7 @@
 				<div class="btn-group dropdown colored-toggle hide-on-mobile" data-bind="visible: allowMessageListActions, registerBootstrapDropdown: true, openDropdownTrigger: moveDropdownTrigger">
 					<a id="move-dropdown-id" href="#" tabindex="-1" class="btn dropdown-toggle buttonMove" data-toggle="dropdown" data-bind="command: moveCommand, tooltip: 'GLOBAL/MOVE_TO'">
 						<i class="icon-copy visible-on-ctrl-btn"></i>
-						<i class="icon-folder hidden-on-ctrl-btn"></i>
+						<i class="fontastic hidden-on-ctrl-btn">📁</i>
 						<span class="caret"></span>
 					</a>
 					<ul class="dropdown-menu g-ui-menu" role="menu" aria-labelledby="move-dropdown-id" role="menu" data-bind="foreach: folderMenuForMove">
@@ -37,7 +37,7 @@
 				<div class="btn-group" data-bind="visible: allowMessageListActions && mobileCheckedStateShow()">
 					<a id="move-dropdown-id" href="#" tabindex="-1" class="btn buttonMove" data-bind="command: moveNewCommand, tooltip: 'GLOBAL/MOVE_TO'">
 						<i class="icon-copy visible-on-ctrl-btn"></i>
-						<i class="icon-folder hidden-on-ctrl-btn"></i>
+						<i class="fontastic hidden-on-ctrl-btn">📁</i>
 					</a>
 				</div>
 				<!-- /ko -->
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 3020762e0..58d136e19 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
@@ -37,7 +37,7 @@
 				<div class="b-message-view-backdrop" data-bind="visible: moveAction">
 					<div class="backdrop-message-wrp">
 						<div class="backdrop-message">
-							<i class="icon-folder" style="padding: 0 7px; font-size: 24px; width: 24px; line-height: 24px;"></i>
+							<i class="fontastic" style="padding: 0 7px; font-size: 24px; width: 24px; line-height: 24px;">📁</i>
 							<span style="vertical-align: middle; padding: 0 7px" data-i18n="MESSAGE/MESSAGE_VIEW_MOVE_DESC"></span>
 						</div>
 					</div>
diff --git a/vendors/fontastic/fonts/snappymail.woff b/vendors/fontastic/fonts/snappymail.woff
index 155547fbc..5038c37bc 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 41b8f8ae8..c088e8954 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 27994dffc..5cdd59a6a 100644
--- a/vendors/fontastic/styles.css
+++ b/vendors/fontastic/styles.css
@@ -15,6 +15,7 @@
   font-style: normal !important;
   font-weight: normal !important;
   font-variant: normal !important;
+  line-height: 1;
   text-transform: none !important;
   speak: never;
   -webkit-font-smoothing: antialiased;
@@ -106,9 +107,6 @@
 .icon-folder-add::before {
   content: "\e03c";
 }
-.icon-folder::before {
-  content: "🗀";
-}
 .icon-bolt::before {
   content: "\e042";
 }
@@ -281,4 +279,7 @@
 .icon-spinner::before {
   content: "\e05e";
 }
+.icon-folder::before {
+  content: "📁";
+}
 */