diff --git a/dev/Styles/_FontasticToBoot.less b/dev/Styles/_FontasticToBoot.less
index a8094657b..f7830804f 100644
--- a/dev/Styles/_FontasticToBoot.less
+++ b/dev/Styles/_FontasticToBoot.less
@@ -7,6 +7,12 @@
 	height: 1em;
 }
 
+.fontastic + span,
+[class^="icon-"] + span,
+[class*=" icon-"] + span {
+	margin-left: 0.5em;
+}
+
 [class^="icon-"],
 [class*=" icon-"] {
 	line-height: 1;
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsContacts.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsContacts.html
index c8bca08c2..4af28dace 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsContacts.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsContacts.html
@@ -74,7 +74,6 @@ pgsql:host=127.0.0.1;port=5432;dbname=rainloop
 				<div class="controls">
 					<a class="btn" data-bind="command: testContactsCommand, css: { 'btn-success': testContactsSuccess, 'btn-danger': testContactsError }">
 						<i data-bind="css: {'icon-info': !testing(), 'icon-spinner': testing(), 'icon-white': testContactsSuccess() || testContactsError() }"></i>
-						&nbsp;&nbsp;
 						<span data-i18n="TAB_CONTACTS/BUTTON_TEST"></span>
 					</a>
 				</div>
@@ -94,7 +93,6 @@ pgsql:host=127.0.0.1;port=5432;dbname=rainloop
 				<div class="controls">
 					<a class="btn" data-bind="command: testContactsCommand, css: { 'btn-success': testContactsSuccess, 'btn-danger': testContactsError }">
 						<i data-bind="css: {'icon-info': !testing(), 'icon-spinner': testing(), 'icon-white': testContactsSuccess() || testContactsError() }"></i>
-						&nbsp;&nbsp;
 						<span data-i18n="TAB_CONTACTS/BUTTON_TEST"></span>
 					</a>
 				</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsDomains.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsDomains.html
index fb75112f2..94154a627 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsDomains.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsDomains.html
@@ -3,13 +3,11 @@
 	<div>
 		<a class="btn" data-bind="click: createDomain">
 			<i class="icon-plus"></i>
-			&nbsp;&nbsp;
 			<span data-i18n="TAB_DOMAINS/BUTTON_ADD_DOMAIN"></span>
 		</a>
 		&nbsp;&nbsp;
 		<a class="btn" data-bind="click: createDomainAlias">
 			<i class="icon-plus"></i>
-			&nbsp;&nbsp;
 			<span data-i18n="TAB_DOMAINS/BUTTON_ADD_ALIAS"></span>
 		</a>
 		<br />
@@ -27,4 +25,4 @@
 			<tbody data-bind="template: { name: 'AdminSettingsDomainListItem', foreach: domains }"></tbody>
 		</table>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html
index 9e24eb7e1..c20beeb90 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html
@@ -103,7 +103,6 @@
 			<div class="controls">
 				<a class="btn" data-bind="command: saveNewAdminPasswordCommand, css: { 'btn-success': adminPasswordUpdateSuccess, 'btn-danger': adminPasswordUpdateError }">
 					<i class="fontastic" data-bind="css: {'icon-white': adminPasswordUpdateSuccess() || adminPasswordUpdateError() }">🔑></i>
-					&nbsp;&nbsp;
 					<span data-i18n="TAB_SECURITY/BUTTON_UPDATE_PASSWORD"></span>
 				</a>
 			</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
index b8071a793..4d16811a8 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
@@ -226,28 +226,23 @@
 		   'btn-success': testingDone() && !testingImapError() && !testingSmtpError(),
 		   'btn-danger': testingDone() && (testingImapError() || testingSmtpError()) }">
 			<i data-bind="css: {'icon-info': !testing(), 'icon-spinner': testing(), 'icon-white': testingDone()}"></i>
-			&nbsp;&nbsp;
 			<span data-i18n="POPUPS_DOMAIN/BUTTON_TEST"></span>
 		</a>
 		<a class="btn button-white-list pull-left" data-bind="command: whiteListCommand, visible: 'main' === page()">
 			<i class="fontastic">👥</i>
-			&nbsp;&nbsp;
 			<span data-i18n="POPUPS_DOMAIN/BUTTON_WHITE_LIST"></span>
 		</a>
 		<a class="btn button-white-list pull-left" data-bind="command: backCommand, visible: 'main' !== page()">
 			<i class="icon-left"></i>
-			&nbsp;&nbsp;
 			<span data-i18n="POPUPS_DOMAIN/BUTTON_BACK"></span>
 		</a>
 		<a class="btn buttonClose" data-bind="command: cancelCommand">
 			<i class="fontastic">✖</i>
-			&nbsp;&nbsp;
 			<span data-i18n="POPUPS_DOMAIN/BUTTON_CLOSE"></span>
 		</a>
 		<a class="btn buttonClear" data-bind="command: createOrAddCommand">
 			<i data-bind="css: edit() ? 'icon-ok' : 'icon-plus', visible: !saving()"></i>
 			<i class="icon-spinner" data-bind="visible: saving"></i>
-			&nbsp;&nbsp;
 			<span data-bind="visible: !edit()" data-i18n="POPUPS_DOMAIN/BUTTON_ADD"></span>
 			<span data-bind="visible: edit()" data-i18n="POPUPS_DOMAIN/BUTTON_UPDATE"></span>
 		</a>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomainAlias.html b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomainAlias.html
index 63aa1e16a..7a3bd4a13 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomainAlias.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomainAlias.html
@@ -38,13 +38,11 @@
 	<div class="modal-footer">
 		<a class="btn buttonClose" data-bind="command: cancelCommand">
 			<i class="fontastic">✖</i>
-			&nbsp;&nbsp;
 			<span data-i18n="POPUPS_DOMAIN_ALIAS/BUTTON_CLOSE"></span>
 		</a>
 		<a class="btn buttonClear" data-bind="command: createCommand">
 			<i class="icon-plus" data-bind="visible: !saving()"></i>
 			<i class="icon-spinner" data-bind="visible: saving"></i>
-			&nbsp;&nbsp;
 			<span data-i18n="POPUPS_DOMAIN_ALIAS/BUTTON_ADD"></span>
 		</a>
 	</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsPlugin.html b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsPlugin.html
