diff --git a/compose-material/src/main/java/com/google/android/horologist/compose/material/Confirmation.kt b/compose-material/src/main/java/com/google/android/horologist/compose/material/Confirmation.kt
index 36b3a61e85..6951f15c92 100644
--- a/compose-material/src/main/java/com/google/android/horologist/compose/material/Confirmation.kt
+++ b/compose-material/src/main/java/com/google/android/horologist/compose/material/Confirmation.kt
@@ -58,7 +58,9 @@ public fun Confirmation(
     title: String? = null,
     durationMillis: Long = DialogDefaults.ShortDurationMillis,
     columnState: ScalingLazyColumnState = rememberColumnState(
-        ScalingLazyColumnDefaults.responsive(),
+        ScalingLazyColumnDefaults.responsive(
+            verticalArrangement = DialogDefaults.ConfirmationVerticalArrangement,
+        ),
     ),
 ) {
     // Always refer to the latest inputs with which Confirmation was recomposed.
@@ -72,7 +74,7 @@ public fun Confirmation(
     ) ?: durationMillis
 
     LaunchedEffect(showDialog, a11yDurationMillis) {
-        if (showDialog == true) {
+        if (showDialog) {
             delay(a11yDurationMillis)
             currentOnDismissed()
         }
@@ -99,7 +101,9 @@ public fun ConfirmationContent(
     icon: @Composable (() -> Unit)? = null,
     title: String? = null,
     columnState: ScalingLazyColumnState = rememberColumnState(
-        ScalingLazyColumnDefaults.responsive(),
+        ScalingLazyColumnDefaults.responsive(
+            verticalArrangement = DialogDefaults.ConfirmationVerticalArrangement,
+        ),
     ),
     showPositionIndicator: Boolean = true,
 ) {
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 4f5b4f832a..3780f37283 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,14 +43,12 @@ import com.google.android.horologist.compose.material.ResponsiveDialogContent
 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 com.google.android.horologist.screenshots.ScreenshotTestRule
 import kotlinx.coroutines.runBlocking
 import org.junit.Test
 
 class DialogTest(device: Device) : ScreenSizeTest(
     device = device,
     showTimeText = false,
-    recordMode = ScreenshotTestRule.RecordMode.Record,
 ) {
 
     @Composable
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 2a01e2438e..78190506a8 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:e10629d39a220a9ab66c0db3165be10607bda87984fb7ecf8b4b910107f5370d
-size 17150
+oid sha256:c10f74a1af18c454bfc8f77b201ccc3fd53ab923e675e34f38e2005bb3806b5e
+size 16905
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 e1ae770359..2ed763d020 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:982992ab69b59b9fd987d9da2f93d146b78d568feb7244d522e73c6f93eca2e5
-size 14933
+oid sha256:14de2e5dea8d5dc6c85074cbda353e1c4edfd081b8899432c842ce0368d5582e
+size 14885
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 bcc3508ccf..0d61fda4c9 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:3a0d76a2b86879b258554feb57d40a64a1c35d3ace07e4acceb97585e61abf1c
-size 18601
+oid sha256:59cfdd012a2424709aea43d8ca4255cc8bc0a97dd6bb68c9687a8becca490631
+size 18250
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 62f8251092..999f227112 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:8f505162b8f21c65c86eb7bdf1642af157ba0b714095d45f672a88f9b2f2abfa
-size 14880
+oid sha256:226fc808c7691036453cc989ac6489539a57f6654c9dc851a3213876aaba9b9a
+size 14756
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 62f8251092..999f227112 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:8f505162b8f21c65c86eb7bdf1642af157ba0b714095d45f672a88f9b2f2abfa
-size 14880
+oid sha256:226fc808c7691036453cc989ac6489539a57f6654c9dc851a3213876aaba9b9a
+size 14756
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 2cd3c961b8..16457afede 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:eb49c2b33b865c1a4961adb62f1dcd793208086937ecb186fe1f62ae678718fa
-size 16629
+oid sha256:e4a20a12da347082cc3b7dd12959bc0cd6c7d0f48b355a6af3be20e82eca9fd6
+size 16403
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 e468c61442..e061663dc8 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:4e9c39b4ee99c5100955cc362b2cbee1b1cb3b7b51a0c157aa284c45d4107acc
-size 16090
+oid sha256:db3b058155fe1fc322d5cff35cd191bbdf8758ccd909432716ee0307d110e1d6
+size 15894
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 c311a663bb..6d2fc50ba5 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:af595ced1acc8921c561bf11305f87ef667e8bf3b6cad227d6df1a49d30322a9
-size 17157
+oid sha256:2dac86bb42e527bc8efffc7abce8115830bfc4b3d4cd84a5e7994aecbae5e4ec
+size 16807