diff --git a/dev/Styles/User/EmailAddresses.less b/dev/Styles/User/EmailAddresses.less
index 7770ec42a..12015fbbc 100644
--- a/dev/Styles/User/EmailAddresses.less
+++ b/dev/Styles/User/EmailAddresses.less
@@ -13,7 +13,6 @@
 }
 
 .emailaddresses.emailaddresses-focused {
-	background-color: #fff;
 	border: 1px solid darken(@inputBorder, 20%);
 	box-shadow: none;
 }
@@ -72,7 +71,7 @@
 	height: auto;
 	line-height: inherit;
 	margin: 0;
-	padding: 0;
+	padding: 4px;
 	vertical-align: baseline;
 }
 
diff --git a/dev/Styles/User/FolderList.less b/dev/Styles/User/FolderList.less
index eda2897e0..8b1ef676c 100644
--- a/dev/Styles/User/FolderList.less
+++ b/dev/Styles/User/FolderList.less
@@ -60,8 +60,7 @@
 
 	hr {
 		margin: 10px;
-		border-top: 0;
-		border-bottom: 1px solid #999;
+		border-color: #999;
 	}
 
 	li {
diff --git a/dev/Styles/User/SettingsGeneral.less b/dev/Styles/User/SettingsGeneral.less
index ff695dbe1..283fe0312 100644
--- a/dev/Styles/User/SettingsGeneral.less
+++ b/dev/Styles/User/SettingsGeneral.less
@@ -1,4 +1,9 @@
 
 .b-settings-general {
-
+	.editMainIdentity {
+		border-bottom: 1px dashed #555;
+		cursor: pointer;
+		display: inline-block;
+		padding: 5px 0;
+	}
 }
diff --git a/dev/Styles/User/SquireUI.less b/dev/Styles/User/SquireUI.less
index 6f1fd50c5..c112f6fc4 100644
--- a/dev/Styles/User/SquireUI.less
+++ b/dev/Styles/User/SquireUI.less
@@ -137,7 +137,6 @@ Secondly, we can't rely on MUA's what to do with :empty
 */
 
 .squire-plain {
-	background-color: #fff;
 	border: 0;
 	border-radius: 0;
 	display: none;
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html
index 7d6a0a66e..d6e7b006a 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html
@@ -4,10 +4,7 @@
 		<div class="control-group">
 			<label class="control-label" data-i18n="SETTINGS_GENERAL/LABEL_IDENTITY"></label>
 			<div class="controls">
-				<div style="display: inline-block; margin-top: 5px">
-					<b data-bind="click: editMainIdentity, text: identityMainDesc"
-						style="border-bottom: 1px dashed #555; cursor: pointer; padding: 2px 0px;"></b>
-				</div>
+				<b class="editMainIdentity" data-bind="click: editMainIdentity, text: identityMainDesc"></b>
 			</div>
 		</div>
 		<div class="control-group" data-bind="visible: allowLanguagesOnSettings">
diff --git a/snappymail/v/0.0.0/themes/SquaresDark/styles.css b/snappymail/v/0.0.0/themes/SquaresDark/styles.css
index 115ccf1c9..c506caf9e 100644
--- a/snappymail/v/0.0.0/themes/SquaresDark/styles.css
+++ b/snappymail/v/0.0.0/themes/SquaresDark/styles.css
@@ -148,8 +148,19 @@
 	color: #000;
 }
 
-.select, select {
-    background: #000 url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' height='10px' width='15px'><text x='0' y='10' fill='rgb(255,255,255)'>▾</text></svg>") right center/1em no-repeat border-box;
+input, textarea, .select, select, .emailaddresses {
+    background-color: #000;
     border-color: #aaa;
     color: #fff;
 }
+.select, select {
+    background-image: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' height='10px' width='15px'><text x='0' y='10' fill='rgb(255,255,255)'>▾</text></svg>");
+}
+
+hr {
+	border-color: #666;
+}
+
+.b-settings-general .editMainIdentity {
+    border-color: #999;
+}
diff --git a/vendors/bootstrap/less/forms.less b/vendors/bootstrap/less/forms.less
index f9b4b83c7..a84b05e6e 100644
--- a/vendors/bootstrap/less/forms.less
+++ b/vendors/bootstrap/less/forms.less
@@ -91,7 +91,6 @@ input {
 
   // Focus state
   &:focus {
-    background-color: #fff;
     border-color: darken(@inputBorder, 20%);
     box-shadow: none;
   }
diff --git a/vendors/bootstrap/less/type.less b/vendors/bootstrap/less/type.less
index 8544c79be..83f23d61d 100644
--- a/vendors/bootstrap/less/type.less
+++ b/vendors/bootstrap/less/type.less
@@ -72,8 +72,7 @@ li {
 hr {
   margin: @baseLineHeight 0;
   border: 0;
-  border-top: 1px solid @hrBorder;
-  border-bottom: 1px solid @white;
+  border-bottom: 1px solid @hrBorder;
   box-sizing: content-box;
   height: 0;
 }