diff --git a/dev/Styles/FolderList.less b/dev/Styles/FolderList.less
index d31fc20d1..d0b458cec 100644
--- a/dev/Styles/FolderList.less
+++ b/dev/Styles/FolderList.less
@@ -273,12 +273,14 @@
 
 	&.buttonCompose {
 		width: calc(~'100% - 85px');
+		max-width: -moz-fit-content;
+		max-width: -webkit-fit-content;
 		max-width: fit-content;
 		white-space: nowrap;
 		overflow: hidden;
 		height: 19px;
-		display: inline-block;
 		margin-top: 1px;
+		padding: 4px 8px;
 	}
 }
 
diff --git a/dev/Styles/MessageView.less b/dev/Styles/MessageView.less
index a840ca190..3f87d4f81 100644
--- a/dev/Styles/MessageView.less
+++ b/dev/Styles/MessageView.less
@@ -449,6 +449,8 @@ html.rl-no-preview-pane {
 							height: auto;
 							transform: translate(-25%,0);
 							width: auto;
+							width: -moz-fit-content;
+							width: -webkit-fit-content;
 							width: fit-content;
 						}
 
diff --git a/dev/Styles/_BootstrapFix.less b/dev/Styles/_BootstrapFix.less
index 7fb9a6d55..c11755249 100644
--- a/dev/Styles/_BootstrapFix.less
+++ b/dev/Styles/_BootstrapFix.less
@@ -123,15 +123,6 @@ select {
 .btn {
 	border-radius: @btnBorderRadius;
 	background-image: none;
-	padding-left: 13px;
-	padding-right: 13px;
-
-	&.disabled, &[disabled] {
-		opacity: 0.8;
-		box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
-	}
-
-	border-color: rgba(0, 0, 0, 0.25) rgba(0, 0, 0, 0.25) rgba(0, 0, 0, 0.25);
 
 //	&:active {
 //		.box-shadow(~"inset 0 2px 4px rgba(0,0,0,.3), 0 0 0 rgba(0,0,0,.1)");
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 58387838f..4d1018163 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
@@ -1,12 +1,12 @@
 <div class="b-folders g-ui-user-select-none thm-folders" data-bind="css: {'focused': folderListFocused, 'single-root-inbox': foldersListWithSingleInboxRootFolder, 'inbox-is-starred': isInboxStarred}">
 	<div class="b-toolbar btn-toolbar hide-on-mobile">
-		<a class="btn buttonCompose pull-left" data-bind="visible: allowComposer, click: composeClick, tooltip: 'FOLDER_LIST/BUTTON_NEW_MESSAGE', css: {'btn-warning': composeInEdit, 'btn-success': !composeInEdit()}">
+		<a class="btn buttonCompose" data-bind="visible: allowComposer, click: composeClick, tooltip: 'FOLDER_LIST/BUTTON_NEW_MESSAGE', css: {'btn-warning': composeInEdit, 'btn-success': !composeInEdit()}">
 			<i class="icon-paper-plane"></i>
 			<span class="btn-text-wrp buttonComposeText">
 				<span class="i18n" data-i18n="FOLDER_LIST/BUTTON_NEW_MESSAGE"></span>
 			</span>
 		</a>
-		<a class="btn buttonContacts pull-left" data-bind="visible: allowContacts, click: contactsClick, tooltip: 'GLOBAL/CONTACTS'">
+		<a class="btn buttonContacts" data-bind="visible: allowContacts, click: contactsClick, tooltip: 'GLOBAL/CONTACTS'">
 			<i class="icon-address-book"></i>
 		</a>
 	</div>
diff --git a/vendors/bootstrap/less/buttons.less b/vendors/bootstrap/less/buttons.less
index 20f0e79f8..8a9d329c3 100644
--- a/vendors/bootstrap/less/buttons.less
+++ b/vendors/bootstrap/less/buttons.less
@@ -9,7 +9,7 @@
 // Core
 .btn {
   display: inline-block;
-  padding: 4px 14px;
+  padding: 4px 13px;
   margin-bottom: 0; // For input.btn
   font-size: @baseFontSize;
   line-height: @baseLineHeight;
@@ -18,8 +18,7 @@
   cursor: pointer;
   .buttonBackground(@btnBackground, @btnBackgroundHighlight, @grayDark, 0 1px 1px rgba(255,255,255,.75));
   border: 1px solid @btnBorder;
-  border-bottom-color: darken(@btnBorder, 10%);
-  border-radius: 4px;
+  border-color: rgba(0, 0, 0, 0.25) rgba(0, 0, 0, 0.25) rgba(0, 0, 0, 0.25);
   box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
 
   // Hover state
@@ -54,8 +53,8 @@
     cursor: default;
     background-color: darken(@white, 10%);
     background-image: none;
-    opacity: 0.65;
-    box-shadow: none;
+	opacity: 0.8;
+    box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
   }
 
 }