index 8a06b6c20..375eb3410 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsPlugin.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsPlugin.html
@@ -25,12 +25,10 @@
 	<div class="modal-footer">
 		<a class="btn buttonClose" data-bind="command: cancelCommand">
 			<i class="fontastic">✖</i>
-			&nbsp;&nbsp;
 			<span data-i18n="POPUPS_PLUGIN/BUTTON_CLOSE"></span>
 		</a>
 		<a class="btn buttonClear" data-bind="command: saveCommand, visible: hasConfiguration">
 			<i class="icon-ok"></i>
-			&nbsp;&nbsp;
 			<span data-i18n="POPUPS_PLUGIN/BUTTON_SAVE"></span>
 		</a>
 	</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Common/PopupsAsk.html b/snappymail/v/0.0.0/app/templates/Views/Common/PopupsAsk.html
index 8808f1f45..5db6d8f93 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Common/PopupsAsk.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Common/PopupsAsk.html
@@ -11,12 +11,10 @@
 		<div class="modal-footer">
 			<button class="btn buttonYes" data-bind="click: yesClick">
 				<i class="icon-ok"></i>
-				&nbsp;&nbsp;
 				<span data-bind="text: yesButton"></span>
 			</button>
 			<button class="btn buttonNo" data-bind="click: noClick">
 				<i class="fontastic">✖</i>
-				&nbsp;&nbsp;
 				<span data-bind="text: noButton"></span>
 			</button>
 		</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Components/Checkbox.html b/snappymail/v/0.0.0/app/templates/Views/Components/Checkbox.html
index c8d4ee6e8..c13d0cd04 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Components/Checkbox.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Components/Checkbox.html
@@ -4,7 +4,6 @@
 		'icon-checkbox-unchecked': !value()
 	}"></i>
 <!-- ko if: labeled -->
-	&nbsp;&nbsp;
 	<span class="sub-label i18n" data-bind="attr: {'data-i18n': label}, css: {'i18n-animation': labelAnimated}"></span>
 <!-- /ko -->
 </span>
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 d43a9fdc9..ce688f9d4 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
@@ -75,35 +75,30 @@
 							<li class="e-item" role="presentation" data-bind="click: listUnsetSeen, css: {'disabled': !hasCheckedOrSelectedLines()}">
 								<a class="e-link menuitem" href="#" tabindex="-1">
 									<i class="icon-none"></i>
-									&nbsp;&nbsp;
 									<span class="i18n" data-i18n="MESSAGE_LIST/MENU_UNSET_SEEN"></span>
 								</a>
 							</li>
 							<li class="e-item" role="presentation" data-bind="click: listSetSeen, css: {'disabled': !hasCheckedOrSelectedLines()}">
 								<a class="e-link menuitem" href="#" tabindex="-1">
 									<i class="icon-none"></i>
-									&nbsp;&nbsp;
 									<span class="i18n" data-i18n="MESSAGE_LIST/MENU_SET_SEEN"></span>
 								</a>
 							</li>
 							<li class="e-item" role="presentation" data-bind="click: listSetFlags, css: {'disabled': !hasCheckedOrSelectedLines()}">
 								<a class="e-link menuitem" href="#" tabindex="-1">
 									<i class="icon-none"></i>
-									&nbsp;&nbsp;
 									<span class="i18n" data-i18n="MESSAGE_LIST/MENU_SET_FLAG"></span>
 								</a>
 							</li>
 							<li class="e-item" role="presentation" data-bind="click: listUnsetFlags, css: {'disabled': !hasCheckedOrSelectedLines()}">
 								<a class="e-link menuitem" href="#" tabindex="-1">
 									<i class="icon-none"></i>
-									&nbsp;&nbsp;
 									<span class="i18n" data-i18n="MESSAGE_LIST/MENU_UNSET_FLAG"></span>
 								</a>
 							</li>
 							<li class="e-item" role="presentation" data-bind="click: listSetAllSeen, css: {'disabled': !hasMessages()}">
 								<a class="e-link menuitem" href="#" tabindex="-1">
 									<i class="icon-none"></i>
-									&nbsp;&nbsp;
 									<span class="i18n" data-i18n="MESSAGE_LIST/MENU_SET_ALL_SEEN"></span>
 								</a>
 							</li>
@@ -111,21 +106,18 @@
 						<li class="e-item dividerbar" role="presentation" data-bind="visible: allowComposer, command: multyForwardCommand">
 							<a class="e-link menuitem" href="#" tabindex="-1">
 								<i class="fontastic">↞</i>
-								&nbsp;&nbsp;
 								<span class="i18n" data-i18n="MESSAGE_LIST/BUTTON_MULTY_FORWARD"></span>
 							</a>
 						</li>
 						<li class="e-item dividerbar" role="presentation" data-bind="visible: allowDangerousActions, command: deleteWithoutMoveCommand">
 							<a class="e-link menuitem" href="#" tabindex="-1">
 								<i class="fontastic">🗑</i>
-								&nbsp;&nbsp;
 								<span class="i18n" data-i18n="MESSAGE_LIST/BUTTON_DELETE_WITHOUT_MOVE"></span>
 							</a>
 						</li>
 						<li class="e-item" role="presentation" data-bind="visible: allowDangerousActions, command: clearCommand">
 							<a class="e-link menuitem" href="#" tabindex="-1">
 								<i class="fontastic">🔥</i>
-								&nbsp;&nbsp;
 								<span class="i18n" data-i18n="MESSAGE_LIST/BUTTON_EMPTY_FOLDER"></span>
 							</a>
 						</li>
@@ -155,7 +147,6 @@
 					<div class="content-wrapper">
 						<div class="listThreadUidDesc" data-bind="visible: '' !== messageListEndThreadUid(), click: cancelThreadUid">
 							<i class="icon-left" data-bind="click: cancelThreadUid"></i>
-							&nbsp;&nbsp;
 							<span class="i18n" data-i18n="MESSAGE_LIST/BACK_TO_MESSAGE_LIST"></span>
 						</div>
 						<div class="listSearchDesc" data-bind="visible: '' !== messageListSearchDesc()">
@@ -163,7 +154,6 @@
 						</div>
 						<div class="listDragOver" data-bind="css: {'viewAppendArea': dragOver() && '' === messageListError() && !popupVisibility(), 'dragOverEnter': dragOverEnter }, initDom: dragOverArea">
 							<i class="icon-down e-icon"></i>
