diff --git a/dev/Styles/AdminGeneral.less b/dev/Styles/AdminGeneral.less
index d3f3719f1..79bb229a1 100644
--- a/dev/Styles/AdminGeneral.less
+++ b/dev/Styles/AdminGeneral.less
@@ -1,12 +1,13 @@
 
 .b-admin-general {
-	
+
 	.flag-selector {
 		padding-top: 5px;
 	}
 
 	.flag-name {
 		border-bottom: 1px dashed #555;
+		cursor: pointer;
 	}
 }
 
diff --git a/dev/Styles/Components.less b/dev/Styles/Components.less
index 58781d4ea..750f9fd7d 100644
--- a/dev/Styles/Components.less
+++ b/dev/Styles/Components.less
@@ -70,16 +70,16 @@
 			height: 18px;
 			vertical-align: bottom;
 			margin-bottom: 3px;
-			margin-top: 1px;
 		}
 
 		.sub-label {
-			padding-left: 8px;
+			padding-left: 12px;
 		}
 
 		.sub-checkbox {
 			position: absolute;
 			box-sizing: border-box;
+			margin-top: 1px;
 
 			.checkbox-box-sizes();
 		}
diff --git a/dev/Styles/SettingsGeneral.less b/dev/Styles/SettingsGeneral.less
index 4c82170e3..7d4a236be 100644
--- a/dev/Styles/SettingsGeneral.less
+++ b/dev/Styles/SettingsGeneral.less
@@ -1,25 +1,26 @@
-
-.b-settings-general {
-
-	.notification-desc-denied {
-		color: #999;
-		display: none;
-	}
-
-	.denied-by-browser {
-		.notification-desc-denied {
-			display: inline;
-		}
-		.notification-desc {
-			color: #999;
-		}
-	}
-
-	.flag-selector {
-		padding-top: 5px;
-	}
-
-	.flag-name {
-		border-bottom: 1px dashed #555;
-	}
-}
+
+.b-settings-general {
+
+	.notification-desc-denied {
+		color: #999;
+		display: none;
+	}
+
+	.denied-by-browser {
+		.notification-desc-denied {
+			display: inline;
+		}
+		.notification-desc {
+			color: #999;
+		}
+	}
+
+	.flag-selector {
+		padding-top: 5px;
+	}
+
+	.flag-name {
+		border-bottom: 1px dashed #555;
+		cursor: pointer;
+	}
+}
diff --git a/dev/Styles/_FontasticToBoot.less b/dev/Styles/_FontasticToBoot.less
index ad6c9df3d..4f06b2711 100644
--- a/dev/Styles/_FontasticToBoot.less
+++ b/dev/Styles/_FontasticToBoot.less
@@ -70,6 +70,7 @@
 	line-height: 20px;
 }
 
+/*
 @keyframes rotation {
 	to   {transform: rotate(1turn);}
 }
@@ -86,19 +87,56 @@
 		line-height: 100%;
 	}
 }
+*/
+
+@keyframes rotation {
+	to   {transform: rotate(1turn);}
+}
+
+.icon-spinner {
+
+	font-family: Arial;
+
+	&:before {
+		content: "";
+	}
+
+	height: 11px;
+	width: 11px;
+
+	margin-right: -1px;
+	background: none;
+
+	border: 3px solid #aaa;
+	border-top-color: #333;
+	border-radius: 100%;
+
+	animation: none;
+
+	&.animated {
+		border-color: transparent;
+		border-top-color: #999;
+
+		animation: rotation .8s infinite linear;
+	}
+}
 
 html.no-cssanimations .icon-spinner {
+	background: none;
 	background-image: url('@{rlSyncFileStop}');
 	background-repeat: no-repeat;
+
+	border: none;
+	box-shadow: none;
+	height: 16px;
+	width: 16px;
+
 	font-family: Arial;
 	&:before {
 		content: "";
 	}
 	&.animated {
+		background: none;
 		background-image: url('@{rlSyncFile}');
 	}
 }
-
-html.cssanimations .icon-spinner.animated:before {
-	animation: rotation 1s infinite steps(40);
-}
diff --git a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html
index b11fc30ee..74643d8be 100644
--- a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html
+++ b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html
@@ -18,7 +18,7 @@
 				Language
 			</label>
 			<div class="controls">
-				<label class="flag-selector">
+				<div class="flag-selector">
 					<span class="flag-wrapper">
 						<span data-bind="css: 'flag flag-' + mainLanguage()" style=""></span>
 					</span>
@@ -28,7 +28,7 @@
 						name: 'SaveTrigger',
 						params: { value: languageTrigger }
 					}"></div>
-				</label>
+				</div>
 			</div>
 		</div>
 		<div class="control-group">
diff --git a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html
index 2e0710127..d167c8472 100644
--- a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html
+++ b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html
@@ -36,7 +36,7 @@
 					params: { value: verifySslCertificate, label: 'Require verification of SSL certificate used (IMAP/SMTP)', inline: true }
 				}"></div>
 				&nbsp;&nbsp;
-				<span style="color:red">(beta)</span>
+				<span style="color:red">(unstable)</span>
 			</div>
 		</div>
 		<div class="control-group">
diff --git a/rainloop/v/0.0.0/app/templates/Views/Components/Checkbox.html b/rainloop/v/0.0.0/app/templates/Views/Components/Checkbox.html
index 0172d430e..b00a75f1e 100644
--- a/rainloop/v/0.0.0/app/templates/Views/Components/Checkbox.html
+++ b/rainloop/v/0.0.0/app/templates/Views/Components/Checkbox.html
@@ -1,10 +1,10 @@
-<label class="e-component e-checkbox" data-bind="click: click, css: {'inline': inline, 'disabled': disable() || !enable() }">
+<label class="e-component e-checkbox inline" data-bind="click: click, css: { 'disabled': disable() || !enable() }">
 	<i data-bind="css: value() ?
 	   (inverted ? 'icon-checkbox-unchecked' : 'icon-checkbox-checked') :
 	   (inverted ? 'icon-checkbox-checked' : 'icon-checkbox-unchecked')
 	"></i>
 <!-- ko if: labeled -->
