diff --git a/dev/Styles/MessageList.less b/dev/Styles/MessageList.less
index 0fbf04d32..2573f18d1 100644
--- a/dev/Styles/MessageList.less
+++ b/dev/Styles/MessageList.less
@@ -286,15 +286,15 @@ html.rl-no-preview-pane {
 				border-color: transparent !important;
 			}
 
-			.checkedParent {
+			.checkboxMessage {
 				display: inline-block;
 				float: left;
 				margin-top: 11px;
 				padding: 0 8px 0 6px;
-				font-size: 14px;
+				font-size: 16px;
 			}
 
-			&.e-single-line .checkedParent {
+			&.e-single-line .checkboxMessage {
 				margin-top: 1px;
 			}
 
@@ -558,7 +558,7 @@ html.rl-no-preview-pane {
 	}
 
 	&.hideMessageListCheckbox {
-		.checkedParent, .checkboxCkeckAll {
+		.checkboxMessage, .checkboxCkeckAll {
 			display: none !important;
 		}
 		.sidebarParent {
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 0ed6fc27d..4bf2d9bf1 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
@@ -3,28 +3,22 @@
 		data-bind="css: {'message-selected': isMessageSelected, 'message-focused': !messageListFocused(), 'hideMessageListCheckbox': !useCheckboxesInList() }">
 		<div class="toolbar">
 			<div class="btn-toolbar">
-				<!-- ko if:  allowFolders && mobile -->
-				<div class="btn-group" data-bind="visible: leftPanelDisabled()">
-					<a class="btn btn-thin-2" data-bind="click: showLeft">
-						<i class="icon-right-middle"></i>
-					</a>
-				</div>
-				<div class="btn-group" data-bind="visible: !leftPanelDisabled()">
-					<a class="btn btn-thin-2" data-bind="click: hideLeft">
-						<i class="icon-left-middle"></i>
-					</a>
-				</div>
+				<!-- ko if: mobile -->
+				<!-- ko if: allowFolders -->
+				<a class="btn btn-thin-2" data-bind="click: showLeft, visible: leftPanelDisabled()">
+					<i class="icon-right-middle"></i>
+				</a>
+				<a class="btn btn-thin-2" data-bind="click: hideLeft, visible: !leftPanelDisabled()">
+					<i class="icon-left-middle"></i>
+				</a>
 				<!-- /ko -->
-				<div class="btn-group" data-bind="visible: mobile && allowComposer && mobileCheckedStateHide()">
-					<a class="btn buttonCompose" data-bind="click: composeClick, tooltip: 'FOLDER_LIST/BUTTON_NEW_MESSAGE', css: {'btn-warning': composeInEdit, 'btn-success': !composeInEdit()}">
-						<i class="icon-paper-plane"></i>
-					</a>
-				</div>
-				<div class="btn-group" data-bind="visible: allowReload && mobileCheckedStateHide()">
-					<a class="btn buttonReload" data-bind="command: reloadCommand, tooltip: 'MESSAGE_LIST/BUTTON_RELOAD'">
-						<i class="icon-spinner" data-bind="css: {'not-animated': !messageListCompleteLoadingThrottleForAnimation()}"></i>
-					</a>
-				</div>
+				<a class="btn buttonCompose" data-bind="click: composeClick, tooltip: 'FOLDER_LIST/BUTTON_NEW_MESSAGE', css: {'btn-warning': composeInEdit, 'btn-success': !composeInEdit()}, visible: allowComposer && mobileCheckedStateHide()">
+					<i class="icon-paper-plane"></i>
+				</a>
+				<!-- /ko -->
+				<a class="btn buttonReload" data-bind="command: reloadCommand, tooltip: 'MESSAGE_LIST/BUTTON_RELOAD', visible: allowReload && mobileCheckedStateHide()">
+					<i class="icon-spinner" data-bind="css: {'not-animated': !messageListCompleteLoadingThrottleForAnimation()}"></i>
+				</a>
 				<!-- ko if: !newMoveToFolder -->
 				<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'">
@@ -137,7 +131,7 @@
 							<span class="caret"></span>
 						</a>
 					</div>
-					<i class="checkboxCkeckAll" data-bind="css: checkAll() ? (isIncompleteChecked() ? 'icon-checkbox-partial' : 'icon-checkbox-checked') : 'icon-checkbox-unchecked'"></i>
+					<i class="checkboxCkeckAll fontastic" data-bind="text: checkAll() ? (isIncompleteChecked() ? '▣' : '☑') : '☐'"></i>
 				</div>
 			</div>
 			<div class="b-content" data-bind="initDom: dragOverBodyArea">
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageListItem.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageListItem.html
index 4caf50550..af6907f1e 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageListItem.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageListItem.html
@@ -26,9 +26,7 @@
 				</span>
 			</span>
 		</div>
-		<div class="checkedParent">
-			<i class="checkboxMessage" data-bind="css: checked() ? 'checkboxMessage icon-checkbox-checked' : 'checkboxMessage icon-checkbox-unchecked'"></i>
-		</div>
+		<div class="checkboxMessage fontastic" data-bind="text: checked() ? '☑' : '☐'"></div>
 		<div class="senderParent actionHandle">
 			<span class="replyFlag"><i class="fontastic">←</i>&nbsp;</span>
 			<span class="forwardFlag"><i class="fontastic">→</i>&nbsp;</span>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageListItemNoPreviewPane.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageListItemNoPreviewPane.html
index 06651c436..364140942 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageListItemNoPreviewPane.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageListItemNoPreviewPane.html
@@ -15,9 +15,7 @@
 				</span>
 			</span>
 		</div>
-		<div class="checkedParent">
-			<i class="checkboxMessage" data-bind="css: checked() ? 'checkboxMessage icon-checkbox-checked' : 'checkboxMessage icon-checkbox-unchecked'"></i>
-		</div>
+		<div class="checkboxMessage fontastic" data-bind="text: checked() ? '☑' : '☐'"></div>
 		<div class="flagParent">
 			<span class="flagOn">
 				<i class="icon-star"></i>
diff --git a/vendors/fontastic/fonts/snappymail.woff b/vendors/fontastic/fonts/snappymail.woff
index dd3a24fe4..b9e52d2c8 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 bc509e088..7ea08b35a 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 6e2ce11a1..d1bc03cad 100644
--- a/vendors/fontastic/styles.css
+++ b/vendors/fontastic/styles.css
@@ -29,7 +29,7 @@
   content: "\e001";
 }
 .icon-list::before {
-  content: "\e002";
+  content: "☰";
 }
 .icon-user-add::before {
   content: "\e005";
@@ -44,10 +44,10 @@
   content: "\e00c"; /* ▶ */
 }
 .icon-left::before {
-  content: "\e01b"; /* ➔ rotate 180 */
+  content: "⬅";
 }
 .icon-down::before {
-  content: "\e01d"; /* ➔ rotate 90 */
+  content: "⬇";
 }
 .icon-right-mini::before {
   content: "\e01e"; /* › */
@@ -56,7 +56,7 @@
   content: "\e01f"; /* › rotate 90 */
 }
 .icon-up::before {
-  content: "\e020"; /* ➔ rotate -90 */
+  content: "⬆";
 }
 .icon-star-empty::before {
   content: "☆";
@@ -130,7 +130,7 @@
   content: "\e045";
 }
 .icon-telephone::before {
-  content: "\e047"; /* ℡ ✆ ☎ ☏ 📞 */
+  content: "📞"; /* ℡ ✆ ☎ ☏ */
 }
 .icon-left-middle::before {
   content: "\e04b"; /* ❮ */
@@ -151,7 +151,7 @@
   content: "☐";
 }
 .icon-checkbox-partial::before {
-  content: "\e05a";
+  content: "▣";
 }
 .icon-radio-checked::before {
   content: "\e05b";