diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-1-chromium-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-1-chromium-linux.png
index 09932b73f9..a6cdccb49c 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-1-chromium-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-1-chromium-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-1-firefox-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-1-firefox-linux.png
index ca13da1704..9114333073 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-1-firefox-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-1-firefox-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-1-webkit-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-1-webkit-linux.png
index 164e032eb9..9be36e6312 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-1-webkit-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-1-webkit-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-2-chromium-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-2-chromium-linux.png
index 31e7d1f9e0..32f7b42b29 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-2-chromium-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-2-chromium-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-2-firefox-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-2-firefox-linux.png
index ca13da1704..9114333073 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-2-firefox-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-2-firefox-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-2-webkit-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-2-webkit-linux.png
index 0c64dd6b83..b69bbd53fe 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-2-webkit-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-2-webkit-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-3-chromium-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-3-chromium-linux.png
index 0368db0e3b..28c4661ad4 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-3-chromium-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-3-chromium-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-3-firefox-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-3-firefox-linux.png
index ca13da1704..9114333073 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-3-firefox-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-3-firefox-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-3-webkit-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-3-webkit-linux.png
index 647136c432..f302feaf87 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-3-webkit-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-3-webkit-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-4-chromium-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-4-chromium-linux.png
index c8ed903ff7..6569375aad 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-4-chromium-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-4-chromium-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-4-firefox-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-4-firefox-linux.png
index ca13da1704..9114333073 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-4-firefox-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-4-firefox-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-4-webkit-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-4-webkit-linux.png
index affc0057e8..f756d29860 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-4-webkit-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-4-webkit-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-5-chromium-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-5-chromium-linux.png
index af30c55465..79ab786206 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-5-chromium-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-5-chromium-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-5-firefox-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-5-firefox-linux.png
index f46786c312..e5689d3f7b 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-5-firefox-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-5-firefox-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-5-webkit-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-5-webkit-linux.png
index fe56253d74..1ff2e9fb3e 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-5-webkit-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-5-webkit-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-6-chromium-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-6-chromium-linux.png
index 3bb9720824..7f7d68e2f6 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-6-chromium-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-6-chromium-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-6-firefox-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-6-firefox-linux.png
index 9d35ab62eb..cd1974345f 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-6-firefox-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-6-firefox-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-6-webkit-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-6-webkit-linux.png
index 4ff72d25f6..e81141083c 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-6-webkit-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-6-webkit-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-7-chromium-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-7-chromium-linux.png
index 381917bf64..f8b2582a8d 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-7-chromium-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-7-chromium-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-7-firefox-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-7-firefox-linux.png
index f09ded5b14..cbeb5e1a53 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-7-firefox-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-7-firefox-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-7-webkit-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-7-webkit-linux.png
index 7a938e0075..2e492ea6bf 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-7-webkit-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-7-webkit-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-8-chromium-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-8-chromium-linux.png
index 82c46d6f53..a0913f1524 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-8-chromium-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-8-chromium-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-8-firefox-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-8-firefox-linux.png
index 33b070cfc2..feef3fc14d 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-8-firefox-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-8-firefox-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-8-webkit-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-8-webkit-linux.png
index 35a9a3d323..5cbff449e7 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-8-webkit-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Steps-on-hover-and-focus---small-state-8-webkit-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-1-chromium-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-1-chromium-linux.png
index 1a78e4bd21..fa06e88c4d 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-1-chromium-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-1-chromium-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-1-firefox-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-1-firefox-linux.png
index af173dbce4..431cecfa68 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-1-firefox-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-1-firefox-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-1-webkit-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-1-webkit-linux.png
index 5e19cb3ec0..77a1e23678 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-1-webkit-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-1-webkit-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-2-chromium-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-2-chromium-linux.png
index f82f833f42..d7960f80f9 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-2-chromium-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-2-chromium-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-2-firefox-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-2-firefox-linux.png
index af173dbce4..431cecfa68 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-2-firefox-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-2-firefox-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-2-webkit-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-2-webkit-linux.png
index da53eeff2d..ccd0bc4008 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-2-webkit-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-2-webkit-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-3-chromium-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-3-chromium-linux.png
index d8a93cf266..0bc811f016 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-3-chromium-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-3-chromium-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-3-firefox-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-3-firefox-linux.png
index af173dbce4..431cecfa68 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-3-firefox-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-3-firefox-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-3-webkit-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-3-webkit-linux.png
index 44d7cfc456..6b510a7be4 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-3-webkit-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-3-webkit-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-4-chromium-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-4-chromium-linux.png
index 8b7f81b6ac..400b560e74 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-4-chromium-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-4-chromium-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-4-firefox-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-4-firefox-linux.png
index 2eb2d9fda1..133b6eebe0 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-4-firefox-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-4-firefox-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-4-webkit-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-4-webkit-linux.png
index 9bd2a04d3e..e678378b5c 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-4-webkit-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-4-webkit-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-5-chromium-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-5-chromium-linux.png
index a566a68d07..dcb0703f0c 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-5-chromium-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-5-chromium-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-5-firefox-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-5-firefox-linux.png
index 77a671aa7f..836b36ee57 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-5-firefox-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-5-firefox-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-5-webkit-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-5-webkit-linux.png
index 2ce6b7caf9..1170c56e91 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-5-webkit-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-5-webkit-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-6-chromium-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-6-chromium-linux.png
index dbe7bec4e0..289d3e68be 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-6-chromium-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-6-chromium-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-6-firefox-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-6-firefox-linux.png
index 291e650261..42abab0e2c 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-6-firefox-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-6-firefox-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-6-webkit-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-6-webkit-linux.png
index 90a07bedcf..f27bf4d5b6 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-6-webkit-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-6-webkit-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-7-chromium-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-7-chromium-linux.png
index 90d2b27abc..eb018345df 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-7-chromium-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-7-chromium-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-7-firefox-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-7-firefox-linux.png
index 4d1de0bf25..233bac5b53 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-7-firefox-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-7-firefox-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-7-webkit-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-7-webkit-linux.png
index 6fbc0a6593..123d55d16e 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-7-webkit-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Steps-and-buttons-states-Verify-Steps-on-hover-and-focus---expanded-state-7-webkit-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Verify-Custom-step-example-1-chromium-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Verify-Custom-step-example-1-chromium-linux.png
index 3e90dbeedc..9f9b2b4b25 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Verify-Custom-step-example-1-chromium-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Verify-Custom-step-example-1-chromium-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Verify-Custom-step-example-1-firefox-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Verify-Custom-step-example-1-firefox-linux.png
index 6aafbff994..4127ed652c 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Verify-Custom-step-example-1-firefox-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Verify-Custom-step-example-1-firefox-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Verify-Custom-step-example-1-webkit-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Verify-Custom-step-example-1-webkit-linux.png
index a0aace6e14..12f9610707 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Verify-Custom-step-example-1-webkit-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Verify-Custom-step-example-1-webkit-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Verify-z-index-in-content-1-chromium-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Verify-z-index-in-content-1-chromium-linux.png
index 963ac761d5..130bcd0507 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Verify-z-index-in-content-1-chromium-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Verify-z-index-in-content-1-chromium-linux.png differ
diff --git a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Verify-z-index-in-content-1-webkit-linux.png b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Verify-z-index-in-content-1-webkit-linux.png
index cc2e4fcf7c..ed4cf18dbb 100644
Binary files a/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Verify-z-index-in-content-1-webkit-linux.png and b/semcore/wizard/__tests__/wizard.browser-test.tsx-snapshots/-visual-Verify-z-index-in-content-1-webkit-linux.png differ
diff --git a/semcore/wizard/src/Wizard.tsx b/semcore/wizard/src/Wizard.tsx
index 57216b25eb..c49cacdd53 100644
--- a/semcore/wizard/src/Wizard.tsx
+++ b/semcore/wizard/src/Wizard.tsx
@@ -1,4 +1,4 @@
-import { ScreenReaderOnly, Box } from '@semcore/base-components';
+import { ScreenReaderOnly, Box, Flex } from '@semcore/base-components';
 import Button from '@semcore/button';
 import { createComponent, Component, Root, sstyled } from '@semcore/core';
 import type { Intergalactic } from '@semcore/core';