-	&nbsp;
+	&nbsp;&nbsp;
 	<span class="sub-label i18n" data-bind="attr: {'data-i18n-text': label}"></span>
 <!-- /ko -->
 </label>
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/app/templates/Views/Components/CheckboxClassic.html b/rainloop/v/0.0.0/app/templates/Views/Components/CheckboxClassic.html
index d6e98a7ed..4169e29fc 100644
--- a/rainloop/v/0.0.0/app/templates/Views/Components/CheckboxClassic.html
+++ b/rainloop/v/0.0.0/app/templates/Views/Components/CheckboxClassic.html
@@ -1,5 +1,5 @@
-<label class="e-component e-checkbox" data-bind="css: {'inline': inline, 'disabled': disable() || !enable() }">
-	<input type="checkbox" data-bind="checked: value, disable: disable() || !enable()" />
+<label class="e-component e-checkbox inline" data-bind="css: { 'disabled': disable() || !enable() }">
+	<input type="checkbox" data-bind="checked: value, disable: disable() || !enable()" style="margin: 0 0 1px 0;" />
 <!-- ko if: labeled -->
 	&nbsp;&nbsp;
 	<span class="sub-label i18n" data-bind="attr: {'data-i18n-text': label}"></span>
diff --git a/rainloop/v/0.0.0/app/templates/Views/Components/CheckboxMaterialDesign.html b/rainloop/v/0.0.0/app/templates/Views/Components/CheckboxMaterialDesign.html
index 196dbccec..df3391cca 100644
--- a/rainloop/v/0.0.0/app/templates/Views/Components/CheckboxMaterialDesign.html
+++ b/rainloop/v/0.0.0/app/templates/Views/Components/CheckboxMaterialDesign.html
@@ -1,11 +1,10 @@
-<label class="e-component e-checkbox material-design" data-bind="click: click, css: {'inline': inline, 'disabled': disable() || !enable() }">
+<label class="e-component e-checkbox material-design inline" data-bind="click: click, css: { 'disabled': disable() || !enable() }">
 	<div class="sub-checkbox-container">
 		<div class="sub-checkbox" data-bind="css: {'checked': (value() && !inverted) || (!value() && inverted),
 			'unchecked': (!value() && !inverted) || (value() && inverted),
 			'box': animationBox, 'checkmark': animationCheckmark}"></div>
 	</div>
 <!-- ko if: labeled -->
-	&nbsp;
 	<span class="sub-label i18n" data-bind="attr: {'data-i18n-text': label}"></span>
 <!-- /ko -->
 </label>
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/SettingsGeneral.html b/rainloop/v/0.0.0/app/templates/Views/User/SettingsGeneral.html
index e5001f7e5..419d03a22 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/SettingsGeneral.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/SettingsGeneral.html
@@ -8,7 +8,7 @@
 				<span class="i18n" data-i18n-text="SETTINGS_GENERAL/LABEL_LANGUAGE"></span>
 			</label>
 			<div class="controls">
-				<label class="flag-selector">
+				<div class="flag-selector">
 					<span class="flag-wrapper">
 						<span data-bind="css: 'flag flag-' + mainLanguage()" style=""></span>
 					</span>
@@ -18,11 +18,11 @@
 						name: 'SaveTrigger',
 						params: { value: languageTrigger }
 					}"></div>
-				</label>
+				</div>
 			</div>
 		</div>
 		<div class="control-group">
-			<label class="control-label" style="padding-top: 0;">
+			<label class="control-label">
 			   <span class="i18n" data-i18n-text="SETTINGS_GENERAL/LABEL_EDITOR"></span>
 			</label>
 			<div class="controls">
@@ -39,7 +39,7 @@
 			</div>
 		</div>
 		<div class="control-group">
-			<label class="control-label" style="padding-top: 0;">
+			<label class="control-label">
 			   <span class="i18n" data-i18n-text="SETTINGS_GENERAL/LABEL_LAYOUT"></span>
 			</label>
 			<div class="controls">
diff --git a/webpack.config.js b/webpack.config.js
index 10eb01e2e..fa6f6529f 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -25,22 +25,22 @@ module.exports = {
 	},
 	externals: {
 		'window': 'window',
-		'JSON': 'JSON',
+		'JSON': 'window.JSON',
 		'JSEncrypt': 'window.JSEncrypt',
 		'$LAB': 'window.$LAB',
 		'SimplePace': 'window.SimplePace',
 		'PhotoSwipe': 'window.PhotoSwipe',
 		'PhotoSwipeUI_Default': 'window.PhotoSwipeUI_Default',
 		'queue': 'window.queue',
-		'moment': 'moment',
-		'ifvisible': 'ifvisible',
-		'crossroads': 'crossroads',
-		'hasher': 'hasher',
-		'Jua': 'Jua',
-		'Autolinker': 'Autolinker',
-		'ssm': 'ssm',
-		'key': 'key',
-		'_': '_',
-		'$': 'jQuery'
+		'moment': 'window.moment',
+		'ifvisible': 'window.ifvisible',
+		'crossroads': 'window.crossroads',
+		'hasher': 'window.hasher',
+		'Jua': 'window.Jua',
+		'Autolinker': 'window.Autolinker',
+		'ssm': 'window.ssm',
+		'key': 'window.key',
+		'_': 'window._',
+		'$': 'window.jQuery'
 	}
 };
\ No newline at end of file