diff --git a/internal_packages/message-list/stylesheets/message-list.less b/internal_packages/message-list/stylesheets/message-list.less
index 6913839c8..ae65bfc1e 100644
--- a/internal_packages/message-list/stylesheets/message-list.less
+++ b/internal_packages/message-list/stylesheets/message-list.less
@@ -69,6 +69,7 @@
   }
   .message-subject {
     font-size: @font-size-large;
+    color: @text-color;
   }
   .message-count {
     float: right;
@@ -119,7 +120,7 @@
 
     margin: @message-spacing auto;
     padding: 0;
-    
+
     background: @background-primary;
     border: 0;
     box-shadow: 0 0 0.5px rgba(0, 0, 0, 0.28), 0 1px 1.5px rgba(0, 0, 0, 0.08);
diff --git a/static/variables/ui-variables.less b/static/variables/ui-variables.less
index 4b375ae52..8d9ee5aec 100644
--- a/static/variables/ui-variables.less
+++ b/static/variables/ui-variables.less
@@ -481,7 +481,7 @@
 @body-bg: @white;
 //== Panels and Sidebars
 @panel-background-color: @gray-lighter;
-@toolbar-background-color: @gray-lighter;
+@toolbar-background-color: darken(@white, 13%);
 
 // Helpers for Specs - Do Not Remove
 @spec-test-variable: rgb(152,123,0);
diff --git a/static/workspace.less b/static/workspace.less
index 6a34dd4ae..8577d750d 100644
--- a/static/workspace.less
+++ b/static/workspace.less
@@ -120,14 +120,17 @@ body.is-blurred {
       background-position: 0 -36px;
     }
   }
+  .sheet-toolbar-container {
+    background-image: -webkit-linear-gradient(top, lighten(@toolbar-background-color, 12%), lighten(@toolbar-background-color, 12%));
+    .btn.btn-toolbar img {
+      opacity:0.5;
+    }
+  }
 }
 
 .sheet-toolbar-container {
-  background: @toolbar-background-color;
-
-  &.mode-popout {
-    background: transparent;
-  }
+  background-image: -webkit-linear-gradient(top, lighten(@toolbar-background-color, 10.5%), @toolbar-background-color);
+  box-shadow: inset 0 1px 0 lighten(@toolbar-background-color, 15%);
 }
 
 .layout-mode-popout {
@@ -145,8 +148,7 @@ body.is-blurred {
 .sheet-toolbar {
   position: relative;
   -webkit-app-region: drag;
-  background: @toolbar-background-color;
-  border-bottom: 1px solid @border-color-divider;
+  border-bottom: 1px solid darken(@toolbar-background-color, 9%);
   width:  100%;
   height: 50px;