diff --git a/internal_packages/composer/stylesheets/composer.less b/internal_packages/composer/stylesheets/composer.less
index 792b1b40a..a36189d6a 100644
--- a/internal_packages/composer/stylesheets/composer.less
+++ b/internal_packages/composer/stylesheets/composer.less
@@ -279,8 +279,8 @@ body.platform-win32 {
   .composer-inner-wrap {
 
     .composer-action-bar-wrap {
-      background: #fcfcfc;
-      border-top: 1px solid #eaeaea;
+      background: darken(@background-primary, 1%);
+      border-top: 1px solid darken(@background-primary, 8%);
       box-shadow: inset 0 1px 2px rgba(0,0,0,0.03);
     }
 
diff --git a/internal_packages/ui-dark/styles/ui-variables.less b/internal_packages/ui-dark/styles/ui-variables.less
index 3ed26e7f2..90288a0a5 100644
--- a/internal_packages/ui-dark/styles/ui-variables.less
+++ b/internal_packages/ui-dark/styles/ui-variables.less
@@ -48,3 +48,7 @@ img.content-dark {
 img.content-light {
   -webkit-filter: invert(100%);
 }
+
+.popover {
+  border: 1px solid @border-primary-bg;
+}
diff --git a/static/workspace.less b/static/workspace.less
index c92d06dac..8b59c91f0 100644
--- a/static/workspace.less
+++ b/static/workspace.less
@@ -144,6 +144,7 @@ body.is-blurred {
   }
   .sheet-toolbar-container {
     background-image: -webkit-linear-gradient(top, lighten(@toolbar-background-color, 14%), lighten(@toolbar-background-color, 14%));
+
     .btn.btn-toolbar {
       background: none;
       img { opacity:0.5; }
@@ -159,6 +160,7 @@ body.is-blurred {
 .sheet-toolbar-container {
   background-image: -webkit-linear-gradient(top, lighten(@toolbar-background-color, 9%), @toolbar-background-color);
   box-shadow: inset 0 1px 0 lighten(@toolbar-background-color, 15%);
+  color:@text-color-heading;
 }
 
 .layout-mode-popout {