diff --git a/packages/client/ui-settings/src/client/SettingsRoot.module.css b/packages/client/ui-settings/src/client/SettingsRoot.module.css
index 711387fbb4..dd3cd9661c 100644
--- a/packages/client/ui-settings/src/client/SettingsRoot.module.css
+++ b/packages/client/ui-settings/src/client/SettingsRoot.module.css
@@ -10,10 +10,10 @@
   display: flex;
   align-items: center;
   gap: 8px;
-  width: 100%;
+  width: calc(100% - 8px);
   height: 38px;
-  margin: 4px 0 0;
-  padding: 8px 2px 8px 6px;
+  margin: 4px 4px 4px;
+  padding: 8px 2px 8px 10px;
   box-sizing: border-box;
   border: none;
   border-radius: 12px;
diff --git a/packages/client/ui-sidebar/src/client/SidebarRoot.module.css b/packages/client/ui-sidebar/src/client/SidebarRoot.module.css
index 47a7a40967..2cc99e3159 100644
--- a/packages/client/ui-sidebar/src/client/SidebarRoot.module.css
+++ b/packages/client/ui-sidebar/src/client/SidebarRoot.module.css
@@ -167,7 +167,7 @@
   gap: 6px;
   height: 38px;
   padding: 8px 16px;
-  margin: 0 2px 20px; /* bottom: former headerBlock padBottom 12 + root gap 8 */
+  margin: 0 2px 8px;
   box-sizing: border-box;
   border: 1px solid var(--dsw-alias-border-l2);
   border-radius: 12px;