diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html
index 27761b82d..df56b9647 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html
@@ -1,7 +1,7 @@
 <div class="b-login-content">
 	<div class="loginFormWrapper" data-bind="css: {'afterLoginHide': formHidden}">
 		<div class="alert alertError" data-bind="visible: '' !== submitError()">
-			<button type="button" class="close" data-bind="click: function () { submitError('') }">&times;</button>
+			<button type="button" class="close" data-bind="click: function () { submitError('') }">×</button>
 			<span data-bind="text: submitError"></span>
 		</div>
 		<div class="wrapper-parent">
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 91b9c1817..bcaa28d0f 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
@@ -5,7 +5,7 @@
 				<i class="icon-spinner animated" style="margin-top: 2px" data-bind="style: {'visibility': adminManLoadingVisibility }"></i>
 				&nbsp;&nbsp;
 				SnappyMail
-				&mdash;
+				—
 				<span data-i18n="TOP_PANEL/LABEL_ADMIN_PANEL"></span>
 			</h4>
 			<div class="btn-group pull-right">
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPackages.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPackages.html
index 0c3aec30b..1ff50b2ac 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPackages.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPackages.html
@@ -4,7 +4,7 @@
 		data-i18n="TAB_PACKAGES/ALERT_CANNOT_ACCESS_REPOSITORY"></div>
 
 	<div class="alert" style="margin-top: 10px;" data-bind="visible: '' !== packagesError()">
-		<button type="button" class="close" data-bind="click: function () { packagesError('') }">&times;</button>
+		<button type="button" class="close" data-bind="click: function () { packagesError('') }">×</button>
 		<span data-bind="text: packagesError"></span>
 	</div>
 
@@ -29,4 +29,4 @@
 		<br />
 	</div>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPlugins.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPlugins.html
index 08a895bed..7b1000c4f 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPlugins.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPlugins.html
@@ -2,7 +2,7 @@
 
 	<div class="row">
 		<div class="alert span8" style="margin-top: 10px;" data-bind="visible: '' !== pluginsError()">
-			<button type="button" class="close" data-bind="click: function () { pluginsError('') }">&times;</button>
+			<button type="button" class="close" data-bind="click: function () { pluginsError('') }">×</button>
 			<span data-bind="text: pluginsError"></span>
 		</div>
 	</div>
@@ -38,4 +38,4 @@
 			</table>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</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 a563f864e..74345d496 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
@@ -1,7 +1,7 @@
 <div class="modal fade b-domain-content g-ui-user-select-none"
 	data-bind="modal: modalVisibility, css: {'domain-edit': edit, 'domain-second-page': 'main' !== page()}">
 	<div class="modal-header">
-		<button type="button" class="close" data-bind="command: cancelCommand">&times;</button>
+		<button type="button" class="close" data-bind="command: cancelCommand">×</button>
 		<h3 data-bind="text: headerText"></h3>
 	</div>
 	<div class="modal-body">
@@ -73,7 +73,7 @@
 									}
 								}"></div>
 								&nbsp;&nbsp;
-								<span style="color: #aaa">(user@domain.com &rarr; user)</span>
+								<span style="color: #aaa">(user@domain.com → user)</span>
 							</div>
 						</div>
 						<br />
@@ -199,7 +199,7 @@
 									}
 								}"></div>
 								&nbsp;&nbsp;
-								<span style="color: #aaa">(user@domain.com &rarr; user)</span>
+								<span style="color: #aaa">(user@domain.com → user)</span>
 								<br />
 								<div data-bind="component: {
 									name: 'Checkbox',
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 9185b9aa1..3342073d1 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
@@ -1,6 +1,6 @@
 <div class="modal fade b-domain-alias-content" data-bind="modal: modalVisibility">
 	<div class="modal-header">
