diff --git a/dev/Styles/Compose.less b/dev/Styles/Compose.less
index 06f26b599..dec5716cb 100644
--- a/dev/Styles/Compose.less
+++ b/dev/Styles/Compose.less
@@ -112,6 +112,10 @@
 			width: 1%;
 			min-width: 70px;
 			padding: 6px 10px;
+
+			html.rl-modal {
+				min-width: 50px;
+			}
 		}
 
 		.e-value {
diff --git a/dev/Styles/_End.less b/dev/Styles/_End.less
index de493e035..7d769e9d9 100644
--- a/dev/Styles/_End.less
+++ b/dev/Styles/_End.less
@@ -88,3 +88,8 @@ svg-icon {
 .lg-backdrop.in {
 	opacity: 0.8;
 }
+
+
+.btn .btn-text {
+	padding-left: 8px;
+}
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/PopupsCompose.html b/rainloop/v/0.0.0/app/templates/Views/User/PopupsCompose.html
index 7e23a94c0..37c1fddf4 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/PopupsCompose.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/PopupsCompose.html
@@ -3,13 +3,11 @@
 		<div class="modal-header b-header-toolbar g-ui-user-select-none">
 			<a class="btn btn-large button-send" data-bind="command: sendCommand, tooltipErrorTip: sendErrorDesc, css: {'btn-success': sendButtonSuccess, 'btn-danger': sendError, 'btn-warning': sendSuccessButSaveError }">
 				<i class="icon-white" data-bind="css: {'icon-paper-plane': !sending(), 'icon-spinner animated big': sending()}"></i>
-				&nbsp;&nbsp;
-				<span class="i18n" data-i18n="COMPOSE/BUTTON_SEND"></span>
+				<span class="i18n btn-text hide-on-mobile" data-i18n="COMPOSE/BUTTON_SEND"></span>
 			</a>
 			<a class="btn button-save" data-bind="visible: allowFolders, command: saveCommand, tooltipErrorTip: savedErrorDesc, css: {'btn-danger': savedError }">
 				<i data-bind="css: {'icon-floppy': !saving(), 'icon-spinner animated': saving(), 'icon-white': savedError()}"></i>
-				&nbsp;&nbsp;
-				<span class="i18n" data-i18n="COMPOSE/BUTTON_SAVE"></span>
+				<span class="i18n btn-text hide-on-mobile" data-i18n="COMPOSE/BUTTON_SAVE"></span>
 			</a>
 
 			<a class="close-custom" data-tooltip-join="top" data-bind="click: tryToClosePopup, tooltip: 'COMPOSE/BUTTON_CANCEL'">&times;</a>