diff --git a/packages/samples/react/src/components/badge/basic.tsx b/packages/samples/react/src/components/badge/basic.tsx
index dc680ec18b8..03c3e40b50f 100644
--- a/packages/samples/react/src/components/badge/basic.tsx
+++ b/packages/samples/react/src/components/badge/basic.tsx
@@ -11,7 +11,7 @@ export const BadgeBasic: FC = () => (
 			<p>KolBadge shows badges with a label, background color and optional icon.</p>
 		</SampleDescription>
 
-		<div className="flex gap-2">
+		<div className="flex flex-wrap gap-2">
 			<KolBadge _label="black"></KolBadge>
 			<KolBadge _color="#86ffc6" _label="teal"></KolBadge>
 			<KolBadge _color="#06539e" _label="blue"></KolBadge>
diff --git a/packages/samples/react/src/components/badge/button.tsx b/packages/samples/react/src/components/badge/button.tsx
index 4100c3b815e..4f9576404ab 100644
--- a/packages/samples/react/src/components/badge/button.tsx
+++ b/packages/samples/react/src/components/badge/button.tsx
@@ -23,7 +23,7 @@ export const BadgeButton: FC = () => (
 			</p>
 		</SampleDescription>
 
-		<div className="flex gap-2">
+		<div className="flex flex-wrap gap-2">
 			<KolBadge {...createBadgeProps('black')}></KolBadge>
 			<KolBadge _color="#86ffc6" {...createBadgeProps('teal')}></KolBadge>
 			<KolBadge _color="#06539e" {...createBadgeProps('blue')}></KolBadge>
diff --git a/packages/samples/react/src/components/button/baselined.tsx b/packages/samples/react/src/components/button/baselined.tsx
index cbd38554bb8..18212900779 100644
--- a/packages/samples/react/src/components/button/baselined.tsx
+++ b/packages/samples/react/src/components/button/baselined.tsx
@@ -19,7 +19,7 @@ export const ButtonBaselined: FC = () => {
 				<p>This KolButton sample is used for internal testing purposes: It features multiple buttons with and without icons which are vertically aligned.</p>
 			</SampleDescription>
 
-			<div className="flex">
+			<div className="flex flex-wrap gap-2">
 				<KolButton _label="Label-Text" _on={dummyEventHandler}></KolButton>
 				<KolButton _label="Label-Text" _on={dummyEventHandler}></KolButton>
 				<KolButton _label="Label-Text" _on={dummyEventHandler}></KolButton>
diff --git a/packages/samples/react/src/components/link-button/aria-description.tsx b/packages/samples/react/src/components/link-button/aria-description.tsx
index 4a787681e5f..7feb07fa4b4 100644
--- a/packages/samples/react/src/components/link-button/aria-description.tsx
+++ b/packages/samples/react/src/components/link-button/aria-description.tsx
@@ -9,7 +9,7 @@ export const LinkButtonAriaDescription: FC = () => (
 			<p>This sample shows KolLinkButton with aria-description</p>
 		</SampleDescription>
 
-		<div className="flex flex-wrap gap-4">
+		<div className="flex flex-wrap gap-2">
 			<KolLinkButton _href="#/back-page" _label="Link Button Text without area description"></KolLinkButton>
 			<KolLinkButton _href="#/back-page" _label="Link Button Text" _ariaDescription="Link Button Area Description"></KolLinkButton>
 		</div>
diff --git a/packages/samples/react/src/components/link-button/basic.tsx b/packages/samples/react/src/components/link-button/basic.tsx
index 87f80248ce9..85920c0713d 100644
--- a/packages/samples/react/src/components/link-button/basic.tsx
+++ b/packages/samples/react/src/components/link-button/basic.tsx
@@ -15,16 +15,14 @@ export const LinkButtonBasic: FC = () => (
 			<p>KolLinkButton renders a link that looks like a button. The sample shows the different styling variants.</p>
 		</SampleDescription>
 
-		<div className="grid gap-14">
-			<div className="flex flex-wrap gap-14">
-				<KolLinkButton _label="Primary" _variant="primary" {...ARGS}></KolLinkButton>
-				<KolLinkButton _label="Secondary" _variant="secondary" {...ARGS}></KolLinkButton>
-				<KolLinkButton _label="Normal" _variant="normal" {...ARGS}></KolLinkButton>
-				<KolLinkButton _label="Danger" _variant="danger" {...ARGS}></KolLinkButton>
-				<KolLinkButton _label="Ghost" _variant="ghost" {...ARGS}></KolLinkButton>
-				<KolLinkButton _label="Access Key" _variant="primary" _accessKey="c" {...ARGS}></KolLinkButton>
-				<KolLinkButton _label="Short Key" _variant="primary" _shortKey="s" {...ARGS}></KolLinkButton>
-			</div>
+		<div className="flex flex-wrap gap-2">
+			<KolLinkButton _label="Primary" _variant="primary" {...ARGS}></KolLinkButton>
+			<KolLinkButton _label="Secondary" _variant="secondary" {...ARGS}></KolLinkButton>
+			<KolLinkButton _label="Normal" _variant="normal" {...ARGS}></KolLinkButton>
+			<KolLinkButton _label="Danger" _variant="danger" {...ARGS}></KolLinkButton>
+			<KolLinkButton _label="Ghost" _variant="ghost" {...ARGS}></KolLinkButton>
+			<KolLinkButton _label="Access Key" _variant="primary" _accessKey="c" {...ARGS}></KolLinkButton>
+			<KolLinkButton _label="Short Key" _variant="primary" _shortKey="s" {...ARGS}></KolLinkButton>
 		</div>
 	</>
 );
diff --git a/packages/samples/react/src/components/tree/basic.tsx b/packages/samples/react/src/components/tree/basic.tsx
index c6bc8e0c6ad..34da26b474c 100644
--- a/packages/samples/react/src/components/tree/basic.tsx
+++ b/packages/samples/react/src/components/tree/basic.tsx
@@ -66,7 +66,7 @@ export const TreeBasic: FC = () => {
 
 			<p>Current tree item: {subPage ?? 'none'}</p>
 
-			<div className="flex flex-row gap-2">
+			<div className="flex flex-wrap gap-2">
 				<KolButton _label="Change label for '1 Home'" _on={{ onClick: updateHomeLabel }}></KolButton>
 				<KolButton _label="Toggle '2.1.2.2 Pets'" _on={{ onClick: () => setShowPets(!showPets) }}></KolButton>
 				<KolButton _label="Toggle '2.2.1 Europe' (two levels at once)" _on={{ onClick: () => setShowEurope(!showEurope) }}></KolButton>
diff --git a/packages/samples/react/src/style.scss b/packages/samples/react/src/style.scss
index 8398bd15531..df7cbca7a61 100644
--- a/packages/samples/react/src/style.scss
+++ b/packages/samples/react/src/style.scss
@@ -23,10 +23,7 @@ hr {
 
 .indented-text {
 	p {
-		font-family: var(--font-family);
-		border-left: rem(-2) solid var(--color-primary-variant);
-		padding: 0 calc(8rem / var(--kolibri-root-font-size, 16));
-		margin-left: rem(-2);
+		margin: 0;
 	}
 }
 
diff --git a/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-badge-basic-zoom-firefox-linux.png b/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-badge-basic-zoom-firefox-linux.png
index dacbf4ac79d..6241be48981 100644
Binary files a/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-badge-basic-zoom-firefox-linux.png and b/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-badge-basic-zoom-firefox-linux.png differ
diff --git a/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-badge-button-zoom-firefox-linux.png b/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-badge-button-zoom-firefox-linux.png
index f6f0aef573d..8e9a7eadeb9 100644
Binary files a/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-badge-button-zoom-firefox-linux.png and b/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-badge-button-zoom-firefox-linux.png differ
diff --git a/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-button-baselined-firefox-linux.png b/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-button-baselined-firefox-linux.png
index 01ab4bfa197..7cf932a9355 100644
Binary files a/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-button-baselined-firefox-linux.png and b/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-button-baselined-firefox-linux.png differ
diff --git a/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-button-baselined-zoom-firefox-linux.png b/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-button-baselined-zoom-firefox-linux.png
index d366a92bde2..0f4210e61e3 100644
Binary files a/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-button-baselined-zoom-firefox-linux.png and b/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-button-baselined-zoom-firefox-linux.png differ
diff --git a/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-link-button-basic-firefox-linux.png b/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-link-button-basic-firefox-linux.png
index fe784710b05..0b60fae6ec4 100644
Binary files a/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-link-button-basic-firefox-linux.png and b/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-link-button-basic-firefox-linux.png differ
diff --git a/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-link-button-basic-zoom-firefox-linux.png b/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-link-button-basic-zoom-firefox-linux.png
index 137086ed791..fbd855758ff 100644
Binary files a/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-link-button-basic-zoom-firefox-linux.png and b/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-link-button-basic-zoom-firefox-linux.png differ
diff --git a/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-tree-basic-home-firefox-linux.png b/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-tree-basic-home-firefox-linux.png
index e614de6a654..f14f48e6ec2 100644
Binary files a/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-tree-basic-home-firefox-linux.png and b/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-tree-basic-home-firefox-linux.png differ
diff --git a/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-tree-basic-home-zoom-firefox-linux.png b/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-tree-basic-home-zoom-firefox-linux.png
index c832b6c6b2b..bf9febc0b74 100644
Binary files a/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-tree-basic-home-zoom-firefox-linux.png and b/packages/test-tag-name-transformer/snapshots/theme-default/snapshot-for-tree-basic-home-zoom-firefox-linux.png differ
diff --git a/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-badge-basic-zoom-firefox-linux.png b/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-badge-basic-zoom-firefox-linux.png
index 2d43a741ecb..1780ccb2849 100644
Binary files a/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-badge-basic-zoom-firefox-linux.png and b/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-badge-basic-zoom-firefox-linux.png differ
diff --git a/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-badge-button-zoom-firefox-linux.png b/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-badge-button-zoom-firefox-linux.png
index 4e156e65b72..ce0eb59c142 100644
Binary files a/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-badge-button-zoom-firefox-linux.png and b/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-badge-button-zoom-firefox-linux.png differ
diff --git a/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-button-baselined-firefox-linux.png b/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-button-baselined-firefox-linux.png
index 7d43cb4c242..e653b116055 100644
Binary files a/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-button-baselined-firefox-linux.png and b/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-button-baselined-firefox-linux.png differ
diff --git a/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-button-baselined-zoom-firefox-linux.png b/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-button-baselined-zoom-firefox-linux.png
index 3ce01f269eb..4805ad4c33c 100644
Binary files a/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-button-baselined-zoom-firefox-linux.png and b/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-button-baselined-zoom-firefox-linux.png differ
diff --git a/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-link-button-basic-firefox-linux.png b/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-link-button-basic-firefox-linux.png
index bf93ba4f15e..016523df1a6 100644
Binary files a/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-link-button-basic-firefox-linux.png and b/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-link-button-basic-firefox-linux.png differ
diff --git a/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-link-button-basic-zoom-firefox-linux.png b/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-link-button-basic-zoom-firefox-linux.png
index 32610bc7e89..e748bf7ede2 100644
Binary files a/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-link-button-basic-zoom-firefox-linux.png and b/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-link-button-basic-zoom-firefox-linux.png differ
diff --git a/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-tree-basic-home-firefox-linux.png b/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-tree-basic-home-firefox-linux.png
index 0e79fa9b678..43e6f846eda 100644
Binary files a/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-tree-basic-home-firefox-linux.png and b/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-tree-basic-home-firefox-linux.png differ
diff --git a/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-tree-basic-home-zoom-firefox-linux.png b/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-tree-basic-home-zoom-firefox-linux.png
index 67358249f50..4d66a571171 100644
Binary files a/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-tree-basic-home-zoom-firefox-linux.png and b/packages/themes/bwst/snapshots/theme-bwst/snapshot-for-tree-basic-home-zoom-firefox-linux.png differ
diff --git a/packages/themes/default/snapshots/theme-default/snapshot-for-badge-basic-zoom-firefox-linux.png b/packages/themes/default/snapshots/theme-default/snapshot-for-badge-basic-zoom-firefox-linux.png
index dacbf4ac79d..6241be48981 100644
Binary files a/packages/themes/default/snapshots/theme-default/snapshot-for-badge-basic-zoom-firefox-linux.png and b/packages/themes/default/snapshots/theme-default/snapshot-for-badge-basic-zoom-firefox-linux.png differ
diff --git a/packages/themes/default/snapshots/theme-default/snapshot-for-badge-button-zoom-firefox-linux.png b/packages/themes/default/snapshots/theme-default/snapshot-for-badge-button-zoom-firefox-linux.png
index f6f0aef573d..8e9a7eadeb9 100644
Binary files a/packages/themes/default/snapshots/theme-default/snapshot-for-badge-button-zoom-firefox-linux.png and b/packages/themes/default/snapshots/theme-default/snapshot-for-badge-button-zoom-firefox-linux.png differ
diff --git a/packages/themes/default/snapshots/theme-default/snapshot-for-button-baselined-firefox-linux.png b/packages/themes/default/snapshots/theme-default/snapshot-for-button-baselined-firefox-linux.png
index 01ab4bfa197..7cf932a9355 100644
Binary files a/packages/themes/default/snapshots/theme-default/snapshot-for-button-baselined-firefox-linux.png and b/packages/themes/default/snapshots/theme-default/snapshot-for-button-baselined-firefox-linux.png differ
diff --git a/packages/themes/default/snapshots/theme-default/snapshot-for-button-baselined-zoom-firefox-linux.png b/packages/themes/default/snapshots/theme-default/snapshot-for-button-baselined-zoom-firefox-linux.png
index d366a92bde2..0f4210e61e3 100644
Binary files a/packages/themes/default/snapshots/theme-default/snapshot-for-button-baselined-zoom-firefox-linux.png and b/packages/themes/default/snapshots/theme-default/snapshot-for-button-baselined-zoom-firefox-linux.png differ
diff --git a/packages/themes/default/snapshots/theme-default/snapshot-for-link-button-basic-firefox-linux.png b/packages/themes/default/snapshots/theme-default/snapshot-for-link-button-basic-firefox-linux.png
index fe784710b05..0b60fae6ec4 100644
Binary files a/packages/themes/default/snapshots/theme-default/snapshot-for-link-button-basic-firefox-linux.png and b/packages/themes/default/snapshots/theme-default/snapshot-for-link-button-basic-firefox-linux.png differ
diff --git a/packages/themes/default/snapshots/theme-default/snapshot-for-link-button-basic-zoom-firefox-linux.png b/packages/themes/default/snapshots/theme-default/snapshot-for-link-button-basic-zoom-firefox-linux.png
index 137086ed791..fbd855758ff 100644
Binary files a/packages/themes/default/snapshots/theme-default/snapshot-for-link-button-basic-zoom-firefox-linux.png and b/packages/themes/default/snapshots/theme-default/snapshot-for-link-button-basic-zoom-firefox-linux.png differ
diff --git a/packages/themes/default/snapshots/theme-default/snapshot-for-tree-basic-home-firefox-linux.png b/packages/themes/default/snapshots/theme-default/snapshot-for-tree-basic-home-firefox-linux.png
index e614de6a654..f14f48e6ec2 100644
Binary files a/packages/themes/default/snapshots/theme-default/snapshot-for-tree-basic-home-firefox-linux.png and b/packages/themes/default/snapshots/theme-default/snapshot-for-tree-basic-home-firefox-linux.png differ
diff --git a/packages/themes/default/snapshots/theme-default/snapshot-for-tree-basic-home-zoom-firefox-linux.png b/packages/themes/default/snapshots/theme-default/snapshot-for-tree-basic-home-zoom-firefox-linux.png
index c832b6c6b2b..bf9febc0b74 100644
Binary files a/packages/themes/default/snapshots/theme-default/snapshot-for-tree-basic-home-zoom-firefox-linux.png and b/packages/themes/default/snapshots/theme-default/snapshot-for-tree-basic-home-zoom-firefox-linux.png differ