diff --git a/api/js/etemplate/et2_widget_htmlarea.js b/api/js/etemplate/et2_widget_htmlarea.js
index c846ada23a..279632d592 100644
--- a/api/js/etemplate/et2_widget_htmlarea.js
+++ b/api/js/etemplate/et2_widget_htmlarea.js
@@ -446,7 +446,7 @@ jQuery.extend(et2_htmlarea, {
 	 * arranged toolbars as simple mode
 	 * @constant
 	 */
-	TOOLBAR_SIMPLE: "undo redo|fontselect fontsizeselect | bold italic removeformat forecolor backcolor | "+
+	TOOLBAR_SIMPLE: "undo redo|formatselect fontselect fontsizeselect | bold italic removeformat forecolor backcolor | "+
 					"alignleft aligncenter alignright alignjustify | numlist "+
 					"bullist outdent indent| link image pastetext",
 	/**
diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index 3439a89ae0..61e56e79d1 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -963,4 +963,12 @@ img.smime_cert_unknownemail {
 	padding: 10px 0 10px 0;
 }
 div#mail-index_nm.splitter-pane {min-height: 100px;}
-#mail-index_mailSplitter .splitter-bar-horizontal {background: white;}
\ No newline at end of file
+#mail-index_mailSplitter .splitter-bar-horizontal {background: white;}
+
+#mail-compose .tox.tox-tinymce .tox-tbtn--bespoke:first-child > .tox-tbtn__select-label {
+	width: 18px;
+}
+
+#mail-compose .tox.tox-tinymce .tox-tbtn--bespoke .tox-tbtn__select-label {
+	width: 3em;
+}
diff --git a/mail/templates/mobile/app.css b/mail/templates/mobile/app.css
index d70999c276..a29d0e1af6 100644
--- a/mail/templates/mobile/app.css
+++ b/mail/templates/mobile/app.css
@@ -952,6 +952,12 @@ div#mail-index_nm.splitter-pane {
 #mail-index_mailSplitter .splitter-bar-horizontal {
   background: white;
 }
+#mail-compose .tox.tox-tinymce .tox-tbtn--bespoke:first-child > .tox-tbtn__select-label {
+  width: 18px;
+}
+#mail-compose .tox.tox-tinymce .tox-tbtn--bespoke .tox-tbtn__select-label {
+  width: 3em;
+}
 #popupMainDiv {
   padding: 5px;
 }
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index 4246a01485..4a77c6d9f0 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -940,6 +940,12 @@ div#mail-index_nm.splitter-pane {
 #mail-index_mailSplitter .splitter-bar-horizontal {
   background: white;
 }
+#mail-compose .tox.tox-tinymce .tox-tbtn--bespoke:first-child > .tox-tbtn__select-label {
+  width: 18px;
+}
+#mail-compose .tox.tox-tinymce .tox-tbtn--bespoke .tox-tbtn__select-label {
+  width: 3em;
+}
 #popupMainDiv {
   padding: 5px;
 }