diff --git a/core/designsystem/src/test/screenshots/Background/Background_dark_androidTheme.png b/core/designsystem/src/test/screenshots/Background/Background_dark_androidTheme.png
new file mode 100644
index 0000000..257b752
Binary files /dev/null and b/core/designsystem/src/test/screenshots/Background/Background_dark_androidTheme.png differ
diff --git a/core/designsystem/src/test/screenshots/Background/Background_dark_defaultTheme.png b/core/designsystem/src/test/screenshots/Background/Background_dark_defaultTheme.png
new file mode 100644
index 0000000..d5e8ae4
Binary files /dev/null and b/core/designsystem/src/test/screenshots/Background/Background_dark_defaultTheme.png differ
diff --git a/core/designsystem/src/test/screenshots/Background/Background_light_androidTheme.png b/core/designsystem/src/test/screenshots/Background/Background_light_androidTheme.png
new file mode 100644
index 0000000..21c6f66
Binary files /dev/null and b/core/designsystem/src/test/screenshots/Background/Background_light_androidTheme.png differ
diff --git a/core/designsystem/src/test/screenshots/Background/Background_light_defaultTheme.png b/core/designsystem/src/test/screenshots/Background/Background_light_defaultTheme.png
new file mode 100644
index 0000000..18ea4bd
Binary files /dev/null and b/core/designsystem/src/test/screenshots/Background/Background_light_defaultTheme.png differ
diff --git a/core/designsystem/src/test/screenshots/NavigationBar/NavigationBar_dark_androidTheme.png b/core/designsystem/src/test/screenshots/NavigationBar/NavigationBar_dark_androidTheme.png
new file mode 100644
index 0000000..ddef923
Binary files /dev/null and b/core/designsystem/src/test/screenshots/NavigationBar/NavigationBar_dark_androidTheme.png differ
diff --git a/core/designsystem/src/test/screenshots/NavigationBar/NavigationBar_dark_defaultTheme.png b/core/designsystem/src/test/screenshots/NavigationBar/NavigationBar_dark_defaultTheme.png
new file mode 100644
index 0000000..ddef923
Binary files /dev/null and b/core/designsystem/src/test/screenshots/NavigationBar/NavigationBar_dark_defaultTheme.png differ
diff --git a/core/designsystem/src/test/screenshots/NavigationBar/NavigationBar_fontScale2.png b/core/designsystem/src/test/screenshots/NavigationBar/NavigationBar_fontScale2.png
new file mode 100644
index 0000000..3fea04c
Binary files /dev/null and b/core/designsystem/src/test/screenshots/NavigationBar/NavigationBar_fontScale2.png differ
diff --git a/core/designsystem/src/test/screenshots/NavigationBar/NavigationBar_light_androidTheme.png b/core/designsystem/src/test/screenshots/NavigationBar/NavigationBar_light_androidTheme.png
new file mode 100644
index 0000000..c88df55
Binary files /dev/null and b/core/designsystem/src/test/screenshots/NavigationBar/NavigationBar_light_androidTheme.png differ
diff --git a/core/designsystem/src/test/screenshots/NavigationBar/NavigationBar_light_defaultTheme.png b/core/designsystem/src/test/screenshots/NavigationBar/NavigationBar_light_defaultTheme.png
new file mode 100644
index 0000000..c88df55
Binary files /dev/null and b/core/designsystem/src/test/screenshots/NavigationBar/NavigationBar_light_defaultTheme.png differ
diff --git a/core/designsystem/src/test/screenshots/NavigationDrawer/NavigationDrawer_dark_androidTheme.png b/core/designsystem/src/test/screenshots/NavigationDrawer/NavigationDrawer_dark_androidTheme.png
new file mode 100644
index 0000000..0210a48
Binary files /dev/null and b/core/designsystem/src/test/screenshots/NavigationDrawer/NavigationDrawer_dark_androidTheme.png differ
diff --git a/core/designsystem/src/test/screenshots/NavigationDrawer/NavigationDrawer_dark_defaultTheme.png b/core/designsystem/src/test/screenshots/NavigationDrawer/NavigationDrawer_dark_defaultTheme.png
new file mode 100644
index 0000000..0210a48
Binary files /dev/null and b/core/designsystem/src/test/screenshots/NavigationDrawer/NavigationDrawer_dark_defaultTheme.png differ
diff --git a/core/designsystem/src/test/screenshots/NavigationDrawer/NavigationDrawer_fontScale2.png b/core/designsystem/src/test/screenshots/NavigationDrawer/NavigationDrawer_fontScale2.png
new file mode 100644
index 0000000..e891c4c
Binary files /dev/null and b/core/designsystem/src/test/screenshots/NavigationDrawer/NavigationDrawer_fontScale2.png differ
diff --git a/core/designsystem/src/test/screenshots/NavigationDrawer/NavigationDrawer_light_androidTheme.png b/core/designsystem/src/test/screenshots/NavigationDrawer/NavigationDrawer_light_androidTheme.png
new file mode 100644
index 0000000..187f6cd
Binary files /dev/null and b/core/designsystem/src/test/screenshots/NavigationDrawer/NavigationDrawer_light_androidTheme.png differ
diff --git a/core/designsystem/src/test/screenshots/NavigationDrawer/NavigationDrawer_light_defaultTheme.png b/core/designsystem/src/test/screenshots/NavigationDrawer/NavigationDrawer_light_defaultTheme.png
new file mode 100644
index 0000000..187f6cd
Binary files /dev/null and b/core/designsystem/src/test/screenshots/NavigationDrawer/NavigationDrawer_light_defaultTheme.png differ
diff --git a/core/designsystem/src/test/screenshots/NavigationRail/NavigationRail_dark_androidTheme.png b/core/designsystem/src/test/screenshots/NavigationRail/NavigationRail_dark_androidTheme.png
new file mode 100644
index 0000000..4d61998
Binary files /dev/null and b/core/designsystem/src/test/screenshots/NavigationRail/NavigationRail_dark_androidTheme.png differ
diff --git a/core/designsystem/src/test/screenshots/NavigationRail/NavigationRail_dark_defaultTheme.png b/core/designsystem/src/test/screenshots/NavigationRail/NavigationRail_dark_defaultTheme.png
new file mode 100644
index 0000000..4d61998
Binary files /dev/null and b/core/designsystem/src/test/screenshots/NavigationRail/NavigationRail_dark_defaultTheme.png differ
diff --git a/core/designsystem/src/test/screenshots/NavigationRail/NavigationRail_light_androidTheme.png b/core/designsystem/src/test/screenshots/NavigationRail/NavigationRail_light_androidTheme.png
new file mode 100644
index 0000000..d1e3b5e
Binary files /dev/null and b/core/designsystem/src/test/screenshots/NavigationRail/NavigationRail_light_androidTheme.png differ
diff --git a/core/designsystem/src/test/screenshots/NavigationRail/NavigationRail_light_defaultTheme.png b/core/designsystem/src/test/screenshots/NavigationRail/NavigationRail_light_defaultTheme.png
new file mode 100644
index 0000000..d1e3b5e
Binary files /dev/null and b/core/designsystem/src/test/screenshots/NavigationRail/NavigationRail_light_defaultTheme.png differ