diff --git a/skins/elastic/styles/colors.less b/skins/elastic/styles/colors.less
index 4bac88c35..15dd09a25 100644
--- a/skins/elastic/styles/colors.less
+++ b/skins/elastic/styles/colors.less
@@ -28,6 +28,7 @@
 
 // Layout elements
 @color-layout-border:               @color-black-shade-border;
+@color-layout-header:               @color-font;
 @color-layout-sidebar-background:   #fff;
 @color-layout-list-background:      #fff;
 @color-layout-content-background:   #fff;
@@ -108,9 +109,9 @@
 @color-message-error:               @color-error;
 @color-message-loading:             #333;
 @color-message-shadow:              @color-black-shade-bg;
-@color-message-error-background:    fadeout(@color-message-error, 95%);
-@color-message-information-background: fadeout(@color-message-information, 95%);
-@color-message-success-background:  fadeout(@color-message-success, 95%);
+@color-message-error-background:    fadeout(@color-message-error, 85%);
+@color-message-information-background: fadeout(@color-message-information, 85%);
+@color-message-success-background:  fadeout(@color-message-success, 85%);
 @color-message-warning-background:  fadeout(#ffff66, 75%);
 
 
@@ -126,7 +127,7 @@
 
 // Dialogs
 @color-dialog-overlay-background:   fade(@color-font, 50%);
-@color-dialog-header:               @color-font;
+@color-dialog-header:               @color-layout-header;
 @color-dialog-header-border:        @color-border;
 
 
@@ -162,7 +163,7 @@
 @color-btn-danger:                  #fff;
 @color-btn-danger-background:       @color-error;
 
-@color-quota-background:            @color-black-shade-border;
+@color-quota-background:            @color-black-shade-bg;
 @color-quota-text:                  @color-black-shade-text;
 @color-quota-value:                 @color-main;
 @color-quota-value-warning:         @color-error;
diff --git a/skins/elastic/styles/layout.less b/skins/elastic/styles/layout.less
index 1424e8697..642ae9088 100644
--- a/skins/elastic/styles/layout.less
+++ b/skins/elastic/styles/layout.less
@@ -133,6 +133,7 @@ body > #layout {
 
         & > .header {
             border-bottom: 1px solid @color-layout-border;
+            color: @color-layout-header;
 
             .header-title {
                 .overflow-ellipsis;
diff --git a/skins/elastic/styles/widgets/mail.less b/skins/elastic/styles/widgets/mail.less
index 38ef6d54b..8ed9886ee 100644
--- a/skins/elastic/styles/widgets/mail.less
+++ b/skins/elastic/styles/widgets/mail.less
@@ -205,8 +205,8 @@
     padding: .5rem 0;
     margin: .5rem 0 0 0;
     font-size: 90%;
-    border-top: 1px solid lighten(@color-mail-headers, 50%);
-    border-bottom: 1px solid lighten(@color-mail-headers, 50%);
+    border-top: 1px solid @color-list-border;
+    border-bottom: 1px solid @color-list-border;
     color: @color-mail-headers;
 
     .header-title {
diff --git a/skins/elastic/styles/widgets/messages.less b/skins/elastic/styles/widgets/messages.less
index a09a29fd2..3e0b12618 100644
--- a/skins/elastic/styles/widgets/messages.less
+++ b/skins/elastic/styles/widgets/messages.less
@@ -139,7 +139,7 @@
     }
 
     &.boxinformation {
-        background-color: @color-message-background;
+        background-color: @color-message-information-background;
     }
 
     &.boxconfirmation {
diff --git a/skins/elastic/styles/widgets/toolbar.less b/skins/elastic/styles/widgets/toolbar.less
index e070f60b6..b874d0b42 100644
--- a/skins/elastic/styles/widgets/toolbar.less
+++ b/skins/elastic/styles/widgets/toolbar.less
@@ -738,4 +738,8 @@ html.ie11 .toolbar .dropbutton a.dropdown:before {
             flex-grow: 1;
         }
     }
+
+    .toolbar.listing a {
+        color: @color-font;
+    }
 }