-		<button type="button" class="close" data-bind="command: cancelCommand">&times;</button>
+		<button type="button" class="close" data-bind="command: cancelCommand">×</button>
 		<h3 data-i18n="POPUPS_DOMAIN_ALIAS/TITLE_ADD_DOMAIN_ALIAS"></h3>
 	</div>
 	<div class="modal-body">
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 e52c4d330..9b75e8f20 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
@@ -1,6 +1,6 @@
 <div class="modal fade b-plugin-content" data-bind="modal: modalVisibility">
 	<div class="modal-header">
-		<button type="button" class="close" data-bind="command: cancelCommand">&times;</button>
+		<button type="button" class="close" data-bind="command: cancelCommand">×</button>
 		<h4>
 			<span data-i18n="POPUPS_PLUGIN/TITLE_PLUGIN"></span>
 			&nbsp;
@@ -14,7 +14,7 @@
 				<span data-i18n="POPUPS_PLUGIN/DESC_NOTHING_TO_CONFIGURE"></span>
 			</div>
 			<div class="alert" data-bind="visible: '' !== saveError()">
-				<button type="button" class="close" data-bind="click: function () { saveError('') }">&times;</button>
+				<button type="button" class="close" data-bind="click: function () { saveError('') }">×</button>
 				<span data-bind="text: saveError"></span>
 			</div>
 			<div data-bind="foreach: configures, visible: hasConfiguration">
diff --git a/snappymail/v/0.0.0/app/templates/Views/Common/PopupsKeyboardShortcutsHelp.html b/snappymail/v/0.0.0/app/templates/Views/Common/PopupsKeyboardShortcutsHelp.html
index 36363ea0b..e5a513947 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Common/PopupsKeyboardShortcutsHelp.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Common/PopupsKeyboardShortcutsHelp.html
@@ -1,6 +1,6 @@
 <div class="modal fade b-shortcuts-content" data-bind="modal: modalVisibility">
 	<div class="modal-header">
-		<button type="button" class="close" data-bind="command: cancelCommand">&times;</button>
+		<button type="button" class="close" data-bind="command: cancelCommand">×</button>
 		<h3 class="i18n" data-i18n="SHORTCUTS_HELP/LEGEND_SHORTCUTS_HELP"></h3>
 	</div>
 	<div class="modal-body">
@@ -49,8 +49,8 @@
 					<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_SEARCH"></td><td>/</td></tr>
 					<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_FULLSCREEN_ENTER"></td><td>Enter</td></tr>
 					<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_VIEW_MESSAGE_ENTER"></td><td>Enter</td></tr>
-					<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_SWITCH_TO_MESSAGE"></td><td>&rarr;, Tab</td></tr>
-					<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_SWITCH_TO_FOLDER_LIST"></td><td>&larr;, Shift + Tab</td></tr>
+					<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_SWITCH_TO_MESSAGE"></td><td>→, Tab</td></tr>
+					<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_SWITCH_TO_FOLDER_LIST"></td><td>←, Shift + Tab</td></tr>
 				</tbody>
 				</table>
 
diff --git a/snappymail/v/0.0.0/app/templates/Views/Common/PopupsLanguages.html b/snappymail/v/0.0.0/app/templates/Views/Common/PopupsLanguages.html
index 5cc66408c..33e45534b 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Common/PopupsLanguages.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Common/PopupsLanguages.html
@@ -1,6 +1,6 @@
 <div class="modal fade b-languages-content g-ui-user-select-none" data-bind="modal: modalVisibility">
 	<div class="modal-header">
-		<button type="button" class="close" data-bind="command: cancelCommand">&times;</button>
+		<button type="button" class="close" data-bind="command: cancelCommand">×</button>
 		<h3>
 			<span class="i18n" data-i18n="POPUPS_LANGUAGES/TITLE_LANGUAGES"></span>
 		</h3>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/Login.html b/snappymail/v/0.0.0/app/templates/Views/User/Login.html
index 4b780ac3d..e79377905 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/Login.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/Login.html
@@ -5,7 +5,7 @@
 			<span class="desc" data-bind="text: loadingDesc"></span>
 		</div>
 		<div class="alert alertError" data-bind="hidden: !submitError()" hidden="">
