diff --git a/app/assets/stylesheets/framework/ds_experiments_tokens.scss b/app/assets/stylesheets/framework/ds_experiments_tokens.scss
index a965bb01a3bb1105ec2000b1d0b94923e4c43641..6f42d444e7bdabd5825e9b9ed45475aec1d1f3f6 100644
--- a/app/assets/stylesheets/framework/ds_experiments_tokens.scss
+++ b/app/assets/stylesheets/framework/ds_experiments_tokens.scss
@@ -2,10 +2,15 @@
  * DS token overrides
  */
 
- // Neutralize design tokens
+// Neutralize design tokens
 
 :root.application-chrome {
 
+  --accent-default: var(--theme-accent-color);
+  --accent-hover: lch(from var(--accent-default) calc(l * 1.25) c h);
+  --accent-focus: lch(from var(--accent-default) calc(l / 1.5) c h);
+  --accent-active: lch(from var(--accent-default) calc(l / 1.5) c h);
+
   --gl-button-confirm-primary-background-color-default: var(--gl-color-neutral-800);
   --gl-button-confirm-primary-background-color-hover: var(--gl-color-neutral-950);
   --gl-button-confirm-primary-background-color-focus: var(--gl-color-neutral-950);
@@ -32,28 +37,37 @@
 
   --gl-tab-selected-indicator-color-default: var(--gl-color-neutral-800);
 
-  --gl-control-background-color-selected-default: var(--gl-color-neutral-800);
-  --gl-control-background-color-selected-hover: var(--gl-color-neutral-950);
-  --gl-control-background-color-selected-focus: var(--gl-color-neutral-950);
-
-  --gl-control-border-color-selected-default: var(--gl-color-neutral-800);
-  --gl-control-border-color-selected-hover: var(--gl-color-neutral-950);
-  --gl-control-border-color-selected-focus: var(--gl-color-neutral-950);
+  --gl-control-background-color-selected-default: var(--accent-default);
+  --gl-control-background-color-selected-hover: var(--accent-hover);
+  --gl-control-background-color-selected-focus: var(--accent-focus);
 
-  --gl-toggle-switch-icon-color-checked-default: var(--gl-color-neutral-800);
-  --gl-toggle-switch-icon-color-checked-hover: var(--gl-color-neutral-950);
-  --gl-toggle-switch-icon-color-checked-focus: var(--gl-color-neutral-950);
-  --gl-toggle-switch-icon-color-checked-active: var(--gl-color-neutral-1000);
+  --gl-control-border-color-selected-default: var(--accent-default);
+  --gl-control-border-color-selected-hover: var(--accent-hover);
+  --gl-control-border-color-selected-focus: var(--accent-focus);
 
   --gl-action-strong-confirm-background-color-default: var(--gl-color-neutral-800);
   --gl-action-strong-confirm-background-color-hover: var(--gl-color-neutral-950);
   --gl-action-strong-confirm-background-color-focus: var(--gl-color-neutral-950);
   --gl-action-strong-confirm-background-color-active: var(--gl-color-neutral-1000);
 
+  .gl-toggle.is-checked {
+    --gl-toggle-switch-icon-color-checked-default: var(--accent-default);
+    --gl-toggle-switch-icon-color-checked-hover: var(--accent-hover);
+    --gl-toggle-switch-icon-color-checked-focus: var(--accent-focus);
+    --gl-toggle-switch-icon-color-checked-active: var(--accent-active);
+
+    --gl-action-strong-confirm-background-color-default: var(--accent-default);
+    --gl-action-strong-confirm-background-color-hover: var(--accent-hover);
+    --gl-action-strong-confirm-background-color-focus: var(--accent-focus);
+    --gl-action-strong-confirm-background-color-active: var(--accent-active);
+  }
+
 }
 
 :root.application-chrome.gl-dark {
 
+  --accent-default: hsl(from var(--theme-accent-color) calc(h - 10) s calc(l + 20));
+
   --gl-button-confirm-primary-background-color-default: var(--gl-color-neutral-50);
   --gl-button-confirm-primary-background-color-hover: var(--gl-color-neutral-10);
   --gl-button-confirm-primary-background-color-focus: var(--gl-color-neutral-10);
@@ -81,19 +95,6 @@
 
   --gl-tab-selected-indicator-color-default: var(--gl-color-neutral-50);
 
-  --gl-control-background-color-selected-default: var(--gl-color-neutral-50);
-  --gl-control-background-color-selected-hover: var(--gl-color-neutral-10);
-  --gl-control-background-color-selected-focus: var(--gl-color-neutral-10);
-
-  --gl-control-border-color-selected-default: var(--gl-color-neutral-50);
-  --gl-control-border-color-selected-hover: var(--gl-color-neutral-10);
-  --gl-control-border-color-selected-focus: var(--gl-color-neutral-10);
-
-  --gl-toggle-switch-icon-color-checked-default: var(--gl-color-neutral-50);
-  --gl-toggle-switch-icon-color-checked-hover: var(--gl-color-neutral-10);
-  --gl-toggle-switch-icon-color-checked-focus: var(--gl-color-neutral-10);
-  --gl-toggle-switch-icon-color-checked-active: var(--gl-color-neutral-0);
-
   --gl-action-strong-confirm-background-color-default: var(--gl-color-neutral-50);
   --gl-action-strong-confirm-background-color-hover: var(--gl-color-neutral-10);
   --gl-action-strong-confirm-background-color-focus: var(--gl-color-neutral-10);