diff --git a/ui/src/main/java/kiwi/orbit/compose/ui/controls/Icon.kt b/ui/src/main/java/kiwi/orbit/compose/ui/controls/Icon.kt
index 10c0aba42..ec1d20a37 100644
--- a/ui/src/main/java/kiwi/orbit/compose/ui/controls/Icon.kt
+++ b/ui/src/main/java/kiwi/orbit/compose/ui/controls/Icon.kt
@@ -16,6 +16,8 @@ import androidx.compose.ui.graphics.toolingGraphicsLayer
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.layout.IntrinsicMeasurable
+import androidx.compose.ui.layout.IntrinsicMeasureScope
 import androidx.compose.ui.layout.LayoutModifier
 import androidx.compose.ui.layout.Measurable
 import androidx.compose.ui.layout.MeasureResult
@@ -139,6 +141,18 @@ private data class DefaultSizeModifier(
             placeable.placeRelative(0, 0)
         }
     }
+
+    override fun IntrinsicMeasureScope.maxIntrinsicHeight(measurable: IntrinsicMeasurable, width: Int): Int =
+        defaultSize.roundToPx()
+
+    override fun IntrinsicMeasureScope.maxIntrinsicWidth(measurable: IntrinsicMeasurable, height: Int): Int =
+        defaultSize.roundToPx()
+
+    override fun IntrinsicMeasureScope.minIntrinsicHeight(measurable: IntrinsicMeasurable, width: Int): Int =
+        defaultSize.roundToPx()
+
+    override fun IntrinsicMeasureScope.minIntrinsicWidth(measurable: IntrinsicMeasurable, height: Int): Int =
+        defaultSize.roundToPx()
 }
 
 @OrbitPreviews
diff --git a/ui/src/test/snapshots/images/kiwi.orbit.compose.ui_ScreenshotTest_choiceTileCentered_big.png b/ui/src/test/snapshots/images/kiwi.orbit.compose.ui_ScreenshotTest_choiceTileCentered_big.png
index 03983dc0d..f5aeaee86 100644
--- a/ui/src/test/snapshots/images/kiwi.orbit.compose.ui_ScreenshotTest_choiceTileCentered_big.png
+++ b/ui/src/test/snapshots/images/kiwi.orbit.compose.ui_ScreenshotTest_choiceTileCentered_big.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:68a7bccd7ab7e5878c35c5cf04191635d2232c19ad61d99d759ca9bb6348e905
-size 65389
+oid sha256:5653c78b8c5d14988810f236ddb312db5eb147d1d0218c37bf05bfd97664a37d
+size 65604
diff --git a/ui/src/test/snapshots/images/kiwi.orbit.compose.ui_ScreenshotTest_tileGroup_big.png b/ui/src/test/snapshots/images/kiwi.orbit.compose.ui_ScreenshotTest_tileGroup_big.png
index 5c118d4e4..5e808cab5 100644
--- a/ui/src/test/snapshots/images/kiwi.orbit.compose.ui_ScreenshotTest_tileGroup_big.png
+++ b/ui/src/test/snapshots/images/kiwi.orbit.compose.ui_ScreenshotTest_tileGroup_big.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:68d42c4e4cb79959b3cedf06eff29d8e6cff101245db2eecfe039f305405ea8e
-size 39916
+oid sha256:2e3c0e65a06cb3ba8eab64c87fecfb1efac454e9b402a19a67c869f5c2ef70f4
+size 40478
diff --git a/ui/src/test/snapshots/images/kiwi.orbit.compose.ui_ScreenshotTest_tile_big.png b/ui/src/test/snapshots/images/kiwi.orbit.compose.ui_ScreenshotTest_tile_big.png
index 9e86b0b63..6ab71d071 100644
--- a/ui/src/test/snapshots/images/kiwi.orbit.compose.ui_ScreenshotTest_tile_big.png
+++ b/ui/src/test/snapshots/images/kiwi.orbit.compose.ui_ScreenshotTest_tile_big.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:610a1b76a61f8bd1e325f9f9f695bf010a074870f16a222f04a2e4f5b840161f
-size 41542
+oid sha256:3dbc01e0a9d8f39b92bd77ad402aa2d3dc3973dcc63e16f12cebb19c285991d0
+size 42415