-							&nbsp;&nbsp;
 							<span class="i18n" data-i18n="MESSAGE_LIST/PUT_MESSAGE_HERE"></span>
 						</div>
 						<div class="listClear" data-bind="visible: clearListIsVisible()">
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 b24c5ff8c..314ca83a9 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
@@ -7,14 +7,12 @@
 						<i class="fontastic">✖</i>
 					</a>
 				</div>
-				<div class="btn-group">&nbsp;</div>
 				<div class="btn-group" data-bind="visible: isDraftFolder(), tooltip: 'MESSAGE/BUTTON_EDIT'">
 					<a class="btn btn-success buttonEdit" data-bind="command: messageEditCommand">
 						<i class="fontastic icon-white">🖉</i>
 					</a>
 				</div>
-				<div class="btn-group" data-bind="visible: !usePreviewPane()">&nbsp;</div>
-				<div class="btn-group" data-bind="visible: !usePreviewPane()">
+				<div class="btn-group">
 					<a class="btn button-archive" data-bind="visible: !isDraftFolder() && !isArchiveFolder() && !isArchiveDisabled(), command: archiveCommand, tooltip: 'GLOBAL/TO_ARCHIVE'">
 						<i class="icon-archive"></i>
 					</a>
@@ -28,8 +26,7 @@
 						<i class="fontastic">🗑</i>
 					</a>
 				</div>
-				<div class="btn-group">&nbsp;</div>
-				<div class="btn-group hide-on-mobile" data-bind="visible: !usePreviewPane()">
+				<div class="btn-group">
 					<a class="btn btn-thin buttonUp" data-bind="command: goUpCommand">
 						<i class="icon-left-middle"></i>
 					</a>
@@ -84,35 +81,30 @@
 									<li class="e-item" role="presentation">
 										<a class="e-link menuitem" href="#" tabindex="-1" data-bind="command: replyCommand">
 											<i class="fontastic">←</i>
-											&nbsp;&nbsp;
 											<span class="i18n" data-i18n="MESSAGE/BUTTON_REPLY"></span>
 										</a>
 									</li>
 									<li class="e-item" role="presentation">
 										<a class="e-link menuitem" href="#" tabindex="-1" data-bind="command: replyAllCommand">
 											<i class="fontastic">↞</i>
-											&nbsp;&nbsp;
 											<span class="i18n" data-i18n="MESSAGE/BUTTON_REPLY_ALL"></span>
 										</a>
 									</li>
 									<li class="e-item" role="presentation">
 										<a class="e-link menuitem" href="#" tabindex="-1" data-bind="command: forwardCommand">
 											<i class="fontastic">→</i>
-											&nbsp;&nbsp;
 											<span class="i18n" data-i18n="MESSAGE/BUTTON_FORWARD"></span>
 										</a>
 									</li>
 									<li class="e-item" role="presentation">
 										<a class="e-link menuitem" href="#" tabindex="-1" data-bind="command: editAsNewCommand">
 											<i class="fontastic">🖉</i>
-											&nbsp;&nbsp;
 											<span class="i18n" data-i18n="MESSAGE/BUTTON_EDIT_AS_NEW"></span>
 										</a>
 									</li>
 									<li class="e-item" role="presentation">
 										<a class="e-link menuitem" href="#" tabindex="-1" data-bind="command: forwardAsAttachmentCommand">
 											<i class="fontastic">→</i>
-											&nbsp;&nbsp;
 											<span class="i18n" data-i18n="MESSAGE/BUTTON_FORWARD_AS_ATTACHMENT"></span>
 										</a>
 									</li>
@@ -121,35 +113,30 @@
 									<li class="e-item" role="presentation" data-bind="visible: !isDraftFolder() && !isArchiveFolder() && !isArchiveDisabled()">
 										<a target="_blank" class="e-link menuitem" href="#" tabindex="-1" data-bind="command: archiveCommand">
 											<i class="icon-archive"></i>
-											&nbsp;&nbsp;
 											<span class="i18n" data-i18n="GLOBAL/TO_ARCHIVE"></span>
 										</a>
 									</li>
 									<li class="e-item" role="presentation" data-bind="visible: !isDraftFolder() && !isSentFolder() && !isSpamFolder() && !isSpamDisabled()">
 										<a target="_blank" class="e-link menuitem" href="#" tabindex="-1" data-bind="command: spamCommand">
 											<i class="fontastic">⚠</i>
-											&nbsp;&nbsp;
 											<span class="i18n" data-i18n="GLOBAL/SPAM"></span>
 										</a>
 									</li>
 									<li class="e-item" role="presentation" data-bind="visible: !isDraftFolder() && !isSentFolder() && isSpamFolder() && !isSpamDisabled()">
 										<a target="_blank" class="e-link menuitem" href="#" tabindex="-1" data-bind="command: notSpamCommand">
 											<i class="icon-check-mark-circle-two"></i>
-											&nbsp;&nbsp;
 											<span class="i18n" data-i18n="GLOBAL/NOT_SPAM"></span>
 										</a>
 									</li>
 									<li class="e-item" role="presentation">
 										<a target="_blank" class="e-link menuitem" href="#" tabindex="-1" data-bind="command: deleteCommand">
 											<i class="fontastic">🗑</i>
-											&nbsp;&nbsp;
 											<span class="i18n" data-i18n="GLOBAL/DELETE"></span>
 										</a>
 									</li>
 									<li class="e-item" role="presentation" data-bind="visible: message() && message().hasUnsubsribeLinks()">
 										<a target="_blank" class="e-link menuitem" href="#" tabindex="-1" data-bind="link: viewUnsubscribeLink()">
 											<i class="fontastic">✖</i>
-											&nbsp;&nbsp;
 											<span class="i18n" data-i18n="MESSAGE/BUTTON_UNSUBSCRIBE"></span>
 										</a>
 									</li>
@@ -158,28 +145,24 @@
 									<li class="e-item" role="presentation">
 										<a target="_blank" class="e-link menuitem" href="#" tabindex="-1" data-bind="click: function () { if (message()) { message().printMessage(); }} ">
 											<i class="fontastic">🖨</i>
-											&nbsp;&nbsp;
 											<span class="i18n" data-i18n="MESSAGE/MENU_PRINT"></span>
 										</a>
 									</li>
 									<li class="e-item" role="presentation">
 										<a target="_blank" class="e-link menuitem" href="#" tabindex="-1" data-bind="click: function () { if (message()) { message().viewPopupMessage(); }}">
 											<i class="icon-popup"></i>