-			<button type="button" class="close" data-bind="click: function () { submitError('') }">&times;</button>
+			<button type="button" class="close" data-bind="click: function () { submitError('') }">×</button>
 			<span data-bind="text: submitError"></span>
 			<div data-bind="visible: '' !== submitErrorAddidional()">
 				<br />
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 cb505566f..67dce34f7 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
@@ -145,7 +145,7 @@
 				<div class="form-inline">
 					<div class="input-append pull-right" data-bind="visible: allowSearch">
 						<div class="close-input-wrp">
-							<a class="close" data-bind="click: cancelSearch, visible: '' !== messageListSearchDesc()">&times;</a>
+							<a class="close" data-bind="click: cancelSearch, visible: '' !== messageListSearchDesc()">×</a>
 							<input type="text" class="i18n span4 inputSearch" tabindex="-1" placeholder="Search" autocorrect="off" autocapitalize="off" data-i18n="[placeholder]SEARCH/MAIN_INPUT_PLACEHOLDER" data-bind="value: inputProxyMessageListSearch, onEnter: searchEnterAction, hasfocus: inputMessageListSearchFocus" />
 						</div>
 						<a class="btn buttonMoreSearch" data-bind="visible: allowSearchAdv, click: advancedSearchClick">
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 93637d154..1d9606a2d 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
@@ -204,7 +204,7 @@
 				<div data-bind="visible: message">
 					<div class="messageItemHeader" data-bind="css: {'emptySubject': '' === viewSubject()}">
 						<div class="subjectParent">
-							<button class="close" data-bind="command: closeMessageCommand" style="margin-top: -2px;">&times;</button>
+							<button class="close" data-bind="command: closeMessageCommand" style="margin-top: -2px;">×</button>
 							<span class="infoParent g-ui-user-select-none" data-bind="click: function() { showFullInfo(!showFullInfo()); }">
 								<i class="icon-info" style="padding-top: 1px;"></i>
 							</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 0044618c9..e08294430 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
@@ -1,7 +1,7 @@
 <div class="modal fade b-account-add-content g-ui-user-select-none" data-bind="modal: modalVisibility">
 	<div>
 		<div class="modal-header">
-			<button type="button" class="close" data-bind="command: cancelCommand">&times;</button>
+			<button type="button" class="close" data-bind="command: cancelCommand">×</button>
 			<h3>
 				<span data-bind="visible: isNew" class="i18n" data-i18n="POPUPS_ADD_ACCOUNT/TITLE_ADD_ACCOUNT"></span>
 				<span data-bind="visible: !isNew()" class="i18n" data-i18n="POPUPS_ADD_ACCOUNT/TITLE_UPDATE_ACCOUNT"></span>
@@ -10,7 +10,7 @@
 		<div class="modal-body">
 			<div class="form-horizontal">
 				<div class="alert" data-bind="visible: '' !== submitError()">
-					<button type="button" class="close-custom" data-bind="click: function () { submitError('') }">&times;</button>
+					<button type="button" class="close-custom" data-bind="click: function () { submitError('') }">×</button>
 					<span data-bind="text: submitError"></span>
 					<div data-bind="visible: submitErrorAdditional">
 						<br />
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsAddOpenPgpKey.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsAddOpenPgpKey.html
index 5d36c978e..7a737ff43 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsAddOpenPgpKey.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsAddOpenPgpKey.html
@@ -1,7 +1,7 @@
 <div class="modal fade b-open-pgp-key-add-content g-ui-user-select-none" data-bind="modal: modalVisibility">
 	<div>
 		<div class="modal-header">
