diff --git a/dev/Styles/Admin/Plugin.less b/dev/Styles/Admin/Plugin.less
index 52b1a8cd5..cb6c50b81 100644
--- a/dev/Styles/Admin/Plugin.less
+++ b/dev/Styles/Admin/Plugin.less
@@ -2,10 +2,6 @@
 
 	max-width: 660px;
 
-	.modal-body {
-		overflow: auto;
-	}
-
 	.information {
 		display: inline-block;
 		background-color: #ddd;
diff --git a/dev/Styles/User/Identity.less b/dev/Styles/User/Identity.less
index 055bb92b3..bc8d1210e 100644
--- a/dev/Styles/User/Identity.less
+++ b/dev/Styles/User/Identity.less
@@ -2,14 +2,9 @@
 
 	max-width: 770px;
 
-	.modal-body {
-		overflow: hidden;
-	}
-
 	.e-signature-place {
 		border: 1px solid #ccc;
 		border-radius: 3px;
-		height: 200px;
 	}
 
 	.textEmail {
diff --git a/dev/Styles/User/SquireUI.less b/dev/Styles/User/SquireUI.less
index b42f94701..a58c0d69a 100644
--- a/dev/Styles/User/SquireUI.less
+++ b/dev/Styles/User/SquireUI.less
@@ -148,10 +148,13 @@ Secondly, we can't rely on MUA's what to do with :empty
 	white-space: pre-wrap;
 	width: 100%;
 }
+
+.squire-mode-wysiwyg .squire-plain,
 .squire-mode-plain .squire-wysiwyg,
 .squire-mode-plain .btn-group:not(#squire-toolgroup-mode) {
 	display: none;
 }
+
 .squire-mode-plain .squire-plain {
 	display: block;
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php
index 1a588400e..141126028 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php
@@ -255,10 +255,7 @@ trait Accounts
 		$order = \json_decode($orderString, true) ?? [];
 		if (isset($order['Identities']) && \is_array($order['Identities']) && 1 < \count($order['Identities'])) {
 			$list = \array_map(function ($item) {
-				if ('' === $item) {
-					$item = '---';
-				}
-				return $item;
+				return ('' === $item) ? '---' : $item;
 			}, $order['Identities']);
 
 			\usort($identities, function ($a, $b) use ($list) {
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 edb7b4770..dc69f6cc9 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
@@ -65,20 +65,16 @@
 		</div>
 	</div>
 	<hr />
-	<div class="form-horizontal">
-		<div class="control-group g-ui-user-select-none">
-			<div class="controls" data-bind="component: {
-				name: 'Checkbox',
-				params: {
-					label: 'POPUPS_IDENTITY/LABEL_SIGNATURE_INSERT_BEFORE',
-					value: signatureInsertBefore
-				}
-			}"></div>
-		</div>
-		<div class="control-group">
-			<div class="e-signature-place" data-bind="editor: signature"></div>
-		</div>
+	<div class="control-group g-ui-user-select-none">
+		<div class="controls" data-bind="component: {
+			name: 'Checkbox',
+			params: {
+				label: 'POPUPS_IDENTITY/LABEL_SIGNATURE_INSERT_BEFORE',
+				value: signatureInsertBefore
+			}
+		}"></div>
 	</div>
+	<div class="e-signature-place" data-bind="editor: signature"></div>
 </div>
 <footer>
 	<a class="btn buttonAddIdentity" data-bind="command: addOrEditIdentityCommand">