diff --git a/android/feature/account/src/test/kotlin/se/hagstedt/kvitt/feature/account/ScreenSnapshots.kt b/android/feature/account/src/test/kotlin/se/hagstedt/kvitt/feature/account/ScreenSnapshots.kt
index eb7b383..5c02c7f 100644
--- a/android/feature/account/src/test/kotlin/se/hagstedt/kvitt/feature/account/ScreenSnapshots.kt
+++ b/android/feature/account/src/test/kotlin/se/hagstedt/kvitt/feature/account/ScreenSnapshots.kt
@@ -2,6 +2,7 @@ package se.hagstedt.kvitt.feature.account
 
 import android.content.res.Configuration
 import android.os.LocaleList
+import android.os.Looper
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.getValue
@@ -22,6 +23,7 @@ import kotlinx.coroutines.test.UnconfinedTestDispatcher
 import kotlinx.coroutines.test.resetMain
 import kotlinx.coroutines.test.setMain
 import kotlinx.datetime.TimeZone
+import org.robolectric.Shadows.shadowOf
 import se.hagstedt.kvitt.design.KvittTheme
 import se.hagstedt.kvitt.design.component.KvittClock
 import se.hagstedt.kvitt.design.component.LocalKvittClock
@@ -75,6 +77,11 @@ object ScreenSnapshots {
         variants.forEach { variant ->
             current = variant
             compose.mainClock.advanceTimeBy(SETTLE_MILLIS)
+            // The screen (and a dialog window) draw in a later frame; one more frame and an idle main looper, so the
+            // capture shows this variant and not the previous one.
+            shadowOf(Looper.getMainLooper()).idle()
+            compose.mainClock.advanceTimeByFrame()
+            shadowOf(Looper.getMainLooper()).idle()
             captureScreenRoboImage("src/test/screenshots/${name}_${variant.suffix}.png")
         }
     }