-			<button type="button" class="close" data-bind="command: cancelCommand">&times;</button>
+			<button type="button" class="close" data-bind="command: cancelCommand">×</button>
 			<h3>
 				<span class="i18n" data-i18n="POPUPS_IMPORT_OPEN_PGP_KEY/TITLE_IMPORT_OPEN_PGP_KEY"></span>
 			</h3>
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 51d572acb..073ec6cc7 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
@@ -1,6 +1,6 @@
 <div class="modal fade b-advanced-search-content g-ui-user-select-none" data-bind="modal: modalVisibility">
 	<div class="modal-header">
-		<button type="button" class="close" data-bind="command: cancelCommand">&times;</button>
+		<button type="button" class="close" data-bind="command: cancelCommand">×</button>
 		<h3>
 			<span class="i18n" data-i18n="SEARCH/TITLE_ADV"></span>
 		</h3>
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 e563b5414..268558960 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
@@ -9,7 +9,7 @@
 			<span class="i18n btn-text hide-on-mobile" data-i18n="COMPOSE/BUTTON_SAVE"></span>
 		</a>
 
-		<a class="close-custom" data-bind="click: tryToClosePopup, tooltip: 'COMPOSE/BUTTON_CANCEL'">&times;</a>
+		<a class="close-custom" data-bind="click: tryToClosePopup, tooltip: 'COMPOSE/BUTTON_CANCEL'">×</a>
 		<a class="minimize-custom" data-bind="click: skipCommand, tooltip: 'COMPOSE/BUTTON_MINIMIZE'"></a>
 
 		<a class="btn btn-danger button-delete button-delete-transitions" data-bind="command: deleteCommand">
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 31f40d5db..392767d65 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
@@ -1,7 +1,7 @@
 <div class="modal fade b-compose-open-pgp-content g-ui-user-select-none" data-bind="modal: modalVisibility">
 	<div>
 		<div class="modal-header">
-			<button type="button" class="close" data-bind="command: cancelCommand">&times;</button>
+			<button type="button" class="close" data-bind="command: cancelCommand">×</button>
 			<h3>
 				<span class="i18n" data-i18n="POPUPS_COMPOSE_OPEN_PGP/TITLE_COMPOSE_OPEN_PGP"></span>
 			</h3>
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 f7b217c96..ea652e61d 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
@@ -1,7 +1,7 @@
 <div class="modal fade b-contacts-content" data-bind="modal: modalVisibility">
 	<div class="modal-header b-header-toolbar g-ui-user-select-none">
 
-		<button type="button" class="close" data-bind="command: cancelCommand">&times;</button>
+		<button type="button" class="close" data-bind="command: cancelCommand">×</button>
 
 		<div class="btn-toolbar">
 
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 36b958c3f..55301c21d 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
@@ -1,7 +1,7 @@
 <div class="modal fade b-filter-content g-ui-user-select-none" data-bind="modal: modalVisibility">
 	<div>
 		<div class="modal-header">
-			<button type="button" class="close" data-bind="command: cancelCommand">&times;</button>
+			<button type="button" class="close" data-bind="command: cancelCommand">×</button>
 			<h3>
 				<span class="i18n" data-i18n="POPUPS_FILTER/TITLE_CREATE_FILTER" data-bind="visible: isNew"></span>
 				<span class="i18n" data-i18n="POPUPS_FILTER/TITLE_EDIT_FILTER" data-bind="visible: !isNew()"></span>
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 525a41751..913646bd6 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
@@ -1,7 +1,7 @@
 <div class="modal fade b-folder-clear-content g-ui-user-select-none" data-bind="modal: modalVisibility">
 	<div>
 		<div class="modal-header">
-			<button type="button" class="close" data-bind="command: cancelCommand">&times;</button>
+			<button type="button" class="close" data-bind="command: cancelCommand">×</button>
 			<h3>
 				<span class="i18n" data-i18n="POPUPS_CLEAR_FOLDER/TITLE_CLEAR_FOLDER" data-bind="visible: !clearingProcess()"></span>
 				<span class="i18n" data-i18n="POPUPS_CLEAR_FOLDER/TITLE_CLEARING_PROCESS" data-bind="visible: clearingProcess"></span>
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 86f4a5f8d..1335a90d2 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
@@ -1,7 +1,7 @@
 <div class="modal fade b-folder-create-content g-ui-user-select-none" data-bind="modal: modalVisibility">
 	<div>
 		<div class="modal-header">