-											&nbsp;&nbsp;
 											<span class="i18n" data-i18n="MESSAGE/BUTTON_IN_NEW_WINDOW"></span>
 										</a>
 									</li>
 									<li class="e-item dividerbar" role="presentation">
 										<a target="_blank" class="e-link menuitem" href="#" tabindex="-1" data-bind="link: viewViewLink()">
 											<i class="icon-file-code"></i>
-											&nbsp;&nbsp;
 											<span class="i18n" data-i18n="MESSAGE/MENU_VIEW_ORIGINAL"></span>
 										</a>
 									</li>
 									<li class="e-item" role="presentation">
 										<a target="_blank" class="e-link menuitem" href="#" tabindex="-1" data-bind="link: viewDownloadLink()">
 											<i class="icon-download"></i>
-											&nbsp;&nbsp;
 											<span class="i18n" data-i18n="MESSAGE/MENU_DOWNLOAD_ORIGINAL"></span>
 										</a>
 									</li>
@@ -303,12 +286,10 @@
 									<div class="bodySubHeader">
 										<div class="showImages" data-bind="visible: message() && message().hasImages(), click: function() { showImages(message()); }">
 											<i class="fontastic">🖼</i>
-											&nbsp;&nbsp;
 											<span class="i18n text" data-i18n="MESSAGE/BUTTON_SHOW_IMAGES"></span>
 										</div>
 										<div class="readReceipt" data-bind="visible: message() && !isDraftOrSentFolder() && '' !== message().readReceipt() && !message().isReadReceipt(), click: function() { readReceipt(message()); }">
 											<i class="icon-mail"></i>
-											&nbsp;&nbsp;
 											<span class="i18n text" data-i18n="MESSAGE/BUTTON_NOTIFY_READ_RECEIPT"></span>
 										</div>
 										<div class="attachmentsPlace" data-bind="visible: message() && message().attachments().hasVisible(),
@@ -369,7 +350,6 @@
 												<i class="fontastic iconcolor-red" data-bind="visible: downloadAsZipError">✖</i>
 												<i class="icon-file-zip" data-bind="visible: !downloadAsZipError(),
 													css: {'icon-file-zip': !downloadAsZipLoading(), 'icon-spinner': downloadAsZipLoading()}"></i>
-												&nbsp;&nbsp;
 												<span class="g-ui-link" data-bind="click: downloadAsZip">
 													<span class="i18n" data-i18n="MESSAGE/LINK_DOWNLOAD_AS_ZIP"></span>
 												</span>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsAccount.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsAccount.html
index c71212d75..f35cff58c 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsAccount.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsAccount.html
@@ -38,9 +38,8 @@
 		<div class="modal-footer">
 			<a class="btn buttonAddAccount" data-bind="command: addAccountCommand">
 				<i data-bind="visible: isNew, css: {'icon-user-add': !submitRequest(), 'icon-spinner': submitRequest()}"></i>
-				<i data-bind="visible: !isNew(), css: {'icon-ok': !submitRequest(), 'icon-spinner': submitRequest()}"></i>
-				&nbsp;&nbsp;
 				<span data-bind="visible: isNew" class="i18n" data-i18n="POPUPS_ADD_ACCOUNT/BUTTON_ADD_ACCOUNT"></span>
+				<i data-bind="visible: !isNew(), css: {'icon-ok': !submitRequest(), 'icon-spinner': submitRequest()}"></i>
 				<span data-bind="visible: !isNew()" class="i18n" data-i18n="POPUPS_ADD_ACCOUNT/BUTTON_UPDATE_ACCOUNT"></span>
 			</a>
 		</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsAdvancedSearch.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsAdvancedSearch.html
index 5e0e803f7..d615615d1 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsAdvancedSearch.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsAdvancedSearch.html
@@ -98,7 +98,6 @@
 	<div class="modal-footer">
 		<button type="submit" class="btn buttonAdvSearch" data-bind="command: searchCommand">
 			<i class="fontastic">🔎</i>
-			&nbsp;&nbsp;
 			<span class="i18n" data-i18n="GLOBAL/SEARCH"></span>
 		</a>
 	</div>
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 324479118..e0e1b4104 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
@@ -53,28 +53,24 @@
 									<li class="e-item" data-bind="click: function () { requestReadReceipt(!requestReadReceipt()); }">
 										<a class="e-link">
 											<i class="icon-checkbox-unchecked" data-bind="css: {'icon-checkbox-checked': requestReadReceipt(), 'icon-checkbox-unchecked': !requestReadReceipt() }"></i>
-											&nbsp;&nbsp;
 											<span class="i18n" data-i18n="COMPOSE/BUTTON_REQUEST_READ_RECEIPT"></span>
 										</a>
 									</li>
 									<li class="e-item" data-bind="click: function () { requestDsn(!requestDsn()); }">
 										<a class="e-link">
 											<i class="icon-checkbox-unchecked" data-bind="css: {'icon-checkbox-checked': requestDsn(), 'icon-checkbox-unchecked': !requestDsn() }"></i>
-											&nbsp;&nbsp;
 											<span class="i18n" data-i18n="COMPOSE/BUTTON_REQUEST_DSN"></span>
 										</a>
 									</li>
 									<li class="e-item" data-bind="click: function () { markAsImportant(!markAsImportant()); }">
 										<a class="e-link">
 											<i class="icon-checkbox-unchecked" data-bind="css: {'icon-checkbox-checked': markAsImportant(), 'icon-checkbox-unchecked': !markAsImportant() }"></i>
-											&nbsp;&nbsp;
 											<span class="i18n" data-i18n="COMPOSE/BUTTON_MARK_AS_IMPORTANT"></span>
 										</a>
 									</li>
 									<li class="e-item dividerbar" data-bind="visible: capaOpenPGP, click: openOpenPgpPopup, css: {'disabled': isHtml()}">
 										<a class="e-link">
 											<i class="fontastic">🔑</i>
-											&nbsp;&nbsp;
 											<span class="i18n" data-i18n="COMPOSE/BUTTON_OPEN_PGP"></span>
 										</a>
 									</li>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsComposeOpenPgp.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsComposeOpenPgp.html
