diff --git a/src/plugins/kibana_react/public/code_editor/editor_theme.ts b/src/plugins/kibana_react/public/code_editor/editor_theme.ts
index 91d66ce8cbf81..57d1d715151b7 100644
--- a/src/plugins/kibana_react/public/code_editor/editor_theme.ts
+++ b/src/plugins/kibana_react/public/code_editor/editor_theme.ts
@@ -35,7 +35,7 @@ export function createTheme(
       {
         token: '',
         foreground: euiTheme.euiColorDarkestShade,
-        background: euiTheme.euiColorEmptyShade,
+        background: euiTheme.euiFormBackgroundColor,
       },
       { token: 'invalid', foreground: euiTheme.euiColorAccent },
       { token: 'emphasis', fontStyle: 'italic' },
@@ -94,7 +94,7 @@ export function createTheme(
     ],
     colors: {
       'editor.foreground': euiTheme.euiColorDarkestShade,
-      'editor.background': euiTheme.euiColorEmptyShade,
+      'editor.background': euiTheme.euiFormBackgroundColor,
       'editorLineNumber.foreground': euiTheme.euiColorDarkShade,
       'editorLineNumber.activeForeground': euiTheme.euiColorDarkShade,
       'editorIndentGuide.background': euiTheme.euiColorLightShade,
diff --git a/x-pack/plugins/canvas/public/components/expression/expression.scss b/x-pack/plugins/canvas/public/components/expression/expression.scss
index 1635446a74012..da95eca2b4f61 100644
--- a/x-pack/plugins/canvas/public/components/expression/expression.scss
+++ b/x-pack/plugins/canvas/public/components/expression/expression.scss
@@ -45,4 +45,5 @@
 .canvasExpression__settings {
   padding: $euiSizeM $euiSize;
   border-top: $euiBorderThin;
+  background-color: $euiColorEmptyShade;
 }
diff --git a/x-pack/plugins/canvas/public/components/toolbar/toolbar.scss b/x-pack/plugins/canvas/public/components/toolbar/toolbar.scss
index 41bc718dcfec1..c46a2ec7a1e22 100644
--- a/x-pack/plugins/canvas/public/components/toolbar/toolbar.scss
+++ b/x-pack/plugins/canvas/public/components/toolbar/toolbar.scss
@@ -6,7 +6,7 @@
   position: absolute;
   top: $euiSize * -1.25;
   left: 50%;
-  background-color: $euiColorLightestShade;
+  background-color: $euiFormBackgroundColor;
   margin: 0;
   border-radius: $euiBorderRadius $euiBorderRadius 0 0;
 
diff --git a/x-pack/plugins/canvas/public/components/toolbar/tray/tray.scss b/x-pack/plugins/canvas/public/components/toolbar/tray/tray.scss
index 34a9a12aac3e6..0ed47a761cd4f 100644
--- a/x-pack/plugins/canvas/public/components/toolbar/tray/tray.scss
+++ b/x-pack/plugins/canvas/public/components/toolbar/tray/tray.scss
@@ -4,11 +4,7 @@
 }
 
 .canvasTray__panel {
-  background-color: $euiPageBackgroundColor;
+  background-color: $euiFormBackgroundColor;
   border-radius: 0;
-
-  &.canvasTray__panel--holdingExpression {
-    background-color: $euiColorEmptyShade;
-  }
 }
 
diff --git a/x-pack/plugins/painless_lab/public/styles/_index.scss b/x-pack/plugins/painless_lab/public/styles/_index.scss
index 14a58fe4bdb8b..e5ed8f38a31ee 100644
--- a/x-pack/plugins/painless_lab/public/styles/_index.scss
+++ b/x-pack/plugins/painless_lab/public/styles/_index.scss
@@ -12,7 +12,7 @@ $bottomBarHeight: $euiSize * 3;
 
 .painlessLabLeftPane {
   padding-top: $euiSizeM;
-  background-color: $euiColorEmptyShade;
+  background-color: $euiFormBackgroundColor;
 }
 
 .painlessLabRightPane {