-			<button type="button" class="close" data-bind="command: cancelCommand">&times;</button>
+			<button type="button" class="close" data-bind="command: cancelCommand">×</button>
 			<h3>
 				<span class="i18n" data-i18n="POPUPS_CREATE_FOLDER/TITLE_CREATE_FOLDER"></span>
 			</h3>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderSystem.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderSystem.html
index d2236a878..2d318750b 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderSystem.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderSystem.html
@@ -1,6 +1,6 @@
 <div class="modal fade b-folder-system-content g-ui-user-select-none" data-bind="modal: modalVisibility">
 	<div class="modal-header">
-		<button type="button" class="close" data-bind="command: cancelCommand">&times;</button>
+		<button type="button" class="close" data-bind="command: cancelCommand">×</button>
 		<h3>
 			<span class="i18n" data-i18n="POPUPS_SYSTEM_FOLDERS/TITLE_SYSTEM_FOLDERS"></span>
 		</h3>
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 aaaf2d4a3..87e3ca679 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
@@ -1,7 +1,7 @@
 <div class="modal fade b-identity-content" data-bind="modal: modalVisibility">
 	<div>
 		<div class="modal-header g-ui-user-select-none">
-			<button type="button" class="close" data-bind="command: cancelCommand">&times;</button>
+			<button type="button" class="close" data-bind="command: cancelCommand">×</button>
 			<h3>
 				<span data-bind="visible: !edit()" class="i18n" data-i18n="POPUPS_IDENTITY/TITLE_ADD_IDENTITY"></span>
 				<span data-bind="visible: edit" class="i18n" data-i18n="POPUPS_IDENTITY/TITLE_UPDATE_IDENTITY"></span>
@@ -10,7 +10,7 @@
 		<div class="modal-body">
 			<div class="form-horizontal g-ui-user-select-none">
 				<div class="alert" data-bind="visible: '' !== submitError()">
-					<button type="button" class="close" data-bind="click: function () { submitError('') }">&times;</button>
+					<button type="button" class="close" data-bind="click: function () { submitError('') }">×</button>
 					<span data-bind="text: submitError"></span>
 				</div>
 				<br />
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 3fad69b3c..bfd3b1cfb 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
@@ -1,7 +1,7 @@
 <div class="modal fade b-message-open-pgp-content g-ui-user-select-none" data-bind="modal: modalVisibility">
 	<div>
 		<div class="modal-header">
-			<button type="button" class="close" data-bind="command: cancelCommand">&times;</button>
+			<button type="button" class="close" data-bind="command: cancelCommand">×</button>
 			<h3>
 				<span class="i18n" data-i18n="POPUPS_MESSAGE_OPEN_PGP/TITLE_MESSAGE_OPEN_PGP"></span>
 			</h3>
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 c13e167cf..05085755d 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
@@ -1,7 +1,7 @@
 <div class="modal fade b-open-pgp-key-generate-content g-ui-user-select-none" data-bind="modal: modalVisibility">
 	<div>
 		<div class="modal-header">
-			<button type="button" class="close" data-bind="command: cancelCommand">&times;</button>
+			<button type="button" class="close" data-bind="command: cancelCommand">×</button>
 			<h3>
 				<span class="i18n" data-i18n="POPUPS_GENERATE_OPEN_PGP_KEYS/TITLE_GENERATE_OPEN_PGP_KEYS"></span>
 			</h3>
@@ -9,7 +9,7 @@
 		<div class="modal-body">
 			<div class="form-horizontal">
 				<div class="alert" data-bind="visible: '' !== submitError()">
