diff --git a/core/misc/dialog/off-canvas.button.css b/core/misc/dialog/off-canvas.button.css
index 181bd778504d..96a6823c02fe 100644
--- a/core/misc/dialog/off-canvas.button.css
+++ b/core/misc/dialog/off-canvas.button.css
@@ -69,7 +69,7 @@
 #drupal-off-canvas input[type="submit"].button--primary:hover,
 #drupal-off-canvas input[type="submit"].button--primary:focus,
 #drupal-off-canvas input[type="submit"].button--primary:active {
-  background: #2b8bd8;
+  background: #236aaf;
   outline: none;
 }
 #drupal-off-canvas .button-action:before {
diff --git a/core/misc/dialog/off-canvas.form.css b/core/misc/dialog/off-canvas.form.css
index b47dbcc6f2b5..f1def25a7019 100644
--- a/core/misc/dialog/off-canvas.form.css
+++ b/core/misc/dialog/off-canvas.form.css
@@ -43,9 +43,6 @@
   font-size: 12px;
   font-style: normal;
 }
-#drupal-off-canvas .details-wrapper .description {
-  color: #bbb;
-}
 #drupal-off-canvas .form-item {
   margin-bottom: 10px;
   margin-top: 10px;
diff --git a/core/misc/dialog/off-canvas.table.css b/core/misc/dialog/off-canvas.table.css
index 03efbd6326de..bf949741a877 100644
--- a/core/misc/dialog/off-canvas.table.css
+++ b/core/misc/dialog/off-canvas.table.css
@@ -46,7 +46,6 @@
 }
 #drupal-off-canvas th {
   font-weight: bold;
-  color: #bbb;
 }
 #drupal-off-canvas th.checkbox,
 #drupal-off-canvas td.checkbox {
diff --git a/core/modules/settings_tray/css/settings_tray.theme.css b/core/modules/settings_tray/css/settings_tray.theme.css
index 82a8e5ee13e0..7a0e3084eee5 100644
--- a/core/modules/settings_tray/css/settings_tray.theme.css
+++ b/core/modules/settings_tray/css/settings_tray.theme.css
@@ -9,7 +9,7 @@
 
 /* Style the edit mode toolbar and tabs. */
 #toolbar-bar.js-settings-tray-edit-mode {
