diff --git a/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-custom-popover-element-examples-chromium-dark-linux.png b/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-custom-popover-element-examples-chromium-dark-linux.png
index 683c3168a6..3dfdd7276f 100644
--- a/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-custom-popover-element-examples-chromium-dark-linux.png
+++ b/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-custom-popover-element-examples-chromium-dark-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3fec6abda3fe2d71ef99abc01cb62840f67aee5137813842558c21daa64d0ecf
-size 18286
+oid sha256:a39bf86f0a344818ff6b89d82407e4c715e6aada3fe2fa2028b866e23b738115
+size 18343
diff --git a/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-custom-popover-element-examples-chromium-light-linux.png b/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-custom-popover-element-examples-chromium-light-linux.png
index 7cfc73f602..9fa286bbae 100644
--- a/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-custom-popover-element-examples-chromium-light-linux.png
+++ b/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-custom-popover-element-examples-chromium-light-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9a5af0b1f03685b0331f78472b68b1de51ce1353c2aa51d8ba46486cf216392e
-size 16415
+oid sha256:50d40931b08caeb54c9aa102a6ce2efd27106f5556f10ae3e530a7ad2a0d9be7
+size 16421
diff --git a/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-custom-popover-onhover-element-examples-chromium-dark-linux.png b/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-custom-popover-onhover-element-examples-chromium-dark-linux.png
index 683c3168a6..3dfdd7276f 100644
--- a/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-custom-popover-onhover-element-examples-chromium-dark-linux.png
+++ b/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-custom-popover-onhover-element-examples-chromium-dark-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3fec6abda3fe2d71ef99abc01cb62840f67aee5137813842558c21daa64d0ecf
-size 18286
+oid sha256:a39bf86f0a344818ff6b89d82407e4c715e6aada3fe2fa2028b866e23b738115
+size 18343
diff --git a/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-custom-popover-onhover-element-examples-chromium-light-linux.png b/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-custom-popover-onhover-element-examples-chromium-light-linux.png
index 7cfc73f602..9fa286bbae 100644
--- a/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-custom-popover-onhover-element-examples-chromium-light-linux.png
+++ b/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-custom-popover-onhover-element-examples-chromium-light-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9a5af0b1f03685b0331f78472b68b1de51ce1353c2aa51d8ba46486cf216392e
-size 16415
+oid sha256:50d40931b08caeb54c9aa102a6ce2efd27106f5556f10ae3e530a7ad2a0d9be7
+size 16421
diff --git a/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-custom-style-element-examples-chromium-dark-linux.png b/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-custom-style-element-examples-chromium-dark-linux.png
index 8e2d4087f2..cbc4197494 100644
--- a/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-custom-style-element-examples-chromium-dark-linux.png
+++ b/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-custom-style-element-examples-chromium-dark-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c36be5a2ef5ba712ce8cc47d92742804296b9065b9db03f500b407a8c0711a08
-size 18385
+oid sha256:81efe1b3e3129e9f1a830bdcb445aab93d761fe5af72deee29b6c16876c1e060
+size 18448
diff --git a/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-custom-style-element-examples-chromium-light-linux.png b/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-custom-style-element-examples-chromium-light-linux.png
index 39228c3f25..0652606e3c 100644
--- a/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-custom-style-element-examples-chromium-light-linux.png
+++ b/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-custom-style-element-examples-chromium-light-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1763fe328c9fa17820f59b3892c5d0ad09c1961983adeb7b462fe88a18f23a86
-size 15700
+oid sha256:43741169914834c4859311487ae9dfbf8b0dfab5aacddd849bb8d4e0d24d12ce
+size 15705
diff --git a/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-custom-zoom-levels-element-examples-chromium-dark-linux.png b/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-custom-zoom-levels-element-examples-chromium-dark-linux.png
index 5dd604b5af..ef5c1025e4 100644
--- a/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-custom-zoom-levels-element-examples-chromium-dark-linux.png
+++ b/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-custom-zoom-levels-element-examples-chromium-dark-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d5fb5a10c7d0f2013473239666a5c23c85d8b506f6888351a1e7a22d0ed22da8
-size 18534
+oid sha256:f950709986b4bde5e8a99f17c4c2452b71605243dd5314eac7586d1ce537abc9
+size 18677
diff --git a/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-custom-zoom-levels-element-examples-chromium-light-linux.png b/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-custom-zoom-levels-element-examples-chromium-light-linux.png
index c6d36e1fed..41ea3c08ab 100644
--- a/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-custom-zoom-levels-element-examples-chromium-light-linux.png
+++ b/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-custom-zoom-levels-element-examples-chromium-light-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9806c97d8e745a4ba0fff3364c0d1440d7588b7b5f96e44c816059251a0b39bb
-size 16651
+oid sha256:6d3622577489e43eaf67c43f6166bb30488fdd578bfba097a28ce945cee3f049
+size 16745
diff --git a/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-default-style-element-examples-chromium-dark-linux.png b/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-default-style-element-examples-chromium-dark-linux.png
index 683c3168a6..3dfdd7276f 100644
--- a/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-default-style-element-examples-chromium-dark-linux.png
+++ b/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-default-style-element-examples-chromium-dark-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3fec6abda3fe2d71ef99abc01cb62840f67aee5137813842558c21daa64d0ecf
-size 18286
+oid sha256:a39bf86f0a344818ff6b89d82407e4c715e6aada3fe2fa2028b866e23b738115
+size 18343
diff --git a/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-default-style-element-examples-chromium-light-linux.png b/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-default-style-element-examples-chromium-light-linux.png
index 7cfc73f602..9fa286bbae 100644
--- a/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-default-style-element-examples-chromium-light-linux.png
+++ b/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-default-style-element-examples-chromium-light-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9a5af0b1f03685b0331f78472b68b1de51ce1353c2aa51d8ba46486cf216392e
-size 16415
+oid sha256:50d40931b08caeb54c9aa102a6ce2efd27106f5556f10ae3e530a7ad2a0d9be7
+size 16421
diff --git a/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-grouping-element-examples-chromium-dark-linux.png b/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-grouping-element-examples-chromium-dark-linux.png
index 3366d6ece2..655af7d04d 100644
--- a/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-grouping-element-examples-chromium-dark-linux.png
+++ b/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-grouping-element-examples-chromium-dark-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d736012c6c7cbf08da5f94ce4fb0cc5c57143bee20678e4d08312559ef7e01f6
-size 14296
+oid sha256:5dd1d7c6a37f4e1da0dbb20d554b8869853e17a05d83a97b0577036ba1a09908
+size 14386
diff --git a/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-grouping-element-examples-chromium-light-linux.png b/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-grouping-element-examples-chromium-light-linux.png
index 70fa41b662..c254af18a0 100644
--- a/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-grouping-element-examples-chromium-light-linux.png
+++ b/playwright/snapshots/maps/static.spec.ts-snapshots/si-map--si-map-grouping-element-examples-chromium-light-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b4c1c403dc639ef6d22252ee25a49d508383c9a21625e914bf5f05244db2ff4a
-size 12997
+oid sha256:1fceaf07458d99b98849e02d23bb19d0e8f4a78060f9340a216199b3dfe9d0c0
+size 13006
diff --git a/projects/maps-ng/src/components/si-map/si-map.component.scss b/projects/maps-ng/src/components/si-map/si-map.component.scss
index fe16bfe342..e9027929f8 100644
--- a/projects/maps-ng/src/components/si-map/si-map.component.scss
+++ b/projects/maps-ng/src/components/si-map/si-map.component.scss
@@ -1,7 +1,7 @@
 @use 'sass:map';
 @use '@siemens/element-theme/src/styles/variables';
 
