diff --git a/ComposeStarter/app/src/test/java/presentation/WearDevice.kt b/ComposeStarter/app/src/test/java/presentation/WearDevice.kt
index 72448b667..46dad3004 100644
--- a/ComposeStarter/app/src/test/java/presentation/WearDevice.kt
+++ b/ComposeStarter/app/src/test/java/presentation/WearDevice.kt
@@ -21,7 +21,8 @@ enum class WearDevice(
     val id: String,
     val modelName: String,
     val screenSizePx: Int,
-    val density: Float
+    val density: Float,
+    val fontScale: Float = 1f
 ) {
     MobvoiTicWatchPro5(
         id = "ticwatch_pro_5",
@@ -35,7 +36,7 @@ enum class WearDevice(
         screenSizePx = 396,
         density = 2.0f
     ),
-    SamsungGalaxyWatch6Large(
+    SamsungGalaxyWatch6(
         id = "galaxy_watch_6",
         modelName = "Samsung Galaxy Watch 6 Large",
         screenSizePx = 480,
@@ -58,6 +59,20 @@ enum class WearDevice(
         modelName = "Generic Large Round",
         screenSizePx = 454,
         density = 2.0f
+    ),
+    SamsungGalaxyWatch6SmallFont(
+        id = "galaxy_watch_6_small_font",
+        modelName = "Samsung Galaxy Watch 6 Large",
+        screenSizePx = 480,
+        density = 2.125f,
+        fontScale = 0.94f
+    ),
+    GooglePixelWatchLargeFont(
+        id = "pixel_watch_large_font",
+        modelName = "Google Pixel Watch",
+        screenSizePx = 384,
+        density = 2.0f,
+        fontScale = 1.24f
     );
 
     val dp: Int = (screenSizePx / density).roundToInt()
diff --git a/ComposeStarter/app/src/test/java/presentation/WearScreenshotTest.kt b/ComposeStarter/app/src/test/java/presentation/WearScreenshotTest.kt
index 69549cca1..41f404946 100644
--- a/ComposeStarter/app/src/test/java/presentation/WearScreenshotTest.kt
+++ b/ComposeStarter/app/src/test/java/presentation/WearScreenshotTest.kt
@@ -44,6 +44,8 @@ abstract class WearScreenshotTest {
     @OptIn(ExperimentalRoborazziApi::class)
     fun runTest(content: @Composable () -> Unit) {
         RuntimeEnvironment.setQualifiers("+w${device.dp}dp-h${device.dp}dp")
+        RuntimeEnvironment.setFontScale(device.fontScale)
+
         composeRule.setContent {
             content()
         }
diff --git a/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_galaxy_watch_5.png b/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_galaxy_watch_5.png
index 9b137702e..4e0e992e8 100644
Binary files a/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_galaxy_watch_5.png and b/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_galaxy_watch_5.png differ
diff --git a/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_galaxy_watch_6.png b/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_galaxy_watch_6.png
index 8a2c35aa9..5691aab71 100644
Binary files a/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_galaxy_watch_6.png and b/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_galaxy_watch_6.png differ
diff --git a/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_galaxy_watch_6_small_font.png b/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_galaxy_watch_6_small_font.png
new file mode 100644
index 000000000..add55c213
Binary files /dev/null and b/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_galaxy_watch_6_small_font.png differ
diff --git a/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_large_round.png b/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_large_round.png
index 679a6b059..e48a63cde 100644
Binary files a/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_large_round.png and b/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_large_round.png differ
diff --git a/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_pixel_watch.png b/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_pixel_watch.png
index e6b89f0cf..bb990eddd 100644
Binary files a/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_pixel_watch.png and b/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_pixel_watch.png differ
diff --git a/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_pixel_watch_large_font.png b/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_pixel_watch_large_font.png
new file mode 100644
index 000000000..3048eeb97
Binary files /dev/null and b/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_pixel_watch_large_font.png differ
diff --git a/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_small_round.png b/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_small_round.png
index e6b89f0cf..bb990eddd 100644
Binary files a/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_small_round.png and b/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_small_round.png differ
diff --git a/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_ticwatch_pro_5.png b/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_ticwatch_pro_5.png
index 8feb1a44a..10fff60ec 100644
Binary files a/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_ticwatch_pro_5.png and b/ComposeStarter/app/src/test/screenshots/GreetingScreenTest_ticwatch_pro_5.png differ
diff --git a/ComposeStarter/app/src/test/screenshots/ListScreenTest_galaxy_watch_5.png b/ComposeStarter/app/src/test/screenshots/ListScreenTest_galaxy_watch_5.png
index 21a14db36..641ad6c8d 100644
Binary files a/ComposeStarter/app/src/test/screenshots/ListScreenTest_galaxy_watch_5.png and b/ComposeStarter/app/src/test/screenshots/ListScreenTest_galaxy_watch_5.png differ
diff --git a/ComposeStarter/app/src/test/screenshots/ListScreenTest_galaxy_watch_6.png b/ComposeStarter/app/src/test/screenshots/ListScreenTest_galaxy_watch_6.png
index 1de7a3ae7..b2a115267 100644
Binary files a/ComposeStarter/app/src/test/screenshots/ListScreenTest_galaxy_watch_6.png and b/ComposeStarter/app/src/test/screenshots/ListScreenTest_galaxy_watch_6.png differ
diff --git a/ComposeStarter/app/src/test/screenshots/ListScreenTest_galaxy_watch_6_small_font.png b/ComposeStarter/app/src/test/screenshots/ListScreenTest_galaxy_watch_6_small_font.png
new file mode 100644
index 000000000..525ff50bd
Binary files /dev/null and b/ComposeStarter/app/src/test/screenshots/ListScreenTest_galaxy_watch_6_small_font.png differ
diff --git a/ComposeStarter/app/src/test/screenshots/ListScreenTest_large_round.png b/ComposeStarter/app/src/test/screenshots/ListScreenTest_large_round.png
index 2c97919dc..5125bc829 100644
Binary files a/ComposeStarter/app/src/test/screenshots/ListScreenTest_large_round.png and b/ComposeStarter/app/src/test/screenshots/ListScreenTest_large_round.png differ
diff --git a/ComposeStarter/app/src/test/screenshots/ListScreenTest_pixel_watch.png b/ComposeStarter/app/src/test/screenshots/ListScreenTest_pixel_watch.png
index f471a3d26..fd82908f6 100644
Binary files a/ComposeStarter/app/src/test/screenshots/ListScreenTest_pixel_watch.png and b/ComposeStarter/app/src/test/screenshots/ListScreenTest_pixel_watch.png differ
diff --git a/ComposeStarter/app/src/test/screenshots/ListScreenTest_pixel_watch_large_font.png b/ComposeStarter/app/src/test/screenshots/ListScreenTest_pixel_watch_large_font.png
new file mode 100644
index 000000000..651345ae8
Binary files /dev/null and b/ComposeStarter/app/src/test/screenshots/ListScreenTest_pixel_watch_large_font.png differ
diff --git a/ComposeStarter/app/src/test/screenshots/ListScreenTest_small_round.png b/ComposeStarter/app/src/test/screenshots/ListScreenTest_small_round.png
index f471a3d26..fd82908f6 100644
Binary files a/ComposeStarter/app/src/test/screenshots/ListScreenTest_small_round.png and b/ComposeStarter/app/src/test/screenshots/ListScreenTest_small_round.png differ
diff --git a/ComposeStarter/app/src/test/screenshots/ListScreenTest_ticwatch_pro_5.png b/ComposeStarter/app/src/test/screenshots/ListScreenTest_ticwatch_pro_5.png
index bc4f74644..a35baa797 100644
Binary files a/ComposeStarter/app/src/test/screenshots/ListScreenTest_ticwatch_pro_5.png and b/ComposeStarter/app/src/test/screenshots/ListScreenTest_ticwatch_pro_5.png differ