-					<button type="button" class="close" data-bind="click: function () { submitError('') }">&times;</button>
+					<button type="button" class="close" data-bind="click: function () { submitError('') }">×</button>
 					<span data-bind="text: submitError"></span>
 				</div>
 				<br />
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 3af91854f..068b7173c 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
@@ -1,7 +1,7 @@
 <div class="modal fade b-template-add-content" data-bind="modal: modalVisibility">
 	<div>
 		<div class="modal-header g-ui-user-select-none">
-			<button type="button" class="close" data-bind="command: cancelCommand">&times;</button>
+			<button type="button" class="close" data-bind="command: cancelCommand">×</button>
 			<h3>
 				<span data-bind="visible: '' === id()" class="i18n" data-i18n="POPUPS_ADD_TEMPLATE/TITLE_ADD_TEMPLATE"></span>
 				<span data-bind="visible: '' !== id()" class="i18n" data-i18n="POPUPS_ADD_TEMPLATE/TITLE_UPDATE_TEMPLATE"></span>
@@ -10,7 +10,7 @@
 		<div class="modal-body">
 			<div class="form-horizontal g-ui-user-select-none">
 				<div class="alert" data-bind="visible: '' !== submitError()">
-					<button type="button" class="close" data-bind="click: function () { submitError('') }">&times;</button>
+					<button type="button" class="close" data-bind="click: function () { submitError('') }">×</button>
 					<span data-bind="text: submitError"></span>
 				</div>
 				<br />
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 6a18f147d..f3b00995c 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
@@ -1,7 +1,7 @@
 <div class="modal fade b-two-factor-content g-ui-user-select-none" data-bind="modal: modalVisibility">
 	<div>
 		<div class="modal-header">
-			<button type="button" class="close" data-bind="visible: viewEnable() || !lock(), command: cancelCommand">&times;</button>
+			<button type="button" class="close" data-bind="visible: viewEnable() || !lock(), command: cancelCommand">×</button>
 			<h3>
 				<span class="i18n" data-i18n="POPUPS_TWO_FACTOR_CFG/LEGEND_TWO_FACTOR_AUTH"></span>
 			</h3>
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 04ac958bd..585e6370e 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
@@ -1,7 +1,7 @@
 <div class="modal fade b-two-factor-test-content g-ui-user-select-none" data-bind="modal: modalVisibility">
 	<div>
 		<div class="modal-header">
-			<button type="button" class="close" data-bind="command: cancelCommand">&times;</button>
+			<button type="button" class="close" data-bind="command: cancelCommand">×</button>
 			<h3>
 				<span class="i18n" data-i18n="POPUPS_TWO_FACTOR_TEST/TITLE_TEST_CODE"></span>
 			</h3>
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 5fa7891a9..e85f7c2fa 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
@@ -1,7 +1,7 @@
 <div class="modal fade b-open-pgp-key-view-content" data-bind="modal: modalVisibility">
 	<div>
 		<div class="modal-header g-ui-user-select-none">
-			<button type="button" class="close" data-bind="command: cancelCommand">&times;</button>
+			<button type="button" class="close" data-bind="command: cancelCommand">×</button>
 			<h3>
 				<span class="i18n" data-i18n="POPUPS_VIEW_OPEN_PGP_KEY/TITLE_VIEW_OPEN_PGP_KEY"></span>
 			</h3>
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 223f9b25f..06451ec29 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
@@ -24,7 +24,7 @@
 			<span class="i18n" data-i18n="SETTINGS_FOLDERS/TO_MANY_FOLDERS_DESC_2"></span>
 		</div>
 		<div class="alert folders-list-error" data-bind="visible: '' !== folderListError()">
-			<button type="button" class="close" data-bind="click: function () { folderListError(''); }">&times;</button>
+			<button type="button" class="close" data-bind="click: function () { folderListError(''); }">×</button>
 			<span data-bind="text: folderListError"></span>
 		</div>
 		<table class="table table-hover list-table" data-bind="i18nUpdate: folderList" style="margin-top: 40px">