index b2fb0f545..dd962be58 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsComposeOpenPgp.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsComposeOpenPgp.html
@@ -107,7 +107,6 @@
 			<button class="btn buttonDo" data-bind="command: doCommand,
 				enable: (sign() || encrypt()) && (!encrypt() || encrypt() && encryptKeys().length > 0)">
 				<i class="fontastic" data-bind="css: {'icon-spinner': submitRequest()}">🔑</i>
-				&nbsp;&nbsp;
 				<span class="i18n" data-bind="visible: sign() && !encrypt()" data-i18n="POPUPS_COMPOSE_OPEN_PGP/BUTTON_SIGN"></span>
 				<span class="i18n" data-bind="visible: !sign() && encrypt()" data-i18n="POPUPS_COMPOSE_OPEN_PGP/BUTTON_ENCRYPT"></span>
 				<span class="i18n" data-bind="visible: (sign() && encrypt()) || (!sign() && !encrypt())" data-i18n="POPUPS_COMPOSE_OPEN_PGP/BUTTON_SIGN_AND_ENCRYPT"></span>
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 99a896173..7aa43882f 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
@@ -8,7 +8,6 @@
 			<div class="btn-group">
 				<a class="btn button-create-contact" data-bind="command: newCommand">
 					<i class="icon-plus"></i>
-					&nbsp;&nbsp;
 					<span class="i18n" data-i18n="CONTACTS/BUTTON_ADD_CONTACT"></span>
 				</a>
 			</div>
@@ -34,28 +33,24 @@
 					<li class="e-item" role="presentation">
 						<a class="e-link menuitem" href="#" tabindex="-1" data-bind="initDom: importUploaderButton">
 							<i data-bind="css: {'icon-import': !contacts.importing(), 'icon-spinner': contacts.importing}"></i>
-							&nbsp;&nbsp;
 							<span class="i18n" data-i18n="CONTACTS/BUTTON_IMPORT"></span>
 						</a>
 					</li>
 					<li class="e-item dividerbar hide-mobile" role="presentation">
 						<a class="e-link menuitem" href="#" tabindex="-1" data-bind="click: exportCsv">
 							<i data-bind="css: {'icon-export': !contacts.exportingCsv(), 'icon-spinner': contacts.exportingCsv}"></i>
-							&nbsp;&nbsp;
 							<span class="i18n" data-i18n="CONTACTS/BUTTON_EXPORT_CSV"></span>
 						</a>
 					</li>
 					<li class="e-item hide-mobile" role="presentation">
 						<a class="e-link menuitem" href="#" tabindex="-1" data-bind="click: exportVcf">
 							<i data-bind="css: {'icon-export': !contacts.exportingVcf(), 'icon-spinner': contacts.exportingVcf}"></i>
-							&nbsp;&nbsp;
 							<span class="i18n" data-i18n="CONTACTS/BUTTON_EXPORT_VCARD"></span>
 						</a>
 					</li>
 					<li class="e-item dividerbar" role="presentation" data-bind="visible: enableContactsSync() && allowContactsSync()">
 						<a class="e-link menuitem" href="#" tabindex="-1" data-bind="command: syncCommand">
 							<i data-bind="css: {'icon-sync': !contacts.syncing(), 'icon-spinner': contacts.syncing}"></i>
-							&nbsp;&nbsp;
 							<span class="i18n" data-i18n="CONTACTS/BUTTON_SYNC"></span>
 						</a>
 					</li>
@@ -111,7 +106,6 @@
 			<div class="btn-group">
 				<button class="btn button-save-contact" data-bind="visible: !emptySelection(), command: saveCommand, css: {'dirty': watchDirty}">
 					<i data-bind="css: {'icon-ok': !viewSaving(), 'icon-spinner': viewSaving()}"></i>
-					&nbsp;&nbsp;
 					<span class="i18n" data-i18n="CONTACTS/BUTTON_CREATE_CONTACT" data-bind="visible: '' === viewID()"></span>
 					<span class="i18n" data-i18n="CONTACTS/BUTTON_UPDATE_CONTACT" data-bind="visible: '' !== viewID()"></span>
 				</button>
@@ -126,28 +120,24 @@
 					<li class="e-item" role="presentation">
 						<a class="e-link menuitem" href="#" tabindex="-1" data-bind="click: addNewEmail">
 							<i class="icon-none"></i>
-							&nbsp;&nbsp;
 							<span class="i18n" data-i18n="GLOBAL/EMAIL"></span>
 						</a>
 					</li>
 					<li class="e-item" role="presentation">
 						<a class="e-link menuitem" href="#" tabindex="-1" data-bind="click: addNewPhone">
 							<i class="icon-none"></i>
-							&nbsp;&nbsp;
 							<span class="i18n" data-i18n="CONTACTS/ADD_MENU_PHONE"></span>
 						</a>
 					</li>
 					<li class="e-item" role="presentation">
 						<a class="e-link menuitem" href="#" tabindex="-1" data-bind="click: addNewWeb">
 							<i class="icon-none"></i>
-							&nbsp;&nbsp;
 							<span class="i18n" data-i18n="CONTACTS/ADD_MENU_URL"></span>
 						</a>
 					</li>
 					<li class="e-item dividerbar" role="presentation">
 						<a class="e-link menuitem" href="#" tabindex="-1" data-bind="click: addNewNickname">
 							<i class="icon-none"></i>
-							&nbsp;&nbsp;
 							<span class="i18n" data-i18n="CONTACTS/ADD_MENU_NICKNAME"></span>
 						</a>
 					</li>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFilter.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFilter.html
index 6db660db3..9a8012801 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFilter.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFilter.html
@@ -40,7 +40,6 @@
 						<br />
 						<a class="btn" data-bind="click: addCondition, i18nInit: true">
 							<i class="icon-plus"></i>
-							&nbsp;&nbsp;
 							<span class="i18n" data-i18n="POPUPS_FILTER/BUTTON_ADD_CONDITION"></span>
 						</a>
 					</div>
@@ -54,7 +53,6 @@
 		<div class="modal-footer">
 			<a class="btn buttonSave" data-bind="command: saveFilterCommand">
 				<i class="icon-ok"></i>
-				&nbsp;&nbsp;
 				<span class="i18n" data-i18n="GLOBAL/DONE"></span>
 			</a>
 		</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderClear.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderClear.html