-  background-image: linear-gradient(to bottom, #0c97ed, #1f86c7);
+  background-image: linear-gradient(to bottom, #0A7BC1, #0a6eb4);
 }
 .js-settings-tray-edit-mode .toolbar-item:not(.toolbar-icon-edit) {
   color: #999;
@@ -22,9 +22,9 @@
 .toolbar-tab > .toolbar-icon.toolbar-icon-edit.toolbar-item,
 .toolbar-tab > .toolbar-icon.toolbar-icon-edit.toolbar-item.is-active,
 .toolbar-tab > .toolbar-icon.toolbar-icon-edit.toolbar-item:focus {
-  background-color: #50a0e9;
-  background-image: linear-gradient(to bottom, #007bc6, #0071b8);
-  color: #ddd;
+  background-color: #0066A1;
+  background-image: linear-gradient(to bottom, #0066A1, #005b98);
+  color: #eee;
   text-shadow: none;
   font-weight: bold;
   outline: none;
@@ -32,13 +32,13 @@
 /* Make the hover of the inactive state the same as the active state. */
 .toolbar-tab > .toolbar-icon.toolbar-icon-edit.toolbar-item:hover,
 .toolbar-tab > .toolbar-icon.toolbar-icon-edit.toolbar-item.is-active {
-  background-image: linear-gradient(to bottom, #0c97ed, #1f86c7);
+  background-image: linear-gradient(to bottom, #0a7bc1, #0a6eb4);
   color: #fff;
 }
 /* Make the hover of the active state the same as the inactive state. */
 .toolbar-tab > .toolbar-icon.toolbar-icon-edit.toolbar-item.is-active:hover {
-  background-color: #2369a6;
-  background-image: linear-gradient(to bottom, #007bc6, #0071b8);
+  background-color: #0066A1;
+  background-image: linear-gradient(to bottom, #0066A1, #005b98);
   color: #fff;
 }
 /* Make the inactive icon grey. */
diff --git a/core/modules/settings_tray/css/settings_tray.toolbar.css b/core/modules/settings_tray/css/settings_tray.toolbar.css
index 8a2278c24a81..7fe5eef3d2d6 100644
--- a/core/modules/settings_tray/css/settings_tray.toolbar.css
+++ b/core/modules/settings_tray/css/settings_tray.toolbar.css
@@ -20,25 +20,25 @@
 
 /* Style both the edit and editing states of the contextual links toggle tab. */
 .toolbar-icon-edit.toolbar-item {
-  background-color: #50a0e9;
-  background-image: linear-gradient(to bottom, #007bc6, #0071b8);
+  background-color: #0066A1;
+  background-image: linear-gradient(to bottom, #0066A1, #005b98);
   color: #eee;
   text-shadow: 0 1px hsla(0, 0%, 0%, 0.5);
   font-weight: 700;
   -webkit-font-smoothing: antialiased;
 }
 .toolbar-icon-edit.toolbar-item.is-active {
-  background-color: #50a0e9;
-  background-image: linear-gradient(to bottom, #007bc6, #0071b8);
-  color: #eee;
+  background-color: #0a7bc1;
+  background-image: linear-gradient(to bottom, #0a7bc1, #0a6eb4);
+  color: #fff;
   text-shadow: 0 1px hsla(0, 0%, 0%, 0.5);
   font-weight: 700;
   -webkit-font-smoothing: antialiased;
 }
 .toolbar-tab:hover > .toolbar-icon-edit,
 .toolbar-icon-edit:focus .toolbar-item {
-  background-color: #2369a6;
-  background-image: linear-gradient(to bottom, #0c97ed, #1f86c7);
+  background-color: #0a7bc1;
+  background-image: linear-gradient(to bottom, #0a7bc1, #0a6eb4);
   border-color: #1e5c90;
   color: #fff;
   outline: none;
@@ -59,9 +59,8 @@ button.toolbar-icon.toolbar-icon-edit.toolbar-item:before:focus {
 }
 
 #toolbar-bar.js-settings-tray-edit-mode button.toolbar-icon.toolbar-icon-edit.toolbar-item.is-active {
-  background-image: none;
   color: #fff;
 }
 #toolbar-bar.js-settings-tray-edit-mode button.toolbar-icon.toolbar-icon-edit.toolbar-item.is-active:hover {
-  background-image: linear-gradient(to bottom, #0094f0, #0e69be);
+  background-image: linear-gradient(to bottom, #0a6fb4, #0a65aa);
 }
diff --git a/core/themes/stable/css/core/dialog/off-canvas.button.css b/core/themes/stable/css/core/dialog/off-canvas.button.css
index 181bd778504d..96a6823c02fe 100644
--- a/core/themes/stable/css/core/dialog/off-canvas.button.css
+++ b/core/themes/stable/css/core/dialog/off-canvas.button.css
@@ -69,7 +69,7 @@
 #drupal-off-canvas input[type="submit"].button--primary:hover,
 #drupal-off-canvas input[type="submit"].button--primary:focus,
 #drupal-off-canvas input[type="submit"].button--primary:active {
-  background: #2b8bd8;
+  background: #236aaf;
   outline: none;
 }
 #drupal-off-canvas .button-action:before {
diff --git a/core/themes/stable/css/core/dialog/off-canvas.form.css b/core/themes/stable/css/core/dialog/off-canvas.form.css
index b47dbcc6f2b5..f1def25a7019 100644
--- a/core/themes/stable/css/core/dialog/off-canvas.form.css
+++ b/core/themes/stable/css/core/dialog/off-canvas.form.css
@@ -43,9 +43,6 @@
   font-size: 12px;
   font-style: normal;
 }
-#drupal-off-canvas .details-wrapper .description {
-  color: #bbb;
-}
 #drupal-off-canvas .form-item {
   margin-bottom: 10px;
   margin-top: 10px;
diff --git a/core/themes/stable/css/core/dialog/off-canvas.table.css b/core/themes/stable/css/core/dialog/off-canvas.table.css
index 03efbd6326de..bf949741a877 100644
--- a/core/themes/stable/css/core/dialog/off-canvas.table.css
+++ b/core/themes/stable/css/core/dialog/off-canvas.table.css
@@ -46,7 +46,6 @@
 }
 #drupal-off-canvas th {
   font-weight: bold;
-  color: #bbb;
 }
 #drupal-off-canvas th.checkbox,
 #drupal-off-canvas td.checkbox {