diff --git a/dev/Styles/User/FolderList.less b/dev/Styles/User/FolderList.less
index 8c07f0406..92b322453 100644
--- a/dev/Styles/User/FolderList.less
+++ b/dev/Styles/User/FolderList.less
@@ -222,13 +222,12 @@
 
 .btn {
 	&.buttonCompose {
-		width: calc(100% - 85px);
+		width: calc(100% - 68px);
 		max-width: -moz-fit-content;
 		max-width: -webkit-fit-content;
 		max-width: fit-content;
 		overflow: hidden;
 		height: 19px;
-		margin-top: 1px;
 		padding: 4px 8px;
 	}
 }
diff --git a/dev/Styles/_BootstrapFix.less b/dev/Styles/_BootstrapFix.less
index be653a715..ff69e76a0 100644
--- a/dev/Styles/_BootstrapFix.less
+++ b/dev/Styles/_BootstrapFix.less
@@ -20,10 +20,6 @@
 	padding: 4px 9px;
 }
 
-.btn.btn-thin-2 {
-	padding: 4px 7px;
-}
-
 .alert a:not(.close) {
 	text-decoration: underline;
 	color: @warningText;
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminPane.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminPane.html
index 6a1c4d53e..8725f936a 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminPane.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminPane.html
@@ -1,5 +1,5 @@
 <div class="b-toolbar g-ui-user-select-none">
-	<a class="btn btn-thin-2 fontastic toggleLeft" data-bind="click: leftPanelDisabled.toggle, text: leftPanelDisabled() ? '❯' : '❮'">❮</a>
+	<a class="btn btn-thin fontastic toggleLeft" data-bind="click: leftPanelDisabled.toggle, text: leftPanelDisabled() ? '❯' : '❮'">❮</a>
 	<i class="icon-spinner" style="margin: 10px" data-bind="style: {'visibility': adminManLoadingVisibility }"></i>
 	<h4>SnappyMail - <span data-i18n="TOP_PANEL/LABEL_ADMIN_PANEL"></span></h4>
 	<a class="btn btn-logout fontastic" data-bind="click: logoutClick">⏻</a>
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 ff86fe3a3..22bead997 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
@@ -1,6 +1,6 @@
 <div class="btn-toolbar">
 	<!-- ko if: isMobile() -->
-	<a class="btn btn-thin-2 fontastic toggleLeft" data-bind="click: leftPanelDisabled.toggle, text: leftPanelDisabled() ? '❯' : '❮'">❮</a>
+	<a class="btn btn-thin fontastic toggleLeft" data-bind="click: leftPanelDisabled.toggle, text: leftPanelDisabled() ? '❯' : '❮'">❮</a>
 	<a class="btn buttonCompose" data-bind="click: composeClick, css: {'btn-warning': composeInEdit, 'btn-success': !composeInEdit()}, visible: mobileCheckedStateHide()" data-i18n="[title]FOLDER_LIST/BUTTON_NEW_MESSAGE">
 		<i class="icon-paper-plane"></i>
 	</a>
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 eb36e7dba..0619e67f1 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
@@ -43,14 +43,14 @@
 
 		<div class="message-fixed-button-toolbar" data-bind="visible: message">
 			<div class="btn-group" style="margin-right: -11px;">
-				<a class="btn btn-thin-2 btn-transparent buttonReply fontastic"
+				<a class="btn btn-thin btn-transparent buttonReply fontastic"
 					data-bind="visible: 'reply' === lastReplyAction(), command: replyCommand" data-i18n="[title]MESSAGE/BUTTON_REPLY">←</a>
-				<a class="btn btn-thin-2 btn-transparent buttonReplyAll fontastic"
+				<a class="btn btn-thin btn-transparent buttonReplyAll fontastic"
 					data-bind="visible: 'replyall' === lastReplyAction(), command: replyAllCommand" data-i18n="[title]MESSAGE/BUTTON_REPLY_ALL">↞</a>
-				<a class="btn btn-thin-2 btn-transparent buttonForward fontastic"
+				<a class="btn btn-thin btn-transparent buttonForward fontastic"
 					data-bind="visible: 'forward' === lastReplyAction(), command: forwardCommand" data-i18n="[title]MESSAGE/BUTTON_FORWARD">→</a>
 				<div class="btn-group" data-bind="registerBootstrapDropdown: true" style="display: inline-block">
-					<a class="btn btn-thin-2 btn-transparent dropdown-toggle fontastic" id="more-view-dropdown-id" href="#" tabindex="-1" style="margin-left: -4px; margin-right: 2px">☰</a>
+					<a class="btn btn-thin btn-transparent dropdown-toggle fontastic" id="more-view-dropdown-id" href="#" tabindex="-1">☰</a>
 					<ul class="dropdown-menu right-edge" role="menu" aria-labelledby="more-view-dropdown-id">
 						<div data-bind="visible: !isDraftFolder()">
 							<li role="presentation">
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsPane.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsPane.html
index 97e8dcf99..6e4f6ea26 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsPane.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsPane.html
@@ -1,7 +1,7 @@
 <div class="btn-toolbar">
 	<!-- ko if: isMobile() -->
 	<div class="btn-group" style="margin-left: -1px">
-		<a class="btn btn-thin-2 fontastic toggleLeft" data-bind="click: leftPanelDisabled.toggle, text: leftPanelDisabled() ? '❯' : '❮'">❮</a>
+		<a class="btn btn-thin fontastic toggleLeft" data-bind="click: leftPanelDisabled.toggle, text: leftPanelDisabled() ? '❯' : '❮'">❮</a>
 	</div>
 	<!-- /ko -->
 	<a class="btn button-back" data-bind="click: backToMailBoxClick">