@@ -247,8 +247,8 @@ function Stepper(
   } = props;
   const SStepper = Root;
   const SStepNumber = 'span';
-  const SStepDescription = 'span';
-  const SCompleted = CheckM;
+  const SStepDescription = Flex;
+  const SCompleteIcon = CheckM;
 
   const handlerClick = React.useCallback(
     (e: React.SyntheticEvent<HTMLElement>) => {
@@ -277,7 +277,7 @@ function Stepper(
 
   return sstyled(styles)(
     <SStepper
-      render={Box}
+      render={Flex}
       role='tab'
       tabIndex={disabled ? undefined : 0}
       onClick={handlerClick}
@@ -285,7 +285,7 @@ function Stepper(
     >
       {completed && <ScreenReaderOnly>{getI18nText('completedStep')}</ScreenReaderOnly>}
       <ScreenReaderOnly><Children /></ScreenReaderOnly>
-      <SStepNumber aria-hidden='true'>{completed ? <SCompleted /> : number}</SStepNumber>
+      <SStepNumber aria-hidden='true'>{completed ? <SCompleteIcon /> : number}</SStepNumber>
       <SStepDescription aria-hidden='true'>
         <Children />
       </SStepDescription>
@@ -318,6 +318,7 @@ function StepBack(
     <SStepBack
       render={Button}
       use='tertiary'
+      theme='muted'
       size='l'
       onClick={handleClick}
       aria-label={getI18nText('backButton', { buttonName: stepName })}
@@ -341,6 +342,7 @@ function StepNext(
     <SStepNext
       render={Button}
       use='tertiary'
+      theme='muted'
       size='l'
       onClick={handleClick}
       aria-label={getI18nText('nextButton', { buttonName: stepName })}
diff --git a/semcore/wizard/src/style/wizard.shadow.css b/semcore/wizard/src/style/wizard.shadow.css
index fd0f1bfc37..c1113b0e3a 100644
--- a/semcore/wizard/src/style/wizard.shadow.css
+++ b/semcore/wizard/src/style/wizard.shadow.css
@@ -7,30 +7,29 @@ SWizard {
 }
 
 SSidebar {
-  background: var(--intergalactic-control-primary-advertising, oklch(0.23 0.01 140)); /* TODO: --intergalactic-wizard-sidebar-bg */
-  color: var(--intergalactic-text-primary-invert, oklch(0.999 0.001 180 / 0.949)); /* TODO: --intergalactic-wizard-sidebar-text-primary */
-  font-weight: var(--intergalactic-bold, 700);
-  font-size: var(--intergalactic-fs-300, 16px);
-  line-height: var(--intergalactic-lh-300, 150%);
-  padding: var(--intergalactic-spacing-10x, 40px) var(--intergalactic-spacing-2x, 8px);
+  background: var(--intergalactic-wizard-sidebar-bg, oklch(0.23 0.01 140));
+  color: var(--intergalactic-wizard-sidebar-text-primary, oklch(0.999 0.001 180 / 0.949));
+  padding: var(--intergalactic-spacing-content-padding-xxlarge, 40px) var(--intergalactic-spacing-content-padding-small, 8px);
   max-width: 220px;
   flex-shrink: 0;
   box-sizing: border-box;
-  border-radius: var(--intergalactic-modal-rounded, 14px) 0 0
-    var(--intergalactic-modal-rounded, 14px);
+  border-radius: var(--intergalactic-modal-rounded, 14px) 0 0 var(--intergalactic-modal-rounded, 14px);
   @media (max-width: 1060px) {
-    width: 56px;
+    width: 44px;
   }
 
   SStepper {
-    display: flex;
-    gap: var(--intergalactic-spacing-1x, 4px);
-    font-size: var(--intergalactic-fs-200, 14px);
+    box-sizing: border-box;
+    min-height: 36px;
+    gap: var(--intergalactic-spacing-content-gap-small, 4px);
     border-radius: var(--intergalactic-control-rounded, 6px);
-    padding: var(--intergalactic-spacing-2x, 8px) var(--intergalactic-spacing-3x, 12px);
+    padding: var(--intergalactic-spacing-content-padding-small, 8px) var(--intergalactic-spacing-content-padding-medium, 12px);
     cursor: pointer;
     position: relative;
     overflow: auto;
+
+    font-size: var(--intergalactic-fs-200, 14px); 
+    font-weight: var(--intergalactic-bold, 700);
     line-height: var(--intergalactic-lh-200, 142%);
 
     &:focus-visible {
@@ -38,22 +37,25 @@ SSidebar {
     }
 
     &:hover {
-      background: var(--intergalactic-control-primary-advertising-hover, oklch(0.36 0.005 140)); /* TODO: --intergalactic-wizard-sidebar-control-hover */
+      background: var(--intergalactic-wizard-sidebar-control-hover, oklch(0.36 0.005 140));
       z-index: 2;
     }
     &[active] {
-      background: var(--intergalactic-control-primary-advertising-active, oklch(0.4 0.004 140)); /* TODO: --intergalactic-wizard-sidebar-control-active */
+      background: var(--intergalactic-wizard-sidebar-control-active, oklch(0.4 0.004 140));
     }
     &:disabled,
     &[disabled] {
       opacity: var(--intergalactic-disabled-opacity, 0.4);
       cursor: default;
-      pointer-events: none; /* Disable interactions */
+      pointer-events: none;
     }
 
     @media (max-width: 1060px) {
-      padding: var(--intergalactic-spacing-2x, 8px);
+      padding: var(--intergalactic-spacing-content-padding-small, 8px) var(--intergalactic-spacing-content-padding-xsmall, 4px);
+
       &:hover {
+        display: flex;
+        padding: var(--intergalactic-spacing-content-padding-small, 8px) var(--intergalactic-spacing-content-padding-medium, 12px) var(--intergalactic-spacing-content-padding-small, 8px) var(--intergalactic-spacing-content-padding-xsmall, 4px);
         width: max-content;
         max-width: 220px;
       }
@@ -63,7 +65,7 @@ SSidebar {
         overflow: auto;
       }
       &[active]:hover SStepDescription {
-        background: var(--intergalactic-control-primary-advertising-active, oklch(0.4 0.004 140)); /* TODO: --intergalactic-wizard-sidebar-control-active */
+        background: var(--intergalactic-wizard-sidebar-control-active, oklch(0.4 0.004 140));
       }
     }
   }
@@ -71,7 +73,8 @@ SSidebar {
 
 SSidebarHeader {
   font-size: var(--intergalactic-fs-300, 16px);
-  margin: 0 var(--intergalactic-spacing-5x, 20px) var(--intergalactic-spacing-4x, 16px);
+  margin: 0;
+  padding: 0 var(--intergalactic-spacing-content-padding-xlarge, 20px) var(--intergalactic-spacing-content-padding-large, 16px) var(--intergalactic-spacing-content-padding-xlarge, 20px);
   @media (max-width: 1060px) {
     display: none;
   }
@@ -81,14 +84,17 @@ SStepNumber {
   display: inline-block;
   min-width: 20px;
   text-align: center;
-}
 
-SCompleted {
-  /* disable-tokens-validator */
-  margin-top: 1px;
+  SCompleteIcon {
+    vertical-align: text-bottom;
+    transform: translateY(-1px);
+  }
 }
 
 SStepDescription {
+  flex-direction: column;
+  gap: var(--intergalactic-spacing-content-gap-small, 4px);
+
   overflow-wrap: anywhere;
   @media (max-width: 1060px) {
     display: none;
@@ -96,18 +102,17 @@ SStepDescription {
 }
 
 SContent {
-  padding: var(--intergalactic-spacing-10x, 40px);
+  padding: var(--intergalactic-spacing-content-padding-xxlarge, 40px);
   overflow: hidden;
   flex: 1;
-  border-radius: 0 var(--intergalactic-modal-rounded, 14px) var(--intergalactic-modal-rounded, 14px)
-    0;
-  background: var(--intergalactic-bg-primary-neutral, oklch(1 0 0)); /* TODO: --intergalactic-wizard-bg */
+  border-radius: 0 var(--intergalactic-modal-rounded, 14px) var(--intergalactic-modal-rounded, 14px) 0;
+  background: var(--intergalactic-wizard-bg, oklch(1 0 0));
 
   SWizardStepTitle {
     display: block;
     word-break: break-word;
     font-weight: var(--intergalactic-semi-bold, 600);
-    margin-bottom: var(--intergalactic-spacing-5x, 20px);
+    margin-bottom: var(--intergalactic-spacing-content-gap-xxlarge-extended, 20px);
   }
 }
 SContent[noSidebar] {
diff --git a/stories/components/wizard/docs/examples/custom_step.tsx b/stories/components/wizard/docs/examples/custom_step.tsx
index 54a2fc39ea..29cd8aa3c2 100644
--- a/stories/components/wizard/docs/examples/custom_step.tsx
+++ b/stories/components/wizard/docs/examples/custom_step.tsx
@@ -47,7 +47,7 @@ const Demo = () => {
           </Wizard.Stepper>
           <Wizard.Stepper step={3} onActive={handleStepChange(3)}>
             {steps[2].title}
-            <Text color='text-secondary-invert' fontWeight={400} mt={1} tag='div'>
+            <Text color='wizard-sidebar-text-secondary' fontWeight='regular' tag='div'>
               optional
             </Text>
           </Wizard.Stepper>
diff --git a/stories/components/wizard/tests/examples/steps_and_buttons_states.tsx b/stories/components/wizard/tests/examples/steps_and_buttons_states.tsx
index fd9e865a9f..1c872f3e01 100644
--- a/stories/components/wizard/tests/examples/steps_and_buttons_states.tsx
+++ b/stories/components/wizard/tests/examples/steps_and_buttons_states.tsx
@@ -55,20 +55,20 @@ const Demo = ({ firstStepTitle, ellipsis }: StepsAndButtonsStatesProps) => {
           </Wizard.Stepper>
           <Wizard.Stepper step={2} onActive={handleStepChange(2)} number={1.1}>
             {configurableSteps[1].title}
-            <Text color='text-secondary-invert' fontWeight={400} tag='div'>
+            <Text color='wizard-sidebar-text-secondary' fontWeight={400} tag='div'>
               {value === '' ? 'Not selected' : value}
             </Text>
           </Wizard.Stepper>
           <Wizard.Stepper step={3} onActive={handleStepChange(3)} number={1.2}>
-            <Text color='text-secondary-invert' fontWeight={400}>
+            <Text color='wizard-sidebar-text-secondary' fontWeight={400}>
               {configurableSteps[2].title}
             </Text>
-            <Text color='text-secondary-invert' fontWeight={400} tag='div'>
+            <Text color='wizard-sidebar-text-secondary' fontWeight={400} tag='div'>
               Optional step
             </Text>
           </Wizard.Stepper>
           <Wizard.Stepper step={4} onActive={handleStepChange(4)} number={1.3}>
-            <Text color='text-secondary-invert' fontWeight={400}>
+            <Text color='wizard-sidebar-text-secondary' fontWeight={400}>
               {configurableSteps[3].title}
             </Text>
           </Wizard.Stepper>
@@ -80,7 +80,7 @@ const Demo = ({ firstStepTitle, ellipsis }: StepsAndButtonsStatesProps) => {
           </Wizard.Stepper>
           <Wizard.Stepper step={7} onActive={handleStepChange(7)}>
             {configurableSteps[6].title}
-            <Text color='text-secondary-invert' fontWeight={400} tag='div'>
+            <Text color='wizard-sidebar-text-secondary' fontWeight={400} tag='div'>
               optional
             </Text>
           </Wizard.Stepper>
diff --git a/website/docs/components/wizard/wizard.md b/website/docs/components/wizard/wizard.md
index 80d532c191..335aea82fb 100644
--- a/website/docs/components/wizard/wizard.md
+++ b/website/docs/components/wizard/wizard.md
@@ -49,20 +49,25 @@ max-height: 700px;
 
 Table: Stepper states
 
-| State    | Appearance example       | Styles                                                                                         |
-| -------- | ------------------------ | ---------------------------------------------------------------------------------------------- |
-| Normal   | ![](static/normal.png)   | `background-color: var(--control-primary-advertising)`, `border-radius: var(--rounded-medium)` |
-| Hover    | ![](static/hover.png)    | `background-color: var(--control-primary-advertising-hover)`, `cursor: pointer`                |
-| Active   | ![](static/active.png)   | `background-color: var(--control-primary-advertising-active)`                                  |
-| Disabled | ![](static/disabled.png) | Use `--disabled-opacity` token.                                                                |
-| Checked  | ![](static/checked.png)  | The number changes to a `Check` icon with M size.
+| State    | Appearance example       |
+| -------- | ------------------------ |
+| Normal   | ![](static/normal.png)   |
+| Hover    | ![](static/hover.png)    |
+| Active   | ![](static/active.png)   |
+| Disabled | ![](static/disabled.png) |
+| Checked  | ![](static/checked.png)  |
 
 ### Optional stepper
 
 If a step is optional, you can add an **"optional"** label to it using the following styles:
 
 ```CSS
-<Text color='text-secondary-invert' fontWeight={400} mt={1} tag='div'>
+<Text
+  color='wizard-sidebar-text-secondary'
+  fontWeight={400}
+  mt={1}
+  tag='div'
+>
     optional
 </Text>
 ```
@@ -74,9 +79,9 @@ Refer to the [example with custom step](/components/wizard/wizard-code#custom-st
 We recommend:
 
 - Using the `L` size for basic controls
-- Using the following margins
+- Using the `spacing-content-gap-xlarge` gap within the footer and the `spacing-content-gap-xxlarge-extended` gap between the footer and the content.
 
-![margin-bottom: 20px; color: var(--gray-800); font-size: var(--fs-500); line-height: var(--lh-500);](static/footer.png)
+![](static/footer.png)
 
 ### Collapsing panel with steps on screen less than 1060px
 
diff --git a/website/docs/style/design-tokens/design-tokens.json b/website/docs/style/design-tokens/design-tokens.json
index 56199ea400..06f7650072 100644
--- a/website/docs/style/design-tokens/design-tokens.json
+++ b/website/docs/style/design-tokens/design-tokens.json
@@ -241,8 +241,7 @@
       "modal",
       "side-panel",
       "slider",
-      "textarea",
-      "wizard"
+      "textarea"
     ]
   },
   {
@@ -1015,25 +1014,19 @@
     "name": "--intergalactic-control-primary-advertising",
     "value": "oklch(0.23 0.01 140)",
     "description": "Background of the advertising primary control.",
-    "components": [
-      "wizard"
-    ]
+    "components": []
   },
   {
     "name": "--intergalactic-control-primary-advertising-hover",
     "value": "oklch(0.36 0.005 140)",
     "description": "Hover state of the advertising primary control.",
-    "components": [
-      "wizard"
-    ]
+    "components": []
   },
   {
     "name": "--intergalactic-control-primary-advertising-active",
     "value": "oklch(0.4 0.004 140)",
     "description": "Active (selected) state of the advertising primary control.",
-    "components": [
-      "wizard"
-    ]
+    "components": []
   },
   {
     "name": "--intergalactic-control-primary-brand",
@@ -2989,8 +2982,7 @@
     "components": [
       "date-picker",
       "feature-highlight",
-      "notice-bubble",
-      "wizard"
+      "notice-bubble"
     ]
   },
   {
@@ -3090,13 +3082,17 @@
     "name": "--intergalactic-wizard-bg",
     "value": "oklch(1 0 0)",
     "description": "Main background of the Wizard.",
-    "components": []
+    "components": [
+      "wizard"
+    ]
   },
   {
     "name": "--intergalactic-wizard-sidebar-bg",
     "value": "oklch(0.23 0.01 140)",
     "description": "Background of the Wizard sidebar.",
-    "components": []
+    "components": [
+      "wizard"
+    ]
   },
   {
     "name": "--intergalactic-wizard-sidebar-control",
@@ -3108,19 +3104,25 @@
     "name": "--intergalactic-wizard-sidebar-control-active",
     "value": "oklch(0.4 0.004 140)",
     "description": "Active state of the control in the Wizard sidebar.",
-    "components": []
+    "components": [
+      "wizard"
+    ]
   },
   {
     "name": "--intergalactic-wizard-sidebar-control-hover",
     "value": "oklch(0.36 0.005 140)",
     "description": "Hover state of the control in the Wizard sidebar.",
-    "components": []
+    "components": [
+      "wizard"
+    ]
   },
   {
     "name": "--intergalactic-wizard-sidebar-text-primary",
     "value": "oklch(0.999 0.001 180 / 0.949)",
     "description": "Primary text color in the Wizard sidebar.",
-    "components": []
+    "components": [
+      "wizard"
+    ]
   },
   {
     "name": "--intergalactic-wizard-sidebar-text-secondary",
@@ -3308,7 +3310,8 @@
       "dropdown",
       "dropdown-menu",
       "input-tags",
-      "pills"
+      "pills",
+      "wizard"
     ]
   },
   {
@@ -3329,7 +3332,8 @@
       "bulk-textarea",
       "dropdown",
       "modal",
-      "pills"
+      "pills",
+      "wizard"
     ]
   },
   {
@@ -3349,7 +3353,8 @@
       "pills",
       "textarea",
       "time-picker",
-      "tooltip"
+      "tooltip",
+      "wizard"
     ]
   },
   {
@@ -3359,7 +3364,8 @@
     "components": [
       "bulk-textarea",
       "feature-popover",
-      "notice-bubble"
+      "notice-bubble",
+      "wizard"
     ]
   },
   {
@@ -3368,7 +3374,8 @@
     "description": "Extra large padding for content inside controls and surfaces.",
     "components": [
       "bulk-textarea",
-      "card"
+      "card",
+      "wizard"
     ]
   },
   {
@@ -3384,7 +3391,8 @@
     "components": [
       "feature-popover",
       "modal",
-      "notice-bubble"
+      "notice-bubble",
+      "wizard"
     ]
   },
   {
@@ -3404,7 +3412,8 @@
       "dropdown-menu",
       "inline-input",
       "pagination",
-      "tag"
+      "tag",
+      "wizard"
     ]
   },
   {
@@ -3461,7 +3470,8 @@
     "value": "20px",
     "description": "Extended 2x large gap between elements, rows, or columns.",
     "components": [
-      "pagination"
+      "pagination",
+      "wizard"
     ]
   },
   {