index 4592614f7..4e3135eb7 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderClear.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderClear.html
@@ -24,7 +24,6 @@
 		<div class="modal-footer">
 			<a class="btn btn-danger buttonClear" data-bind="command: clearCommand">
 				<i class="fontastic" data-bind="css: {'icon-spinner white': clearingProcess()}">🔥</i>
-				&nbsp;&nbsp;
 				<span class="i18n" data-i18n="GLOBAL/CLEAR"></span>
 			</a>
 		</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderCreate.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderCreate.html
index 16f4ca9a2..4f9bc30aa 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderCreate.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderCreate.html
@@ -32,7 +32,6 @@
 		<div class="modal-footer">
 			<a class="btn buttonCreate" data-bind="command: createFolderCommand">
 				<i class="icon-folder-add"></i>
-				&nbsp;&nbsp;
 				<span class="i18n" data-i18n="POPUPS_CREATE_FOLDER/BUTTON_CREATE"></span>
 			</a>
 		</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsIdentity.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsIdentity.html
index 638000ecc..3b9635be4 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsIdentity.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsIdentity.html
@@ -87,9 +87,8 @@
 		<div class="modal-footer">
 			<a class="btn buttonAddIdentity" data-bind="command: addOrEditIdentityCommand">
 				<i data-bind="visible: !edit(), css: {'icon-user-add': !submitRequest(), 'icon-spinner': submitRequest()}"></i>
-				<i data-bind="visible: edit, css: {'icon-ok': !submitRequest(), 'icon-spinner': submitRequest()}"></i>
-				&nbsp;&nbsp;
 				<span data-bind="visible: !edit()" class="i18n" data-i18n="POPUPS_IDENTITY/BUTTON_ADD_IDENTITY"></span>
+				<i data-bind="visible: edit, css: {'icon-ok': !submitRequest(), 'icon-spinner': submitRequest()}"></i>
 				<span data-bind="visible: edit" class="i18n" data-i18n="POPUPS_IDENTITY/BUTTON_UPDATE_IDENTITY"></span>
 			</a>
 		</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsMessageOpenPgp.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsMessageOpenPgp.html
index 59c4129bf..276f5a954 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsMessageOpenPgp.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsMessageOpenPgp.html
@@ -43,7 +43,6 @@
 		<div class="modal-footer">
 			<button class="btn buttonDo" data-bind="command: doCommand">
 				<i class="fontastic" data-bind="css: {'icon-spinner': submitRequest()}">🔑</i>
-				&nbsp;&nbsp;
 				<span class="i18n" data-i18n="POPUPS_MESSAGE_OPEN_PGP/BUTTON_DECRYPT"></span>
 			</button>
 		</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsNewOpenPgpKey.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsNewOpenPgpKey.html
index e30fafd3e..412700a3f 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsNewOpenPgpKey.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsNewOpenPgpKey.html
@@ -48,7 +48,6 @@
 		<div class="modal-footer">
 			<a class="btn buttonHenerateOpenPgpKey" data-bind="command: generateOpenPgpKeyCommand">
 				<i class="fontastic" data-bind="css: {'icon-spinner': submitRequest()}">🔑</i>
-				&nbsp;&nbsp;
 				<span class="i18n" data-i18n="POPUPS_GENERATE_OPEN_PGP_KEYS/BUTTON_GENERATE_OPEN_PGP_KEYS"></span>
 			</a>
 		</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsSieveScript.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsSieveScript.html
index 06a62aa35..9b68ab42c 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsSieveScript.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsSieveScript.html
@@ -24,7 +24,6 @@
 				<div class="span8 width100-on-mobile">
 					<div class="alert g-ui-user-select-none">
 						<i class="fontastic">⚠</i>
-						&nbsp;&nbsp;
 						<span class="i18n" data-i18n="POPUPS_SIEVE_SCRIPT/CHANGES_NEED_TO_BE_SAVED_DESC"></span>
 					</div>
 				</div>
@@ -33,7 +32,6 @@
 				<div class="span8 width100-on-mobile">
 					<div class="alert alert-error g-ui-user-select-none">
 						<i class="fontastic">⚠</i>
-						&nbsp;&nbsp;
 						<span data-bind="text: $root.saveErrorText"></span>
 					</div>
 				</div>
@@ -88,7 +86,6 @@
 				</table>
 				<a class="btn" data-bind="click: $root.addFilter">
 					<i class="icon-plus"></i>
-					&nbsp;&nbsp;
 					<span class="i18n" data-i18n="POPUPS_SIEVE_SCRIPT/BUTTON_ADD_FILTER"></span>
 				</a>
 			</div>
@@ -100,7 +97,6 @@
 			</a>
 			<a class="btn buttonSave" data-bind="visible: hasChanges, click: function() { $root.saveScriptCommand(); }, css: {'btn-danger': $root.saveError}">
 				<i class="fontastic" data-bind="css: {'icon-spinner': $root.saving}">💾</i>
-				&nbsp;&nbsp;
 				<span class="i18n" data-i18n="GLOBAL/SAVE"></span>
 			</a>
 		</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsTemplate.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsTemplate.html
index dd1ab5a51..37e83bdb5 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsTemplate.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsTemplate.html
@@ -32,9 +32,8 @@
 		<div class="modal-footer">
 			<a class="btn buttonAddAccount" data-bind="command: addTemplateCommand">
 				<i data-bind="visible: '' == id(), css: {'icon-user-add': !submitRequest(), 'icon-spinner': submitRequest()}"></i>
-				<i data-bind="visible: '' !== id(), css: {'icon-ok': !submitRequest(), 'icon-spinner': submitRequest()}"></i>
-				&nbsp;&nbsp;
 				<span data-bind="visible: '' == id()" class="i18n" data-i18n="POPUPS_ADD_TEMPLATE/BUTTON_ADD_TEMPLATE"></span>
+				<i data-bind="visible: '' !== id(), css: {'icon-ok': !submitRequest(), 'icon-spinner': submitRequest()}"></i>
 				<span data-bind="visible: '' !== id()" class="i18n" data-i18n="POPUPS_ADD_TEMPLATE/BUTTON_UPDATE_TEMPLATE"></span>
 			</a>
 		</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsTwoFactorConfiguration.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsTwoFactorConfiguration.html
