diff --git a/core/designsystem/src/test/screenshots/AutoSizeText/Large_dark_androidTheme_notDynamic.png b/core/designsystem/src/test/screenshots/AutoSizeText/Large_dark_androidTheme_notDynamic.png
new file mode 100644
index 0000000000..79107d0dd3
Binary files /dev/null and b/core/designsystem/src/test/screenshots/AutoSizeText/Large_dark_androidTheme_notDynamic.png differ
diff --git a/core/designsystem/src/test/screenshots/AutoSizeText/Large_dark_defaultTheme_dynamic.png b/core/designsystem/src/test/screenshots/AutoSizeText/Large_dark_defaultTheme_dynamic.png
new file mode 100644
index 0000000000..3063851223
Binary files /dev/null and b/core/designsystem/src/test/screenshots/AutoSizeText/Large_dark_defaultTheme_dynamic.png differ
diff --git a/core/designsystem/src/test/screenshots/AutoSizeText/Large_dark_defaultTheme_notDynamic.png b/core/designsystem/src/test/screenshots/AutoSizeText/Large_dark_defaultTheme_notDynamic.png
new file mode 100644
index 0000000000..afbbbded6f
Binary files /dev/null and b/core/designsystem/src/test/screenshots/AutoSizeText/Large_dark_defaultTheme_notDynamic.png differ
diff --git a/core/designsystem/src/test/screenshots/AutoSizeText/Large_light_androidTheme_notDynamic.png b/core/designsystem/src/test/screenshots/AutoSizeText/Large_light_androidTheme_notDynamic.png
new file mode 100644
index 0000000000..d8afaf00d4
Binary files /dev/null and b/core/designsystem/src/test/screenshots/AutoSizeText/Large_light_androidTheme_notDynamic.png differ
diff --git a/core/designsystem/src/test/screenshots/AutoSizeText/Large_light_defaultTheme_dynamic.png b/core/designsystem/src/test/screenshots/AutoSizeText/Large_light_defaultTheme_dynamic.png
new file mode 100644
index 0000000000..66e69b6735
Binary files /dev/null and b/core/designsystem/src/test/screenshots/AutoSizeText/Large_light_defaultTheme_dynamic.png differ
diff --git a/core/designsystem/src/test/screenshots/AutoSizeText/Large_light_defaultTheme_notDynamic.png b/core/designsystem/src/test/screenshots/AutoSizeText/Large_light_defaultTheme_notDynamic.png
new file mode 100644
index 0000000000..8a95b53ede
Binary files /dev/null and b/core/designsystem/src/test/screenshots/AutoSizeText/Large_light_defaultTheme_notDynamic.png differ
diff --git a/core/designsystem/src/test/screenshots/AutoSizeText/Medium_dark_androidTheme_notDynamic.png b/core/designsystem/src/test/screenshots/AutoSizeText/Medium_dark_androidTheme_notDynamic.png
new file mode 100644
index 0000000000..82f9891aed
Binary files /dev/null and b/core/designsystem/src/test/screenshots/AutoSizeText/Medium_dark_androidTheme_notDynamic.png differ
diff --git a/core/designsystem/src/test/screenshots/AutoSizeText/Medium_dark_defaultTheme_dynamic.png b/core/designsystem/src/test/screenshots/AutoSizeText/Medium_dark_defaultTheme_dynamic.png
new file mode 100644
index 0000000000..16be3155cf
Binary files /dev/null and b/core/designsystem/src/test/screenshots/AutoSizeText/Medium_dark_defaultTheme_dynamic.png differ
diff --git a/core/designsystem/src/test/screenshots/AutoSizeText/Medium_dark_defaultTheme_notDynamic.png b/core/designsystem/src/test/screenshots/AutoSizeText/Medium_dark_defaultTheme_notDynamic.png
new file mode 100644
index 0000000000..42c40ab92d
Binary files /dev/null and b/core/designsystem/src/test/screenshots/AutoSizeText/Medium_dark_defaultTheme_notDynamic.png differ
diff --git a/core/designsystem/src/test/screenshots/AutoSizeText/Medium_light_androidTheme_notDynamic.png b/core/designsystem/src/test/screenshots/AutoSizeText/Medium_light_androidTheme_notDynamic.png
new file mode 100644
index 0000000000..a510c66a4c
Binary files /dev/null and b/core/designsystem/src/test/screenshots/AutoSizeText/Medium_light_androidTheme_notDynamic.png differ
diff --git a/core/designsystem/src/test/screenshots/AutoSizeText/Medium_light_defaultTheme_dynamic.png b/core/designsystem/src/test/screenshots/AutoSizeText/Medium_light_defaultTheme_dynamic.png
new file mode 100644
index 0000000000..0e44d73018
Binary files /dev/null and b/core/designsystem/src/test/screenshots/AutoSizeText/Medium_light_defaultTheme_dynamic.png differ
diff --git a/core/designsystem/src/test/screenshots/AutoSizeText/Medium_light_defaultTheme_notDynamic.png b/core/designsystem/src/test/screenshots/AutoSizeText/Medium_light_defaultTheme_notDynamic.png
new file mode 100644
index 0000000000..d93c5d16a2
Binary files /dev/null and b/core/designsystem/src/test/screenshots/AutoSizeText/Medium_light_defaultTheme_notDynamic.png differ
diff --git a/core/designsystem/src/test/screenshots/AutoSizeText/Small_dark_androidTheme_notDynamic.png b/core/designsystem/src/test/screenshots/AutoSizeText/Small_dark_androidTheme_notDynamic.png
new file mode 100644
index 0000000000..4139631133
Binary files /dev/null and b/core/designsystem/src/test/screenshots/AutoSizeText/Small_dark_androidTheme_notDynamic.png differ
diff --git a/core/designsystem/src/test/screenshots/AutoSizeText/Small_dark_defaultTheme_dynamic.png b/core/designsystem/src/test/screenshots/AutoSizeText/Small_dark_defaultTheme_dynamic.png
new file mode 100644
index 0000000000..0977040ba9
Binary files /dev/null and b/core/designsystem/src/test/screenshots/AutoSizeText/Small_dark_defaultTheme_dynamic.png differ
diff --git a/core/designsystem/src/test/screenshots/AutoSizeText/Small_dark_defaultTheme_notDynamic.png b/core/designsystem/src/test/screenshots/AutoSizeText/Small_dark_defaultTheme_notDynamic.png
new file mode 100644
index 0000000000..4eefcf1274
Binary files /dev/null and b/core/designsystem/src/test/screenshots/AutoSizeText/Small_dark_defaultTheme_notDynamic.png differ
diff --git a/core/designsystem/src/test/screenshots/AutoSizeText/Small_light_androidTheme_notDynamic.png b/core/designsystem/src/test/screenshots/AutoSizeText/Small_light_androidTheme_notDynamic.png
new file mode 100644
index 0000000000..2f23e64930
Binary files /dev/null and b/core/designsystem/src/test/screenshots/AutoSizeText/Small_light_androidTheme_notDynamic.png differ
diff --git a/core/designsystem/src/test/screenshots/AutoSizeText/Small_light_defaultTheme_dynamic.png b/core/designsystem/src/test/screenshots/AutoSizeText/Small_light_defaultTheme_dynamic.png
new file mode 100644
index 0000000000..9beac22622
Binary files /dev/null and b/core/designsystem/src/test/screenshots/AutoSizeText/Small_light_defaultTheme_dynamic.png differ
diff --git a/core/designsystem/src/test/screenshots/AutoSizeText/Small_light_defaultTheme_notDynamic.png b/core/designsystem/src/test/screenshots/AutoSizeText/Small_light_defaultTheme_notDynamic.png
new file mode 100644
index 0000000000..69be46d204
Binary files /dev/null and b/core/designsystem/src/test/screenshots/AutoSizeText/Small_light_defaultTheme_notDynamic.png differ
diff --git a/core/designsystem/src/test/screenshots/SegmentedButtons/ThreeItems_dark_androidTheme_notDynamic.png b/core/designsystem/src/test/screenshots/SegmentedButtons/ThreeItems_dark_androidTheme_notDynamic.png
new file mode 100644
index 0000000000..cd0f83020f
Binary files /dev/null and b/core/designsystem/src/test/screenshots/SegmentedButtons/ThreeItems_dark_androidTheme_notDynamic.png differ
diff --git a/core/designsystem/src/test/screenshots/SegmentedButtons/ThreeItems_dark_defaultTheme_dynamic.png b/core/designsystem/src/test/screenshots/SegmentedButtons/ThreeItems_dark_defaultTheme_dynamic.png
new file mode 100644
index 0000000000..d6360d6571
Binary files /dev/null and b/core/designsystem/src/test/screenshots/SegmentedButtons/ThreeItems_dark_defaultTheme_dynamic.png differ
diff --git a/core/designsystem/src/test/screenshots/SegmentedButtons/ThreeItems_dark_defaultTheme_notDynamic.png b/core/designsystem/src/test/screenshots/SegmentedButtons/ThreeItems_dark_defaultTheme_notDynamic.png
new file mode 100644
index 0000000000..cd0f83020f
Binary files /dev/null and b/core/designsystem/src/test/screenshots/SegmentedButtons/ThreeItems_dark_defaultTheme_notDynamic.png differ
diff --git a/core/designsystem/src/test/screenshots/SegmentedButtons/ThreeItems_light_androidTheme_notDynamic.png b/core/designsystem/src/test/screenshots/SegmentedButtons/ThreeItems_light_androidTheme_notDynamic.png
new file mode 100644
index 0000000000..c3771241af
Binary files /dev/null and b/core/designsystem/src/test/screenshots/SegmentedButtons/ThreeItems_light_androidTheme_notDynamic.png differ
diff --git a/core/designsystem/src/test/screenshots/SegmentedButtons/ThreeItems_light_defaultTheme_dynamic.png b/core/designsystem/src/test/screenshots/SegmentedButtons/ThreeItems_light_defaultTheme_dynamic.png
new file mode 100644
index 0000000000..ab4b1c245d
Binary files /dev/null and b/core/designsystem/src/test/screenshots/SegmentedButtons/ThreeItems_light_defaultTheme_dynamic.png differ
diff --git a/core/designsystem/src/test/screenshots/SegmentedButtons/ThreeItems_light_defaultTheme_notDynamic.png b/core/designsystem/src/test/screenshots/SegmentedButtons/ThreeItems_light_defaultTheme_notDynamic.png
new file mode 100644
index 0000000000..c3771241af
Binary files /dev/null and b/core/designsystem/src/test/screenshots/SegmentedButtons/ThreeItems_light_defaultTheme_notDynamic.png differ
diff --git a/core/designsystem/src/test/screenshots/SegmentedButtons/TwoItems_dark_androidTheme_notDynamic.png b/core/designsystem/src/test/screenshots/SegmentedButtons/TwoItems_dark_androidTheme_notDynamic.png
new file mode 100644
index 0000000000..6298404886
Binary files /dev/null and b/core/designsystem/src/test/screenshots/SegmentedButtons/TwoItems_dark_androidTheme_notDynamic.png differ
diff --git a/core/designsystem/src/test/screenshots/SegmentedButtons/TwoItems_dark_defaultTheme_dynamic.png b/core/designsystem/src/test/screenshots/SegmentedButtons/TwoItems_dark_defaultTheme_dynamic.png
new file mode 100644
index 0000000000..2caf226455
Binary files /dev/null and b/core/designsystem/src/test/screenshots/SegmentedButtons/TwoItems_dark_defaultTheme_dynamic.png differ
diff --git a/core/designsystem/src/test/screenshots/SegmentedButtons/TwoItems_dark_defaultTheme_notDynamic.png b/core/designsystem/src/test/screenshots/SegmentedButtons/TwoItems_dark_defaultTheme_notDynamic.png
new file mode 100644
index 0000000000..6298404886
Binary files /dev/null and b/core/designsystem/src/test/screenshots/SegmentedButtons/TwoItems_dark_defaultTheme_notDynamic.png differ
diff --git a/core/designsystem/src/test/screenshots/SegmentedButtons/TwoItems_light_androidTheme_notDynamic.png b/core/designsystem/src/test/screenshots/SegmentedButtons/TwoItems_light_androidTheme_notDynamic.png
new file mode 100644
index 0000000000..6bafa404d6
Binary files /dev/null and b/core/designsystem/src/test/screenshots/SegmentedButtons/TwoItems_light_androidTheme_notDynamic.png differ
diff --git a/core/designsystem/src/test/screenshots/SegmentedButtons/TwoItems_light_defaultTheme_dynamic.png b/core/designsystem/src/test/screenshots/SegmentedButtons/TwoItems_light_defaultTheme_dynamic.png
new file mode 100644
index 0000000000..39a414c34e
Binary files /dev/null and b/core/designsystem/src/test/screenshots/SegmentedButtons/TwoItems_light_defaultTheme_dynamic.png differ
diff --git a/core/designsystem/src/test/screenshots/SegmentedButtons/TwoItems_light_defaultTheme_notDynamic.png b/core/designsystem/src/test/screenshots/SegmentedButtons/TwoItems_light_defaultTheme_notDynamic.png
new file mode 100644
index 0000000000..6bafa404d6
Binary files /dev/null and b/core/designsystem/src/test/screenshots/SegmentedButtons/TwoItems_light_defaultTheme_notDynamic.png differ
diff --git a/feature/sort/src/test/screenshots/AppSortBottomSheet_foldable.png b/feature/sort/src/test/screenshots/AppSortBottomSheet_foldable.png
index 3c0c7a19ba..990c6e8b11 100644
Binary files a/feature/sort/src/test/screenshots/AppSortBottomSheet_foldable.png and b/feature/sort/src/test/screenshots/AppSortBottomSheet_foldable.png differ
diff --git a/feature/sort/src/test/screenshots/AppSortBottomSheet_phone.png b/feature/sort/src/test/screenshots/AppSortBottomSheet_phone.png
index fa7f8ddd8b..ffd98eacee 100644
Binary files a/feature/sort/src/test/screenshots/AppSortBottomSheet_phone.png and b/feature/sort/src/test/screenshots/AppSortBottomSheet_phone.png differ
diff --git a/feature/sort/src/test/screenshots/AppSortBottomSheet_phone_dark.png b/feature/sort/src/test/screenshots/AppSortBottomSheet_phone_dark.png
index 2300c0bf03..1996addd5c 100644
Binary files a/feature/sort/src/test/screenshots/AppSortBottomSheet_phone_dark.png and b/feature/sort/src/test/screenshots/AppSortBottomSheet_phone_dark.png differ
diff --git a/feature/sort/src/test/screenshots/AppSortBottomSheet_tablet.png b/feature/sort/src/test/screenshots/AppSortBottomSheet_tablet.png
index 7fa47ec4fb..198370c7a8 100644
Binary files a/feature/sort/src/test/screenshots/AppSortBottomSheet_tablet.png and b/feature/sort/src/test/screenshots/AppSortBottomSheet_tablet.png differ
diff --git a/feature/sort/src/test/screenshots/ComponentSortBottomSheet_foldable.png b/feature/sort/src/test/screenshots/ComponentSortBottomSheet_foldable.png
index f7e5958038..74a2c607d2 100644
Binary files a/feature/sort/src/test/screenshots/ComponentSortBottomSheet_foldable.png and b/feature/sort/src/test/screenshots/ComponentSortBottomSheet_foldable.png differ
diff --git a/feature/sort/src/test/screenshots/ComponentSortBottomSheet_phone.png b/feature/sort/src/test/screenshots/ComponentSortBottomSheet_phone.png
index ee845a1e12..0a35b70a06 100644
Binary files a/feature/sort/src/test/screenshots/ComponentSortBottomSheet_phone.png and b/feature/sort/src/test/screenshots/ComponentSortBottomSheet_phone.png differ
diff --git a/feature/sort/src/test/screenshots/ComponentSortBottomSheet_phone_dark.png b/feature/sort/src/test/screenshots/ComponentSortBottomSheet_phone_dark.png
index 1f886cd49c..e2adad8a1a 100644
Binary files a/feature/sort/src/test/screenshots/ComponentSortBottomSheet_phone_dark.png and b/feature/sort/src/test/screenshots/ComponentSortBottomSheet_phone_dark.png differ
diff --git a/feature/sort/src/test/screenshots/ComponentSortBottomSheet_tablet.png b/feature/sort/src/test/screenshots/ComponentSortBottomSheet_tablet.png
index 95aae2d13a..ebffa12279 100644
Binary files a/feature/sort/src/test/screenshots/ComponentSortBottomSheet_tablet.png and b/feature/sort/src/test/screenshots/ComponentSortBottomSheet_tablet.png differ