diff --git a/android/feature/account/src/test/screenshots/S-5-account-archived_sv_dark.png b/android/feature/account/src/test/screenshots/S-5-account-archived_sv_dark.png
index bbdf386..46b2aa3 100644
Binary files a/android/feature/account/src/test/screenshots/S-5-account-archived_sv_dark.png and b/android/feature/account/src/test/screenshots/S-5-account-archived_sv_dark.png differ
diff --git a/android/feature/account/src/test/screenshots/S-5-account-delete-confirm_sv_dark.png b/android/feature/account/src/test/screenshots/S-5-account-delete-confirm_sv_dark.png
index 2768abe..45259dd 100644
Binary files a/android/feature/account/src/test/screenshots/S-5-account-delete-confirm_sv_dark.png and b/android/feature/account/src/test/screenshots/S-5-account-delete-confirm_sv_dark.png differ
diff --git a/android/feature/account/src/test/screenshots/S-5-account-empty_sv_dark.png b/android/feature/account/src/test/screenshots/S-5-account-empty_sv_dark.png
index 8e2f389..c7a2529 100644
Binary files a/android/feature/account/src/test/screenshots/S-5-account-empty_sv_dark.png and b/android/feature/account/src/test/screenshots/S-5-account-empty_sv_dark.png differ
diff --git a/android/feature/account/src/test/screenshots/S-5-account-error_sv_dark.png b/android/feature/account/src/test/screenshots/S-5-account-error_sv_dark.png
index 783a994..24aa94a 100644
Binary files a/android/feature/account/src/test/screenshots/S-5-account-error_sv_dark.png and b/android/feature/account/src/test/screenshots/S-5-account-error_sv_dark.png differ
diff --git a/android/feature/account/src/test/screenshots/S-5-account-negative_sv_dark.png b/android/feature/account/src/test/screenshots/S-5-account-negative_sv_dark.png
index de0ba6b..4225d1a 100644
Binary files a/android/feature/account/src/test/screenshots/S-5-account-negative_sv_dark.png and b/android/feature/account/src/test/screenshots/S-5-account-negative_sv_dark.png differ
diff --git a/android/feature/account/src/test/screenshots/S-5-account_sv_dark.png b/android/feature/account/src/test/screenshots/S-5-account_sv_dark.png
index 6fec3d9..8079f76 100644
Binary files a/android/feature/account/src/test/screenshots/S-5-account_sv_dark.png and b/android/feature/account/src/test/screenshots/S-5-account_sv_dark.png differ
diff --git a/android/feature/account/src/test/screenshots/S-6-account-editor-create_sv_light.png b/android/feature/account/src/test/screenshots/S-6-account-editor-create_sv_light.png
index bcfd3cd..b1e1eba 100644
Binary files a/android/feature/account/src/test/screenshots/S-6-account-editor-create_sv_light.png and b/android/feature/account/src/test/screenshots/S-6-account-editor-create_sv_light.png differ
diff --git a/android/feature/account/src/test/screenshots/S-6-account-editor-decimals_sv_light.png b/android/feature/account/src/test/screenshots/S-6-account-editor-decimals_sv_light.png
index 0e07d8f..f22a3f1 100644
Binary files a/android/feature/account/src/test/screenshots/S-6-account-editor-decimals_sv_light.png and b/android/feature/account/src/test/screenshots/S-6-account-editor-decimals_sv_light.png differ
diff --git a/android/feature/account/src/test/screenshots/S-6-account-editor-error_sv_light.png b/android/feature/account/src/test/screenshots/S-6-account-editor-error_sv_light.png
index 9acd2e0..397d947 100644
Binary files a/android/feature/account/src/test/screenshots/S-6-account-editor-error_sv_light.png and b/android/feature/account/src/test/screenshots/S-6-account-editor-error_sv_light.png differ
diff --git a/android/feature/account/src/test/screenshots/S-6-account-editor-network_sv_light.png b/android/feature/account/src/test/screenshots/S-6-account-editor-network_sv_light.png
index 165ac31..691eab1 100644
Binary files a/android/feature/account/src/test/screenshots/S-6-account-editor-network_sv_light.png and b/android/feature/account/src/test/screenshots/S-6-account-editor-network_sv_light.png differ
diff --git a/android/feature/account/src/test/screenshots/S-6-account-editor-saving_en_light.png b/android/feature/account/src/test/screenshots/S-6-account-editor-saving_en_light.png
index fa4bf83..fd6b94c 100644
Binary files a/android/feature/account/src/test/screenshots/S-6-account-editor-saving_en_light.png and b/android/feature/account/src/test/screenshots/S-6-account-editor-saving_en_light.png differ
diff --git a/android/feature/account/src/test/screenshots/S-6-account-editor-saving_sv_dark.png b/android/feature/account/src/test/screenshots/S-6-account-editor-saving_sv_dark.png
index 05ed8ab..fdf3c7f 100644
Binary files a/android/feature/account/src/test/screenshots/S-6-account-editor-saving_sv_dark.png and b/android/feature/account/src/test/screenshots/S-6-account-editor-saving_sv_dark.png differ
diff --git a/android/feature/account/src/test/screenshots/S-6-account-editor-saving_sv_light.png b/android/feature/account/src/test/screenshots/S-6-account-editor-saving_sv_light.png
index 196003d..0d54e1b 100644
Binary files a/android/feature/account/src/test/screenshots/S-6-account-editor-saving_sv_light.png and b/android/feature/account/src/test/screenshots/S-6-account-editor-saving_sv_light.png differ
diff --git a/android/feature/account/src/test/screenshots/S-6-account-editor-validation_sv_light.png b/android/feature/account/src/test/screenshots/S-6-account-editor-validation_sv_light.png
index 6dbaabc..11e80fe 100644
Binary files a/android/feature/account/src/test/screenshots/S-6-account-editor-validation_sv_light.png and b/android/feature/account/src/test/screenshots/S-6-account-editor-validation_sv_light.png differ
diff --git a/android/feature/account/src/test/screenshots/S-6-account-editor_sv_light.png b/android/feature/account/src/test/screenshots/S-6-account-editor_sv_light.png
index e13ac9d..0d5aefb 100644
Binary files a/android/feature/account/src/test/screenshots/S-6-account-editor_sv_light.png and b/android/feature/account/src/test/screenshots/S-6-account-editor_sv_light.png differ