index 9fdd2ee4c..bc2035c66 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsTwoFactorConfiguration.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsTwoFactorConfiguration.html
@@ -81,22 +81,18 @@
 		<div class="modal-footer">
 			<a class="btn pull-left" data-bind="visible: lock, click: logout">
 				<i class="fontastic">⏻</i>
-				&nbsp;&nbsp;
 				<span class="i18n" data-i18n="GLOBAL/LOGOUT"></span>
 			</a>
 			<a class="btn btn-danger" data-bind="click: clearTwoFactor, visible: twoFactorStatus">
 				<i class="fontastic" data-bind="css: {'icon-spinner': clearing()}">✖</i>
-				&nbsp;&nbsp;
 				<span class="i18n" data-i18n="GLOBAL/CLEAR"></span>
 			</a>
 			<a class="btn" data-bind="click: createTwoFactor, visible: !twoFactorStatus()">
 				<i class="fontastic" data-bind="css: {'icon-spinner': processing()}">▶</i>
-				&nbsp;&nbsp;
 				<span class="i18n" data-i18n="POPUPS_TWO_FACTOR_CFG/BUTTON_ACTIVATE"></span>
 			</a>
 			<a class="btn" data-bind="command: cancelCommand, visible: viewEnable() || !lock()">
 				<i class="icon-ok" ></i>
-				&nbsp;&nbsp;
 				<span class="i18n" data-i18n="GLOBAL/DONE"></span>
 			</a>
 		</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsTwoFactorTest.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsTwoFactorTest.html
index dd2054e8a..2bffa635a 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsTwoFactorTest.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsTwoFactorTest.html
@@ -24,7 +24,6 @@
 		<div class="modal-footer">
 			<a class="btn" data-bind="command: testCodeCommand, css: { 'btn-success': true === codeStatus(), 'btn-danger': false === codeStatus() }">
 				<i data-bind="css: {'icon-ok': !testing(), 'icon-spinner': testing(), 'icon-white': true === codeStatus() || false === codeStatus() }"></i>
-				&nbsp;&nbsp;
 				<span class="i18n" data-i18n="GLOBAL/TEST"></span>
 			</a>
 		</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsViewOpenPgpKey.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsViewOpenPgpKey.html
index af44a7cb2..2cd7c5c2d 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsViewOpenPgpKey.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsViewOpenPgpKey.html
@@ -16,12 +16,10 @@
 		<div class="modal-footer">
 			<a class="btn buttonClose" data-bind="command: cancelCommand">
 				<i class="fontastic">✖</i>
-				&nbsp;&nbsp;
 				<span class="i18n" data-i18n="GLOBAL/CLOSE"></span>
 			</a>
 			<a class="btn buttonClose" data-bind="click: selectKey">
 				<i class="fontastic">🔑</i>
-				&nbsp;&nbsp;
 				<span class="i18n" data-i18n="POPUPS_VIEW_OPEN_PGP_KEY/BUTTON_SELECT"></span>
 			</a>
 		</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsAccounts.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsAccounts.html
index 97672b119..a1069ca13 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsAccounts.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsAccounts.html
@@ -9,7 +9,6 @@
 		</div>
 		<a class="btn" data-bind="click: addNewAccount">
 			<i class="icon-user-add"></i>
-			&nbsp;&nbsp;
 			<span class="i18n" data-i18n="SETTINGS_ACCOUNTS/BUTTON_ADD_ACCOUNT"></span>
 		</a>
 		<br />
@@ -28,7 +27,6 @@
 						<td class="e-action" data-bind="css: {'e-action': canBeEdit}">
 							<span class="account-img fontastic">👤</span>
 							<i class="icon-braille drag-handle"></i>
-							&nbsp;&nbsp;
 							<span class="account-name" data-bind="text: email"></span>
 						</td>
 						<td>
@@ -55,7 +53,6 @@
 		</div>
 		<a class="btn" data-bind="click: addNewIdentity">
 			<i class="icon-user-add"></i>
-			&nbsp;&nbsp;
 			<span class="i18n" data-i18n="SETTINGS_ACCOUNTS/BUTTON_ADD_IDENTITY"></span>
 		</a>
 		<br />
@@ -74,7 +71,6 @@
 						<td class="e-action">
 							<span class="identity-img fontastic">👤</span>
 							<i class="icon-braille drag-handle"></i>
-							&nbsp;&nbsp;
 							<span class="identity-name" data-bind="text: formattedName()"></span>
 							&nbsp;&nbsp;
 							<span class="identity-default" data-bind="visible: 0 === $index()">
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsChangePassword.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsChangePassword.html
index 93d4702dd..5e9b922fd 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsChangePassword.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsChangePassword.html
@@ -36,7 +36,6 @@
 					<div class="controls">
 						<a class="btn" data-bind="command: saveNewPasswordCommand, css: { 'btn-success': passwordUpdateSuccess, 'btn-danger': passwordUpdateError }">
 							<i class="fontastic" data-bind="css: {'icon-spinner': changeProcess(), 'icon-white': passwordUpdateSuccess() || passwordUpdateError() }">🔑</i>
-							&nbsp;&nbsp;
 							<span class="i18n" data-i18n="SETTINGS_CHANGE_PASSWORD/BUTTON_UPDATE_PASSWORD"></span>
 						</a>
 					</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html
index 665e094c2..f970dd029 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html
@@ -10,7 +10,6 @@
 		<div class="span8 width100-on-mobile">
 			<div class="alert alert-error g-ui-user-select-none" style="margin-bottom: 0">
 				<i class="fontastic">⚠</i>
-				&nbsp;&nbsp;
 				<span data-bind="text: serverErrorDesc"></span>
 			</div>
 		</div>
@@ -48,7 +47,6 @@
 			</table>
 			<a class="btn" data-bind="click: $root.addScript">
 				<i class="icon-plus"></i>
-				&nbsp;&nbsp;
 				<span class="i18n" data-i18n="SETTINGS_FILTERS/BUTTON_ADD_SCRIPT"></span>
 			</a>
 		</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolders.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolders.html
index 37b2bde02..8bbda90a0 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolders.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolders.html
@@ -8,13 +8,11 @@
 	</div>
 	<a class="btn" data-bind="click: createFolder">
 		<i class="icon-folder-add"></i>
-		&nbsp;&nbsp;
 		<span class="i18n" data-i18n="SETTINGS_FOLDERS/BUTTON_CREATE"></span>
 	</a>
 	&nbsp;&nbsp;
 	<a class="btn" data-bind="click: systemFolder">
 		<i class="fontastic">🔧</i>
