diff --git a/css/mail.scss b/css/mail.scss
index ffef960b49..f3df46f37c 100755
--- a/css/mail.scss
+++ b/css/mail.scss
@@ -299,8 +299,8 @@
 }
 
 .transparency {
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
-	opacity: .5;
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)";
+	opacity: .6;
 }
 
 
@@ -328,25 +328,25 @@
 
 /* icons */
 .icon-inbox {
-	background-image: url('../img/inbox.svg');
+	@include icon-color('inbox', 'mail', $color-black);
 }
 .icon-flagged {
-	background-image: url('../img/star.svg');
+	@include icon-color('star', 'mail', $color-black);
 }
 .icon-drafts {
-	background-image: url('../img/drafts.svg');
+	@include icon-color('drafts', 'mail', $color-black);
 }
 .icon-sent {
-	background-image: url('../img/sent.svg');
+	@include icon-color('sent', 'mail', $color-black);
 }
 .icon-archive {
-	background-image: url('../img/archive.svg');
+	@include icon-color('archive', 'mail', $color-black);
 }
 .icon-junk {
-	background-image: url('../img/junk.svg');
+	@include icon-color('junk', 'mail', $color-black);
 }
 .icon-trash {
-	background-image: url('../img/trash.svg');
+	@include icon-color('trash', 'mail', $color-black);
 }
 
 
diff --git a/src/components/Composer.vue b/src/components/Composer.vue
index 99b14a6372..0a7a8e68b7 100644
--- a/src/components/Composer.vue
+++ b/src/components/Composer.vue
@@ -376,7 +376,7 @@
 	.composer-fields {
 		display: flex;
 		align-items: center;
-		border-top: 1px solid #eee;
+		border-top: 1px solid var(--color-border);
 		padding-right: 30px;
 	}
 	.composer-fields .multiselect,
diff --git a/src/components/Message.vue b/src/components/Message.vue
index 0ea5b48f8c..d2a313f58c 100644
--- a/src/components/Message.vue
+++ b/src/components/Message.vue
@@ -256,11 +256,10 @@
 	}
 
 	#mail-message-header .transparency {
-		color: rgba(0, 0, 0, .3) !important;
-		opacity: 1;
+		opacity: .6;
 	}
 
 	#mail-message-header .transparency a {
-		color: rgba(0, 0, 0, .5) !important;
+		font-weight: bold;
 	}
 </style>