diff --git a/dev/Styles/@Main.less b/dev/Styles/@Main.less
index 02d4ea1f6..824a606e7 100644
--- a/dev/Styles/@Main.less
+++ b/dev/Styles/@Main.less
@@ -13,9 +13,9 @@
 @import "../../vendors/bootstrap/less/button-groups.less";
 @import "../../vendors/bootstrap/less/alerts.less";
 @import "../../vendors/bootstrap/less/code.less";
-@import "../../vendors/bootstrap/less/utilities.less";
 @import "../../vendors/bootstrap/less/dropdowns.less";
 @import "../../vendors/bootstrap/less/navs.less";
+@import "../../vendors/bootstrap/less/utilities.less";
 
 @import "_FontasticToBoot.less";
 @import "_BootstrapFix.less";
diff --git a/dev/Styles/User/MessageList.less b/dev/Styles/User/MessageList.less
index 05f918987..e9d9f20a0 100644
--- a/dev/Styles/User/MessageList.less
+++ b/dev/Styles/User/MessageList.less
@@ -79,7 +79,7 @@ html.rl-no-preview-pane {
 
 	.checkboxCheckAll {
 		cursor: pointer;
-		margin: 0.5em 0.5em 0 0;
+		margin: 0.45em 0.5em 0 0;
 	}
 
 	.search-input-wrp {
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 478523709..ba6b919da 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
@@ -20,7 +20,7 @@
 			</div>
 
 			<div class="legend" data-i18n="POPUPS_FILTER/LEGEND_CONDITIONS"></div>
-			<div data-bind="visible: 1 < conditions().length">
+			<div class="control-group" data-bind="visible: 1 < conditions().length">
 				<select class="span4" data-bind="value: conditionsType">
 					<option value="Any"
 						data-i18n="POPUPS_FILTER/SELECT_MATCH_ANY"></option>
@@ -29,16 +29,21 @@
 				</select>
 			</div>
 			<div data-bind="visible: 0 < conditions().length, foreach: conditions">
-				<div data-bind="template: {'name': template(), 'data': $data}"></div>
+				<div class="control-group" data-bind="css: {'error': valueError}" style="display:flex">
+					<div style="flex-grow:1" data-bind="css: {'error': valueError}, template: {'name': template(), 'data': $data}"></div>
+					<span class="delete-action button-delete fontastic" style="margin-top: 5px;"
+						data-bind="click: function (oCondition) { $root.removeCondition(oCondition); }">🗑</span>
+				</div>
 			</div>
-			<div data-bind="visible: 0 === conditions().length"
+			<div class="control-group" data-bind="visible: 0 === conditions().length"
 				data-i18n="POPUPS_FILTER/ALL_INCOMING_MESSAGES_DESC"></div>
-			<br />
-			<a class="btn" data-bind="click: addCondition, i18nInit: true">
-				<i class="fontastic">✚</i>
-				<span data-i18n="POPUPS_FILTER/BUTTON_ADD_CONDITION"></span>
-			</a>
-			<br />
+			<div class="control-group">
+				<a class="btn" data-bind="click: addCondition, i18nInit: true">
+					<i class="fontastic">✚</i>
+					<span data-i18n="POPUPS_FILTER/BUTTON_ADD_CONDITION"></span>
+				</a>
+			</div>
+
 			<div class="legend" data-i18n="POPUPS_FILTER/LEGEND_ACTIONS"></div>
 			<select class="span3" data-bind="options: $root.actionTypeOptions, value: actionType, optionsText: 'name', optionsValue: 'id'"></select>
 			<div data-bind="template: {'name': actionTemplate()}, i18nUpdate: actionTemplate"></div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersConditionBody.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersConditionBody.html
index f093d725f..e95349649 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersConditionBody.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersConditionBody.html
@@ -1,10 +1,5 @@
-<div class="control-group" data-bind="css: {'error': valueError}" style="margin-bottom: 0">
-	<select class="span3" data-bind="options: $root.fieldOptions, value: field, optionsText: 'name', optionsValue: 'id'"></select>
-	&nbsp;
-	<select class="span2" data-bind="options: $root.typeOptionsBody, value: type, optionsText: 'name', optionsValue: 'id'"></select>
-	&nbsp;
-	<input class="span3" type="text" data-bind="value: value" />
-	&nbsp;
-	<span class="delete-action button-delete pull-right fontastic" style="margin-top: 5px;"
-		data-bind="click: function (oCondition) { $root.removeCondition(oCondition); }">🗑</span>
-</div>
+<select class="span3" data-bind="options: $root.fieldOptions, value: field, optionsText: 'name', optionsValue: 'id'"></select>
+&nbsp;
+<select class="span2" data-bind="options: $root.typeOptionsBody, value: type, optionsText: 'name', optionsValue: 'id'"></select>
+&nbsp;
+<input class="span3" type="text" data-bind="value: value" />
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersConditionDefault.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersConditionDefault.html
index baf0510a9..cd24934c6 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersConditionDefault.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersConditionDefault.html
@@ -1,10 +1,5 @@
-<div class="control-group" data-bind="css: {'error': valueError}" style="margin-bottom: 0">
-	<select class="span3" data-bind="options: $root.fieldOptions, value: field, optionsText: 'name', optionsValue: 'id'"></select>
-	&nbsp;
-	<select class="span2" data-bind="options: $root.typeOptions, value: type, optionsText: 'name', optionsValue: 'id'"></select>
-	&nbsp;
-	<input class="span3" type="text" data-bind="value: value" />
-	&nbsp;
-	<span class="delete-action button-delete pull-right fontastic" style="margin-top: 5px;"
-		data-bind="click: function (oCondition) { $root.removeCondition(oCondition); }">🗑</span>
-</div>
+<select class="span3" data-bind="options: $root.fieldOptions, value: field, optionsText: 'name', optionsValue: 'id'"></select>
+&nbsp;
+<select class="span2" data-bind="options: $root.typeOptions, value: type, optionsText: 'name', optionsValue: 'id'"></select>
+&nbsp;
+<input class="span3" type="text" data-bind="value: value" />
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersConditionMore.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersConditionMore.html
index b5abc4c46..5aa0bda95 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersConditionMore.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersConditionMore.html
@@ -1,12 +1,7 @@
-<div class="control-group" data-bind="css: {'error': valueError}" style="margin-bottom: 0">
-	<select class="span2" data-bind="options: $root.fieldOptions, value: field, optionsText: 'name', optionsValue: 'id'"></select>
-	&nbsp;
-	<input class="span2" type="text" data-bind="value: valueSecond" />
-	&nbsp;
-	<select class="span2" data-bind="options: $root.typeOptions, value: type, optionsText: 'name', optionsValue: 'id'"></select>
-	&nbsp;
-	<input class="span3" type="text" data-bind="value: value" />
-	&nbsp;
-	<span class="delete-action button-delete pull-right fontastic" style="margin-top: 5px;"
-		data-bind="click: function (oCondition) { $root.removeCondition(oCondition); }">🗑</span>
-</div>
+<select class="span2" data-bind="options: $root.fieldOptions, value: field, optionsText: 'name', optionsValue: 'id'"></select>
+&nbsp;
+<input class="span2" type="text" data-bind="value: valueSecond" />
+&nbsp;
+<select class="span2" data-bind="options: $root.typeOptions, value: type, optionsText: 'name', optionsValue: 'id'"></select>
+&nbsp;
+<input class="span3" type="text" data-bind="value: value" />
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersConditionSize.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersConditionSize.html
index 8c4bf0722..9752bff25 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersConditionSize.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersConditionSize.html
@@ -1,10 +1,5 @@
-<div class="control-group" data-bind="css: {'error': valueError}" style="margin-bottom: 0">
-	<select class="span3" data-bind="options: $root.fieldOptions, value: field, optionsText: 'name', optionsValue: 'id'"></select>
-	&nbsp;
-	<select class="span2" data-bind="options: $root.typeOptionsSize, value: type, optionsText: 'name', optionsValue: 'id'"></select>
-	&nbsp;
-	<input class="span3" type="text" data-bind="value: value" />
-	&nbsp;
-	<span class="delete-action button-delete pull-right fontastic" style="margin-top: 5px;"
-		data-bind="click: function (oCondition) { $root.removeCondition(oCondition); }">🗑</span>
-</div>
+<select class="span3" data-bind="options: $root.fieldOptions, value: field, optionsText: 'name', optionsValue: 'id'"></select>
+&nbsp;
+<select class="span2" data-bind="options: $root.typeOptionsSize, value: type, optionsText: 'name', optionsValue: 'id'"></select>
+&nbsp;
+<input class="span3" type="text" data-bind="value: value" />
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 1e4240ad8..e97a4cd18 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
@@ -30,7 +30,9 @@
 				<span class="open-pgp-key-user" data-bind="foreach: users">
 					<div class="open-pgp-key-user-address" data-bind="text: $data"></div>
 				</span>
-				<a class="btn btn-small btn-small-small btn-danger pull-right button-confirm-delete" data-bind="css: {'delete-access': deleteAccess()}, click: function(openPgpKey) { $root.deleteOpenPgpKey(openPgpKey); }"
+			</td>
+			<td>
+				<a class="btn btn-small btn-small-small btn-danger button-confirm-delete" data-bind="css: {'delete-access': deleteAccess()}, click: function(openPgpKey) { $root.deleteOpenPgpKey(openPgpKey); }"
 					data-i18n="GLOBAL/ARE_YOU_SURE"></a>
 			</td>
 			<td>
@@ -47,7 +49,9 @@
 						<span data-bind="text: $data"></span> (<span class="open-pgp-key-id" data-bind="text: $parent.id"></span>)
 					</div>
 				</span>
-				<a class="btn btn-small btn-small-small btn-danger pull-right button-confirm-delete" data-bind="css: {'delete-access': deleteAccess()}, click: function(oOpenPGP) { $root.deleteOpenPgpKey(oOpenPGP); }"
+			</td>
+			<td>
+				<a class="btn btn-small btn-small-small btn-danger button-confirm-delete" data-bind="css: {'delete-access': deleteAccess()}, click: function(oOpenPGP) { $root.deleteOpenPgpKey(oOpenPGP); }"
 					data-i18n="GLOBAL/ARE_YOU_SURE"></a>
 			</td>
 			<td>