-		&nbsp;&nbsp;
 		<span class="i18n" data-i18n="SETTINGS_FOLDERS/BUTTON_SYSTEM"></span>
 	</a>
 	<div class="alert folders-list-error" data-bind="visible: folderListOptimized">
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html
index aacf26735..2b72695ed 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html
@@ -4,14 +4,12 @@
 	</div>
 	<button class="btn" data-bind="click: addOpenPgpKey">
 		<i class="icon-list-add"></i>
-		&nbsp;&nbsp;
 		<span class="i18n" data-i18n="SETTINGS_OPEN_PGP/BUTTON_ADD_OPEN_PGP_KEY"></span>
 	</button>
 	&nbsp;&nbsp;
 	<div style="display: inline-block" data-bind="tooltip: 'SETTINGS_OPEN_PGP/GENERATE_ONLY_HTTPS'">
 		<button class="btn" data-bind="click: generateOpenPgpKey">
 			<i class="fontastic">🔑</i>
-			&nbsp;&nbsp;
 			<span class="i18n" data-i18n="SETTINGS_OPEN_PGP/BUTTON_GENERATE_OPEN_PGP_KEYS"></span>
 		</button>
 	</div>
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 aaf539150..a0bfce200 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
@@ -13,7 +13,6 @@
 			</div>
 			<a class="btn button-back" data-bind="click: backToMailBoxClick">
 				<i class="icon-left"></i>
-				&nbsp;&nbsp;
 				<span class="i18n i18n-animation" data-i18n="GLOBAL/BACK"></span>
 			</a>
 		</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsTemplates.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsTemplates.html
index dc906cb7e..a8de49951 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsTemplates.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsTemplates.html
@@ -8,7 +8,6 @@
 	</div>
 	<a class="btn" data-bind="click: addNewTemplate">
 		<i class="icon-user-add"></i>
-		&nbsp;&nbsp;
 		<span class="i18n" data-i18n="SETTINGS_TEMPLATES/BUTTON_ADD_TEMPLATE"></span>
 	</a>
 	<br />
@@ -27,7 +26,6 @@
 						<td class="e-action">
 							<span class="template-img fontastic">👤</span>
 							<i class="icon-braille drag-handle"></i>
-							&nbsp;&nbsp;
 							<span class="template-name" data-bind="text: name"></span>
 						</td>
 						<td>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsThemes.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsThemes.html
index af9186e14..52b092ad7 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsThemes.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsThemes.html
@@ -35,7 +35,6 @@
 			<div class="row" data-bind="visible: '' === background.name()" style="margin-left: 0">
 				<a class="btn" data-bind="initDom: background.uploaderButton">
 					<i class="fontastic" data-bind="css: {'icon-spinner': background.loading()}">🖼</i>
-					&nbsp;&nbsp;
 					<span class="i18n" data-i18n="SETTINGS_THEMES/BUTTON_UPLOAD_BACKGROUND_IMAGE"></span>
 				</a>
 			</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SystemDropDown.html b/snappymail/v/0.0.0/app/templates/Views/User/SystemDropDown.html
index 775ca8a48..e848ed15d 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SystemDropDown.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SystemDropDown.html
@@ -34,7 +34,6 @@
 									</b>-->
 									<i class="icon-ok"></i>
 									<i class="icon-user fontastic">👤</i>
-									&nbsp;&nbsp;
 									<span class="email-title" data-bind="text: email, attr: {title: email}"></span>
 								</a>
 							</li>
@@ -44,49 +43,42 @@
 					<li class="e-item dividerbar" role="presentation" data-bind="visible: capaAdditionalAccounts">
 						<a class="e-link menuitem" href="#" tabindex="-1" data-bind="click: addAccountClick">
 							<i class="icon-plus"></i>
-							&nbsp;&nbsp;
 							<span class="i18n" data-i18n="TOP_TOOLBAR/BUTTON_ADD_ACCOUNT"></span>
 						</a>
 					</li>
 					<li class="e-item" role="presentation" data-bind="visible: allowSettings">
 						<a class="e-link menuitem" href="#" tabindex="-1" data-bind="visible: allowContacts, click: contactsClick">
 							<i class="icon-address-book"></i>
-							&nbsp;&nbsp;
 							<span class="i18n" data-i18n="GLOBAL/CONTACTS"></span>
 						</a>
 					</li>
 					<li class="e-item" role="presentation" data-bind="visible: allowSettings">
 						<a class="e-link menuitem" href="#" tabindex="-1" data-bind="click: settingsClick">
 							<i class="fontastic">⚙</i>
-							&nbsp;&nbsp;
 							<span class="i18n" data-i18n="TOP_TOOLBAR/BUTTON_SETTINGS"></span>
 						</a>
 					</li>
 					<li class="e-item" role="presentation" data-bind="visible: allowHelp">
 						<a class="e-link menuitem" href="#" tabindex="-1" data-bind="click: settingsHelp">
 							<i class="icon-help"></i>
-							&nbsp;&nbsp;
 							<span class="i18n" data-i18n="TOP_TOOLBAR/BUTTON_HELP"></span>
 						</a>
 					</li>
 					<li class="e-item dividerbar" role="presentation" data-bind="visible: mobile">
 						<a class="e-link menuitem" href="./?/DesktopVersion/" tabindex="-1">
 							<i class="fontastic">💻</i>
-							&nbsp;&nbsp;
 							<span class="i18n" data-i18n="MOBILE/BUTTON_DESKTOP_VERSION"></span>
 						</a>
 					</li>
 					<li class="e-item dividerbar" role="presentation" data-bind="visible: !mobile">
 						<a class="e-link menuitem" href="./?/MobileVersion/" tabindex="-1">
 							<i class="fontastic">📱</i>
-							&nbsp;&nbsp;
 							<span class="i18n" data-i18n="MOBILE/BUTTON_MOBILE_VERSION"></span>
 						</a>
 					</li>
 					<li class="e-item" role="presentation">
 						<a class="e-link menuitem" href="#" tabindex="-1" data-bind="click: logoutClick">
 							<i class="fontastic">⏻</i>
-							&nbsp;&nbsp;
 							<span class="i18n" data-i18n="GLOBAL/LOGOUT"></span>
 						</a>
 					</li>