diff --git a/dev/Styles/_FontasticToBoot.less b/dev/Styles/_FontasticToBoot.less
index d079e284d..5c68d6d61 100644
--- a/dev/Styles/_FontasticToBoot.less
+++ b/dev/Styles/_FontasticToBoot.less
@@ -1,11 +1,4 @@
 
-[class^="icon-"],
-[class*=" icon-"] {
-	display: inline-block;
-	width: 1em;
-	height: 1em;
-}
-
 .fontastic + span,
 [class^="icon-"] + span,
 [class*=" icon-"] + span {
@@ -14,6 +7,9 @@
 
 [class^="icon-"],
 [class*=" icon-"] {
+	display: inline-block;
+	width: 1em;
+	height: 1em;
 	line-height: 1;
 	font-size: 16px;
 	vertical-align: text-top;
@@ -30,14 +26,14 @@
 	margin-left: -1px;
 }
 
-.iconsize24 {
-	font-size: 24px;
-}
-
 .iconsize20 {
 	font-size: 20px;
 }
 
+.iconsize24 {
+	font-size: 24px;
+}
+
 /* White icons with optional class, or on hover/active states of certain elements */
 .icon-white,
 .nav > .active > a > [class^="icon-"],
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 af505cfb1..14bc2f3e8 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
@@ -55,7 +55,7 @@
 						data-bind="command: deleteCommand, tooltip: 'GLOBAL/DELETE'">🗑</a>
 				</div>
 				<div class="btn-group dropdown colored-toggle" data-bind="visible: allowComposer || allowMessageListActions || allowDangerousActions, registerBootstrapDropdown: true, openDropdownTrigger: moreDropdownTrigger">
-					<a id="more-list-dropdown-id" class="btn dropdown-toggle buttonMore fontastic" href="#" tabindex="-1" data-toggle="dropdown" data-bind="tooltip: 'GLOBAL/MORE'">☰</a>
+					<a id="more-list-dropdown-id" class="btn dropdown-toggle fontastic" href="#" tabindex="-1" data-toggle="dropdown" data-bind="tooltip: 'GLOBAL/MORE'">☰</a>
 					<ul class="dropdown-menu g-ui-menu" role="menu" aria-labelledby="more-list-dropdown-id">
 						<div data-bind="visible: allowMessageListActions">
 							<li class="e-item" role="presentation" data-bind="click: listUnsetSeen, css: {'disabled': !hasCheckedOrSelectedLines()}">
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 f060c75a3..3020762e0 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
@@ -68,7 +68,7 @@
 							<i class="fontastic">→</i>
 						</a>
 						<div class="btn-group" data-bind="registerBootstrapDropdown: true, visible: allowComposer || allowMessageListActions || allowMessageActions" style="display: inline-block">
-							<a class="btn btn-thin-2 btn-transparent dropdown-toggle buttonMore" id="more-view-dropdown-id" href="#" tabindex="-1" data-toggle="dropdown" style="margin-left: -4px; margin-right: 2px" data-bind="command: messageVisibilityCommand">
+							<a class="btn btn-thin-2 btn-transparent dropdown-toggle" id="more-view-dropdown-id" href="#" tabindex="-1" data-toggle="dropdown" style="margin-left: -4px; margin-right: 2px" data-bind="command: messageVisibilityCommand">
 									<span data-bind="visible: !allowComposer" class="fontastic">⋮</span>
 									<span data-bind="visible: allowComposer" class="caret"></span>
 							</a>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsCompose.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsCompose.html
index 90e2bedf4..4fb14771a 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsCompose.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsCompose.html
@@ -46,7 +46,7 @@
 						</div>
 						<div class="pull-right">
 							<div class="btn-group dropdown colored-toggle pull-right" style="margin-right: 4px;" data-bind="registerBootstrapDropdown: true">
-								<a class="btn dropdown-toggle buttonMore fontastic" data-toggle="dropdown">☰</a>
+								<a class="btn dropdown-toggle fontastic" data-toggle="dropdown">☰</a>
 								<ul class="dropdown-menu g-ui-menu" role="menu">
 									<li class="e-item" data-bind="click: function () { requestReadReceipt(!requestReadReceipt()); }">
 										<a class="e-link">
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html
index fa9fea7f0..fe49184df 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html
@@ -25,7 +25,7 @@
 			</div>
 
 			<div class="btn-group dropdown colored-toggle" data-bind="registerBootstrapDropdown: true">
-				<a id="contacts-more-dropdown-id" class="btn dropdown-toggle buttonMore" href="#" tabindex="-1" data-toggle="dropdown">
+				<a id="contacts-more-dropdown-id" class="btn dropdown-toggle" href="#" tabindex="-1" data-toggle="dropdown">
 					<i class="fontastic" data-bind="css: {'icon-spinner': contacts.importing() || contacts.syncing()}">☰</i>
 				</a>
 				<ul class="dropdown-menu g-ui-menu right-edge" role="menu" aria-labelledby="contacts-more-dropdown-id">
diff --git a/vendors/bootstrap/less/button-groups.less b/vendors/bootstrap/less/button-groups.less
index 59a342836..3e26ecb6f 100644
--- a/vendors/bootstrap/less/button-groups.less
+++ b/vendors/bootstrap/less/button-groups.less
@@ -25,7 +25,7 @@
   .btn + .btn,
   .btn-group + .btn,
   .btn + .btn-group {
-    margin-left: 5px;
+    margin-left: 3px;
   }
 }
 
diff --git a/vendors/fontastic/fonts/snappymail.woff b/vendors/fontastic/fonts/snappymail.woff
index 8e0e1cf31..155547fbc 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 b777964e6..41b8f8ae8 100644
Binary files a/vendors/fontastic/fonts/snappymail.woff2 and b/vendors/fontastic/fonts/snappymail.woff2 differ