Migrate screenshot tests to Roborazzi (#2181)

687 files changed, 2225 insertions, 2262 deletions

diff --git a/.github/workflows/fixup.yml b/.github/workflows/fixup.yml
index 5baa026c..a7949bef 100644
--- a/.github/workflows/fixup.yml
+++ b/.github/workflows/fixup.yml
@@ -53,7 +53,8 @@ jobs:
 
       - name: Push new screenshots if available
         uses: stefanzweifel/git-auto-commit-action@v5
+        if: ${{ always() }}
         with:
-          file_pattern: '**/snapshots/images/*.png'
+          file_pattern: '**/snapshots/images/*.png **/screenshots/*.png'
           disable_globbing: true
           commit_message: "🤖 Updates screenshots"
diff --git a/.idea/kotlinScripting.xml b/.idea/kotlinScripting.xml
deleted file mode 100644
index a6fe551d..00000000
--- a/.idea/kotlinScripting.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="KotlinScriptingSettings">
-    <option name="isAutoReloadEnabled" value="true" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 8491b65f..b2958f46 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -4,6 +4,6 @@
     <option name="jvmTarget" value="1.8" />
   </component>
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.9.22" />
+    <option name="version" value="1.9.23" />
   </component>
 </project>
\ No newline at end of file
diff --git a/ai/ui/build.gradle.kts b/ai/ui/build.gradle.kts
index 7c778dd0..2b8830a6 100644
--- a/ai/ui/build.gradle.kts
+++ b/ai/ui/build.gradle.kts
@@ -19,6 +19,7 @@ plugins {
     id("org.jetbrains.dokka")
     id("me.tylerbwong.gradle.metalava")
     kotlin("android")
+    alias(libs.plugins.roborazzi)
 }
 
 android {
diff --git a/ai/ui/src/test/java/com/google/android/horologist/ai/composables/components/PromptScreenTest.kt b/ai/ui/src/test/java/com/google/android/horologist/ai/composables/components/PromptScreenTest.kt
index 7bce4c64..3185a5d5 100644
--- a/ai/ui/src/test/java/com/google/android/horologist/ai/composables/components/PromptScreenTest.kt
+++ b/ai/ui/src/test/java/com/google/android/horologist/ai/composables/components/PromptScreenTest.kt
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.ai.composables.components
 
 import androidx.compose.material.icons.Icons
@@ -26,16 +24,13 @@ import com.google.android.horologist.ai.ui.model.TextResponseUiModel
 import com.google.android.horologist.ai.ui.screens.PromptScreen
 import com.google.android.horologist.ai.ui.screens.PromptUiState
 import com.google.android.horologist.compose.material.Button
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
-import com.google.android.horologist.screenshots.ScreenshotTestRule.Companion.screenshotTestRuleParams
+import com.google.android.horologist.screenshots.rng.WearLegacyScreenTest
 import org.junit.Test
 
-class PromptScreenTest : ScreenshotBaseTest(
-    screenshotTestRuleParams {},
-) {
+class PromptScreenTest : WearLegacyScreenTest() {
     @Test
     fun empty() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             PromptScreen(
                 uiState = PromptUiState(
                     modelInfo = ModelInstanceUiModel("simple", "Simple Model"),
diff --git a/ai/ui/src/test/snapshots/images/com.google.android.horologist.ai.composables.components_PromptScreenTest_empty.png b/ai/ui/src/test/snapshots/images/com.google.android.horologist.ai.composables.components_PromptScreenTest_empty.png
index ece44800..3349a561 100644
--- a/ai/ui/src/test/snapshots/images/com.google.android.horologist.ai.composables.components_PromptScreenTest_empty.png
+++ b/ai/ui/src/test/snapshots/images/com.google.android.horologist.ai.composables.components_PromptScreenTest_empty.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:654aed5fc070ff2a860c8390639178786c182ddbad809d43868a07de107d5644
-size 38969
+oid sha256:90b4ab2a405bcdec76f3b67ba722fc775e53c204af0b25a6ec419eeba60927dd
+size 25494
diff --git a/auth/composables/build.gradle.kts b/auth/composables/build.gradle.kts
index 1deabe88..e61dcc81 100644
--- a/auth/composables/build.gradle.kts
+++ b/auth/composables/build.gradle.kts
@@ -20,6 +20,7 @@ plugins {
     id("me.tylerbwong.gradle.metalava")
     alias(libs.plugins.dependencyAnalysis)
     kotlin("android")
+    alias(libs.plugins.roborazzi)
 }
 
 android {
diff --git a/auth/composables/src/main/java/com/google/android/horologist/auth/composables/dialogs/SignedInConfirmationDialog.kt b/auth/composables/src/main/java/com/google/android/horologist/auth/composables/dialogs/SignedInConfirmationDialog.kt
index b5c783a6..cffd97a1 100644
--- a/auth/composables/src/main/java/com/google/android/horologist/auth/composables/dialogs/SignedInConfirmationDialog.kt
+++ b/auth/composables/src/main/java/com/google/android/horologist/auth/composables/dialogs/SignedInConfirmationDialog.kt
@@ -43,6 +43,7 @@ import androidx.wear.compose.material.Text
 import androidx.wear.compose.material.dialog.DialogDefaults
 import com.google.android.horologist.auth.composables.R
 import com.google.android.horologist.auth.composables.model.AccountUiModel
+import com.google.android.horologist.compose.layout.ScreenScaffold
 import com.google.android.horologist.compose.material.Confirmation
 import com.google.android.horologist.compose.material.util.DECORATIVE_ELEMENT_CONTENT_DESCRIPTION
 import com.google.android.horologist.images.base.paintable.Paintable
@@ -113,71 +114,73 @@ internal fun SignedInConfirmationDialogContent(
     val configuration = LocalConfiguration.current
     val horizontalPadding = (configuration.screenWidthDp * HORIZONTAL_PADDING_SCREEN_PERCENTAGE).dp
 
-    Column(
-        modifier = modifier
-            .fillMaxSize()
-            .padding(horizontal = horizontalPadding),
-        verticalArrangement = Arrangement.Center,
-        horizontalAlignment = Alignment.CenterHorizontally,
-    ) {
-        val hasName = !name.isNullOrEmpty()
-
-        Box(
-            modifier = Modifier
-                .size(60.dp)
-                .background(color = Color(AVATAR_BACKGROUND_COLOR), shape = CircleShape),
-            contentAlignment = Alignment.Center,
+    ScreenScaffold(timeText = {}) {
+        Column(
+            modifier = modifier
+                .fillMaxSize()
+                .padding(horizontal = horizontalPadding),
+            verticalArrangement = Arrangement.Center,
+            horizontalAlignment = Alignment.CenterHorizontally,
         ) {
-            if (avatar != null) {
-                Image(
-                    modifier = Modifier.clip(CircleShape),
-                    painter = avatar.rememberPainter(),
-                    contentDescription = DECORATIVE_ELEMENT_CONTENT_DESCRIPTION,
-                    contentScale = ContentScale.Fit,
-                )
-            } else if (hasName) {
-                Text(
-                    text = name!!.first().uppercase(),
-                    modifier = Modifier
-                        .align(Alignment.Center)
-                        .fillMaxWidth(),
-                    color = Color(AVATAR_TEXT_COLOR),
-                    fontSize = 24.sp,
-                    textAlign = TextAlign.Center,
-                )
-            }
-        }
+            val hasName = !name.isNullOrEmpty()
 
-        Text(
-            text = if (hasName) {
-                stringResource(
-                    id = R.string.horologist_signedin_confirmation_greeting,
-                    name!!,
-                )
-            } else {
-                stringResource(id = R.string.horologist_signedin_confirmation_greeting_no_name)
-            },
-            modifier = Modifier
-                .padding(top = 8.dp)
-                .fillMaxWidth(),
-            textAlign = TextAlign.Center,
-            overflow = TextOverflow.Ellipsis,
-            maxLines = 1,
-            style = MaterialTheme.typography.title3,
-        )
+            Box(
+                modifier = Modifier
+                    .size(60.dp)
+                    .background(color = Color(AVATAR_BACKGROUND_COLOR), shape = CircleShape),
+                contentAlignment = Alignment.Center,
+            ) {
+                if (avatar != null) {
+                    Image(
+                        modifier = Modifier.clip(CircleShape),
+                        painter = avatar.rememberPainter(),
+                        contentDescription = DECORATIVE_ELEMENT_CONTENT_DESCRIPTION,
+                        contentScale = ContentScale.Fit,
+                    )
+                } else if (hasName) {
+                    Text(
+                        text = name!!.first().uppercase(),
+                        modifier = Modifier
+                            .align(Alignment.Center)
+                            .fillMaxWidth(),
+                        color = Color(AVATAR_TEXT_COLOR),
+                        fontSize = 24.sp,
+                        textAlign = TextAlign.Center,
+                    )
+                }
+            }
 
-        email?.let {
             Text(
-                text = email,
+                text = if (hasName) {
+                    stringResource(
+                        id = R.string.horologist_signedin_confirmation_greeting,
+                        name!!,
+                    )
+                } else {
+                    stringResource(id = R.string.horologist_signedin_confirmation_greeting_no_name)
+                },
                 modifier = Modifier
-                    .padding(top = 4.dp)
+                    .padding(top = 8.dp)
                     .fillMaxWidth(),
-                color = MaterialTheme.colors.onSurfaceVariant,
                 textAlign = TextAlign.Center,
                 overflow = TextOverflow.Ellipsis,
                 maxLines = 1,
-                style = MaterialTheme.typography.body2,
+                style = MaterialTheme.typography.title3,
             )
+
+            email?.let {
+                Text(
+                    text = email,
+                    modifier = Modifier
+                        .padding(top = 4.dp)
+                        .fillMaxWidth(),
+                    color = MaterialTheme.colors.onSurfaceVariant,
+                    textAlign = TextAlign.Center,
+                    overflow = TextOverflow.Ellipsis,
+                    maxLines = 1,
+                    style = MaterialTheme.typography.body2,
+                )
+            }
         }
     }
 }
diff --git a/auth/composables/src/main/java/com/google/android/horologist/auth/composables/screens/AuthErrorScreen.kt b/auth/composables/src/main/java/com/google/android/horologist/auth/composables/screens/AuthErrorScreen.kt
index 3051e538..bc9a2487 100644
--- a/auth/composables/src/main/java/com/google/android/horologist/auth/composables/screens/AuthErrorScreen.kt
+++ b/auth/composables/src/main/java/com/google/android/horologist/auth/composables/screens/AuthErrorScreen.kt
@@ -28,6 +28,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.wear.compose.material.Text
 import com.google.android.horologist.auth.composables.R
+import com.google.android.horologist.compose.layout.ScreenScaffold
 
 /**
  * A catch all error screen to be displayed to users when an error occurred during authentication
@@ -37,17 +38,19 @@ import com.google.android.horologist.auth.composables.R
 public fun AuthErrorScreen(
     modifier: Modifier = Modifier,
 ) {
-    Column(
-        modifier = modifier.fillMaxSize(),
-        verticalArrangement = Arrangement.Center,
+    ScreenScaffold(timeText = {}) {
+        Column(
+            modifier = modifier.fillMaxSize(),
+            verticalArrangement = Arrangement.Center,
 
-    ) {
-        Text(
-            text = stringResource(id = R.string.horologist_auth_error_message),
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(horizontal = 30.dp),
-            textAlign = TextAlign.Center,
-        )
+        ) {
+            Text(
+                text = stringResource(id = R.string.horologist_auth_error_message),
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 30.dp),
+                textAlign = TextAlign.Center,
+            )
+        }
     }
 }
diff --git a/auth/composables/src/main/java/com/google/android/horologist/auth/composables/screens/CheckYourPhoneScreen.kt b/auth/composables/src/main/java/com/google/android/horologist/auth/composables/screens/CheckYourPhoneScreen.kt
index 26a4089f..05cb10f3 100644
--- a/auth/composables/src/main/java/com/google/android/horologist/auth/composables/screens/CheckYourPhoneScreen.kt
+++ b/auth/composables/src/main/java/com/google/android/horologist/auth/composables/screens/CheckYourPhoneScreen.kt
@@ -40,6 +40,7 @@ import androidx.wear.compose.material.Icon
 import androidx.wear.compose.material.MaterialTheme
 import androidx.wear.compose.material.Text
 import com.google.android.horologist.auth.composables.R
+import com.google.android.horologist.compose.layout.ScreenScaffold
 import com.google.android.horologist.compose.material.util.DECORATIVE_ELEMENT_CONTENT_DESCRIPTION
 
 private const val TOP_PADDING_SCREEN_PERCENTAGE = 0.1248f
@@ -93,48 +94,50 @@ public fun CheckYourPhoneScreen(
     val textPadding =
         if (isLarge) (configuration.screenHeightDp * TEXT_PADDING_SCREEN_PERCENTAGE).dp else 0.dp
 
-    Column(
-        modifier = modifier
-            .fillMaxSize()
-            .padding(
-                top = topPadding,
-                bottom = bottomPadding,
-                start = sidePadding,
-                end = sidePadding,
-            ),
-    ) {
+    ScreenScaffold(timeText = {}) {
         Column(
-            modifier = Modifier
-                .fillMaxWidth()
-                .weight(1f)
-                .padding(horizontal = textPadding),
-            verticalArrangement = Arrangement.Center,
+            modifier = modifier
+                .fillMaxSize()
+                .padding(
+                    top = topPadding,
+                    bottom = bottomPadding,
+                    start = sidePadding,
+                    end = sidePadding,
+                ),
         ) {
-            Text(
-                text = stringResource(id = R.string.horologist_check_your_phone_title),
+            Column(
                 modifier = Modifier
                     .fillMaxWidth()
-                    .align(Alignment.CenterHorizontally),
-                textAlign = TextAlign.Center,
-                style = MaterialTheme.typography.title3,
-            )
-
-            if (message != null) {
+                    .weight(1f)
+                    .padding(horizontal = textPadding),
+                verticalArrangement = Arrangement.Center,
+            ) {
                 Text(
-                    text = message,
+                    text = stringResource(id = R.string.horologist_check_your_phone_title),
                     modifier = Modifier
-                        .padding(top = 20.dp)
                         .fillMaxWidth()
                         .align(Alignment.CenterHorizontally),
                     textAlign = TextAlign.Center,
+                    style = MaterialTheme.typography.title3,
                 )
+
+                if (message != null) {
+                    Text(
+                        text = message,
+                        modifier = Modifier
+                            .padding(top = 20.dp)
+                            .fillMaxWidth()
+                            .align(Alignment.CenterHorizontally),
+                        textAlign = TextAlign.Center,
+                    )
+                }
             }
-        }
 
-        ProgressCircle(
-            Modifier
-                .align(Alignment.CenterHorizontally),
-        )
+            ProgressCircle(
+                Modifier
+                    .align(Alignment.CenterHorizontally),
+            )
+        }
     }
 }
 
diff --git a/auth/composables/src/main/java/com/google/android/horologist/auth/composables/screens/SignInPlaceholderScreen.kt b/auth/composables/src/main/java/com/google/android/horologist/auth/composables/screens/SignInPlaceholderScreen.kt
index a18b4abd..c8270c5e 100644
--- a/auth/composables/src/main/java/com/google/android/horologist/auth/composables/screens/SignInPlaceholderScreen.kt
+++ b/auth/composables/src/main/java/com/google/android/horologist/auth/composables/screens/SignInPlaceholderScreen.kt
@@ -37,6 +37,7 @@ import androidx.compose.ui.unit.dp
 import androidx.wear.compose.material.MaterialTheme
 import androidx.wear.compose.material.Text
 import com.google.android.horologist.auth.composables.R
+import com.google.android.horologist.compose.layout.ScreenScaffold
 
 private const val AVATAR_BACKGROUND_COLOR = 0xFF3C4043
 private const val BOTTOM_PADDING_SCREEN_PERCENTAGE = 0.094
@@ -57,32 +58,34 @@ public fun SignInPlaceholderScreen(
     val horizontalPadding = (configuration.screenWidthDp * HORIZONTAL_PADDING_SCREEN_PERCENTAGE).dp
     val bottomPadding = (configuration.screenHeightDp * BOTTOM_PADDING_SCREEN_PERCENTAGE).dp
 
-    Column(
-        modifier = modifier
-            .fillMaxSize()
-            .padding(horizontal = horizontalPadding)
-            .padding(bottom = bottomPadding),
-        verticalArrangement = Arrangement.Center,
-        horizontalAlignment = Alignment.CenterHorizontally,
-    ) {
-        Box(
-            modifier = Modifier
-                .size(60.dp)
-                .background(
-                    color = Color(AVATAR_BACKGROUND_COLOR),
-                    shape = CircleShape,
-                ),
-        )
+    ScreenScaffold(timeText = {}) {
+        Column(
+            modifier = modifier
+                .fillMaxSize()
+                .padding(horizontal = horizontalPadding)
+                .padding(bottom = bottomPadding),
+            verticalArrangement = Arrangement.Center,
+            horizontalAlignment = Alignment.CenterHorizontally,
+        ) {
+            Box(
+                modifier = Modifier
+                    .size(60.dp)
+                    .background(
+                        color = Color(AVATAR_BACKGROUND_COLOR),
+                        shape = CircleShape,
+                    ),
+            )
 
-        Text(
-            text = message,
-            modifier = Modifier
-                .padding(top = 8.dp)
-                .fillMaxWidth(),
-            textAlign = TextAlign.Center,
-            overflow = TextOverflow.Ellipsis,
-            maxLines = 1,
-            style = MaterialTheme.typography.title3,
-        )
+            Text(
+                text = message,
+                modifier = Modifier
+                    .padding(top = 8.dp)
+                    .fillMaxWidth(),
+                textAlign = TextAlign.Center,
+                overflow = TextOverflow.Ellipsis,
+                maxLines = 1,
+                style = MaterialTheme.typography.title3,
+            )
+        }
     }
 }
diff --git a/auth/composables/src/test/java/com/google/android/horologist/auth/composables/chips/AccountChipTest.kt b/auth/composables/src/test/java/com/google/android/horologist/auth/composables/chips/AccountChipTest.kt
index c6eef3ab..fffc297f 100644
--- a/auth/composables/src/test/java/com/google/android/horologist/auth/composables/chips/AccountChipTest.kt
+++ b/auth/composables/src/test/java/com/google/android/horologist/auth/composables/chips/AccountChipTest.kt
@@ -14,19 +14,17 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.auth.composables.chips
 
 import androidx.wear.compose.material.ChipDefaults
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
+import com.google.android.horologist.screenshots.rng.WearLegacyComponentTest
 import org.junit.Test
 
-class AccountChipTest : ScreenshotBaseTest() {
+class AccountChipTest : WearLegacyComponentTest() {
 
     @Test
     fun default() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             AccountChip(
                 email = "maggie@example.com",
                 onClick = {},
@@ -36,7 +34,7 @@ class AccountChipTest : ScreenshotBaseTest() {
 
     @Test
     fun disabled() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             AccountChip(
                 email = "maggie@example.com",
                 onClick = {},
@@ -47,7 +45,7 @@ class AccountChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withSmallAvatar() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             AccountChip(
                 email = "maggie@example.com",
                 onClick = {},
@@ -58,7 +56,7 @@ class AccountChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withSecondaryChipType() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             AccountChip(
                 email = "maggie@example.com",
                 onClick = {},
@@ -69,7 +67,7 @@ class AccountChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withLongEmailAddress() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             AccountChip(
                 email = "thisisaverylongemailaddresssample@example.com",
                 onClick = {},
@@ -79,7 +77,7 @@ class AccountChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withEmailAddressStartingWithSingleLetterAndDot() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             AccountChip(
                 email = "p.thisisaverylongemailaddress@example.com",
                 onClick = {},
diff --git a/auth/composables/src/test/java/com/google/android/horologist/auth/composables/chips/CreateAccountChipTest.kt b/auth/composables/src/test/java/com/google/android/horologist/auth/composables/chips/CreateAccountChipTest.kt
index a4d09f64..cd86b872 100644
--- a/auth/composables/src/test/java/com/google/android/horologist/auth/composables/chips/CreateAccountChipTest.kt
+++ b/auth/composables/src/test/java/com/google/android/horologist/auth/composables/chips/CreateAccountChipTest.kt
@@ -14,26 +14,24 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.auth.composables.chips
 
 import androidx.wear.compose.material.ChipDefaults
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
+import com.google.android.horologist.screenshots.rng.WearLegacyComponentTest
 import org.junit.Test
 
-class CreateAccountChipTest : ScreenshotBaseTest() {
+class CreateAccountChipTest : WearLegacyComponentTest() {
 
     @Test
     fun default() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             CreateAccountChip(onClick = {})
         }
     }
 
     @Test
     fun disabled() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             CreateAccountChip(
                 onClick = {},
                 enabled = false,
@@ -43,7 +41,7 @@ class CreateAccountChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withLargeIconSpace() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             CreateAccountChip(
                 onClick = {},
                 largeIconSpace = true,
@@ -53,7 +51,7 @@ class CreateAccountChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withSecondaryChipType() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             CreateAccountChip(
                 onClick = {},
                 colors = ChipDefaults.secondaryChipColors(),
diff --git a/auth/composables/src/test/java/com/google/android/horologist/auth/composables/chips/GuestModeChipTest.kt b/auth/composables/src/test/java/com/google/android/horologist/auth/composables/chips/GuestModeChipTest.kt
index 540ba63d..3aa1cd2e 100644
--- a/auth/composables/src/test/java/com/google/android/horologist/auth/composables/chips/GuestModeChipTest.kt
+++ b/auth/composables/src/test/java/com/google/android/horologist/auth/composables/chips/GuestModeChipTest.kt
@@ -14,26 +14,24 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.auth.composables.chips
 
 import androidx.wear.compose.material.ChipDefaults
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
+import com.google.android.horologist.screenshots.rng.WearLegacyComponentTest
 import org.junit.Test
 
-class GuestModeChipTest : ScreenshotBaseTest() {
+class GuestModeChipTest : WearLegacyComponentTest() {
 
     @Test
     fun default() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             GuestModeChip(onClick = {})
         }
     }
 
     @Test
     fun disabled() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             GuestModeChip(
                 onClick = {},
                 enabled = false,
@@ -43,7 +41,7 @@ class GuestModeChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withSecondaryChipType() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             GuestModeChip(
                 onClick = {},
                 colors = ChipDefaults.secondaryChipColors(),
@@ -53,7 +51,7 @@ class GuestModeChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withSecondaryChipTypeDisabled() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             GuestModeChip(
                 onClick = {},
                 colors = ChipDefaults.secondaryChipColors(),
diff --git a/auth/composables/src/test/java/com/google/android/horologist/auth/composables/chips/OtherOptionsChipTest.kt b/auth/composables/src/test/java/com/google/android/horologist/auth/composables/chips/OtherOptionsChipTest.kt
index 419fe93d..a54fa4c0 100644
--- a/auth/composables/src/test/java/com/google/android/horologist/auth/composables/chips/OtherOptionsChipTest.kt
+++ b/auth/composables/src/test/java/com/google/android/horologist/auth/composables/chips/OtherOptionsChipTest.kt
@@ -14,26 +14,24 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.auth.composables.chips
 
 import androidx.wear.compose.material.ChipDefaults
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
+import com.google.android.horologist.screenshots.rng.WearLegacyComponentTest
 import org.junit.Test
 
-class OtherOptionsChipTest : ScreenshotBaseTest() {
+class OtherOptionsChipTest : WearLegacyComponentTest() {
 
     @Test
     fun default() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             OtherOptionsChip(onClick = {})
         }
     }
 
     @Test
     fun disabled() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             OtherOptionsChip(
                 onClick = {},
                 enabled = false,
@@ -43,7 +41,7 @@ class OtherOptionsChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withSecondaryChipType() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             OtherOptionsChip(
                 onClick = {},
                 colors = ChipDefaults.secondaryChipColors(),
@@ -53,7 +51,7 @@ class OtherOptionsChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withSecondaryChipTypeDisabled() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             OtherOptionsChip(
                 onClick = {},
                 colors = ChipDefaults.secondaryChipColors(),
diff --git a/auth/composables/src/test/java/com/google/android/horologist/auth/composables/chips/SignInChipTest.kt b/auth/composables/src/test/java/com/google/android/horologist/auth/composables/chips/SignInChipTest.kt
index 6592dfd7..ed2cbb6a 100644
--- a/auth/composables/src/test/java/com/google/android/horologist/auth/composables/chips/SignInChipTest.kt
+++ b/auth/composables/src/test/java/com/google/android/horologist/auth/composables/chips/SignInChipTest.kt
@@ -14,26 +14,24 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.auth.composables.chips
 
 import androidx.wear.compose.material.ChipDefaults
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
+import com.google.android.horologist.screenshots.rng.WearLegacyComponentTest
 import org.junit.Test
 
-class SignInChipTest : ScreenshotBaseTest() {
+class SignInChipTest : WearLegacyComponentTest() {
 
     @Test
     fun default() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             SignInChip(onClick = {})
         }
     }
 
     @Test
     fun disabled() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             SignInChip(
                 onClick = {},
                 enabled = false,
@@ -43,7 +41,7 @@ class SignInChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withSecondaryChipType() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             SignInChip(
                 onClick = {},
                 colors = ChipDefaults.secondaryChipColors(),
@@ -53,7 +51,7 @@ class SignInChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withSecondaryChipTypeDisabled() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             SignInChip(
                 onClick = {},
                 colors = ChipDefaults.secondaryChipColors(),
diff --git a/auth/composables/src/test/java/com/google/android/horologist/auth/composables/dialogs/SignedInConfirmationDialogTest.kt b/auth/composables/src/test/java/com/google/android/horologist/auth/composables/dialogs/SignedInConfirmationDialogTest.kt
index 0e3b6f03..462204c2 100644
--- a/auth/composables/src/test/java/com/google/android/horologist/auth/composables/dialogs/SignedInConfirmationDialogTest.kt
+++ b/auth/composables/src/test/java/com/google/android/horologist/auth/composables/dialogs/SignedInConfirmationDialogTest.kt
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.auth.composables.dialogs
 
 import android.R
@@ -25,23 +23,14 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import com.google.android.horologist.images.base.paintable.DrawableResPaintable
-import com.google.android.horologist.images.coil.FakeImageLoader
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
-import com.google.android.horologist.screenshots.ScreenshotTestRule.Companion.screenshotTestRuleParams
+import com.google.android.horologist.screenshots.rng.WearLegacyScreenTest
 import org.junit.Test
 
-class SignedInConfirmationDialogTest : ScreenshotBaseTest(
-    screenshotTestRuleParams {
-        screenTimeText = { }
-    },
-) {
+class SignedInConfirmationDialogTest : WearLegacyScreenTest() {
 
     @Test
     fun signedInConfirmationDialog() {
-        screenshotTestRule.setContent(
-            takeScreenshot = true,
-            fakeImageLoader = FakeImageLoader.Resources,
-        ) {
+        runTest {
             Box(
                 modifier = Modifier.background(Color.Black),
                 contentAlignment = Alignment.Center,
@@ -58,10 +47,7 @@ class SignedInConfirmationDialogTest : ScreenshotBaseTest(
 
     @Test
     fun signedInConfirmationDialogNoName() {
-        screenshotTestRule.setContent(
-            takeScreenshot = true,
-            fakeImageLoader = FakeImageLoader.Resources,
-        ) {
+        runTest {
             SignedInConfirmationDialog(
                 onDismissOrTimeout = {},
                 email = "maggie@example.com",
@@ -72,10 +58,7 @@ class SignedInConfirmationDialogTest : ScreenshotBaseTest(
 
     @Test
     fun signedInConfirmationDialogEmptyName() {
-        screenshotTestRule.setContent(
-            takeScreenshot = true,
-            fakeImageLoader = FakeImageLoader.Resources,
-        ) {
+        runTest {
             SignedInConfirmationDialog(
                 onDismissOrTimeout = {},
                 name = "",
@@ -87,7 +70,7 @@ class SignedInConfirmationDialogTest : ScreenshotBaseTest(
 
     @Test
     fun signedInConfirmationDialogNoNameNoAvatar() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             SignedInConfirmationDialog(
                 onDismissOrTimeout = {},
                 email = "maggie@example.com",
@@ -97,10 +80,7 @@ class SignedInConfirmationDialogTest : ScreenshotBaseTest(
 
     @Test
     fun signedInConfirmationDialogNoEmail() {
-        screenshotTestRule.setContent(
-            takeScreenshot = true,
-            fakeImageLoader = FakeImageLoader.Resources,
-        ) {
+        runTest {
             SignedInConfirmationDialog(
                 onDismissOrTimeout = {},
                 name = "Maggie",
@@ -111,17 +91,14 @@ class SignedInConfirmationDialogTest : ScreenshotBaseTest(
 
     @Test
     fun signedInConfirmationDialogNoInformation() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             SignedInConfirmationDialog(onDismissOrTimeout = {})
         }
     }
 
     @Test
     fun signedInConfirmationDialogTruncation() {
-        screenshotTestRule.setContent(
-            takeScreenshot = true,
-            fakeImageLoader = FakeImageLoader.Resources,
-        ) {
+        runTest {
             SignedInConfirmationDialog(
                 onDismissOrTimeout = {},
                 name = "Wolfeschlegelsteinhausenbergerdorff",
diff --git a/auth/composables/src/test/java/com/google/android/horologist/auth/composables/screens/AuthErrorScreenTest.kt b/auth/composables/src/test/java/com/google/android/horologist/auth/composables/screens/AuthErrorScreenTest.kt
index 98a4a6c9..48dee754 100644
--- a/auth/composables/src/test/java/com/google/android/horologist/auth/composables/screens/AuthErrorScreenTest.kt
+++ b/auth/composables/src/test/java/com/google/android/horologist/auth/composables/screens/AuthErrorScreenTest.kt
@@ -14,22 +14,15 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.auth.composables.screens
 
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
-import com.google.android.horologist.screenshots.ScreenshotTestRule.Companion.screenshotTestRuleParams
+import com.google.android.horologist.screenshots.rng.WearLegacyScreenTest
 import org.junit.Test
 
-class AuthErrorScreenTest : ScreenshotBaseTest(
-    screenshotTestRuleParams {
-        screenTimeText = {}
-    },
-) {
+class AuthErrorScreenTest : WearLegacyScreenTest() {
     @Test
     fun authErrorScreen() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             AuthErrorScreen()
         }
     }
diff --git a/auth/composables/src/test/java/com/google/android/horologist/auth/composables/screens/CheckYourPhoneScreenTest.kt b/auth/composables/src/test/java/com/google/android/horologist/auth/composables/screens/CheckYourPhoneScreenTest.kt
index 1d2e3179..075417a8 100644
--- a/auth/composables/src/test/java/com/google/android/horologist/auth/composables/screens/CheckYourPhoneScreenTest.kt
+++ b/auth/composables/src/test/java/com/google/android/horologist/auth/composables/screens/CheckYourPhoneScreenTest.kt
@@ -14,30 +14,23 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.auth.composables.screens
 
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
-import com.google.android.horologist.screenshots.ScreenshotTestRule
+import com.google.android.horologist.screenshots.rng.WearLegacyScreenTest
 import org.junit.Test
 
-class CheckYourPhoneScreenTest : ScreenshotBaseTest(
-    params = ScreenshotTestRule.screenshotTestRuleParams {
-        screenTimeText = {}
-    },
-) {
+class CheckYourPhoneScreenTest : WearLegacyScreenTest() {
 
     @Test
     fun checkYourPhoneScreen() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             CheckYourPhoneScreen()
         }
     }
 
     @Test
     fun checkYourPhoneScreenWithMessage() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             CheckYourPhoneScreen(message = "XXXX-YYYY")
         }
     }
diff --git a/auth/composables/src/test/java/com/google/android/horologist/auth/composables/screens/SelectAccountScreenTest.kt b/auth/composables/src/test/java/com/google/android/horologist/auth/composables/screens/SelectAccountScreenTest.kt
index d10e188b..7971cec9 100644
--- a/auth/composables/src/test/java/com/google/android/horologist/auth/composables/screens/SelectAccountScreenTest.kt
+++ b/auth/composables/src/test/java/com/google/android/horologist/auth/composables/screens/SelectAccountScreenTest.kt
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.auth.composables.screens
 
 import androidx.compose.material.icons.Icons
@@ -23,19 +21,14 @@ import androidx.compose.material.icons.filled.Face
 import com.google.android.horologist.auth.composables.model.AccountUiModel
 import com.google.android.horologist.compose.layout.ScalingLazyColumnDefaults
 import com.google.android.horologist.images.base.paintable.ImageVectorPaintable.Companion.asPaintable
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
-import com.google.android.horologist.screenshots.ScreenshotTestRule.Companion.screenshotTestRuleParams
+import com.google.android.horologist.screenshots.rng.WearLegacyScreenTest
 import org.junit.Test
 
-class SelectAccountScreenTest : ScreenshotBaseTest(
-    screenshotTestRuleParams {
-        screenTimeText = {}
-    },
-) {
+class SelectAccountScreenTest : WearLegacyScreenTest() {
 
     @Test
     fun selectAccountScreen() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             SelectAccountScreen(
                 accounts = listOf(
                     AccountUiModel(
@@ -52,7 +45,7 @@ class SelectAccountScreenTest : ScreenshotBaseTest(
 
     @Test
     fun selectAccountScreenNoAvatar() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             SelectAccountScreen(
                 accounts = listOf(
                     AccountUiModel(email = "maggie@example.com"),
diff --git a/auth/composables/src/test/java/com/google/android/horologist/auth/composables/screens/SignInPlaceholderScreenTest.kt b/auth/composables/src/test/java/com/google/android/horologist/auth/composables/screens/SignInPlaceholderScreenTest.kt
index 03069a24..f35505cb 100644
--- a/auth/composables/src/test/java/com/google/android/horologist/auth/composables/screens/SignInPlaceholderScreenTest.kt
+++ b/auth/composables/src/test/java/com/google/android/horologist/auth/composables/screens/SignInPlaceholderScreenTest.kt
@@ -14,22 +14,15 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.auth.composables.screens
 
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
-import com.google.android.horologist.screenshots.ScreenshotTestRule.Companion.screenshotTestRuleParams
+import com.google.android.horologist.screenshots.rng.WearLegacyScreenTest
 import org.junit.Test
 
-class SignInPlaceholderScreenTest : ScreenshotBaseTest(
-    screenshotTestRuleParams {
-        screenTimeText = {}
-    },
-) {
+class SignInPlaceholderScreenTest : WearLegacyScreenTest() {
     @Test
     fun signInPlaceholderScreen() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             SignInPlaceholderScreen()
         }
     }
diff --git a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_AccountChipTest_default.png b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_AccountChipTest_default.png
index 37eefa39..d411afc4 100644
--- a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_AccountChipTest_default.png
+++ b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_AccountChipTest_default.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d6456b7e1bdadab78724b066925f3ca53a5f7faaa82aa1734a00d92682704172
-size 10854
+oid sha256:58d88f6bc5e2fb42dd36b347a00d36f23b2d4ef0b8e92f5348c5d9ff71b9d109
+size 7001
diff --git a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_AccountChipTest_disabled.png b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_AccountChipTest_disabled.png
index baf00609..51551c22 100644
--- a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_AccountChipTest_disabled.png
+++ b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_AccountChipTest_disabled.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:89ed7ddf8238ec3204aa4277bf661cb05762ac3aac48857097f058201ed10176
-size 11841
+oid sha256:b7f6412cd12af165de7c16c159d64f7d6a2c6f310029f15bf3f2f52d56c708b0
+size 7113
diff --git a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_AccountChipTest_withEmailAddressStartingWithSingleLetterAndDot.png b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_AccountChipTest_withEmailAddressStartingWithSingleLetterAndDot.png
index 19431da7..e257969b 100644
--- a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_AccountChipTest_withEmailAddressStartingWithSingleLetterAndDot.png
+++ b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_AccountChipTest_withEmailAddressStartingWithSingleLetterAndDot.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bd91b04ed5b22b38d767d2c7e6775f36515792e47004c10a788b6866e91ce1b0
-size 15981
+oid sha256:d242cf361abac64eab6e5f128fccfc19fca91655bb34f8de23c4b4c09c1d76a3
+size 10464
diff --git a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_AccountChipTest_withLongEmailAddress.png b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_AccountChipTest_withLongEmailAddress.png
index 5c523140..78676472 100644
--- a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_AccountChipTest_withLongEmailAddress.png
+++ b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_AccountChipTest_withLongEmailAddress.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2e3a800507435367bba07a90f31dca97dc29238e6c22e90ff16d77f33074cfd8
-size 15871
+oid sha256:4d2763057087daafab9fce5547ccd41388995bbcba17ecef628dc4a093041a78
+size 10292
diff --git a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_AccountChipTest_withSecondaryChipType.png b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_AccountChipTest_withSecondaryChipType.png
index ac41b6af..394bc3b6 100644
--- a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_AccountChipTest_withSecondaryChipType.png
+++ b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_AccountChipTest_withSecondaryChipType.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e1a1e2e88bd8970ae67fbd0b8add4a7b0d3b5dfe56709f17f477bfc09553529c
-size 10676
+oid sha256:0de89389ec8547348343501cd361da0a0dbd3598803dacf722de0f7a0b4e2bb6
+size 6884
diff --git a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_AccountChipTest_withSmallAvatar.png b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_AccountChipTest_withSmallAvatar.png
index ca70e1e8..1c238340 100644
--- a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_AccountChipTest_withSmallAvatar.png
+++ b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_AccountChipTest_withSmallAvatar.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b4f22511ebe03479bdf0c0241787f69fe494e4f9b6f230b654171b167929f333
-size 10333
+oid sha256:0d8250c761f4fc266d8a965a9e7afdaab94fef97cd2cef3ce6b423b4a38cef54
+size 6693
diff --git a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_CreateAccountChipTest_default.png b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_CreateAccountChipTest_default.png
index 215b0cfb..4c6e68fa 100644
--- a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_CreateAccountChipTest_default.png
+++ b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_CreateAccountChipTest_default.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b84b5347b7564c85a21b0f733b0b06f929b4e892c99d4af42e965d1d5370d13e
-size 7589
+oid sha256:3cc93c4919c7d02e3d7a507ba7cc26efa4579309a9f33a5804d3e35c41dff7ae
+size 5088
diff --git a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_CreateAccountChipTest_disabled.png b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_CreateAccountChipTest_disabled.png
index 262ded81..23630f50 100644
--- a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_CreateAccountChipTest_disabled.png
+++ b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_CreateAccountChipTest_disabled.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4b4253079afd8adc05a333c12c8afe70658b776ba53e3012a7ee7b964d68ee1a
-size 7792
+oid sha256:1f02a900d57cfe9043f434e9213995a68ee93212686d40aba004f7ec1556e61f
+size 5224
diff --git a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_CreateAccountChipTest_withLargeIconSpace.png b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_CreateAccountChipTest_withLargeIconSpace.png
index 1dea6fc5..5025ff0b 100644
--- a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_CreateAccountChipTest_withLargeIconSpace.png
+++ b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_CreateAccountChipTest_withLargeIconSpace.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1e9d3b817d33dea6529a03fe3900608b1040170c5e173ef38a414af8f597698f
-size 7536
+oid sha256:4e8f1eaf192d7a8adc8dab34a8a03dc4e6f2a763dcdfeadfc318fa1396b4387e
+size 5073
diff --git a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_CreateAccountChipTest_withSecondaryChipType.png b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_CreateAccountChipTest_withSecondaryChipType.png
index 22576731..b05435cd 100644
--- a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_CreateAccountChipTest_withSecondaryChipType.png
+++ b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_CreateAccountChipTest_withSecondaryChipType.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:623bc97c63316f31bb30ff44e5e343eedf672a85ab1cb67844103b93acd479b6
-size 7198
+oid sha256:0b51c2a8681d75a1228ce9a997c0f6ec0a38a61cb14d79db113320a0e723a24b
+size 4983
diff --git a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_GuestModeChipTest_default.png b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_GuestModeChipTest_default.png
index f1866a43..674b1e60 100644
--- a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_GuestModeChipTest_default.png
+++ b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_GuestModeChipTest_default.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:428f5058dee89301fc4f4c452e558719d36e57bde3d823c82972e5f84c7a8def
-size 8352
+oid sha256:9cf6096cb1924ef2571a850cf5952b828ab89eb8b715186fcdb7143e929dcb87
+size 5492
diff --git a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_GuestModeChipTest_disabled.png b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_GuestModeChipTest_disabled.png
index db1c0121..5df3d146 100644
--- a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_GuestModeChipTest_disabled.png
+++ b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_GuestModeChipTest_disabled.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5b83522db1cc98847d1e69d5abb85c72af8148411cb4ecd01bd9af40dc08beb9
-size 8811
+oid sha256:9bcc89019d124f3178c2fa364bca07b95aeab96cff2bbfee1140459967f433ff
+size 5569
diff --git a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_GuestModeChipTest_withSecondaryChipType.png b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_GuestModeChipTest_withSecondaryChipType.png
index f2845ad0..4d0a674c 100644
--- a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_GuestModeChipTest_withSecondaryChipType.png
+++ b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_GuestModeChipTest_withSecondaryChipType.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8c46f66d2b3c6f0166f39fe7b6a6191a04df064bf708101690ff935a2b218c00
-size 8092
+oid sha256:7ee284ed97f191fa300b50cf3330263d65afb45f5e693838b8c2da2e8ff589b7
+size 5433
diff --git a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_GuestModeChipTest_withSecondaryChipTypeDisabled.png b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_GuestModeChipTest_withSecondaryChipTypeDisabled.png
index f7525e1e..1b2e7a6a 100644
--- a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_GuestModeChipTest_withSecondaryChipTypeDisabled.png
+++ b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_GuestModeChipTest_withSecondaryChipTypeDisabled.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bf51e6a7cdae1e2bb4d429f6472a5a41ba580fc9ecae948428b9585e66ff454f
-size 8233
+oid sha256:68ad8e9c4a5d48c2998cc0659b4dd289c54c8efad856af1541acd08c1bb6177c
+size 5068
diff --git a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_OtherOptionsChipTest_default.png b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_OtherOptionsChipTest_default.png
index 6a67c70a..f21b5f4d 100644
--- a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_OtherOptionsChipTest_default.png
+++ b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_OtherOptionsChipTest_default.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9c2f837bd366aea7eb2d22211e25d63929be494184ea3a63076ffea0afb2cb58
-size 7686
+oid sha256:95158d66ed171d445bb10af1bb264ff35f7229ea43e0455daf1eff589f41fc8f
+size 5220
diff --git a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_OtherOptionsChipTest_disabled.png b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_OtherOptionsChipTest_disabled.png
index 9a7ee15d..d8c6624e 100644
--- a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_OtherOptionsChipTest_disabled.png
+++ b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_OtherOptionsChipTest_disabled.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:896b4c5cbeebb9f83f09785c6c7bc769b5588987980528c6c74959c383c92c8a
-size 7966
+oid sha256:d7ce51cbe6e925a10f8ec32d955ef6238ad70c6943de8e5dc2b7df0ad6069d30
+size 5365
diff --git a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_OtherOptionsChipTest_withSecondaryChipType.png b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_OtherOptionsChipTest_withSecondaryChipType.png
index e2d4630b..9ad0ea4d 100644
--- a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_OtherOptionsChipTest_withSecondaryChipType.png
+++ b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_OtherOptionsChipTest_withSecondaryChipType.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:14f3bab4277aa2b63d817663ab93474968b0a7faefb4aafcf2539efdd8644fcc
-size 7428
+oid sha256:2c4a040079d803e154eaa2432512bbaa69d78c7aa0fa3a3c293c32ca56b6ab69
+size 5146
diff --git a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_OtherOptionsChipTest_withSecondaryChipTypeDisabled.png b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_OtherOptionsChipTest_withSecondaryChipTypeDisabled.png
index 4561560e..2af43f96 100644
--- a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_OtherOptionsChipTest_withSecondaryChipTypeDisabled.png
+++ b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_OtherOptionsChipTest_withSecondaryChipTypeDisabled.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:58c0ac727427c60960d65119687f7968428a4aebf67e7872b12eb5f74551e161
-size 7572
+oid sha256:fb5e2a7681dfcf6df15e4c351e804e31e3c5233ea634fcf6e7f677c28f220102
+size 4927
diff --git a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_SignInChipTest_default.png b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_SignInChipTest_default.png
index e60cb873..6d2b2964 100644
--- a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_SignInChipTest_default.png
+++ b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_SignInChipTest_default.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9a56bc2830fd1367491c774ae63b0d955b127a4509eb096e4c953cad0a785c37
-size 6578
+oid sha256:3cfe9f61df4c5809b7cfce9edae32280a62bcc66349839a028cc6c7784b3bf91
+size 4262
diff --git a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_SignInChipTest_disabled.png b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_SignInChipTest_disabled.png
index b26ccc7c..6546abe6 100644
--- a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_SignInChipTest_disabled.png
+++ b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_SignInChipTest_disabled.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:70199fa15f8bbf7c5fae8c23924a3052733fcf9a0064c5886cb07990c616e9ee
-size 6827
+oid sha256:cd98274e868acfae785d043763d9f15192aeb50907554e5f7f25452b01aee1d0
+size 4365
diff --git a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_SignInChipTest_withSecondaryChipType.png b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_SignInChipTest_withSecondaryChipType.png
index 13b137cb..d86c9c82 100644
--- a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_SignInChipTest_withSecondaryChipType.png
+++ b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_SignInChipTest_withSecondaryChipType.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1cc76c03ee2b10d995c51d1f6c1c5e93226bc4f971887e04e203aa6982fd5048
-size 6369
+oid sha256:caf276e34af867129d4343d02225bfdceb1f445d7cda632b62165461c4347071
+size 4202
diff --git a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_SignInChipTest_withSecondaryChipTypeDisabled.png b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_SignInChipTest_withSecondaryChipTypeDisabled.png
index de4f4aec..a68a1e35 100644
--- a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_SignInChipTest_withSecondaryChipTypeDisabled.png
+++ b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.chips_SignInChipTest_withSecondaryChipTypeDisabled.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eb1d2e13ba520e4d13531c09d25f3c8572b991a0a511653743d0ba256edd5253
-size 6482
+oid sha256:ee870dc1433b4fda42594fd0c8a8f1662035f9bd4fe9c793fd3fe34cab6679eb
+size 4057
diff --git a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.dialogs_SignedInConfirmationDialogTest_signedInConfirmationDialog.png b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.dialogs_SignedInConfirmationDialogTest_signedInConfirmationDialog.png
index 121134db..fb3a57f5 100644
--- a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.dialogs_SignedInConfirmationDialogTest_signedInConfirmationDialog.png
+++ b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.dialogs_SignedInConfirmationDialogTest_signedInConfirmationDialog.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ec602f0ae080fa15071f7d210c037d3af3004c57bab6b119d14efb0c95cc3007
-size 26698
+oid sha256:41f9ae4234fca13b3f23ec133060e9904ca5a860c9c15ef80810145df81e181b
+size 19978
diff --git a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.dialogs_SignedInConfirmationDialogTest_signedInConfirmationDialogEmptyName.png b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.dialogs_SignedInConfirmationDialogTest_signedInConfirmationDialogEmptyName.png
index 4492c222..20f65bcf 100644
--- a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.dialogs_SignedInConfirmationDialogTest_signedInConfirmationDialogEmptyName.png
+++ b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.dialogs_SignedInConfirmationDialogTest_signedInConfirmationDialogEmptyName.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:27a9364bbef334736e1d9a304ffd2f2f6fe8e244675f387a9556db3397906c73
-size 25078
+oid sha256:c1d9b795524bed260fc407f6cc4e5bba2984f2902ef5405bb992a034908127b0
+size 18202
diff --git a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.dialogs_SignedInConfirmationDialogTest_signedInConfirmationDialogNoEmail.png b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.dialogs_SignedInConfirmationDialogTest_signedInConfirmationDialogNoEmail.png
index f6ff3883..17f04932 100644
--- a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.dialogs_SignedInConfirmationDialogTest_signedInConfirmationDialogNoEmail.png
+++ b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.dialogs_SignedInConfirmationDialogTest_signedInConfirmationDialogNoEmail.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4ade3dc8df01fdb7c7e7c5fae5257bcc820f79f8acb84e73d1e574b401021685
-size 21934
+oid sha256:3384d6ccc28e6e430fdf97f22ba52f666a002bac8d47ea09a7caae93d5fb155c
+size 16122
diff --git a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.dialogs_SignedInConfirmationDialogTest_signedInConfirmationDialogNoInformation.png b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.dialogs_SignedInConfirmationDialogTest_signedInConfirmationDialogNoInformation.png
index b49d5f65..a2543cae 100644
--- a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.dialogs_SignedInConfirmationDialogTest_signedInConfirmationDialogNoInformation.png
+++ b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.dialogs_SignedInConfirmationDialogTest_signedInConfirmationDialogNoInformation.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:96da0e9ca4bf1558b6f5ec96b64c52638a1e13d866129148ea3faacb9b72c08d
-size 14907
+oid sha256:f90e786f1fd6dbd4a666983656bfb9c495b618c4155b0d040f10e02a3d1effff
+size 9280
diff --git a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.dialogs_SignedInConfirmationDialogTest_signedInConfirmationDialogNoName.png b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.dialogs_SignedInConfirmationDialogTest_signedInConfirmationDialogNoName.png
index 4492c222..20f65bcf 100644
--- a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.dialogs_SignedInConfirmationDialogTest_signedInConfirmationDialogNoName.png
+++ b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.dialogs_SignedInConfirmationDialogTest_signedInConfirmationDialogNoName.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:27a9364bbef334736e1d9a304ffd2f2f6fe8e244675f387a9556db3397906c73
-size 25078
+oid sha256:c1d9b795524bed260fc407f6cc4e5bba2984f2902ef5405bb992a034908127b0
+size 18202
diff --git a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.dialogs_SignedInConfirmationDialogTest_signedInConfirmationDialogNoNameNoAvatar.png b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.dialogs_SignedInConfirmationDialogTest_signedInConfirmationDialogNoNameNoAvatar.png
index c92f991f..7ffe32c7 100644
--- a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.dialogs_SignedInConfirmationDialogTest_signedInConfirmationDialogNoNameNoAvatar.png
+++ b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.dialogs_SignedInConfirmationDialogTest_signedInConfirmationDialogNoNameNoAvatar.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4b0d35f7f31b0564023ecd68f269e5aadbac4563c3c978e480a9c4e06daf87cf
-size 20164
+oid sha256:6af0e0a3818b4ab54f9adbbe393a9a5efd5a3a49ce891c207d6b64e6689263a8
+size 13220
diff --git a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.dialogs_SignedInConfirmationDialogTest_signedInConfirmationDialogTruncation.png b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.dialogs_SignedInConfirmationDialogTest_signedInConfirmationDialogTruncation.png
index 5e9737b3..bf574352 100644
--- a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.dialogs_SignedInConfirmationDialogTest_signedInConfirmationDialogTruncation.png
+++ b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.dialogs_SignedInConfirmationDialogTest_signedInConfirmationDialogTruncation.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:60c3f401f3e77321a66b8452b1c6d1dbc42a72df2cab3317dd4826820557a9ee
-size 29309
+oid sha256:34e32564c8f113ceda54df4b33ad0dc5fbeab0e9b07d98b24e292570d21ed46d
+size 21576
diff --git a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.screens_AuthErrorScreenTest_authErrorScreen.png b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.screens_AuthErrorScreenTest_authErrorScreen.png
index 49084084..8606968e 100644
--- a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.screens_AuthErrorScreenTest_authErrorScreen.png
+++ b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.screens_AuthErrorScreenTest_authErrorScreen.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a3b467c1b73ae37efbe977172eecd9cdc2de26b5390762838eca72e1dc175b33
-size 18557
+oid sha256:8497c0ce64fbf1a1eed14853954a27a2983e098e4e07b81d22dc1de406663952
+size 11781
diff --git a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.screens_CheckYourPhoneScreenTest_checkYourPhoneScreen.png b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.screens_CheckYourPhoneScreenTest_checkYourPhoneScreen.png
index 2c6f14e0..667c0f3e 100644
--- a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.screens_CheckYourPhoneScreenTest_checkYourPhoneScreen.png
+++ b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.screens_CheckYourPhoneScreenTest_checkYourPhoneScreen.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bfedbda0b0031459a7ff7383e65bb170718c264688fb11a615817624e00b65bf
-size 20717
+oid sha256:38f7939707b1b5014b9335a5285df36a2cf3786e2d84ebc18389a13faa487e59
+size 13142
diff --git a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.screens_CheckYourPhoneScreenTest_checkYourPhoneScreenWithMessage.png b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.screens_CheckYourPhoneScreenTest_checkYourPhoneScreenWithMessage.png
index a2cc0162..ef1c904d 100644
--- a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.screens_CheckYourPhoneScreenTest_checkYourPhoneScreenWithMessage.png
+++ b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.screens_CheckYourPhoneScreenTest_checkYourPhoneScreenWithMessage.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:874095abc950851ec9fa60a298ff95a324d62835d8b5e8d604929c5569bc9c72
-size 21547
+oid sha256:845eb0fb47bdfb209e8c29aa3fff3657d525a883c8475dda55381d78f8d561fd
+size 14224
diff --git a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.screens_SelectAccountScreenTest_selectAccountScreen.png b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.screens_SelectAccountScreenTest_selectAccountScreen.png
index bf96c651..a1db490b 100644
--- a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.screens_SelectAccountScreenTest_selectAccountScreen.png
+++ b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.screens_SelectAccountScreenTest_selectAccountScreen.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0ec31221c2e3c955578333fe4527aeab5a1659ded1e2150bf1a80cc6e30f85ef
-size 39629
+oid sha256:a6c99dc3479e626e85a41b15acdefb756b6e96be0c6f59306104ccb401fdd3bf
+size 26847
diff --git a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.screens_SelectAccountScreenTest_selectAccountScreenNoAvatar.png b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.screens_SelectAccountScreenTest_selectAccountScreenNoAvatar.png
index 9a6485d4..411c5750 100644
--- a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.screens_SelectAccountScreenTest_selectAccountScreenNoAvatar.png
+++ b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.screens_SelectAccountScreenTest_selectAccountScreenNoAvatar.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9d4cee7a2db8b7bb47bbceffa8c3e1e40477d44731a97336b68595f87e222e8f
-size 37109
+oid sha256:5a13e3377cd27348a5e84f240dbeb259b594f134ff2c5aaf589042ca30fc7106
+size 25309
diff --git a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.screens_SignInPlaceholderScreenTest_signInPlaceholderScreen.png b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.screens_SignInPlaceholderScreenTest_signInPlaceholderScreen.png
index 6c568e8a..9f672ad4 100644
--- a/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.screens_SignInPlaceholderScreenTest_signInPlaceholderScreen.png
+++ b/auth/composables/src/test/snapshots/images/com.google.android.horologist.auth.composables.screens_SignInPlaceholderScreenTest_signInPlaceholderScreen.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7aaac439d6871914007e72da774f055e72aab2cc78d7a993d76080224ce96e8a
-size 16482
+oid sha256:91e2627f0f83042e26e65cce057db436d9752297cf1d9a6a10b413bfaa555f9b
+size 10469
diff --git a/auth/ui/build.gradle.kts b/auth/ui/build.gradle.kts
index 267d7756..cd8e9187 100644
--- a/auth/ui/build.gradle.kts
+++ b/auth/ui/build.gradle.kts
@@ -20,6 +20,7 @@ plugins {
     id("me.tylerbwong.gradle.metalava")
     alias(libs.plugins.dependencyAnalysis)
     kotlin("android")
+    alias(libs.plugins.roborazzi)
 }
 
 android {
diff --git a/auth/ui/src/main/java/com/google/android/horologist/auth/ui/common/screens/prompt/SignInPromptScreen.kt b/auth/ui/src/main/java/com/google/android/horologist/auth/ui/common/screens/prompt/SignInPromptScreen.kt
index f700874a..6a77d19e 100644
--- a/auth/ui/src/main/java/com/google/android/horologist/auth/ui/common/screens/prompt/SignInPromptScreen.kt
+++ b/auth/ui/src/main/java/com/google/android/horologist/auth/ui/common/screens/prompt/SignInPromptScreen.kt
@@ -34,6 +34,7 @@ import com.google.android.horologist.auth.composables.model.AccountUiModel
 import com.google.android.horologist.auth.composables.screens.SignInPlaceholderScreen
 import com.google.android.horologist.compose.layout.ScalingLazyColumn
 import com.google.android.horologist.compose.layout.ScalingLazyColumnState
+import com.google.android.horologist.compose.layout.ScreenScaffold
 import com.google.android.horologist.compose.material.Title
 
 /**
@@ -91,46 +92,48 @@ public fun SignInPromptScreen(
     loadingContent: @Composable () -> Unit = { SignInPlaceholderScreen(modifier = modifier) },
     content: ScalingLazyListScope.() -> Unit,
 ) {
-    when (state) {
-        SignInPromptScreenState.Idle -> {
-            SideEffect {
-                onIdleStateObserved()
-            }
+    ScreenScaffold(timeText = {}) {
+        when (state) {
+            SignInPromptScreenState.Idle -> {
+                SideEffect {
+                    onIdleStateObserved()
+                }
 
-            loadingContent()
-        }
+                loadingContent()
+            }
 
-        SignInPromptScreenState.Loading -> {
-            loadingContent()
-        }
+            SignInPromptScreenState.Loading -> {
+                loadingContent()
+            }
 
-        is SignInPromptScreenState.SignedIn -> {
-            SignInPlaceholderScreen(modifier = modifier)
+            is SignInPromptScreenState.SignedIn -> {
+                SignInPlaceholderScreen(modifier = modifier)
 
-            onAlreadySignedIn(state.account)
-        }
+                onAlreadySignedIn(state.account)
+            }
 
-        SignInPromptScreenState.SignedOut -> {
-            ScalingLazyColumn(
-                columnState = columnState,
-                modifier = modifier,
-            ) {
-                item { Title(title) }
-                item {
-                    Text(
-                        text = message,
-                        modifier = Modifier.padding(
-                            top = 8.dp,
-                            bottom = 12.dp,
-                            start = 10.dp,
-                            end = 10.dp,
-                        ),
-                        color = MaterialTheme.colors.onBackground,
-                        textAlign = TextAlign.Center,
-                        style = MaterialTheme.typography.body2,
-                    )
+            SignInPromptScreenState.SignedOut -> {
+                ScalingLazyColumn(
+                    columnState = columnState,
+                    modifier = modifier,
+                ) {
+                    item { Title(title) }
+                    item {
+                        Text(
+                            text = message,
+                            modifier = Modifier.padding(
+                                top = 8.dp,
+                                bottom = 12.dp,
+                                start = 10.dp,
+                                end = 10.dp,
+                            ),
+                            color = MaterialTheme.colors.onBackground,
+                            textAlign = TextAlign.Center,
+                            style = MaterialTheme.typography.body2,
+                        )
+                    }
+                    apply(content)
                 }
-                apply(content)
             }
         }
     }
diff --git a/auth/ui/src/test/java/com/google/android/horologist/auth/ui/common/screens/prompt/SignInPromptScreenTest.kt b/auth/ui/src/test/java/com/google/android/horologist/auth/ui/common/screens/prompt/SignInPromptScreenTest.kt
index 9aa5911c..39f472cc 100644
--- a/auth/ui/src/test/java/com/google/android/horologist/auth/ui/common/screens/prompt/SignInPromptScreenTest.kt
+++ b/auth/ui/src/test/java/com/google/android/horologist/auth/ui/common/screens/prompt/SignInPromptScreenTest.kt
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.auth.ui.common.screens.prompt
 
 import androidx.compose.foundation.layout.Box
@@ -29,19 +27,14 @@ import com.google.android.horologist.auth.composables.chips.GuestModeChip
 import com.google.android.horologist.auth.composables.chips.SignInChip
 import com.google.android.horologist.auth.composables.model.AccountUiModel
 import com.google.android.horologist.compose.layout.ScalingLazyColumnDefaults
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
-import com.google.android.horologist.screenshots.ScreenshotTestRule.Companion.screenshotTestRuleParams
+import com.google.android.horologist.screenshots.rng.WearLegacyScreenTest
 import org.junit.Test
 
-class SignInPromptScreenTest : ScreenshotBaseTest(
-    screenshotTestRuleParams {
-        screenTimeText = {}
-    },
-) {
+class SignInPromptScreenTest : WearLegacyScreenTest() {
 
     @Test
     fun idle() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             SignInPromptScreen(
                 state = SignInPromptScreenState.Idle,
                 title = "Sign in",
@@ -57,7 +50,7 @@ class SignInPromptScreenTest : ScreenshotBaseTest(
 
     @Test
     fun loading() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             SignInPromptScreen(
                 state = SignInPromptScreenState.Loading,
                 title = "Sign in",
@@ -73,7 +66,7 @@ class SignInPromptScreenTest : ScreenshotBaseTest(
 
     @Test
     fun customLoading() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             SignInPromptScreen(
                 state = SignInPromptScreenState.Loading,
                 title = "Sign in",
@@ -94,7 +87,7 @@ class SignInPromptScreenTest : ScreenshotBaseTest(
 
     @Test
     fun signedIn() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             SignInPromptScreen(
                 state = SignInPromptScreenState.SignedIn(AccountUiModel("user@example.com")),
                 title = "Sign in",
@@ -110,7 +103,7 @@ class SignInPromptScreenTest : ScreenshotBaseTest(
 
     @Test
     fun signedOut() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             SignInPromptScreen(
                 state = SignInPromptScreenState.SignedOut,
                 title = "Sign in",
@@ -126,7 +119,7 @@ class SignInPromptScreenTest : ScreenshotBaseTest(
 
     @Test
     fun signedOutTruncation() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             SignInPromptScreen(
                 state = SignInPromptScreenState.SignedOut,
                 title = "WWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW",
diff --git a/auth/ui/src/test/snapshots/images/com.google.android.horologist.auth.ui.common.screens.prompt_SignInPromptScreenTest_customLoading.png b/auth/ui/src/test/snapshots/images/com.google.android.horologist.auth.ui.common.screens.prompt_SignInPromptScreenTest_customLoading.png
index 366860ff..bccccf0b 100644
--- a/auth/ui/src/test/snapshots/images/com.google.android.horologist.auth.ui.common.screens.prompt_SignInPromptScreenTest_customLoading.png
+++ b/auth/ui/src/test/snapshots/images/com.google.android.horologist.auth.ui.common.screens.prompt_SignInPromptScreenTest_customLoading.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:16b31ab0ada513dc0665cbc825d61eeea3f972f3adb96343571fb94f0a3f9362
-size 14170
+oid sha256:7cf553fb480411ac1cc5155a9800f215f562333cb859bfdbf787bcdd46335bef
+size 8417
diff --git a/auth/ui/src/test/snapshots/images/com.google.android.horologist.auth.ui.common.screens.prompt_SignInPromptScreenTest_idle.png b/auth/ui/src/test/snapshots/images/com.google.android.horologist.auth.ui.common.screens.prompt_SignInPromptScreenTest_idle.png
index 6c568e8a..9f672ad4 100644
--- a/auth/ui/src/test/snapshots/images/com.google.android.horologist.auth.ui.common.screens.prompt_SignInPromptScreenTest_idle.png
+++ b/auth/ui/src/test/snapshots/images/com.google.android.horologist.auth.ui.common.screens.prompt_SignInPromptScreenTest_idle.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7aaac439d6871914007e72da774f055e72aab2cc78d7a993d76080224ce96e8a
-size 16482
+oid sha256:91e2627f0f83042e26e65cce057db436d9752297cf1d9a6a10b413bfaa555f9b
+size 10469
diff --git a/auth/ui/src/test/snapshots/images/com.google.android.horologist.auth.ui.common.screens.prompt_SignInPromptScreenTest_loading.png b/auth/ui/src/test/snapshots/images/com.google.android.horologist.auth.ui.common.screens.prompt_SignInPromptScreenTest_loading.png
index 6c568e8a..9f672ad4 100644
--- a/auth/ui/src/test/snapshots/images/com.google.android.horologist.auth.ui.common.screens.prompt_SignInPromptScreenTest_loading.png
+++ b/auth/ui/src/test/snapshots/images/com.google.android.horologist.auth.ui.common.screens.prompt_SignInPromptScreenTest_loading.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7aaac439d6871914007e72da774f055e72aab2cc78d7a993d76080224ce96e8a
-size 16482
+oid sha256:91e2627f0f83042e26e65cce057db436d9752297cf1d9a6a10b413bfaa555f9b
+size 10469
diff --git a/auth/ui/src/test/snapshots/images/com.google.android.horologist.auth.ui.common.screens.prompt_SignInPromptScreenTest_signedIn.png b/auth/ui/src/test/snapshots/images/com.google.android.horologist.auth.ui.common.screens.prompt_SignInPromptScreenTest_signedIn.png
index 6c568e8a..9f672ad4 100644
--- a/auth/ui/src/test/snapshots/images/com.google.android.horologist.auth.ui.common.screens.prompt_SignInPromptScreenTest_signedIn.png
+++ b/auth/ui/src/test/snapshots/images/com.google.android.horologist.auth.ui.common.screens.prompt_SignInPromptScreenTest_signedIn.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7aaac439d6871914007e72da774f055e72aab2cc78d7a993d76080224ce96e8a
-size 16482
+oid sha256:91e2627f0f83042e26e65cce057db436d9752297cf1d9a6a10b413bfaa555f9b
+size 10469
diff --git a/auth/ui/src/test/snapshots/images/com.google.android.horologist.auth.ui.common.screens.prompt_SignInPromptScreenTest_signedOut.png b/auth/ui/src/test/snapshots/images/com.google.android.horologist.auth.ui.common.screens.prompt_SignInPromptScreenTest_signedOut.png
index aabcda55..fb7b5480 100644
--- a/auth/ui/src/test/snapshots/images/com.google.android.horologist.auth.ui.common.screens.prompt_SignInPromptScreenTest_signedOut.png
+++ b/auth/ui/src/test/snapshots/images/com.google.android.horologist.auth.ui.common.screens.prompt_SignInPromptScreenTest_signedOut.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5080c31e5ee1ec1e8e5844fad4eb879324ef5fcdf12ce6b4687031b60daefd37
-size 33805
+oid sha256:c54ff4bf58352296dfae7cbaf6aba7ed5a81a130fdcf1ca9546a5e2ccebd1c30
+size 23564
diff --git a/auth/ui/src/test/snapshots/images/com.google.android.horologist.auth.ui.common.screens.prompt_SignInPromptScreenTest_signedOutTruncation.png b/auth/ui/src/test/snapshots/images/com.google.android.horologist.auth.ui.common.screens.prompt_SignInPromptScreenTest_signedOutTruncation.png
index 7369d369..2b3acc0b 100644
--- a/auth/ui/src/test/snapshots/images/com.google.android.horologist.auth.ui.common.screens.prompt_SignInPromptScreenTest_signedOutTruncation.png
+++ b/auth/ui/src/test/snapshots/images/com.google.android.horologist.auth.ui.common.screens.prompt_SignInPromptScreenTest_signedOutTruncation.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1540317e6df1558a9d7f0f9c855377f511b3de6a131bdefdb22d3d03d1769095
-size 23188
+oid sha256:d9c7aa1ccbb02f255847ea30e577aee53af1e6934b1b24d22e4e98c743210e9c
+size 17788
diff --git a/composables/build.gradle.kts b/composables/build.gradle.kts
index 95cfe1e5..b52d168b 100644
--- a/composables/build.gradle.kts
+++ b/composables/build.gradle.kts
@@ -19,6 +19,7 @@ plugins {
     id("org.jetbrains.dokka")
     id("me.tylerbwong.gradle.metalava")
     kotlin("android")
+    alias(libs.plugins.roborazzi)
 }
 
 android {
diff --git a/composables/src/test/kotlin/com/google/android/horologist/composables/DatePickerTest.kt b/composables/src/test/kotlin/com/google/android/horologist/composables/DatePickerTest.kt
index fbf5e492..ae5b6207 100644
--- a/composables/src/test/kotlin/com/google/android/horologist/composables/DatePickerTest.kt
+++ b/composables/src/test/kotlin/com/google/android/horologist/composables/DatePickerTest.kt
@@ -14,28 +14,21 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.composables
 
 import androidx.compose.ui.text.font.FontWeight
 import androidx.wear.compose.material.MaterialTheme
 import com.google.android.horologist.compose.tools.copy
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
-import com.google.android.horologist.screenshots.ScreenshotTestRule.Companion.screenshotTestRuleParams
+import com.google.android.horologist.screenshots.rng.WearLegacyScreenTest
 import org.junit.Test
 import org.robolectric.annotation.Config
 import java.time.LocalDate
 
-class DatePickerTest : ScreenshotBaseTest(
-    screenshotTestRuleParams {
-        screenTimeText = {}
-    },
-) {
+class DatePickerTest : WearLegacyScreenTest() {
 
     @Test
     fun initial() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             DatePicker(
                 onDateConfirm = {},
                 date = LocalDate.of(2022, 4, 25),
@@ -48,7 +41,7 @@ class DatePickerTest : ScreenshotBaseTest(
         fontScale = 1.24f,
     )
     fun largestFontScaling() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest(applyDeviceConfig = false) {
             DatePicker(
                 onDateConfirm = {},
                 date = LocalDate.of(2022, 4, 25),
@@ -62,7 +55,7 @@ class DatePickerTest : ScreenshotBaseTest(
         fontScale = 1.24f,
     )
     fun smallDeviceLargeFontBold() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest(applyDeviceConfig = false) {
             MaterialTheme(typography = MaterialTheme.typography.copy { this.copy(fontWeight = FontWeight.Bold) }) {
                 DatePicker(
                     onDateConfirm = {},
diff --git a/composables/src/test/kotlin/com/google/android/horologist/composables/MarqueeTest.kt b/composables/src/test/kotlin/com/google/android/horologist/composables/MarqueeTest.kt
index 60f85bb7..3c21fe8b 100644
--- a/composables/src/test/kotlin/com/google/android/horologist/composables/MarqueeTest.kt
+++ b/composables/src/test/kotlin/com/google/android/horologist/composables/MarqueeTest.kt
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.composables
 
 import androidx.compose.foundation.background
@@ -24,17 +22,12 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
-import com.google.android.horologist.screenshots.ScreenshotTestRule.Companion.screenshotTestRuleParams
+import com.google.android.horologist.screenshots.rng.WearLegacyComponentTest
 import org.junit.Test
 
-class MarqueeTest : ScreenshotBaseTest(
-    params = screenshotTestRuleParams {
-    },
-) {
+class MarqueeTest : WearLegacyComponentTest() {
     @Test
     fun noMarquee() {
         runMarqueeTest("Sia")
@@ -46,18 +39,14 @@ class MarqueeTest : ScreenshotBaseTest(
     }
 
     private fun runMarqueeTest(text: String) {
-        screenshotTestRule.setContent(
-            isComponent = true,
-            takeScreenshot = true,
-        ) {
+        runComponentTest {
             Box(modifier = Modifier.background(Color.Black)) {
                 MarqueeSample(text)
             }
         }
 
-        screenshotTestRule.interact {
-            onNodeWithText(text).assertExists()
-        }
+        // TODO verify via a11y
+//        composeRule.onNodeWithText(text).assertExists()
     }
 
     @Composable
diff --git a/composables/src/test/kotlin/com/google/android/horologist/composables/PickerThemeTest.kt b/composables/src/test/kotlin/com/google/android/horologist/composables/PickerThemeTest.kt
index 22446ae9..5ad59de0 100644
--- a/composables/src/test/kotlin/com/google/android/horologist/composables/PickerThemeTest.kt
+++ b/composables/src/test/kotlin/com/google/android/horologist/composables/PickerThemeTest.kt
@@ -14,15 +14,12 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.composables
 
 import androidx.wear.compose.material.MaterialTheme
 import com.google.android.horologist.compose.tools.ThemeValues
 import com.google.android.horologist.compose.tools.themeValues
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
-import com.google.android.horologist.screenshots.ScreenshotTestRule.Companion.screenshotTestRuleParams
+import com.google.android.horologist.screenshots.rng.WearLegacyScreenTest
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.ParameterizedRobolectricTestRunner
@@ -32,16 +29,17 @@ import java.time.LocalTime
 @RunWith(ParameterizedRobolectricTestRunner::class)
 class PickerThemeTest(
     private val themeValue: ThemeValues,
-) : ScreenshotBaseTest(
-    screenshotTestRuleParams {
-        screenTimeText = {}
-        testLabel = themeValue.safeName
-    },
-) {
+) : WearLegacyScreenTest() {
+
+    override fun testName(suffix: String): String {
+        return "src/test/snapshots/images/" +
+            "${javaClass.`package`?.name}_${javaClass.simpleName}_${testInfo.methodName}_" +
+            "${themeValue.safeName}.png"
+    }
 
     @Test
     fun datePicker() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             MaterialTheme(colors = themeValue.colors) {
                 DatePicker(
                     onDateConfirm = {},
@@ -53,7 +51,7 @@ class PickerThemeTest(
 
     @Test
     fun timePicker() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             MaterialTheme(colors = themeValue.colors) {
                 TimePicker(
                     time = LocalTime.of(10, 10, 0),
@@ -65,7 +63,7 @@ class PickerThemeTest(
 
     @Test
     fun timePicker12h() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             MaterialTheme(colors = themeValue.colors) {
                 TimePickerWith12HourClock(
                     time = LocalTime.of(10, 10, 0),
diff --git a/composables/src/test/kotlin/com/google/android/horologist/composables/PlaceholderChipTest.kt b/composables/src/test/kotlin/com/google/android/horologist/composables/PlaceholderChipTest.kt
index 6bc2ce0c..0f1991e5 100644
--- a/composables/src/test/kotlin/com/google/android/horologist/composables/PlaceholderChipTest.kt
+++ b/composables/src/test/kotlin/com/google/android/horologist/composables/PlaceholderChipTest.kt
@@ -14,32 +14,24 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.composables
 
 import androidx.wear.compose.material.ChipDefaults
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
+import com.google.android.horologist.screenshots.rng.WearLegacyComponentTest
 import org.junit.Test
 
-class PlaceholderChipTest : ScreenshotBaseTest() {
+class PlaceholderChipTest : WearLegacyComponentTest() {
 
     @Test
     fun default() {
-        screenshotTestRule.setContent(
-            isComponent = true,
-            takeScreenshot = true,
-        ) {
+        runComponentTest {
             PlaceholderChip()
         }
     }
 
     @Test
     fun secondaryColors() {
-        screenshotTestRule.setContent(
-            isComponent = true,
-            takeScreenshot = true,
-        ) {
+        runComponentTest {
             PlaceholderChip(colors = ChipDefaults.secondaryChipColors())
         }
     }
diff --git a/composables/src/test/kotlin/com/google/android/horologist/composables/SectionedListHeaderFooterTest.kt b/composables/src/test/kotlin/com/google/android/horologist/composables/SectionedListHeaderFooterTest.kt
index 65562769..d37fbd16 100644
--- a/composables/src/test/kotlin/com/google/android/horologist/composables/SectionedListHeaderFooterTest.kt
+++ b/composables/src/test/kotlin/com/google/android/horologist/composables/SectionedListHeaderFooterTest.kt
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.composables
 
 import com.google.android.horologist.composables.Section.Companion.ALL_STATES
@@ -29,8 +27,7 @@ import com.google.android.horologist.composables.SectionedListTest.Companion.Dow
 import com.google.android.horologist.composables.SectionedListTest.Companion.SectionedListPreview
 import com.google.android.horologist.composables.SectionedListTest.Companion.downloads
 import com.google.android.horologist.compose.layout.ScalingLazyColumnDefaults
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
-import com.google.android.horologist.screenshots.ScreenshotTestRule.Companion.screenshotTestRuleParams
+import com.google.android.horologist.screenshots.rng.WearLegacyScreenTest
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.ParameterizedRobolectricTestRunner
@@ -40,15 +37,11 @@ class SectionedListHeaderFooterTest(
     private val headerVisibleStatesParam: Section.VisibleStates,
     private val footerVisibleStatesParam: Section.VisibleStates,
     private val sectionStateParam: Section.State<String>,
-) : ScreenshotBaseTest(
-    screenshotTestRuleParams {
-        screenTimeText = {}
-    },
-) {
+) : WearLegacyScreenTest() {
 
     @Test
     fun test() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             val columnState = ScalingLazyColumnDefaults.responsive().create()
 
             SectionedListPreview(columnState) {
diff --git a/composables/src/test/kotlin/com/google/android/horologist/composables/SectionedListTest.kt b/composables/src/test/kotlin/com/google/android/horologist/composables/SectionedListTest.kt
index f6a8a4b0..42f59488 100644
--- a/composables/src/test/kotlin/com/google/android/horologist/composables/SectionedListTest.kt
+++ b/composables/src/test/kotlin/com/google/android/horologist/composables/SectionedListTest.kt
@@ -48,19 +48,14 @@ import com.google.android.horologist.compose.layout.ScalingLazyColumnState
 import com.google.android.horologist.compose.layout.scrollAway
 import com.google.android.horologist.compose.material.Chip
 import com.google.android.horologist.screenshots.FixedTimeSource
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
-import com.google.android.horologist.screenshots.ScreenshotTestRule.Companion.screenshotTestRuleParams
+import com.google.android.horologist.screenshots.rng.WearLegacyScreenTest
 import org.junit.Test
 
-class SectionedListTest : ScreenshotBaseTest(
-    screenshotTestRuleParams {
-        screenTimeText = {}
-    },
-) {
+class SectionedListTest : WearLegacyScreenTest() {
 
     @Test
     fun loadingSection() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             val columnState = ScalingLazyColumnDefaults.responsive().create()
 
             SectionedListPreview(columnState) {
@@ -75,7 +70,7 @@ class SectionedListTest : ScreenshotBaseTest(
 
     @Test
     fun loadedSection() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             val columnState = ScalingLazyColumnDefaults.responsive().create()
 
             SectionedListPreview(columnState) {
@@ -90,7 +85,7 @@ class SectionedListTest : ScreenshotBaseTest(
 
     @Test
     fun loadedSection_secondPage() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             val columnState = ScalingLazyColumnDefaults.responsive().create()
 
             LaunchedEffect(Unit) {
@@ -109,7 +104,7 @@ class SectionedListTest : ScreenshotBaseTest(
 
     @Test
     fun failedSection() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             val columnState = ScalingLazyColumnDefaults.responsive().create()
 
             SectionedListPreview(columnState) {
@@ -124,7 +119,7 @@ class SectionedListTest : ScreenshotBaseTest(
 
     @Test
     fun failedSection_secondPage() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             val columnState = ScalingLazyColumnDefaults.responsive().create()
 
             LaunchedEffect(Unit) {
@@ -143,7 +138,7 @@ class SectionedListTest : ScreenshotBaseTest(
 
     @Test
     fun emptySection() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             val columnState = ScalingLazyColumnDefaults.responsive().create()
 
             SectionedListPreview(columnState) {
@@ -158,7 +153,7 @@ class SectionedListTest : ScreenshotBaseTest(
 
     @Test
     fun emptyContentForStates() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             val columnState = ScalingLazyColumnDefaults.responsive().create()
 
             SectionedListPreview(columnState) {
diff --git a/composables/src/test/kotlin/com/google/android/horologist/composables/SegmentedProgressIndicatorTest.kt b/composables/src/test/kotlin/com/google/android/horologist/composables/SegmentedProgressIndicatorTest.kt
index 62a7fc1f..e197304d 100644
--- a/composables/src/test/kotlin/com/google/android/horologist/composables/SegmentedProgressIndicatorTest.kt
+++ b/composables/src/test/kotlin/com/google/android/horologist/composables/SegmentedProgressIndicatorTest.kt
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.composables
 
 import androidx.compose.foundation.layout.fillMaxSize
@@ -24,20 +22,15 @@ import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.compositeOver
 import androidx.compose.ui.unit.dp
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
-import com.google.android.horologist.screenshots.ScreenshotTestRule
+import com.google.android.horologist.screenshots.rng.WearLegacyScreenTest
 import org.junit.Test
 
 class SegmentedProgressIndicatorTest :
-    ScreenshotBaseTest(
-        ScreenshotTestRule.screenshotTestRuleParams {
-            screenTimeText = {}
-        },
-    ) {
+    WearLegacyScreenTest() {
 
     @Test
     fun segmentedPicker() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             val segments = listOf(
                 ProgressIndicatorSegment(1f, Color.Green),
                 ProgressIndicatorSegment(1f, Color.Cyan),
@@ -64,7 +57,7 @@ class SegmentedProgressIndicatorTest :
 
     @Test
     fun segmentedPickerWithBrushColors() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             val segments = listOf(
                 ProgressIndicatorSegment(
                     1f,
@@ -97,7 +90,7 @@ class SegmentedProgressIndicatorTest :
 
     @Test
     fun segmentedPickerWithBrushColorsAndColorsCombined() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             val segments = listOf(
                 ProgressIndicatorSegment(
                     1f,
diff --git a/composables/src/test/kotlin/com/google/android/horologist/composables/SquareSegmentedProgressIndicatorTest.kt b/composables/src/test/kotlin/com/google/android/horologist/composables/SquareSegmentedProgressIndicatorTest.kt
index 828b2d23..f467705e 100644
--- a/composables/src/test/kotlin/com/google/android/horologist/composables/SquareSegmentedProgressIndicatorTest.kt
+++ b/composables/src/test/kotlin/com/google/android/horologist/composables/SquareSegmentedProgressIndicatorTest.kt
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.composables
 
 import androidx.compose.foundation.background
@@ -27,8 +25,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
-import com.google.android.horologist.screenshots.ScreenshotTestRule
+import com.google.android.horologist.screenshots.rng.WearLegacyScreenTest
 import org.junit.Test
 import org.robolectric.annotation.Config
 
@@ -37,15 +34,11 @@ import org.robolectric.annotation.Config
     qualifiers = "w227dp-h227dp-small-notlong-notround-watch-xhdpi-keyshidden-nonav",
 )
 class SquareSegmentedProgressIndicatorTest :
-    ScreenshotBaseTest(
-        ScreenshotTestRule.screenshotTestRuleParams {
-            screenTimeText = {}
-        },
-    ) {
+    WearLegacyScreenTest() {
 
     @Test
     fun squareSegmentedIndicatorLowCornerRadius() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             val segments = listOf(
                 ProgressIndicatorSegment(
                     weight = 1f,
@@ -80,7 +73,7 @@ class SquareSegmentedProgressIndicatorTest :
 
     @Test
     fun squareSegmentedIndicatorHighCornerRadius() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             val segments = listOf(
                 ProgressIndicatorSegment(
                     weight = 1f,
@@ -115,7 +108,7 @@ class SquareSegmentedProgressIndicatorTest :
 
     @Test
     fun squareSegmentedIndicatorManySegments() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             val segments = listOf(
                 ProgressIndicatorSegment(
                     weight = 1f,
@@ -158,7 +151,7 @@ class SquareSegmentedProgressIndicatorTest :
 
     @Test
     fun squareSegmentedIndicatorFewSegments() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             val segments = listOf(
                 ProgressIndicatorSegment(
                     weight = 1f,
@@ -189,7 +182,7 @@ class SquareSegmentedProgressIndicatorTest :
 
     @Test
     fun squareSegmentedIndicatorFewSegmentsAndBrushColor() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             val segments = listOf(
                 ProgressIndicatorSegment(
                     1f,
@@ -228,7 +221,7 @@ class SquareSegmentedProgressIndicatorTest :
 
     @Test
     fun squareSegmentedIndicatorFewSegmentsAndBrushColorAndColorsCombined() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             val segments = listOf(
                 ProgressIndicatorSegment(
                     1f,
diff --git a/composables/src/test/kotlin/com/google/android/horologist/composables/TimePicker12hTest.kt b/composables/src/test/kotlin/com/google/android/horologist/composables/TimePicker12hTest.kt
index 43b35d57..e31bd887 100644
--- a/composables/src/test/kotlin/com/google/android/horologist/composables/TimePicker12hTest.kt
+++ b/composables/src/test/kotlin/com/google/android/horologist/composables/TimePicker12hTest.kt
@@ -14,28 +14,19 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.composables
 
-import androidx.compose.ui.text.font.FontWeight
-import androidx.wear.compose.material.MaterialTheme
-import com.google.android.horologist.compose.tools.copy
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
-import com.google.android.horologist.screenshots.ScreenshotTestRule
+import com.google.android.horologist.screenshots.rng.WearDevice
+import com.google.android.horologist.screenshots.rng.WearLegacyScreenTest
 import org.junit.Test
 import org.robolectric.annotation.Config
 import java.time.LocalTime
 
-class TimePicker12hTest : ScreenshotBaseTest(
-    ScreenshotTestRule.screenshotTestRuleParams {
-        screenTimeText = {}
-    },
-) {
+class TimePicker12hTest : WearLegacyScreenTest() {
 
     @Test
     fun initial() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             TimePickerWith12HourClock(
                 time = LocalTime.of(10, 10, 0),
                 onTimeConfirm = {},
@@ -48,7 +39,7 @@ class TimePicker12hTest : ScreenshotBaseTest(
         fontScale = 1.24f,
     )
     fun largestFontScaling() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest(applyDeviceConfig = false) {
             TimePickerWith12HourClock(
                 time = LocalTime.of(10, 10, 0),
                 onTimeConfirm = {},
@@ -57,18 +48,12 @@ class TimePicker12hTest : ScreenshotBaseTest(
     }
 
     @Test
-    @Config(
-        qualifiers = "+w192dp-h192dp",
-        fontScale = 1.24f,
-    )
     fun smallDeviceLargeFontBold() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
-            MaterialTheme(typography = MaterialTheme.typography.copy { this.copy(fontWeight = FontWeight.Bold) }) {
-                TimePickerWith12HourClock(
-                    time = LocalTime.of(10, 10, 0),
-                    onTimeConfirm = {},
-                )
-            }
+        runTest(device = WearDevice.GooglePixelWatchLargeFont) {
+            TimePickerWith12HourClock(
+                time = LocalTime.of(10, 10, 0),
+                onTimeConfirm = {},
+            )
         }
     }
 }
diff --git a/composables/src/test/kotlin/com/google/android/horologist/composables/TimePickerTest.kt b/composables/src/test/kotlin/com/google/android/horologist/composables/TimePickerTest.kt
index 08f6e24d..62fad7d6 100644
--- a/composables/src/test/kotlin/com/google/android/horologist/composables/TimePickerTest.kt
+++ b/composables/src/test/kotlin/com/google/android/horologist/composables/TimePickerTest.kt
@@ -14,28 +14,21 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.composables
 
 import androidx.compose.ui.text.font.FontWeight
 import androidx.wear.compose.material.MaterialTheme
 import com.google.android.horologist.compose.tools.copy
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
-import com.google.android.horologist.screenshots.ScreenshotTestRule
+import com.google.android.horologist.screenshots.rng.WearLegacyScreenTest
 import org.junit.Test
 import org.robolectric.annotation.Config
 import java.time.LocalTime
 
-class TimePickerTest : ScreenshotBaseTest(
-    ScreenshotTestRule.screenshotTestRuleParams {
-        screenTimeText = {}
-    },
-) {
+class TimePickerTest : WearLegacyScreenTest() {
 
     @Test
     fun initial() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             TimePicker(
                 time = LocalTime.of(10, 10, 0),
                 onTimeConfirm = {},
@@ -48,17 +41,19 @@ class TimePickerTest : ScreenshotBaseTest(
         fontScale = 1.24f,
     )
     fun largestFontScaling() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
-            TimePicker(
-                time = LocalTime.of(10, 10, 0),
-                onTimeConfirm = {},
-            )
+        runTest(applyDeviceConfig = false) {
+            TestScaffold {
+                TimePicker(
+                    time = LocalTime.of(10, 10, 0),
+                    onTimeConfirm = {},
+                )
+            }
         }
     }
 
     @Test
     fun noSeconds() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             TimePicker(
                 time = LocalTime.of(10, 10, 0),
                 onTimeConfirm = {},
@@ -73,7 +68,7 @@ class TimePickerTest : ScreenshotBaseTest(
         fontScale = 1.24f,
     )
     fun smallDeviceLargeFontBold() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest(applyDeviceConfig = false) {
             MaterialTheme(typography = MaterialTheme.typography.copy { this.copy(fontWeight = FontWeight.Bold) }) {
                 TimePicker(
                     time = LocalTime.of(10, 10, 0),
diff --git a/composables/src/test/snapshots/images/com.google.android.horologist.composables_DatePickerTest_initial.png b/composables/src/test/snapshots/images/com.google.android.horologist.composables_DatePickerTest_initial.png
index 2425e361..d788b221 100644
--- a/composables/src/test/snapshots/images/com.google.android.horologist.composables_DatePickerTest_initial.png
+++ b/composables/src/test/snapshots/images/com.google.android.horologist.composables_DatePickerTest_initial.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9c33b2cec48e9461377f26a8a55d0cd9d595f53b335b275c892958b87aea5bba
-size 27991
+oid sha256:bc95204eec949fa3f337791ba8d97bcdf928094bc9181fb53ace65afb94f27b2
+size 20233
diff --git a/composables/src/test/snapshots/images/com.google.android.horologist.composables_DatePickerTest_largestFontScaling.png b/composables/src/test/snapshots/images/com.google.android.horologist.composables_DatePickerTest_largestFontScaling.png
index 3a60f621..45087a88 100644
--- a/composables/src/test/snapshots/images/com.google.android.horologist.composables_DatePickerTest_largestFontScaling.png
+++ b/composables/src/test/snapshots/images/com.google.android.horologist.composables_DatePickerTest_largestFontScaling.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9dd712df96dc4e30d6b9fa143355f184d75ba7cdd9f6b4d3fe84f535abc0b3a1
-size 28165
+oid sha256:482c98749da3874a07504e3a75c43b3654e4765bef468f1489ae7e72aa75c7ef
+size 20181
diff --git a/composables/src/test/snapshots/images/com.google.android.horologist.composables_DatePickerTest_smallDeviceLargeFontBold.png b/composables/src/test/snapshots/images/com.google.android.horologist.composables_DatePickerTest_smallDeviceLargeFontBold.png
index a3e68a18..59e0c608 100644
--- a/composables/src/test/snapshots/images/com.google.android.horologist.composables_DatePickerTest_smallDeviceLargeFontBold.png
+++ b/composables/src/test/snapshots/images/com.google.android.horologist.composables_DatePickerTest_smallDeviceLargeFontBold.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:57a30d58198cbefe21bf6ad3791e4db181069118845716b57e1b5eccf9dbad30
-size 23888
+oid sha256:e9d6e65055ac8b6302765e20f823d28b023e1d0867ad1adbcd2ff990962b0d36
+size 16518
diff --git a/composables/src/test/snapshots/images/com.google.android.horologist.composables_MarqueeTest_marquee.png b/composables/src/test/snapshots/images/com.google.android.horologist.composables_MarqueeTest_marquee.png
index 64408d6c..bda636c9 100644
--- a/composables/src/test/snapshots/images/com.google.android.horologist.composables_MarqueeTest_marquee.png
+++ b/composables/src/test/snapshots/images/com.google.android.horologist.composables_MarqueeTest_marquee.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c7cebaa2b64160e4bcf1e412973b1b83b3a6b6c2296b6afe7091fcfd9090777d
-size 4889
+oid sha256:639bc58c2014bc37f3adf5770407b6db15c6ed0efd7a94f13d9e994ea7cf0382
+size 3731
diff --git a/composables/src/test/snapshots/images/com.google.android.horologist.composables_MarqueeTest_noMarquee.png b/composables/src/test/snapshots/images/com.google.android.horologist.composables_MarqueeTest_noMarquee.png
index af529349..2bc2b8ae 100644
--- a/composables/src/test/snapshots/images/com.google.android.horologist.composables_MarqueeTest_noMarquee.png
+++ b/composables/src/test/snapshots/images/com.google.android.horologist.composables_MarqueeTest_noMarquee.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:85baae62a6ff1ab4361ba7f6a235ab7dbd08691ca75f7e7f60f1d1af31b24c33
-size 1457
+oid sha256:9324ee0876ea17bc76a8e8a0f88c8674fffbf9e649233427e92201215324058f
+size 1243
diff --git a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_datePicker[0]_BlueDefaultAECBFA.png b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_datePicker[0]_BlueDefaultAECBFA.png
index 2425e361..d788b221 100644
--- a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_datePicker[0]_BlueDefaultAECBFA.png
+++ b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_datePicker[0]_BlueDefaultAECBFA.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9c33b2cec48e9461377f26a8a55d0cd9d595f53b335b275c892958b87aea5bba
-size 27991
+oid sha256:bc95204eec949fa3f337791ba8d97bcdf928094bc9181fb53ace65afb94f27b2
+size 20233
diff --git a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_datePicker[1]_Blue7FCFFF.png b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_datePicker[1]_Blue7FCFFF.png
index 1516e23f..74e173a6 100644
--- a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_datePicker[1]_Blue7FCFFF.png
+++ b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_datePicker[1]_Blue7FCFFF.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7dd8b7dca8544be9cc4f679a9847cae27ce39e0d6318a6f49b4efe8d6a4d0592
-size 28068
+oid sha256:370e9978be5360ce7ad4b64bb1d6b3a8aeb3638767146c1ffde7733c49d872f5
+size 20078
diff --git a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_datePicker[2]_LilacD0BCFF.png b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_datePicker[2]_LilacD0BCFF.png
index ae3d329c..e70e6c6f 100644
--- a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_datePicker[2]_LilacD0BCFF.png
+++ b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_datePicker[2]_LilacD0BCFF.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4b510d9f7fcc91112728e4a00186a1a77df78b39074526cfd95dba132f49f72a
-size 28035
+oid sha256:9e32675b94900df85c317b829ecdc443446df1dee56e3f436d494b3ca83db6fd
+size 20220
diff --git a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_datePicker[3]_Green6DD58C.png b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_datePicker[3]_Green6DD58C.png
index 6bbf01ec..86eed203 100644
--- a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_datePicker[3]_Green6DD58C.png
+++ b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_datePicker[3]_Green6DD58C.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:feaf3f717cc3cea013f53258c8c1616647b602787af8ea2d6d353ad8fd0ce216
-size 27637
+oid sha256:9318600245b2d1afb467fe7067909e14710dfad66ac32057c9a1d26628c68e12
+size 20055
diff --git a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_datePicker[4]_BluewithText7FCFFF.png b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_datePicker[4]_BluewithText7FCFFF.png
index 404b2adb..d0754bfe 100644
--- a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_datePicker[4]_BluewithText7FCFFF.png
+++ b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_datePicker[4]_BluewithText7FCFFF.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e6df7db8b45efad1264d79e3e04916bf9c36034df8f3546492ccd39c22b5ab5d
-size 28051
+oid sha256:893ec629d94c2859df572860b6e88a6343a9a634ef7fe4ac60a48caafca2223f
+size 20037
diff --git a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_datePicker[5]_Orangey.png b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_datePicker[5]_Orangey.png
index c442f034..60250ebe 100644
--- a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_datePicker[5]_Orangey.png
+++ b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_datePicker[5]_Orangey.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:87d3168751b3ab2c721cb878745c4a2e8bc93f733d105093e2cf74ad46cabb28
-size 27637
+oid sha256:b9698d71f9edc964f99e29bc4185aaffdce0d2e27f0d0b2e72e44f61818df173
+size 19801
diff --git a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_datePicker[6]_Uamp.png b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_datePicker[6]_Uamp.png
index b3acb9b0..b02b84d7 100644
--- a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_datePicker[6]_Uamp.png
+++ b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_datePicker[6]_Uamp.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:11f4e7474b3e3c555a9d2b57ff44db135a7dd1b43ea6fc366aee41266f304d70
-size 27493
+oid sha256:239f1548bcd7f72bdee16626b3e549247c9aed8fc1ac7b17ef97602f28133be1
+size 19415
diff --git a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker12h[0]_BlueDefaultAECBFA.png b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker12h[0]_BlueDefaultAECBFA.png
index 2ff0f1ee..d660cdd6 100644
--- a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker12h[0]_BlueDefaultAECBFA.png
+++ b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker12h[0]_BlueDefaultAECBFA.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fe7faf77cf2c50d65df5b6b011853439b5552a245e183fd16f47ecdba2a32bb0
-size 27679
+oid sha256:14995b883373dff1ec507f32eb865dee378620b34ff7487dbf0e794007e1ebe7
+size 21288
diff --git a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker12h[1]_Blue7FCFFF.png b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker12h[1]_Blue7FCFFF.png
index 532e0557..6b24b334 100644
--- a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker12h[1]_Blue7FCFFF.png
+++ b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker12h[1]_Blue7FCFFF.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:677efdf97280ee9cf01efd3fc4a339a321731144dbdcb6fb0ccdbc0e201c6f24
-size 27907
+oid sha256:db3b83388ab8f5dae17ff17d069a9003080cc4d53258dd085960bbdffc8d530d
+size 21072
diff --git a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker12h[2]_LilacD0BCFF.png b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker12h[2]_LilacD0BCFF.png
index 404dab72..1ceca35d 100644
--- a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker12h[2]_LilacD0BCFF.png
+++ b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker12h[2]_LilacD0BCFF.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8e3da432d7efa7cebe9f11da4baa9b0fd3b5e2d25182f8854a0742ef7fed9a5b
-size 27772
+oid sha256:3adf769a4799736b38716db11e0efe80da7711cf9d5dd47705e9899c4540533c
+size 21301
diff --git a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker12h[3]_Green6DD58C.png b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker12h[3]_Green6DD58C.png
index 9a8c99f3..9facce47 100644
--- a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker12h[3]_Green6DD58C.png
+++ b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker12h[3]_Green6DD58C.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6fc5174e9d78a96e569f53168a49ec7cf7eda77569053228056a23618e8a4f18
-size 27475
+oid sha256:f27d35445b91683d537b5f387a1a5f4652620ac10715ae1da0dcf8649466b4cd
+size 21082
diff --git a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker12h[4]_BluewithText7FCFFF.png b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker12h[4]_BluewithText7FCFFF.png
index 2aab55dc..80f190e8 100644
--- a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker12h[4]_BluewithText7FCFFF.png
+++ b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker12h[4]_BluewithText7FCFFF.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ea2c3df7c0fcd71a136bf38d339fdcadbc5427483686e17d2701c4cea1e2ab41
-size 27876
+oid sha256:e8bc8aa6833fcfbbc9b5b97e6ebbffa94b84c8dfd7fce409138e79d97a91cec7
+size 21066
diff --git a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker12h[5]_Orangey.png b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker12h[5]_Orangey.png
index 8553135d..fcd8dd7f 100644
--- a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker12h[5]_Orangey.png
+++ b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker12h[5]_Orangey.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4d0317095579c2e671059b0693483e91d170d5141c6675012559f632431da453
-size 27397
+oid sha256:b6cb66adf618de305d477631817315a4980fc95243016019eaa0cfc73766b5ce
+size 20879
diff --git a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker12h[6]_Uamp.png b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker12h[6]_Uamp.png
index 7834de39..0c951a9e 100644
--- a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker12h[6]_Uamp.png
+++ b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker12h[6]_Uamp.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:399e47d3396af178c2175369805a5ebdda2f80bb904eb2532036a686f1251a79
-size 27285
+oid sha256:4298aed9baed5cf91eab11942c6bc86420fb5d85675a217b73767d0fddf0bf70
+size 20441
diff --git a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker[0]_BlueDefaultAECBFA.png b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker[0]_BlueDefaultAECBFA.png
index 7c412ba9..21a099e2 100644
--- a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker[0]_BlueDefaultAECBFA.png
+++ b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker[0]_BlueDefaultAECBFA.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2bc38ee8e6ec864c7b4b31cde01bcbc58d3421ec83631a051fa327d80b45c8de
-size 25766
+oid sha256:4c2be576b46816a4d1d840f98bfda150d67a26e874dffe8e6f89869f2d62d0d7
+size 19619
diff --git a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker[1]_Blue7FCFFF.png b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker[1]_Blue7FCFFF.png
index 65cb3109..ead69daa 100644
--- a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker[1]_Blue7FCFFF.png
+++ b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker[1]_Blue7FCFFF.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:99fbb93f26df1441205c1da42adf89c4c428adb114a186a2036cd3063c838a73
-size 25951
+oid sha256:8af55c7013ebd83e7382a4e1ca024e4a1c8e7b2784ae59769f5ede0f01e1be89
+size 19408
diff --git a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker[2]_LilacD0BCFF.png b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker[2]_LilacD0BCFF.png
index 016d8a01..3814f9a2 100644
--- a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker[2]_LilacD0BCFF.png
+++ b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker[2]_LilacD0BCFF.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5c525aea28a51eca16e8fd6f1dcbaa28d048976a21a8117c78a9e0ef983b3fcf
-size 25841
+oid sha256:b953930749c06086827f4258eb5c207eaa8a9a65a380277b6ac20fdc671594ca
+size 19633
diff --git a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker[3]_Green6DD58C.png b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker[3]_Green6DD58C.png
index 26e81f79..24b3cb20 100644
--- a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker[3]_Green6DD58C.png
+++ b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker[3]_Green6DD58C.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0e4cae19919baf551880ee625905b1d46aa4ce45d54bc3462a8ab4618eb42d5b
-size 25515
+oid sha256:377bb80e0284fd5d81d59afa3569cc2250254cdc1ccb0537ca4a29c89f1a7aa0
+size 19415
diff --git a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker[4]_BluewithText7FCFFF.png b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker[4]_BluewithText7FCFFF.png
index c663da9e..c182c8e5 100644
--- a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker[4]_BluewithText7FCFFF.png
+++ b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker[4]_BluewithText7FCFFF.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:631f93f67ad93986136516fb72c8521d017c76b2c66cf9cc91013404d4664bce
-size 25915
+oid sha256:9e45c0a8b7a2e696a8ffd76504b059107074d0eeaf1b3783bfe72ac2cf763cf0
+size 19400
diff --git a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker[5]_Orangey.png b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker[5]_Orangey.png
index 3b199943..cdd82a3f 100644
--- a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker[5]_Orangey.png
+++ b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker[5]_Orangey.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1eea65358ced0a025adca3458dee564c6a815fd746e288dacdefc967007d6486
-size 25496
+oid sha256:ce3fb496b757b3c7df891837444bb8655690c63afc98ecd9d893b57167d0913a
+size 19220
diff --git a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker[6]_Uamp.png b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker[6]_Uamp.png
index b8a7abcf..09760484 100644
--- a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker[6]_Uamp.png
+++ b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PickerThemeTest_timePicker[6]_Uamp.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:29b2a85d5977879d4e340b76384255e1a2308a0ba2fc18fcf46c35a71b94cf7b
-size 25317
+oid sha256:a30f291cbc11800b1672d585a8e7a5b24d1db0db965f204c2419d9df1afc45e6
+size 18783
diff --git a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PlaceholderChipTest_default.png b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PlaceholderChipTest_default.png
index 69b4e4b1..8cc9d30b 100644
--- a/composables/src/test/snapshots/images/com.google.android.horologist.composables_PlaceholderChipTest_default.png
+++ b/composables/src/test/snapshots/images/com.google.android.horologist.composables_PlaceholderChipTest_default.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:94f66952598c50d66aede03560a36724da4f286d16f959d90f64a8d1cd9d06a3
-size 5132
+oid sha256:0e0b0b27e6db51db23d2696bec9d5352eade609f64bb2563f21cb6108ac1f862
+size 3630
diff --git a/compose-layout/build.gradle.kts b/compose-layout/build.gradle.kts
index 336d7b64..345e0324 100644
--- a/compose-layout/build.gradle.kts
+++ b/compose-layout/build.gradle.kts
@@ -19,6 +19,7 @@ plugins {
     id("org.jetbrains.dokka")
     id("me.tylerbwong.gradle.metalava")
     kotlin("android")
+    alias(libs.plugins.roborazzi)
 }
 
 android {
diff --git a/compose-layout/src/test/java/com/google/android/horologist/compose/layout/ResponsiveTimeTextTest.kt b/compose-layout/src/test/java/com/google/android/horologist/compose/layout/ResponsiveTimeTextTest.kt
index 3dace84e..cab61c5c 100644
--- a/compose-layout/src/test/java/com/google/android/horologist/compose/layout/ResponsiveTimeTextTest.kt
+++ b/compose-layout/src/test/java/com/google/android/horologist/compose/layout/ResponsiveTimeTextTest.kt
@@ -14,19 +14,17 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.compose.layout
 
 import androidx.compose.runtime.Composable
 import androidx.wear.compose.material.TimeSource
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
+import com.google.android.horologist.screenshots.rng.WearLegacyScreenTest
 import org.junit.Test
 
-class ResponsiveTimeTextTest : ScreenshotBaseTest() {
+class ResponsiveTimeTextTest : WearLegacyScreenTest() {
     @Test
     fun defaultTimeText() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runTest {
             ResponsiveTimeText(
                 timeSource = object : TimeSource {
                     override val currentTime: String
diff --git a/compose-layout/src/test/java/com/google/android/horologist/compose/pager/VerticalPagerScreenScreenshotTest.kt b/compose-layout/src/test/java/com/google/android/horologist/compose/pager/VerticalPagerScreenScreenshotTest.kt
index afb4997f..f39810a9 100644
--- a/compose-layout/src/test/java/com/google/android/horologist/compose/pager/VerticalPagerScreenScreenshotTest.kt
+++ b/compose-layout/src/test/java/com/google/android/horologist/compose/pager/VerticalPagerScreenScreenshotTest.kt
@@ -14,12 +14,8 @@
  * limitations under the License.
  */
 
-@file:OptIn(ExperimentalFoundationApi::class)
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.compose.pager
 
-import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
@@ -28,19 +24,14 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.wear.compose.material.Text
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
-import com.google.android.horologist.screenshots.ScreenshotTestRule
+import com.google.android.horologist.screenshots.rng.WearLegacyScreenTest
 import org.junit.Test
 
-class VerticalPagerScreenScreenshotTest : ScreenshotBaseTest(
-    params = ScreenshotTestRule.screenshotTestRuleParams {
-        screenTimeText = {}
-    },
-) {
+class VerticalPagerScreenScreenshotTest : WearLegacyScreenTest() {
 
     @Test
     fun screens() {
-        screenshotTestRule.setContent(takeScreenshot = true, roundScreen = true) {
+        runTest {
             VerticalPagerScreen(
                 state = rememberPagerState {
                     10
diff --git a/compose-layout/src/test/snapshots/images/com.google.android.horologist.compose.layout_ResponsiveTimeTextTest_defaultTimeText.png b/compose-layout/src/test/snapshots/images/com.google.android.horologist.compose.layout_ResponsiveTimeTextTest_defaultTimeText.png
index f091c177..9883ee5e 100644
--- a/compose-layout/src/test/snapshots/images/com.google.android.horologist.compose.layout_ResponsiveTimeTextTest_defaultTimeText.png
+++ b/compose-layout/src/test/snapshots/images/com.google.android.horologist.compose.layout_ResponsiveTimeTextTest_defaultTimeText.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1e9840cb97636cb4d0d876ecf8186e4698b71de12d706c7ce6894ac5f0c59399
-size 13482
+oid sha256:19a6830092560acf520417e861e097eb8ec29c67e6c7c72ba204c21fb1eec969
+size 7996
diff --git a/compose-layout/src/test/snapshots/images/com.google.android.horologist.compose.pager_VerticalPagerScreenScreenshotTest_screens.png b/compose-layout/src/test/snapshots/images/com.google.android.horologist.compose.pager_VerticalPagerScreenScreenshotTest_screens.png
index 2f0dd283..4b84af6d 100644
--- a/compose-layout/src/test/snapshots/images/com.google.android.horologist.compose.pager_VerticalPagerScreenScreenshotTest_screens.png
+++ b/compose-layout/src/test/snapshots/images/com.google.android.horologist.compose.pager_VerticalPagerScreenScreenshotTest_screens.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b06d8ed76f22c73372ff14048552c629fc659f09aeffbbd48abe277e8c38e4fc
-size 16610
+oid sha256:73866bacad51c9671d46b4ab711e8264eb9f87708bfbfcfd5fd258f7af96bac1
+size 12042
diff --git a/compose-material/src/test/java/com/google/android/horologist/compose/material/ButtonTest.kt b/compose-material/src/test/java/com/google/android/horologist/compose/material/ButtonTest.kt
index 6d2a642b..c5668483 100644
--- a/compose-material/src/test/java/com/google/android/horologist/compose/material/ButtonTest.kt
+++ b/compose-material/src/test/java/com/google/android/horologist/compose/material/ButtonTest.kt
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.compose.material
 
 import androidx.compose.material.icons.Icons
@@ -24,14 +22,14 @@ import androidx.compose.material.icons.filled.Check
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.wear.compose.material.ButtonDefaults
 import com.google.accompanist.testharness.TestHarness
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
+import com.google.android.horologist.screenshots.rng.WearLegacyComponentTest
 import org.junit.Test
 
-internal class ButtonTest : ScreenshotBaseTest() {
+internal class ButtonTest : WearLegacyComponentTest() {
 
     @Test
     fun default() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             Button(
                 imageVector = Icons.Default.Check,
                 contentDescription = "contentDescription",
@@ -42,7 +40,7 @@ internal class ButtonTest : ScreenshotBaseTest() {
 
     @Test
     fun disabled() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             Button(
                 imageVector = Icons.Default.Check,
                 contentDescription = "contentDescription",
@@ -54,7 +52,7 @@ internal class ButtonTest : ScreenshotBaseTest() {
 
     @Test
     fun large() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             Button(
                 imageVector = Icons.Default.Check,
                 contentDescription = "contentDescription",
@@ -66,7 +64,7 @@ internal class ButtonTest : ScreenshotBaseTest() {
 
     @Test
     fun small() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             Button(
                 imageVector = Icons.Default.Check,
                 contentDescription = "contentDescription",
@@ -78,7 +76,7 @@ internal class ButtonTest : ScreenshotBaseTest() {
 
     @Test
     fun customSize() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             Button(
                 imageVector = Icons.Default.Check,
                 contentDescription = "contentDescription",
@@ -93,7 +91,7 @@ internal class ButtonTest : ScreenshotBaseTest() {
 
     @Test
     fun withSecondaryButtonColors() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             Button(
                 imageVector = Icons.Default.Check,
                 contentDescription = "contentDescription",
@@ -105,7 +103,7 @@ internal class ButtonTest : ScreenshotBaseTest() {
 
     @Test
     fun withIconButtonColors() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             Button(
                 imageVector = Icons.Default.Check,
                 contentDescription = "contentDescription",
@@ -117,7 +115,7 @@ internal class ButtonTest : ScreenshotBaseTest() {
 
     @Test
     fun usingDrawableResAsIcon() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             Button(
                 id = android.R.drawable.ic_media_play,
                 contentDescription = "contentDescription",
@@ -128,7 +126,7 @@ internal class ButtonTest : ScreenshotBaseTest() {
 
     @Test
     fun usingDrawableResAsIconRtl() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(layoutDirection = LayoutDirection.Rtl) {
                 Button(
                     id = android.R.drawable.ic_media_play,
@@ -141,7 +139,7 @@ internal class ButtonTest : ScreenshotBaseTest() {
 
     @Test
     fun usingDrawableResAsIconMirrored() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             Button(
                 id = android.R.drawable.ic_media_play,
                 contentDescription = "contentDescription",
@@ -153,7 +151,7 @@ internal class ButtonTest : ScreenshotBaseTest() {
 
     @Test
     fun usingDrawableResAsIconMirroredRtl() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(layoutDirection = LayoutDirection.Rtl) {
                 Button(
                     id = android.R.drawable.ic_media_play,
@@ -167,7 +165,7 @@ internal class ButtonTest : ScreenshotBaseTest() {
 
     @Test
     fun defaultRtl() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(layoutDirection = LayoutDirection.Rtl) {
                 Button(
                     imageVector = Icons.Default.Check,
@@ -180,7 +178,7 @@ internal class ButtonTest : ScreenshotBaseTest() {
 
     @Test
     fun mirrored() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             Button(
                 imageVector = Icons.AutoMirrored.Default.DirectionsBike,
                 contentDescription = "contentDescription",
@@ -192,7 +190,7 @@ internal class ButtonTest : ScreenshotBaseTest() {
 
     @Test
     fun mirroredRtl() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(layoutDirection = LayoutDirection.Rtl) {
                 Button(
                     imageVector = Icons.AutoMirrored.Default.DirectionsBike,
diff --git a/compose-material/src/test/java/com/google/android/horologist/compose/material/ChipIconWithProgressTest.kt b/compose-material/src/test/java/com/google/android/horologist/compose/material/ChipIconWithProgressTest.kt
index d45a1009..d15aa0e4 100644
--- a/compose-material/src/test/java/com/google/android/horologist/compose/material/ChipIconWithProgressTest.kt
+++ b/compose-material/src/test/java/com/google/android/horologist/compose/material/ChipIconWithProgressTest.kt
@@ -14,48 +14,41 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.compose.material
 
 import androidx.compose.material.icons.materialPath
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.unit.dp
 import com.google.android.horologist.images.base.paintable.ImageVectorPaintable.Companion.asPaintable
-import com.google.android.horologist.images.coil.FakeImageLoader
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
+import com.google.android.horologist.screenshots.rng.WearLegacyComponentTest
 import org.junit.Test
 
-class ChipIconWithProgressTest : ScreenshotBaseTest() {
+class ChipIconWithProgressTest : WearLegacyComponentTest() {
 
     @Test
     fun default() {
-        screenshotTestRule.setContent(
-            isComponent = true,
-            takeScreenshot = true,
-            fakeImageLoader = FakeImageLoader.NotFound,
-        ) {
+        runComponentTest {
             ChipIconWithProgress(progress = 75f)
         }
     }
 
     @Test
     fun withProgressSmallIcon() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ChipIconWithProgress(progress = 75f, icon = Icon12dp.asPaintable())
         }
     }
 
     @Test
     fun withProgressMediumIcon() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ChipIconWithProgress(progress = 75f, icon = Icon32dp.asPaintable())
         }
     }
 
     @Test
     fun withProgressLargeIcon() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ChipIconWithProgress(
                 progress = 75f,
                 icon = Icon48dp.asPaintable(),
diff --git a/compose-material/src/test/java/com/google/android/horologist/compose/material/ChipTest.kt b/compose-material/src/test/java/com/google/android/horologist/compose/material/ChipTest.kt
index 09ab0884..d56c07e3 100644
--- a/compose-material/src/test/java/com/google/android/horologist/compose/material/ChipTest.kt
+++ b/compose-material/src/test/java/com/google/android/horologist/compose/material/ChipTest.kt
@@ -33,14 +33,14 @@ import androidx.wear.compose.material.ChipDefaults
 import com.google.accompanist.testharness.TestHarness
 import com.google.android.horologist.images.base.paintable.DrawableResPaintable
 import com.google.android.horologist.images.base.paintable.ImageVectorPaintable.Companion.asPaintable
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
+import com.google.android.horologist.screenshots.rng.WearLegacyComponentTest
 import org.junit.Test
 
-class ChipTest : ScreenshotBaseTest() {
+class ChipTest : WearLegacyComponentTest() {
 
     @Test
     fun default() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             Chip(
                 label = "Primary label",
                 onClick = { },
@@ -50,7 +50,7 @@ class ChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withSecondaryLabel() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             Chip(
                 label = "Primary label",
                 onClick = { },
@@ -61,7 +61,7 @@ class ChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withIcon() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             Chip(
                 label = "Primary label",
                 onClick = { },
@@ -72,7 +72,7 @@ class ChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withLargeIcon() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             Chip(
                 label = "Primary label",
                 onClick = { },
@@ -84,7 +84,7 @@ class ChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withSecondaryLabelAndIcon() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             Chip(
                 label = "Primary label",
                 onClick = { },
@@ -96,7 +96,7 @@ class ChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withSecondaryLabelAndLargeIcon() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             Chip(
                 label = "Primary label",
                 onClick = { },
@@ -109,7 +109,7 @@ class ChipTest : ScreenshotBaseTest() {
 
     @Test
     fun disabled() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             Chip(
                 label = "Primary label",
                 onClick = { },
@@ -122,7 +122,7 @@ class ChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withLongText() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             Chip(
                 label = "Primary label very very very very very very very very very very very very very very very very very long text",
                 onClick = { },
@@ -132,7 +132,7 @@ class ChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withLongTextAndLargestFontScale() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(fontScale = largestFontScale) {
                 Chip(
                     label = "Primary label very very very very very very very very very very very very very very very very very long text",
@@ -144,7 +144,7 @@ class ChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withLongTextAndMediumFontScale() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(fontScale = 1.06f) {
                 Chip(
                     label = "Primary label very very very very very very very very very very very very very very very very very long text",
@@ -156,7 +156,7 @@ class ChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withSecondaryLabelAndIconAndLongText() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             Chip(
                 label = "Primary label very very very very very very very very long text",
                 onClick = { },
@@ -168,7 +168,7 @@ class ChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withSecondaryLabelAndIconAndLongTextAndLargestFontScale() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(fontScale = largestFontScale) {
                 Chip(
                     label = "Primary label very very very very very very very very long text",
@@ -182,7 +182,7 @@ class ChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withSecondaryLabelAndLargeIconAndLongText() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             Chip(
                 label = "Primary label very very very very very very very very long text",
                 onClick = { },
@@ -195,7 +195,7 @@ class ChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withSecondaryLabelAndLargeIconAndLongTextAndLargestFontScale() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(fontScale = largestFontScale) {
                 Chip(
                     label = "Primary label very very very very very very very very long text",
@@ -210,7 +210,7 @@ class ChipTest : ScreenshotBaseTest() {
 
     @Test
     fun usingSmallIcon() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             Chip(
                 label = "Primary label",
                 onClick = { },
@@ -221,7 +221,7 @@ class ChipTest : ScreenshotBaseTest() {
 
     @Test
     fun usingDrawableResAsIcon() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             Chip(
                 label = "Primary label",
                 onClick = { },
@@ -232,7 +232,7 @@ class ChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withLargeIconUsingSmallIcon() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             Chip(
                 label = "Primary label",
                 onClick = { },
@@ -244,7 +244,7 @@ class ChipTest : ScreenshotBaseTest() {
 
     @Test
     fun usingExtraLargeIcon() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             Chip(
                 label = "Primary label",
                 onClick = { },
@@ -255,7 +255,7 @@ class ChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withLargeIconUsingExtraLargeIcon() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             Chip(
                 label = "Primary label",
                 onClick = { },
@@ -267,7 +267,7 @@ class ChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withSecondaryLabelAndIconRtl() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(layoutDirection = LayoutDirection.Rtl) {
                 Chip(
                     label = "Primary label",
@@ -281,7 +281,7 @@ class ChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withSecondaryChipColors() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             Chip(
                 label = "Primary label",
                 onClick = { },
@@ -294,7 +294,7 @@ class ChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withGradientBackgroundChipColors() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             Chip(
                 label = "Primary label",
                 onClick = { },
@@ -307,7 +307,7 @@ class ChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withImageBackgroundChipColors() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             Chip(
                 label = "Primary label",
                 onClick = { },
@@ -322,7 +322,7 @@ class ChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withIconMirrored() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             CompositionLocalProvider(LocalLayoutDirection provides LayoutDirection.Rtl) {
                 @Suppress("Deprecation")
                 Chip(
diff --git a/compose-material/src/test/java/com/google/android/horologist/compose/material/ChipThemeTest.kt b/compose-material/src/test/java/com/google/android/horologist/compose/material/ChipThemeTest.kt
index 14183c7d..bb3eeb96 100644
--- a/compose-material/src/test/java/com/google/android/horologist/compose/material/ChipThemeTest.kt
+++ b/compose-material/src/test/java/com/google/android/horologist/compose/material/ChipThemeTest.kt
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.compose.material
 
 import androidx.compose.foundation.shape.CutCornerShape
@@ -29,14 +27,14 @@ import androidx.wear.compose.material.Colors
 import androidx.wear.compose.material.MaterialTheme
 import androidx.wear.compose.material.Shapes
 import androidx.wear.compose.material.Typography
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
+import com.google.android.horologist.screenshots.rng.WearLegacyComponentTest
 import org.junit.Test
 
-class ChipThemeTest : ScreenshotBaseTest() {
+class ChipThemeTest : WearLegacyComponentTest() {
 
     @Test
     fun withCustomTheme() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             MaterialTheme(
                 colors = CustomColors,
                 typography = CustomTypography,
diff --git a/compose-material/src/test/java/com/google/android/horologist/compose/material/CompactChipTest.kt b/compose-material/src/test/java/com/google/android/horologist/compose/material/CompactChipTest.kt
index 11e0107f..adbff801 100644
--- a/compose-material/src/test/java/com/google/android/horologist/compose/material/CompactChipTest.kt
+++ b/compose-material/src/test/java/com/google/android/horologist/compose/material/CompactChipTest.kt
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.compose.material
 
 import android.R
@@ -26,14 +24,14 @@ import androidx.compose.ui.unit.LayoutDirection
 import com.google.accompanist.testharness.TestHarness
 import com.google.android.horologist.images.base.paintable.DrawableResPaintable
 import com.google.android.horologist.images.base.paintable.ImageVectorPaintable.Companion.asPaintable
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
+import com.google.android.horologist.screenshots.rng.WearLegacyComponentTest
 import org.junit.Test
 
-class CompactChipTest : ScreenshotBaseTest() {
+class CompactChipTest : WearLegacyComponentTest() {
 
     @Test
     fun default() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             CompactChip(
                 label = "Primary label",
                 onClick = { },
@@ -43,7 +41,7 @@ class CompactChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withIcon() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             CompactChip(
                 label = "Primary label",
                 onClick = { },
@@ -54,7 +52,7 @@ class CompactChipTest : ScreenshotBaseTest() {
 
     @Test
     fun iconOnly() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             CompactChip(
                 onClick = { },
                 icon = Icons.Filled.Add.asPaintable(),
@@ -65,7 +63,7 @@ class CompactChipTest : ScreenshotBaseTest() {
 
     @Test
     fun disabled() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             CompactChip(
                 label = "Primary label",
                 onClick = { },
@@ -77,7 +75,7 @@ class CompactChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withLongText() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             CompactChip(
                 label = "Primary label very very very very very very very very very very very very very very very very very long text",
                 onClick = { },
@@ -87,7 +85,7 @@ class CompactChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withLongTextAndLargestFontScale() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(fontScale = LARGEST_FONT_SCALE) {
                 CompactChip(
                     label = "Primary label very very very very very very very very very very very very very very very very very long text",
@@ -99,7 +97,7 @@ class CompactChipTest : ScreenshotBaseTest() {
 
     @Test
     fun usingDrawableResAsIcon() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             CompactChip(
                 label = "Primary label",
                 onClick = { },
@@ -110,7 +108,7 @@ class CompactChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withIconRtl() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(layoutDirection = LayoutDirection.Rtl) {
                 CompactChip(
                     label = "Primary label",
@@ -123,7 +121,7 @@ class CompactChipTest : ScreenshotBaseTest() {
 
     @Test
     fun mirrored() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             CompactChip(
                 label = "Primary label",
                 onClick = { },
@@ -135,7 +133,7 @@ class CompactChipTest : ScreenshotBaseTest() {
 
     @Test
     fun mirroredRtl() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(layoutDirection = LayoutDirection.Rtl) {
                 CompactChip(
                     label = "Primary label",
@@ -149,7 +147,7 @@ class CompactChipTest : ScreenshotBaseTest() {
 
     @Test
     fun usingDrawableResAsIconMirroredRtl() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(layoutDirection = LayoutDirection.Rtl) {
                 CompactChip(
                     label = "Primary label",
diff --git a/compose-material/src/test/java/com/google/android/horologist/compose/material/IconTest.kt b/compose-material/src/test/java/com/google/android/horologist/compose/material/IconTest.kt
index afc304d6..9fc60e5f 100644
--- a/compose-material/src/test/java/com/google/android/horologist/compose/material/IconTest.kt
+++ b/compose-material/src/test/java/com/google/android/horologist/compose/material/IconTest.kt
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.compose.material
 
 import androidx.compose.material.icons.Icons
@@ -25,14 +23,14 @@ import androidx.compose.ui.unit.LayoutDirection
 import com.google.accompanist.testharness.TestHarness
 import com.google.android.horologist.images.base.paintable.DrawableResPaintable
 import com.google.android.horologist.images.base.paintable.ImageVectorPaintable.Companion.asPaintable
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
+import com.google.android.horologist.screenshots.rng.WearLegacyComponentTest
 import org.junit.Test
 
-class IconTest : ScreenshotBaseTest() {
+class IconTest : WearLegacyComponentTest() {
 
     @Test
     fun default() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             Icon(
                 paintable = Icons.Outlined.Abc.asPaintable(),
                 contentDescription = "contentDescription",
@@ -42,7 +40,7 @@ class IconTest : ScreenshotBaseTest() {
 
     @Test
     fun defaultRtl() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(layoutDirection = LayoutDirection.Rtl) {
                 Icon(
                     paintable = Icons.Outlined.Abc.asPaintable(),
@@ -54,7 +52,7 @@ class IconTest : ScreenshotBaseTest() {
 
     @Test
     fun mirrored() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             Icon(
                 paintable = Icons.Outlined.Abc.asPaintable(),
                 contentDescription = "contentDescription",
@@ -65,7 +63,7 @@ class IconTest : ScreenshotBaseTest() {
 
     @Test
     fun mirroredRtl() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(layoutDirection = LayoutDirection.Rtl) {
                 Icon(
                     paintable = Icons.Outlined.Abc.asPaintable(),
@@ -78,7 +76,7 @@ class IconTest : ScreenshotBaseTest() {
 
     @Test
     fun autoMirroredLTR() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             Icon(
                 paintable = Icons.AutoMirrored.Outlined.VolumeDown.asPaintable(),
                 contentDescription = "contentDescription",
@@ -88,7 +86,7 @@ class IconTest : ScreenshotBaseTest() {
 
     @Test
     fun autoMirroredRtl() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(layoutDirection = LayoutDirection.Rtl) {
                 Icon(
                     paintable = Icons.AutoMirrored.Outlined.VolumeDown.asPaintable(),
@@ -100,7 +98,7 @@ class IconTest : ScreenshotBaseTest() {
 
     @Test
     fun usingDrawableResAsIcon() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             Icon(
                 paintable = DrawableResPaintable(android.R.drawable.ic_media_play),
                 contentDescription = "contentDescription",
@@ -110,7 +108,7 @@ class IconTest : ScreenshotBaseTest() {
 
     @Test
     fun usingDrawableResAsIconRtl() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(layoutDirection = LayoutDirection.Rtl) {
                 Icon(
                     paintable = DrawableResPaintable(android.R.drawable.ic_media_play),
@@ -122,7 +120,7 @@ class IconTest : ScreenshotBaseTest() {
 
     @Test
     fun usingDrawableResAsIconMirrored() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             Icon(
                 paintable = DrawableResPaintable(android.R.drawable.ic_media_play),
                 contentDescription = "contentDescription",
@@ -133,7 +131,7 @@ class IconTest : ScreenshotBaseTest() {
 
     @Test
     fun usingDrawableResAsIconMirroredRtl() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(layoutDirection = LayoutDirection.Rtl) {
                 Icon(
                     paintable = DrawableResPaintable(android.R.drawable.ic_media_play),
diff --git a/compose-material/src/test/java/com/google/android/horologist/compose/material/OutlinedChipTest.kt b/compose-material/src/test/java/com/google/android/horologist/compose/material/OutlinedChipTest.kt
index 16a32714..1a25848d 100644
--- a/compose-material/src/test/java/com/google/android/horologist/compose/material/OutlinedChipTest.kt
+++ b/compose-material/src/test/java/com/google/android/horologist/compose/material/OutlinedChipTest.kt
@@ -33,14 +33,14 @@ import androidx.wear.compose.material.ChipDefaults
 import com.google.accompanist.testharness.TestHarness
 import com.google.android.horologist.images.base.paintable.DrawableResPaintable
 import com.google.android.horologist.images.base.paintable.ImageVectorPaintable.Companion.asPaintable
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
+import com.google.android.horologist.screenshots.rng.WearLegacyComponentTest
 import org.junit.Test
 
-class OutlinedChipTest : ScreenshotBaseTest() {
+class OutlinedChipTest : WearLegacyComponentTest() {
 
     @Test
     fun default() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             OutlinedChip(
                 label = "Primary label",
                 onClick = { },
@@ -50,7 +50,7 @@ class OutlinedChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withSecondaryLabel() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             OutlinedChip(
                 label = "Primary label",
                 onClick = { },
@@ -61,7 +61,7 @@ class OutlinedChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withIcon() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             OutlinedChip(
                 label = "Primary label",
                 onClick = { },
@@ -72,7 +72,7 @@ class OutlinedChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withLargeIcon() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             OutlinedChip(
                 label = "Primary label",
                 onClick = { },
@@ -84,7 +84,7 @@ class OutlinedChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withSecondaryLabelAndIcon() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             OutlinedChip(
                 label = "Primary label",
                 onClick = { },
@@ -96,7 +96,7 @@ class OutlinedChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withSecondaryLabelAndLargeIcon() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             OutlinedChip(
                 label = "Primary label",
                 onClick = { },
@@ -109,7 +109,7 @@ class OutlinedChipTest : ScreenshotBaseTest() {
 
     @Test
     fun disabled() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             OutlinedChip(
                 label = "Primary label",
                 onClick = { },
@@ -122,7 +122,7 @@ class OutlinedChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withLongText() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             OutlinedChip(
                 label = "Primary label very very very very very very very very very very very very very very very very very long text",
                 onClick = { },
@@ -132,7 +132,7 @@ class OutlinedChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withLongTextAndLargestFontScale() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(fontScale = LARGEST_FONT_SCALE) {
                 OutlinedChip(
                     label = "Primary label very very very very very very very very very very very very very very very very very long text",
@@ -144,7 +144,7 @@ class OutlinedChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withLongTextAndMediumFontScale() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(fontScale = MEDIUM_FONT_SCALE) {
                 OutlinedChip(
                     label = "Primary label very very very very very very very very very very very very very very very very very long text",
@@ -156,7 +156,7 @@ class OutlinedChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withSecondaryLabelAndIconAndLongText() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             OutlinedChip(
                 label = "Primary label very very very very very very very very long text",
                 onClick = { },
@@ -168,7 +168,7 @@ class OutlinedChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withSecondaryLabelAndIconAndLongTextAndLargestFontScale() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(fontScale = LARGEST_FONT_SCALE) {
                 OutlinedChip(
                     label = "Primary label very very very very very very very very long text",
@@ -182,7 +182,7 @@ class OutlinedChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withSecondaryLabelAndLargeIconAndLongText() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             OutlinedChip(
                 label = "Primary label very very very very very very very very long text",
                 onClick = { },
@@ -195,7 +195,7 @@ class OutlinedChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withSecondaryLabelAndLargeIconAndLongTextAndLargestFontScale() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(fontScale = LARGEST_FONT_SCALE) {
                 OutlinedChip(
                     label = "Primary label very very very very very very very very long text",
@@ -210,7 +210,7 @@ class OutlinedChipTest : ScreenshotBaseTest() {
 
     @Test
     fun usingSmallIcon() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             OutlinedChip(
                 label = "Primary label",
                 onClick = { },
@@ -221,18 +221,18 @@ class OutlinedChipTest : ScreenshotBaseTest() {
 
     @Test
     fun usingDrawableResAsIcon() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             OutlinedChip(
                 label = "Primary label",
                 onClick = { },
-                icon = DrawableResPaintable(android.R.drawable.ic_delete),
+                icon = DrawableResPaintable(R.drawable.ic_delete),
             )
         }
     }
 
     @Test
     fun withLargeIconUsingSmallIcon() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             OutlinedChip(
                 label = "Primary label",
                 onClick = { },
@@ -244,7 +244,7 @@ class OutlinedChipTest : ScreenshotBaseTest() {
 
     @Test
     fun usingExtraLargeIcon() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             OutlinedChip(
                 label = "Primary label",
                 onClick = { },
@@ -255,7 +255,7 @@ class OutlinedChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withLargeIconUsingExtraLargeIcon() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             OutlinedChip(
                 label = "Primary label",
                 onClick = { },
@@ -267,7 +267,7 @@ class OutlinedChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withSecondaryLabelAndIconRtl() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(layoutDirection = LayoutDirection.Rtl) {
                 OutlinedChip(
                     label = "Primary label",
@@ -281,7 +281,7 @@ class OutlinedChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withSecondaryChipColors() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             OutlinedChip(
                 label = "Primary label",
                 onClick = { },
@@ -294,7 +294,7 @@ class OutlinedChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withGradientBackgroundChipColors() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             OutlinedChip(
                 label = "Primary label",
                 onClick = { },
@@ -307,7 +307,7 @@ class OutlinedChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withImageBackgroundChipColors() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             OutlinedChip(
                 label = "Primary label",
                 onClick = { },
@@ -322,7 +322,7 @@ class OutlinedChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withIconMirrored() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             CompositionLocalProvider(LocalLayoutDirection provides LayoutDirection.Rtl) {
                 @Suppress("Deprecation")
                 OutlinedChip(
diff --git a/compose-material/src/test/java/com/google/android/horologist/compose/material/OutlinedCompactChipTest.kt b/compose-material/src/test/java/com/google/android/horologist/compose/material/OutlinedCompactChipTest.kt
index c9accb1a..b6250979 100644
--- a/compose-material/src/test/java/com/google/android/horologist/compose/material/OutlinedCompactChipTest.kt
+++ b/compose-material/src/test/java/com/google/android/horologist/compose/material/OutlinedCompactChipTest.kt
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.compose.material
 
 import android.R
@@ -26,14 +24,14 @@ import androidx.compose.ui.unit.LayoutDirection
 import com.google.accompanist.testharness.TestHarness
 import com.google.android.horologist.images.base.paintable.DrawableResPaintable
 import com.google.android.horologist.images.base.paintable.ImageVectorPaintable.Companion.asPaintable
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
+import com.google.android.horologist.screenshots.rng.WearLegacyComponentTest
 import org.junit.Test
 
-class OutlinedCompactChipTest : ScreenshotBaseTest() {
+class OutlinedCompactChipTest : WearLegacyComponentTest() {
 
     @Test
     fun default() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             OutlinedCompactChip(
                 onClick = { },
                 label = "Primary label",
@@ -43,7 +41,7 @@ class OutlinedCompactChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withIcon() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             OutlinedCompactChip(
                 onClick = { },
                 label = "Primary label",
@@ -54,7 +52,7 @@ class OutlinedCompactChipTest : ScreenshotBaseTest() {
 
     @Test
     fun iconOnly() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             OutlinedCompactChip(
                 onClick = { },
                 icon = Icons.Filled.Add.asPaintable(),
@@ -64,7 +62,7 @@ class OutlinedCompactChipTest : ScreenshotBaseTest() {
 
     @Test
     fun disabled() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             OutlinedCompactChip(
                 onClick = { },
                 label = "Primary label",
@@ -76,7 +74,7 @@ class OutlinedCompactChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withLongText() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             OutlinedCompactChip(
                 onClick = { },
                 label = "Primary label very very very very very very very very very very very very very very very very very long text",
@@ -86,7 +84,7 @@ class OutlinedCompactChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withLongTextAndLargestFontScale() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(fontScale = LARGEST_FONT_SCALE) {
                 OutlinedCompactChip(
                     onClick = { },
@@ -98,7 +96,7 @@ class OutlinedCompactChipTest : ScreenshotBaseTest() {
 
     @Test
     fun usingDrawableResAsIcon() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             OutlinedCompactChip(
                 onClick = { },
                 label = "Primary label",
@@ -109,7 +107,7 @@ class OutlinedCompactChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withIconRtl() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(layoutDirection = LayoutDirection.Rtl) {
                 OutlinedCompactChip(
                     onClick = { },
@@ -122,7 +120,7 @@ class OutlinedCompactChipTest : ScreenshotBaseTest() {
 
     @Test
     fun mirrored() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             OutlinedCompactChip(
                 onClick = { },
                 label = "Primary label",
@@ -134,7 +132,7 @@ class OutlinedCompactChipTest : ScreenshotBaseTest() {
 
     @Test
     fun mirroredRtl() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(layoutDirection = LayoutDirection.Rtl) {
                 OutlinedCompactChip(
                     onClick = { },
@@ -148,7 +146,7 @@ class OutlinedCompactChipTest : ScreenshotBaseTest() {
 
     @Test
     fun usingDrawableResAsIconMirroredRtl() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(layoutDirection = LayoutDirection.Rtl) {
                 OutlinedCompactChip(
                     onClick = { },
diff --git a/compose-material/src/test/java/com/google/android/horologist/compose/material/SplitToggleChipTest.kt b/compose-material/src/test/java/com/google/android/horologist/compose/material/SplitToggleChipTest.kt
index 4ff80188..8b171f04 100644
--- a/compose-material/src/test/java/com/google/android/horologist/compose/material/SplitToggleChipTest.kt
+++ b/compose-material/src/test/java/com/google/android/horologist/compose/material/SplitToggleChipTest.kt
@@ -14,20 +14,18 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.compose.material
 
 import androidx.compose.ui.unit.LayoutDirection
 import com.google.accompanist.testharness.TestHarness
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
+import com.google.android.horologist.screenshots.rng.WearLegacyComponentTest
 import org.junit.Test
 
-class SplitToggleChipTest : ScreenshotBaseTest() {
+class SplitToggleChipTest : WearLegacyComponentTest() {
 
     @Test
     fun switch() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             SplitToggleChip(
                 checked = true,
                 onCheckedChanged = { },
@@ -40,7 +38,7 @@ class SplitToggleChipTest : ScreenshotBaseTest() {
 
     @Test
     fun radio() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             SplitToggleChip(
                 checked = true,
                 onCheckedChanged = { },
@@ -53,7 +51,7 @@ class SplitToggleChipTest : ScreenshotBaseTest() {
 
     @Test
     fun checkbox() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             SplitToggleChip(
                 checked = true,
                 onCheckedChanged = { },
@@ -66,7 +64,7 @@ class SplitToggleChipTest : ScreenshotBaseTest() {
 
     @Test
     fun unchecked() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             SplitToggleChip(
                 checked = false,
                 onCheckedChanged = { },
@@ -79,7 +77,7 @@ class SplitToggleChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withSecondaryLabel() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             SplitToggleChip(
                 checked = true,
                 onCheckedChanged = { },
@@ -93,7 +91,7 @@ class SplitToggleChipTest : ScreenshotBaseTest() {
 
     @Test
     fun disabled() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             SplitToggleChip(
                 checked = true,
                 onCheckedChanged = { },
@@ -107,7 +105,7 @@ class SplitToggleChipTest : ScreenshotBaseTest() {
 
     @Test
     fun uncheckedAndDisabled() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             SplitToggleChip(
                 checked = false,
                 onCheckedChanged = { },
@@ -121,7 +119,7 @@ class SplitToggleChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withLongText() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             SplitToggleChip(
                 checked = true,
                 onCheckedChanged = { },
@@ -134,7 +132,7 @@ class SplitToggleChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withLongTextAndLargestFontScale() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(fontScale = largestFontScale) {
                 SplitToggleChip(
                     checked = true,
@@ -149,7 +147,7 @@ class SplitToggleChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withSecondaryLabelAndLongText() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             SplitToggleChip(
                 checked = true,
                 onCheckedChanged = { },
@@ -163,7 +161,7 @@ class SplitToggleChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withSecondaryLabelAndLongTextAndLargestFontScale() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(fontScale = largestFontScale) {
                 SplitToggleChip(
                     checked = true,
@@ -179,7 +177,7 @@ class SplitToggleChipTest : ScreenshotBaseTest() {
 
     @Test
     fun rtl() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(layoutDirection = LayoutDirection.Rtl) {
                 SplitToggleChip(
                     checked = true,
diff --git a/compose-material/src/test/java/com/google/android/horologist/compose/material/StepperTest.kt b/compose-material/src/test/java/com/google/android/horologist/compose/material/StepperTest.kt
index d0fcd91c..d92da823 100644
--- a/compose-material/src/test/java/com/google/android/horologist/compose/material/StepperTest.kt
+++ b/compose-material/src/test/java/com/google/android/horologist/compose/material/StepperTest.kt
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.compose.material
 
 import androidx.compose.runtime.getValue
@@ -24,19 +22,14 @@ import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.wear.compose.material.Text
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
-import com.google.android.horologist.screenshots.ScreenshotTestRule
+import com.google.android.horologist.screenshots.rng.WearLegacyScreenTest
 import org.junit.Test
 
-class StepperTest : ScreenshotBaseTest(
-    params = ScreenshotTestRule.screenshotTestRuleParams {
-        screenTimeText = {}
-    },
-) {
+class StepperTest : WearLegacyScreenTest() {
 
     @Test
     fun float() {
-        screenshotTestRule.setContent(takeScreenshot = true, roundScreen = true) {
+        runTest {
             var value by remember {
                 mutableFloatStateOf(0f)
             }
@@ -53,7 +46,7 @@ class StepperTest : ScreenshotBaseTest(
 
     @Test
     fun int() {
-        screenshotTestRule.setContent(takeScreenshot = true, roundScreen = true) {
+        runTest {
             var value by remember {
                 mutableIntStateOf(0)
             }
diff --git a/compose-material/src/test/java/com/google/android/horologist/compose/material/TitleTest.kt b/compose-material/src/test/java/com/google/android/horologist/compose/material/TitleTest.kt
index e56bcbf8..7e9be1f2 100644
--- a/compose-material/src/test/java/com/google/android/horologist/compose/material/TitleTest.kt
+++ b/compose-material/src/test/java/com/google/android/horologist/compose/material/TitleTest.kt
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.compose.material
 
 import androidx.compose.material.icons.Icons
@@ -23,14 +21,14 @@ import androidx.compose.material.icons.outlined.MusicNote
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.LayoutDirection
 import com.google.accompanist.testharness.TestHarness
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
+import com.google.android.horologist.screenshots.rng.WearLegacyComponentTest
 import org.junit.Test
 
-class TitleTest : ScreenshotBaseTest() {
+class TitleTest : WearLegacyComponentTest() {
 
     @Test
     fun defaultPrimary() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             Title(
                 text = "Title",
             )
@@ -39,7 +37,7 @@ class TitleTest : ScreenshotBaseTest() {
 
     @Test
     fun primaryWithVeryLongText() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             Title(
                 text = "Title with a very very very very very very very very very very very very " +
                     "very very very very very very very very very very very very very very very " +
@@ -50,7 +48,7 @@ class TitleTest : ScreenshotBaseTest() {
 
     @Test
     fun defaultSecondary() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             SecondaryTitle(
                 text = "Title",
             )
@@ -59,7 +57,7 @@ class TitleTest : ScreenshotBaseTest() {
 
     @Test
     fun secondaryWithVeryLongText() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             SecondaryTitle(
                 text = "Title with a very very very very very very very very very very very very " +
                     "very very very very very very very very very very very very very very very " +
@@ -70,7 +68,7 @@ class TitleTest : ScreenshotBaseTest() {
 
     @Test
     fun defaultSecondaryWithIcon() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             SecondaryTitle(
                 text = "Title",
                 icon = Icons.Outlined.MusicNote,
@@ -81,7 +79,7 @@ class TitleTest : ScreenshotBaseTest() {
 
     @Test
     fun secondaryWithIconAndVeryLongText() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             SecondaryTitle(
                 text = "Title with a very very very very very very very very very very very very " +
                     "very very very very very very very very very very very very very very very " +
@@ -94,7 +92,7 @@ class TitleTest : ScreenshotBaseTest() {
 
     @Test
     fun defaultPrimaryRtl() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(layoutDirection = LayoutDirection.Rtl) {
                 Title(
                     text = "Title",
@@ -105,7 +103,7 @@ class TitleTest : ScreenshotBaseTest() {
 
     @Test
     fun defaultSecondaryRtl() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(layoutDirection = LayoutDirection.Rtl) {
                 SecondaryTitle(
                     text = "Title",
@@ -116,7 +114,7 @@ class TitleTest : ScreenshotBaseTest() {
 
     @Test
     fun mirroredSecondary() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             SecondaryTitle(
                 text = "Title",
                 icon = Icons.Outlined.MusicNote,
@@ -128,7 +126,7 @@ class TitleTest : ScreenshotBaseTest() {
 
     @Test
     fun mirroredRtlSecondary() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(layoutDirection = LayoutDirection.Rtl) {
                 SecondaryTitle(
                     text = "Title",
diff --git a/compose-material/src/test/java/com/google/android/horologist/compose/material/ToggleButtonTest.kt b/compose-material/src/test/java/com/google/android/horologist/compose/material/ToggleButtonTest.kt
index 26aeb525..1c571169 100644
--- a/compose-material/src/test/java/com/google/android/horologist/compose/material/ToggleButtonTest.kt
+++ b/compose-material/src/test/java/com/google/android/horologist/compose/material/ToggleButtonTest.kt
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.compose.material
 
 import androidx.compose.material.icons.Icons
@@ -26,14 +24,14 @@ import androidx.compose.material.icons.filled.AirplanemodeInactive
 import androidx.compose.ui.unit.LayoutDirection
 import com.google.accompanist.testharness.TestHarness
 import com.google.android.horologist.images.base.paintable.ImageVectorPaintable.Companion.asPaintable
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
+import com.google.android.horologist.screenshots.rng.WearLegacyComponentTest
 import org.junit.Test
 
-class ToggleButtonTest : ScreenshotBaseTest() {
+class ToggleButtonTest : WearLegacyComponentTest() {
 
     @Test
     fun default() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ToggleButton(
                 checkedIcon = Icons.Filled.AirplanemodeActive.asPaintable(),
                 notCheckedIcon = Icons.Filled.AirplanemodeInactive.asPaintable(),
@@ -45,7 +43,7 @@ class ToggleButtonTest : ScreenshotBaseTest() {
 
     @Test
     fun notChecked() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ToggleButton(
                 checkedIcon = Icons.Filled.AirplanemodeActive.asPaintable(),
                 notCheckedIcon = Icons.Filled.AirplanemodeInactive.asPaintable(),
@@ -58,7 +56,7 @@ class ToggleButtonTest : ScreenshotBaseTest() {
 
     @Test
     fun disabled() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ToggleButton(
                 checkedIcon = Icons.Filled.AirplanemodeActive.asPaintable(),
                 notCheckedIcon = Icons.Filled.AirplanemodeInactive.asPaintable(),
@@ -71,7 +69,7 @@ class ToggleButtonTest : ScreenshotBaseTest() {
 
     @Test
     fun notCheckedDisabled() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ToggleButton(
                 checkedIcon = Icons.Filled.AirplanemodeActive.asPaintable(),
                 notCheckedIcon = Icons.Filled.AirplanemodeInactive.asPaintable(),
@@ -85,7 +83,7 @@ class ToggleButtonTest : ScreenshotBaseTest() {
 
     @Test
     fun text() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ToggleButton(
                 text = "Monday",
                 onCheckedChanged = {},
@@ -95,7 +93,7 @@ class ToggleButtonTest : ScreenshotBaseTest() {
 
     @Test
     fun textNotChecked() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ToggleButton(
                 text = "Monday",
                 onCheckedChanged = {},
@@ -106,7 +104,7 @@ class ToggleButtonTest : ScreenshotBaseTest() {
 
     @Test
     fun textDisabled() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ToggleButton(
                 text = "Monday",
                 onCheckedChanged = {},
@@ -117,7 +115,7 @@ class ToggleButtonTest : ScreenshotBaseTest() {
 
     @Test
     fun textNotCheckedDisabled() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ToggleButton(
                 text = "Monday",
                 onCheckedChanged = {},
@@ -129,7 +127,7 @@ class ToggleButtonTest : ScreenshotBaseTest() {
 
     @Test
     fun small() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ToggleButton(
                 checkedIcon = Icons.Filled.AirplanemodeActive.asPaintable(),
                 notCheckedIcon = Icons.Filled.AirplanemodeInactive.asPaintable(),
@@ -142,7 +140,7 @@ class ToggleButtonTest : ScreenshotBaseTest() {
 
     @Test
     fun smallNotChecked() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ToggleButton(
                 checkedIcon = Icons.Filled.AirplanemodeActive.asPaintable(),
                 notCheckedIcon = Icons.Filled.AirplanemodeInactive.asPaintable(),
@@ -156,7 +154,7 @@ class ToggleButtonTest : ScreenshotBaseTest() {
 
     @Test
     fun smallDisabled() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ToggleButton(
                 checkedIcon = Icons.Filled.AirplanemodeActive.asPaintable(),
                 notCheckedIcon = Icons.Filled.AirplanemodeInactive.asPaintable(),
@@ -169,7 +167,7 @@ class ToggleButtonTest : ScreenshotBaseTest() {
     }
 
     fun smallNotCheckedDisabled() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ToggleButton(
                 checkedIcon = Icons.Filled.AirplanemodeActive.asPaintable(),
                 notCheckedIcon = Icons.Filled.AirplanemodeInactive.asPaintable(),
@@ -183,7 +181,7 @@ class ToggleButtonTest : ScreenshotBaseTest() {
     }
 
     fun iconOnly() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ToggleButton(
                 checkedIcon = Icons.Filled.AirplanemodeActive.asPaintable(),
                 notCheckedIcon = Icons.Filled.AirplanemodeInactive.asPaintable(),
@@ -196,7 +194,7 @@ class ToggleButtonTest : ScreenshotBaseTest() {
     }
 
     fun iconOnlyNotChecked() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ToggleButton(
                 checkedIcon = Icons.Filled.AirplanemodeActive.asPaintable(),
                 notCheckedIcon = Icons.Filled.AirplanemodeInactive.asPaintable(),
@@ -210,7 +208,7 @@ class ToggleButtonTest : ScreenshotBaseTest() {
     }
 
     fun iconOnlyDisabled() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ToggleButton(
                 checkedIcon = Icons.Filled.AirplanemodeActive.asPaintable(),
                 notCheckedIcon = Icons.Filled.AirplanemodeInactive.asPaintable(),
@@ -224,7 +222,7 @@ class ToggleButtonTest : ScreenshotBaseTest() {
     }
 
     fun iconOnlyNotCheckedDisabled() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ToggleButton(
                 checkedIcon = Icons.Filled.AirplanemodeActive.asPaintable(),
                 notCheckedIcon = Icons.Filled.AirplanemodeInactive.asPaintable(),
@@ -240,7 +238,7 @@ class ToggleButtonTest : ScreenshotBaseTest() {
 
     @Test
     fun rtl() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(layoutDirection = LayoutDirection.Rtl) {
                 ToggleButton(
                     checkedIcon = Icons.AutoMirrored.Filled.VolumeUp.asPaintable(),
@@ -254,7 +252,7 @@ class ToggleButtonTest : ScreenshotBaseTest() {
 
     @Test
     fun mirrored() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ToggleButton(
                 checkedIcon = Icons.AutoMirrored.Filled.VolumeUp.asPaintable(),
                 notCheckedIcon = Icons.AutoMirrored.Filled.VolumeOff.asPaintable(),
@@ -267,7 +265,7 @@ class ToggleButtonTest : ScreenshotBaseTest() {
 
     @Test
     fun mirroredRtl() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(layoutDirection = LayoutDirection.Rtl) {
                 ToggleButton(
                     checkedIcon = Icons.AutoMirrored.Filled.VolumeUp.asPaintable(),
@@ -282,7 +280,7 @@ class ToggleButtonTest : ScreenshotBaseTest() {
 
     @Test
     fun textWithLargestFontScale() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(fontScale = largestFontScale) {
                 ToggleButton(
                     text = "Monday",
diff --git a/compose-material/src/test/java/com/google/android/horologist/compose/material/ToggleChipTest.kt b/compose-material/src/test/java/com/google/android/horologist/compose/material/ToggleChipTest.kt
index 01c489cb..700613eb 100644
--- a/compose-material/src/test/java/com/google/android/horologist/compose/material/ToggleChipTest.kt
+++ b/compose-material/src/test/java/com/google/android/horologist/compose/material/ToggleChipTest.kt
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.compose.material
 
 import androidx.compose.material.icons.Icons
@@ -26,14 +24,14 @@ import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
 import com.google.accompanist.testharness.TestHarness
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
+import com.google.android.horologist.screenshots.rng.WearLegacyComponentTest
 import org.junit.Test
 
-class ToggleChipTest : ScreenshotBaseTest() {
+class ToggleChipTest : WearLegacyComponentTest() {
 
     @Test
     fun switch() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ToggleChip(
                 checked = true,
                 onCheckedChanged = { },
@@ -45,7 +43,7 @@ class ToggleChipTest : ScreenshotBaseTest() {
 
     @Test
     fun radio() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ToggleChip(
                 checked = true,
                 onCheckedChanged = { },
@@ -57,7 +55,7 @@ class ToggleChipTest : ScreenshotBaseTest() {
 
     @Test
     fun checkbox() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ToggleChip(
                 checked = true,
                 onCheckedChanged = { },
@@ -69,7 +67,7 @@ class ToggleChipTest : ScreenshotBaseTest() {
 
     @Test
     fun unchecked() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ToggleChip(
                 checked = false,
                 onCheckedChanged = { },
@@ -81,7 +79,7 @@ class ToggleChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withSecondaryLabel() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ToggleChip(
                 checked = true,
                 onCheckedChanged = { },
@@ -94,7 +92,7 @@ class ToggleChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withIcon() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ToggleChip(
                 checked = true,
                 onCheckedChanged = { },
@@ -107,7 +105,7 @@ class ToggleChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withSecondaryLabelAndIcon() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ToggleChip(
                 checked = true,
                 onCheckedChanged = { },
@@ -121,7 +119,7 @@ class ToggleChipTest : ScreenshotBaseTest() {
 
     @Test
     fun disabled() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ToggleChip(
                 checked = true,
                 onCheckedChanged = { },
@@ -134,7 +132,7 @@ class ToggleChipTest : ScreenshotBaseTest() {
 
     @Test
     fun uncheckedAndDisabled() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ToggleChip(
                 checked = false,
                 onCheckedChanged = { },
@@ -147,7 +145,7 @@ class ToggleChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withLongText() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ToggleChip(
                 checked = true,
                 onCheckedChanged = { },
@@ -159,7 +157,7 @@ class ToggleChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withLongTextAndLargestFontScale() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(fontScale = largestFontScale) {
                 ToggleChip(
                     checked = true,
@@ -173,7 +171,7 @@ class ToggleChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withIconAndLongText() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ToggleChip(
                 checked = true,
                 onCheckedChanged = { },
@@ -186,7 +184,7 @@ class ToggleChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withIconAndLongTextAndLargestFontScale() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(fontScale = largestFontScale) {
                 ToggleChip(
                     checked = true,
@@ -201,7 +199,7 @@ class ToggleChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withSecondaryLabelAndLongText() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ToggleChip(
                 checked = true,
                 onCheckedChanged = { },
@@ -214,7 +212,7 @@ class ToggleChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withSecondaryLabelAndLongTextAndLargestFontScale() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(fontScale = largestFontScale) {
                 ToggleChip(
                     checked = true,
@@ -229,7 +227,7 @@ class ToggleChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withIconAndSecondaryLabelAndLongText() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ToggleChip(
                 checked = true,
                 onCheckedChanged = { },
@@ -243,7 +241,7 @@ class ToggleChipTest : ScreenshotBaseTest() {
 
     @Test
     fun withIconAndSecondaryLabelAndLongTextAndLargestFontScale() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(fontScale = largestFontScale) {
                 ToggleChip(
                     checked = true,
@@ -259,7 +257,7 @@ class ToggleChipTest : ScreenshotBaseTest() {
 
     @Test
     fun usingSmallIcon() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ToggleChip(
                 checked = true,
                 onCheckedChanged = { },
@@ -272,7 +270,7 @@ class ToggleChipTest : ScreenshotBaseTest() {
 
     @Test
     fun usingLargeIcon() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ToggleChip(
                 checked = true,
                 onCheckedChanged = { },
@@ -287,7 +285,7 @@ class ToggleChipTest : ScreenshotBaseTest() {
     // with "defaultRtl" test, as it uses a different icon that is easier to see mirrored.
     @Test
     fun default() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ToggleChip(
                 checked = true,
                 onCheckedChanged = { },
@@ -301,7 +299,7 @@ class ToggleChipTest : ScreenshotBaseTest() {
 
     @Test
     fun defaultRtl() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(layoutDirection = LayoutDirection.Rtl) {
                 ToggleChip(
                     checked = true,
@@ -317,7 +315,7 @@ class ToggleChipTest : ScreenshotBaseTest() {
 
     @Test
     fun mirrored() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ToggleChip(
                 checked = true,
                 onCheckedChanged = { },
@@ -332,7 +330,7 @@ class ToggleChipTest : ScreenshotBaseTest() {
 
     @Test
     fun mirroredRtl() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             TestHarness(layoutDirection = LayoutDirection.Rtl) {
                 ToggleChip(
                     checked = true,
diff --git a/gradle.properties b/gradle.properties
index a72f37cf..e2cb5625 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -62,3 +62,5 @@ android.suppressUnsupportedCompileSdk=34
 
 # Uncomment to enable record mode
 #screenshot.record=repair
+#roborazzi.test.verify=true
+#roborazzi.test.record=true
diff --git a/health/composables/build.gradle.kts b/health/composables/build.gradle.kts
index cb796cbe..c1e7386d 100644
--- a/health/composables/build.gradle.kts
+++ b/health/composables/build.gradle.kts
@@ -19,6 +19,7 @@ plugins {
     id("org.jetbrains.dokka")
     id("me.tylerbwong.gradle.metalava")
     kotlin("android")
+    alias(libs.plugins.roborazzi)
 }
 
 android {
diff --git a/health/composables/src/test/java/com/google/android/horologist/health/composables/components/MetricDisplayTest.kt b/health/composables/src/test/java/com/google/android/horologist/health/composables/components/MetricDisplayTest.kt
index 31455887..1650c7a6 100644
--- a/health/composables/src/test/java/com/google/android/horologist/health/composables/components/MetricDisplayTest.kt
+++ b/health/composables/src/test/java/com/google/android/horologist/health/composables/components/MetricDisplayTest.kt
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.health.composables.components
 
 import com.google.android.horologist.health.composables.model.MetricUiModel
@@ -23,18 +21,13 @@ import com.google.android.horologist.health.composables.theme.HR_HARD
 import com.google.android.horologist.health.composables.theme.HR_LIGHT
 import com.google.android.horologist.health.composables.theme.HR_MAXIMUM
 import com.google.android.horologist.health.composables.theme.HR_MODERATE
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
-import com.google.android.horologist.screenshots.ScreenshotTestRule.Companion.screenshotTestRuleParams
+import com.google.android.horologist.screenshots.rng.WearLegacyComponentTest
 import org.junit.Test
 
-class MetricDisplayTest : ScreenshotBaseTest(
-    screenshotTestRuleParams {
-        screenTimeText = {}
-    },
-) {
+class MetricDisplayTest : WearLegacyComponentTest() {
     @Test
     fun metricDisplay() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             MetricDisplay(
                 metric = MetricUiModel(
                     text = "139",
@@ -48,7 +41,7 @@ class MetricDisplayTest : ScreenshotBaseTest(
 
     @Test
     fun metricDisplayTextOnly() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             MetricDisplay(
                 metric = MetricUiModel(
                     text = "18:52",
@@ -60,7 +53,7 @@ class MetricDisplayTest : ScreenshotBaseTest(
 
     @Test
     fun metricDisplayTopRightText() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             MetricDisplay(
                 metric = MetricUiModel(
                     text = "8'32\"",
@@ -73,7 +66,7 @@ class MetricDisplayTest : ScreenshotBaseTest(
 
     @Test
     fun metricDisplayBottomRightText() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             MetricDisplay(
                 metric = MetricUiModel(
                     text = "2.1",
@@ -86,7 +79,7 @@ class MetricDisplayTest : ScreenshotBaseTest(
 
     @Test
     fun metricDisplayTextTruncation() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             MetricDisplay(
                 metric = MetricUiModel(
                     text = "Very very long text",
@@ -99,7 +92,7 @@ class MetricDisplayTest : ScreenshotBaseTest(
 
     @Test
     fun metricDisplayBothRightTextTruncation() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             MetricDisplay(
                 metric = MetricUiModel(
                     text = "139",
@@ -112,7 +105,7 @@ class MetricDisplayTest : ScreenshotBaseTest(
 
     @Test
     fun metricDisplayTopRightTextTruncation() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             MetricDisplay(
                 metric = MetricUiModel(
                     text = "139",
@@ -124,7 +117,7 @@ class MetricDisplayTest : ScreenshotBaseTest(
 
     @Test
     fun metricDisplayBottomRightTextTruncation() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             MetricDisplay(
                 metric = MetricUiModel(
                     text = "139",
diff --git a/health/composables/src/test/java/com/google/android/horologist/health/composables/screens/MetricsScreenTest.kt b/health/composables/src/test/java/com/google/android/horologist/health/composables/screens/MetricsScreenTest.kt
index aa932f45..7327e96f 100644
--- a/health/composables/src/test/java/com/google/android/horologist/health/composables/screens/MetricsScreenTest.kt
+++ b/health/composables/src/test/java/com/google/android/horologist/health/composables/screens/MetricsScreenTest.kt
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.health.composables.screens
 
 import androidx.wear.compose.material.PositionIndicator
@@ -23,18 +21,14 @@ import com.google.accompanist.testharness.TestHarness
 import com.google.android.horologist.health.composables.model.MetricUiModel
 import com.google.android.horologist.health.composables.theme.HR_HARD
 import com.google.android.horologist.health.composables.theme.HR_MAXIMUM
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
-import com.google.android.horologist.screenshots.ScreenshotTestRule.Companion.screenshotTestRuleParams
+import com.google.android.horologist.screenshots.rng.WearLegacyScreenTest
 import org.junit.Test
 import org.robolectric.annotation.Config
 
-class MetricsScreenTest : ScreenshotBaseTest(
-    screenshotTestRuleParams {
-    },
-) {
+class MetricsScreenTest : WearLegacyScreenTest() {
     @Test
     fun metricsScreenOneMetric() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             MetricsScreen(
                 firstMetric = MetricUiModel(
                     text = "21:34",
@@ -51,7 +45,7 @@ class MetricsScreenTest : ScreenshotBaseTest(
 
     @Test
     fun metricsScreenTwoMetrics() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             MetricsScreen(
                 firstMetric = MetricUiModel(
                     text = "21:34",
@@ -72,7 +66,7 @@ class MetricsScreenTest : ScreenshotBaseTest(
 
     @Test
     fun metricsScreenThreeMetrics() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             MetricsScreen(
                 firstMetric = MetricUiModel(
                     text = "164",
@@ -98,7 +92,7 @@ class MetricsScreenTest : ScreenshotBaseTest(
 
     @Test
     fun metricsScreenFourMetrics() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             MetricsScreen(
                 firstMetric = MetricUiModel(
                     text = "198",
@@ -128,7 +122,7 @@ class MetricsScreenTest : ScreenshotBaseTest(
 
     @Test
     fun metricsScreenMetricsSkipped() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             MetricsScreen(
                 firstMetric = MetricUiModel(
                     text = "198",
@@ -154,7 +148,7 @@ class MetricsScreenTest : ScreenshotBaseTest(
     )
     @Test
     fun metricsScreenFourMetrics_largeScreen_smallestFont() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest(applyDeviceConfig = false) {
             TestHarness(fontScale = smallestFontScale) {
                 MetricsScreen(
                     firstMetric = MetricUiModel(
@@ -190,7 +184,7 @@ class MetricsScreenTest : ScreenshotBaseTest(
     )
     @Test
     fun metricsScreenFourMetrics_smallScreen_largestFont() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest(applyDeviceConfig = false) {
             TestHarness(fontScale = largestFontScale) {
                 MetricsScreen(
                     firstMetric = MetricUiModel(
diff --git a/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.components_MetricDisplayTest_metricDisplay.png b/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.components_MetricDisplayTest_metricDisplay.png
index 1e9bd17c..c230a901 100644
--- a/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.components_MetricDisplayTest_metricDisplay.png
+++ b/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.components_MetricDisplayTest_metricDisplay.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c92bccf6c9dcb570ccf0b84fdaed219a033914581659b2d23c7eca6ad84dcf11
-size 8225
+oid sha256:85981ed4702742ccf510de8db9fec8e45ce26e5e0ae1ac62d158b774715d3c0c
+size 4850
diff --git a/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.components_MetricDisplayTest_metricDisplayBothRightTextTruncation.png b/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.components_MetricDisplayTest_metricDisplayBothRightTextTruncation.png
index 1f8be536..c81ac880 100644
--- a/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.components_MetricDisplayTest_metricDisplayBothRightTextTruncation.png
+++ b/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.components_MetricDisplayTest_metricDisplayBothRightTextTruncation.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aa3567f9f415e2836cb1e096ae47b5d4289e8a61f5ad7ba743a27230a19142cd
-size 12828
+oid sha256:bd603858951c2820291ec85f739e7d21bb2346687fe026d723118dcc49ce1609
+size 7092
diff --git a/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.components_MetricDisplayTest_metricDisplayBottomRightText.png b/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.components_MetricDisplayTest_metricDisplayBottomRightText.png
index 2186bdd1..e0c88d39 100644
--- a/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.components_MetricDisplayTest_metricDisplayBottomRightText.png
+++ b/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.components_MetricDisplayTest_metricDisplayBottomRightText.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b479d0bab4faf7fb87d3ea2c56a90bc3ff73ec70418aa23048e681efe90eb985
-size 3703
+oid sha256:8cd0271f391f18653ede2b079d10aa91d756e8ef6430909e0f6d0326606bc62a
+size 2449
diff --git a/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.components_MetricDisplayTest_metricDisplayBottomRightTextTruncation.png b/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.components_MetricDisplayTest_metricDisplayBottomRightTextTruncation.png
index fbb093ba..6ecf0d5f 100644
--- a/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.components_MetricDisplayTest_metricDisplayBottomRightTextTruncation.png
+++ b/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.components_MetricDisplayTest_metricDisplayBottomRightTextTruncation.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:34bdfd1e84368e66d4c23c542d034621f759ee9e93e14ef252b6309105fa8d91
-size 8343
+oid sha256:50beba6a1b1ff96214dc7a61f50bc02c181d115955bf5b867fdf8d2e28499c1a
+size 4807
diff --git a/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.components_MetricDisplayTest_metricDisplayTextOnly.png b/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.components_MetricDisplayTest_metricDisplayTextOnly.png
index 1d95b2e3..41732f70 100644
--- a/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.components_MetricDisplayTest_metricDisplayTextOnly.png
+++ b/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.components_MetricDisplayTest_metricDisplayTextOnly.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:075b775aeee2d8179e0bc93121b85268233845a416095d6c81bbd0b8cc15fb85
-size 5187
+oid sha256:e846c44dcc2d18378349d760e0b4c3f75382de124df5423af48aa895687e9dbf
+size 3173
diff --git a/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.components_MetricDisplayTest_metricDisplayTextTruncation.png b/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.components_MetricDisplayTest_metricDisplayTextTruncation.png
index b3c43ec0..ed6af8e4 100644
--- a/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.components_MetricDisplayTest_metricDisplayTextTruncation.png
+++ b/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.components_MetricDisplayTest_metricDisplayTextTruncation.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9958bd1d78f270ffbef8c0ee97e25d00a10fc0f80b5e03c04f6cc13af9f7cafb
-size 9351
+oid sha256:1e3403fd1c38730c79ba2d40d65e9939df2c8597297acf42a24aa339358c2052
+size 5578
diff --git a/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.components_MetricDisplayTest_metricDisplayTopRightText.png b/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.components_MetricDisplayTest_metricDisplayTopRightText.png
index cf85483b..55d975e3 100644
--- a/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.components_MetricDisplayTest_metricDisplayTopRightText.png
+++ b/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.components_MetricDisplayTest_metricDisplayTopRightText.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bd42e56bdfb9fbfa1d8207c18d5b02d2610b0d5060b64417e8542bf3804ae99a
-size 5965
+oid sha256:c9663e1b3a723c9027e8271b0a74aa4651bc7a13334ff8e56a05fd096d8f99d3
+size 3683
diff --git a/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.components_MetricDisplayTest_metricDisplayTopRightTextTruncation.png b/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.components_MetricDisplayTest_metricDisplayTopRightTextTruncation.png
index e6a3a2b6..3050d130 100644
--- a/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.components_MetricDisplayTest_metricDisplayTopRightTextTruncation.png
+++ b/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.components_MetricDisplayTest_metricDisplayTopRightTextTruncation.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6b421f2348fd75a8d7a849f86206348aaf0c1089699684e90f833e5607d3efeb
-size 8591
+oid sha256:cadd47640aadebeaff09c1e076cdcba89c36baa4df175c34590b3d9785b7361d
+size 4859
diff --git a/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.screens_MetricsScreenTest_metricsScreenFourMetrics.png b/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.screens_MetricsScreenTest_metricsScreenFourMetrics.png
index 617f0214..68f4b87e 100644
--- a/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.screens_MetricsScreenTest_metricsScreenFourMetrics.png
+++ b/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.screens_MetricsScreenTest_metricsScreenFourMetrics.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ccc1def2b5e694c4da3b8d76b3ebfe96f6d97986a65e8fe8a1ac2117158ba402
-size 30891
+oid sha256:65dda69125f7f4dae859e020faef861b81e28caaa9ff5185bcc963a1b74d3fe0
+size 22376
diff --git a/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.screens_MetricsScreenTest_metricsScreenFourMetrics_largeScreen_smallestFont.png b/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.screens_MetricsScreenTest_metricsScreenFourMetrics_largeScreen_smallestFont.png
index 989ecd7f..ced3d355 100644
--- a/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.screens_MetricsScreenTest_metricsScreenFourMetrics_largeScreen_smallestFont.png
+++ b/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.screens_MetricsScreenTest_metricsScreenFourMetrics_largeScreen_smallestFont.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dfbf3469edc9b45b954ce839083de41d9ee89155d70756a98b13e7fb92988e09
-size 26198
+oid sha256:cbdbd6aeccde789314bfae8888a00f8e543a6bcc117cc24e6202213bdf0e9a6c
+size 21415
diff --git a/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.screens_MetricsScreenTest_metricsScreenFourMetrics_smallScreen_largestFont.png b/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.screens_MetricsScreenTest_metricsScreenFourMetrics_smallScreen_largestFont.png
index 0b208255..43cd66d1 100644
--- a/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.screens_MetricsScreenTest_metricsScreenFourMetrics_smallScreen_largestFont.png
+++ b/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.screens_MetricsScreenTest_metricsScreenFourMetrics_smallScreen_largestFont.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8037707e28ba097dbd0e415bb0e6285657c33374158bf60ac39b3051a4ca5807
-size 25238
+oid sha256:62294b9fc9f79c487222f3dd3deec0ec7d2862a8fc4affb50d8f7b0f672871c4
+size 20405
diff --git a/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.screens_MetricsScreenTest_metricsScreenMetricsSkipped.png b/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.screens_MetricsScreenTest_metricsScreenMetricsSkipped.png
index 2503fc19..88649ffe 100644
--- a/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.screens_MetricsScreenTest_metricsScreenMetricsSkipped.png
+++ b/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.screens_MetricsScreenTest_metricsScreenMetricsSkipped.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e12249be112a872201ae13981066d74501eeb1b5b488aad1546c172665d142da
-size 24335
+oid sha256:d5cd541487f878d65a7dc93f4381020585b2dac7c49a2022d8b701283174f14a
+size 17093
diff --git a/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.screens_MetricsScreenTest_metricsScreenOneMetric.png b/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.screens_MetricsScreenTest_metricsScreenOneMetric.png
index 3f33a263..f4595620 100644
--- a/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.screens_MetricsScreenTest_metricsScreenOneMetric.png
+++ b/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.screens_MetricsScreenTest_metricsScreenOneMetric.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a206096c890a0c5df56df4d9926293a7698ec81da7583ef655777976bd5cc403
-size 19504
+oid sha256:59a8f22256dd0d8becb3cfd5bb971c08bc85123379feca2580ce456013b57e4a
+size 13599
diff --git a/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.screens_MetricsScreenTest_metricsScreenThreeMetrics.png b/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.screens_MetricsScreenTest_metricsScreenThreeMetrics.png
index 392aa8df..5703b2cc 100644
--- a/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.screens_MetricsScreenTest_metricsScreenThreeMetrics.png
+++ b/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.screens_MetricsScreenTest_metricsScreenThreeMetrics.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a560b3059857a6ae0f2157a9b0b6fd8c38559d3082bcbc7b42403592eaa02d7d
-size 26702
+oid sha256:675152c113163b47bad300a1a9c3b1e8c1091b373fd4ba42a07c13dbbe1310d9
+size 19037
diff --git a/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.screens_MetricsScreenTest_metricsScreenTwoMetrics.png b/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.screens_MetricsScreenTest_metricsScreenTwoMetrics.png
index 9b2bc4af..080f87cf 100644
--- a/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.screens_MetricsScreenTest_metricsScreenTwoMetrics.png
+++ b/health/composables/src/test/snapshots/images/com.google.android.horologist.health.composables.screens_MetricsScreenTest_metricsScreenTwoMetrics.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:489697a55c4f28b457481dd6cf54ce6b9b5b0fff1a943faf72d941b1b6345fc3
-size 23395
+oid sha256:61142f73b2047b525d8d0001857b9bf7358d63e725d50ac0e4e48707118d24d0
+size 16500
diff --git a/images/coil/build.gradle.kts b/images/coil/build.gradle.kts
index f8b56cd2..62775218 100644
--- a/images/coil/build.gradle.kts
+++ b/images/coil/build.gradle.kts
@@ -19,6 +19,7 @@ plugins {
     id("org.jetbrains.dokka")
     id("me.tylerbwong.gradle.metalava")
     kotlin("android")
+    alias(libs.plugins.roborazzi)
 }
 
 android {
diff --git a/images/coil/src/test/java/com/google/android/horologist/compose/material/ChipTest.kt b/images/coil/src/test/java/com/google/android/horologist/compose/material/ChipTest.kt
index 845247a4..f289921b 100644
--- a/images/coil/src/test/java/com/google/android/horologist/compose/material/ChipTest.kt
+++ b/images/coil/src/test/java/com/google/android/horologist/compose/material/ChipTest.kt
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.compose.material
 
 import androidx.compose.material.icons.Icons
@@ -25,19 +23,13 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalInspectionMode
 import com.google.android.horologist.images.base.util.rememberVectorPainter
 import com.google.android.horologist.images.coil.CoilPaintable
-import com.google.android.horologist.images.coil.FakeImageLoader
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
+import com.google.android.horologist.screenshots.rng.WearLegacyComponentTest
 import org.junit.Test
 
-class ChipTest : ScreenshotBaseTest() {
+class ChipTest : WearLegacyComponentTest() {
     @Test
     fun withPlaceholderIcon() {
-        screenshotTestRule.setContent(
-            isComponent = true,
-            takeScreenshot = true,
-            fakeImageLoader = FakeImageLoader.Never,
-        ) {
-            // TODO https://github.com/google/horologist/issues/1927
+        runComponentTest {
             // In inspection mode will jump to placeholder
             CompositionLocalProvider(LocalInspectionMode.provides(true)) {
                 Chip(
@@ -57,12 +49,7 @@ class ChipTest : ScreenshotBaseTest() {
 
     @Test
     fun disabledWithIconPlaceholder() {
-        screenshotTestRule.setContent(
-            isComponent = true,
-            takeScreenshot = true,
-            fakeImageLoader = FakeImageLoader.Never,
-        ) {
-            // TODO https://github.com/google/horologist/issues/1927
+        runComponentTest {
             // In inspection mode will jump to placeholder
             CompositionLocalProvider(LocalInspectionMode.provides(true)) {
                 Chip(
diff --git a/images/coil/src/test/java/com/google/android/horologist/compose/material/CompactChipTest.kt b/images/coil/src/test/java/com/google/android/horologist/compose/material/CompactChipTest.kt
index 1165f88c..66abdea5 100644
--- a/images/coil/src/test/java/com/google/android/horologist/compose/material/CompactChipTest.kt
+++ b/images/coil/src/test/java/com/google/android/horologist/compose/material/CompactChipTest.kt
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.compose.material
 
 import androidx.compose.material.icons.Icons
@@ -26,17 +24,13 @@ import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.wear.compose.material.MaterialTheme
 import com.google.android.horologist.images.base.util.rememberVectorPainter
 import com.google.android.horologist.images.coil.CoilPaintable
-import com.google.android.horologist.images.coil.FakeImageLoader
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
+import com.google.android.horologist.screenshots.rng.WearLegacyComponentTest
 import org.junit.Test
 
-class CompactChipTest : ScreenshotBaseTest() {
+class CompactChipTest : WearLegacyComponentTest() {
     @Test
     fun withPlaceholderIcon() {
-        screenshotTestRule.setContent(
-            isComponent = true,
-            takeScreenshot = true,
-        ) {
+        runComponentTest {
             // In inspection mode will jump to placeholder
             CompositionLocalProvider(LocalInspectionMode.provides(true)) {
                 CompactChip(
@@ -56,11 +50,7 @@ class CompactChipTest : ScreenshotBaseTest() {
 
     @Test
     fun disabledWithIconPlaceholder() {
-        screenshotTestRule.setContent(
-            isComponent = true,
-            takeScreenshot = true,
-            fakeImageLoader = FakeImageLoader.Never,
-        ) {
+        runComponentTest {
             // In inspection mode will jump to placeholder
             CompositionLocalProvider(LocalInspectionMode.provides(true)) {
                 CompactChip(
diff --git a/images/coil/src/test/java/com/google/android/horologist/compose/material/OutlinedChipTest.kt b/images/coil/src/test/java/com/google/android/horologist/compose/material/OutlinedChipTest.kt
index a0162f6c..7fd6705b 100644
--- a/images/coil/src/test/java/com/google/android/horologist/compose/material/OutlinedChipTest.kt
+++ b/images/coil/src/test/java/com/google/android/horologist/compose/material/OutlinedChipTest.kt
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.compose.material
 
 import androidx.compose.material.icons.Icons
@@ -25,14 +23,13 @@ import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.wear.compose.material.MaterialTheme
 import com.google.android.horologist.images.base.util.rememberVectorPainter
 import com.google.android.horologist.images.coil.CoilPaintable
-import com.google.android.horologist.images.coil.FakeImageLoader
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
+import com.google.android.horologist.screenshots.rng.WearLegacyComponentTest
 import org.junit.Test
 
-class OutlinedChipTest : ScreenshotBaseTest() {
+class OutlinedChipTest : WearLegacyComponentTest() {
     @Test
     fun withPlaceholderIcon() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             CompositionLocalProvider(LocalInspectionMode.provides(true)) {
                 OutlinedChip(
                     label = "Primary label",
@@ -52,11 +49,7 @@ class OutlinedChipTest : ScreenshotBaseTest() {
 
     @Test
     fun disabledWithIconPlaceholder() {
-        screenshotTestRule.setContent(
-            isComponent = true,
-            takeScreenshot = true,
-            fakeImageLoader = FakeImageLoader.Never,
-        ) {
+        runComponentTest {
             // In inspection mode will jump to placeholder
             CompositionLocalProvider(LocalInspectionMode.provides(true)) {
                 OutlinedChip(
diff --git a/images/coil/src/test/java/com/google/android/horologist/compose/material/OutlinedCompactChipTest.kt b/images/coil/src/test/java/com/google/android/horologist/compose/material/OutlinedCompactChipTest.kt
index c3d03a94..51096e5f 100644
--- a/images/coil/src/test/java/com/google/android/horologist/compose/material/OutlinedCompactChipTest.kt
+++ b/images/coil/src/test/java/com/google/android/horologist/compose/material/OutlinedCompactChipTest.kt
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.compose.material
 
 import androidx.compose.material.icons.Icons
@@ -25,14 +23,13 @@ import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.wear.compose.material.MaterialTheme
 import com.google.android.horologist.images.base.util.rememberVectorPainter
 import com.google.android.horologist.images.coil.CoilPaintable
-import com.google.android.horologist.images.coil.FakeImageLoader
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
+import com.google.android.horologist.screenshots.rng.WearLegacyComponentTest
 import org.junit.Test
 
-class OutlinedCompactChipTest : ScreenshotBaseTest() {
+class OutlinedCompactChipTest : WearLegacyComponentTest() {
     @Test
     fun withPlaceholderIcon() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             // In inspection mode will jump to placeholder
             CompositionLocalProvider(LocalInspectionMode.provides(true)) {
                 OutlinedCompactChip(
@@ -52,11 +49,7 @@ class OutlinedCompactChipTest : ScreenshotBaseTest() {
 
     @Test
     fun disabledWithIconPlaceholder() {
-        screenshotTestRule.setContent(
-            isComponent = true,
-            takeScreenshot = true,
-            fakeImageLoader = FakeImageLoader.Never,
-        ) {
+        runComponentTest {
             // In inspection mode will jump to placeholder
             CompositionLocalProvider(LocalInspectionMode.provides(true)) {
                 OutlinedCompactChip(
diff --git a/images/coil/src/test/snapshots/images/com.google.android.horologist.compose.material_ChipTest_disabledWithIconPlaceholder.png b/images/coil/src/test/snapshots/images/com.google.android.horologist.compose.material_ChipTest_disabledWithIconPlaceholder.png
index dcfc0db1..7fbd8879 100644
--- a/images/coil/src/test/snapshots/images/com.google.android.horologist.compose.material_ChipTest_disabledWithIconPlaceholder.png
+++ b/images/coil/src/test/snapshots/images/com.google.android.horologist.compose.material_ChipTest_disabledWithIconPlaceholder.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9eff311e918f716b22f2a5d61c9819ec0cc9551235dc94769197af01aaccc688
-size 11117
+oid sha256:a9db1f27cc52f18802cfe27b276e1fdf8039e6e67884d804e1e8e0a7529f78ef
+size 7458
diff --git a/images/coil/src/test/snapshots/images/com.google.android.horologist.compose.material_ChipTest_withPlaceholderIcon.png b/images/coil/src/test/snapshots/images/com.google.android.horologist.compose.material_ChipTest_withPlaceholderIcon.png
index b8e6b1d2..374d66be 100644
--- a/images/coil/src/test/snapshots/images/com.google.android.horologist.compose.material_ChipTest_withPlaceholderIcon.png
+++ b/images/coil/src/test/snapshots/images/com.google.android.horologist.compose.material_ChipTest_withPlaceholderIcon.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:30b1056521cfe10f752ffbd64bf720c20f3af93e35e98a2a60971fbd9ae6cb0d
-size 6951
+oid sha256:0bc5d5723270ed3bc592587039c2b17d64301c6c8350a92d54e08132dbf2d76f
+size 4906
diff --git a/images/coil/src/test/snapshots/images/com.google.android.horologist.compose.material_CompactChipTest_disabledWithIconPlaceholder.png b/images/coil/src/test/snapshots/images/com.google.android.horologist.compose.material_CompactChipTest_disabledWithIconPlaceholder.png
index 9c03b1bb..8aeebadf 100644
--- a/images/coil/src/test/snapshots/images/com.google.android.horologist.compose.material_CompactChipTest_disabledWithIconPlaceholder.png
+++ b/images/coil/src/test/snapshots/images/com.google.android.horologist.compose.material_CompactChipTest_disabledWithIconPlaceholder.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:42a059a000e2249ddff1e5a18c0af88da2dda2b5fd778e392c7b950d91da6352
-size 5680
+oid sha256:7c4b47c7c1fa945bbed6b1e9e47acae03e3cf10c83bc40909a57f0b025027de1
+size 3977
diff --git a/images/coil/src/test/snapshots/images/com.google.android.horologist.compose.material_CompactChipTest_withPlaceholderIcon.png b/images/coil/src/test/snapshots/images/com.google.android.horologist.compose.material_CompactChipTest_withPlaceholderIcon.png
index a8297fd2..3f7b53d3 100644
--- a/images/coil/src/test/snapshots/images/com.google.android.horologist.compose.material_CompactChipTest_withPlaceholderIcon.png
+++ b/images/coil/src/test/snapshots/images/com.google.android.horologist.compose.material_CompactChipTest_withPlaceholderIcon.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:52ac0805ddca5373dfc6cfccd33f48267e32b4034703bbeedce902e93d784ecb
-size 5489
+oid sha256:e6079c8c17eeedf7e7811088e6fa905a301c014bd819dd742eb9657a7272aca4
+size 3834
diff --git a/images/coil/src/test/snapshots/images/com.google.android.horologist.compose.material_OutlinedChipTest_disabledWithIconPlaceholder.png b/images/coil/src/test/snapshots/images/com.google.android.horologist.compose.material_OutlinedChipTest_disabledWithIconPlaceholder.png
index f5adbc86..7f715f2b 100644
--- a/images/coil/src/test/snapshots/images/com.google.android.horologist.compose.material_OutlinedChipTest_disabledWithIconPlaceholder.png
+++ b/images/coil/src/test/snapshots/images/com.google.android.horologist.compose.material_OutlinedChipTest_disabledWithIconPlaceholder.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:04b03291a1c84a337f15d67c9ac8c0fb69bf8b5288055f3df6f8cc1aff8dd1a3
-size 13159
+oid sha256:f78fc1c1042130dff78a451f1edafb5a3075de5821a0cf9dfbab9426abfc5057
+size 8721
diff --git a/images/coil/src/test/snapshots/images/com.google.android.horologist.compose.material_OutlinedChipTest_withPlaceholderIcon.png b/images/coil/src/test/snapshots/images/com.google.android.horologist.compose.material_OutlinedChipTest_withPlaceholderIcon.png
index e5233816..c4bb95c6 100644
--- a/images/coil/src/test/snapshots/images/com.google.android.horologist.compose.material_OutlinedChipTest_withPlaceholderIcon.png
+++ b/images/coil/src/test/snapshots/images/com.google.android.horologist.compose.material_OutlinedChipTest_withPlaceholderIcon.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bb2291353abc48ad200d57659655e6da9c0d6c2b535910690a7fff6d843cc436
-size 13964
+oid sha256:05c2ccd66385eb395e192d8f20c8970bb2795e5430364291e27d00275a2cf444
+size 8784
diff --git a/images/coil/src/test/snapshots/images/com.google.android.horologist.compose.material_OutlinedCompactChipTest_disabledWithIconPlaceholder.png b/images/coil/src/test/snapshots/images/com.google.android.horologist.compose.material_OutlinedCompactChipTest_disabledWithIconPlaceholder.png
index 6cbfc1e8..bf15cd8f 100644
--- a/images/coil/src/test/snapshots/images/com.google.android.horologist.compose.material_OutlinedCompactChipTest_disabledWithIconPlaceholder.png
+++ b/images/coil/src/test/snapshots/images/com.google.android.horologist.compose.material_OutlinedCompactChipTest_disabledWithIconPlaceholder.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3a46a65de32e41e781bbb6799524b4bb90bc7847813cb1e5fe9ade67605feefb
-size 6951
+oid sha256:7851dbb1138d7bab780125b70544d45987f3dfab5737e289eca722fa380a6ed8
+size 4597
diff --git a/images/coil/src/test/snapshots/images/com.google.android.horologist.compose.material_OutlinedCompactChipTest_withPlaceholderIcon.png b/images/coil/src/test/snapshots/images/com.google.android.horologist.compose.material_OutlinedCompactChipTest_withPlaceholderIcon.png
index c5110a1e..dba42b76 100644
--- a/images/coil/src/test/snapshots/images/com.google.android.horologist.compose.material_OutlinedCompactChipTest_withPlaceholderIcon.png
+++ b/images/coil/src/test/snapshots/images/com.google.android.horologist.compose.material_OutlinedCompactChipTest_withPlaceholderIcon.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c56b47dbae28aa0cb8ddc1660296edeb1c417167c5e198bb8fac91c6ce5d3a0f
-size 7220
+oid sha256:082151f9c65024fe8371ce891685605de48d14aeca8b317d33e6ec71ccf24829
+size 4631
diff --git a/media/audio-ui/build.gradle.kts b/media/audio-ui/build.gradle.kts
index a0ec6dd7..06b2f641 100644
--- a/media/audio-ui/build.gradle.kts
+++ b/media/audio-ui/build.gradle.kts
@@ -19,6 +19,7 @@ plugins {
     id("org.jetbrains.dokka")
     id("me.tylerbwong.gradle.metalava")
     kotlin("android")
+    alias(libs.plugins.roborazzi)
 }
 
 android {
diff --git a/media/audio-ui/src/test/kotlin/com/google/android/horologist/audio/ui/VolumeScreenIndividualTest.kt b/media/audio-ui/src/test/kotlin/com/google/android/horologist/audio/ui/VolumeScreenIndividualTest.kt
index d151332a..b0d6e910 100644
--- a/media/audio-ui/src/test/kotlin/com/google/android/horologist/audio/ui/VolumeScreenIndividualTest.kt
+++ b/media/audio-ui/src/test/kotlin/com/google/android/horologist/audio/ui/VolumeScreenIndividualTest.kt
@@ -14,24 +14,17 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.audio.ui
 
 import androidx.wear.compose.material.MaterialTheme
-import androidx.wear.compose.material.Scaffold
 import com.google.android.horologist.audio.AudioOutput
 import com.google.android.horologist.audio.VolumeState
 import com.google.android.horologist.audio.ui.mapper.VolumeUiStateMapper
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
-import com.google.android.horologist.screenshots.ScreenshotTestRule.Companion.screenshotTestRuleParams
+import com.google.android.horologist.compose.layout.ScreenScaffold
+import com.google.android.horologist.screenshots.rng.WearLegacyScreenTest
 import org.junit.Test
 
-class VolumeScreenIndividualTest : ScreenshotBaseTest(
-    screenshotTestRuleParams {
-        screenTimeText = { }
-    },
-) {
+class VolumeScreenIndividualTest : WearLegacyScreenTest() {
     @Test
     fun volumeScreenAtMinimum() {
         val volumeState = VolumeState(
@@ -40,7 +33,7 @@ class VolumeScreenIndividualTest : ScreenshotBaseTest(
         )
         val audioOutput = AudioOutput.BluetoothHeadset("id", "Pixelbuds")
 
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             VolumeScreenTestCase(
                 colors = MaterialTheme.colors,
                 volumeState = volumeState,
@@ -57,7 +50,7 @@ class VolumeScreenIndividualTest : ScreenshotBaseTest(
         )
         val audioOutput = AudioOutput.BluetoothHeadset("id", "Pixelbuds")
 
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             VolumeScreenTestCase(
                 colors = MaterialTheme.colors,
                 volumeState = volumeState,
@@ -74,7 +67,7 @@ class VolumeScreenIndividualTest : ScreenshotBaseTest(
         )
         val audioOutput = AudioOutput.BluetoothHeadset("id", "Galaxy Watch 4")
 
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             VolumeScreenTestCase(
                 colors = MaterialTheme.colors,
                 volumeState = volumeState,
@@ -92,7 +85,7 @@ class VolumeScreenIndividualTest : ScreenshotBaseTest(
         // Media Router returns "Phone"
         val audioOutput = AudioOutput.WatchSpeaker("id", "Phone", true)
 
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             VolumeScreenTestCase(
                 colors = MaterialTheme.colors,
                 volumeState = volumeState,
@@ -110,7 +103,7 @@ class VolumeScreenIndividualTest : ScreenshotBaseTest(
         // Media Router returns "Phone"
         val audioOutput = AudioOutput.WatchSpeaker("id", "Phone", false)
 
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             VolumeScreenTestCase(
                 colors = MaterialTheme.colors,
                 volumeState = volumeState,
@@ -127,13 +120,14 @@ class VolumeScreenIndividualTest : ScreenshotBaseTest(
         )
         val volumeUiState = VolumeUiStateMapper.map(volumeState = volumeState)
 
-        screenshotTestRule.setContent(takeScreenshot = true) {
-            Scaffold(
+        runTest {
+            ScreenScaffold(
                 positionIndicator = {
                     VolumePositionIndicator(
                         volumeUiState = { volumeUiState },
                     )
                 },
+                timeText = {},
             ) {
                 VolumeWithLabelScreen(
                     volume = { volumeUiState },
diff --git a/media/audio-ui/src/test/kotlin/com/google/android/horologist/audio/ui/VolumeScreenTestCase.kt b/media/audio-ui/src/test/kotlin/com/google/android/horologist/audio/ui/VolumeScreenTestCase.kt
index c63fb5f2..50855d2c 100644
--- a/media/audio-ui/src/test/kotlin/com/google/android/horologist/audio/ui/VolumeScreenTestCase.kt
+++ b/media/audio-ui/src/test/kotlin/com/google/android/horologist/audio/ui/VolumeScreenTestCase.kt
@@ -19,11 +19,11 @@ package com.google.android.horologist.audio.ui
 import androidx.compose.runtime.Composable
 import androidx.wear.compose.material.Colors
 import androidx.wear.compose.material.MaterialTheme
-import androidx.wear.compose.material.Scaffold
 import com.google.android.horologist.audio.AudioOutput
 import com.google.android.horologist.audio.VolumeState
 import com.google.android.horologist.audio.ui.components.toAudioOutputUi
 import com.google.android.horologist.audio.ui.mapper.VolumeUiStateMapper
+import com.google.android.horologist.compose.layout.ScreenScaffold
 import com.google.android.horologist.compose.tools.RoundPreview
 
 @Composable
@@ -35,12 +35,13 @@ fun VolumeScreenTestCase(
     val volumeUiState = VolumeUiStateMapper.map(volumeState = volumeState)
     RoundPreview {
         MaterialTheme(colors = colors) {
-            Scaffold(
+            ScreenScaffold(
                 positionIndicator = {
                     VolumePositionIndicator(
                         volumeUiState = { volumeUiState },
                     )
                 },
+                timeText = {},
             ) {
                 VolumeScreen(
                     volume = { volumeUiState },
diff --git a/media/audio-ui/src/test/kotlin/com/google/android/horologist/audio/ui/VolumeScreenThemeTest.kt b/media/audio-ui/src/test/kotlin/com/google/android/horologist/audio/ui/VolumeScreenThemeTest.kt
index dc9295da..683256e3 100644
--- a/media/audio-ui/src/test/kotlin/com/google/android/horologist/audio/ui/VolumeScreenThemeTest.kt
+++ b/media/audio-ui/src/test/kotlin/com/google/android/horologist/audio/ui/VolumeScreenThemeTest.kt
@@ -14,16 +14,13 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.audio.ui
 
 import com.google.android.horologist.audio.AudioOutput
 import com.google.android.horologist.audio.VolumeState
 import com.google.android.horologist.compose.tools.ThemeValues
 import com.google.android.horologist.compose.tools.themeValues
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
-import com.google.android.horologist.screenshots.ScreenshotTestRule.Companion.screenshotTestRuleParams
+import com.google.android.horologist.screenshots.rng.WearLegacyScreenTest
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.ParameterizedRobolectricTestRunner
@@ -31,12 +28,13 @@ import org.robolectric.ParameterizedRobolectricTestRunner
 @RunWith(ParameterizedRobolectricTestRunner::class)
 class VolumeScreenThemeTest(
     private val themeValue: ThemeValues,
-) : ScreenshotBaseTest(
-    screenshotTestRuleParams {
-        screenTimeText = {}
-        testLabel = themeValue.safeName.lowercase()
-    },
-) {
+) : WearLegacyScreenTest() {
+
+    override fun testName(suffix: String): String {
+        return "src/test/snapshots/images/" +
+            "${javaClass.`package`?.name}_${javaClass.simpleName}_${testInfo.methodName}_" +
+            "${themeValue.safeName.lowercase()}.png"
+    }
 
     @Test
     fun volumeScreenThemes() {
@@ -46,7 +44,7 @@ class VolumeScreenThemeTest(
         )
         val audioOutput = AudioOutput.BluetoothHeadset("id", "Pixelbuds")
 
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             VolumeScreenTestCase(
                 colors = themeValue.colors,
                 volumeState = volumeState,
diff --git a/media/audio-ui/src/test/kotlin/com/google/android/horologist/audio/ui/components/actions/SetVolumeButtonTest.kt b/media/audio-ui/src/test/kotlin/com/google/android/horologist/audio/ui/components/actions/SetVolumeButtonTest.kt
index 9e6dad00..2ee9e23b 100644
--- a/media/audio-ui/src/test/kotlin/com/google/android/horologist/audio/ui/components/actions/SetVolumeButtonTest.kt
+++ b/media/audio-ui/src/test/kotlin/com/google/android/horologist/audio/ui/components/actions/SetVolumeButtonTest.kt
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.audio.ui.components.actions
 
 import androidx.compose.foundation.background
@@ -27,20 +25,16 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import com.google.android.horologist.audio.ui.VolumeUiState
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
+import com.google.android.horologist.screenshots.rng.WearLegacyComponentTest
 import org.junit.Test
 
-class SetVolumeButtonTest : ScreenshotBaseTest() {
+class SetVolumeButtonTest : WearLegacyComponentTest() {
 
     @Test
     fun givenCurrentVolumeIsNotMaxAndNotMin_thenIconIsVolumeDown() {
         val currentVolume = 5
 
-        screenshotTestRule.setContent(
-            isComponent = true,
-            componentDefaultContent = { ComponentDefaults(it) },
-            takeScreenshot = true,
-        ) {
+        runComponentTest {
             SetVolumeButton(
                 onVolumeClick = {},
                 volumeUiState = VolumeUiState(current = currentVolume, max = 10),
@@ -52,11 +46,7 @@ class SetVolumeButtonTest : ScreenshotBaseTest() {
     fun givenCurrentVolumeIsMinimum_thenIconIsVolumeMute() {
         val currentVolume = 0
 
-        screenshotTestRule.setContent(
-            isComponent = true,
-            componentDefaultContent = { ComponentDefaults(it) },
-            takeScreenshot = true,
-        ) {
+        runComponentTest {
             SetVolumeButton(
                 onVolumeClick = {},
                 volumeUiState = VolumeUiState(current = currentVolume),
@@ -68,11 +58,7 @@ class SetVolumeButtonTest : ScreenshotBaseTest() {
     fun givenCurrentVolumeIsMaximum_thenIconIsVolumeUp() {
         val currentVolume = 1
 
-        screenshotTestRule.setContent(
-            isComponent = true,
-            componentDefaultContent = { ComponentDefaults(it) },
-            takeScreenshot = true,
-        ) {
+        runComponentTest {
             SetVolumeButton(
                 onVolumeClick = {},
                 volumeUiState = VolumeUiState(current = currentVolume),
@@ -82,17 +68,13 @@ class SetVolumeButtonTest : ScreenshotBaseTest() {
 
     @Test
     fun givenNoVolumeUiState_thenIconIsVolumeUp() {
-        screenshotTestRule.setContent(
-            isComponent = true,
-            componentDefaultContent = { ComponentDefaults(it) },
-            takeScreenshot = true,
-        ) {
+        runComponentTest {
             SetVolumeButton(onVolumeClick = {})
         }
     }
 
     @Composable
-    private fun ComponentDefaults(content: @Composable (() -> Unit)) {
+    override fun ComponentScaffold(content: @Composable () -> Unit) {
         Box(
             modifier = Modifier
                 .wrapContentSize()
diff --git a/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui.components.actions_SetVolumeButtonTest_givenCurrentVolumeIsMaximum_thenIconIsVolumeUp.png b/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui.components.actions_SetVolumeButtonTest_givenCurrentVolumeIsMaximum_thenIconIsVolumeUp.png
index eeb35143..27162a9e 100644
--- a/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui.components.actions_SetVolumeButtonTest_givenCurrentVolumeIsMaximum_thenIconIsVolumeUp.png
+++ b/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui.components.actions_SetVolumeButtonTest_givenCurrentVolumeIsMaximum_thenIconIsVolumeUp.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2c76d483c1ae807b33314402f1343d60013db59e7039c6a137913b79252e7251
-size 1451
+oid sha256:374592de7aeffcd4ac45083228342d66d5f4c0462c2f8f8434352b0dd03b8b86
+size 998
diff --git a/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui.components.actions_SetVolumeButtonTest_givenCurrentVolumeIsMinimum_thenIconIsVolumeMute.png b/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui.components.actions_SetVolumeButtonTest_givenCurrentVolumeIsMinimum_thenIconIsVolumeMute.png
index 8aa4e327..2be8f516 100644
--- a/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui.components.actions_SetVolumeButtonTest_givenCurrentVolumeIsMinimum_thenIconIsVolumeMute.png
+++ b/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui.components.actions_SetVolumeButtonTest_givenCurrentVolumeIsMinimum_thenIconIsVolumeMute.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:81279dab387ae0f45cc7f89b1438673c606f09732bcc37475a8bc189422103b0
-size 698
+oid sha256:1e1e12fa03b2e066deaadbf4bcb1bc4b024ef378be56a4eff516bbd9396d24ea
+size 542
diff --git a/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui.components.actions_SetVolumeButtonTest_givenCurrentVolumeIsNotMaxAndNotMin_thenIconIsVolumeDown.png b/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui.components.actions_SetVolumeButtonTest_givenCurrentVolumeIsNotMaxAndNotMin_thenIconIsVolumeDown.png
index 0ca05914..0547612e 100644
--- a/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui.components.actions_SetVolumeButtonTest_givenCurrentVolumeIsNotMaxAndNotMin_thenIconIsVolumeDown.png
+++ b/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui.components.actions_SetVolumeButtonTest_givenCurrentVolumeIsNotMaxAndNotMin_thenIconIsVolumeDown.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ef8912029d9ae042e5c86506230a67688ca63fe76e408074b35959f7b9e96d0e
-size 802
+oid sha256:571b6bf5e86203b140abf8478e0ea2fc96f049c2f3baf39135e0315f4c720041
+size 642
diff --git a/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui.components.actions_SetVolumeButtonTest_givenNoVolumeUiState_thenIconIsVolumeUp.png b/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui.components.actions_SetVolumeButtonTest_givenNoVolumeUiState_thenIconIsVolumeUp.png
index eeb35143..27162a9e 100644
--- a/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui.components.actions_SetVolumeButtonTest_givenNoVolumeUiState_thenIconIsVolumeUp.png
+++ b/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui.components.actions_SetVolumeButtonTest_givenNoVolumeUiState_thenIconIsVolumeUp.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2c76d483c1ae807b33314402f1343d60013db59e7039c6a137913b79252e7251
-size 1451
+oid sha256:374592de7aeffcd4ac45083228342d66d5f4c0462c2f8f8434352b0dd03b8b86
+size 998
diff --git a/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenIndividualTest_volumeScreenAtMaximum.png b/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenIndividualTest_volumeScreenAtMaximum.png
index 3998767b..650f0b7e 100644
--- a/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenIndividualTest_volumeScreenAtMaximum.png
+++ b/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenIndividualTest_volumeScreenAtMaximum.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ec7d82d2652468a7d874cbdc1acf6fb6630edc53f0cafede79fc26875eaec06f
-size 21492
+oid sha256:6f1767b80ce6f8bdf566fed4078a62543f806cc655652bc0a2bc7aff75b5e3d1
+size 14537
diff --git a/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenIndividualTest_volumeScreenAtMinimum.png b/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenIndividualTest_volumeScreenAtMinimum.png
index 9520c1d8..3c123c75 100644
--- a/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenIndividualTest_volumeScreenAtMinimum.png
+++ b/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenIndividualTest_volumeScreenAtMinimum.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4cd53da2595a8b2846ca9b02691d82a463e194392033135f2d528037e2d6c801
-size 20710
+oid sha256:81feca5579be8ed2177dda94ded49f819b78148e241c383473ae51946a01f384
+size 14297
diff --git a/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenIndividualTest_volumeScreenWithLabel.png b/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenIndividualTest_volumeScreenWithLabel.png
index 63f3bf20..03115c3c 100644
--- a/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenIndividualTest_volumeScreenWithLabel.png
+++ b/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenIndividualTest_volumeScreenWithLabel.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1f2e33ade3e1ff97ef0e1f1a01e4278aec248cff731ccdb09ac8c39652b20f90
-size 17049
+oid sha256:8384796e37c65342611ad9876927be59654ca7b770a2b30a34f590d410486db6
+size 11634
diff --git a/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenIndividualTest_volumeScreenWithLongTest.png b/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenIndividualTest_volumeScreenWithLongTest.png
index 29f87be1..bb730464 100644
--- a/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenIndividualTest_volumeScreenWithLongTest.png
+++ b/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenIndividualTest_volumeScreenWithLongTest.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b0aaeb614b45806a10fa4a2962058a597969a1cc06c0ca06e23f0323c30b631d
-size 22216
+oid sha256:77af61e2f06bcb0f5307f2b027ef9d79629cdab449f03f05cc2a54e490008041
+size 15376
diff --git a/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenIndividualTest_volumeScreenWithWatchSpeaker.png b/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenIndividualTest_volumeScreenWithWatchSpeaker.png
index 14e5b04e..7c1d7f91 100644
--- a/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenIndividualTest_volumeScreenWithWatchSpeaker.png
+++ b/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenIndividualTest_volumeScreenWithWatchSpeaker.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:40d3d00866e6e27c60a9deaba162b0c3f904c628870300a6e8d69634dbb81487
-size 22598
+oid sha256:665ae49d90fbc0bd8e0a34905052ce8d0b68fa1c7aca77f674efc49ff13dc30f
+size 15504
diff --git a/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenIndividualTest_volumeScreenWithWatchSpeakerNotPlayable.png b/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenIndividualTest_volumeScreenWithWatchSpeakerNotPlayable.png
index bdf02acc..70e3b4e5 100644
--- a/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenIndividualTest_volumeScreenWithWatchSpeakerNotPlayable.png
+++ b/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenIndividualTest_volumeScreenWithWatchSpeakerNotPlayable.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9f4501f8566b5b829b7d526a8bd1767fd860fd20d136b66703701ff3caa0351a
-size 21094
+oid sha256:3afc9500966e6a7852eeb603c447d064a0453a42264356dfcb728707af525995
+size 14442
diff --git a/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenThemeTest_volumeScreenThemes[0]_bluedefaultaecbfa.png b/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenThemeTest_volumeScreenThemes[0]_bluedefaultaecbfa.png
index 3da5b5f2..eda9707a 100644
--- a/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenThemeTest_volumeScreenThemes[0]_bluedefaultaecbfa.png
+++ b/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenThemeTest_volumeScreenThemes[0]_bluedefaultaecbfa.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a0fc9f5d4e572ea72fc5f4eeb080095afb6ddbf8d37cfcb2163f63eeed4073d3
-size 20856
+oid sha256:98860a1f642ba0c6b9fc4c846fad3f052bcac655d4afebc918c86725c11cf867
+size 14473
diff --git a/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenThemeTest_volumeScreenThemes[1]_blue7fcfff.png b/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenThemeTest_volumeScreenThemes[1]_blue7fcfff.png
index 1322a5aa..044af2c3 100644
--- a/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenThemeTest_volumeScreenThemes[1]_blue7fcfff.png
+++ b/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenThemeTest_volumeScreenThemes[1]_blue7fcfff.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f196f8b839001e351cc98da61c79630e9e60514641bbb88136ffe73aaee79098
-size 20834
+oid sha256:4558890ba36296bcb727eb16ef44066cd46e8a88b986e9a5a743e65acbf6b022
+size 14472
diff --git a/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenThemeTest_volumeScreenThemes[2]_lilacd0bcff.png b/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenThemeTest_volumeScreenThemes[2]_lilacd0bcff.png
index cb358203..41c6ef4e 100644
--- a/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenThemeTest_volumeScreenThemes[2]_lilacd0bcff.png
+++ b/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenThemeTest_volumeScreenThemes[2]_lilacd0bcff.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9a7dd8971a83d745e4ef8beb1210df0cb0a595ea1ccfd3cd8c3709b0ed6e6e18
-size 20837
+oid sha256:1c381ebb8254143df4cc45f014be93ac035c193998378a75f750422511fdcddc
+size 14484
diff --git a/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenThemeTest_volumeScreenThemes[3]_green6dd58c.png b/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenThemeTest_volumeScreenThemes[3]_green6dd58c.png
index e7a2465e..4d770770 100644
--- a/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenThemeTest_volumeScreenThemes[3]_green6dd58c.png
+++ b/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenThemeTest_volumeScreenThemes[3]_green6dd58c.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e6c1fba6931c783503829a2830f78a18b608be43d6327e787b2514ff10ea345e
-size 20804
+oid sha256:4a9d91d1a140fed02cd5a56022209cbae82f9b21089b1e71d4ea4712d811046c
+size 14399
diff --git a/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenThemeTest_volumeScreenThemes[4]_bluewithtext7fcfff.png b/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenThemeTest_volumeScreenThemes[4]_bluewithtext7fcfff.png
index 7eb6615e..83e9da16 100644
--- a/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenThemeTest_volumeScreenThemes[4]_bluewithtext7fcfff.png
+++ b/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenThemeTest_volumeScreenThemes[4]_bluewithtext7fcfff.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a7e8d0897079fa167b76e1b3b16ad309baf36bad66f946ecf313209f48b3a3ba
-size 20486
+oid sha256:bfc4470dec7b4eac5b81d0cc0ad4cc25d286a0a82d5d28f20e0752c3bbf43153
+size 14217
diff --git a/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenThemeTest_volumeScreenThemes[5]_orangey.png b/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenThemeTest_volumeScreenThemes[5]_orangey.png
index 58f5aa77..b9bc6336 100644
--- a/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenThemeTest_volumeScreenThemes[5]_orangey.png
+++ b/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenThemeTest_volumeScreenThemes[5]_orangey.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e847ab821f790d2e154fa89d3362e3d03844a1811b2d59fa8d7a7bc80f9ec740
-size 20241
+oid sha256:96f7711c10cb56506f5e8c8bc31669cd2c15ba415f636e92d13c5fc0e1b67a4a
+size 14232
diff --git a/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenThemeTest_volumeScreenThemes[6]_uamp.png b/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenThemeTest_volumeScreenThemes[6]_uamp.png
index 8ceb63f5..75ec830b 100644
--- a/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenThemeTest_volumeScreenThemes[6]_uamp.png
+++ b/media/audio-ui/src/test/snapshots/images/com.google.android.horologist.audio.ui_VolumeScreenThemeTest_volumeScreenThemes[6]_uamp.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:978f4cbf68292428b94f627de749e2863f7292ecf295c48debf32cf8814531ae
-size 20800
+oid sha256:482b3be4ae262188c91e7c582be96d3912c3902aee28435aa66f954620b02c9f
+size 14428
diff --git a/media/ui/build.gradle.kts b/media/ui/build.gradle.kts
index e46adf7f..782f8349 100644
--- a/media/ui/build.gradle.kts
+++ b/media/ui/build.gradle.kts
@@ -19,6 +19,7 @@ plugins {
     id("org.jetbrains.dokka")
     id("me.tylerbwong.gradle.metalava")
     kotlin("android")
+    alias(libs.plugins.roborazzi)
 }
 
 android {
diff --git a/media/ui/src/test/java/com/google/android/horologist/media/ui/MediaPlayerDeviceScreenTest.kt b/media/ui/src/test/java/com/google/android/horologist/media/ui/MediaPlayerDeviceScreenTest.kt
index 9bce3694..cdc893e1 100644
--- a/media/ui/src/test/java/com/google/android/horologist/media/ui/MediaPlayerDeviceScreenTest.kt
+++ b/media/ui/src/test/java/com/google/android/horologist/media/ui/MediaPlayerDeviceScreenTest.kt
@@ -14,20 +14,18 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.media.ui
 
 import com.google.android.horologist.media.ui.state.PlayerUiState
 import com.google.android.horologist.media.ui.state.model.MediaUiModel
 import com.google.android.horologist.media.ui.state.model.TrackPositionUiModel
 import com.google.android.horologist.media.ui.uamp.UampColors
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
+import com.google.android.horologist.screenshots.rng.WearLegacyScreenTest
 import org.junit.Test
 import org.robolectric.annotation.Config
 import kotlin.time.Duration.Companion.seconds
 
-class MediaPlayerDeviceScreenTest : ScreenshotBaseTest() {
+class MediaPlayerDeviceScreenTest : WearLegacyScreenTest() {
 
     @Test
     fun mediaPlayerLargeRound() {
@@ -79,7 +77,7 @@ class MediaPlayerDeviceScreenTest : ScreenshotBaseTest() {
             connected = true,
         )
 
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             MediaPlayerTestCase(
                 colors = UampColors,
                 playerUiState = playerUiState,
diff --git a/media/ui/src/test/java/com/google/android/horologist/media/ui/MediaPlayerScreenTest.kt b/media/ui/src/test/java/com/google/android/horologist/media/ui/MediaPlayerScreenTest.kt
index 76d935bc..029e74bb 100644
--- a/media/ui/src/test/java/com/google/android/horologist/media/ui/MediaPlayerScreenTest.kt
+++ b/media/ui/src/test/java/com/google/android/horologist/media/ui/MediaPlayerScreenTest.kt
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.media.ui
 
 import androidx.compose.foundation.background
@@ -27,8 +25,7 @@ import com.google.android.horologist.compose.tools.themeValues
 import com.google.android.horologist.media.ui.state.PlayerUiState
 import com.google.android.horologist.media.ui.state.model.MediaUiModel
 import com.google.android.horologist.media.ui.state.model.TrackPositionUiModel
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
-import com.google.android.horologist.screenshots.ScreenshotTestRule.Companion.screenshotTestRuleParams
+import com.google.android.horologist.screenshots.rng.WearLegacyScreenTest
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.ParameterizedRobolectricTestRunner
@@ -38,11 +35,13 @@ import kotlin.time.Duration.Companion.seconds
 @RunWith(ParameterizedRobolectricTestRunner::class)
 class MediaPlayerScreenTest(
     private val themeValue: ThemeValues,
-) : ScreenshotBaseTest(
-    screenshotTestRuleParams {
-        testLabel = themeValue.safeName.lowercase()
-    },
-) {
+) : WearLegacyScreenTest() {
+
+    override fun testName(suffix: String): String {
+        return "src/test/snapshots/images/" +
+            "${javaClass.`package`?.name}_${javaClass.simpleName}_${testInfo.methodName}_" +
+            "${themeValue.safeName.lowercase()}.png"
+    }
 
     @Test
     fun mediaPlayerScreen() {
@@ -71,7 +70,7 @@ class MediaPlayerScreenTest(
             connected = true,
         )
 
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             Box(modifier = Modifier.background(Color.Black)) {
                 MediaPlayerTestCase(colors = themeValue.colors, playerUiState = playerUiState)
             }
diff --git a/media/ui/src/test/java/com/google/android/horologist/media/ui/MediaPlayerStatesScreenTest.kt b/media/ui/src/test/java/com/google/android/horologist/media/ui/MediaPlayerStatesScreenTest.kt
index 6e6afc08..fdb81b18 100644
--- a/media/ui/src/test/java/com/google/android/horologist/media/ui/MediaPlayerStatesScreenTest.kt
+++ b/media/ui/src/test/java/com/google/android/horologist/media/ui/MediaPlayerStatesScreenTest.kt
@@ -14,22 +14,16 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.media.ui
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
-import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.wear.compose.material.TimeSource
-import com.google.android.horologist.compose.layout.ResponsiveTimeText
 import com.google.android.horologist.media.ui.state.PlayerUiState
 import com.google.android.horologist.media.ui.state.model.MediaUiModel
 import com.google.android.horologist.media.ui.state.model.TrackPositionUiModel
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
-import com.google.android.horologist.screenshots.ScreenshotTestRule
+import com.google.android.horologist.screenshots.rng.WearLegacyScreenTest
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.ParameterizedRobolectricTestRunner
@@ -39,19 +33,13 @@ import kotlin.time.Duration.Companion.seconds
 @RunWith(ParameterizedRobolectricTestRunner::class)
 class MediaPlayerStatesScreenTest(
     private val state: State,
-) : ScreenshotBaseTest(
-    ScreenshotTestRule.screenshotTestRuleParams {
-        screenTimeText = {
-            ResponsiveTimeText(
-                timeSource = object : TimeSource {
-                    override val currentTime: String
-                        @Composable get() = "10:10"
-                },
-            )
-        }
-        testLabel = state.name.lowercase()
-    },
-) {
+) : WearLegacyScreenTest() {
+
+    override fun testName(suffix: String): String {
+        return "src/test/snapshots/images/" +
+            "${javaClass.`package`?.name}_${javaClass.simpleName}_${testInfo.methodName}_" +
+            "${state.name.lowercase()}.png"
+    }
 
     @Test
     fun mediaPlayerScreen() {
@@ -88,7 +76,7 @@ class MediaPlayerStatesScreenTest(
             connected = state.connected,
         )
 
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             Box(modifier = Modifier.background(Color.Black)) {
                 MediaPlayerTestCase(playerUiState = playerUiState)
             }
diff --git a/media/ui/src/test/java/com/google/android/horologist/media/ui/PodcastPlayerScreenTest.kt b/media/ui/src/test/java/com/google/android/horologist/media/ui/PodcastPlayerScreenTest.kt
index 3d965058..805674eb 100644
--- a/media/ui/src/test/java/com/google/android/horologist/media/ui/PodcastPlayerScreenTest.kt
+++ b/media/ui/src/test/java/com/google/android/horologist/media/ui/PodcastPlayerScreenTest.kt
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.media.ui
 
 import com.google.android.horologist.media.ui.components.PodcastControlButtons
@@ -23,8 +21,7 @@ import com.google.android.horologist.media.ui.components.controls.SeekButtonIncr
 import com.google.android.horologist.media.ui.state.PlayerUiState
 import com.google.android.horologist.media.ui.state.model.MediaUiModel
 import com.google.android.horologist.media.ui.state.model.TrackPositionUiModel
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
-import com.google.android.horologist.screenshots.ScreenshotTestRule
+import com.google.android.horologist.screenshots.rng.WearLegacyScreenTest
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.ParameterizedRobolectricTestRunner
@@ -34,12 +31,13 @@ import kotlin.time.Duration.Companion.seconds
 @RunWith(ParameterizedRobolectricTestRunner::class)
 class PodcastPlayerScreenTest(
     private val options: PodcastOptions,
-) : ScreenshotBaseTest(
-    ScreenshotTestRule.screenshotTestRuleParams {
-        screenTimeText = {}
-        testLabel = options.toString().lowercase()
-    },
-) {
+) : WearLegacyScreenTest() {
+
+    override fun testName(suffix: String): String {
+        return "src/test/snapshots/images/" +
+            "${javaClass.`package`?.name}_${javaClass.simpleName}_${testInfo.methodName}_" +
+            "${options.toString().lowercase()}.png"
+    }
 
     @Test
     fun mediaPlayerScreen() {
@@ -68,7 +66,7 @@ class PodcastPlayerScreenTest(
             connected = true,
         )
 
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             MediaPlayerTestCase(playerUiState = playerUiState, controlButtons = {
                 PodcastControlButtons(
                     onPlayButtonClick = { },
diff --git a/media/ui/src/test/java/com/google/android/horologist/media/ui/components/LoadingMediaDisplayTest.kt b/media/ui/src/test/java/com/google/android/horologist/media/ui/components/LoadingMediaDisplayTest.kt
index 64ec4178..7338587d 100644
--- a/media/ui/src/test/java/com/google/android/horologist/media/ui/components/LoadingMediaDisplayTest.kt
+++ b/media/ui/src/test/java/com/google/android/horologist/media/ui/components/LoadingMediaDisplayTest.kt
@@ -14,45 +14,48 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.media.ui.components
 
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.wrapContentSize
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.graphics.Color
 import com.google.android.horologist.media.ui.components.animated.MarqueeTextMediaDisplay
 import com.google.android.horologist.media.ui.components.display.LoadingMediaDisplay
 import com.google.android.horologist.media.ui.components.display.TextMediaDisplay
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
-import com.google.android.horologist.screenshots.ScreenshotTestRule
+import com.google.android.horologist.screenshots.rng.WearLegacyComponentTest
 import org.junit.Test
 import org.robolectric.annotation.Config
 
-class LoadingMediaDisplayTest : ScreenshotBaseTest(
-    ScreenshotTestRule.screenshotTestRuleParams {
-        screenTimeText = {}
-    },
-) {
+class LoadingMediaDisplayTest : WearLegacyComponentTest() {
     @Test
     fun default() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             LoadingMediaDisplay()
         }
     }
 
     @Test
     fun loadingMediaDisplay_textMediaDisplay_overlay_largeScreen() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
-            LoadingMediaDisplay(modifier = Modifier.alpha(0.5f))
-            TextMediaDisplay(title = "Sorrow", subtitle = "David Bowie")
+        runComponentTest {
+            DisplayArea {
+                LoadingMediaDisplay(modifier = Modifier.alpha(0.5f))
+                TextMediaDisplay(title = "Sorrow", subtitle = "David Bowie")
+            }
         }
     }
 
     @Test
     fun loadingMediaDisplay_marqueeTextMediaDisplay_overlay_largeScreen() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
-            LoadingMediaDisplay(modifier = Modifier.alpha(0.5f))
-            MarqueeTextMediaDisplay(title = "Sorrow", artist = "David Bowie")
+        runComponentTest {
+            DisplayArea {
+                LoadingMediaDisplay(modifier = Modifier.alpha(0.5f))
+                MarqueeTextMediaDisplay(title = "Sorrow", artist = "David Bowie")
+            }
         }
     }
 
@@ -61,9 +64,11 @@ class LoadingMediaDisplayTest : ScreenshotBaseTest(
     )
     @Test
     fun loadingMediaDisplay_textMediaDisplay_overlay_smallScreen() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
-            LoadingMediaDisplay(modifier = Modifier.alpha(0.5f))
-            TextMediaDisplay(title = "Sorrow", subtitle = "David Bowie")
+        runComponentTest {
+            DisplayArea {
+                LoadingMediaDisplay(modifier = Modifier.alpha(0.5f))
+                TextMediaDisplay(title = "Sorrow", subtitle = "David Bowie")
+            }
         }
     }
 
@@ -72,9 +77,23 @@ class LoadingMediaDisplayTest : ScreenshotBaseTest(
     )
     @Test
     fun loadingMediaDisplay_marqueeTextMediaDisplay_overlay_smallScreen() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
-            LoadingMediaDisplay(modifier = Modifier.alpha(0.5f))
-            MarqueeTextMediaDisplay(title = "Sorrow", artist = "David Bowie")
+        runComponentTest {
+            DisplayArea {
+                LoadingMediaDisplay(modifier = Modifier.alpha(0.5f))
+                MarqueeTextMediaDisplay(title = "Sorrow", artist = "David Bowie")
+            }
+        }
+    }
+
+    @Composable
+    fun DisplayArea(content: @Composable () -> Unit) {
+        Box(
+            modifier = Modifier
+                .wrapContentSize()
+                .background(Color.Black.copy(alpha = 0.5f)),
+            contentAlignment = Alignment.Center,
+        ) {
+            content()
         }
     }
 }
diff --git a/media/ui/src/test/java/com/google/android/horologist/media/ui/components/MarqueeTextMediaDisplayTest.kt b/media/ui/src/test/java/com/google/android/horologist/media/ui/components/MarqueeTextMediaDisplayTest.kt
index d975ed6d..dc14815d 100644
--- a/media/ui/src/test/java/com/google/android/horologist/media/ui/components/MarqueeTextMediaDisplayTest.kt
+++ b/media/ui/src/test/java/com/google/android/horologist/media/ui/components/MarqueeTextMediaDisplayTest.kt
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.media.ui.components
 
 import androidx.compose.runtime.Composable
@@ -24,25 +22,20 @@ import com.google.android.horologist.images.base.paintable.DrawableResPaintable
 import com.google.android.horologist.images.base.paintable.Paintable
 import com.google.android.horologist.logo.R
 import com.google.android.horologist.media.ui.components.animated.MarqueeTextMediaDisplay
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
-import com.google.android.horologist.screenshots.ScreenshotTestRule
+import com.google.android.horologist.screenshots.rng.WearLegacyComponentTest
 import org.junit.Test
 
-class MarqueeTextMediaDisplayTest : ScreenshotBaseTest(
-    ScreenshotTestRule.screenshotTestRuleParams {
-        screenTimeText = {}
-    },
-) {
+class MarqueeTextMediaDisplayTest : WearLegacyComponentTest() {
     @Test
     fun givenTitleAndArtist_thenTitleAndArtistAreDisplayed() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             MarqueeTextMediaDisplay(title = "Sorrow", artist = "David Bowie")
         }
     }
 
     @Test
     fun givenPaintableIcon_thenTintedIconIsDisplayed() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             MarqueeTextMediaDisplay(
                 title = "Sorrow",
                 artist = "David Bowie",
@@ -53,7 +46,7 @@ class MarqueeTextMediaDisplayTest : ScreenshotBaseTest(
 
     @Test
     fun givenPaintable_thenImageIsDisplayed() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             MarqueeTextMediaDisplay(
                 title = "Sorrow",
                 artist = "David Bowie",
diff --git a/media/ui/src/test/java/com/google/android/horologist/media/ui/components/MediaArtworkA11yTest.kt b/media/ui/src/test/java/com/google/android/horologist/media/ui/components/MediaArtworkA11yTest.kt
index 51a1d493..41bf83fa 100644
--- a/media/ui/src/test/java/com/google/android/horologist/media/ui/components/MediaArtworkA11yTest.kt
+++ b/media/ui/src/test/java/com/google/android/horologist/media/ui/components/MediaArtworkA11yTest.kt
@@ -37,9 +37,6 @@ class MediaArtworkA11yTest : ScreenshotBaseTest(
         screenTimeText = {}
     },
 ) {
-    init {
-    }
-
     @Test
     fun a11y() {
         screenshotTestRule.setContent(
diff --git a/media/ui/src/test/java/com/google/android/horologist/media/ui/components/MediaChipTest.kt b/media/ui/src/test/java/com/google/android/horologist/media/ui/components/MediaChipTest.kt
index 8032d236..1ba8611d 100644
--- a/media/ui/src/test/java/com/google/android/horologist/media/ui/components/MediaChipTest.kt
+++ b/media/ui/src/test/java/com/google/android/horologist/media/ui/components/MediaChipTest.kt
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.media.ui.components
 
 import androidx.compose.foundation.layout.height
@@ -24,14 +22,14 @@ import androidx.compose.ui.unit.dp
 import com.google.android.horologist.images.base.paintable.DrawableResPaintable
 import com.google.android.horologist.logo.R
 import com.google.android.horologist.media.ui.state.model.MediaUiModel
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
+import com.google.android.horologist.screenshots.rng.WearLegacyComponentTest
 import org.junit.Test
 
-class MediaChipTest : ScreenshotBaseTest() {
+class MediaChipTest : WearLegacyComponentTest() {
 
     @Test
     fun givenMediaWithArtwork_thenDisplaysArtwork() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             MediaChip(
                 title = "Red Hot Chilli Peppers",
                 artworkPaintable = DrawableResPaintable(R.drawable.horologist_logo),
@@ -42,7 +40,7 @@ class MediaChipTest : ScreenshotBaseTest() {
 
     @Test
     fun givenMediaWithNOArtwork_thenDoesNOTDisplayArtwork() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             MediaChip(
                 title = "Red Hot Chilli Peppers",
                 artworkPaintable = null,
@@ -53,7 +51,7 @@ class MediaChipTest : ScreenshotBaseTest() {
 
     @Test
     fun givenVeryLongTitle_thenEllipsizeAt2ndLine() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             MediaChip(
                 title = "Very very very very very very very very very very very long title",
                 artworkPaintable = DrawableResPaintable(R.drawable.horologist_logo),
@@ -64,7 +62,7 @@ class MediaChipTest : ScreenshotBaseTest() {
 
     @Test
     fun givenNOTitle_thenDisplaysDefaultTitle() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             MediaChip(
                 media = MediaUiModel(
                     id = "id",
@@ -78,7 +76,7 @@ class MediaChipTest : ScreenshotBaseTest() {
 
     @Test
     fun givenModifier_thenAppliesModifierCorrectly() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             MediaChip(
                 media = MediaUiModel(
                     id = "id",
diff --git a/media/ui/src/test/java/com/google/android/horologist/media/ui/components/actions/ShowPlaylistChipTest.kt b/media/ui/src/test/java/com/google/android/horologist/media/ui/components/actions/ShowPlaylistChipTest.kt
index 1c8c4cf9..dbbab02e 100644
--- a/media/ui/src/test/java/com/google/android/horologist/media/ui/components/actions/ShowPlaylistChipTest.kt
+++ b/media/ui/src/test/java/com/google/android/horologist/media/ui/components/actions/ShowPlaylistChipTest.kt
@@ -14,20 +14,18 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.media.ui.components.actions
 
 import com.google.android.horologist.images.base.paintable.DrawableResPaintable
 import com.google.android.horologist.logo.R
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
+import com.google.android.horologist.screenshots.rng.WearLegacyComponentTest
 import org.junit.Test
 
-class ShowPlaylistChipTest : ScreenshotBaseTest() {
+class ShowPlaylistChipTest : WearLegacyComponentTest() {
 
     @Test
     fun givenArtwork_thenDisplaysArtwork() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ShowPlaylistChip(
                 artworkPaintable = DrawableResPaintable(R.drawable.horologist_logo),
                 name = "Playlists",
@@ -38,7 +36,7 @@ class ShowPlaylistChipTest : ScreenshotBaseTest() {
 
     @Test
     fun givenNOArtwork_thenDoesNOTDisplayArtwork() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ShowPlaylistChip(
                 artworkPaintable = null,
                 name = "Playlists",
@@ -49,7 +47,7 @@ class ShowPlaylistChipTest : ScreenshotBaseTest() {
 
     @Test
     fun givenNOName_thenDoesDisplayArtwork() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ShowPlaylistChip(
                 artworkPaintable = DrawableResPaintable(R.drawable.horologist_logo),
                 name = null,
@@ -60,7 +58,7 @@ class ShowPlaylistChipTest : ScreenshotBaseTest() {
 
     @Test
     fun givenVeryLongTitle_thenEllipsizeAt2ndLine() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ShowPlaylistChip(
                 artworkPaintable = DrawableResPaintable(R.drawable.horologist_logo),
                 name = "Very very very very very very very very very very very very very very very very very very very long title",
diff --git a/media/ui/src/test/java/com/google/android/horologist/media/ui/controls/SeekBackButtonTest.kt b/media/ui/src/test/java/com/google/android/horologist/media/ui/controls/SeekBackButtonTest.kt
index cce134dc..3c125cbe 100644
--- a/media/ui/src/test/java/com/google/android/horologist/media/ui/controls/SeekBackButtonTest.kt
+++ b/media/ui/src/test/java/com/google/android/horologist/media/ui/controls/SeekBackButtonTest.kt
@@ -14,20 +14,18 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.media.ui.controls
 
 import com.google.android.horologist.media.ui.components.controls.SeekBackButton
 import com.google.android.horologist.media.ui.components.controls.SeekButtonIncrement
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
+import com.google.android.horologist.screenshots.rng.WearLegacyComponentTest
 import org.junit.Test
 
-class SeekBackButtonTest : ScreenshotBaseTest() {
+class SeekBackButtonTest : WearLegacyComponentTest() {
 
     @Test
     fun givenIncrementIsFive_thenIconIsFive() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             SeekBackButton(
                 onClick = {},
                 seekButtonIncrement = SeekButtonIncrement.Five,
@@ -37,7 +35,7 @@ class SeekBackButtonTest : ScreenshotBaseTest() {
 
     @Test
     fun givenIncrementIsTen_thenIconIsTen() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             SeekBackButton(
                 onClick = {},
                 seekButtonIncrement = SeekButtonIncrement.Ten,
@@ -47,7 +45,7 @@ class SeekBackButtonTest : ScreenshotBaseTest() {
 
     @Test
     fun givenIncrementIsThirty_thenIconIsThirty() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             SeekBackButton(
                 onClick = {},
                 seekButtonIncrement = SeekButtonIncrement.Thirty,
@@ -57,7 +55,7 @@ class SeekBackButtonTest : ScreenshotBaseTest() {
 
     @Test
     fun givenIncrementIsOtherValue_thenIconIsDefault() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             SeekBackButton(
                 onClick = {},
                 seekButtonIncrement = SeekButtonIncrement.Known(15),
@@ -67,7 +65,7 @@ class SeekBackButtonTest : ScreenshotBaseTest() {
 
     @Test
     fun givenIncrementIsUnknown_thenIconIsDefault() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             SeekBackButton(
                 onClick = {},
                 seekButtonIncrement = SeekButtonIncrement.Unknown,
diff --git a/media/ui/src/test/java/com/google/android/horologist/media/ui/controls/SeekForwardButtonTest.kt b/media/ui/src/test/java/com/google/android/horologist/media/ui/controls/SeekForwardButtonTest.kt
index c3ef8799..6d80a309 100644
--- a/media/ui/src/test/java/com/google/android/horologist/media/ui/controls/SeekForwardButtonTest.kt
+++ b/media/ui/src/test/java/com/google/android/horologist/media/ui/controls/SeekForwardButtonTest.kt
@@ -14,20 +14,18 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.media.ui.controls
 
 import com.google.android.horologist.media.ui.components.controls.SeekButtonIncrement
 import com.google.android.horologist.media.ui.components.controls.SeekForwardButton
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
+import com.google.android.horologist.screenshots.rng.WearLegacyComponentTest
 import org.junit.Test
 
-class SeekForwardButtonTest : ScreenshotBaseTest() {
+class SeekForwardButtonTest : WearLegacyComponentTest() {
 
     @Test
     fun givenIncrementIsFive_thenIconIsFive() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             SeekForwardButton(
                 onClick = {},
                 seekButtonIncrement = SeekButtonIncrement.Five,
@@ -37,7 +35,7 @@ class SeekForwardButtonTest : ScreenshotBaseTest() {
 
     @Test
     fun givenIncrementIsTen_thenIconIsTen() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             SeekForwardButton(
                 onClick = {},
                 seekButtonIncrement = SeekButtonIncrement.Ten,
@@ -47,7 +45,7 @@ class SeekForwardButtonTest : ScreenshotBaseTest() {
 
     @Test
     fun givenIncrementIsThirty_thenIconIsThirty() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             SeekForwardButton(
                 onClick = {},
                 seekButtonIncrement = SeekButtonIncrement.Thirty,
@@ -57,7 +55,7 @@ class SeekForwardButtonTest : ScreenshotBaseTest() {
 
     @Test
     fun givenIncrementIsOtherValue_thenIconIsDefault() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             SeekForwardButton(
                 onClick = {},
                 seekButtonIncrement = SeekButtonIncrement.Known(15),
@@ -67,7 +65,7 @@ class SeekForwardButtonTest : ScreenshotBaseTest() {
 
     @Test
     fun givenIncrementIsUnknown_thenIconIsDefault() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             SeekForwardButton(
                 onClick = {},
                 seekButtonIncrement = SeekButtonIncrement.Unknown,
diff --git a/media/ui/src/test/java/com/google/android/horologist/media/ui/controls/ShuffleToggleButtonTest.kt b/media/ui/src/test/java/com/google/android/horologist/media/ui/controls/ShuffleToggleButtonTest.kt
index 194e12a1..f5b657a7 100644
--- a/media/ui/src/test/java/com/google/android/horologist/media/ui/controls/ShuffleToggleButtonTest.kt
+++ b/media/ui/src/test/java/com/google/android/horologist/media/ui/controls/ShuffleToggleButtonTest.kt
@@ -14,19 +14,17 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.media.ui.controls
 
 import com.google.android.horologist.media.ui.components.controls.ShuffleToggleButton
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
+import com.google.android.horologist.screenshots.rng.WearLegacyComponentTest
 import org.junit.Test
 
-class ShuffleToggleButtonTest : ScreenshotBaseTest() {
+class ShuffleToggleButtonTest : WearLegacyComponentTest() {
 
     @Test
     fun givenShuffleIsOn_thenIconIsShuffleOn() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ShuffleToggleButton(
                 onToggle = {},
                 shuffleOn = true,
@@ -36,7 +34,7 @@ class ShuffleToggleButtonTest : ScreenshotBaseTest() {
 
     @Test
     fun givenShuffleIsOff_thenIconIsShuffle() {
-        screenshotTestRule.setContent(isComponent = true, takeScreenshot = true) {
+        runComponentTest {
             ShuffleToggleButton(
                 onToggle = {},
                 shuffleOn = false,
diff --git a/media/ui/src/test/java/com/google/android/horologist/media/ui/tiles/MediaCollectionsTileTest.kt b/media/ui/src/test/java/com/google/android/horologist/media/ui/tiles/MediaCollectionsTileTest.kt
index 22512c41..e2d5369d 100644
--- a/media/ui/src/test/java/com/google/android/horologist/media/ui/tiles/MediaCollectionsTileTest.kt
+++ b/media/ui/src/test/java/com/google/android/horologist/media/ui/tiles/MediaCollectionsTileTest.kt
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-@file:Suppress("DEPRECATION")
-
 package com.google.android.horologist.media.ui.tiles
 
 import androidx.compose.runtime.Composable
@@ -25,17 +23,12 @@ import androidx.wear.protolayout.ActionBuilders
 import com.google.android.horologist.compose.tools.TileLayoutPreview
 import com.google.android.horologist.media.ui.R
 import com.google.android.horologist.media.ui.uamp.UampColors
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
-import com.google.android.horologist.screenshots.ScreenshotTestRule
+import com.google.android.horologist.screenshots.rng.WearLegacyScreenTest
 import com.google.android.horologist.tiles.images.drawableResToImageResource
 import org.junit.Test
 import org.robolectric.annotation.Config
 
-class MediaCollectionsTileTest : ScreenshotBaseTest(
-    ScreenshotTestRule.screenshotTestRuleParams {
-        screenTimeText = {}
-    },
-) {
+class MediaCollectionsTileTest : WearLegacyScreenTest() {
     @Test
     fun largeRound() {
         tileScreenshot()
@@ -60,7 +53,7 @@ class MediaCollectionsTileTest : ScreenshotBaseTest(
     }
 
     fun tileScreenshot() {
-        screenshotTestRule.setContent(takeScreenshot = true) {
+        runTest {
             SampleTilePreview()
         }
     }
@@ -107,6 +100,7 @@ class MediaCollectionsTileTest : ScreenshotBaseTest(
             )
         }
 
+        @Suppress("DEPRECATION")
         TileLayoutPreview(
             tileState,
             resourceState,
diff --git a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui.components_LoadingMediaDisplayTest_default.png b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui.components_LoadingMediaDisplayTest_default.png
index 31755042..b3349aef 100644
--- a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui.components_LoadingMediaDisplayTest_default.png
+++ b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui.components_LoadingMediaDisplayTest_default.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5e96ae497e131df5baa28f047c9a6be3d7d6710b37d0f7035292a7f22346fe7f
-size 1466
+oid sha256:f56f1369180c4b0aacd4e8ffa58cce98cf8c8aec31c660ec71822505be69e9ce
+size 924
diff --git a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui.components_LoadingMediaDisplayTest_loadingMediaDisplay_marqueeTextMediaDisplay_overlay_largeScreen.png b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui.components_LoadingMediaDisplayTest_loadingMediaDisplay_marqueeTextMediaDisplay_overlay_largeScreen.png
index 68fec83e..7cfca05f 100644
--- a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui.components_LoadingMediaDisplayTest_loadingMediaDisplay_marqueeTextMediaDisplay_overlay_largeScreen.png
+++ b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui.components_LoadingMediaDisplayTest_loadingMediaDisplay_marqueeTextMediaDisplay_overlay_largeScreen.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bb103ad40672b95be9ff4a496042291da0a1dbf502d0e3d7467e741fd98a587f
-size 8548
+oid sha256:6c9bf5d2d9b620eef542be110e04fff5224d0004546e6e57c31e820b0d80bf72
+size 5750
diff --git a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui.components_LoadingMediaDisplayTest_loadingMediaDisplay_marqueeTextMediaDisplay_overlay_smallScreen.png b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui.components_LoadingMediaDisplayTest_loadingMediaDisplay_marqueeTextMediaDisplay_overlay_smallScreen.png
index 5856bb4d..2ac178e1 100644
--- a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui.components_LoadingMediaDisplayTest_loadingMediaDisplay_marqueeTextMediaDisplay_overlay_smallScreen.png
+++ b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui.components_LoadingMediaDisplayTest_loadingMediaDisplay_marqueeTextMediaDisplay_overlay_smallScreen.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f33750a46495e945b3a8f8d654ffcc0c7f82659a4b5ac2ce3e0ba8752e50931a
-size 8462
+oid sha256:d9dd46984dfe0ee953362e4fd70422f5a3eb3a4750f3fba186aeacf6e4197f4f
+size 5655
diff --git a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui.components_LoadingMediaDisplayTest_loadingMediaDisplay_textMediaDisplay_overlay_largeScreen.png b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui.components_LoadingMediaDisplayTest_loadingMediaDisplay_textMediaDisplay_overlay_largeScreen.png
index 68fec83e..7cfca05f 100644
--- a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui.components_LoadingMediaDisplayTest_loadingMediaDisplay_textMediaDisplay_overlay_largeScreen.png
+++ b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui.components_LoadingMediaDisplayTest_loadingMediaDisplay_textMediaDisplay_overlay_largeScreen.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bb103ad40672b95be9ff4a496042291da0a1dbf502d0e3d7467e741fd98a587f
-size 8548
+oid sha256:6c9bf5d2d9b620eef542be110e04fff5224d0004546e6e57c31e820b0d80bf72
+size 5750
diff --git a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui.components_LoadingMediaDisplayTest_loadingMediaDisplay_textMediaDisplay_overlay_smallScreen.png b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui.components_LoadingMediaDisplayTest_loadingMediaDisplay_textMediaDisplay_overlay_smallScreen.png
index 5856bb4d..2ac178e1 100644
--- a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui.components_LoadingMediaDisplayTest_loadingMediaDisplay_textMediaDisplay_overlay_smallScreen.png
+++ b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui.components_LoadingMediaDisplayTest_loadingMediaDisplay_textMediaDisplay_overlay_smallScreen.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f33750a46495e945b3a8f8d654ffcc0c7f82659a4b5ac2ce3e0ba8752e50931a
-size 8462
+oid sha256:d9dd46984dfe0ee953362e4fd70422f5a3eb3a4750f3fba186aeacf6e4197f4f
+size 5655
diff --git a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerDeviceScreenTest_mediaPlayerLargeRound.png b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerDeviceScreenTest_mediaPlayerLargeRound.png
index c16722e4..fb7e8cb6 100644
--- a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerDeviceScreenTest_mediaPlayerLargeRound.png
+++ b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerDeviceScreenTest_mediaPlayerLargeRound.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4bc2c165510272ac95b772c65c99d9d46e5b87c97d2b2506f7a9ca18bdc1eee4
-size 119099
+oid sha256:5437361a1f709e80e10c49f4953b50ce0c20244c079718552b5c6cf634e531a1
+size 107227
diff --git a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerDeviceScreenTest_mediaPlayerScreen.png b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerDeviceScreenTest_mediaPlayerScreen.png
index c16722e4..fb7e8cb6 100644
--- a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerDeviceScreenTest_mediaPlayerScreen.png
+++ b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerDeviceScreenTest_mediaPlayerScreen.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4bc2c165510272ac95b772c65c99d9d46e5b87c97d2b2506f7a9ca18bdc1eee4
-size 119099
+oid sha256:5437361a1f709e80e10c49f4953b50ce0c20244c079718552b5c6cf634e531a1
+size 107227
diff --git a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerDeviceScreenTest_mediaPlayerSmallRound.png b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerDeviceScreenTest_mediaPlayerSmallRound.png
index 051b2ac6..d80929e7 100644
--- a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerDeviceScreenTest_mediaPlayerSmallRound.png
+++ b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerDeviceScreenTest_mediaPlayerSmallRound.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bf04c2cbce280bca1232af424ec7d8d980e23c5cf37a98dc43e7a223e0c99622
-size 85027
+oid sha256:2037558035c7a065e66bd7431e8ac00182a1bacef7c09df4796fd7dc13c285fb
+size 82736
diff --git a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerDeviceScreenTest_mediaPlayerSquare.png b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerDeviceScreenTest_mediaPlayerSquare.png
index 94ee0c87..e7316fc2 100644
--- a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerDeviceScreenTest_mediaPlayerSquare.png
+++ b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerDeviceScreenTest_mediaPlayerSquare.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7666587695391e6ff9bd8a7aa2adc0d458f9e7a5075501d6e162f8bd25140bbc
-size 53629
+oid sha256:2221efd7918e87a0843edd643aaaebb5e47cbf95905fd5b62fcc8bbfb5d203cb
+size 52872
diff --git a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerScreenTest_mediaPlayerScreen[0]_bluedefaultaecbfa.png b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerScreenTest_mediaPlayerScreen[0]_bluedefaultaecbfa.png
index 6c3f897d..0bc12ce5 100644
--- a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerScreenTest_mediaPlayerScreen[0]_bluedefaultaecbfa.png
+++ b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerScreenTest_mediaPlayerScreen[0]_bluedefaultaecbfa.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:334058cb920d5cdfa5976ae7e991c831b4a4b37fec68d51b21801cf3efdedccf
-size 117486
+oid sha256:cb5ad80fa4c9da35fc5bcfefcc1f984b9a810d6e073d8327d7799c3dc7de0adb
+size 126375
diff --git a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerScreenTest_mediaPlayerScreen[1]_blue7fcfff.png b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerScreenTest_mediaPlayerScreen[1]_blue7fcfff.png
index 7284563e..56d4a26d 100644
--- a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerScreenTest_mediaPlayerScreen[1]_blue7fcfff.png
+++ b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerScreenTest_mediaPlayerScreen[1]_blue7fcfff.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e147e9dacb23e24e20748c56cd709c8f9d177e20b5ae235544f87b562a387475
-size 115426
+oid sha256:e9f0c8724912340105399b61e7c98e6ab6db157786d8a67594e9abe40fce4278
+size 124041
diff --git a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerScreenTest_mediaPlayerScreen[2]_lilacd0bcff.png b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerScreenTest_mediaPlayerScreen[2]_lilacd0bcff.png
index 56fe85f6..38b7a4b2 100644
--- a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerScreenTest_mediaPlayerScreen[2]_lilacd0bcff.png
+++ b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerScreenTest_mediaPlayerScreen[2]_lilacd0bcff.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4adab18c9c90a442514484de4aa22a7e24611ed08a52434691468977a7704c50
-size 117117
+oid sha256:a524f5204f4250b8edd7390f874aea95463df25768b380ea15343264f555be51
+size 126974
diff --git a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerScreenTest_mediaPlayerScreen[3]_green6dd58c.png b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerScreenTest_mediaPlayerScreen[3]_green6dd58c.png
index d3d606d7..b7994d12 100644
--- a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerScreenTest_mediaPlayerScreen[3]_green6dd58c.png
+++ b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerScreenTest_mediaPlayerScreen[3]_green6dd58c.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f95547b98768b06a18c4919e30eb9a9e50c73d1a8af85432bc217869b8797b3a
-size 117348
+oid sha256:cb87ef29d1cd96f74dfc43973f538bf8609e4ecd14a1a2d9f9f44f3d495127e1
+size 119038
diff --git a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerScreenTest_mediaPlayerScreen[4]_bluewithtext7fcfff.png b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerScreenTest_mediaPlayerScreen[4]_bluewithtext7fcfff.png
index 8f6bb1b1..03000238 100644
--- a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerScreenTest_mediaPlayerScreen[4]_bluewithtext7fcfff.png
+++ b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerScreenTest_mediaPlayerScreen[4]_bluewithtext7fcfff.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0094a15636164147613eaa4352f1f1e9b0fcb04b25e31031cf04260e6cf5bc22
-size 115474
+oid sha256:e9e457be9f4753cec9948e5316fa3c97eade77a5813017bbf15adc842771943d
+size 124215
diff --git a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerScreenTest_mediaPlayerScreen[5]_orangey.png b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerScreenTest_mediaPlayerScreen[5]_orangey.png
index 97ca99f7..a0f4efdd 100644
--- a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerScreenTest_mediaPlayerScreen[5]_orangey.png
+++ b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerScreenTest_mediaPlayerScreen[5]_orangey.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3d4f5e622aaa0350b7257378e637dd892cff40b97b8edb4d73e6bf9b6900ba88
-size 116933
+oid sha256:eeb07f86fa69907473a9d77a1ab1185f7b38b7b9d11bb4eb96303b25547ffb68
+size 126504
diff --git a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerScreenTest_mediaPlayerScreen[6]_uamp.png b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerScreenTest_mediaPlayerScreen[6]_uamp.png
index cc188bb1..759dbfce 100644
--- a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerScreenTest_mediaPlayerScreen[6]_uamp.png
+++ b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerScreenTest_mediaPlayerScreen[6]_uamp.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0b8f6039ff0a486cf7884bc7e07b6667a21969273c134176196c84e207901316
-size 118100
+oid sha256:85cf6ce65073d7a7ee0ddf16d5a6f7f979429cfd4658220163be484eb739a15e
+size 107246
diff --git a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerStatesScreenTest_mediaPlayerScreen[0]_nomedia.png b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerStatesScreenTest_mediaPlayerScreen[0]_nomedia.png
index 2c3cd471..b9ae9d1a 100644
--- a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerStatesScreenTest_mediaPlayerScreen[0]_nomedia.png
+++ b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerStatesScreenTest_mediaPlayerScreen[0]_nomedia.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:85a49fa69a2ae518e84dd325cdd219df58c2e752abe3f9c9e5d429b23cb0d690
-size 112383
+oid sha256:05304391be9fd671a9cd575cc8c8000b22a2b0fd9588181efe1e4cd74b273e83
+size 122680
diff --git a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerStatesScreenTest_mediaPlayerScreen[1]_notconnected.png b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerStatesScreenTest_mediaPlayerScreen[1]_notconnected.png
index bfaa2877..98240afa 100644
--- a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerStatesScreenTest_mediaPlayerScreen[1]_notconnected.png
+++ b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerStatesScreenTest_mediaPlayerScreen[1]_notconnected.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e6b20b2bae174210d17a9d365e356841e3ad2901c5ca1d4a0fe64c36a47eb1ad
-size 113678
+oid sha256:5fe2f3453393e8d73c5708dcc17648f3b80b05b4f8604453c1d87742eb91265c
+size 125072
diff --git a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_PodcastPlayerScreenTest_mediaPlayerScreen[0]_seekbuttonincrement(unknown)_seekbuttonincrement(unknown).png b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_PodcastPlayerScreenTest_mediaPlayerScreen[0]_seekbuttonincrement(unknown)_seekbuttonincrement(unknown).png
index c042f02c..72786671 100644
--- a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_PodcastPlayerScreenTest_mediaPlayerScreen[0]_seekbuttonincrement(unknown)_seekbuttonincrement(unknown).png
+++ b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_PodcastPlayerScreenTest_mediaPlayerScreen[0]_seekbuttonincrement(unknown)_seekbuttonincrement(unknown).png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0f647d4cc3fa5925aa9f37b1d632e2808d784613c4b81be85eba1b81aab6a3c6
-size 116548
+oid sha256:95043442f05e14c0e1b4f5cfec8676ba56e5bff0431350d80e952ca971623170
+size 126013
diff --git a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_PodcastPlayerScreenTest_mediaPlayerScreen[1]_known(seconds=10)_known(seconds=10).png b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_PodcastPlayerScreenTest_mediaPlayerScreen[1]_known(seconds=10)_known(seconds=10).png
index c28b3c62..5984440b 100644
--- a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_PodcastPlayerScreenTest_mediaPlayerScreen[1]_known(seconds=10)_known(seconds=10).png
+++ b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_PodcastPlayerScreenTest_mediaPlayerScreen[1]_known(seconds=10)_known(seconds=10).png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:68df796ae1567dd6f6e37105495a7580e333a507c796059d550975f0f3498c85
-size 117224
+oid sha256:60be2fd8def39b432852499990e81a3dbc97978fddb07800fb46e9a950879f4a
+size 126286
diff --git a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_PodcastPlayerScreenTest_mediaPlayerScreen[2]_known(seconds=5)_known(seconds=30).png b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_PodcastPlayerScreenTest_mediaPlayerScreen[2]_known(seconds=5)_known(seconds=30).png
index a1677a72..8f227033 100644
--- a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_PodcastPlayerScreenTest_mediaPlayerScreen[2]_known(seconds=5)_known(seconds=30).png
+++ b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_PodcastPlayerScreenTest_mediaPlayerScreen[2]_known(seconds=5)_known(seconds=30).png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:20dc849a1012f5829fcbd87964328d366eb7688e91d9e7e1c07564d6ee1b5544
-size 117353
+oid sha256:a966fec19e364a0bb8d54cb073a7dad58f066ca6709bd88281ffe5908a308a89
+size 126386
diff --git a/roboscreenshots/api/current.api b/roboscreenshots/api/current.api
index 856a7145..a4dea355 100644
--- a/roboscreenshots/api/current.api
+++ b/roboscreenshots/api/current.api
@@ -126,7 +126,6 @@ package com.google.android.horologist.screenshots.rng {
   @org.junit.runner.RunWith(ParameterizedRobolectricTestRunner::class) public abstract class WearDeviceScreenshotTest extends com.google.android.horologist.screenshots.rng.WearScreenshotTest {
     ctor public WearDeviceScreenshotTest(com.google.android.horologist.screenshots.rng.WearDevice device);
     method @org.robolectric.ParameterizedRobolectricTestRunner.Parameters public static final java.util.List<com.google.android.horologist.screenshots.rng.WearDevice> devices();
-    method public com.google.android.horologist.screenshots.rng.WearDevice getDevice();
     method public final void runTest(kotlin.jvm.functions.Function0<kotlin.Unit> content);
     property public com.google.android.horologist.screenshots.rng.WearDevice device;
     property public float tolerance;
@@ -137,16 +136,44 @@ package com.google.android.horologist.screenshots.rng {
     method @org.robolectric.ParameterizedRobolectricTestRunner.Parameters public java.util.List<com.google.android.horologist.screenshots.rng.WearDevice> devices();
   }
 
-  @org.robolectric.annotation.Config(sdk={33}, qualifiers="w227dp-h227dp-small-notlong-round-watch-xhdpi-keyshidden-nonav") @org.robolectric.annotation.GraphicsMode(org.robolectric.annotation.GraphicsMode.Mode.NATIVE) public abstract class WearScreenshotTest {
+  @org.junit.runner.RunWith(AndroidJUnit4::class) @org.robolectric.annotation.Config(sdk={33}, qualifiers=com.github.takahirom.roborazzi.RobolectricDeviceQualifiers.WearOSLargeRound) @org.robolectric.annotation.GraphicsMode(org.robolectric.annotation.GraphicsMode.Mode.NATIVE) public abstract class WearLegacyComponentTest {
+    ctor public WearLegacyComponentTest();
+    method @androidx.compose.runtime.Composable public void ComponentScaffold(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method public com.google.android.horologist.screenshots.rng.WearDevice? getDevice();
+    method public com.google.android.horologist.images.coil.FakeImageLoader? getFakeImageLoader();
+    method @org.junit.Rule public final org.junit.rules.TestName getTestInfo();
+    method public float getTolerance();
+    method public final void runComponentTest(kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method public String testName(String suffix);
+    property public com.google.android.horologist.screenshots.rng.WearDevice? device;
+    property public com.google.android.horologist.images.coil.FakeImageLoader? fakeImageLoader;
+    property @org.junit.Rule public final org.junit.rules.TestName testInfo;
+    property public float tolerance;
+  }
+
+  public abstract class WearLegacyScreenTest extends com.google.android.horologist.screenshots.rng.WearScreenshotTest {
+    ctor public WearLegacyScreenTest();
+  }
+
+  @org.junit.runner.RunWith(AndroidJUnit4::class) @org.robolectric.annotation.Config(sdk={33}, qualifiers=com.github.takahirom.roborazzi.RobolectricDeviceQualifiers.WearOSLargeRound) @org.robolectric.annotation.GraphicsMode(org.robolectric.annotation.GraphicsMode.Mode.NATIVE) public abstract class WearScreenshotTest {
     ctor public WearScreenshotTest();
+    method @androidx.compose.runtime.Composable public void TestScaffold(kotlin.jvm.functions.Function0<kotlin.Unit> content);
     method public final void captureScreenshot(String suffix);
     method @org.junit.Rule public final androidx.compose.ui.test.junit4.ComposeContentTestRule getComposeRule();
-    method public abstract com.google.android.horologist.screenshots.rng.WearDevice getDevice();
+    method public com.google.android.horologist.screenshots.rng.WearDevice? getDevice();
+    method @org.junit.Rule public final org.junit.rules.TestName getTestInfo();
     method public float getTolerance();
-    method public final void runTest(optional String? suffix, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method public final void runTest(optional String? suffix, optional com.google.android.horologist.screenshots.rng.WearDevice? device, optional boolean applyDeviceConfig, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method public String testName(String suffix);
     property @org.junit.Rule public final androidx.compose.ui.test.junit4.ComposeContentTestRule composeRule;
-    property public abstract com.google.android.horologist.screenshots.rng.WearDevice device;
+    property public com.google.android.horologist.screenshots.rng.WearDevice? device;
+    property @org.junit.Rule public final org.junit.rules.TestName testInfo;
     property public float tolerance;
+    field public static final com.google.android.horologist.screenshots.rng.WearScreenshotTest.Companion Companion;
+  }
+
+  public static final class WearScreenshotTest.Companion {
+    method public void useHardwareRenderer();
   }
 
 }
diff --git a/roboscreenshots/build.gradle.kts b/roboscreenshots/build.gradle.kts
index 9cfa8fea..bb382ea2 100644
--- a/roboscreenshots/build.gradle.kts
+++ b/roboscreenshots/build.gradle.kts
@@ -101,9 +101,9 @@ dependencies {
     implementation(libs.wearcompose.material)
     implementation(libs.wearcompose.foundation)
 
-    implementation(libs.roborazzi)
-    implementation(libs.roborazzi.compose)
-    implementation(libs.roborazzi.rule)
+    api(libs.roborazzi)
+    api(libs.roborazzi.compose)
+    api(libs.roborazzi.rule)
 
     // TODO remove
     implementation(libs.snapshot.android)
diff --git a/roboscreenshots/src/main/java/com/google/android/horologist/screenshots/rng/WearDeviceScreenshotTest.kt b/roboscreenshots/src/main/java/com/google/android/horologist/screenshots/rng/WearDeviceScreenshotTest.kt
index 12b65a79..9d39bb03 100644
--- a/roboscreenshots/src/main/java/com/google/android/horologist/screenshots/rng/WearDeviceScreenshotTest.kt
+++ b/roboscreenshots/src/main/java/com/google/android/horologist/screenshots/rng/WearDeviceScreenshotTest.kt
@@ -21,16 +21,17 @@ import org.junit.runner.RunWith
 import org.robolectric.ParameterizedRobolectricTestRunner
 
 @RunWith(ParameterizedRobolectricTestRunner::class)
-public abstract class WearDeviceScreenshotTest(override val device: WearDevice) : WearScreenshotTest() {
-    public override val tolerance: Float = 0.02f
+public abstract class WearDeviceScreenshotTest(override val device: WearDevice) :
+    WearScreenshotTest() {
+        public override val tolerance: Float = 0.02f
 
-    public fun runTest(content: @Composable () -> Unit) {
-        runTest(suffix = null, content)
-    }
+        public fun runTest(content: @Composable () -> Unit) {
+            runTest(suffix = null, content = content)
+        }
 
-    public companion object {
-        @JvmStatic
-        @ParameterizedRobolectricTestRunner.Parameters
-        public fun devices(): List<WearDevice> = WearDevice.entries
+        public companion object {
+            @JvmStatic
+            @ParameterizedRobolectricTestRunner.Parameters
+            public fun devices(): List<WearDevice> = WearDevice.entries
+        }
     }
-}
diff --git a/roboscreenshots/src/main/java/com/google/android/horologist/screenshots/rng/WearLegacyComponentTest.kt b/roboscreenshots/src/main/java/com/google/android/horologist/screenshots/rng/WearLegacyComponentTest.kt
new file mode 100644
index 00000000..74a9d3bd
--- /dev/null
+++ b/roboscreenshots/src/main/java/com/google/android/horologist/screenshots/rng/WearLegacyComponentTest.kt
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@file:OptIn(ExperimentalRoborazziApi::class)
+
+package com.google.android.horologist.screenshots.rng
+
+import androidx.compose.runtime.Composable
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.github.takahirom.roborazzi.ExperimentalRoborazziApi
+import com.github.takahirom.roborazzi.RobolectricDeviceQualifiers
+import com.github.takahirom.roborazzi.RoborazziOptions
+import com.github.takahirom.roborazzi.ThresholdValidator
+import com.github.takahirom.roborazzi.captureRoboImage
+import com.google.android.horologist.images.coil.FakeImageLoader
+import com.google.android.horologist.screenshots.rng.WearScreenshotTest.Companion.useHardwareRenderer
+import org.junit.Rule
+import org.junit.rules.TestName
+import org.junit.runner.RunWith
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.annotation.Config
+import org.robolectric.annotation.GraphicsMode
+
+@Config(
+    sdk = [33],
+    qualifiers = RobolectricDeviceQualifiers.WearOSLargeRound,
+)
+@RunWith(AndroidJUnit4::class)
+@GraphicsMode(GraphicsMode.Mode.NATIVE)
+public abstract class WearLegacyComponentTest {
+
+    @get:Rule
+    public val testInfo: TestName = TestName()
+
+    public open val fakeImageLoader: FakeImageLoader? = null
+
+    public open fun testName(suffix: String): String =
+        "src/test/snapshots/images/${this.javaClass.`package`?.name}_${this.javaClass.simpleName}_${testInfo.methodName}.png"
+
+    public open val device: WearDevice? = null
+
+    // Allow for individual tolerances to be set on each test, should be between 0.0 and 1.0
+    public open val tolerance: Float = 0.0f
+
+    public fun runComponentTest(
+        content: @Composable () -> Unit,
+    ) {
+        device?.let {
+            RuntimeEnvironment.setQualifiers("+w${it.dp}dp-h${it.dp}dp")
+            RuntimeEnvironment.setFontScale(it.fontScale)
+        }
+        captureRoboImage(
+            filePath = testName(""),
+            roborazziOptions = RoborazziOptions(
+                recordOptions = RoborazziOptions.RecordOptions(
+                    applyDeviceCrop = false,
+                ),
+                compareOptions = RoborazziOptions.CompareOptions(
+                    resultValidator = ThresholdValidator(tolerance),
+                ),
+            ),
+        ) {
+            ComponentScaffold {
+                content()
+            }
+        }
+    }
+
+    @Composable
+    public open fun ComponentScaffold(content: @Composable () -> Unit) {
+        content()
+    }
+
+    internal companion object {
+        init {
+            useHardwareRenderer()
+        }
+    }
+}
diff --git a/roboscreenshots/src/main/java/com/google/android/horologist/screenshots/rng/WearLegacyScreenTest.kt b/roboscreenshots/src/main/java/com/google/android/horologist/screenshots/rng/WearLegacyScreenTest.kt
new file mode 100644
index 00000000..66fbc104
--- /dev/null
+++ b/roboscreenshots/src/main/java/com/google/android/horologist/screenshots/rng/WearLegacyScreenTest.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.horologist.screenshots.rng
+
+public abstract class WearLegacyScreenTest : WearScreenshotTest() {
+
+    override fun testName(suffix: String): String =
+        "src/test/snapshots/images/${this.javaClass.`package`?.name}_${this.javaClass.simpleName}_${testInfo.methodName}.png"
+}
diff --git a/roboscreenshots/src/main/java/com/google/android/horologist/screenshots/rng/WearScreenshotTest.kt b/roboscreenshots/src/main/java/com/google/android/horologist/screenshots/rng/WearScreenshotTest.kt
index d9fe22e1..18b0b6e6 100644
--- a/roboscreenshots/src/main/java/com/google/android/horologist/screenshots/rng/WearScreenshotTest.kt
+++ b/roboscreenshots/src/main/java/com/google/android/horologist/screenshots/rng/WearScreenshotTest.kt
@@ -19,53 +19,68 @@
 package com.google.android.horologist.screenshots.rng
 
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.test.junit4.ComposeContentTestRule
 import androidx.compose.ui.test.junit4.createComposeRule
-import androidx.compose.ui.test.onRoot
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.wear.compose.material.MaterialTheme
 import com.github.takahirom.roborazzi.ExperimentalRoborazziApi
+import com.github.takahirom.roborazzi.RobolectricDeviceQualifiers
 import com.github.takahirom.roborazzi.RoborazziOptions
 import com.github.takahirom.roborazzi.ThresholdValidator
-import com.github.takahirom.roborazzi.captureRoboImage
+import com.github.takahirom.roborazzi.captureScreenRoboImage
+import com.google.android.horologist.compose.layout.AppScaffold
+import com.google.android.horologist.compose.layout.ResponsiveTimeText
+import com.google.android.horologist.screenshots.FixedTimeSource
 import org.junit.Rule
+import org.junit.rules.TestName
+import org.junit.runner.RunWith
 import org.robolectric.RuntimeEnvironment
 import org.robolectric.annotation.Config
 import org.robolectric.annotation.GraphicsMode
 
 @Config(
     sdk = [33],
-    qualifiers = "w227dp-h227dp-small-notlong-round-watch-xhdpi-keyshidden-nonav",
+    qualifiers = RobolectricDeviceQualifiers.WearOSLargeRound,
 )
+@RunWith(AndroidJUnit4::class)
 @GraphicsMode(GraphicsMode.Mode.NATIVE)
 public abstract class WearScreenshotTest {
     @get:Rule
     public val composeRule: ComposeContentTestRule = createComposeRule()
 
-    public abstract val device: WearDevice
+    @get:Rule
+    public val testInfo: TestName = TestName()
+
+    public open val device: WearDevice? = null
 
     // Allow for individual tolerances to be set on each test, should be between 0.0 and 1.0
     public open val tolerance: Float = 0.0f
 
-    public fun runTest(suffix: String? = null, content: @Composable () -> Unit) {
-        RuntimeEnvironment.setQualifiers("+w${device.dp}dp-h${device.dp}dp")
-        RuntimeEnvironment.setFontScale(device.fontScale)
+    public fun runTest(
+        suffix: String? = null,
+        device: WearDevice? = this.device,
+        applyDeviceConfig: Boolean = true,
+        content: @Composable () -> Unit,
+    ) {
+        if (applyDeviceConfig && device != null) {
+            RuntimeEnvironment.setQualifiers("+w${device.dp}dp-h${device.dp}dp")
+            RuntimeEnvironment.setFontScale(device.fontScale)
+        }
 
         composeRule.setContent {
-            Box(modifier = Modifier.fillMaxSize().background(MaterialTheme.colors.background)) {
+            TestScaffold {
                 content()
             }
         }
-
         captureScreenshot(suffix.orEmpty())
     }
 
     public fun captureScreenshot(suffix: String) {
-        composeRule.onRoot().captureRoboImage(
-            filePath = "src/test/screenshots/${this.javaClass.simpleName}_${device.id}$suffix.png",
+        captureScreenRoboImage(
+            filePath = testName(suffix),
             roborazziOptions = RoborazziOptions(
                 recordOptions = RoborazziOptions.RecordOptions(
                     applyDeviceCrop = true,
@@ -76,4 +91,31 @@ public abstract class WearScreenshotTest {
             ),
         )
     }
+
+    @Composable
+    public open fun TestScaffold(content: @Composable () -> Unit) {
+        AppScaffold(
+            modifier = Modifier
+                .fillMaxSize()
+                .background(MaterialTheme.colors.background),
+            timeText = { ResponsiveTimeText(timeSource = FixedTimeSource) },
+        ) {
+            content()
+        }
+    }
+
+    public open fun testName(suffix: String): String =
+        "src/test/screenshots/${this.javaClass.simpleName}_${device?.id ?: WearDevice.GenericLargeRound.id}$suffix.png"
+
+    public companion object {
+        internal const val USE_HARDWARE_RENDERER_NATIVE_ENV = "robolectric.screenshot.hwrdr.native"
+
+        init {
+            useHardwareRenderer()
+        }
+
+        public fun useHardwareRenderer() {
+            System.setProperty(USE_HARDWARE_RENDERER_NATIVE_ENV, "true")
+        }
+    }
 }
diff --git a/sample/src/test/kotlin/com/google/android/horologist/screensizes/AuthSignInTest.kt b/sample/src/test/kotlin/com/google/android/horologist/screensizes/AuthSignInTest.kt
index 68f20550..335d0928 100644
--- a/sample/src/test/kotlin/com/google/android/horologist/screensizes/AuthSignInTest.kt
+++ b/sample/src/test/kotlin/com/google/android/horologist/screensizes/AuthSignInTest.kt
@@ -25,7 +25,7 @@ import com.google.android.horologist.auth.ui.common.screens.prompt.SignInPromptS
 import com.google.android.horologist.compose.layout.ScalingLazyColumnDefaults
 import com.google.android.horologist.compose.tools.Device
 
-class AuthSignInTest(device: Device) : ScreenSizeTest(device = device, showTimeText = false) {
+class AuthSignInTest(device: Device) : WearLegacyScreenSizeTest(device = device, showTimeText = false) {
 
     @Composable
     override fun Content() {
diff --git a/sample/src/test/kotlin/com/google/android/horologist/screensizes/DatePickerTest.kt b/sample/src/test/kotlin/com/google/android/horologist/screensizes/DatePickerTest.kt
index db3e70cc..3a7887f5 100644
--- a/sample/src/test/kotlin/com/google/android/horologist/screensizes/DatePickerTest.kt
+++ b/sample/src/test/kotlin/com/google/android/horologist/screensizes/DatePickerTest.kt
@@ -22,7 +22,7 @@ import com.google.android.horologist.compose.tools.Device
 import org.junit.Test
 import java.time.LocalDate
 
-class DatePickerTest(device: Device) : ScreenSizeTest(device = device, showTimeText = false) {
+class DatePickerTest(device: Device) : WearLegacyScreenSizeTest(device = device, showTimeText = false) {
 
     private val date: LocalDate = LocalDate.of(2022, 4, 25)
 
diff --git a/sample/src/test/kotlin/com/google/android/horologist/screensizes/DevicesTest.kt b/sample/src/test/kotlin/com/google/android/horologist/screensizes/DevicesTest.kt
index c55a9e99..1605cb1f 100644
--- a/sample/src/test/kotlin/com/google/android/horologist/screensizes/DevicesTest.kt
+++ b/sample/src/test/kotlin/com/google/android/horologist/screensizes/DevicesTest.kt
@@ -36,7 +36,7 @@ import androidx.wear.compose.material.MaterialTheme
 import androidx.wear.compose.material.Text
 import com.google.android.horologist.compose.tools.Device
 
-class DevicesTest(device: Device) : ScreenSizeTest(device = device, showTimeText = true) {
+class DevicesTest(device: Device) : WearLegacyScreenSizeTest(device = device, showTimeText = true) {
 
     @Composable
     override fun Content() {
@@ -83,10 +83,17 @@ fun ScreenSizeInfo(device: Device) {
             "isScreenRound: ${configuration.isScreenRound}",
             style = MaterialTheme.typography.body2,
         )
-        Text(
-            "screenSizePx: ${displayMetrics.widthPixels}x${displayMetrics.heightPixels}",
-            style = MaterialTheme.typography.body2,
-        )
+        if (device.density == 2f) {
+            Text(
+                "screenSizePx: ${displayMetrics.widthPixels}x${displayMetrics.heightPixels}",
+                style = MaterialTheme.typography.body2,
+            )
+        } else {
+            Text(
+                "screenSizePx:",
+                style = MaterialTheme.typography.body2,
+            )
+        }
         Text(
             "screenSizeDp: ${configuration.screenWidthDp}x${configuration.screenHeightDp}",
             style = MaterialTheme.typography.body2,
diff --git a/sample/src/test/kotlin/com/google/android/horologist/screensizes/DialogTest.kt b/sample/src/test/kotlin/com/google/android/horologist/screensizes/DialogTest.kt
index 07805198..41d5c906 100644
--- a/sample/src/test/kotlin/com/google/android/horologist/screensizes/DialogTest.kt
+++ b/sample/src/test/kotlin/com/google/android/horologist/screensizes/DialogTest.kt
@@ -43,10 +43,9 @@ import com.google.android.horologist.compose.material.ConfirmationContent
 import com.google.android.horologist.compose.material.ToggleChip
 import com.google.android.horologist.compose.material.ToggleChipToggleControl
 import com.google.android.horologist.compose.tools.Device
-import kotlinx.coroutines.runBlocking
 import org.junit.Test
 
-class DialogTest(device: Device) : ScreenSizeTest(
+class DialogTest(device: Device) : WearLegacyScreenSizeTest(
     device = device,
     showTimeText = false,
 ) {
@@ -92,14 +91,7 @@ class DialogTest(device: Device) : ScreenSizeTest(
 
     @Test
     fun longDialogScreen1() {
-        runTest(testFn = {
-            screenshotTestRule.interact {
-                onNode(hasScrollToNodeAction())
-                    .performTouchInput { repeat(10) { swipeUp() } }
-            }
-
-            screenshotTestRule.takeScreenshot()
-        }) {
+        runTest {
             AlertContent(
                 title = "Turn on Bedtime mode?",
                 message = "Watch screen, tilt-to-wake, and touch are turned off. " +
@@ -120,20 +112,16 @@ class DialogTest(device: Device) : ScreenSizeTest(
                 }
             }
         }
+
+        composeRule.onNode(hasScrollToNodeAction())
+            .performTouchInput { repeat(10) { swipeUp() } }
+
+        captureScreenshot("_2")
     }
 
     @Test
     fun batterySaverScreen() {
-        runTest(testFn = {
-            screenshotTestRule.interact {
-                runBlocking {
-                    onNode(hasScrollToNodeAction())
-                        .performTouchInput { repeat(10) { swipeUp() } }
-                }
-            }
-
-            screenshotTestRule.takeScreenshot()
-        }) {
+        runTest {
             AlertContent(
                 icon = {
                     Icon(
@@ -173,6 +161,11 @@ class DialogTest(device: Device) : ScreenSizeTest(
                 }
             }
         }
+
+        composeRule.onNode(hasScrollToNodeAction())
+            .performTouchInput { repeat(10) { swipeUp() } }
+
+        captureScreenshot("_2")
     }
 
     @Test
diff --git a/sample/src/test/kotlin/com/google/android/horologist/screensizes/MediaPlayerLibraryTest.kt b/sample/src/test/kotlin/com/google/android/horologist/screensizes/MediaPlayerLibraryTest.kt
index 3af0b40b..98cc347d 100644
--- a/sample/src/test/kotlin/com/google/android/horologist/screensizes/MediaPlayerLibraryTest.kt
+++ b/sample/src/test/kotlin/com/google/android/horologist/screensizes/MediaPlayerLibraryTest.kt
@@ -42,7 +42,7 @@ import com.google.android.horologist.media.ui.state.model.DownloadMediaUiModel
 import com.google.android.horologist.media.ui.state.model.PlaylistUiModel
 import com.google.android.horologist.screenshots.FixedTimeSource
 
-class MediaPlayerLibraryTest(device: Device) : ScreenSizeTest(device = device, showTimeText = false) {
+class MediaPlayerLibraryTest(device: Device) : WearLegacyScreenSizeTest(device = device, showTimeText = false) {
 
     @Composable
     override fun Content() {
diff --git a/sample/src/test/kotlin/com/google/android/horologist/screensizes/MediaPlayerTest.kt b/sample/src/test/kotlin/com/google/android/horologist/screensizes/MediaPlayerTest.kt
index e6d623aa..25f385a5 100644
--- a/sample/src/test/kotlin/com/google/android/horologist/screensizes/MediaPlayerTest.kt
+++ b/sample/src/test/kotlin/com/google/android/horologist/screensizes/MediaPlayerTest.kt
@@ -46,7 +46,7 @@ import com.google.android.horologist.media.ui.state.model.TrackPositionUiModel
 import kotlinx.coroutines.flow.flowOf
 import kotlin.time.Duration.Companion.seconds
 
-class MediaPlayerTest(device: Device) : ScreenSizeTest(
+class MediaPlayerTest(device: Device) : WearLegacyScreenSizeTest(
     device = device,
     showTimeText = true,
 ) {
diff --git a/sample/src/test/kotlin/com/google/android/horologist/screensizes/SampleTileTest.kt b/sample/src/test/kotlin/com/google/android/horologist/screensizes/SampleTileTest.kt
index edd81b00..43769898 100644
--- a/sample/src/test/kotlin/com/google/android/horologist/screensizes/SampleTileTest.kt
+++ b/sample/src/test/kotlin/com/google/android/horologist/screensizes/SampleTileTest.kt
@@ -30,7 +30,7 @@ import com.google.android.horologist.media.ui.tiles.toTileColors
 import com.google.android.horologist.media.ui.uamp.UampColors
 import com.google.android.horologist.tiles.images.drawableResToImageResource
 
-class SampleTileTest(device: Device) : ScreenSizeTest(device = device, showTimeText = false) {
+class SampleTileTest(device: Device) : WearLegacyScreenSizeTest(device = device, showTimeText = false) {
 
     @Composable
     override fun Content() {
diff --git a/sample/src/test/kotlin/com/google/android/horologist/screensizes/ScalingLazyColumnDefaultsTest.kt b/sample/src/test/kotlin/com/google/android/horologist/screensizes/ScalingLazyColumnDefaultsTest.kt
index 92eafe0c..0b37423a 100644
--- a/sample/src/test/kotlin/com/google/android/horologist/screensizes/ScalingLazyColumnDefaultsTest.kt
+++ b/sample/src/test/kotlin/com/google/android/horologist/screensizes/ScalingLazyColumnDefaultsTest.kt
@@ -38,7 +38,7 @@ import com.google.android.horologist.sample.Screen
 import org.junit.Test
 
 class ScalingLazyColumnDefaultsTest(device: Device) :
-    ScreenSizeTest(
+    WearLegacyScreenSizeTest(
         device = device,
         showTimeText = false,
     ) {
diff --git a/sample/src/test/kotlin/com/google/android/horologist/screensizes/SectionedListDefaultTest.kt b/sample/src/test/kotlin/com/google/android/horologist/screensizes/SectionedListDefaultTest.kt
index 8000fb65..cc565a89 100644
--- a/sample/src/test/kotlin/com/google/android/horologist/screensizes/SectionedListDefaultTest.kt
+++ b/sample/src/test/kotlin/com/google/android/horologist/screensizes/SectionedListDefaultTest.kt
@@ -21,7 +21,7 @@ import com.google.android.horologist.compose.layout.ScalingLazyColumnDefaults
 import com.google.android.horologist.compose.tools.Device
 import com.google.android.horologist.sectionedlist.SectionedListMenuScreen
 
-class SectionedListDefaultTest(device: Device) : ScreenSizeTest(device = device, showTimeText = false) {
+class SectionedListDefaultTest(device: Device) : WearLegacyScreenSizeTest(device = device, showTimeText = false) {
 
     @Composable
     override fun Content() {
diff --git a/sample/src/test/kotlin/com/google/android/horologist/screensizes/SectionedListTest.kt b/sample/src/test/kotlin/com/google/android/horologist/screensizes/SectionedListTest.kt
index 8f6439d9..be118cf5 100644
--- a/sample/src/test/kotlin/com/google/android/horologist/screensizes/SectionedListTest.kt
+++ b/sample/src/test/kotlin/com/google/android/horologist/screensizes/SectionedListTest.kt
@@ -31,7 +31,7 @@ import com.google.android.horologist.compose.tools.Device
 import com.google.android.horologist.screenshots.FixedTimeSource
 import com.google.android.horologist.sectionedlist.SectionedListMenuScreen
 
-class SectionedListTest(device: Device) : ScreenSizeTest(device = device, showTimeText = false) {
+class SectionedListTest(device: Device) : WearLegacyScreenSizeTest(device = device, showTimeText = false) {
 
     @Composable
     override fun Content() {
diff --git a/sample/src/test/kotlin/com/google/android/horologist/screensizes/TimePicker12Test.kt b/sample/src/test/kotlin/com/google/android/horologist/screensizes/TimePicker12Test.kt
index 79b3eada..7588dbc7 100644
--- a/sample/src/test/kotlin/com/google/android/horologist/screensizes/TimePicker12Test.kt
+++ b/sample/src/test/kotlin/com/google/android/horologist/screensizes/TimePicker12Test.kt
@@ -21,7 +21,7 @@ import com.google.android.horologist.composables.TimePickerWith12HourClock
 import com.google.android.horologist.compose.tools.Device
 import java.time.LocalTime
 
-class TimePicker12Test(device: Device) : ScreenSizeTest(device = device, showTimeText = false) {
+class TimePicker12Test(device: Device) : WearLegacyScreenSizeTest(device = device, showTimeText = false) {
 
     @Composable
     override fun Content() {
diff --git a/sample/src/test/kotlin/com/google/android/horologist/screensizes/TimePickerTest.kt b/sample/src/test/kotlin/com/google/android/horologist/screensizes/TimePickerTest.kt
index 1e2492a7..fabd820d 100644
--- a/sample/src/test/kotlin/com/google/android/horologist/screensizes/TimePickerTest.kt
+++ b/sample/src/test/kotlin/com/google/android/horologist/screensizes/TimePickerTest.kt
@@ -21,7 +21,7 @@ import com.google.android.horologist.composables.TimePicker
 import com.google.android.horologist.compose.tools.Device
 import java.time.LocalTime
 
-class TimePickerTest(device: Device) : ScreenSizeTest(device = device, showTimeText = false) {
+class TimePickerTest(device: Device) : WearLegacyScreenSizeTest(device = device, showTimeText = false) {
 
     @Composable
     override fun Content() {
diff --git a/sample/src/test/kotlin/com/google/android/horologist/screensizes/VolumeScreenTest.kt b/sample/src/test/kotlin/com/google/android/horologist/screensizes/VolumeScreenTest.kt
index ea01140b..5056cf38 100644
--- a/sample/src/test/kotlin/com/google/android/horologist/screensizes/VolumeScreenTest.kt
+++ b/sample/src/test/kotlin/com/google/android/horologist/screensizes/VolumeScreenTest.kt
@@ -26,7 +26,7 @@ import com.google.android.horologist.audio.ui.components.toAudioOutputUi
 import com.google.android.horologist.audio.ui.mapper.VolumeUiStateMapper
 import com.google.android.horologist.compose.tools.Device
 
-class VolumeScreenTest(device: Device) : ScreenSizeTest(device = device, showTimeText = false) {
+class VolumeScreenTest(device: Device) : WearLegacyScreenSizeTest(device = device, showTimeText = false) {
 
     @Composable
     override fun Content() {
diff --git a/sample/src/test/kotlin/com/google/android/horologist/screensizes/ScreenSizeTest.kt b/sample/src/test/kotlin/com/google/android/horologist/screensizes/WearLegacyScreenSizeTest.kt
index 96b9b385..54118306 100644
--- a/sample/src/test/kotlin/com/google/android/horologist/screensizes/ScreenSizeTest.kt
+++ b/sample/src/test/kotlin/com/google/android/horologist/screensizes/WearLegacyScreenSizeTest.kt
@@ -15,15 +15,28 @@
  */
 
 @file:Suppress("DEPRECATION")
+@file:OptIn(ExperimentalRoborazziApi::class)
 
 package com.google.android.horologist.screensizes
 
 import android.content.Context
 import android.content.res.Configuration
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.test.junit4.ComposeContentTestRule
+import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.text.font.FontWeight
 import androidx.test.core.app.ApplicationProvider
 import androidx.wear.compose.material.MaterialTheme
+import com.github.takahirom.roborazzi.ExperimentalRoborazziApi
+import com.github.takahirom.roborazzi.RobolectricDeviceQualifiers
+import com.github.takahirom.roborazzi.RoborazziOptions
+import com.github.takahirom.roborazzi.ThresholdValidator
+import com.github.takahirom.roborazzi.captureScreenRoboImage
 import com.google.android.horologist.compose.tools.Device
 import com.google.android.horologist.compose.tools.GenericLargeRound
 import com.google.android.horologist.compose.tools.GenericSmallRound
@@ -32,40 +45,54 @@ import com.google.android.horologist.compose.tools.MobvoiTicWatchPro5
 import com.google.android.horologist.compose.tools.SamsungGalaxyWatch5
 import com.google.android.horologist.compose.tools.SamsungGalaxyWatch6Large
 import com.google.android.horologist.compose.tools.copy
-import com.google.android.horologist.screenshots.ScreenshotBaseTest
-import com.google.android.horologist.screenshots.ScreenshotTestRule
-import com.google.android.horologist.screenshots.ScreenshotTestRule.Companion.screenshotTestRuleParams
-import com.google.android.horologist.screenshots.ScreenshotTestRule.RecordMode.Companion.defaultRecordMode
+import com.google.android.horologist.screenshots.rng.WearScreenshotTest.Companion.useHardwareRenderer
+import org.junit.Rule
 import org.junit.Test
+import org.junit.rules.TestName
 import org.junit.runner.RunWith
 import org.robolectric.ParameterizedRobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
 import org.robolectric.Shadows
+import org.robolectric.annotation.Config
+import org.robolectric.annotation.GraphicsMode
 import org.robolectric.shadows.ShadowDisplay
 
+@Config(
+    sdk = [33],
+    qualifiers = RobolectricDeviceQualifiers.WearOSLargeRound,
+)
 @RunWith(ParameterizedRobolectricTestRunner::class)
-abstract class ScreenSizeTest(
+@GraphicsMode(GraphicsMode.Mode.NATIVE)
+abstract class WearLegacyScreenSizeTest(
     val device: Device,
     val showTimeText: Boolean,
-    recordMode: ScreenshotTestRule.RecordMode = defaultRecordMode(),
-) : ScreenshotBaseTest(
-    screenshotTestRuleParams {
-        if (!showTimeText) {
-            screenTimeText = { }
-        }
-        testLabel = device.name.lowercase().replace("\\W+".toRegex(), "")
-        record = recordMode
-    },
 ) {
+    @get:Rule
+    public val composeRule: ComposeContentTestRule = createComposeRule()
+
     @Composable
     abstract fun Content()
 
+    @get:Rule
+    public val testInfo: TestName = TestName()
+
+    // Allow for individual tolerances to be set on each test, should be between 0.0 and 1.0
+    public open val tolerance: Float = 0.0f
+
     @Test
     fun screenshot() {
         runTest { Content() }
     }
 
-    fun runTest(testFn: () -> Unit = {}, preScreenshotInteractions: (() -> Unit)? = null, content: @Composable () -> Unit) {
+    fun testName(suffix: String): String =
+        "src/test/snapshots/images/${this.javaClass.`package`?.name}_${this.javaClass.simpleName}_${testInfo.methodName}_${
+            device.name.lowercase().replace("\\W+".toRegex(), "")
+        }$suffix.png"
+
+    fun runTest(
+        capture: Boolean = true,
+        content: @Composable () -> Unit,
+    ) {
         val shadowDisplay = Shadows.shadowOf(ShadowDisplay.getDefaultDisplay())
         shadowDisplay.setDensity(device.density)
         shadowDisplay.setHeight(device.screenSizePx)
@@ -76,21 +103,38 @@ abstract class ScreenSizeTest(
 
         ApplicationProvider.getApplicationContext<Context>().setDisplayScale(device.density)
 
-        screenshotTestRule.setContent(takeScreenshot = preScreenshotInteractions == null) {
-            MaterialTheme(
-                typography = MaterialTheme.typography.copy {
-                    this.copy(fontWeight = if (device.boldText) FontWeight.Bold else FontWeight.Medium)
-                },
-                content = content,
-            )
+        composeRule.setContent {
+            Box(
+                modifier = Modifier
+                    .fillMaxSize()
+                    .background(Color.Black),
+            ) {
+                MaterialTheme(
+                    typography = MaterialTheme.typography.copy {
+                        this.copy(fontWeight = if (device.boldText) FontWeight.Bold else FontWeight.Medium)
+                    },
+                    content = content,
+                )
+            }
         }
 
-        if (preScreenshotInteractions != null) {
-            preScreenshotInteractions()
-            screenshotTestRule.takeScreenshot()
+        if (capture) {
+            captureScreenshot("")
         }
+    }
 
-        testFn()
+    public fun captureScreenshot(suffix: String = "") {
+        captureScreenRoboImage(
+            filePath = testName(suffix),
+            roborazziOptions = RoborazziOptions(
+                recordOptions = RoborazziOptions.RecordOptions(
+                    applyDeviceCrop = true,
+                ),
+                compareOptions = RoborazziOptions.CompareOptions(
+                    resultValidator = ThresholdValidator(tolerance),
+                ),
+            ),
+        )
     }
 
     companion object {
@@ -118,5 +162,9 @@ abstract class ScreenSizeTest(
                 resources.displayMetrics,
             )
         }
+
+        init {
+            useHardwareRenderer()
+        }
     }
 }
diff --git a/sample/src/test/kotlin/com/google/android/horologist/spec/ScalingLazyColumnExamplesTest.kt b/sample/src/test/kotlin/com/google/android/horologist/spec/ScalingLazyColumnExamplesTest.kt
index abfc9582..09ff9595 100644
--- a/sample/src/test/kotlin/com/google/android/horologist/spec/ScalingLazyColumnExamplesTest.kt
+++ b/sample/src/test/kotlin/com/google/android/horologist/spec/ScalingLazyColumnExamplesTest.kt
@@ -22,11 +22,11 @@ import androidx.compose.ui.test.performScrollToIndex
 import androidx.compose.ui.test.performTouchInput
 import androidx.compose.ui.test.swipeUp
 import com.google.android.horologist.compose.tools.Device
-import com.google.android.horologist.screensizes.ScreenSizeTest
+import com.google.android.horologist.screensizes.WearLegacyScreenSizeTest
 import org.junit.Assume.assumeFalse
 import org.junit.Test
 
-class ScalingLazyColumnExamplesTest(device: Device) : ScreenSizeTest(
+class ScalingLazyColumnExamplesTest(device: Device) : WearLegacyScreenSizeTest(
     device = device,
     showTimeText = false,
 ) {
@@ -108,73 +108,71 @@ class ScalingLazyColumnExamplesTest(device: Device) : ScreenSizeTest(
 
     @Test
     fun bottom1Button() {
-        runTest(preScreenshotInteractions = {
-            scrollToBottom(5)
-        }) {
+        runTest {
             Bottom1Button()
         }
+        scrollToBottom(5)
+        captureScreenshot()
     }
 
     @Test
     fun bottom2Buttons() {
-        runTest(preScreenshotInteractions = {
-            scrollToBottom(5)
-        }) {
+        runTest {
             Bottom2Buttons()
         }
+        scrollToBottom(5)
+        captureScreenshot()
     }
 
     @Test
     fun bottom3Buttons() {
-        runTest(preScreenshotInteractions = {
-            scrollToBottom(5)
-        }) {
+        runTest {
             Bottom3Buttons()
         }
+        scrollToBottom(5)
+        captureScreenshot()
     }
 
     @Test
     fun bottomOtherChips() {
-        runTest(preScreenshotInteractions = {
-            scrollToBottom(4)
-        }) {
+        runTest {
             BottomOtherChips()
         }
+        scrollToBottom(4)
+        captureScreenshot()
     }
 
     @Test
     fun bottomOtherCards() {
-        runTest(preScreenshotInteractions = {
-            scrollToBottom(1)
-        }) {
+        runTest {
             BottomOtherCards()
         }
+        scrollToBottom(1)
+        captureScreenshot()
     }
 
     @Test
     fun bottomUnspecified() {
-        runTest(preScreenshotInteractions = {
-            scrollToBottom(1)
-        }) {
+        runTest {
             BottomUnspecified()
         }
+        scrollToBottom(1)
+        captureScreenshot()
     }
 
     @Test
     fun bottomOtherText() {
-        runTest(preScreenshotInteractions = {
-            scrollToBottom(3)
-        }) {
+        runTest {
             BottomOtherText()
         }
+        scrollToBottom(3)
+        captureScreenshot()
     }
 
     private fun scrollToBottom(index: Int) {
-        screenshotTestRule.interact {
-            onNode(hasScrollToNodeAction())
-                .performScrollToIndex(index)
-                .performTouchInput { swipeUp() }
-        }
+        composeRule.onNode(hasScrollToNodeAction())
+            .performScrollToIndex(index)
+            .performTouchInput { swipeUp() }
     }
 
     @Test
diff --git a/sample/src/test/screenshots/SelectAccountScreenTest_galaxy_watch_5.png b/sample/src/test/screenshots/SelectAccountScreenTest_galaxy_watch_5.png
index 2a56d95b..82300c52 100644
--- a/sample/src/test/screenshots/SelectAccountScreenTest_galaxy_watch_5.png
+++ b/sample/src/test/screenshots/SelectAccountScreenTest_galaxy_watch_5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0e706ae33ce261aa50d1996fc653a49b0e9f88df74b6ffb5256091f69d9e1b75
-size 23212
+oid sha256:8e0819a1048304b45b69c80194ef34463573d63b838512072a9fb42e817f82b8
+size 27615
diff --git a/sample/src/test/screenshots/SelectAccountScreenTest_galaxy_watch_6.png b/sample/src/test/screenshots/SelectAccountScreenTest_galaxy_watch_6.png
index a44171de..8157a52a 100644
--- a/sample/src/test/screenshots/SelectAccountScreenTest_galaxy_watch_6.png
+++ b/sample/src/test/screenshots/SelectAccountScreenTest_galaxy_watch_6.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8f72db414afedd67a43f0bfcbb5b02b2b6ffff75314db83b86772c0afe1b430d
-size 25187
+oid sha256:7137605333930680696c79760e283f529d78ecb6eda0f1c8600cfe0fd16815ab
+size 29607
diff --git a/sample/src/test/screenshots/SelectAccountScreenTest_galaxy_watch_6_small_font.png b/sample/src/test/screenshots/SelectAccountScreenTest_galaxy_watch_6_small_font.png
index bf388f54..11ee77af 100644
--- a/sample/src/test/screenshots/SelectAccountScreenTest_galaxy_watch_6_small_font.png
+++ b/sample/src/test/screenshots/SelectAccountScreenTest_galaxy_watch_6_small_font.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:828fed7b45118ef6d41ef25cb4966268d202bd2e10562a2ba6169fad4ffbcd0c
-size 24320
+oid sha256:d9d37f1e0e0f11324d27d98c5372fefd2a98a926353f6b4ee5455ed28a6df7e7
+size 28398
diff --git a/sample/src/test/screenshots/SelectAccountScreenTest_large_round.png b/sample/src/test/screenshots/SelectAccountScreenTest_large_round.png
index 5a1910f9..34673c67 100644
--- a/sample/src/test/screenshots/SelectAccountScreenTest_large_round.png
+++ b/sample/src/test/screenshots/SelectAccountScreenTest_large_round.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d1a460225724aba04654e209c04eddc3457a18fce0e4859b2cc930e73dcf4bc0
-size 25247
+oid sha256:2b30df4f74663acbd2618d1314beb1f2386438bb108db88b0e4268e92dc1ee62
+size 29667
diff --git a/sample/src/test/screenshots/SelectAccountScreenTest_pixel_watch.png b/sample/src/test/screenshots/SelectAccountScreenTest_pixel_watch.png
index bb0d4223..16ca0cf1 100644
--- a/sample/src/test/screenshots/SelectAccountScreenTest_pixel_watch.png
+++ b/sample/src/test/screenshots/SelectAccountScreenTest_pixel_watch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:98d66b9c37aa5186527b36d2565e0a36bbf5ee21db337056a5e49825d40ba138
-size 23056
+oid sha256:ae6d324c448d45ad6ae359daf63356b56facd457cf12e769afe97082d8e7cb93
+size 27414
diff --git a/sample/src/test/screenshots/SelectAccountScreenTest_pixel_watch_large_font.png b/sample/src/test/screenshots/SelectAccountScreenTest_pixel_watch_large_font.png
index 40e6e98d..9576bac2 100644
--- a/sample/src/test/screenshots/SelectAccountScreenTest_pixel_watch_large_font.png
+++ b/sample/src/test/screenshots/SelectAccountScreenTest_pixel_watch_large_font.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4456ef883e288d1c1120c4ed204e6060e9d0197407eb58275453f9433a7ee159
-size 24998
+oid sha256:fe7bab4c694d3a3200564ae24affa9efc4c0f4983034eb644b8f260ebdaf7f53
+size 26978
diff --git a/sample/src/test/screenshots/SelectAccountScreenTest_small_round.png b/sample/src/test/screenshots/SelectAccountScreenTest_small_round.png
index bb0d4223..16ca0cf1 100644
--- a/sample/src/test/screenshots/SelectAccountScreenTest_small_round.png
+++ b/sample/src/test/screenshots/SelectAccountScreenTest_small_round.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:98d66b9c37aa5186527b36d2565e0a36bbf5ee21db337056a5e49825d40ba138
-size 23056
+oid sha256:ae6d324c448d45ad6ae359daf63356b56facd457cf12e769afe97082d8e7cb93
+size 27414
diff --git a/sample/src/test/screenshots/SelectAccountScreenTest_ticwatch_pro_5.png b/sample/src/test/screenshots/SelectAccountScreenTest_ticwatch_pro_5.png
index 7e0b1a3f..414c00bb 100644
--- a/sample/src/test/screenshots/SelectAccountScreenTest_ticwatch_pro_5.png
+++ b/sample/src/test/screenshots/SelectAccountScreenTest_ticwatch_pro_5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4ece4bf22b41226cea192e32541c0ec32f2b827f9b85394016925bd7d5e5813f
-size 25478
+oid sha256:6544e03ececcc236477be16b1690b93543ca3984c5f67c71b632c88990bb8987
+size 29886
diff --git a/sample/src/test/screenshots/SignInPlaceholderScreenTest_galaxy_watch_5.png b/sample/src/test/screenshots/SignInPlaceholderScreenTest_galaxy_watch_5.png
index 8547da88..a2fb2258 100644
--- a/sample/src/test/screenshots/SignInPlaceholderScreenTest_galaxy_watch_5.png
+++ b/sample/src/test/screenshots/SignInPlaceholderScreenTest_galaxy_watch_5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:90eeaea18552a4c86dee968297067e891cbca50b2eaac35864129c6e17cca9c9
-size 9344
+oid sha256:2778e564af6f7b51d1dd1185ac37bcfa1391b15f157aaf557f47b4d1257216a9
+size 10948
diff --git a/sample/src/test/screenshots/SignInPlaceholderScreenTest_galaxy_watch_6.png b/sample/src/test/screenshots/SignInPlaceholderScreenTest_galaxy_watch_6.png
index fb4496dd..84324222 100644
--- a/sample/src/test/screenshots/SignInPlaceholderScreenTest_galaxy_watch_6.png
+++ b/sample/src/test/screenshots/SignInPlaceholderScreenTest_galaxy_watch_6.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0e05b266cede23afb7befd6e42c37738e2ad13301d51e0ae1e9ef5c56f6ffda9
-size 10437
+oid sha256:16e2384d865d918803c7d786eb778b9afb34bd012ea4272d09bd7bacd8567ff1
+size 12080
diff --git a/sample/src/test/screenshots/SignInPlaceholderScreenTest_galaxy_watch_6_small_font.png b/sample/src/test/screenshots/SignInPlaceholderScreenTest_galaxy_watch_6_small_font.png
index 930a09c4..3546144b 100644
--- a/sample/src/test/screenshots/SignInPlaceholderScreenTest_galaxy_watch_6_small_font.png
+++ b/sample/src/test/screenshots/SignInPlaceholderScreenTest_galaxy_watch_6_small_font.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fc876ee80ec71b322464cd3755a5e4c82a68f53cf1f22eac6cb46ecb4bcee191
-size 10322
+oid sha256:7cd7472de2b22628eca1f179cfeb355a4e52772becfd3bcaa9c2090e4241e4c8
+size 11889
diff --git a/sample/src/test/screenshots/SignInPlaceholderScreenTest_large_round.png b/sample/src/test/screenshots/SignInPlaceholderScreenTest_large_round.png
index 9f672ad4..ebf69fed 100644
--- a/sample/src/test/screenshots/SignInPlaceholderScreenTest_large_round.png
+++ b/sample/src/test/screenshots/SignInPlaceholderScreenTest_large_round.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:91e2627f0f83042e26e65cce057db436d9752297cf1d9a6a10b413bfaa555f9b
-size 10469
+oid sha256:5252ac17ea7cf909467737dd78c6f5feb8c9698b5a50a6680fa448527c483b65
+size 12115
diff --git a/sample/src/test/screenshots/SignInPlaceholderScreenTest_pixel_watch.png b/sample/src/test/screenshots/SignInPlaceholderScreenTest_pixel_watch.png
index 75023e29..68ea8caf 100644
--- a/sample/src/test/screenshots/SignInPlaceholderScreenTest_pixel_watch.png
+++ b/sample/src/test/screenshots/SignInPlaceholderScreenTest_pixel_watch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eced5ef68ee3c5b43d25bd7909fa5549ba83ec6b59d96e501f985be1fc50fb0c
-size 9187
+oid sha256:d0c7772ca88f779a6499cd455a69b9e79c3948e77bb6f8ac55337c9940d8adb2
+size 10825
diff --git a/sample/src/test/screenshots/SignInPlaceholderScreenTest_pixel_watch_large_font.png b/sample/src/test/screenshots/SignInPlaceholderScreenTest_pixel_watch_large_font.png
index 57544fd6..b5a2c693 100644
--- a/sample/src/test/screenshots/SignInPlaceholderScreenTest_pixel_watch_large_font.png
+++ b/sample/src/test/screenshots/SignInPlaceholderScreenTest_pixel_watch_large_font.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bce914b0f00f1613c79f3b90e2d33d94e46f48861e6b042e595d8a63434706f2
-size 9543
+oid sha256:86173598858189fb6a1d2484c517bcb3d220044cc7ef78f8bb4c6c9b395ca187
+size 11653
diff --git a/sample/src/test/screenshots/SignInPlaceholderScreenTest_small_round.png b/sample/src/test/screenshots/SignInPlaceholderScreenTest_small_round.png
index 75023e29..68ea8caf 100644
--- a/sample/src/test/screenshots/SignInPlaceholderScreenTest_small_round.png
+++ b/sample/src/test/screenshots/SignInPlaceholderScreenTest_small_round.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eced5ef68ee3c5b43d25bd7909fa5549ba83ec6b59d96e501f985be1fc50fb0c
-size 9187
+oid sha256:d0c7772ca88f779a6499cd455a69b9e79c3948e77bb6f8ac55337c9940d8adb2
+size 10825
diff --git a/sample/src/test/screenshots/SignInPlaceholderScreenTest_ticwatch_pro_5.png b/sample/src/test/screenshots/SignInPlaceholderScreenTest_ticwatch_pro_5.png
index 32a288c3..6c4e5f1a 100644
--- a/sample/src/test/screenshots/SignInPlaceholderScreenTest_ticwatch_pro_5.png
+++ b/sample/src/test/screenshots/SignInPlaceholderScreenTest_ticwatch_pro_5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3d41e3d57a7f55dc2a83d23e4bd88c0894232c035d420e46f31b69a140bd5f5b
-size 10656
+oid sha256:370f09b8482170a9569e3da2afaf475fa131b63c710ccc9c2842a0cd5f762edd
+size 12280
diff --git a/sample/src/test/screenshots/SignedInConfirmationTest_galaxy_watch_5.png b/sample/src/test/screenshots/SignedInConfirmationTest_galaxy_watch_5.png
index 30474f64..f4cd0c58 100644
--- a/sample/src/test/screenshots/SignedInConfirmationTest_galaxy_watch_5.png
+++ b/sample/src/test/screenshots/SignedInConfirmationTest_galaxy_watch_5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3ab65184fa39a91ced7f73bb55570fc843b2930627de8f6964a45813edcba22d
-size 18698
+oid sha256:e7fe0aecfb97326957f4c59e12f855b183fd9a2b5fc91f8b01b668499e6c7512
+size 20222
diff --git a/sample/src/test/screenshots/SignedInConfirmationTest_galaxy_watch_6.png b/sample/src/test/screenshots/SignedInConfirmationTest_galaxy_watch_6.png
index b6ba81d3..b22d9605 100644
--- a/sample/src/test/screenshots/SignedInConfirmationTest_galaxy_watch_6.png
+++ b/sample/src/test/screenshots/SignedInConfirmationTest_galaxy_watch_6.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:588f39b0db3725b83c287de6225e60d046b111c561e56a94e18cec023fc5d1a5
-size 19970
+oid sha256:e2dac52b068c94cea4e4c6f0f4e8d8055b956191a13c62ba322a58826bb72b17
+size 21526
diff --git a/sample/src/test/screenshots/SignedInConfirmationTest_galaxy_watch_6_small_font.png b/sample/src/test/screenshots/SignedInConfirmationTest_galaxy_watch_6_small_font.png
index 192a6ffe..29183dcf 100644
--- a/sample/src/test/screenshots/SignedInConfirmationTest_galaxy_watch_6_small_font.png
+++ b/sample/src/test/screenshots/SignedInConfirmationTest_galaxy_watch_6_small_font.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7d2b57f18a77d01ea0692bbfa58eb1e01f008aa3ed50af37eca234c06ab55971
-size 19507
+oid sha256:ec16da26a88744321d3b4b9e31352486646e0051ee4c57df05c45a5688689b2a
+size 20993
diff --git a/sample/src/test/screenshots/SignedInConfirmationTest_large_round.png b/sample/src/test/screenshots/SignedInConfirmationTest_large_round.png
index f9c88236..2797d681 100644
--- a/sample/src/test/screenshots/SignedInConfirmationTest_large_round.png
+++ b/sample/src/test/screenshots/SignedInConfirmationTest_large_round.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e38ec27ccdc1ef07a011a9534aa9545fa6944475af90ec09cd6ab28c1a0eb9a7
-size 19986
+oid sha256:46237b33afc0ced07cba45c1bce9b17b4aa24391a20cf9574b7d7db9e3fc23c4
+size 21564
diff --git a/sample/src/test/screenshots/SignedInConfirmationTest_pixel_watch.png b/sample/src/test/screenshots/SignedInConfirmationTest_pixel_watch.png
index 44eb222d..3d74c1e3 100644
--- a/sample/src/test/screenshots/SignedInConfirmationTest_pixel_watch.png
+++ b/sample/src/test/screenshots/SignedInConfirmationTest_pixel_watch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:30efc3602122cbafd3a9615f03bb815ec327e06aefcab4f6565fc8ad5c2392b1
-size 18525
+oid sha256:357fcb8ca3810054297620ebd43de4ad498a09005caf455bd558091f041abd00
+size 20070
diff --git a/sample/src/test/screenshots/SignedInConfirmationTest_pixel_watch_large_font.png b/sample/src/test/screenshots/SignedInConfirmationTest_pixel_watch_large_font.png
index 5cb8e421..a49e5513 100644
--- a/sample/src/test/screenshots/SignedInConfirmationTest_pixel_watch_large_font.png
+++ b/sample/src/test/screenshots/SignedInConfirmationTest_pixel_watch_large_font.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cf283034c3af72f349d03cba65c430f07bbf112da828f7fb199b77e9c0beeed7
-size 19345
+oid sha256:4eb9e2f82d274d182fb10137a28a5378285104fbe0f26883d880b59442ea8ab6
+size 21342
diff --git a/sample/src/test/screenshots/SignedInConfirmationTest_small_round.png b/sample/src/test/screenshots/SignedInConfirmationTest_small_round.png
index 44eb222d..3d74c1e3 100644
--- a/sample/src/test/screenshots/SignedInConfirmationTest_small_round.png
+++ b/sample/src/test/screenshots/SignedInConfirmationTest_small_round.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:30efc3602122cbafd3a9615f03bb815ec327e06aefcab4f6565fc8ad5c2392b1
-size 18525
+oid sha256:357fcb8ca3810054297620ebd43de4ad498a09005caf455bd558091f041abd00
+size 20070
diff --git a/sample/src/test/screenshots/SignedInConfirmationTest_ticwatch_pro_5.png b/sample/src/test/screenshots/SignedInConfirmationTest_ticwatch_pro_5.png
index 1b8df29b..61213749 100644
--- a/sample/src/test/screenshots/SignedInConfirmationTest_ticwatch_pro_5.png
+++ b/sample/src/test/screenshots/SignedInConfirmationTest_ticwatch_pro_5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:289ba84dfcc8048b4b61bc68e68c68bd0215287d751c6cde0e316d165d004aec
-size 20176
+oid sha256:2a8d55b2af5ea78a8705d4bb554781d7762a8c77e391f82e004cf67ad6d020b6
+size 21721
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_AuthSignInTest_screenshot[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_AuthSignInTest_screenshot[0]_mobvoiticwatchpro5.png
index fce6933b..1cf4bedc 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_AuthSignInTest_screenshot[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_AuthSignInTest_screenshot[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4c37c5ec954064d9d6289dc2452fe531fad772310b0c8a3ce0166da2748aea36
-size 16946
+oid sha256:89ee17d93f38b54be14dc80886f6a7f8178216e74b5242ee1c843fa2b885bb99
+size 10629
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_AuthSignInTest_screenshot[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_AuthSignInTest_screenshot[1]_samsunggalaxywatch5.png
index e31bfb62..79e5b42f 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_AuthSignInTest_screenshot[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_AuthSignInTest_screenshot[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4a685a0bba1f8ca7e5ac1589cbf6bffcf782077c1bb31e20b8e33a0912b3577a
-size 14349
+oid sha256:64b83c7f3ecb8b59e810e40931796fcc18ebea0aabdd7b963a3a89d9567b669a
+size 9318
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_AuthSignInTest_screenshot[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_AuthSignInTest_screenshot[2]_samsunggalaxywatch6large.png
index 142d3c77..fec5e631 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_AuthSignInTest_screenshot[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_AuthSignInTest_screenshot[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:550837a36b584aa2dfa19dcda3786ce0d278023c31d3b14debf6855221117daa
-size 17962
+oid sha256:77329e00dc22c21fa34c13d5622e7afb35314746beff9408665d69c5041eaa2e
+size 11135
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_AuthSignInTest_screenshot[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_AuthSignInTest_screenshot[3]_googlepixelwatch.png
index c75cbfcd..622bdbd6 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_AuthSignInTest_screenshot[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_AuthSignInTest_screenshot[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8fd182478b0e57bc83dc4aa3c90fea945786b9e8c860803f909b7fb5cd7153ee
-size 14192
+oid sha256:ab818ffcc1c69f92fe7eef1c3ed40c2dc0d18184c5c6f6deedd854ed7dc842d8
+size 9161
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_AuthSignInTest_screenshot[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_AuthSignInTest_screenshot[4]_genericsmallround.png
index c75cbfcd..622bdbd6 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_AuthSignInTest_screenshot[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_AuthSignInTest_screenshot[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8fd182478b0e57bc83dc4aa3c90fea945786b9e8c860803f909b7fb5cd7153ee
-size 14192
+oid sha256:ab818ffcc1c69f92fe7eef1c3ed40c2dc0d18184c5c6f6deedd854ed7dc842d8
+size 9161
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_AuthSignInTest_screenshot[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_AuthSignInTest_screenshot[5]_genericlargeround.png
index ff17d417..2535abb1 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_AuthSignInTest_screenshot[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_AuthSignInTest_screenshot[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a1c16aef37ee52b48606a6b513acc79dd8fc7a1b898233269acb2e8f8b532088
-size 16500
+oid sha256:7c1bec1049d7e244b653b1a1d431a78cd783cafcae3ab52c3b584b3f298ef2c9
+size 10444
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_AuthSignInTest_screenshot[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_AuthSignInTest_screenshot[6]_smalldevicebigfonts.png
index 72930bdc..da8fdc32 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_AuthSignInTest_screenshot[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_AuthSignInTest_screenshot[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6bf82b7e43b1150d887bf11b947237533df74687be13c335b22d7e9f6144e9be
-size 14677
+oid sha256:3c8dc54d17ed7c68f9e3de909aa9cc528376e0e4beb4e779b04943eff97d9fbe
+size 9466
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_AuthSignInTest_screenshot[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_AuthSignInTest_screenshot[7]_largedevicesmallfonts.png
index 4cc0436e..bf7b86ec 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_AuthSignInTest_screenshot[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_AuthSignInTest_screenshot[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e76e1701c8b72e8ef10a43fcc6f6a68f4948ce5bd012d7a22a90940b53f13a95
-size 16845
+oid sha256:dbf9598c7c49c4b2aae99fa3da7de96532c8eec4a34a5017f14e237cfef36255
+size 10496
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_fromDatePicker[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_fromDatePicker[0]_mobvoiticwatchpro5.png
index d65fae28..474522a7 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_fromDatePicker[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_fromDatePicker[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:400c0e2937634dc09ac30903295b273a401a1ca40b721e05b624467cb0ba1bc3
-size 27826
+oid sha256:aaf3864c03d33967ac836b65537722bae2e8b3fcf81de61a2fb1f2346ef6df0c
+size 18831
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_fromDatePicker[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_fromDatePicker[1]_samsunggalaxywatch5.png
index a8e437a6..302d8889 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_fromDatePicker[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_fromDatePicker[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:378272ae29c3effee139364671ef60b2a59a0d0b2293a8988e553753de97be53
-size 23451
+oid sha256:2f82c2d6e33062c143433dbb8f4af1f19f93a6ea91e7ccfd173588e31f541208
+size 15708
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_fromDatePicker[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_fromDatePicker[2]_samsunggalaxywatch6large.png
index eac0d375..02933717 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_fromDatePicker[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_fromDatePicker[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3b56e3dfafcb85fad1a3cbaca0cd51ef2a54a19735d204500c3e632d85266ded
-size 28902
+oid sha256:a638fa8acfa383baa602724e3ca8bee69ca513e48c7cfe17f56253d3ac8a7469
+size 19425
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_fromDatePicker[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_fromDatePicker[3]_googlepixelwatch.png
index 6d29fb8a..769f5927 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_fromDatePicker[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_fromDatePicker[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e14735a430c8742f91f20b88b08c494f0e1aadaf2e67ccbe524d03995248f0ec
-size 22783
+oid sha256:63373de9a6b9710c20745656fc2da95faa99d348f20bddd73f006a57abd9b867
+size 15211
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_fromDatePicker[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_fromDatePicker[4]_genericsmallround.png
index 6d29fb8a..769f5927 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_fromDatePicker[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_fromDatePicker[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e14735a430c8742f91f20b88b08c494f0e1aadaf2e67ccbe524d03995248f0ec
-size 22783
+oid sha256:63373de9a6b9710c20745656fc2da95faa99d348f20bddd73f006a57abd9b867
+size 15211
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_fromDatePicker[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_fromDatePicker[5]_genericlargeround.png
index 083376cd..c154282b 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_fromDatePicker[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_fromDatePicker[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:87d1999e6e494951f7e41079aca12ae76b2ae39295c32f92dfdd89eb60f206da
-size 26933
+oid sha256:4fab569cb9fa56eebcedbd7f62360db8c5d4cf874694d23235ba2d55f9ffddaa
+size 18123
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_fromDatePicker[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_fromDatePicker[6]_smalldevicebigfonts.png
index 0f4921c7..5ea46b7e 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_fromDatePicker[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_fromDatePicker[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e81945e607aeabd49acda1177994ec81132bcbdd9616f11a8f6ccda733caba07
-size 22849
+oid sha256:b670f87e16c877a6abba34cfba70fd651be79fefa68621193deb48a81a48433a
+size 15266
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_fromDatePicker[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_fromDatePicker[7]_largedevicesmallfonts.png
index 58794ad6..2eeddd7e 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_fromDatePicker[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_fromDatePicker[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:10eceb4de551c0de765f537fb493d86d552369d79ac113b530c800437afe1454
-size 27795
+oid sha256:b0bb044e24b09a1584acb34bf5ecb89a96c1669961bb4322d5e422b3f3d2de51
+size 18825
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_screenshot[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_screenshot[0]_mobvoiticwatchpro5.png
index b8fe6ff7..85776b84 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_screenshot[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_screenshot[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9beb85bce37f0234fb6fa6e4b1a668c3c2362b0ffb4136139617b5b9e54fd1b0
-size 28469
+oid sha256:7c176414f3fc6d7b4a6140c2451a9124b1de55e1bdd533f3fe4b80bf0b5229a5
+size 19318
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_screenshot[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_screenshot[1]_samsunggalaxywatch5.png
index 52496a2c..43ba26d9 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_screenshot[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_screenshot[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1447dca9c691043356ebf113792b60747babddb694ff99374cf120cef92bb73b
-size 23823
+oid sha256:2c510edb58acceb89a66267e916eb0769ceb3546d3c5dfd7438a4a151c50033e
+size 15984
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_screenshot[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_screenshot[2]_samsunggalaxywatch6large.png
index 33597b33..80d05a66 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_screenshot[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_screenshot[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4e21af39cec497c54909e838f736f8cff4f703761606fe9fff52fcfc72427e18
-size 29569
+oid sha256:2272ca4aa31500ed3e5c1ce49f7d5e5ea8ab00d86c80861dad14c02ff9e8b42e
+size 19938
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_screenshot[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_screenshot[3]_googlepixelwatch.png
index 52a93a4c..14accd03 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_screenshot[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_screenshot[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e1d95e47be63e68a04fb7bc713e5577f3a1f1159259df817996e5c76f8a1035c
-size 23189
+oid sha256:4a2ad386be71d1851f109b43bf41c782c5df22d199bd52e73afe7824517e6984
+size 15519
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_screenshot[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_screenshot[4]_genericsmallround.png
index 52a93a4c..14accd03 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_screenshot[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_screenshot[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e1d95e47be63e68a04fb7bc713e5577f3a1f1159259df817996e5c76f8a1035c
-size 23189
+oid sha256:4a2ad386be71d1851f109b43bf41c782c5df22d199bd52e73afe7824517e6984
+size 15519
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_screenshot[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_screenshot[5]_genericlargeround.png
index b9d0a154..86314251 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_screenshot[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_screenshot[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:60f826d863b584d10f9a7621e948ed556c74e246dc5ea41793094dd41fe5a954
-size 27413
+oid sha256:9f5227a76175cf7d173dd38176913366abdc0ac098fa7789a657bda0884534d3
+size 18531
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_screenshot[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_screenshot[6]_smalldevicebigfonts.png
index abc8fc9f..68413244 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_screenshot[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_screenshot[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1effb39668e34065eace5940dfd5fdb465063dfa4c3f642a04819441d3cedec8
-size 23168
+oid sha256:bd53e5d54ea5ab0f239bd7171907ecd06405873ed01e6d6910389ebd46586308
+size 15502
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_screenshot[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_screenshot[7]_largedevicesmallfonts.png
index 121f1ed4..8ddddbbc 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_screenshot[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_screenshot[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8bea0c88654e4626fea87426e4e1425b8ef58cd4fb9bfe8555747dfa72bce0cc
-size 28518
+oid sha256:921366548682f65e74f58e4352d382233ef6747deb35eb62bdf0794a3578a745
+size 19402
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_toDatePicker[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_toDatePicker[0]_mobvoiticwatchpro5.png
index 573768e0..e90e49ca 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_toDatePicker[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_toDatePicker[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:da1e8642d0749de6f8908b857ef869c227a4205502158a9bdb2364b677315331
-size 27732
+oid sha256:7cdb397fb97e73b7ff61bc1f4fef2cc69ef5eb48caa0348af5d217d626440cca
+size 18718
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_toDatePicker[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_toDatePicker[1]_samsunggalaxywatch5.png
index b4abb69e..ec6f483b 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_toDatePicker[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_toDatePicker[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6af2415f29b236c9deb794684327abaf319af0c839222b325c93a0471a3a8403
-size 23381
+oid sha256:c2ecb1f328c8ec3c5836c22b3691676ab85abfefacc2739f8cf188b56e79df16
+size 15598
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_toDatePicker[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_toDatePicker[2]_samsunggalaxywatch6large.png
index fd48662e..7716b97b 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_toDatePicker[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_toDatePicker[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:694dd6e348c4a07ea28b647f143a0cece539825f08479ac1e8ad698f97a58741
-size 28839
+oid sha256:94b82e59c0e4909f25ab14756a03e49aa1f14634b0c58ae45ed51116a6cc60d4
+size 19406
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_toDatePicker[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_toDatePicker[3]_googlepixelwatch.png
index 1f7582f0..a7df6410 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_toDatePicker[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_toDatePicker[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6078fbff4547f21f4d6d049ed1da4042a4243e46f50fbb14af3ac13bb02e1a26
-size 22775
+oid sha256:85885608b5c519728229efa139b97ef5c7f31bf3e4a205d011a56caf24f5d5d7
+size 15135
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_toDatePicker[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_toDatePicker[4]_genericsmallround.png
index 1f7582f0..a7df6410 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_toDatePicker[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_toDatePicker[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6078fbff4547f21f4d6d049ed1da4042a4243e46f50fbb14af3ac13bb02e1a26
-size 22775
+oid sha256:85885608b5c519728229efa139b97ef5c7f31bf3e4a205d011a56caf24f5d5d7
+size 15135
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_toDatePicker[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_toDatePicker[5]_genericlargeround.png
index 34df5c62..1ce13232 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_toDatePicker[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_toDatePicker[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:131b9c593f2dc2bbe460bb4dd04851eb6d174ead1eaebfa4c3bb5c0583f351d8
-size 26836
+oid sha256:3940b7346eed99708c580f27d3cdae0e6038e36e80188b193a6a055fb9df0b03
+size 18062
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_toDatePicker[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_toDatePicker[6]_smalldevicebigfonts.png
index 734cfec8..c478fd8b 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_toDatePicker[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_toDatePicker[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2ea49ac11403d3a36fd2e55c732bf79f0a800ce7fb3c982561e96818c07f74ca
-size 22807
+oid sha256:8912388a047535b12fb7212b3100666edde49af6b8f817b05d9e31aa1f9b72ee
+size 15177
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_toDatePicker[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_toDatePicker[7]_largedevicesmallfonts.png
index a674872f..f9043fb8 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_toDatePicker[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DatePickerTest_toDatePicker[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3c2a51783a5f677fb910c75f7e832eba02ea01a728db18599dfc3edcde0c15c1
-size 27785
+oid sha256:38df29570e1c79eddcbf15cbdefd772e45ed19f75e8a9c5914054a3d99999043
+size 18776
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DevicesTest_screenshot[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DevicesTest_screenshot[0]_mobvoiticwatchpro5.png
index e802429e..a43dfce2 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DevicesTest_screenshot[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DevicesTest_screenshot[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:363b9be214af1c2360a783627016c2eceb28efb487093bec574bdb13a867dec9
-size 49884
+oid sha256:212dd92733cc1c76c76050d40ea5d33a792012ebf5c955d790580f1c496f4d00
+size 32328
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DevicesTest_screenshot[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DevicesTest_screenshot[1]_samsunggalaxywatch5.png
index 9c1a3c68..290ffe7e 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DevicesTest_screenshot[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DevicesTest_screenshot[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5fc7537a4af78f03d2ca204affaee6227ffbab018fe0eec0b318e0896635a41e
-size 48819
+oid sha256:f30ed55b62519bdb81d39b3e3dba628576f3586c1a6cbee6653998e302995973
+size 31088
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DevicesTest_screenshot[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DevicesTest_screenshot[2]_samsunggalaxywatch6large.png
index 91d74d91..19cdd336 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DevicesTest_screenshot[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DevicesTest_screenshot[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5854b36686d98fbe0516a303e921fc9ac5ce3f3054320bc8f8f0b47c7898724e
-size 56610
+oid sha256:fe11764add47d4e1d2b51cd0434b525fec3575767262a8bc45cbc0857b24d6f1
+size 35576
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DevicesTest_screenshot[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DevicesTest_screenshot[3]_googlepixelwatch.png
index 41c0e78e..a94f6b23 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DevicesTest_screenshot[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DevicesTest_screenshot[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a4f7030691bcc329a82aaf3892655b567fbe39d27e4f5013c0760f078e820890
-size 41830
+oid sha256:b070588f7e825ef92490d1cc84b8727447821386a454f62aedb9262897053647
+size 27883
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DevicesTest_screenshot[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DevicesTest_screenshot[4]_genericsmallround.png
index 7f80ab0c..66f6bbfe 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DevicesTest_screenshot[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DevicesTest_screenshot[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1b2c9eb3de1e2ebea67eae89f22a923118d81483df5d7ab611b2f0a323509b9d
-size 41718
+oid sha256:a40bf651403b1c5294ca34520bb36064ef72a32d89a9d1d129f432ca648365c9
+size 27867
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DevicesTest_screenshot[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DevicesTest_screenshot[5]_genericlargeround.png
index 33d75b3e..b8ccd87a 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DevicesTest_screenshot[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DevicesTest_screenshot[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f106d1adcc79ce87852b6aeb33af182649e32b4b837c9f4e3d85c2f511310e59
-size 48259
+oid sha256:295c24c86f321beea7161f11f89eddb6158c05555dd99ec45bab7544ae740768
+size 31287
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DevicesTest_screenshot[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DevicesTest_screenshot[6]_smalldevicebigfonts.png
index f02687a7..f64f60dd 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DevicesTest_screenshot[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DevicesTest_screenshot[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:492437cceb95adc13fead296c0f9f488a2e48386a7c5f0b51843e73109915d90
-size 49756
+oid sha256:01363d891b92d48e6a11464d4af8565bb91dc9f85b72bb28f76606919dd4c540
+size 33256
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DevicesTest_screenshot[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DevicesTest_screenshot[7]_largedevicesmallfonts.png
index 4065a299..5ca4bac7 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DevicesTest_screenshot[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DevicesTest_screenshot[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3ad132d16825b9bae528945736225605223d822df4c013e63a9f7bf4758018d9
-size 48964
+oid sha256:445254e5c79246ae11c326ca020dd6eef3c536616514c037aa65ed57b163fc0c
+size 31205
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[0]_mobvoiticwatchpro5.png
index ec73a253..1a0205b3 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cdd0d9c5042e67b167bf58a521cd497b598bcca1270e67486fa7e5327bdb3d74
-size 16899
+oid sha256:ef55627ec8a1a56a4b60dec8df69695155546cd91f176cb899167f51d80c6ed3
+size 10660
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[1]_samsunggalaxywatch5.png
index 2ed763d0..4bc36667 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:14de2e5dea8d5dc6c85074cbda353e1c4edfd081b8899432c842ce0368d5582e
-size 14885
+oid sha256:15b84ce034c5af1c64fb8911a7f430f7716edf106152df52e0e67fcc4be304b2
+size 9806
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[2]_samsunggalaxywatch6large.png
index c8d80bae..717c77b2 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c77c3f0ab3c00bc0c4f034beec6ac2d95171ffd4ca7129152462a3de7a30e183
-size 18257
+oid sha256:1e40482c849c28f81c0942f19c2d8900ee69ed68e65152fc1ce890cd7ffa416c
+size 11296
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[3]_googlepixelwatch.png
index 999f2271..0adc5d71 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:226fc808c7691036453cc989ac6489539a57f6654c9dc851a3213876aaba9b9a
-size 14756
+oid sha256:357130b0d6a4415c10426ebdfad05a4022d32a86cf861b5e7ba53beede1f9e65
+size 9670
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[4]_genericsmallround.png
index 999f2271..0adc5d71 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:226fc808c7691036453cc989ac6489539a57f6654c9dc851a3213876aaba9b9a
-size 14756
+oid sha256:357130b0d6a4415c10426ebdfad05a4022d32a86cf861b5e7ba53beede1f9e65
+size 9670
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[5]_genericlargeround.png
index da9c8bf1..a155dba2 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7124e1fd7bb39489c7efc0cd71530d067fa8f459d5d31a991f1f9f308e4e4a9c
-size 16407
+oid sha256:991d5f71ba44315206ed08a3a8883e89650c2d19445982df5d4c6f8d348f50d4
+size 10465
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[6]_smalldevicebigfonts.png
index e061663d..8c8aad2b 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:db3b058155fe1fc322d5cff35cd191bbdf8758ccd909432716ee0307d110e1d6
-size 15894
+oid sha256:c4b328b6c46659a4f0908e0b743fc9c29f952860bce6841b071e06af25381a5c
+size 10552
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[7]_largedevicesmallfonts.png
index 6b8efee6..4576af3e 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_alarmConfirmationScreen[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:962f3d6c4d44f36b1f3aeac94dc86ad32a78b5f7ff320f0586c2a99508d53b33
-size 16806
+oid sha256:e6566537044d51acb785c00e8d840153e3bb9d3269c39eb2b2335072795df69e
+size 10537
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[0]_mobvoiticwatchpro5.png
index 99f30cff..4a005a15 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9da2de3d4a73b43bd477362245dc01f6b0a01736e5e9511ef7625e52ca5615b7
-size 35502
+oid sha256:9924f2ae4282654f5e7001afb2b665f1f7c2ddd80488e78b59ee42272b657c84
+size 24951
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[0]_mobvoiticwatchpro5_2.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[0]_mobvoiticwatchpro5_2.png
index 0708ab1c..ceddfba2 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[0]_mobvoiticwatchpro5_2.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[0]_mobvoiticwatchpro5_2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:82472d18f2f098e6dd435a9fa39c5304f60e3b42bafdafd32487876a80bcda31
-size 35346
+oid sha256:d015fb754c3400606c94e32d19ea751f68072f127bb954135f86daaf16e0db99
+size 24264
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[1]_samsunggalaxywatch5.png
index 69a0a98e..9e9a4261 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:20f1342584e23d171a375ed91497ceb3183b10c33ad70dd86c4bcc55c53b5138
-size 31285
+oid sha256:b8f053732f24fe1b63df913270862dc7c0e2ab03dddc0740779b5277d6245ad5
+size 22568
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[1]_samsunggalaxywatch5_2.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[1]_samsunggalaxywatch5_2.png
index 607d91c8..1720d8e2 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[1]_samsunggalaxywatch5_2.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[1]_samsunggalaxywatch5_2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6679afe43a1eae13344722a11f3ad9a6a2fe836684a85e23c4e2f81bd49552da
-size 26604
+oid sha256:34ec6cc8408a0a9ee0653c7c97c4fd6416a756a4521462632a95403dddc7b01f
+size 18926
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[2]_samsunggalaxywatch6large.png
index 9031fd16..9ed9305b 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:383ea53bc5bcf5df024605b27a8747098934e6ab1e5bdf1387dc9d02eae53309
-size 37057
+oid sha256:9d654bc50bd8f2ad102b9899b61c1f08e755825ffe269ed9f8fe7f1611864dc5
+size 26498
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[2]_samsunggalaxywatch6large_2.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[2]_samsunggalaxywatch6large_2.png
index c7751222..e3843493 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[2]_samsunggalaxywatch6large_2.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[2]_samsunggalaxywatch6large_2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ab979c479792bb8fd03ff4bb602ec3682538c929bcb0ae67bbc2d2756d4e3df5
-size 37470
+oid sha256:8ae131964bfd9316c27bf518951fe7ea60b3daa562f8bb40ae79df205cc99c32
+size 25855
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[3]_googlepixelwatch.png
index c69eae74..a0ba6580 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ed636c850f8c0c2a64c53ea6cab95fe577b2b5d365ad6fd94b6521ff74938d4b
-size 30297
+oid sha256:0601f130426df84d42026349a16b329e0ea2a6abe024d1aabe8d07c8f0b0c15f
+size 21860
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[3]_googlepixelwatch_2.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[3]_googlepixelwatch_2.png
index 5269c372..ca8e7394 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[3]_googlepixelwatch_2.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[3]_googlepixelwatch_2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a9929a4024cfe7be79cf88e05ffbbb654ab0cc0c673526bdeb022c36c4420d95
-size 26547
+oid sha256:2ef556a666206cd86be33956aaf85e68a252412760509d9ee71a3577f711faf5
+size 18556
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[4]_genericsmallround.png
index c69eae74..a0ba6580 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ed636c850f8c0c2a64c53ea6cab95fe577b2b5d365ad6fd94b6521ff74938d4b
-size 30297
+oid sha256:0601f130426df84d42026349a16b329e0ea2a6abe024d1aabe8d07c8f0b0c15f
+size 21860
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[4]_genericsmallround_2.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[4]_genericsmallround_2.png
index 5269c372..ca8e7394 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[4]_genericsmallround_2.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[4]_genericsmallround_2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a9929a4024cfe7be79cf88e05ffbbb654ab0cc0c673526bdeb022c36c4420d95
-size 26547
+oid sha256:2ef556a666206cd86be33956aaf85e68a252412760509d9ee71a3577f711faf5
+size 18556
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[5]_genericlargeround.png
index c62974de..7325c956 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:83460a0e843be2f9d115bd83a9a3abfa7ebb1af6a68986294c1b138f179ad5ca
-size 34346
+oid sha256:563f429db91330314d634b00526f08a48623454e00a2c4474be64f2ed95257e8
+size 24632
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[5]_genericlargeround_2.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[5]_genericlargeround_2.png
index 40f919dd..7c81d291 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[5]_genericlargeround_2.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[5]_genericlargeround_2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f546318aa0d018cf045066a681abd11c16d228609acd609ba1fa43e8f50ad346
-size 34736
+oid sha256:dbbccf4782be02279ddd130a74d8b7db1f338d1e2e73a2a420dd535d51716e20
+size 23925
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[6]_smalldevicebigfonts.png
index 4c1b0bc7..b85d8e84 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:30b3ef90c834961a946072647c3ea479b458de42376a54379c439a944539da08
-size 32090
+oid sha256:53a8ca7ea088140b5039546846f8103355a9be18fd38a99ecef5a161cf7e19c7
+size 22488
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[6]_smalldevicebigfonts_2.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[6]_smalldevicebigfonts_2.png
index bc6206aa..5e7a66a6 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[6]_smalldevicebigfonts_2.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[6]_smalldevicebigfonts_2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6d6b5a55e15a95b5ae8745b9f9afe4193de7d4d8178e6599e5fba5595e5d1fff
-size 27998
+oid sha256:e5884124488a410aa96dbe5965317ccdf0a5a4307381dcb4288b7b05ff3a17a1
+size 19938
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[7]_largedevicesmallfonts.png
index bbed2344..16405bb3 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cd4a4e512c54223b75bc5204880f32e3f4eed5c09424134eefd4287abfa9a9b8
-size 35964
+oid sha256:4564ce7a7fa9981b3c263cf7af31949a9159b39328ff8d050f4167e83cc39ae0
+size 24610
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[7]_largedevicesmallfonts_2.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[7]_largedevicesmallfonts_2.png
index 82d048c0..6b54ec35 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[7]_largedevicesmallfonts_2.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_batterySaverScreen[7]_largedevicesmallfonts_2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:79507e35c01bf797bcaac960254ea42572a3f746f18172cf1b985a57a4ff2736
-size 34594
+oid sha256:e5c8c54180a2003b2749fe621ac6f5ca55994b5efd83f60c4748fc9d03846685
+size 23930
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[0]_mobvoiticwatchpro5.png
index c57e6c0c..9fe6cd98 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:af17fab5f0181999243f6517af6a3bb9af2d06d20405ccfc4818f56cef4c098a
-size 28201
+oid sha256:4f49e60319628f6a2ad50ee3edf1fbb86e44436ee7e39434515816920cff5fcc
+size 19268
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[1]_samsunggalaxywatch5.png
index e1f9cd06..ead124a8 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a237dc521a3474284ae21ad92c60fba16b0e64e3e53e34f3214dec3a968d7a4f
-size 25623
+oid sha256:60949158ba7683b5acf02325f5a65f6fb90988f0d4ecb2442abcc9874703a89c
+size 18116
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[2]_samsunggalaxywatch6large.png
index fb103154..9d8218ef 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:34337ce5739df12c0820aba0c3fd5ae01aa91518d3aec7f5c3b2b5a13d435bc6
-size 30337
+oid sha256:dc5d090b234d79b12724de2ee002c05463ccf97040b2f6405125ac61650fbe58
+size 20708
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[3]_googlepixelwatch.png
index d2d01c36..466ddbf1 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:44bf49997a969cab940891e8dc275a947a2ac77aad0da953d86e3ebe884d8a9f
-size 25600
+oid sha256:5ae3864bed637e8bd895485ad3ad55e3b704817897f014657a747d59e3a406ae
+size 17839
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[4]_genericsmallround.png
index d2d01c36..466ddbf1 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:44bf49997a969cab940891e8dc275a947a2ac77aad0da953d86e3ebe884d8a9f
-size 25600
+oid sha256:5ae3864bed637e8bd895485ad3ad55e3b704817897f014657a747d59e3a406ae
+size 17839
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[5]_genericlargeround.png
index f4eaa40e..1260868d 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b81fd8a7f37036de5ada997028966faf171c4a2d6d4a7b0133c5128904b1524f
-size 27628
+oid sha256:c4d1f44645a7977b479c76eb8327ebfc6f3a5778a0ea8716981d0b39a0adbc6a
+size 19041
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[6]_smalldevicebigfonts.png
index f45f5c0e..1dd8eb05 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:80e2bb1a5b982cddb382cc7810a738a0247915bd309911fb05887afa6e0a6951
-size 28430
+oid sha256:1394fb08c29ca4a030b5b0e8d0617ede52678b30d4624a00cbbbb20c7a6b07d9
+size 19507
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[7]_largedevicesmallfonts.png
index 12a7aa19..c2d627dc 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_iconAndTextAlertScreen[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:47459477ea0c66f6e124f4346dc5802c7a3de852767d4b318b13433dc5a42647
-size 27698
+oid sha256:1f66163f4d4a49c8f9d9aad6c5d1367559f4df044c68a90c94b9c90379b2f910
+size 18837
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[0]_mobvoiticwatchpro5.png
index 3a05cf50..f5dda45f 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:141f4ec1d845dcdfb17a334b7589ddddf8d1dddb934ce8c21accfcdf04c85bd9
-size 44277
+oid sha256:b3fac23183e8e8af71d15bd211fe16fb9f370903b37035a9d8c9910101679858
+size 31813
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[0]_mobvoiticwatchpro5_2.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[0]_mobvoiticwatchpro5_2.png
index 54d24b26..5d3b686e 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[0]_mobvoiticwatchpro5_2.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[0]_mobvoiticwatchpro5_2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3fa254e3f72ec9cc9c7d196125ff3294ffd0524496a83b8fcd635405396860bf
-size 37241
+oid sha256:70a6a197326f0f4b2635fedbd5909ac7c3250cf75db84c18790b3bcf7325bda3
+size 25922
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[1]_samsunggalaxywatch5.png
index 2e0ffcc0..71b0a516 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d036308c101960252007a004b72a685e830ed7fbfe1647706ffd20f4be18cf54
-size 37970
+oid sha256:b465bc3d6cb42fe17a30258d88753cd0db5ab2a591166bdac12c70798834d066
+size 28114
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[1]_samsunggalaxywatch5_2.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[1]_samsunggalaxywatch5_2.png
index a137ea4c..70f21919 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[1]_samsunggalaxywatch5_2.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[1]_samsunggalaxywatch5_2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c16f705c023305764d6422252134ffd05d7a71ad73ee9f823749c21338162c16
-size 28937
+oid sha256:120137cad91ccda8f705a6e80fb61cdafbc72e93afcd0d9c91e4fcb5f903b16e
+size 20189
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[2]_samsunggalaxywatch6large.png
index a128b441..6c03d314 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8df2e581d692a4ab7fbb7564a155ad24b95643f631fdfcbc3ed606563059bc7a
-size 44988
+oid sha256:3a46182430aaf7ff4632c5349fe12c7ac7ea4e27c20f89a3e17a97398e6b407c
+size 33517
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[2]_samsunggalaxywatch6large_2.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[2]_samsunggalaxywatch6large_2.png
index 5dc760a3..aef6db3c 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[2]_samsunggalaxywatch6large_2.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[2]_samsunggalaxywatch6large_2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:442adbc0c2ad8ecc852f5037d649041d87737af829ce2c10bb77d4c5cadabe01
-size 38243
+oid sha256:290c10bf3b8c71653ec8d71e9d25284b72624a0e36646bad4442ae4a79db3102
+size 26487
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[3]_googlepixelwatch.png
index d46321c9..212eea3d 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2bac6a4db5046cd72b8f7e10fa679735f5250e5a759f59f66dca778c81f17a5d
-size 36119
+oid sha256:241aaf1beeb6f9086d7916f2d109ba6ea7322c2429f566c98efa145f7b190574
+size 26644
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[3]_googlepixelwatch_2.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[3]_googlepixelwatch_2.png
index 96dc6522..2c98993b 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[3]_googlepixelwatch_2.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[3]_googlepixelwatch_2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:caa4d0a3992ac6b9a40e600a78a96cddb4e6ae9a46c377a07cd53438614b51f3
-size 26330
+oid sha256:351adbc60f4493d8c0fd1b699c776742571cd5defc1f7d1e606dca1c88e42c13
+size 18515
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[4]_genericsmallround.png
index d46321c9..212eea3d 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2bac6a4db5046cd72b8f7e10fa679735f5250e5a759f59f66dca778c81f17a5d
-size 36119
+oid sha256:241aaf1beeb6f9086d7916f2d109ba6ea7322c2429f566c98efa145f7b190574
+size 26644
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[4]_genericsmallround_2.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[4]_genericsmallround_2.png
index 96dc6522..2c98993b 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[4]_genericsmallround_2.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[4]_genericsmallround_2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:caa4d0a3992ac6b9a40e600a78a96cddb4e6ae9a46c377a07cd53438614b51f3
-size 26330
+oid sha256:351adbc60f4493d8c0fd1b699c776742571cd5defc1f7d1e606dca1c88e42c13
+size 18515
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[5]_genericlargeround.png
index 43090922..9ce644f9 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b9b72b61fc903228e6688aea402be07ced0f9b319155965ddbd6b19cda3d1847
-size 43458
+oid sha256:375536983dd279eb4904175f4fefe16a11ca7080d265b13e83abea6ede3ee854
+size 31321
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[5]_genericlargeround_2.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[5]_genericlargeround_2.png
index a0d34417..ba967096 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[5]_genericlargeround_2.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[5]_genericlargeround_2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a1d00191ac7c2f464f7f7a3b2a93952e0e19f1d21f2422be31bd46e66614d069
-size 35591
+oid sha256:97aa6a29738696580de9406396872cbf4aa257af50dd5a794be86c0e28a419cc
+size 24948
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[6]_smalldevicebigfonts.png
index a9c93291..6753d46b 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e29620734c24e4bf895f45310fcd1029ecfac71d8889372b28ad4357b15126c4
-size 31530
+oid sha256:6e86f743cc8822e4cfdab6e52f8a1b1821951bf3a59239811d644840cdc08aff
+size 23488
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[6]_smalldevicebigfonts_2.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[6]_smalldevicebigfonts_2.png
index b2fb4f07..8e3d693a 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[6]_smalldevicebigfonts_2.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[6]_smalldevicebigfonts_2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:08adefd51c02c0db6d36de0e809e64bec3866bcd28b0b8e8788ca15711ec18ed
-size 25806
+oid sha256:77744399c5ecbea6c72eff60ea82515d01f68df5a2d871c3c6e2f2fd70339cae
+size 18506
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[7]_largedevicesmallfonts.png
index b8afcbfd..311bc6e8 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0f90c02e74b0888790343929220680fc62874e71de0b8ac73016629bc35c8ca6
-size 44051
+oid sha256:eade70f6c51aeacb7e1890223ac6ab45d8e9b49e0669e604981ba231dbaef366
+size 30246
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[7]_largedevicesmallfonts_2.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[7]_largedevicesmallfonts_2.png
index 9a3ccb62..01a4b8aa 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[7]_largedevicesmallfonts_2.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_longDialogScreen1[7]_largedevicesmallfonts_2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ac4b135b2c5c5c512571e62463714ea340d99a60c4b5841d2209f6c52b4d92f8
-size 36212
+oid sha256:8fa393b8e6a75e6f5739a93920b30772527588236cdd2595a1fb1cc2d82eba38
+size 25100
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_multiLineConfirmationScreen[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_multiLineConfirmationScreen[0]_mobvoiticwatchpro5.png
index 731c9738..b90022cf 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_multiLineConfirmationScreen[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_multiLineConfirmationScreen[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9e1103b6dbae8e1d8aebf2e17b7caffa699d6d922f646241ca573ed6833af0c5
-size 22854
+oid sha256:0b30957b453b676226b498aafe83ac8ff48bd00ad68d749977307f97a7af2d64
+size 15812
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_multiLineConfirmationScreen[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_multiLineConfirmationScreen[1]_samsunggalaxywatch5.png
index a23c6f59..d35d4119 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_multiLineConfirmationScreen[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_multiLineConfirmationScreen[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b916b00a0de133ca75fa5fd03724dfd367c39f37d3cbb19f5b71219f7f20a48e
-size 20221
+oid sha256:6863ecad6286f56eb5e02cd27f6b162cef6be8441ca2d9e3e93f8ebfa4c85f5f
+size 14534
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_multiLineConfirmationScreen[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_multiLineConfirmationScreen[2]_samsunggalaxywatch6large.png
index 82786bcd..e54b6f87 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_multiLineConfirmationScreen[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_multiLineConfirmationScreen[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4d53411c739854addff4d26d3d92edc06b01ec2a62a9849adc85a362d8f0a081
-size 24520
+oid sha256:7512a3108c4187e736e61ccbd7356c78e9d84587d63e973e6c5f0425088670eb
+size 16830
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_multiLineConfirmationScreen[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_multiLineConfirmationScreen[3]_googlepixelwatch.png
index 8bfdde76..8028ca0d 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_multiLineConfirmationScreen[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_multiLineConfirmationScreen[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f6feceaab818a816a0df5375aab3a510d73f93d8e213e21f9b1b8531b7421170
-size 20007
+oid sha256:785702c882d04a36382e243ca8dff6b24ec376cf6edd4ef03f5698af99476fd1
+size 14369
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_multiLineConfirmationScreen[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_multiLineConfirmationScreen[4]_genericsmallround.png
index 8bfdde76..8028ca0d 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_multiLineConfirmationScreen[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_multiLineConfirmationScreen[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f6feceaab818a816a0df5375aab3a510d73f93d8e213e21f9b1b8531b7421170
-size 20007
+oid sha256:785702c882d04a36382e243ca8dff6b24ec376cf6edd4ef03f5698af99476fd1
+size 14369
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_multiLineConfirmationScreen[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_multiLineConfirmationScreen[5]_genericlargeround.png
index 912a5fcb..3526da2f 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_multiLineConfirmationScreen[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_multiLineConfirmationScreen[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d98b6e34f332a1f4c34471b5f5f35085087f9652475b42fc749ba750ace4ff4e
-size 22334
+oid sha256:e2c65f0ef0b7c140285699977086a2a91fc7010a8dcd15f4d43b4f97801aef36
+size 15635
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_multiLineConfirmationScreen[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_multiLineConfirmationScreen[6]_smalldevicebigfonts.png
index 6fe3ab15..0574bdbe 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_multiLineConfirmationScreen[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_multiLineConfirmationScreen[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e24a0e86e224427819706df7a07a5029c82875b435fa7b818945af188603e869
-size 19428
+oid sha256:5885019df42c1adf769316cf84626f62b26fa69f97757d3dbf7e06024b4f0983
+size 13629
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_multiLineConfirmationScreen[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_multiLineConfirmationScreen[7]_largedevicesmallfonts.png
index 601a1e9d..cc9a8bb3 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_multiLineConfirmationScreen[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_multiLineConfirmationScreen[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f01dead8f271b4e3d1faca378bc555caf5dd86b3f52b3554c7e64d250c6d3f19
-size 22705
+oid sha256:6522ac3782bb769ce172bdf6f85d555e8cd6f245d07a86a8471682a59107ffbc
+size 15477
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[0]_mobvoiticwatchpro5.png
index c7b7446d..e1f20be0 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4cf28abe9db2af191cbde6bf3e04cd6b159cb9f9adfd933a3461ca71401e246c
-size 29653
+oid sha256:7154144d1a500a657c9e13008036c151e44dc4de47e17a059a4b061886e9d0fd
+size 20812
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[1]_samsunggalaxywatch5.png
index 22615f3d..d0af6698 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3ab74ee3378e522ba001e4d460b471f5de57ecb6fb22e177bf5891b208fbb60c
-size 30810
+oid sha256:c22f1e09a30a47fd98d0ccd1ba0e992bf91dd21d28863465cef2a3a8e8a42d45
+size 22338
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[2]_samsunggalaxywatch6large.png
index 6951fe6a..7d9417bb 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5765be35f9de26685d27429c9e3d871257b11aa58b5bd29b8fc9d464d2613485
-size 31645
+oid sha256:ffb95882c72a29d0be15ab41a2026fb56f77e9ed7e35408434a07733bde9eb1f
+size 22458
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[3]_googlepixelwatch.png
index 32efd919..8405b3c1 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7124cdd9e7943312b88260f6056e50645035e2024f66f50f0bc0c207fdd4b3fb
-size 30222
+oid sha256:ca8215a9a57b0dd043a7268bd14d0b69a42d6dfdb1cc22b94e0981ebd201d051
+size 21951
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[4]_genericsmallround.png
index 32efd919..8405b3c1 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7124cdd9e7943312b88260f6056e50645035e2024f66f50f0bc0c207fdd4b3fb
-size 30222
+oid sha256:ca8215a9a57b0dd043a7268bd14d0b69a42d6dfdb1cc22b94e0981ebd201d051
+size 21951
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[5]_genericlargeround.png
index 41843ae0..9108f28c 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:26cc52b1ab269c1aaf02dc5ec983dd5a8bbaf2cddf233274af769c6d6ee9a392
-size 29288
+oid sha256:c235c035cd23b47770748a829adde0dae2281e9b5fb5a53b308a5fc3258343df
+size 20592
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[6]_smalldevicebigfonts.png
index 5000d97b..09220c7f 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cf5d73bf25bc37a507f7b25f41dcde1d0988cf72affe8483c38dd28d1bcfcf82
-size 28513
+oid sha256:957b1e4d63a0d8cd0339487f3f8e6f9e3c1ceb4fae65ddf6dc4d6c95e245f7d8
+size 21655
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[7]_largedevicesmallfonts.png
index 2e1aea51..b15d1f05 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_screenshot[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:deb652d20e229141339216cbe48cac61dfedadb025164b883ae425f68b387689
-size 28789
+oid sha256:98e020d9d104cb0f652f9e37c3f8f8810931c4b141937e07f7b5e1cf42fa2489
+size 20109
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[0]_mobvoiticwatchpro5.png
index ea26bac2..5cceb724 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b881454ca1ef984992705a35aa6d6365132fed1a018a00dd9d8014c2463def55
-size 29794
+oid sha256:b8bd4de5575f940d19d4bbbe5aa4e70023cdc6de708fe2e2f0960529f7cfcb00
+size 21302
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[1]_samsunggalaxywatch5.png
index 1467e8ed..4dd6f53a 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3eb8bd7f1d6d31ac27aafcd4e4b9d3326c5eedc39581acfb51ef3214830d95a3
-size 26411
+oid sha256:87e761eb8448d68beb85abd57074022cc1680235113f09fac34ec478a09078b6
+size 18956
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[2]_samsunggalaxywatch6large.png
index f7c88493..8da2a710 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1937cd6f3a0082a4ea94d1bd9f7ef22fb1af5e18cc7aefc3726fc883d185dbb3
-size 32015
+oid sha256:52548d248b6d7c319aaffac53079a844b7d694d3ff068e4340e99c70072bf134
+size 22642
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[3]_googlepixelwatch.png
index fb81cbd3..68df261e 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a30eb9ad69dc9edfb78498d3ae533c00b30965061957c45777a71fd8b058876f
-size 26381
+oid sha256:aec27c582b9e2046ecc7386f0af6d9adb0aa623226a8aa20a74557629ff19fd0
+size 18739
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[4]_genericsmallround.png
index fb81cbd3..68df261e 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a30eb9ad69dc9edfb78498d3ae533c00b30965061957c45777a71fd8b058876f
-size 26381
+oid sha256:aec27c582b9e2046ecc7386f0af6d9adb0aa623226a8aa20a74557629ff19fd0
+size 18739
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[5]_genericlargeround.png
index 04c51158..884be185 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:54cd43e9b9e68d846d151cd5cd83a91795482e688db796bf9103892a990d9312
-size 29300
+oid sha256:0f0bd9af44a93ddad82bd02c3a529884f6acdb3467ff45120ab38e528bbd562d
+size 21088
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[6]_smalldevicebigfonts.png
index d714d9a3..c6aee86c 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:09ca061b44c1cf007f829ba25bd06338639fc7b45819fec68aa4785f56726eb6
-size 27883
+oid sha256:e2d5323b97aba72cee2d10fa607a0d6df6e795d146d2911c05573a63610c8a8b
+size 19762
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[7]_largedevicesmallfonts.png
index 2a95f784..d546b884 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_textAlertScreen[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5a1c0dc67ee3bbd92aab93019853040ff3582140a715253e1c9400eecdb0e569
-size 29158
+oid sha256:abea3927b4c15ebd530aba8fbca3abc5a1fa47a86c1b56b66206ad2091a10e1a
+size 20575
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[0]_mobvoiticwatchpro5.png
index 443c531f..166a5ff5 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b4641fd59754c1601549e548d486c88564504f866f807e54e408dbda4ad52b5c
-size 28264
+oid sha256:39cc03b7289012e57e2610d29296c257411655401db5bf982d66c6f9389c6259
+size 19519
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[1]_samsunggalaxywatch5.png
index f5610418..09c9bd5c 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5ef1bacfc26e4e05df47587b6ea92d355db36ba96518ecfb567eeb8db06c46de
-size 28870
+oid sha256:c6f39408bf45d4c55bc7a9db88d425fe54f356a6448a91efa76045903cd0bf46
+size 19696
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[2]_samsunggalaxywatch6large.png
index 2aee7503..174d7003 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8a4886859d4726c10bad7b1d486ff29817b299743b53571aa9139e71a6dfd263
-size 30281
+oid sha256:44155fd5214c0476e70d00750ce5a03db9bb24a1af2af58ddd7db1da341cca79
+size 21204
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[3]_googlepixelwatch.png
index 77747f4f..07bce777 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:201e43d25744c89b8bdecf8891a3bbc5a2bcaeccad9c1d1fbdd9eb6599d85b01
-size 29229
+oid sha256:1e963007d5344d2a3d08691009b873b2f744b767c1ada1dbe8fc1a60a166b2bb
+size 19843
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[4]_genericsmallround.png
index 77747f4f..07bce777 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:201e43d25744c89b8bdecf8891a3bbc5a2bcaeccad9c1d1fbdd9eb6599d85b01
-size 29229
+oid sha256:1e963007d5344d2a3d08691009b873b2f744b767c1ada1dbe8fc1a60a166b2bb
+size 19843
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[5]_genericlargeround.png
index 4c7364c8..a5672e0d 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b8be1e2003b47f7092c394d774b8291a7235db755f278944d15b75d720c2840b
-size 28484
+oid sha256:bf4fe8e6975551397982538b6dd7b00124f477b1834a988b340be56ab685f002
+size 19473
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[6]_smalldevicebigfonts.png
index e70d7580..ce4b552d 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:efb365264d2dbb4e1c79f7e3a20628d1fc1b20167a8eaa196de67fe750f9d176
-size 32723
+oid sha256:b0baf1294133acccf7d1185756df9c048b3e8d510fdcb6ef492c8cb17161dd40
+size 22182
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[7]_largedevicesmallfonts.png
index 90c57248..1f75abec 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_DialogTest_wearMaterial[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ef380ae38447e89b0e2eeffec70c5a91336a444c0343da1ee526ff68d34afc90
-size 27277
+oid sha256:72d87f42f89b581e0c8eed8997a6e1441538ca4913e18d693f4038b16cf22049
+size 18878
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[0]_mobvoiticwatchpro5.png
index 60c950eb..2e29a25a 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bdab3358f902ec40f5020a2e6df9ed58eab4a7ed6a2bd4d7a74d1d63ed0f96ea
-size 37683
+oid sha256:f14aa02da397d3565ccbb34a0a885363cc5737f6b44ceebc22d8eecd1a48e115
+size 27085
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[1]_samsunggalaxywatch5.png
index dc8b323b..d48a76fa 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:50849a64d5c1a4662334520d7ab3b7ef50d06f1d3c1bc19087f0d3d69a45e477
-size 32372
+oid sha256:2a7dfb20b9cf002aec33a1cae92509e4d100c834b945bcd0e6e8a18f2811130a
+size 22974
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[2]_samsunggalaxywatch6large.png
index 7c94c0cb..48fcf2d3 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e3f5ace40c2dbe6a30bb5a7a6788444bc320c55e4dbb48a413605c89ecbc212b
-size 38990
+oid sha256:53a737eb8fd484cc5d5b39775d56ce31b30fc14ad05d18d76519110b875bf27a
+size 27610
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[3]_googlepixelwatch.png
index 949f8bf0..dea25acb 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f0a75a3013d37793da2ddbe0cba419d4d4ab4a02eecef0ad652e3d6ef75d7bb6
-size 31944
+oid sha256:e386cb76793df71cd089e80add63adf140fad356d03bef78e5ddfa8e7049f3e1
+size 22590
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[4]_genericsmallround.png
index 949f8bf0..e91dd5b4 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f0a75a3013d37793da2ddbe0cba419d4d4ab4a02eecef0ad652e3d6ef75d7bb6
-size 31944
+oid sha256:012b92f593d2c118268dc1a4a911d4bc560e461ac55701fef5c4ce19a69762c3
+size 22081
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[5]_genericlargeround.png
index 1c1fc56f..189628db 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:35f57fa208c789ad6082f8309ce7423371a3127d9866df9111497cb7508ec5c4
-size 36760
+oid sha256:1cb13e9aa1b2711db0235f43472f5a935d6913820a42867515007a783ea1205f
+size 26454
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[6]_smalldevicebigfonts.png
index 60f8f1ba..1d5f0f06 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4f14294da2feaa3646f73d323ee91d42abb4a7310e2e6734e0f584db5fd8a858
-size 34580
+oid sha256:2f65cb39ffada91ed927773e0d3d4d6f7aa2930a7d94b04714893c692b5f34f6
+size 24592
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[7]_largedevicesmallfonts.png
index b933b4a8..419d14d5 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerLibraryTest_screenshot[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2cb674299b8f1dc4cc2cb2c1b05d982aa0b31ac3ca8d66aa9a1d1eeebd7c936d
-size 37135
+oid sha256:022b7fbc80342ab04e314f4a63eedde176a8d96444e951477dfe4b7ce7180554
+size 26413
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerTest_screenshot[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerTest_screenshot[0]_mobvoiticwatchpro5.png
index 702bc23b..a8596ee5 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerTest_screenshot[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerTest_screenshot[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6eeab5acabefd909adb119769cbd7c762bad2934fa6c8af8f3e9e445ec2fbe23
-size 122109
+oid sha256:dff20a304f0f9efe9eaccc0849b9bc8d65c15301083681c6f6c4053ba5ae7c27
+size 131611
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerTest_screenshot[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerTest_screenshot[1]_samsunggalaxywatch5.png
index 2415584a..9fb858f5 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerTest_screenshot[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerTest_screenshot[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cb227c0883860eeafa8f440b770879bec427bccf5156d928e5f3fda3ec6bd221
-size 95344
+oid sha256:26c0ca8ced4d452dc335a9b649c83cf1de8707bdbef7c5ba8af83b59038dc196
+size 101586
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerTest_screenshot[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerTest_screenshot[2]_samsunggalaxywatch6large.png
index 18c2fdca..1e3af636 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerTest_screenshot[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerTest_screenshot[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:54468f8e4aeb687fe668cf087e53e2bb2ccf2bc594b5a81d49d2ec55610ad8bb
-size 129094
+oid sha256:9a01d29101e2d234078c7bd0a49004defd5e13cb5bd96ffbc91963a55119063c
+size 138479
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerTest_screenshot[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerTest_screenshot[3]_googlepixelwatch.png
index 72a089dd..405ec134 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerTest_screenshot[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerTest_screenshot[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b740a6c53b77243ba42f83a66cc83c7900f6d8a3e0a690d9cd3d2e9d605e2021
-size 90271
+oid sha256:e8ded68ab62c7c998fec72787aa6bdeba6d70c25b30c7c5ecb5baf9a8e1d86a6
+size 97464
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerTest_screenshot[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerTest_screenshot[4]_genericsmallround.png
index 72a089dd..405ec134 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerTest_screenshot[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerTest_screenshot[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b740a6c53b77243ba42f83a66cc83c7900f6d8a3e0a690d9cd3d2e9d605e2021
-size 90271
+oid sha256:e8ded68ab62c7c998fec72787aa6bdeba6d70c25b30c7c5ecb5baf9a8e1d86a6
+size 97464
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerTest_screenshot[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerTest_screenshot[5]_genericlargeround.png
index b1b61d9d..034bdb7e 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerTest_screenshot[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerTest_screenshot[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ced68280e898e7275c124c3be3236c77c36923aa239159c42b8813ec9bed3233
-size 117714
+oid sha256:c8e92819de9c80945001b9ccd657cb6e3a47d73da8ca03095736678464ca242e
+size 126888
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerTest_screenshot[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerTest_screenshot[6]_smalldevicebigfonts.png
index 032f796f..c24979b5 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerTest_screenshot[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerTest_screenshot[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:500fec0a6d9565c043227f28d4d00e8e84586464bc0d99defe0c2838da686f6a
-size 91163
+oid sha256:f1df84e1fa18e30e810a212f9c6387eae61090309e4f1e55e3d29512aa45aa6d
+size 97617
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerTest_screenshot[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerTest_screenshot[7]_largedevicesmallfonts.png
index 6550bd3b..ba97bd66 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerTest_screenshot[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_MediaPlayerTest_screenshot[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8c0569b59a9cf856ee74e46638252975775fe8532905403261804ab4bd01c719
-size 122306
+oid sha256:2d17c2ce255c4dba5d82d977f42c03a56c731e95bf53aa0e7e750c70b4e6a25e
+size 130412
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[0]_mobvoiticwatchpro5.png
index de2ecc02..a4b56b3e 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d5d4aab491d4b5413d8b382586801ecc04e1fe29a64fefcd05d99e2499012067
-size 28727
+oid sha256:a710460d8104c25dad5bf57c94ede3aae6c03d533f1b27fab05925054c3c3bd8
+size 18779
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[1]_samsunggalaxywatch5.png
index cd7639c1..8a74a013 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:55e7da0b46c40c0a72975f99547c15f92a19fa654f567ea8806480dfb6686952
-size 26643
+oid sha256:a49633cdf8033b7739c20dade539c5bf98b158fe1bb49e078924e843991045f6
+size 17368
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[2]_samsunggalaxywatch6large.png
index c8d63c1c..cf3f5297 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2570d22dfce92690e8ca890e371e9dee82e201d1ec86c605a7b791889746cc30
-size 30434
+oid sha256:e83b4d6a602179c745bfd8d8ace68a9eb12b9cf8c72f96f4369f6713ce9b4702
+size 20046
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[3]_googlepixelwatch.png
index 41f1289a..c9e44a22 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ab64d1912f8753dbd14b34aecd748a81f129f72e287aeedf19f96f13f04cb56b
-size 26214
+oid sha256:40eb1eaae4b36cbcca08b6303448b57c269de4b891c0a708fd447d07e0695508
+size 17132
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[4]_genericsmallround.png
index 41f1289a..c9e44a22 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ab64d1912f8753dbd14b34aecd748a81f129f72e287aeedf19f96f13f04cb56b
-size 26214
+oid sha256:40eb1eaae4b36cbcca08b6303448b57c269de4b891c0a708fd447d07e0695508
+size 17132
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[5]_genericlargeround.png
index 0a6cfe39..a93e3d54 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:51f1942ad3e7a2d20319941d720c1de2eab8d64adb8f0e88e67cedb59f4f8c99
-size 28433
+oid sha256:083474d50adb2959cede467465c82e202375784cea3b883d2ae8ab3f2e5df8f5
+size 18559
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[6]_smalldevicebigfonts.png
index 022b14ed..db4830d9 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f7971666eb0e866655e46459ef7defa60b8945f343bb772effbb6ab67174660d
-size 27684
+oid sha256:36193bd217ca9e8159cdc30bbd36fec5a5b383b74001c4e5d02664fd0a2471fa
+size 18207
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[7]_largedevicesmallfonts.png
index b562a47d..8d1c8cf7 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SampleTileTest_screenshot[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8682ee6e3c2534a50b1e525637489605e8df928ca07d5a8ee84faced1d3f970d
-size 28334
+oid sha256:76507b322125a5f081b6b59faf7444e6031e394208ed48a9db8b6f55ac7b4630
+size 18479
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText[0]_mobvoiticwatchpro5.png
index 7fa99078..baddb381 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fba9b4b3476bcfd175fce57247c9103f7f79ee8426f4c6c98da4f83f65864f01
-size 42079
+oid sha256:da805c2bf23972a672ce3e1822561aefdabf080006a4fb085758572f409ba8d0
+size 29661
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText[1]_samsunggalaxywatch5.png
index bdfe87f3..2a96f329 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2999ed8a7c5e43f41796f49f4fb945fc3e04ce69c3b4a137459e84904ed539cf
-size 36990
+oid sha256:bab6df6d22f7165eb5ad3a8a23599e8dd69d18f10e615c890e8b740472193c23
+size 25932
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText[2]_samsunggalaxywatch6large.png
index 680e559c..b40a4649 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:66632e3e88d557630dfb1da380d71d08dbf53a5d30a4fac81da157b0d96d91ae
-size 43235
+oid sha256:b7c182ab0aa591a0502f644ea6051cb4b3443cd3df6b6133b1a3f1af55b1b499
+size 30854
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText[3]_googlepixelwatch.png
index 19415307..8a46ada1 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7c2bda8fbdcef612a44da977c586a907f8b283c7de724800453d0fe51aa15b02
-size 36502
+oid sha256:e252de03166aabd7d6d320fbe8233af8ba452f24ea23bcc3e234e11dfc03e9da
+size 25656
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText[4]_genericsmallround.png
index 19415307..8a46ada1 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7c2bda8fbdcef612a44da977c586a907f8b283c7de724800453d0fe51aa15b02
-size 36502
+oid sha256:e252de03166aabd7d6d320fbe8233af8ba452f24ea23bcc3e234e11dfc03e9da
+size 25656
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText[5]_genericlargeround.png
index 2cfff0c8..7594c4dd 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:24146f08e4382f294152abab9b2b0a421e111170d29bdaed3ad999cab5b35412
-size 40956
+oid sha256:8494a2008af4861d4668a359f53750ba51db69d5da89c0ce259412ae636360af
+size 28920
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText[6]_smalldevicebigfonts.png
index acbec3fb..127181c5 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ae59f6c3e89f8be872c36ca3a566df0069f54f9a4e8604145f47e518107bc8f4
-size 38369
+oid sha256:0216e53dcb99bca3b9529cdd0c934742553c531bdda546814d09864310debb49
+size 27204
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText[7]_largedevicesmallfonts.png
index 04c9b7d6..015de5c4 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ed6ebe5459bdbd098e626aa7b996f2b28cb9f4e2cebc6f88af6c660b718aa6fe
-size 41285
+oid sha256:21a962eeac8f8148d1bf8adee093d8bc0ea2990d7c2e0f52e3f561ad49b85fb1
+size 29166
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[0]_mobvoiticwatchpro5.png
index bca61616..dfbea489 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c247f7aa94b987802e13484e68fcac7bef9a4743cc81941a14b9f2aca5594c76
-size 97543
+oid sha256:9fc5bb303292e7de494c1db95741966c88b0677a732409ec6003690e2b5c06fd
+size 68333
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[1]_samsunggalaxywatch5.png
index 90f99882..c402a40b 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f5c517864ead45fc60d81d965f0532aa1f709274ad8caef8df18d1db974cf877
-size 79226
+oid sha256:74aae6c946c44f43bbe9985a73da800da6fa15c96061e5d6c9c8ef744611bc16
+size 56901
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[2]_samsunggalaxywatch6large.png
index 39bc7179..1b004bc9 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:062bc7eae4bb02333f5f0f6563fbadb8f34cb7974f10406ec9070e7fae5efe0c
-size 103659
+oid sha256:0a965019f8d6a91181f476642dafa9829008184ec4a26aef416510dd0761bf1c
+size 71312
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[3]_googlepixelwatch.png
index 829e2e35..b08dfff1 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d616e8e07ada835550a0c6f98023851f5755beee07e41013b7f964980b732dd5
-size 76562
+oid sha256:b44eaf666dd400944b8a41627a53067bd091ab800c088738ddb1b07a956281a5
+size 54786
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[4]_genericsmallround.png
index 829e2e35..b08dfff1 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d616e8e07ada835550a0c6f98023851f5755beee07e41013b7f964980b732dd5
-size 76562
+oid sha256:b44eaf666dd400944b8a41627a53067bd091ab800c088738ddb1b07a956281a5
+size 54786
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[5]_genericlargeround.png
index 6c83b37a..afa4f559 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cddcb381e728b86b1c170031618e12ddc584108a8d815a2817d2ca968ed057cb
-size 94875
+oid sha256:0f2edb3998a0b4b37ac51cae18171835c1806753f539fbee8fe74c44e41a7a8a
+size 64675
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[6]_smalldevicebigfonts.png
index fe6068d1..673c2387 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a7c7dea77f5a1383708b85da841d7ff42df7a9c515a146eee924f02a73c151fb
-size 76070
+oid sha256:3765b8ea6fedaaa985ee529e43825f185ca4f024a56c26b0ad9252e5ccb39e67
+size 56407
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[7]_largedevicesmallfonts.png
index a480ae75..3ed901a6 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_belowTimeText_end[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:674329432867d495b8611a5e4c39b6faeecd73697ad2839ac2901212287fa001
-size 95272
+oid sha256:7cb9afc3e6d1026093525ddc21547c5bd0975d96e2e40da5fcf8bd4688447a51
+size 67244
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[0]_mobvoiticwatchpro5.png
index 010c0a04..c7f8a8d2 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cf82af3e0fc7fc9f85841e3ededfdf2c976df62b097c4efcadf86f6628c027f4
-size 42634
+oid sha256:9b320220c57ffa5ffad92ba033bc73f74685d971a704889c08fcbb97d5491ee2
+size 29990
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[1]_samsunggalaxywatch5.png
index 9c45d842..1dcad403 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:855424901f9f36c3692f363dd69b1f1654feada7037aa3cc86aca6e4bd8b6480
-size 40427
+oid sha256:e0e8c7b0a530f277c967cb25e6d0482975d5cbd6a0fba0c7d25ffca16937009f
+size 28412
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[2]_samsunggalaxywatch6large.png
index c0f3d8d1..6ea71b3e 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e43a487f700a6b1368bb8bfa9b22f491ae00e36808766d1931618b3850591926
-size 44237
+oid sha256:cd390a2a6b98ab3e93018692d16adbabffc4572c0edcd4720f0d8e02fbbce695
+size 31392
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[3]_googlepixelwatch.png
index d8eb80bc..25bd5c84 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:245bd194316f179e0d623a8c99c9e4fa53898c9a726984bbc2f20334014a6d81
-size 37336
+oid sha256:4cec13af90914aacfb787d9295d8837c2eaf91b8e181c877d0841cfd5151718e
+size 26395
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[4]_genericsmallround.png
index d8eb80bc..25bd5c84 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:245bd194316f179e0d623a8c99c9e4fa53898c9a726984bbc2f20334014a6d81
-size 37336
+oid sha256:4cec13af90914aacfb787d9295d8837c2eaf91b8e181c877d0841cfd5151718e
+size 26395
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[5]_genericlargeround.png
index beb837d7..de331bf2 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:60a335d32aa45f385e7d7076ae4e29e149ba8231a602fc56465e1e86fbc53840
-size 42210
+oid sha256:c46465e4ea81950eb5f5cbace208fea6959d375f503a2d83b71a1311675187f4
+size 29771
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[6]_smalldevicebigfonts.png
index e0e59de1..b6d1a8f2 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e627bea227aba677113c257323ce55eb9827b518ccec0c5a58bf4aa0a30d7186
-size 39182
+oid sha256:b06fea919330d7444fb42a0c4dd574ef7e46472048be8cc0fb00c06e430dbf8c
+size 28039
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[7]_largedevicesmallfonts.png
index 83972fb9..59fa9cf5 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dab29101bf2e8e4f867fd597ce2389c4232376268e83f5c7116845e7ba6b9a13
-size 41985
+oid sha256:88448f43cd54a808c13f62b7f0d1d176b39e8a03e791f9e23b70273ba883dece
+size 29503
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips[0]_mobvoiticwatchpro5.png
index 75c8d8f6..b1cf8a9d 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f65f3f09f12766872b2b4d569d574bec79923373ff3f7fe311f2b0d0d06ca339
-size 25284
+oid sha256:e92983093791a2a6cd6e57519d274b02e802101181710a51f5cdc34a475f7e5f
+size 16951
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips[1]_samsunggalaxywatch5.png
index 6a27adbb..5b1a40d3 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:17349db2fc18bea26b828441dcfee7112ce5ef9f7fc6bc28dd01c5eb70083649
-size 21587
+oid sha256:e6f850d6486477c2b58dd9cbcd15103232fc3874cf2bb1e4188aee62d44418cd
+size 14416
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips[2]_samsunggalaxywatch6large.png
index 4d6c16d2..a25797cf 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d9b1c44ba94ba508259cfb591d02ee8bbe34a6f163a87a2762ac31c30dda041b
-size 25721
+oid sha256:f7c08c4cc48695ebcf7699e90c2d63237d54dbcf5f39ea5427a6c9f56cf56a6f
+size 17073
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips[3]_googlepixelwatch.png
index b60750cb..5a9d703d 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4e30749155936bfbfd5956eaeb344c8dd0ab9f507af42d92d0ea1b0dc79f2fbd
-size 21224
+oid sha256:add18fa7e438995dc56aa16faea20c94714ab0e31d828ed8a8f76aa62cf99aba
+size 14148
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips[4]_genericsmallround.png
index b60750cb..5a9d703d 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4e30749155936bfbfd5956eaeb344c8dd0ab9f507af42d92d0ea1b0dc79f2fbd
-size 21224
+oid sha256:add18fa7e438995dc56aa16faea20c94714ab0e31d828ed8a8f76aa62cf99aba
+size 14148
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips[5]_genericlargeround.png
index d2d0467a..062ac498 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1d8af52c1c7f9f56d2b9e7e5a17bfcac9f519e9bcc792dd0e3cd9b38def546c8
-size 24061
+oid sha256:04f6e3d7a742591a2209db8e82e11cf3eadc62b7a46a5a447334936ac637d0f2
+size 16125
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips[6]_smalldevicebigfonts.png
index ac24e6f8..66ed8b42 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c1c28224c67bc1d23f2e60e4c713d0abfcfd17b7008105c632814ef4322034fe
-size 22161
+oid sha256:423628ddd9a7a3f90d6340e6ea0646a7348e6aac0d42ce5026c759b1a7fd25da
+size 14944
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips[7]_largedevicesmallfonts.png
index e5822bdd..ce7e7e5e 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7d8b69dba94f4299ac639d74c6c764dbcc863ff33311e262087ab18b8f5085f3
-size 25089
+oid sha256:056b3cb8729046c1203cf438ebc71628d8f63a39865b4a785b828d7c50585292
+size 16721
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips_end[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips_end[0]_mobvoiticwatchpro5.png
index 771da2c1..2114fb1f 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips_end[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips_end[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:faf55dba6b3fd97d0b0d632c04e9d2cc76096a6d49009e93cf8572a11560c8f9
-size 25249
+oid sha256:dd2150de53d749c4eb7214aeb1e67720efa9bf9b6a56775a30707d124cbb93f2
+size 16703
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips_end[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips_end[1]_samsunggalaxywatch5.png
index 08aeba59..4b523020 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips_end[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips_end[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7ee0061a73c97028ecf1e83fc9b1cf4325170140484360c1aa28592cfc7a2a2c
-size 22057
+oid sha256:4fa2e63994288e0e24ddef699b12646d6876b65006142ebc50f04c29289034f7
+size 14941
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips_end[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips_end[2]_samsunggalaxywatch6large.png
index d390bb51..3c55c1b8 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips_end[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips_end[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2f9addec9a13e25e987237c3c6b4ad3f34bc0dd469e3da35d55f22b381dec5f2
-size 26497
+oid sha256:47a596aebc64cde82ee64d5df3daf6fb87f8f6c3620b4502b9df54f0152dae51
+size 17749
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips_end[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips_end[3]_googlepixelwatch.png
index 5e01c2af..7ec03a8d 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips_end[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips_end[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:821c504c0b938b5a4b478ad69b90e13808d8745f13262ebf5654a677348a6bcd
-size 21716
+oid sha256:87478ae20604d7f9c89599de1fdff9198d0e310f223a5da0444cdabde220739c
+size 14605
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips_end[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips_end[4]_genericsmallround.png
index 5e01c2af..7ec03a8d 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips_end[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips_end[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:821c504c0b938b5a4b478ad69b90e13808d8745f13262ebf5654a677348a6bcd
-size 21716
+oid sha256:87478ae20604d7f9c89599de1fdff9198d0e310f223a5da0444cdabde220739c
+size 14605
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips_end[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips_end[5]_genericlargeround.png
index 09f7d620..ae8e0518 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips_end[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips_end[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4fdf800367d3a4b0fd139abdf4df49a2bd115c941f995562a9387e458ca422c8
-size 24686
+oid sha256:7989412001ea4db4f73e1fff4fe1f0611ee70653fc0455e64427ae6c1e5b55c7
+size 16477
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips_end[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips_end[6]_smalldevicebigfonts.png
index 360fdf00..1d7123a0 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips_end[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips_end[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1aeecc9ac812a11f4561566c0c2b415a845caa1c91a50c3d71718641328f687c
-size 22828
+oid sha256:9270bbdcdefc6e7ef3b49cf09ba4c0b70327491ab601d96de4fe602b747f6271
+size 15522
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips_end[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips_end[7]_largedevicesmallfonts.png
index 628ac4dc..116ce1f1 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips_end[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_chips_end[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0f8aba1878543dbef936dee431b10db2446e1eac90f3a1a035076c67d296d850
-size 24838
+oid sha256:305fcae7a6b7fdf885300486bc12654ba8bd2538d499e5bf41b82d1e09b9b6d4
+size 16369
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[0]_mobvoiticwatchpro5.png
index 71cee991..f430ad30 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3810667a986e682204b7f0540b5828ce552c748dc102ce3a4533a0f7eea72605
-size 82516
+oid sha256:36858d9b3b12f72c354059e56d11fb3a4c9cf0ac50edbafb44f59e4f85f5007a
+size 57123
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[1]_samsunggalaxywatch5.png
index db35eecd..2b4723f8 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9bbb9365e5f017db29b9e4f0e9e865bccfa7e554caad9b8383e2e2aa487a15c0
-size 69529
+oid sha256:2698ce0741ad77ba749ed05406b5cd12a35a16a424b81403eba5a50becee9112
+size 47488
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[2]_samsunggalaxywatch6large.png
index 98a73a96..2f8a7b36 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cce5adf76f20653b2858bdb138e5c890362f9e082f504ea302af51d1398be161
-size 88292
+oid sha256:c0ca061e0afa97b4da00fbd60551e5a8caf90796a9c76f01478191222ad1f508
+size 60657
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[3]_googlepixelwatch.png
index a4fd9dc1..82aa1375 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e040ffe99cbdf38d8f0c16908d17bac0130271e4831f3bd6a3e30c3f3ecd7b1a
-size 67277
+oid sha256:bf3b11fc859c163dd6338289e9fa690f66474676bfa2306fff108b5c445cbf88
+size 48707
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[4]_genericsmallround.png
index a4fd9dc1..82aa1375 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e040ffe99cbdf38d8f0c16908d17bac0130271e4831f3bd6a3e30c3f3ecd7b1a
-size 67277
+oid sha256:bf3b11fc859c163dd6338289e9fa690f66474676bfa2306fff108b5c445cbf88
+size 48707
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[5]_genericlargeround.png
index 8d7cfce9..51f7c71e 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:84a34d30f49c6f72beaab06c21ad28f6a0a2b0eea53b83b0444077238e9e5e46
-size 79384
+oid sha256:18060482d224cd5777b4c67846f8c34bb8168338319f7a8515f5267f0567b8be
+size 54592
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[6]_smalldevicebigfonts.png
index 5a6bd0a3..010b6e93 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2368d475a2ba696edead3aaa208bbb0452b47da24551a42329322cf278c74d6e
-size 73686
+oid sha256:5fa862e22b3bbc67c13cd5e45fc3c7554fc489a00a1d86fc5f8be80398fa22cf
+size 56560
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[7]_largedevicesmallfonts.png
index b96a2e4d..10ebd650 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_responsive_end[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:90ba3f778b7d181f5e8d129e5a8ee26cdb30ae240b9762ab65fd1bfcd7772d48
-size 78855
+oid sha256:031f9eab094fde674ca327a49d734e202cdb2b2f4a57b07ee1464f18f3b59f67
+size 54355
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_screenshot[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_screenshot[0]_mobvoiticwatchpro5.png
index 0ad9c7ae..14605beb 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_screenshot[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_screenshot[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3b6693a7fc15b7949f552f315726d8c0fc6a13e3317ebad84f8dd265216ebaca
-size 41588
+oid sha256:ff653b2dd5dc6bf82290a486359f379c87d0ecea0cc10d3278dc33edc339b3cb
+size 29079
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_screenshot[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_screenshot[1]_samsunggalaxywatch5.png
index 4df93dcd..e63aeaf2 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_screenshot[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_screenshot[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:608cbd043343173e19646ff3c0ae0de74938465de2ea71ae886cc2046a2477e6
-size 36734
+oid sha256:19bf35c15ae20ee3ccf8e98739388284848250de129d308c6221c27771f40995
+size 25831
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_screenshot[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_screenshot[2]_samsunggalaxywatch6large.png
index 98f0b5a5..bc2aef3f 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_screenshot[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_screenshot[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fd8bc3815406aae23cfb4b7d9e2d45441745a0f7a36c3ef7ddc987f97bf5cce3
-size 42853
+oid sha256:88438fffc4823866410c890e07bb49eef1e51bde826ce37cb228cb5da55d2652
+size 30666
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_screenshot[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_screenshot[3]_googlepixelwatch.png
index 1d34215e..c838fdb4 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_screenshot[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_screenshot[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e1a25f2527a2a9a9bfdd510c1ac45f9c18c950e5d326a0b9307852da4cdbf48d
-size 36678
+oid sha256:60c41c668de61e50a3b4523198f87f5704f432e0f191a8fe541cde94b4e6002b
+size 25353
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_screenshot[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_screenshot[4]_genericsmallround.png
index 1d34215e..c838fdb4 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_screenshot[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_screenshot[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e1a25f2527a2a9a9bfdd510c1ac45f9c18c950e5d326a0b9307852da4cdbf48d
-size 36678
+oid sha256:60c41c668de61e50a3b4523198f87f5704f432e0f191a8fe541cde94b4e6002b
+size 25353
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_screenshot[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_screenshot[5]_genericlargeround.png
index d987a0af..a5795675 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_screenshot[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_screenshot[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b25cfd28448ada7f5dfdf8d0f2d02250066155372dbd793d6dcaf0ded60c8e9a
-size 40773
+oid sha256:8cda62f39c10d2d947bd55fe9d5d99b9d598d4b513015f86683b209c6c372aa8
+size 28811
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_screenshot[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_screenshot[6]_smalldevicebigfonts.png
index 5337bd23..2f4edd39 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_screenshot[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_screenshot[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0b148abfedbfe696b59578d82a1a7d61ee5bdd89cb6d28759d332a59f242090b
-size 38898
+oid sha256:52cb748ade682b24d909bfd9715a6783674707b484581b2df53de3d72d817130
+size 27170
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_screenshot[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_screenshot[7]_largedevicesmallfonts.png
index 463833af..b0d3d792 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_screenshot[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_screenshot[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:24f3ec6476d4bbb1bfdd64ab091f440fde5cb25c2237b72a92c3fcb9e7c220bb
-size 40557
+oid sha256:b3d5f8ab719c8b2cc1df16e2cbfcdd9596268de97c3f488ecd006610b85d807e
+size 28536
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips[0]_mobvoiticwatchpro5.png
index 9aee1e0b..b11808e6 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0402b0a5da11867d24ceffcf61d2b2bab55a411a98d32604fd5e22ca48a3ec1f
-size 25719
+oid sha256:ed078ff23937a42e6429847dd24a69c21e8ac8cd742da108d0274f5bcba27e78
+size 17153
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips[1]_samsunggalaxywatch5.png
index 96e86fa8..7cd0aad6 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:be746c01eacb41c84dc2dfa07a6b4b3c3fbfd3670a9c6103a40d14106eb25748
-size 21595
+oid sha256:5296c9dbbd9cfd3c9b86e87a426b1ff4b8d979ff7562032a82e492b66d56c998
+size 14299
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips[2]_samsunggalaxywatch6large.png
index 7bcc6734..cc118a97 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8638bfc4c7d727d8b593177b51dd721dfe0fc2719ba7936c2a85e22bea4b188e
-size 26875
+oid sha256:b468c49c6a9837d0879f19e950ae521c6a4a242e5dab8a0e3e4791959603bd9d
+size 18095
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips[3]_googlepixelwatch.png
index 85bdf22e..1f7d9789 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:27d73aacdd62756da97a7020ae1d1ba465c5a4681aafa49ca6cb7d9dca471585
-size 21581
+oid sha256:cb4e99a2d40575988c60177886c60841103ed32bf98a3affd9a5c1d92414dd58
+size 14037
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips[4]_genericsmallround.png
index 85bdf22e..1f7d9789 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:27d73aacdd62756da97a7020ae1d1ba465c5a4681aafa49ca6cb7d9dca471585
-size 21581
+oid sha256:cb4e99a2d40575988c60177886c60841103ed32bf98a3affd9a5c1d92414dd58
+size 14037
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips[5]_genericlargeround.png
index 6bec64ad..438ea591 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9ff7b537bec872a875b05a9b2fd89abb4d55e30f0c9c67e8328775cf1f7aa3aa
-size 25188
+oid sha256:5713ae67eebb0f1a647ef765c92faea901200a03dfa4dfa8442506edc3ce850f
+size 16884
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips[6]_smalldevicebigfonts.png
index e731b923..0522a588 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:620b299a18ad7c6a5b52e9688c4dfef731b8ff44f67cc68836a773531cda3a73
-size 22470
+oid sha256:dc8e30be5360340866b32f47cf116ade8f528f5cb8de7fe43a799228d0279688
+size 14907
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips[7]_largedevicesmallfonts.png
index 8cf8484c..fae5ad6c 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:225838400b50b92e29230cc56d12f86c9a0a72c8125163fb979651afff78081d
-size 25334
+oid sha256:52a579c4e9b95ffe6635cae8ade068504ddb09066801a60c27867fd51c5bed30
+size 16827
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips_end[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips_end[0]_mobvoiticwatchpro5.png
index 7267d8d9..5f2ed127 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips_end[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips_end[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:220e99d1a7c43f31bcf740e8f1a61abca5a720859860a3f2f7575056709cc6a0
-size 23074
+oid sha256:7a0a1ad9e0b9099e2029089fb380cfb64246ab360e07c65ab9a336cfeeab7bab
+size 15217
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips_end[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips_end[1]_samsunggalaxywatch5.png
index 43e20dcd..0be8de58 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips_end[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips_end[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e21cf28b0fed4f223fb26b7d0b8782bc50f0638824d83be2df01ba0aed765a22
-size 18817
+oid sha256:21703349955816ec713cee7240c4e9b79ea5cac14bc8c3b5b7fd7fafc809d928
+size 12391
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips_end[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips_end[2]_samsunggalaxywatch6large.png
index 6721b3c9..f0753c81 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips_end[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips_end[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:98872d115515054dd3a0f13b963eb4b55c7125d5bea03c8561756389403287c8
-size 24277
+oid sha256:006680e0ee3af1d63a9b2d5913d2970550c1b20ed130c952a715fa7d44197ec9
+size 16092
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips_end[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips_end[3]_googlepixelwatch.png
index 0139ea67..3a4e2d54 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips_end[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips_end[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:55e3d5e515286478a3f5122019bd8a37323e1ec92a322c29bf226c6bbd51a32d
-size 18642
+oid sha256:52f0d0f04e670f9e586419518041973072a5f9dfa1e4d836f7d9e60b035d3415
+size 12169
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips_end[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips_end[4]_genericsmallround.png
index 0139ea67..3a4e2d54 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips_end[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips_end[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:55e3d5e515286478a3f5122019bd8a37323e1ec92a322c29bf226c6bbd51a32d
-size 18642
+oid sha256:52f0d0f04e670f9e586419518041973072a5f9dfa1e4d836f7d9e60b035d3415
+size 12169
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips_end[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips_end[5]_genericlargeround.png
index 1e745b75..37f42f78 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips_end[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips_end[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8552770434afecbbe9da4ccfb46d42442302f724558cd9597d1296abb7e841fd
-size 22748
+oid sha256:d82dc34dd00d356a7fcb30441a7210806a17d5dd433dbf457fc897b8765f5bd9
+size 14989
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips_end[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips_end[6]_smalldevicebigfonts.png
index 68451656..f6ad288e 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips_end[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips_end[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6da3ef6875c07567a6907a2bdc9d19278db31943ea29666a18e330cb5e76d101
-size 19450
+oid sha256:8fde81edbb0fd56a16a70e144da0d1be3ecf327b8f5c8b3c590e6a0105ca9c0c
+size 12854
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips_end[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips_end[7]_largedevicesmallfonts.png
index bacbad84..1be3d853 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips_end[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_chips_end[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:747f84b5c91991efa2b125b229d5bf72a4ca423c955ec5bf133af623df58efb9
-size 22810
+oid sha256:722e0d14e3c18a06d301a32e693640e18b6c06cb504b493130500834ced722f6
+size 14931
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[0]_mobvoiticwatchpro5.png
index 141e4a53..1558e7eb 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7fab25520bb187a0a22ce51c21c66335979128294162c9cf4ade6f80938b5dcf
-size 83080
+oid sha256:2729d50b7cd10493789ec910896936d36c97903fb000e937d8242beede4832af
+size 57352
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[1]_samsunggalaxywatch5.png
index fcdfab86..2b4827ec 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:37e6cc068ee3452cebda623e027321506d5402cfb821c35a184295c93693daa2
-size 71816
+oid sha256:b4e4de23b930009b9d049700ededa693eb3a1fe82ccf2d9bbc63a23bec531c18
+size 50238
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[2]_samsunggalaxywatch6large.png
index c0d3e4f9..65ab4aa7 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d9a338bc5bcca01f689807088c639bcc3f0b5a9ecca3e48087a1f464519bc470
-size 89634
+oid sha256:3d0e58b7ee623cd65eb402bf41bbc44020923669fd72c753381d745cc1d50764
+size 61920
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[3]_googlepixelwatch.png
index 6b8b747c..59c5d91c 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ff24fd1fbfd0d0f60946ab365bf4d604df22caf7611f099c1e7cb6fe03032fd3
-size 68832
+oid sha256:dce093cc8940e9772a39bd2912a681cad71509e6da5a276820121ab847634b95
+size 48766
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[4]_genericsmallround.png
index 6b8b747c..59c5d91c 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ff24fd1fbfd0d0f60946ab365bf4d604df22caf7611f099c1e7cb6fe03032fd3
-size 68832
+oid sha256:dce093cc8940e9772a39bd2912a681cad71509e6da5a276820121ab847634b95
+size 48766
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[5]_genericlargeround.png
index 58a9f343..0e330fde 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:197f6b6cec5912d80b78003a4354e16ec06967770165f7c34c1d99c97d8e5bf7
-size 80552
+oid sha256:ab4fcfb4cbb79aa905d4591e8dbd926ab95a35bd1dafaf677256f922ca7bb537
+size 55462
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[6]_smalldevicebigfonts.png
index de4fd215..f2e7f18b 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0c967afeab6c0577a60e9e63efb70ebf503b9e15a20e28a8bc7c51105719d016
-size 72755
+oid sha256:a2bb1545a6f54cee648362cbd64b2f1af9c096494e004d1b2996b3f6354805cc
+size 54361
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[7]_largedevicesmallfonts.png
index daea8e83..109a3870 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_ScalingLazyColumnDefaultsTest_standard_end[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:95a076bf905c2df08c775d632d92524dacb477ad6aeebc50dab8523128e4119c
-size 76442
+oid sha256:b361465bdfeb394ac2d0433d5389eb52325b61445b7deeb91cafad8acd65f846
+size 53822
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListDefaultTest_screenshot[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListDefaultTest_screenshot[0]_mobvoiticwatchpro5.png
index 580d02e4..f614beb4 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListDefaultTest_screenshot[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListDefaultTest_screenshot[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2dbf9973c30de729636bafb8b1175d7d32071ad0e832ae580d57315f93d1d4d5
-size 35646
+oid sha256:4a9358bf8ea4cca66bcbaa894d618bd17dfba9f78ae677522ed03767155589ba
+size 23367
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListDefaultTest_screenshot[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListDefaultTest_screenshot[1]_samsunggalaxywatch5.png
index 03d1d998..c40e289e 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListDefaultTest_screenshot[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListDefaultTest_screenshot[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4ced39bdde3e8cb81facf4d23f3a868aad90233aa5cf9f13562e7a84ecadcc9f
-size 33894
+oid sha256:221eb0153ca2f467dc105217d9601fca9412471f47ffd8d86eaf6fc9b1edf521
+size 22226
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListDefaultTest_screenshot[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListDefaultTest_screenshot[2]_samsunggalaxywatch6large.png
index 8a18c895..910230b5 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListDefaultTest_screenshot[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListDefaultTest_screenshot[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:22b92ca742412f3756b97416d344132e6c1a795a7fab7e9c06eafeed22ae2e09
-size 37074
+oid sha256:18aa966a365982d44cd5d40af2814599b9c9b424d4e73f745636f1dce2f9c869
+size 24426
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListDefaultTest_screenshot[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListDefaultTest_screenshot[3]_googlepixelwatch.png
index 5c67bafe..b998f6e1 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListDefaultTest_screenshot[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListDefaultTest_screenshot[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a13b5dc74760ba7142b048629c9ed5d4444ca41105aabb4bd256022ebb28186d
-size 33298
+oid sha256:373e3a7ae6f717c76441668049ecf786379993c377b8364c012d21417a873f6c
+size 21582
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListDefaultTest_screenshot[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListDefaultTest_screenshot[4]_genericsmallround.png
index 5c67bafe..b998f6e1 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListDefaultTest_screenshot[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListDefaultTest_screenshot[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a13b5dc74760ba7142b048629c9ed5d4444ca41105aabb4bd256022ebb28186d
-size 33298
+oid sha256:373e3a7ae6f717c76441668049ecf786379993c377b8364c012d21417a873f6c
+size 21582
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListDefaultTest_screenshot[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListDefaultTest_screenshot[5]_genericlargeround.png
index 2bf39571..9e51f0e1 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListDefaultTest_screenshot[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListDefaultTest_screenshot[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6711de3dd336315720e4c0c76cbab9ff85f9d6e19737b49e297ac068ef595b99
-size 34582
+oid sha256:791c3b2b0f66aa324a3d7bed7a3c1137c732ccd3a0d4aa9f8f82795d02b526e8
+size 22729
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListDefaultTest_screenshot[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListDefaultTest_screenshot[6]_smalldevicebigfonts.png
index d68d2ffd..94c1197e 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListDefaultTest_screenshot[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListDefaultTest_screenshot[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a3643ee90e025f46a08fdd927aa45548e3d64e6736189d02c8ca5c019ba0a918
-size 35702
+oid sha256:bc43ff4176a2812d939e4cae1639b94ecef663825f61616774e00c06675a5169
+size 23148
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListDefaultTest_screenshot[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListDefaultTest_screenshot[7]_largedevicesmallfonts.png
index 50a3c8a6..ea9fabf2 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListDefaultTest_screenshot[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListDefaultTest_screenshot[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e4027809377fdddce0b71d0ae64ab1a4193e523f6eb01fe6c1b23f1de52528f4
-size 34674
+oid sha256:35af7ed49589686ff4586062b908f1b6a07dd1b2e108deb4d29f658f353b5266
+size 22739
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListTest_screenshot[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListTest_screenshot[0]_mobvoiticwatchpro5.png
index 0e848a39..f9199bc8 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListTest_screenshot[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListTest_screenshot[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:acb0333b1a05691f212cf558cbe9e37a557ebc55d0edf22158d430a6328a6b27
-size 39553
+oid sha256:4a7cc3e36e08eaa683cee58af9fe9c529d8fe704cf55a7f8d5deecb772102d6c
+size 27143
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListTest_screenshot[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListTest_screenshot[1]_samsunggalaxywatch5.png
index cd5c3854..c6a3f6fc 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListTest_screenshot[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListTest_screenshot[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4116c06d33690b409a513659349f44fcf14e4dafdeda5232fec34023164c9019
-size 35115
+oid sha256:424fe992890d6de0c9906148de4b8daf7d6f3c9c99dac090ff6aa418391a7562
+size 23579
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListTest_screenshot[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListTest_screenshot[2]_samsunggalaxywatch6large.png
index c09ab163..727e2a46 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListTest_screenshot[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListTest_screenshot[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2952af6ea8f6bd0692cd97bb1379b000044dc659cf8d463f10514971ceab80a4
-size 41611
+oid sha256:9b8f54230b5fcad71455a7d24abad1f383825e6b30b03cc2526ed2efb1131e07
+size 28533
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListTest_screenshot[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListTest_screenshot[3]_googlepixelwatch.png
index 82092927..cafd4415 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListTest_screenshot[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListTest_screenshot[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b9e075a32324bdec0e1255eb0f5b9e88ac8f25bfcf7928a7e8e3fd1a6258b230
-size 34724
+oid sha256:ccff7f120c19d6a4ea6a014cdd230817690d709b0b47092229d2d7b34c34d831
+size 23280
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListTest_screenshot[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListTest_screenshot[4]_genericsmallround.png
index 82092927..cafd4415 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListTest_screenshot[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListTest_screenshot[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b9e075a32324bdec0e1255eb0f5b9e88ac8f25bfcf7928a7e8e3fd1a6258b230
-size 34724
+oid sha256:ccff7f120c19d6a4ea6a014cdd230817690d709b0b47092229d2d7b34c34d831
+size 23280
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListTest_screenshot[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListTest_screenshot[5]_genericlargeround.png
index f0a39e41..12031e89 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListTest_screenshot[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListTest_screenshot[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:49eb774d5a1159b9068f80180dd69b83809c5373c64b4bda1e9ab67b9f6361cc
-size 39188
+oid sha256:24e60dce786e4f8c787688675575232187f41b3a94d1bf6af4325eda38df5ced
+size 27065
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListTest_screenshot[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListTest_screenshot[6]_smalldevicebigfonts.png
index cb63448b..41929d82 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListTest_screenshot[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListTest_screenshot[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b5abd200ef368aa9a32a1ca783876ec828c324f58657c3e3b63ab657253b1595
-size 34012
+oid sha256:20a703e7dc47206b3189e026f32f15d207c221b8611ff30faa6130feccffd5fd
+size 23320
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListTest_screenshot[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListTest_screenshot[7]_largedevicesmallfonts.png
index 577cca3e..c8c82832 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListTest_screenshot[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_SectionedListTest_screenshot[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bcb532c27604b93f8da51cfbae686d918f54bc8ee6e14744503cde5f52ad9266
-size 38812
+oid sha256:e281e9c57e352219503997e8e48878b6c7df2a8c087c6bbfb586477c143de88c
+size 26447
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePicker12Test_screenshot[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePicker12Test_screenshot[0]_mobvoiticwatchpro5.png
index da2a35bc..5ada4cd6 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePicker12Test_screenshot[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePicker12Test_screenshot[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:58d49b30eacbe552b083301e4298bf4fdb031c6479786224b5567016c9eb9922
-size 28038
+oid sha256:22430b165a5fc91a047d3adbc4bda96c8f85c6e4739bacee8a814c2a1d309c91
+size 19995
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePicker12Test_screenshot[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePicker12Test_screenshot[1]_samsunggalaxywatch5.png
index d82a0a1f..fa16f85b 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePicker12Test_screenshot[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePicker12Test_screenshot[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a031c5f3be34e06799d1ca0508ae767f88582df984688cff039cf03a8e1af92e
-size 23385
+oid sha256:e6e29ccfcf70def92815d9b7f3e38be31f92a460f6086c97d5145a50134cdec5
+size 16620
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePicker12Test_screenshot[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePicker12Test_screenshot[2]_samsunggalaxywatch6large.png
index c2ec0557..9aa8b56c 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePicker12Test_screenshot[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePicker12Test_screenshot[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8e2e8b54129efa0347ec0c296541f2a0df0f56858ada7ab02702f6d68d5dab11
-size 29321
+oid sha256:7aeffc82cac0d780e9b0efcb7c50052e08ed124ba871ee8b9476969b5a594afb
+size 20943
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePicker12Test_screenshot[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePicker12Test_screenshot[3]_googlepixelwatch.png
index 557d37a7..955f1b15 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePicker12Test_screenshot[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePicker12Test_screenshot[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ea631b5f9c0410308d6b788eba808f2df0747d337bb7ebe5efffee0bc66ebd00
-size 22766
+oid sha256:de05a28b24744f1bdc67f126368018f21ecf86ae369a4368c5cfe5a6d54f2dc7
+size 16100
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePicker12Test_screenshot[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePicker12Test_screenshot[4]_genericsmallround.png
index 557d37a7..955f1b15 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePicker12Test_screenshot[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePicker12Test_screenshot[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ea631b5f9c0410308d6b788eba808f2df0747d337bb7ebe5efffee0bc66ebd00
-size 22766
+oid sha256:de05a28b24744f1bdc67f126368018f21ecf86ae369a4368c5cfe5a6d54f2dc7
+size 16100
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePicker12Test_screenshot[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePicker12Test_screenshot[5]_genericlargeround.png
index 8e503d24..299c60c8 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePicker12Test_screenshot[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePicker12Test_screenshot[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4d1d793a74f0afcc3335422e7bc1b3130c9e5a3d7c0380ed02b1cd00cdd12632
-size 27019
+oid sha256:f1d312bad673801c618d2b8dc4875efd264862124f867d4e5b5441a9607c2ec6
+size 19292
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePicker12Test_screenshot[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePicker12Test_screenshot[6]_smalldevicebigfonts.png
index 148af4d4..fa86af98 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePicker12Test_screenshot[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePicker12Test_screenshot[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7c62c4b0cd8761ae3d8ce620643f93a8230d78b2057a3d86ca867927e497a525
-size 22933
+oid sha256:04d57759d11179874761b443d5ac8d1c4e7493434feeb0beaaf715af728f32fe
+size 16261
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePicker12Test_screenshot[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePicker12Test_screenshot[7]_largedevicesmallfonts.png
index bb990d91..c50a0d49 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePicker12Test_screenshot[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePicker12Test_screenshot[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:227c1ad37e2359c3ffe0766a0b1a581567bb81c0039eedb10482979380e3d5a8
-size 28138
+oid sha256:3558027f512537cc71b1fb1dd33914be39ab9655429f21cb0ad4e6c715280e60
+size 20108
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePickerTest_screenshot[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePickerTest_screenshot[0]_mobvoiticwatchpro5.png
index f6843ae1..b43c68b7 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePickerTest_screenshot[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePickerTest_screenshot[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d307e3762f76c3aebce213243d2688f7a947c330c1dc24b7bb2c6bf9fef1dc33
-size 26030
+oid sha256:159361bffe4baa23332b09cdfbea0cc48043a1901ddea6d2a1bdddd1d70e9d64
+size 18329
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePickerTest_screenshot[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePickerTest_screenshot[1]_samsunggalaxywatch5.png
index e71562fc..7a9aaaba 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePickerTest_screenshot[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePickerTest_screenshot[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0e1e4d105a085df9612dc90635f516295e7f5a0914080cd4d5fdcff8b5339b40
-size 21694
+oid sha256:82d59b4d6e407a7504f043987c8075d6e202f47aaba24c9ec4997e5515dc27c0
+size 15191
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePickerTest_screenshot[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePickerTest_screenshot[2]_samsunggalaxywatch6large.png
index 4e2fbfa6..edf65e2a 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePickerTest_screenshot[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePickerTest_screenshot[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9fd7fa17e3c5ff84d41f0b6d553b238606498931fa7494c45a4e67c12cd471c1
-size 27243
+oid sha256:60194e9e50c22f90bef5a6faa7a705f1e6b552ca87221c79f97d929d6dc7ae6a
+size 19145
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePickerTest_screenshot[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePickerTest_screenshot[3]_googlepixelwatch.png
index d7e8c050..05c0debd 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePickerTest_screenshot[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePickerTest_screenshot[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bf3645cd9555361ba9f2f55006f2e7d7bd3413a9e91c2d7f3f5b0d5dfc593b70
-size 21130
+oid sha256:9d163159cb1e73b9e52b62d54179210fd11e610a34efb1864ad765e84a94f906
+size 14600
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePickerTest_screenshot[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePickerTest_screenshot[4]_genericsmallround.png
index d7e8c050..05c0debd 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePickerTest_screenshot[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePickerTest_screenshot[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bf3645cd9555361ba9f2f55006f2e7d7bd3413a9e91c2d7f3f5b0d5dfc593b70
-size 21130
+oid sha256:9d163159cb1e73b9e52b62d54179210fd11e610a34efb1864ad765e84a94f906
+size 14600
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePickerTest_screenshot[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePickerTest_screenshot[5]_genericlargeround.png
index d835f43c..7b6c4559 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePickerTest_screenshot[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePickerTest_screenshot[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:64497d08a48c192e82a7b4781b5c80d2efbacfba9d31c8289ab1d1bb21cec7a0
-size 25114
+oid sha256:27e3bf42a58fcc56938893ec72f383705c4b7dfdf8d6709b84aff4d74ad5c4df
+size 17620
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePickerTest_screenshot[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePickerTest_screenshot[6]_smalldevicebigfonts.png
index 4fd11d63..b6a0c9e2 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePickerTest_screenshot[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePickerTest_screenshot[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9f9b0443ad32b3aece6d1a04e4f6243779b62ecfe630900f3bf8c0f2d0cd496d
-size 21346
+oid sha256:34f04b764c39ddf97327aef356e631aae77c0ec67620f8fa7d942c56ddd8d614
+size 14907
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePickerTest_screenshot[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePickerTest_screenshot[7]_largedevicesmallfonts.png
index 12ca3d50..70602bfb 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePickerTest_screenshot[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_TimePickerTest_screenshot[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7a0f938d7d4f09e2cb20f3a9c07f556ed4e81cb9ce053ac7432eee41d71093bb
-size 26121
+oid sha256:acda961f852c5e7b73a0c551061322b002bac42f3a0547bf1fc46e7153072aa8
+size 18449
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_VolumeScreenTest_screenshot[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_VolumeScreenTest_screenshot[0]_mobvoiticwatchpro5.png
index 8c9e3f47..28a9eeea 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_VolumeScreenTest_screenshot[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_VolumeScreenTest_screenshot[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8bacb39cecfc94b9ae4438c765a74b13a48364f411d34af8f9ef66242cd660d5
-size 20596
+oid sha256:133beacffa787dcfda995f4c3f70543cefe58d72d83766486e8178b2faa21b5d
+size 14663
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_VolumeScreenTest_screenshot[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_VolumeScreenTest_screenshot[1]_samsunggalaxywatch5.png
index 3fbed6e9..309a0af4 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_VolumeScreenTest_screenshot[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_VolumeScreenTest_screenshot[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bfcf337d6e513109181117a6a48986afd971f75f2e7919f4bd312a912a7af31c
-size 18433
+oid sha256:a4563aacacdf81515c593297c3130ef3ccd2fc1d28cd39d685e648f511110c68
+size 13375
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_VolumeScreenTest_screenshot[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_VolumeScreenTest_screenshot[2]_samsunggalaxywatch6large.png
index 50e8fa15..60434ba3 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_VolumeScreenTest_screenshot[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_VolumeScreenTest_screenshot[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4670cc3a8cf086f6ad0412a96abe3d5cffbcc6bb9f5b2c0908b729514503b92f
-size 21686
+oid sha256:5c3827fdfa116add0a6137f2a86297a3c193838eaab6784ce80ada5f3c4f4bd3
+size 15524
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_VolumeScreenTest_screenshot[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_VolumeScreenTest_screenshot[3]_googlepixelwatch.png
index c849af8a..efef6525 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_VolumeScreenTest_screenshot[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_VolumeScreenTest_screenshot[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1f18662bda83966f23430a655db4a2a32ddb4e8516050b708f2cc3d784f044b5
-size 18268
+oid sha256:c7813edc8d2ac8a8c7d1cad9486ecd96e7458f3011c1702e8b1af60a96c2aeaf
+size 13130
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_VolumeScreenTest_screenshot[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_VolumeScreenTest_screenshot[4]_genericsmallround.png
index c849af8a..efef6525 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_VolumeScreenTest_screenshot[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_VolumeScreenTest_screenshot[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1f18662bda83966f23430a655db4a2a32ddb4e8516050b708f2cc3d784f044b5
-size 18268
+oid sha256:c7813edc8d2ac8a8c7d1cad9486ecd96e7458f3011c1702e8b1af60a96c2aeaf
+size 13130
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_VolumeScreenTest_screenshot[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_VolumeScreenTest_screenshot[5]_genericlargeround.png
index 369d428a..e8ca686f 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_VolumeScreenTest_screenshot[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_VolumeScreenTest_screenshot[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ae1bb610b43005c483d65b3b60d743943f6934c6701b03de391291ad96cff88a
-size 20227
+oid sha256:8aef05504d2077b5e4da21738b6ed84e4159e501bc9e177b853e98e7ca7ffdc1
+size 14505
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_VolumeScreenTest_screenshot[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_VolumeScreenTest_screenshot[6]_smalldevicebigfonts.png
index f81902fb..ba8bc20f 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_VolumeScreenTest_screenshot[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_VolumeScreenTest_screenshot[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6931b85a35770600168b006b11715dfb6ba2c020f2059b277d7cf9f29d3e03c5
-size 18846
+oid sha256:4416a43ece4f5d3e64d8ca47636199ac99d3d42cdd829acdb3b8c87d136ac648
+size 13626
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_VolumeScreenTest_screenshot[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_VolumeScreenTest_screenshot[7]_largedevicesmallfonts.png
index 47d5a4ca..7a7ca00a 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_VolumeScreenTest_screenshot[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.screensizes_VolumeScreenTest_screenshot[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9ff42c0c3df0fa5c4ef3cd51cc220f7ee009e20031f10b7ed93ec03e9709c261
-size 20433
+oid sha256:3cc4d71bce96d820cd8332b7b48fd32e72e87bca3925492c5c8499a274a95845
+size 14520
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom1Button[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom1Button[0]_mobvoiticwatchpro5.png
index b288e841..35613075 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom1Button[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom1Button[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4b232055c4736bb53adffd2bba82b87181390a6599825a685dfd941aac08c8ed
-size 31716
+oid sha256:efd5514f0d7c24da38b42a511a52d19996a9aa34d163dd15dd93e0cb98696b52
+size 21169
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom1Button[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom1Button[1]_samsunggalaxywatch5.png
index 15a43cf7..2e50fb9c 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom1Button[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom1Button[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:14531883b57d1e15d7802f8798abb6ad3752f0e717e4437a2d8a9a5313958559
-size 28674
+oid sha256:d2f7f14f06142a3fa6e5ede86d95e8e4022e33c8c586b7b4f879280d1643c4ce
+size 18730
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom1Button[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom1Button[2]_samsunggalaxywatch6large.png
index ede03916..f733e3f4 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom1Button[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom1Button[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:94bc8eda70f284d81d168e9e29941973db47676200f5cc49f983975f67890ef1
-size 32993
+oid sha256:20c7fa0a1d20330303487c5963c2cb90ad15ac524ddf6776a464b20c856cbbf1
+size 21557
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom1Button[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom1Button[3]_googlepixelwatch.png
index 1fece064..0ea53862 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom1Button[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom1Button[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c14b14e4fd7f3a945193ba38f6efe2fafe0fe284de44f46230512d7e7340b0e0
-size 28046
+oid sha256:3590975d0f80d19245cce20a4d30ad4bbc9634dc3c250f9f8aef290a3c3bd578
+size 17944
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom1Button[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom1Button[4]_genericsmallround.png
index 1fece064..0ea53862 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom1Button[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom1Button[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c14b14e4fd7f3a945193ba38f6efe2fafe0fe284de44f46230512d7e7340b0e0
-size 28046
+oid sha256:3590975d0f80d19245cce20a4d30ad4bbc9634dc3c250f9f8aef290a3c3bd578
+size 17944
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom1Button[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom1Button[5]_genericlargeround.png
index 35516fea..56bfd509 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom1Button[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom1Button[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8a5f0fe0efecb5fa23858c34a14f7c0319219e195f9c2fb95d17e213e8575fe9
-size 30832
+oid sha256:92a569a444c5efba049804e8552fad01e811db4a4361c6078399bc8263c43cec
+size 20309
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom1Button[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom1Button[6]_smalldevicebigfonts.png
index 3c2bff1a..124cf2c2 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom1Button[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom1Button[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a8ab1ae24e84b443a3c1cf8dea425f9d59878fc5d052401989e89b0dffa41ab8
-size 27895
+oid sha256:6362ebcfff7afd6fb94987453b471c188d99924c86f6f5df24ec1df2b6ab8d35
+size 18226
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom1Button[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom1Button[7]_largedevicesmallfonts.png
index 6a76fd56..e74f2a6e 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom1Button[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom1Button[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:53651d8e81e35483b3c6ce2319bf0019cf3a8758d134ed63465a0e403e483908
-size 31481
+oid sha256:8fa48dedb2c2dc59592855541fa9a523d26e55e8d9b27b268a5730df9a5b37e5
+size 20853
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom2Buttons[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom2Buttons[0]_mobvoiticwatchpro5.png
index b975fc80..b0026263 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom2Buttons[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom2Buttons[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6f764b50122b6410b49078b4d8e600ba60dea6f9604130db87c6bb7d56edd4d0
-size 33079
+oid sha256:2c4ccf4d11a7e4cd07bafffe27a97bd4a840bdf98b4801280e8333380fc78431
+size 22174
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom2Buttons[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom2Buttons[1]_samsunggalaxywatch5.png
index f21e48fe..0140c7d4 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom2Buttons[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom2Buttons[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ed8d7bc6f2758f8b62e25451c6067ce5b31a9b14715aca475bcd147f014d8476
-size 29872
+oid sha256:a177fa30daf2b4fd1dbe7d444b52d735e47a38b35074cd6f3d143e470dcf325f
+size 19735
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom2Buttons[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom2Buttons[2]_samsunggalaxywatch6large.png
index 0a1c4e35..30583eea 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom2Buttons[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom2Buttons[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f9d238d953aca9b6cf8122904105be3a22d8fe7f649711829f69fd6ab1a68593
-size 34377
+oid sha256:c642d9bf375b7a150609b8ada9df37bac159eb505f9fdee9ef5c2b606c6f281d
+size 22644
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom2Buttons[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom2Buttons[3]_googlepixelwatch.png
index d2f240c3..75bcaf20 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom2Buttons[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom2Buttons[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ffb867ed2e64e4b558f0c2310b76f0cf59220be0cda12946f1f163a0c4558474
-size 29313
+oid sha256:4ed7702bcd27c901595e4176fdb3f3a7ab437cf58a2008659b3c46413e9043d0
+size 18962
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom2Buttons[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom2Buttons[4]_genericsmallround.png
index d2f240c3..75bcaf20 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom2Buttons[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom2Buttons[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ffb867ed2e64e4b558f0c2310b76f0cf59220be0cda12946f1f163a0c4558474
-size 29313
+oid sha256:4ed7702bcd27c901595e4176fdb3f3a7ab437cf58a2008659b3c46413e9043d0
+size 18962
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom2Buttons[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom2Buttons[5]_genericlargeround.png
index ecb24477..b17d9382 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom2Buttons[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom2Buttons[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f2722d7b011740b0377efd3abce115df261f6d99284530057b30f01f3a159efb
-size 32086
+oid sha256:200a6b1e307649f780a51af2affefdae19230e42a1ce9f2053cc8a36e5c0b8e6
+size 21285
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom2Buttons[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom2Buttons[6]_smalldevicebigfonts.png
index 5d756b49..fdf734ac 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom2Buttons[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom2Buttons[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e3e3ac34c0322e8eaac345246d27128854b776a58b639b33bc0d1294cf03322f
-size 29162
+oid sha256:4f1a5a25ce5c3e3ebdb9dff88f5e695bf0b92d5035e829a874e698a1700ae2c0
+size 19246
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom2Buttons[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom2Buttons[7]_largedevicesmallfonts.png
index 1165160b..288d9254 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom2Buttons[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom2Buttons[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2ac730796d03ee456d64012ded19c15f07beac7acfba7e636290cbce6ede1ebe
-size 32829
+oid sha256:379bb90fa694cb4c16f3eec13cf9c0a6e0a1ab70ee7a0a89affec326d2b979ec
+size 21860
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom3Buttons[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom3Buttons[0]_mobvoiticwatchpro5.png
index 7873418f..bde3b471 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom3Buttons[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom3Buttons[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b63e96476f05e3e9efe914ad51750cfb544772006976d022dce132fe2ae9f3e4
-size 33447
+oid sha256:7d4559db50f436c4c0c5f118efb54e5bd422d7bca8cfc879eab3533e34ebecc9
+size 22491
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom3Buttons[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom3Buttons[1]_samsunggalaxywatch5.png
index 137ecf11..1cd23f80 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom3Buttons[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom3Buttons[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a595560f9a6ee90cedd17b81c33eaa84ab251c388717c3a7618435bb9f71f833
-size 30366
+oid sha256:baf65894eaee1ae43d010d2044bd7bf6679d173b806148c753ca6eaeb23f8f3e
+size 20074
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom3Buttons[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom3Buttons[2]_samsunggalaxywatch6large.png
index 86d431a2..ecf7aa00 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom3Buttons[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom3Buttons[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:08227bfeb1224c604acf3fc43ba30cad2d671c90d007a8f89aebd53d7382dc29
-size 34807
+oid sha256:3496449a4f29de93d06d287a92232dc6090c4ff96fcd036079eef28298add1dc
+size 23067
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom3Buttons[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom3Buttons[3]_googlepixelwatch.png
index b8694cdd..6974de3f 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom3Buttons[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom3Buttons[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c71fc9b2c9dfefe97330759a346b2e2610ae9c048727ee15594a3f2f9f04c365
-size 29708
+oid sha256:b17a4ceb208b0598ae2544775580ca2455b68c62ae3ece779e836e4e082574ca
+size 19312
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom3Buttons[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom3Buttons[4]_genericsmallround.png
index b8694cdd..6974de3f 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom3Buttons[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom3Buttons[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c71fc9b2c9dfefe97330759a346b2e2610ae9c048727ee15594a3f2f9f04c365
-size 29708
+oid sha256:b17a4ceb208b0598ae2544775580ca2455b68c62ae3ece779e836e4e082574ca
+size 19312
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom3Buttons[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom3Buttons[5]_genericlargeround.png
index f99f74ba..fb75eade 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom3Buttons[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom3Buttons[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:42844a6fd3c167840a5cae859a928b50b81b16a81adc608207932b3b1d053045
-size 32498
+oid sha256:585e41f026938593149312fb269c93a6a6b916e76a0933bfeb707b3a503f4c69
+size 21627
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom3Buttons[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom3Buttons[6]_smalldevicebigfonts.png
index 3170b970..902732a6 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom3Buttons[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom3Buttons[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9d132e7464e06eca6f4fc7baa4ff87bae5469ae8a10798749ba823b4ea4c5f8e
-size 29555
+oid sha256:65de52c8406a30c72d9266282a703b4d7c1ce4b002f747af967f3fda80e960d4
+size 19613
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom3Buttons[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom3Buttons[7]_largedevicesmallfonts.png
index 1cd42e67..fcb56aec 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom3Buttons[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottom3Buttons[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c81fc6e6b91770acd2a135898dfb413dd4bf4d5d290b60b846b0129617504cdb
-size 33210
+oid sha256:4c674c0137810a75dab769382bb676fc38f7d85bb8f8e445a0e22a7a2ba3fde9
+size 22180
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherCards[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherCards[0]_mobvoiticwatchpro5.png
index 561303f0..ce496390 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherCards[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherCards[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:60ceec06551abc88651845030cf2f61605658b71f860bf7f5fa56fa086aef3da
-size 65994
+oid sha256:811ad78d2c6559fc5a1f4f563e9d034eed8bb2c2c63c1f6a468eb68b8fa12872
+size 51252
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherCards[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherCards[1]_samsunggalaxywatch5.png
index 1a4780f2..52221d1c 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherCards[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherCards[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f1cf9383caa0a5e1e20d1a9b167865d4fdee925479c28b17082b59ebab92001f
-size 53547
+oid sha256:6e22f257b04cf174ac4e272c70ac5d75db5a03bd9224be460593e26af42b2194
+size 43158
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherCards[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherCards[2]_samsunggalaxywatch6large.png
index dd6c6ac9..c74bd3b1 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherCards[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherCards[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:acd8deb02a8b4eea8eac1f858a0deaf1ddf009bed05000dec2ad0822f31d1f68
-size 68107
+oid sha256:6d800e87ac392a266baa60ec05aa6b1294e51b85c6f30e5c3af851c33a824ffa
+size 55194
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherCards[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherCards[3]_googlepixelwatch.png
index 731719c2..e2a02928 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherCards[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherCards[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5477662132f8458ad431ed607e6452928b711318e266db2c14bfb813835b55d3
-size 50345
+oid sha256:7b85f901a1a3e16e4f57e21c343910ba190c6336115d02c853bcdd66a138f761
+size 41626
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherCards[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherCards[4]_genericsmallround.png
index f367d96d..e2a02928 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherCards[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherCards[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:02abc9d2fccc61dfc6f9ffa9af9c06b57dedfe91652bcabc436d43d22a11f3d9
-size 50404
+oid sha256:7b85f901a1a3e16e4f57e21c343910ba190c6336115d02c853bcdd66a138f761
+size 41626
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherCards[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherCards[5]_genericlargeround.png
index e9cd5cd9..b50e3139 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherCards[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherCards[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:69285e06420e18e65a4cca728ac55ac3a4a893ce4fb5749d171dbe557d46eb0f
-size 63749
+oid sha256:1c6de67cebce0db5ad584b879768fcaf3e14dc842a2e216b2ec98c5bb1bde276
+size 50182
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherCards[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherCards[6]_smalldevicebigfonts.png
index 658b99dd..21dff22f 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherCards[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherCards[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c126f256c67ac057fa67566818e4c778872b49ba59b7a5771277b299eb667979
-size 48575
+oid sha256:0a268b8704ec3a93b60a158252d3c54b11df4916ee22cc8eed194538ee00ea72
+size 45287
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherCards[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherCards[7]_largedevicesmallfonts.png
index b5434dda..8c85aa7b 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherCards[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherCards[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bdd35312119e8754a9f93bf574f1e42e69c39699cb77eb515a71a302e14420f4
-size 62313
+oid sha256:4ca19148dea95badaddfdce06fa79a3ae6ae9c7202b8259f281275b59a1d04f1
+size 51149
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherChips[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherChips[0]_mobvoiticwatchpro5.png
index f5030df8..534345b4 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherChips[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherChips[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0c66163e9ae452cc35cfde2a1e57b05921bb3b1d0a60e84f483a66aa11aa936b
-size 31871
+oid sha256:416c053813f41c90016093517dec778a4dc80e6973847b12f6a94c8c7051846d
+size 21417
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherChips[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherChips[1]_samsunggalaxywatch5.png
index ba39f794..a38c5f9a 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherChips[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherChips[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:30c06deab23638f995c6c78312409b897a1abae139a9eaac7540a0b30797ee0e
-size 28542
+oid sha256:edd2117d875d49e54b0cc279918dd623b2a0610a49933d8c0a94f309cc92957e
+size 19021
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherChips[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherChips[2]_samsunggalaxywatch6large.png
index 7d875e55..eb9dd1f8 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherChips[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherChips[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f3a232b79a27be1ec84a10854bb0994cd279316e14df822459f8b90930fd480d
-size 34369
+oid sha256:fcdbef49153947700b69128acce00bd4c65212d4959d9bbccc8d827382261a8f
+size 22914
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherChips[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherChips[3]_googlepixelwatch.png
index 2855bf55..6b1c4bc0 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherChips[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherChips[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:952d51630ecf6ad4db5aead512ead2b6d3fe882da3365966cc4e4507852ff940
-size 27228
+oid sha256:a2d8c38fbadc0db8b7e5df9cdbf8533400773e8334f9354d6fd3dbe7a2f2eb46
+size 18080
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherChips[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherChips[4]_genericsmallround.png
index 2855bf55..6b1c4bc0 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherChips[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherChips[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:952d51630ecf6ad4db5aead512ead2b6d3fe882da3365966cc4e4507852ff940
-size 27228
+oid sha256:a2d8c38fbadc0db8b7e5df9cdbf8533400773e8334f9354d6fd3dbe7a2f2eb46
+size 18080
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherChips[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherChips[5]_genericlargeround.png
index 61534967..a8a61033 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherChips[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherChips[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:52290547208684c9bb198685e8c3a66d8ba67cd1fcf04f4f71ad0ef35f14ea0f
-size 31693
+oid sha256:5259c89d4a3e9c1dd76a60b538a0d891df193547cbe9b2383c20af30e5ca901f
+size 21246
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherChips[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherChips[6]_smalldevicebigfonts.png
index 0f4eb015..c8cc36a9 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherChips[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherChips[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:891b341fa3d5a7c967b2429a125f119d194f8a696e1f9d92327a494c856533f5
-size 28308
+oid sha256:3c1d3157f30844068cb741a04d88147ee09e50ed6c24ac475c5fe873d5117734
+size 18679
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherChips[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherChips[7]_largedevicesmallfonts.png
index 686b04ec..c7396e47 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherChips[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherChips[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c42ca12d6274e49afa68580afa2a5554846860aedf7ecbc8b10bea9bcad8ceda
-size 31456
+oid sha256:1dedfc8189e2babcdc83e38a77978ab3c14dcbcb943ef5902737fc4855db35f2
+size 21095
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherText[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherText[0]_mobvoiticwatchpro5.png
index 0d5cdde1..708ae639 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherText[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherText[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d699a32e3cee14e5dc22d182491a8e609b5dccc3368f2a26375c424dc22953f1
-size 42786
+oid sha256:7bac21c405e8394d0edfc33ba69bc42180ffda20dfb447c07f87092f2f5f2a02
+size 29026
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherText[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherText[1]_samsunggalaxywatch5.png
index bae55e7b..f6e033b2 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherText[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherText[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:32ddee8c5f54b33a904f5d140519e86a4e6f513b986c822546d95e5896f14c4f
-size 35205
+oid sha256:0ae5c126c5df1c27bf642eacb38f0c5573d74900e1ff304b149e069bcc817677
+size 23763
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherText[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherText[2]_samsunggalaxywatch6large.png
index bdcda969..1048484a 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherText[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherText[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f58fff806063cd208298257a84b21711cb4e6a37fd0e82b9abd6212773e7957e
-size 44002
+oid sha256:8af047b117585f89c085524278748f80bfcddaa74622f141e05a4e8513feba27
+size 30255
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherText[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherText[3]_googlepixelwatch.png
index f58c13d3..c8d6b4d5 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherText[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherText[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:063cd5d0ab5bbfcb5a8decfad54fc1c41e197609a9a4fd31425cced431832403
-size 33485
+oid sha256:13f7c37bdce89f9f493bf160bd2014913406d315a8ab1db0ecf043fb67c129f5
+size 22502
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherText[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherText[4]_genericsmallround.png
index f58c13d3..c8d6b4d5 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherText[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherText[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:063cd5d0ab5bbfcb5a8decfad54fc1c41e197609a9a4fd31425cced431832403
-size 33485
+oid sha256:13f7c37bdce89f9f493bf160bd2014913406d315a8ab1db0ecf043fb67c129f5
+size 22502
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherText[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherText[5]_genericlargeround.png
index e219d136..548b6808 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherText[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherText[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b06dbaf5b2c297d04295acd5611a71c30b5374211c81b03c33178c1fd70da24d
-size 41451
+oid sha256:ba67f8b21c8cf27bf7d7df0df2aaab4c56b92584532feeced9db7441acd015fa
+size 28406
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherText[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherText[6]_smalldevicebigfonts.png
index 840e30b7..0341278e 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherText[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherText[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5cf62e738e240d8cf7f2b11d18b7d2f9af1685d765db877d60c4caa1bebf48da
-size 30986
+oid sha256:5622cdddc87609c60c498c301e93273ecbb4d8e292b8b87647158755eebb343d
+size 21531
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherText[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherText[7]_largedevicesmallfonts.png
index 14484dc6..59ea346d 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherText[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomOtherText[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3705d6464305f1b8801c6dfdd9349de06fa603678f6b6429022157ca218c0536
-size 42768
+oid sha256:d8af270c0fa78d495b3a7439495cbf13349aeb8c5b4de6ac37e9dd65b318fbe4
+size 28965
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomUnspecified[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomUnspecified[0]_mobvoiticwatchpro5.png
index 668a6e2b..f38fa601 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomUnspecified[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomUnspecified[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6f5ae06f0fe7f209f3d8f5a0864d84971ace69ba051d89683611db0a02d91c2c
-size 76828
+oid sha256:712ae0400f8da54963cb70ce1236e49ca51c723db382dd8587c637ace487b9e7
+size 58874
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomUnspecified[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomUnspecified[1]_samsunggalaxywatch5.png
index 2e9d5679..6169e94b 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomUnspecified[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomUnspecified[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:44a92e8042bb9128726e8a71fcb00fbd6eef8131590bca456ae6e94734e41828
-size 63750
+oid sha256:cc7ca89cc115a5ac8913ee0529015a8cfe309fe0ef07acd326517dc9afb84263
+size 50959
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomUnspecified[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomUnspecified[2]_samsunggalaxywatch6large.png
index 2aba0519..74d53494 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomUnspecified[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomUnspecified[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:03753df2436a56537095a35c39b5310b6c90f252c97bc65d6b0f1fcfbf6a86d0
-size 82371
+oid sha256:c8ebeee85de8fed34f83650e0d16ae69ae5b03678b05b0322468abdd5b7f5dfb
+size 63440
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomUnspecified[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomUnspecified[3]_googlepixelwatch.png
index 0e5a4782..5f4e58e7 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomUnspecified[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomUnspecified[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:50276a80b26473fecdb5f5cb67d18d04fc1c0dab480ff86c9ef7b9e0bf7cf3f3
-size 61392
+oid sha256:05296495f35e7c1edceace996f7e109e6e5b501e7619be5ff87ff6f475a25993
+size 48688
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomUnspecified[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomUnspecified[4]_genericsmallround.png
index 0e5a4782..5f4e58e7 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomUnspecified[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomUnspecified[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:50276a80b26473fecdb5f5cb67d18d04fc1c0dab480ff86c9ef7b9e0bf7cf3f3
-size 61392
+oid sha256:05296495f35e7c1edceace996f7e109e6e5b501e7619be5ff87ff6f475a25993
+size 48688
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomUnspecified[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomUnspecified[5]_genericlargeround.png
index 142df516..e2d0f8f9 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomUnspecified[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomUnspecified[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:48d779c54b033d272120797d635f394fb092c9c37597067df5f7713c90dc58d4
-size 76147
+oid sha256:750f52e979909ca3f321cc6d2b866784dadc63b9e2de73a5d975945afe46f3a9
+size 58229
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomUnspecified[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomUnspecified[6]_smalldevicebigfonts.png
index d68d6b95..591399e1 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomUnspecified[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomUnspecified[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:65c1ea92e9e4cce5d6c865e689529b65d2c75ee1c8a8a0955637dd8072c2160f
-size 53577
+oid sha256:d36dc52cfe1ba61627002321d5b880d1bbf3762783d15ec726e3f0263908dbb6
+size 51976
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomUnspecified[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomUnspecified[7]_largedevicesmallfonts.png
index c9bfff7d..4ae36196 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomUnspecified[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_bottomUnspecified[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3b22d1e6e3cd68340bc30da02218fcb4a24adc37150ed0f303931bedcfc874f4
-size 73815
+oid sha256:2a27d94f6e6953d6808efc67cce9ec14a883c1069a6ee8c1fbde077711cec600
+size 59010
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideCards[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideCards[0]_mobvoiticwatchpro5.png
index b3a35b19..4397390d 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideCards[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideCards[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0c05d6773d2f5e92946f013521154043f4dbd217859ba6bd6ebe40da6a6978aa
-size 85849
+oid sha256:e18b327587edcd864e9d62caabaa863bec75ec506263d7bbfb27e84fa1df62ae
+size 64199
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideCards[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideCards[1]_samsunggalaxywatch5.png
index e509bf0a..68b8d0c7 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideCards[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideCards[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1afb60f1e7306794c0dcc96d396db38fe48f824fdc87306e4a088bbcef9eadd6
-size 67228
+oid sha256:cff0d489856741f8ae000596e2125303955f5f94b01f5be1b21684eb49d07b30
+size 53986
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideCards[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideCards[2]_samsunggalaxywatch6large.png
index 85b68270..3672fb63 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideCards[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideCards[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:30952e3468d6ae0ad56f6548fd0785dffaaccb6b72b72aca0ac94a6c50f34afb
-size 87164
+oid sha256:526e7d99f372e8f0d234831876bdd90a36ddcb4f89f2baf91457bac204a19d9b
+size 70005
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideCards[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideCards[3]_googlepixelwatch.png
index fb54f27c..6d68d488 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideCards[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideCards[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:abf383f8b5484cb4964a23794f7bc6e89760ab1b8b16bbf9e5f915987e09213f
-size 65249
+oid sha256:70d704f1524766398adac064e1c7a617dc0092053d071a7bf44eecdd51330430
+size 51841
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideCards[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideCards[4]_genericsmallround.png
index fb54f27c..6d68d488 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideCards[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideCards[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:abf383f8b5484cb4964a23794f7bc6e89760ab1b8b16bbf9e5f915987e09213f
-size 65249
+oid sha256:70d704f1524766398adac064e1c7a617dc0092053d071a7bf44eecdd51330430
+size 51841
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideCards[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideCards[5]_genericlargeround.png
index e6789abe..c69b4c5b 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideCards[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideCards[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:673dce05c237d3012e452a7ae7dd946c44a1ef747fa13d41b63ce3627c99548a
-size 81020
+oid sha256:2bed8c0edf59cf749f41f2fb65b674c4cdd5e122a064e077a8e4e1e05d9f9c2f
+size 63328
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideCards[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideCards[6]_smalldevicebigfonts.png
index 1ffb3a72..cc2fa2ef 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideCards[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideCards[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3b3b26b63ff75c7409f14400c7fa97e8dfb6ecaa1c1e3a601568061e9fe2ba2d
-size 60905
+oid sha256:85547ffc7c2fa6ec2fb862b65280367e30c02aca84f09df7a112feb281b68d21
+size 54036
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideCards[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideCards[7]_largedevicesmallfonts.png
index 4ab8ba69..d29e0bf4 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideCards[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideCards[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1ed170cf48544baedc13ba50d3afa0c77ceb96dbd432824bc7234559adedef5e
-size 81687
+oid sha256:fbedf8c69cfe8d4c4e182d1ed860aa95b3d53f002a7a81ab9208b827db9a76ef
+size 65439
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideChips[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideChips[0]_mobvoiticwatchpro5.png
index 85c86d57..4f389129 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideChips[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideChips[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b675af84f101fbcf0d6ddfc4d27c758b130daf1055bb275f69c2ae377bdf8089
-size 35256
+oid sha256:97ea57930bb42354acdaa6c4de3ad5486be2e36aca42f57b30dc406ddcd44341
+size 25211
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideChips[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideChips[1]_samsunggalaxywatch5.png
index 0d57da02..3b011075 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideChips[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideChips[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cb62aca249e4aca74dfe06f866dc1e53459317aeba11f2f78b2fbf128f10118a
-size 32935
+oid sha256:63ea2ca801e655039165c53fd9ad4bc5ee649fdeb08dde5bfe8709388fb38a45
+size 23533
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideChips[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideChips[2]_samsunggalaxywatch6large.png
index ed9d0c9e..31645925 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideChips[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideChips[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:81fbeaaaeaac4e5c4ef042223a706e1433ad6c60d24ed27cceed047ad2bedb75
-size 37972
+oid sha256:1103f370a9854d33171ee4b4d5880bd1041cf7972b5a40fdc5c53a24e9b3489c
+size 26845
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideChips[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideChips[3]_googlepixelwatch.png
index f7ae16bc..db4f8913 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideChips[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideChips[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:274a4416b60e6e28647e936590b3b25ca6b5f43f7eeff3f6ea4fe57fef2b2dc5
-size 32314
+oid sha256:31820d44c1d59622786f3c7d33e045f0b72b52c613d1b29963f9e882b59b477e
+size 22886
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideChips[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideChips[4]_genericsmallround.png
index f7ae16bc..db4f8913 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideChips[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideChips[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:274a4416b60e6e28647e936590b3b25ca6b5f43f7eeff3f6ea4fe57fef2b2dc5
-size 32314
+oid sha256:31820d44c1d59622786f3c7d33e045f0b72b52c613d1b29963f9e882b59b477e
+size 22886
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideChips[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideChips[5]_genericlargeround.png
index 73004d79..24ccad02 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideChips[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideChips[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c6beba665cd6ef5e813ca03837c8c5c1e853064318c2d2c09a234d076384f65f
-size 34634
+oid sha256:ada32b8e203cc8972d0bbe6c9bedeb2490938b94192c087488e64dcca699c961
+size 24781
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideChips[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideChips[6]_smalldevicebigfonts.png
index e4609fa2..722afcb3 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideChips[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideChips[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a6b0a61ebb32a5b94f8b0490d5d97bdc808e4dabf5bbed2d1a363f11c419d8bb
-size 33004
+oid sha256:73bb34bc35582f619b7ed1e165ec3d164c6b5a5ca29aa0f8d20ec2ee5dd38b15
+size 23457
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideChips[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideChips[7]_largedevicesmallfonts.png
index 4e8835ef..6d09aa9d 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideChips[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideChips[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:acd7ed884aefda18904ef27eec61caf7ca2e7eb9bdc0dc3e59009f2acc7181a3
-size 34605
+oid sha256:97b4c54d5ae9e483aa4fa4803f3005e31b24a29935ea8d0e7dee55f8e24301c2
+size 24467
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideMixed[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideMixed[0]_mobvoiticwatchpro5.png
index 25972b72..80b03164 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideMixed[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideMixed[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:60983bff54b95e6d0133ca3767729f58ecf06b887ae7f3e026d751cbf2bd95d7
-size 40870
+oid sha256:05087fcc959cc3e0561e8b12574d0b7ec5a0bf460b46df60445069fa99120987
+size 31443
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideMixed[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideMixed[1]_samsunggalaxywatch5.png
index 02f98af2..5e7dd6f4 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideMixed[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideMixed[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ef9033c809f2b507a0ba67c95025a4c2ad1d38479ca74e421b55d3dc901d4730
-size 36062
+oid sha256:3d018aa4d847a7efd675550a2729e5008a3036315a409a484f182e26e15c45c7
+size 28782
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideMixed[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideMixed[2]_samsunggalaxywatch6large.png
index cc1e1aaa..ab958c17 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideMixed[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideMixed[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b73774016640a228dd8e8a7f10acd51bc1438a912538f3939cb7c7d6400b0a69
-size 44275
+oid sha256:f267ca0a54be2c159e297cfa7138a66089062df21dd4f5e2790ba20989e395a6
+size 33406
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideMixed[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideMixed[3]_googlepixelwatch.png
index 83108523..e8fc5827 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideMixed[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideMixed[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e629e7dac24a1774508df92e0f46d1577109ae5a1a2d3a507375b80c42916007
-size 35725
+oid sha256:c177cc04e8b1ac6118effdc69bb01d0fdc9d245c4ba99c6fd1b6609be9f1117e
+size 28072
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideMixed[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideMixed[4]_genericsmallround.png
index 83108523..e8fc5827 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideMixed[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideMixed[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e629e7dac24a1774508df92e0f46d1577109ae5a1a2d3a507375b80c42916007
-size 35725
+oid sha256:c177cc04e8b1ac6118effdc69bb01d0fdc9d245c4ba99c6fd1b6609be9f1117e
+size 28072
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideMixed[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideMixed[5]_genericlargeround.png
index e8bd031c..c6a034af 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideMixed[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideMixed[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8f023253d4b799e6aaa651415b1dc5159d5f3429664974f3f8c49098768d97c1
-size 40144
+oid sha256:fd2596680477a75ccfd63a355fdc338170105bc01f16387f90cd131e86bf8094
+size 31183
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideMixed[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideMixed[6]_smalldevicebigfonts.png
index 0e583d18..6f0a0436 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideMixed[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideMixed[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6444352bd3fdb192a7bed6fa9e882c020883e09a7d99434683fc872795a592fc
-size 37519
+oid sha256:3d943096b8bbdc39987bfed4a08b41262404eea08da0c66729a2705d665165b3
+size 29215
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideMixed[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideMixed[7]_largedevicesmallfonts.png
index 79ef197e..d216f0fe 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideMixed[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideMixed[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:01693d01548458c3fcb17aad015d3bb995f7f5bb69fd2e60ce14cf1a907a98ca
-size 40488
+oid sha256:fe9a0dee6d8e904f3113f77884d0dfcf7d4aaaa05e0f69753fa691b7faf3ccdc
+size 31038
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideText[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideText[0]_mobvoiticwatchpro5.png
index 01173ad2..9181133d 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideText[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideText[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:355e69d835bfc8900c979ddf0c85782e1159bbde60ac533d33038c579738bf1c
-size 51197
+oid sha256:c34208bab8d7d8fd42c5e8e56b8419c8cd8189b9984bc6a3d03301c420112640
+size 37779
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideText[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideText[1]_samsunggalaxywatch5.png
index b72c98cc..b171ab1e 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideText[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideText[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c6a3d9c0b63556f02766d3661eb0b47909dce65d39498c200bfe6fca46df61e3
-size 41112
+oid sha256:543f69ac78e3fa5e5ea0ebe8eaf7e5692c337b8ca0485879dc37af9822cc1359
+size 29839
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideText[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideText[2]_samsunggalaxywatch6large.png
index a9803aa8..6e6a763b 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideText[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideText[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:81411a5df466ee283bba78b6a8a87762162efa548e7f175356770811d2794752
-size 53707
+oid sha256:c70f933ffb91fc49522bb074f08c304dfe723e9bb3ba5cf92471e1aaa5d033ca
+size 40125
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideText[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideText[3]_googlepixelwatch.png
index db86db09..7f6dc761 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideText[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideText[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a7c0c32fec3fba5707e7c9eee2f56128aaefd22068194e3549005047c7eaebe4
-size 38892
+oid sha256:fb03f91dd982d676dfa55792a05583cd155b7257823d004226dd472e8995bfd9
+size 28037
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideText[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideText[4]_genericsmallround.png
index db86db09..7f6dc761 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideText[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideText[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a7c0c32fec3fba5707e7c9eee2f56128aaefd22068194e3549005047c7eaebe4
-size 38892
+oid sha256:fb03f91dd982d676dfa55792a05583cd155b7257823d004226dd472e8995bfd9
+size 28037
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideText[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideText[5]_genericlargeround.png
index aa693732..ab09f9dd 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideText[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideText[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0fc63acb2ccd7713e9cb0058f19b27b432978a76fed00e8a1ea648bc681eb59e
-size 50653
+oid sha256:b900d35ea8a71b9639f115b810a4f3a3eae29ae6e9b2845fd7945afb3657b9b4
+size 37696
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideText[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideText[6]_smalldevicebigfonts.png
index b39546bd..0baa8521 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideText[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideText[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a8931f103a2901d5310b74e17e2ec620ac97bcf1ac7517f063b524b8652059e8
-size 35259
+oid sha256:5955c573ba81922719e6725a0224bbb9f21ee2cde5750fd087100890ca359d44
+size 25817
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideText[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideText[7]_largedevicesmallfonts.png
index ec2708cf..74198e9a 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideText[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_sideText[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:47a6bbed83b1e412a904b3b28e1aafcd32eb11c97e178e0906df1100376f3bde
-size 50568
+oid sha256:23c8bb9a8f8ac6976a9f28719a267ec22a45f2342bddcf0d4ccb2f4d9d4e60a7
+size 37212
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Button[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Button[0]_mobvoiticwatchpro5.png
index 966b214b..acc864bc 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Button[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Button[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8a188a03472d22e810dbef26acb5903cc11e8ec08ee33c76d1b5f073f0fbce75
-size 36446
+oid sha256:66033d10ff19aede7f4a23dbe0f948240bc7b18a2d21378c7b8e3841e3e8d2e7
+size 25032
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Button[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Button[1]_samsunggalaxywatch5.png
index 2239e16b..476527bb 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Button[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Button[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0785bc26b27c00f18a5c72b15559177c46034f68a183952f463b53aff6bb88b4
-size 30086
+oid sha256:4b885a5a4f5e0c22c4bfd8d7aca00d96f67129124694dde6f6840fe0f7733418
+size 20278
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Button[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Button[2]_samsunggalaxywatch6large.png
index 701bad35..ceacb0a5 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Button[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Button[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c4db1459a695738fb61329257ed7b261be36aefbcf7f0bef988b8bbecc24147a
-size 38629
+oid sha256:cf48aad86aba3b6a2da011ecb466c55184984618ef63ec8604f67f77a29a52e3
+size 26295
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Button[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Button[3]_googlepixelwatch.png
index 52bf8b14..cae9fa6b 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Button[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Button[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:29e81aa76683c639ba6dc41630ba851cdbe6e56cc4f0cbdf1ae3e07748fd7e9c
-size 29440
+oid sha256:4ebfe5d443942980922b34b7623e004506a8b12a6bb95d319e1440540c4c721e
+size 19643
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Button[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Button[4]_genericsmallround.png
index 52bf8b14..cae9fa6b 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Button[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Button[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:29e81aa76683c639ba6dc41630ba851cdbe6e56cc4f0cbdf1ae3e07748fd7e9c
-size 29440
+oid sha256:4ebfe5d443942980922b34b7623e004506a8b12a6bb95d319e1440540c4c721e
+size 19643
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Button[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Button[5]_genericlargeround.png
index ea11c079..ff8fe197 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Button[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Button[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a4d11f0d0476dbc02ebaee8e21c892dfb7d600a589f4fb211cadf05ff864fff4
-size 36058
+oid sha256:4c2928cca5e3728396650dc12e67862104c3bfabc287c4354c97dc9649a3c073
+size 24721
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Button[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Button[6]_smalldevicebigfonts.png
index 56fec7ca..889bb1d3 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Button[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Button[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c3ddc6a1e6051b47884602c7a8600ea84a8978398cbbf78d05d115d5c2b37985
-size 30706
+oid sha256:ef9f0393727c48fce81af51ec0c725ba8bd3bc0350cbf8463cc70f3680895d2d
+size 20922
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Button[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Button[7]_largedevicesmallfonts.png
index 31038e98..2dea175d 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Button[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Button[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:51212b25a77ec582c7e7c83eebb5da0111c718da77cdb63eddd66fb124d5471f
-size 35948
+oid sha256:09a1b935d75bb22a4630438f8bb64f044d90cf4f97807138aefd2c908f4558c9
+size 24513
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1CompactChip[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1CompactChip[0]_mobvoiticwatchpro5.png
index a0390eea..1336f57d 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1CompactChip[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1CompactChip[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ac6fa4f32a4ab4dcf215f7cfccb0875cf72ded52ae6a57569b16f60918a59607
-size 36201
+oid sha256:15373d96b9e13afccf5041da351c776b4ed9fe6a1eff1951144828c3cbba2c94
+size 24566
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1CompactChip[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1CompactChip[1]_samsunggalaxywatch5.png
index 670a932f..1a6567b8 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1CompactChip[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1CompactChip[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:738171086d782ce7783ed3c71c1a7bdf8156f2de63da1bc3202605698b7b27a3
-size 30917
+oid sha256:a0623d25a2b9635509fa624703531a9aca1ddf8eeced59faf69c039697983cdc
+size 21237
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1CompactChip[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1CompactChip[2]_samsunggalaxywatch6large.png
index 4fe4bb49..7eb99eea 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1CompactChip[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1CompactChip[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1de13f292f4cb4c5f2d4c1cdfcb062a1f8803e7c7c74b13c4be09b10460992d1
-size 38797
+oid sha256:d9618ed12efbb7b1b0bc8876c4c2863ced07edf6476af7096210e01c52f7066d
+size 26200
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1CompactChip[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1CompactChip[3]_googlepixelwatch.png
index b72a333e..75b43abf 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1CompactChip[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1CompactChip[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:167018884adbb6a7a837b4dea42b66c233ae2e26ea1333a251cd7734db6176cb
-size 29591
+oid sha256:6f797fad19399615c697bcbdfe35bd41a985be518b90ba12c4d2adc517f5ef00
+size 20195
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1CompactChip[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1CompactChip[4]_genericsmallround.png
index b72a333e..75b43abf 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1CompactChip[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1CompactChip[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:167018884adbb6a7a837b4dea42b66c233ae2e26ea1333a251cd7734db6176cb
-size 29591
+oid sha256:6f797fad19399615c697bcbdfe35bd41a985be518b90ba12c4d2adc517f5ef00
+size 20195
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1CompactChip[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1CompactChip[5]_genericlargeround.png
index 80222089..77b7ba9a 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1CompactChip[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1CompactChip[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:da0a1527c6e592383cd1b115fe072583758eec8dd7b6a8f8342e324e9ce065e4
-size 35859
+oid sha256:482ef6119ff0f3c50b5544073d4727959a7adca03abfcd415cfaa6217c1f09fd
+size 24274
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1CompactChip[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1CompactChip[6]_smalldevicebigfonts.png
index ead8667f..619e8be3 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1CompactChip[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1CompactChip[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:29cbe3a185b4f1e196815c548ff93862ad68a7b4f13b3f7336504186aa98ee93
-size 30663
+oid sha256:508970f1179d29b58fc719ca0339e3bf3192df6276867c190429ac170c689b5e
+size 21125
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1CompactChip[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1CompactChip[7]_largedevicesmallfonts.png
index 6a35f4b3..d76d24a2 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1CompactChip[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1CompactChip[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3598627b6fdfa47facc0e04a6d19555ba5db0c31cdf805b0250541e83b5a4d48
-size 35518
+oid sha256:bd0b2cb5442f8cc98072c941b7bab3dfc9f31f5262afcad54626d345f8e32341
+size 23857
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Line[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Line[0]_mobvoiticwatchpro5.png
index 0583e8f8..943daa72 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Line[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Line[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:80d6d662968ebef50d952597935226daf6d7d6854fb73277021b2722cb25928f
-size 34427
+oid sha256:8efed77fac7ad1154215317f91784c02f036a80d2082d87c67958e4065d583b1
+size 23754
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Line[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Line[1]_samsunggalaxywatch5.png
index 760ec9c0..39292426 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Line[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Line[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:058f908efa5dcc5fd0fcee74eb7c2dbc74b7ad9aa60a5c1bc1e93f2bb221ab9b
-size 28975
+oid sha256:d8bb4783b49f587347d1fcb10bcf32c1640fed7e5ba607be2dcd8b4c25273105
+size 20154
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Line[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Line[2]_samsunggalaxywatch6large.png
index 91588b85..ab792fb0 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Line[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Line[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1198126d01593e127bdce91e70e0ce8a1142673ecf986d31d29745cef98492cc
-size 36181
+oid sha256:7696af6dbeaadd0c95432bde85e74fc9652207781f69a1fc43237a50bfe4ce31
+size 24856
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Line[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Line[3]_googlepixelwatch.png
index f126eb06..b6c8aecf 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Line[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Line[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a0de7cef75c926c5b6ca832950a321c1ca118103d88566ac47ff0940f7f2218c
-size 27866
+oid sha256:2e6b56f46e6125cc072a3bad5239d6a4324a0ac2c16c698b40a0b004067e46cf
+size 19369
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Line[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Line[4]_genericsmallround.png
index f126eb06..b6c8aecf 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Line[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Line[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a0de7cef75c926c5b6ca832950a321c1ca118103d88566ac47ff0940f7f2218c
-size 27866
+oid sha256:2e6b56f46e6125cc072a3bad5239d6a4324a0ac2c16c698b40a0b004067e46cf
+size 19369
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Line[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Line[5]_genericlargeround.png
index 5894ec22..0b821470 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Line[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Line[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ba9d29945e9b92b25c4919de0186d2962f4f9c493873fe5e9c2152d7296b34ea
-size 33712
+oid sha256:7e8564a859cbc177bca3cfd6afadf195a33f9b29fa8669129027b58d9d5fd696
+size 23313
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Line[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Line[6]_smalldevicebigfonts.png
index a6253bba..7ce71e09 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Line[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Line[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f3fba4bd7ac6ffb0e8f27cf60be6dbb9a2d0f5a1fceec79b3298bb6adbb16ded
-size 29255
+oid sha256:4623ca4ae60f4bced9652861afcafdd9601f28be548e0426e921e7900fe07e3d
+size 20205
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Line[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Line[7]_largedevicesmallfonts.png
index d90c64c1..653b2fa1 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Line[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title1Line[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e5342313ae9d7f10d26606093aa49ead527937c0db0a4e2ce4f150d8feaca744
-size 33751
+oid sha256:1a392c8ca8834b7b79b686dad90c74f39bde755ab237983dbd8da69ebda03c6f
+size 23156
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Button[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Button[0]_mobvoiticwatchpro5.png
index 15f06348..46131a66 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Button[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Button[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2d05fc509e10aa4b92e086c7fae80c1621fbd86f540f4181e944bb92ded5910a
-size 33446
+oid sha256:2d83713e515f0304357f08e54efc9fb5e273bc3dda60233c6c9ebc67661de79e
+size 22485
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Button[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Button[1]_samsunggalaxywatch5.png
index af77e083..7f7899a9 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Button[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Button[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e618c561589dfe214df71deffdabcd48257f108184682efb54f596985c92c698
-size 30407
+oid sha256:8a6c21562c984375070642f543f640f14f4de2ed09f92d6d49d267cae7db4161
+size 20500
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Button[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Button[2]_samsunggalaxywatch6large.png
index 7efd7661..42079e31 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Button[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Button[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9fd7a7848712afcb7af07daee2aec7ee6647e4ec8f55133d9cb0d43721fb8dfa
-size 35101
+oid sha256:950acacb9123d55069549ebfe10f68bfc45dc70955dc7d8e0c5b48c0590bc4df
+size 23970
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Button[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Button[3]_googlepixelwatch.png
index 082623ac..9a9ca532 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Button[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Button[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6447ad9b35b953dc9a869f281f8d20855ceeb6e0e549f420064ab82bff55807a
-size 29680
+oid sha256:d6804387dfe901615fd6995a8f9e56948c23d7c81dc8bc38d3079bcf56e4305d
+size 19936
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Button[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Button[4]_genericsmallround.png
index 082623ac..9a9ca532 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Button[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Button[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6447ad9b35b953dc9a869f281f8d20855ceeb6e0e549f420064ab82bff55807a
-size 29680
+oid sha256:d6804387dfe901615fd6995a8f9e56948c23d7c81dc8bc38d3079bcf56e4305d
+size 19936
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Button[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Button[5]_genericlargeround.png
index 6b257f9e..13d8607e 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Button[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Button[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ef065df02d3885ab449284ea81988e95a86fc25696d35b8b827384ae5d162416
-size 32876
+oid sha256:1612604247f72b938558895c915d6dd193d1cc246b87efe49d1082e75bf5c977
+size 22148
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Button[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Button[6]_smalldevicebigfonts.png
index 50d562ef..b550bd91 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Button[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Button[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b4ee32f976f56192fdf1fa24f18a2c9bb81595785a35b0bd7e8302e4e77e8cbf
-size 30681
+oid sha256:2bd630ccc259b1861eeac4c9f8ba275938c8142f0cec3749a45c30c6c8a474d4
+size 20523
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Button[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Button[7]_largedevicesmallfonts.png
index 1f6a4ca0..49ad7c6a 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Button[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Button[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ee86392766e4c89d2d04e08a790d66d004f8a082ffa4597f33455afd3806ba3c
-size 32969
+oid sha256:f8c3cc68107a3813a1ac6f3b78676f0e1da754803249280bf04106bd6a9f9f29
+size 22084
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Lines[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Lines[0]_mobvoiticwatchpro5.png
index 7573429f..9c5a168e 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Lines[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Lines[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5965110b1a37e1ad3881f19f00a13235bc42ef480632294f7b91456ee78ac30b
-size 32166
+oid sha256:e29ae5bc62c60080544b0d77f8e9a49186b4a4843727234dac1256507aadbddd
+size 22454
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Lines[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Lines[1]_samsunggalaxywatch5.png
index c4296f25..c3d7f75e 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Lines[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Lines[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f2f66165c6e2d14bd11aac4844cc4d6a4ad3f7e9615c6bdcc87e7a0d9fa969bb
-size 27915
+oid sha256:baeefbc566795a0f155c4861e328d7bbbec48c0973e2ae356eccaf4859386006
+size 19569
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Lines[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Lines[2]_samsunggalaxywatch6large.png
index 00768f2e..e1c0ad3e 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Lines[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Lines[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4d303ee847bef601eed7ee441a363041388d774f57dd55c8b0aa5b6708f3ca2c
-size 32856
+oid sha256:4b3b2aabcdff240cae4f2f44e51fe3144db08b82f2159036213b574552742b3a
+size 22835
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Lines[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Lines[3]_googlepixelwatch.png
index de80ddac..6d57e789 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Lines[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Lines[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3d7136af9080570dd396b59178d768999a4a70b98398f06c992f437d340d274c
-size 27798
+oid sha256:c03c21b153c8e760bf11d99c6c4d3ae967266b9e08acbec56d9bf1ac2f66b78e
+size 19234
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Lines[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Lines[4]_genericsmallround.png
index de80ddac..6d57e789 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Lines[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Lines[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3d7136af9080570dd396b59178d768999a4a70b98398f06c992f437d340d274c
-size 27798
+oid sha256:c03c21b153c8e760bf11d99c6c4d3ae967266b9e08acbec56d9bf1ac2f66b78e
+size 19234
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Lines[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Lines[5]_genericlargeround.png
index 7db558ca..95dd7659 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Lines[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Lines[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9f1bb17f97a140f1bd10aea79b23d0b1c3c27f836f49cf122f1ac0ec25c576a8
-size 30769
+oid sha256:5417687d505aa534614e4d74e30466aa03844f0b24c5cdcfdf118412e9f8968a
+size 21477
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Lines[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Lines[6]_smalldevicebigfonts.png
index 9c47ab6d..908e6ce8 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Lines[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Lines[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2a9025c00581658e9f081e0b6f895364f87750dc7a3c7529008641b3ae11ab80
-size 27572
+oid sha256:fc8d462bb197d43115f22d79178004311f7df8f6edab5da05abdbe4d59666fc7
+size 19228
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Lines[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Lines[7]_largedevicesmallfonts.png
index 835572a7..6b6f99a2 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Lines[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title2Lines[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1d8ed599e1848cb641ca7fb7500fe52f6c1bdceb1105bbe018d5960ea39ad68b
-size 32620
+oid sha256:459caaad625e0815f906bde532f5561c64548b89c1a865e76f5a6b3cf57c19f3
+size 22630
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title3Lines[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title3Lines[0]_mobvoiticwatchpro5.png
index 8d1873f2..e6cfabc8 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title3Lines[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title3Lines[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b9e1cf8edd9a5275d9de0bfd0a953f22cb2dc054ac91283847c8dae862b47472
-size 30763
+oid sha256:fc1eb9bdd08b0cef6a67b7566cab4c48cdaa159703567bc40e476a8e39fa855c
+size 21582
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title3Lines[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title3Lines[1]_samsunggalaxywatch5.png
index ce9f6dda..63564f85 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title3Lines[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title3Lines[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7c9ab781b6f8b936355598f5641e883776be721f46f54cb48f72e699c2ac5aaa
-size 26333
+oid sha256:9f596804a6aaa83728ad2aaa8c32f7c3652e3eba43971674563e63a7b498918e
+size 18703
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title3Lines[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title3Lines[2]_samsunggalaxywatch6large.png
index 1001c67c..4b1af9a2 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title3Lines[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title3Lines[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fe6ab215e40bead546eb42e49b0f2a859b8aa4109c6e16861b7353b0ddbce57f
-size 32745
+oid sha256:85e5ec6e9760f20d8e8ca8f790db6daa40f449e39bba503a63c845b4da8bb0d2
+size 22924
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title3Lines[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title3Lines[3]_googlepixelwatch.png
index 5b17d5a9..165197bc 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title3Lines[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title3Lines[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a0aa009b33b6a8b5b8cf348cb61dcac04798ca601091e7e13044705420d741d5
-size 24769
+oid sha256:00adb9fcf768f10ea7c39626a4d728741b07fb6811793656c4a34aa0536ec099
+size 17437
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title3Lines[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title3Lines[4]_genericsmallround.png
index 5b17d5a9..165197bc 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title3Lines[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title3Lines[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a0aa009b33b6a8b5b8cf348cb61dcac04798ca601091e7e13044705420d741d5
-size 24769
+oid sha256:00adb9fcf768f10ea7c39626a4d728741b07fb6811793656c4a34aa0536ec099
+size 17437
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title3Lines[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title3Lines[5]_genericlargeround.png
index c6fabb98..f6463582 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title3Lines[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title3Lines[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b5ca77e831f5f338470bc7234b67a543dae39e05f199dfe7e36e828d42aa09e0
-size 30416
+oid sha256:42706a0d16e2dcd283e16a8b77154c06f7392ca061f78bc9d71d78c3d44b271f
+size 21246
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title3Lines[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title3Lines[6]_smalldevicebigfonts.png
index 30faafa1..ef890e2d 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title3Lines[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title3Lines[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e309a22459299642f47061343304018495eee8b4e99dcaa643ea28edcc54c089
-size 24582
+oid sha256:057a79a16a29670ff9aeb54ea12fd9b83a55a5acc6b721aa30c9cf96836b333d
+size 17706
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title3Lines[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title3Lines[7]_largedevicesmallfonts.png
index 0860cb9f..02fca1d6 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title3Lines[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_title3Lines[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:67f9ed8d8d53b1edcde3db44b7eab4609df1f52d3a6718ed242dfe8f4c851e1f
-size 30480
+oid sha256:a7a000fcfa60540966455bfa09547d0390e3f415bb1413002d52f75fbf61ce99
+size 21196
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherCards[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherCards[0]_mobvoiticwatchpro5.png
index 0d4c73bc..af55389a 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherCards[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherCards[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0d4378c6f61f980d0dd49efbae709bd93cc3d7f58dcd4e7468e20f9a39833958
-size 85530
+oid sha256:42cb3af954b7785f72b4f8f51a6eb37be103dd0c7a035f52c75f3bd73ec4cda4
+size 63622
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherCards[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherCards[1]_samsunggalaxywatch5.png
index 6844ee2b..2f311175 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherCards[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherCards[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e9e12ea6262406406d0f5e495daceb3b6895fd27e6cf9d5a3a775a0497a26842
-size 67261
+oid sha256:166a793a99e428f505accbf6db0dbfe5754bb2a904a60b082bec19bbc84b180a
+size 53487
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherCards[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherCards[2]_samsunggalaxywatch6large.png
index 6c33e1c8..8cb50856 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherCards[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherCards[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fda52984b026662b9b2c0e3b51b2943e1713aae2b4572c93fd21433e29a7bb6c
-size 86356
+oid sha256:5b40535522c73158ae36c940402a9f74dbb7320946627e6593d77bf388d17639
+size 69624
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherCards[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherCards[3]_googlepixelwatch.png
index 3361b0e7..c0cf31fc 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherCards[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherCards[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:94479c30c2a353a930f6de7a2d789d97b08cf7a0a4d6ec74b2d13c5b82ada85a
-size 65370
+oid sha256:20e62dfd1540a3f4952007fc2b8be3ec4c7893de8319827a20e5d87c2cb6f378
+size 51449
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherCards[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherCards[4]_genericsmallround.png
index 3361b0e7..c0cf31fc 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherCards[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherCards[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:94479c30c2a353a930f6de7a2d789d97b08cf7a0a4d6ec74b2d13c5b82ada85a
-size 65370
+oid sha256:20e62dfd1540a3f4952007fc2b8be3ec4c7893de8319827a20e5d87c2cb6f378
+size 51449
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherCards[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherCards[5]_genericlargeround.png
index de16fa87..fa1da704 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherCards[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherCards[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e1f22f5fc9e5fa851913678d05933b283c40134ac0c6e17512d6bead1eb10075
-size 80500
+oid sha256:1c36fe8f25e0075caea79a1cbdc891e2800b8c18d1dced1ac93d31d79c934c5d
+size 62811
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherCards[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherCards[6]_smalldevicebigfonts.png
index e5b3f73f..b63cb61e 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherCards[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherCards[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:019fb6e246eafe2a0c04c37d574fd74d5e59bbdac34943ae2fee2b6589b86cc6
-size 60716
+oid sha256:a82d967e3eb9c2a0d54f66c77cac2163d1d64bc7d372b716a0145535eb24546a
+size 53681
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherCards[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherCards[7]_largedevicesmallfonts.png
index 280ccbd1..97e6ae4d 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherCards[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherCards[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:68f0904037d6ca3ae641f7b15225a366cb9bac904341de6f755e0962f8eae65a
-size 81294
+oid sha256:d3f964dcc6d50fa572c0a3014b7f55be082f2c2e10f851679934a5373c4d957f
+size 64833
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherChips[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherChips[0]_mobvoiticwatchpro5.png
index e9375947..a8849894 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherChips[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherChips[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:360fd281da389b1f11b3a544cea0cb0331f8c856f9fdda38dc25e9ca3b0ca397
-size 35378
+oid sha256:0397d225cc1b461dda491aff814a089554876cf84fa6635bf5e1434ac7e8375b
+size 24282
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherChips[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherChips[1]_samsunggalaxywatch5.png
index 86d08775..4860332b 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherChips[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherChips[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:881d0446a5bfc35a46dfa7a03a7bf7ae5330a6430da065ff1eecbfd80fabb91f
-size 33215
+oid sha256:9e4364503223c213c1fc2697ac2010b8dde448579272c05bb8cab745ed21ab5e
+size 22735
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherChips[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherChips[2]_samsunggalaxywatch6large.png
index 014b3ed8..3f817185 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherChips[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherChips[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bf29ddb2bc1370a37580c17e7a09c58be1741fcbc869a6584a855021da290df7
-size 38009
+oid sha256:9e01eb9258d43429ca2c4af627d107ba711ba2a8c094b7b41dc9e4f2e1896272
+size 26022
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherChips[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherChips[3]_googlepixelwatch.png
index 0d916fa2..f540534d 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherChips[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherChips[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1a941bc40b9473be912271c1961b1d45078926b12431594ad3ebfebeadb2d3d6
-size 32697
+oid sha256:49a6a135c9b1fe746fd96f946e01e3e3614d2add53d79f6cd70b2a2c57108bfd
+size 22179
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherChips[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherChips[4]_genericsmallround.png
index 0d916fa2..f540534d 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherChips[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherChips[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1a941bc40b9473be912271c1961b1d45078926b12431594ad3ebfebeadb2d3d6
-size 32697
+oid sha256:49a6a135c9b1fe746fd96f946e01e3e3614d2add53d79f6cd70b2a2c57108bfd
+size 22179
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherChips[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherChips[5]_genericlargeround.png
index 07d45da6..9067ba92 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherChips[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherChips[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5671d28df36a7755ad6d612291523ce3b248e4f0ce97c1410635645ce6210dfb
-size 35067
+oid sha256:8887857d8052de171f2210d898cb814b5959a4175539cb38f50e030459a0959b
+size 23917
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherChips[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherChips[6]_smalldevicebigfonts.png
index 4ed1959b..78bcffe6 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherChips[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherChips[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8d38af0723baa6966d690f981da8627ed437058b8d24c7358c361d7dc4c5c2a4
-size 33072
+oid sha256:18f6af54d17fae79889561448c2cfbbcce99f52864281b785b4de6396bdb181e
+size 22763
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherChips[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherChips[7]_largedevicesmallfonts.png
index a7e1d4f4..8307762e 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherChips[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherChips[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:05bc1a7a229b6875ec25201679e4e50026bcc431cdefd9920facb0cb48a98830
-size 34783
+oid sha256:248eee940e657de3be09540f02f155896f5106c147f929aed23ba047eb7b7a05
+size 23595
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherText[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherText[0]_mobvoiticwatchpro5.png
index 0f6b6e4e..7f0a1536 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherText[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherText[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3974abed5223e7234f0f232a185a4c973ad26802c522f069eb062a0afea1f941
-size 51407
+oid sha256:ff00603b0e1b0f5198e2b191f062e6890e0f41e041eab958a186634f5f2d198f
+size 36257
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherText[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherText[1]_samsunggalaxywatch5.png
index 44339877..3a91e0b0 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherText[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherText[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5f67edd2e7cfc126d4456cac83d8fb898d5a8594c50287115fa1a65ab7a45a3d
-size 41052
+oid sha256:dc834caee5fff0abbf94cbab318970a983e1b751404c7f0acacf1c799590cbe4
+size 28290
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherText[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherText[2]_samsunggalaxywatch6large.png
index 5bb5e00e..794d4276 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherText[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherText[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ce40dd97f7ef3c9fc369e7dfb6e7192edaa2080f96cfefa199abb4ad3d63902c
-size 53530
+oid sha256:23fb6c5b5c62837a9d2b002f0b2b10d52dc67a24d383a927185abc5132931951
+size 38468
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherText[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherText[3]_googlepixelwatch.png
index b71a28a6..de3c9c1a 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherText[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherText[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9898e4d9a4874606780a7026917c367d2aed7beee913202eabe1c1fcf215dbed
-size 39085
+oid sha256:312298acbbe9aaf23ee3d3a911eac04cf1ed92b4d9487045e46a78a044a6f926
+size 26633
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherText[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherText[4]_genericsmallround.png
index b71a28a6..de3c9c1a 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherText[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherText[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9898e4d9a4874606780a7026917c367d2aed7beee913202eabe1c1fcf215dbed
-size 39085
+oid sha256:312298acbbe9aaf23ee3d3a911eac04cf1ed92b4d9487045e46a78a044a6f926
+size 26633
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherText[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherText[5]_genericlargeround.png
index 55a9296c..5deaecd8 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherText[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherText[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3e6c87242e72259d01cc5984e997837f5e491002762a1303497dca0054fff183
-size 50865
+oid sha256:ea36f3e3f315ec74915c5ea5755c77185265b423b716bca75cf6ccf8da23b5ee
+size 36085
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherText[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherText[6]_smalldevicebigfonts.png
index 18dbaf0f..bc4409a7 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherText[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherText[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aa8855356dbe7bafbe51b4dc98f8afa902599d3d5711cbdef1565e2746feb131
-size 35300
+oid sha256:033be9e71337c06022cd25cb75965ac99ff043fee67b348cd06028c5e0e13af7
+size 24372
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherText[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherText[7]_largedevicesmallfonts.png
index 4b1977d9..55b10c8b 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherText[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleOtherText[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9b12b289bbad4c493cdf23d0f767491bc8e9dffa8a4bf441724e582d8ae37ad4
-size 50393
+oid sha256:878b34e42f0818abbe7c036aaa3872f2f9798c83f2692f8db79595b133bd8699
+size 35626
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleUnspecified[0]_mobvoiticwatchpro5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleUnspecified[0]_mobvoiticwatchpro5.png
index 444435e1..a84add51 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleUnspecified[0]_mobvoiticwatchpro5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleUnspecified[0]_mobvoiticwatchpro5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e57920ae62bf18de2d2ac07359e1f6d4bfa1005b7ecb25a5ddd5720fd13521e8
-size 36020
+oid sha256:d51300092e68b228a1f327215bfaee9181f30365dc142d67f1486bc60f415fa6
+size 24666
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleUnspecified[1]_samsunggalaxywatch5.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleUnspecified[1]_samsunggalaxywatch5.png
index ec215b18..db854704 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleUnspecified[1]_samsunggalaxywatch5.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleUnspecified[1]_samsunggalaxywatch5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bb1eb75752c845728b7fef61ad40cd7d84e7b284a5095c137dba346fc8344d75
-size 32856
+oid sha256:5333d1f16597997a62b2e7458edcd9378e6e10e15d8ce3e27ea557f4bfc42352
+size 22844
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleUnspecified[2]_samsunggalaxywatch6large.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleUnspecified[2]_samsunggalaxywatch6large.png
index 800646f6..182cac3d 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleUnspecified[2]_samsunggalaxywatch6large.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleUnspecified[2]_samsunggalaxywatch6large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1bc4cccec02508b72cb27f25d2e4510e601396ce9164ff91e1d137884317ecf4
-size 37733
+oid sha256:dfdc85ac0339891e0ddc4b50baa86ba7d571f0f1714c40775fc345a921eb1133
+size 25553
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleUnspecified[3]_googlepixelwatch.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleUnspecified[3]_googlepixelwatch.png
index f8d9e212..5961442e 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleUnspecified[3]_googlepixelwatch.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleUnspecified[3]_googlepixelwatch.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dd205a5a6468d4b7598d806b223eef1a62fea44e2c312716e0121b1088e3557e
-size 32583
+oid sha256:434a3fbee154b040760e7015095ea71b6bb45d4a3df3e91bbdec2850a1f0f5fe
+size 22312
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleUnspecified[4]_genericsmallround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleUnspecified[4]_genericsmallround.png
index f8d9e212..5961442e 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleUnspecified[4]_genericsmallround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleUnspecified[4]_genericsmallround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dd205a5a6468d4b7598d806b223eef1a62fea44e2c312716e0121b1088e3557e
-size 32583
+oid sha256:434a3fbee154b040760e7015095ea71b6bb45d4a3df3e91bbdec2850a1f0f5fe
+size 22312
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleUnspecified[5]_genericlargeround.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleUnspecified[5]_genericlargeround.png
index 045f8b94..aaafbd78 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleUnspecified[5]_genericlargeround.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleUnspecified[5]_genericlargeround.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b4e6cd4318d239ebaf0614bc0871104ad81113e5644af633b1ddf12d6fd6ddcb
-size 34410
+oid sha256:9388a1bef7c199f15f8c3a98e2965867bdcbf41c9d2a6bbb3898456798ac4bef
+size 23693
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleUnspecified[6]_smalldevicebigfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleUnspecified[6]_smalldevicebigfonts.png
index 7e459b10..3b27fcaf 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleUnspecified[6]_smalldevicebigfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleUnspecified[6]_smalldevicebigfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2fdc939e04add519bcf2c8f26023ea2b5036d86cbd406c5f40315f2e9b6c75da
-size 34105
+oid sha256:c31fcedf2c1a6a8c5316846f85b3f256acec1ac4acfb71914839294d4a9fdce7
+size 23643
diff --git a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleUnspecified[7]_largedevicesmallfonts.png b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleUnspecified[7]_largedevicesmallfonts.png
index 1c7fe78b..22a3085f 100644
--- a/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleUnspecified[7]_largedevicesmallfonts.png
+++ b/sample/src/test/snapshots/images/com.google.android.horologist.spec_ScalingLazyColumnExamplesTest_titleUnspecified[7]_largedevicesmallfonts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9a5b8aee8acae5cb9a4eb7ee1db24c31efc8dbc6bc6b68fd0c1009a220d5f432
-size 35519
+oid sha256:167a44d5c63dfe2d35ed8a390194d2f4c40a366bd2b755f28b764099969d36a8
+size 23981