diff --git a/demo/e2e/screenshot.spec.ts-snapshots/button-dark.png b/demo/e2e/screenshot.spec.ts-snapshots/button-dark.png
index 9da7b26..a59f26a 100644
Binary files a/demo/e2e/screenshot.spec.ts-snapshots/button-dark.png and b/demo/e2e/screenshot.spec.ts-snapshots/button-dark.png differ
diff --git a/demo/e2e/screenshot.spec.ts-snapshots/button.png b/demo/e2e/screenshot.spec.ts-snapshots/button.png
index cdd4703..42a878c 100644
Binary files a/demo/e2e/screenshot.spec.ts-snapshots/button.png and b/demo/e2e/screenshot.spec.ts-snapshots/button.png differ
diff --git a/demo/e2e/screenshot.spec.ts-snapshots/popover-dark.png b/demo/e2e/screenshot.spec.ts-snapshots/popover-dark.png
index 1c4efbe..6294e4f 100644
Binary files a/demo/e2e/screenshot.spec.ts-snapshots/popover-dark.png and b/demo/e2e/screenshot.spec.ts-snapshots/popover-dark.png differ
diff --git a/demo/e2e/screenshot.spec.ts-snapshots/popover.png b/demo/e2e/screenshot.spec.ts-snapshots/popover.png
index 1bbd97e..8d15931 100644
Binary files a/demo/e2e/screenshot.spec.ts-snapshots/popover.png and b/demo/e2e/screenshot.spec.ts-snapshots/popover.png differ
diff --git a/demo/e2e/screenshot.spec.ts-snapshots/searchbar-dark.png b/demo/e2e/screenshot.spec.ts-snapshots/searchbar-dark.png
index f5c25de..e959e4e 100644
Binary files a/demo/e2e/screenshot.spec.ts-snapshots/searchbar-dark.png and b/demo/e2e/screenshot.spec.ts-snapshots/searchbar-dark.png differ
diff --git a/demo/e2e/screenshot.spec.ts-snapshots/searchbar.png b/demo/e2e/screenshot.spec.ts-snapshots/searchbar.png
index 40a97ca..bc9b9d1 100644
Binary files a/demo/e2e/screenshot.spec.ts-snapshots/searchbar.png and b/demo/e2e/screenshot.spec.ts-snapshots/searchbar.png differ
diff --git a/demo/e2e/screenshot.spec.ts-snapshots/segment-dark.png b/demo/e2e/screenshot.spec.ts-snapshots/segment-dark.png
index 6f3e33a..ddaa8a1 100644
Binary files a/demo/e2e/screenshot.spec.ts-snapshots/segment-dark.png and b/demo/e2e/screenshot.spec.ts-snapshots/segment-dark.png differ
diff --git a/demo/e2e/screenshot.spec.ts-snapshots/segment.png b/demo/e2e/screenshot.spec.ts-snapshots/segment.png
index 8daafa1..91eabcc 100644
Binary files a/demo/e2e/screenshot.spec.ts-snapshots/segment.png and b/demo/e2e/screenshot.spec.ts-snapshots/segment.png differ
diff --git a/demo/e2e/screenshot.spec.ts-snapshots/toolbar-dark.png b/demo/e2e/screenshot.spec.ts-snapshots/toolbar-dark.png
index cb99ac2..b2b008c 100644
Binary files a/demo/e2e/screenshot.spec.ts-snapshots/toolbar-dark.png and b/demo/e2e/screenshot.spec.ts-snapshots/toolbar-dark.png differ
diff --git a/demo/e2e/screenshot.spec.ts-snapshots/toolbar.png b/demo/e2e/screenshot.spec.ts-snapshots/toolbar.png
index f3a2c39..c49c274 100644
Binary files a/demo/e2e/screenshot.spec.ts-snapshots/toolbar.png and b/demo/e2e/screenshot.spec.ts-snapshots/toolbar.png differ
diff --git a/src/styles/components/ion-toolbar.scss b/src/styles/components/ion-toolbar.scss
index 0940d8d..7649521 100644
--- a/src/styles/components/ion-toolbar.scss
+++ b/src/styles/components/ion-toolbar.scss
@@ -3,8 +3,7 @@ ion-footer.md:not(.md3-disabled) {
   box-shadow: none;
 }
 
-ion-header.md:not(.md3-disabled),
-ion-footer.md:not(.md3-disabled) {
+ion-toolbar.md:not(.md3-disabled) {
   ion-buttons[slot='start'],
   ion-back-button[slot='start'] {
     margin-left: 16px;
@@ -14,22 +13,25 @@ ion-footer.md:not(.md3-disabled) {
     margin-right: 16px;
   }
   /* fallback ion-buttons[slot=end], ion-back-button[slot=end] */
-  ion-toolbar ion-buttons > ion-back-button {
+  ion-buttons > ion-back-button {
     margin-left: 0;
     margin-right: 0;
   }
-}
 
-ion-header.md:not(.md3-disabled) ion-toolbar {
   &:has(> [slot='start']) ion-title {
     padding-inline-start: 4px;
   }
   &:not(:has(> [slot='start'])) ion-title {
     padding-inline-start: calc(16px + 12px);
   }
-}
 
-ion-toolbar.md:not(.md3-disabled) {
+  &.toolbar-searchbar:not(:has(> [slot='start'])) {
+    --padding-start: 10px;
+  }
+  &.toolbar-searchbar:not(:has(> [slot='end'])) {
+    --padding-end: 10px;
+  }
+
   ion-back-button.back-button-has-icon-only {
     --icon-font-size: 24px;
     --min-width: 48px;