-$main-button-block-size: 32px;
+$main-button-block-size: calc(1rem + 2 * map.get(variables.$spacers, 4));
 $main-button-margin: 1px;
 
 :host {
@@ -29,9 +29,9 @@ $main-button-margin: 1px;
       margin: 0;
       line-height: 1;
       border-radius: 0;
-      inline-size: 32px;
+      inline-size: $main-button-block-size;
       block-size: $main-button-block-size;
-      font-size: 1.5rem;
+      font-size: variables.$si-icon-font-size;
       outline: none;
 
       &:hover {
@@ -68,8 +68,9 @@ $main-button-margin: 1px;
   }
 
   .ol-zoom {
-    padding-block-end: map.get(variables.$spacers, 4) + $main-button-margin +
-      $main-button-block-size;
+    padding-block-end: calc(
+      #{map.get(variables.$spacers, 4) + $main-button-margin} + #{$main-button-block-size}
+    );
   }
 
   .ol-attribution {
@@ -86,7 +87,9 @@ $main-button-margin: 1px;
   }
 
   .ol-full-screen {
-    inset-block-end: 10 * map.get(variables.$spacers, 4);
+    inset-block-end: calc(
+      #{map.get(variables.$spacers, 4) + 3 * $main-button-margin} + 3 * $main-button-block-size
+    );
     inset-inline-end: map.get(variables.$spacers, 4);
   }