diff --git a/dev/Styles/AdminPackages.less b/dev/Styles/AdminPackages.less
index 8111c1a61..1605c7577 100644
--- a/dev/Styles/AdminPackages.less
+++ b/dev/Styles/AdminPackages.less
@@ -26,10 +26,10 @@
 			font-size: 12px;
 		}
 
-		.package-release-parent, .package-actions-parent {
+		.package-release, .package-actions {
 			text-align: center;
 		}
-		.package-actions-parent {
+		.package-actions {
 			vertical-align: middle;
 		}
 	}
diff --git a/dev/Styles/FolderList.less b/dev/Styles/FolderList.less
index cbb19de67..4421a48aa 100644
--- a/dev/Styles/FolderList.less
+++ b/dev/Styles/FolderList.less
@@ -92,10 +92,10 @@
 				display: none;
 				margin-left: 7px;
 
-				.icon-star {
+				.flagged {
 					display: none;
 				}
-				.icon-star-empty {
+				.unflagged {
 					opacity: .5;
 
 					&:hover {
@@ -195,11 +195,11 @@
 	}
 
 	&.inbox-is-starred {
-		.icon-star {
+		.flagged {
 			color: orange;
 			display: inline-block !important;
 		}
-		.icon-star-empty {
+		.unflagged {
 			display: none;
 		}
 	}
diff --git a/dev/Styles/MessageList.less b/dev/Styles/MessageList.less
index 90f53c593..0875b838a 100644
--- a/dev/Styles/MessageList.less
+++ b/dev/Styles/MessageList.less
@@ -87,6 +87,7 @@ html.rl-no-preview-pane {
 		border-bottom: 1px solid #bbb;
 
 		.checkboxCheckAll {
+			cursor: pointer;
 			line-height: 30px;
 		}
 	}
diff --git a/dev/Styles/_End.less b/dev/Styles/_End.less
index 0b7fce786..a3fb20f95 100644
--- a/dev/Styles/_End.less
+++ b/dev/Styles/_End.less
@@ -1,9 +1,4 @@
 
-.mfp-container .mfp-figure {
-	min-height: 300px;
-	min-width: 300px;
-}
-
 [data-rainloopErrorTip] {
 	position: relative;
 }
@@ -43,22 +38,6 @@
 	z-index: 2002;
 }
 
-.lg-backdrop.in {
-	opacity: 0.8;
-}
-
-
-.btn .btn-text {
-	padding-left: 8px;
-}
-
-.active-scale-transition {
-	transition: transform .2s;
-	&:active {
-		transform: scale(.95);
-	}
-}
-
 input:-webkit-autofill,
 input:-webkit-autofill:hover,
 input:-webkit-autofill:focus,
diff --git a/dev/Styles/_FontasticToBoot.less b/dev/Styles/_FontasticToBoot.less
index a06313eb9..cfa38be41 100644
--- a/dev/Styles/_FontasticToBoot.less
+++ b/dev/Styles/_FontasticToBoot.less
@@ -11,7 +11,6 @@
 	width: 1em;
 	height: 1em;
 	line-height: 1;
-	font-size: 16px;
 	vertical-align: text-top;
 
 	.disabled &,
@@ -62,13 +61,10 @@
 
 .icon-spinner {
 
-	font-family: Arial;
+	height: 10px;
+	width: 10px;
 
-	height: 11px;
-	width: 11px;
-
-	margin-right: -1px;
-	background: none;
+	margin: 0 -1px;
 
 	border: 3px solid #aaa;
 	border-top-color: #333;
@@ -79,8 +75,7 @@
 		height: 13px;
 		width: 13px;
 
-		margin-top: -2px;
-		margin-left: -2px;
+		margin: -1px -2px;
 	}
 
 	&.white, &.icon-white {
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 94154a627..daa2a1b5f 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
@@ -2,12 +2,12 @@
 	<div class="legend" data-i18n="TAB_DOMAINS/LEGEND_DOMAINS"></div>
 	<div>
 		<a class="btn" data-bind="click: createDomain">
-			<i class="icon-plus"></i>
+			<i class="fontastic">✚</i>
 			<span data-i18n="TAB_DOMAINS/BUTTON_ADD_DOMAIN"></span>
 		</a>
 		&nbsp;&nbsp;
 		<a class="btn" data-bind="click: createDomainAlias">
-			<i class="icon-plus"></i>
+			<i class="fontastic">✚</i>
 			<span data-i18n="TAB_DOMAINS/BUTTON_ADD_ALIAS"></span>
 		</a>
 		<br />
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPackagesListItem.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPackagesListItem.html
index bc21d1ced..36ba0098d 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPackagesListItem.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPackagesListItem.html
@@ -1,19 +1,16 @@
 <tr class="e-item">
-	<td class="package-name-parent">
-		<i class="package-img icon-bolt"></i>
+	<td>
 		<span class="package-name" data-bind="text: name"></span>
 		<span class="package-installed pull-right" data-bind="text: installed"></span>
 		<div class="package-desc" data-bind="text: desc"></div>
 	</td>
-	<td class="package-version-parent">
+	<td>
 		<span class="package-version" data-bind="text: version"></span>
 	</td>
 	<!--
-	<td class="package-release-parent">
-		<span class="package-release" data-bind="text: release"></span>
-	</td>
+	<td class="package-release" data-bind="text: release"></td>
 	-->
-	<td class="package-actions-parent">
+	<td class="package-actions">
 		<i class="icon-download e-action button-download" data-bind="visible: !loading() && canBeUpdated, click: function () { $root.installPackage($data); }"></i>
 		&nbsp;
 		<i class="fontastic e-action button-delete" data-bind="visible: !loading() && canBeDeleted, click: function () { $root.deletePackage($data); }">🗑</i>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPluginListItem.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPluginListItem.html
index 7c1e64685..59302188a 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPluginListItem.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPluginListItem.html
@@ -1,9 +1,4 @@
 <tr class="e-item" data-bind="css: {'disabled': disabled }">
-	<td class="configure-plugin-action e-action">
-		<i class="plugin-img icon-bolt"></i>
-		<span class="plugin-name" data-bind="text: name"></span>
-	</td>
-	<td>
-		<span class="disabled-plugin e-action fontastic" data-bind="text: disabled() ? '☐' : '☑'"></span>
-	</td>
+	<td class="configure-plugin-action e-action plugin-name" data-bind="text: name"></td>
+	<td class="disabled-plugin e-action fontastic" data-bind="text: disabled() ? '☐' : '☑'"></td>
 </tr>
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 2f98156de..e499b4bfb 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
@@ -241,7 +241,7 @@
 			<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="fontastic" data-bind="text: edit() ? '✔' : '✚', visible: !saving()"></i>
 			<i class="icon-spinner" data-bind="visible: saving"></i>
 			<span data-bind="visible: !edit()" data-i18n="POPUPS_DOMAIN/BUTTON_ADD"></span>
 			<span data-bind="visible: edit()" data-i18n="POPUPS_DOMAIN/BUTTON_UPDATE"></span>
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 7a3bd4a13..2c6a16e3d 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
@@ -41,7 +41,7 @@
 			<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="fontastic" data-bind="visible: !saving()">✚</i>
 			<i class="icon-spinner" data-bind="visible: saving"></i>
 			<span data-i18n="POPUPS_DOMAIN_ALIAS/BUTTON_ADD"></span>
 		</a>
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 375eb3410..b1e5acb0c 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
@@ -28,7 +28,7 @@
 			<span data-i18n="POPUPS_PLUGIN/BUTTON_CLOSE"></span>
 		</a>
 		<a class="btn buttonClear" data-bind="command: saveCommand, visible: hasConfiguration">
-			<i class="icon-ok"></i>
+			<i class="fontastic">✔</i>
 			<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 5db6d8f93..1fefda48b 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
@@ -10,7 +10,7 @@
 		</div>
 		<div class="modal-footer">
 			<button class="btn buttonYes" data-bind="click: yesClick">
-				<i class="icon-ok"></i>
+				<i class="fontastic">✔</i>
 				<span data-bind="text: yesButton"></span>
 			</button>
 			<button class="btn buttonNo" data-bind="click: noClick">
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderListSystemItem.html b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderListSystemItem.html
index eb5d70f4f..ee5abc573 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderListSystemItem.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderListSystemItem.html
@@ -4,8 +4,8 @@
 		&nbsp;
 		<span class="name" data-bind="text: localName()"></span>
 		<span class="inbox-star-icon">
-			<i class="icon-star"></i>
-			<i class="icon-star-empty"></i>
+			<i class="fontastic flagged">★</i>
+			<i class="fontastic unflagged">☆</i>
 		</span>
 	</a>
 </div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageListItem.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageListItem.html
index af6907f1e..5f0438256 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageListItem.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageListItem.html
@@ -5,15 +5,9 @@
 	<div class="delimiter"></div>
 	<div class="wrapper">
 		<div class="flagParent">
-			<span class="flagOn">
-				<i class="icon-star"></i>
-			</span>
-			<span class="flagOnHalf">
-				<i class="icon-star-empty"></i>
-			</span>
-			<span class="flagOff">
-				<i class="icon-star-empty"></i>
-			</span>
+			<i class="flagOn fontastic">★</i>
+			<i class="flagOnHalf fontastic">☆</i>
+			<i class="flagOff fontastic">☆</i>
 		</div>
 		<div class="dateParent actionHandle">
 			<time class="date" data-moment-format="SHORT" data-moment-format-title="FULL" data-bind="moment: dateTimeStampInUTC"></time>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageListItemNoPreviewPane.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageListItemNoPreviewPane.html
index 364140942..749b200ef 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageListItemNoPreviewPane.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageListItemNoPreviewPane.html
@@ -17,15 +17,9 @@
 		</div>
 		<div class="checkboxMessage fontastic" data-bind="text: checked() ? '☑' : '☐'"></div>
 		<div class="flagParent">
-			<span class="flagOn">
-				<i class="icon-star"></i>
-			</span>
-			<span class="flagOnHalf">
-				<i class="icon-star-empty"></i>
-			</span>
-			<span class="flagOff">
-				<i class="icon-star-empty"></i>
-			</span>
+			<i class="flagOn fontastic">★</i>
+			<i class="flagOnHalf fontastic">☆</i>
+			<i class="flagOff fontastic">☆</i>
 		</div>
 		<div class="senderParent actionHandle">
 			<span class="replyFlag"><i class="fontastic">←</i>&nbsp;</span>
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 58d136e19..9f9b2da81 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
@@ -181,9 +181,7 @@
 							<span class="infoParent g-ui-user-select-none" data-bind="click: function() { showFullInfo(!showFullInfo()); }">
 								<i class="icon-info" style="padding-top: 1px;"></i>
 							</span>
-							<span class="flagParent g-ui-user-select-none">
-								<i class="icon-star-empty flagOff" data-bind="css: {'icon-star flagOn': viewIsFlagged, 'icon-star-empty flagOff': !viewIsFlagged()}" style="padding-top: 2px;"></i>
-							</span>
+							<span class="flagParent g-ui-user-select-none flagOff fontastic" data-bind="text: viewIsFlagged() ? '★' : '☆', css: {'flagOn': viewIsFlagged, 'flagOff': !viewIsFlagged()}"></span>
 							<b style="color: red; margin-right: 5px" data-bind="visible: viewIsImportant">!</b>
 							<span class="subject" data-bind="text: viewSubject, title: viewSubject, event: { 'dblclick': toggleFullScreen }"></span>
 							<span class="i18n emptySubjectText" data-i18n="MESSAGE/EMPTY_SUBJECT_TEXT" data-bind="event: { 'dblclick': toggleFullScreen }"></span>
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 4fb14771a..c11920460 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
@@ -2,11 +2,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 big': sending()}"></i>
-			<span class="i18n btn-text hide-on-mobile" data-i18n="COMPOSE/BUTTON_SEND"></span>
+			<span class="i18n 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 class="fontastic" data-bind="css: {'icon-spinner': saving(), 'icon-white': savedError()}">💾</i>
-			<span class="i18n btn-text hide-on-mobile" data-i18n="GLOBAL/SAVE"></span>
+			<span class="i18n hide-on-mobile" data-i18n="GLOBAL/SAVE"></span>
 		</a>
 
 		<a class="close" data-bind="click: tryToClosePopup, tooltip: 'GLOBAL/CANCEL'">×</a>
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 fe49184df..e9f5cdabc 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
@@ -7,7 +7,7 @@
 
 			<div class="btn-group">
 				<a class="btn button-create-contact" data-bind="command: newCommand">
-					<i class="icon-plus"></i>
+					<i class="fontastic">✚</i>
 					<span data-i18n="CONTACTS/BUTTON_ADD_CONTACT"></span>
 				</a>
 			</div>
@@ -49,7 +49,7 @@
 					</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>
+							<i class="fontastic" data-bind="css: {'icon-spinner': contacts.syncing}">⇆</i>
 							<span data-i18n="CONTACTS/BUTTON_SYNC"></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 bc79dfbea..89371fb17 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
@@ -39,7 +39,7 @@
 						</div>
 						<br />
 						<a class="btn" data-bind="click: addCondition, i18nInit: true">
-							<i class="icon-plus"></i>
+							<i class="fontastic">✚</i>
 							<span data-i18n="POPUPS_FILTER/BUTTON_ADD_CONDITION"></span>
 						</a>
 					</div>
@@ -52,7 +52,7 @@
 		</div>
 		<div class="modal-footer">
 			<a class="btn buttonSave" data-bind="command: saveFilterCommand">
-				<i class="icon-ok"></i>
+				<i class="fontastic">✔</i>
 				<span data-i18n="GLOBAL/DONE"></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 28deafef6..2a277d353 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
@@ -83,7 +83,7 @@
 					</tbody>
 				</table>
 				<a class="btn" data-bind="click: $root.addFilter">
-					<i class="icon-plus"></i>
+					<i class="fontastic">✚</i>
 					<span data-i18n="POPUPS_SIEVE_SCRIPT/BUTTON_ADD_FILTER"></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 1ae0d875d..d01eaa4ba 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
@@ -44,7 +44,7 @@
 				</tbody>
 			</table>
 			<a class="btn" data-bind="click: $root.addScript">
-				<i class="icon-plus"></i>
+				<i class="fontastic">✚</i>
 				<span data-i18n="SETTINGS_FILTERS/BUTTON_ADD_SCRIPT"></span>
 			</a>
 		</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionVacation.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionVacation.html
index 676d9cf75..a32df01fa 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionVacation.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionVacation.html
@@ -16,7 +16,7 @@
 		<input type="text" class="span5" data-bind="value: actionValueFourth"
 			data-i18n="[placeholder]POPUPS_FILTER/VACATION_RECIPIENTS_LABEL" />
 		<button class="btn setRecipientsBtn" data-bind="click: setRecipients">
-			<i class="icon-plus"></i>
+			<i class="fontastic">✚</i>
 		</button>
 	</div>
 </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 9a0c5d3ed..1770ce48b 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
@@ -32,7 +32,7 @@
 										<span data-bind="text: count, visible: 100 > count()"></span>
 										<span data-bind="visible: 99 < count()">99+</span>
 									</b>-->
-									<i class="icon-ok"></i>
+									<i class="fontastic">✔</i>
 									<i class="icon-user fontastic">👤</i>
 									<span class="email-title" data-bind="text: email, attr: {title: email}"></span>
 								</a>
@@ -42,7 +42,7 @@
 
 					<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>
+							<i class="fontastic">✚</i>
 							<span data-i18n="TOP_TOOLBAR/BUTTON_ADD_ACCOUNT"></span>
 						</a>
 					</li>
diff --git a/vendors/fontastic/fonts/snappymail.woff b/vendors/fontastic/fonts/snappymail.woff
index 5038c37bc..7996f1a9b 100644
Binary files a/vendors/fontastic/fonts/snappymail.woff and b/vendors/fontastic/fonts/snappymail.woff differ
diff --git a/vendors/fontastic/fonts/snappymail.woff2 b/vendors/fontastic/fonts/snappymail.woff2
index c088e8954..8b855ba5a 100644
Binary files a/vendors/fontastic/fonts/snappymail.woff2 and b/vendors/fontastic/fonts/snappymail.woff2 differ
diff --git a/vendors/fontastic/styles.css b/vendors/fontastic/styles.css
index 5cdd59a6a..c9508a1d4 100644
--- a/vendors/fontastic/styles.css
+++ b/vendors/fontastic/styles.css
@@ -22,11 +22,6 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-[class^="icon-"]::before,
-[class*=" icon-"]::before {
-  line-height: 1;
-}
-
 .icon-arrows-in::before {
   content: "\e000";
 }
@@ -48,26 +43,12 @@
 .icon-down-mini::before {
   content: "\e01f"; /* › rotate 90 */
 }
-.icon-star-empty::before {
-  content: "☆";
-}
-/*
-.icon-star-half::before {
-  content: "⯪";
-}
-*/
-.icon-star::before {
-  content: "★";
-}
 .icon-list-add::before {
   content: "\e024";
 }
 .icon-warning-alt::before {
   content: "\e02a";
 }
-.icon-plus::before {
-  content: "✚";
-}
 .icon-ok::before {
   content: "✔";
 }
@@ -107,9 +88,6 @@
 .icon-folder-add::before {
   content: "\e03c";
 }
-.icon-bolt::before {
-  content: "\e042";
-}
 .icon-download::before {
   content: "\e043";
 }
@@ -131,9 +109,6 @@
 .icon-filter::before {
   content: "\e061"; /* ⊆ */
 }
-.icon-sync::before {
-  content: "\e062"; /* ⤻⃔ 🔁 🔃 */
-}
 .icon-import::before {
   content: "\e066";
 }
@@ -156,6 +131,9 @@
   content: "\e073";
 }
 /*
+.icon-sync::before {
+  content: "⇆";
+}
 .icon-radio-checked::before {
   content: "⦿";
 }
@@ -282,4 +260,16 @@
 .icon-folder::before {
   content: "📁";
 }
+.icon-plus::before {
+  content: "✚";
+}
+.icon-star-empty::before {
+  content: "☆";
+}
+.icon-star-half::before {
+  content: "⯪";
+}
+.icon-star::before {
+  content: "★";
+}
 */