diff --git a/dev/Styles/Compose.less b/dev/Styles/Compose.less
index 5cab01450..9caa115e8 100644
--- a/dev/Styles/Compose.less
+++ b/dev/Styles/Compose.less
@@ -20,10 +20,10 @@
 	.attachmentAreaParent {
 		border-top: 1px solid #ccc;
 		overflow-y: auto;
-		padding: 10px 10px 6px 10px;
+		padding: 10px;
 
 		.no-attachments-desc {
-			padding: 50px 10px;
+			padding-top: 50px;
 			text-align: center;
 			font-size: 24px;
 			color: #666;
@@ -38,7 +38,6 @@
 
 	.b-header-toolbar {
 
-		color: #fff;
 		background-color: rgba(0,0,0,0.8);
 
 		.close, .minimize-custom {
@@ -72,23 +71,17 @@
 	.b-header {
 
 		padding: 10px;
-		background-color: #eee;
-		color: #333;
+		background-color: rgba(128,128,128,0.2);;
 
 		.e-identity {
 
-			color: #333;
+			color: var(--main-color);
 			text-decoration: none;
 			font-weight: bold;
 
-			&:hover {
-				color: #333;
-				text-decoration: none;
-			}
-
 			&.multiply {
 				cursor: pointer;
-				border-bottom: 1px dashed #555;
+				border-bottom: 1px dashed var(--main-color);
 			}
 		}
 
diff --git a/dev/Styles/SquireUI.less b/dev/Styles/SquireUI.less
index aa99ec2f8..e7f28dbfd 100644
--- a/dev/Styles/SquireUI.less
+++ b/dev/Styles/SquireUI.less
@@ -2,7 +2,6 @@
 .squire-toolbar {
 	padding: 2px;
 	border-bottom: 1px solid #b6b6b6;
-	background: #EEE;
 	overflow-x: auto;
 	overflow-y: hidden;
 	white-space: nowrap;
@@ -161,6 +160,7 @@ Secondly, we can't rely on MUA's what to do with :empty
 	display: none;
 }
 .rl-mobile .squire-toolbar {
+	background: #EEE;
 	padding: 1px;
 	position: fixed;
 	bottom: 0;
diff --git a/snappymail/v/0.0.0/themes/SquaresDark/styles.less b/snappymail/v/0.0.0/themes/SquaresDark/styles.less
index fcd97484b..2204029fc 100644
--- a/snappymail/v/0.0.0/themes/SquaresDark/styles.less
+++ b/snappymail/v/0.0.0/themes/SquaresDark/styles.less
@@ -49,13 +49,13 @@
 .thm-message-list-top-toolbar, .thm-message-list-bottom-toolbar {
     background-image: linear-gradient(to bottom,#444,#111) !important;
     background-repeat: repeat-x !important;
-	color: #fff;
+	color: var(--main-color);
 }
 
 .btn:not(.btn-success):not(.btn-warning):not(.btn-danger) {
 	border-color: rgba(255,255,255,.15) rgba(255,255,255,.15) rgba(255,255,255,.25);
 	box-shadow: inset 0 1px 0 rgba(0,0,0,.2), 0 1px 2px rgba(255,255,255,.05);
-	color: #fff;
+	color: var(--main-color);
 	text-shadow: 0 -1px 0 rgba(255,255,255,.25);
 	background-color: #000;
 }
@@ -68,7 +68,7 @@
     border-top-color: #ccc;
 }
 .btn .caret {
-	border-top-color: #fff;
+	border-top-color: var(--main-color);
 }
 
 .messageList .b-message-list-wrapper {
@@ -80,10 +80,11 @@
 .b-settins-right .b-content,
 .messageList .b-content,
 .messageView .b-content,
-.b-admin-right .b-content {
+.b-admin-right .b-content,
+.b-compose .b-attachment-place {
 	background-color: #000;
 	border-color: #555;
-	color: #fff;
+	color: var(--main-color);
 }
 
 .legend,
@@ -95,13 +96,12 @@
 .legend,
 .b-compose .b-header .e-identity,
 .messageView .messageItem {
-	color: #fff;
+	color: var(--main-color);
 }
 
-.b-compose .b-header,
-.squire-toolbar {
+.rl-mobile .squire-toolbar,
+.b-compose .b-attachment-place.dragAndDropOver {
 	background-color: #222;
-	color: #fff;
 }
 
 .g-ui-link,
@@ -137,7 +137,7 @@
 }
 .nav-tabs > .active > a,
 .nav-tabs > .active > a:hover {
-    color: #fff;
+    color: var(--main-color);
     background-color: #000;
 }