diff --git a/README.md b/README.md
index e14c66b3b..f5e96832a 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ Aves integrates with Android (from **API 19 to 31**, i.e. from KitKat to S) with
 
 ## Screenshots
 
-<img src="https://raw.githubusercontent.com/deckerst/aves_extra/main/screenshots/S10/1-S10-collection.png" alt='Collection screenshot' height="400" /><img src="https://raw.githubusercontent.com/deckerst/aves_extra/main/screenshots/S10/2-S10-viewer.png" alt='Image screenshot' height="400" /><img src="https://raw.githubusercontent.com/deckerst/aves_extra/main/screenshots/S10/5-S10-stats.png" alt='Stats screenshot' height="400" /><img src="https://raw.githubusercontent.com/deckerst/aves_extra/main/screenshots/S10/3-S10-info__basic_.png" alt='Info (basic) screenshot' height="400" /><img src="https://raw.githubusercontent.com/deckerst/aves_extra/main/screenshots/S10/4-S10-info__metadata_.png" alt='Info (metadata) screenshot' height="400" /><img src="https://raw.githubusercontent.com/deckerst/aves_extra/main/screenshots/S10/6-S10-countries.png" alt='Countries screenshot' height="400" />
+<img src="https://raw.githubusercontent.com/deckerst/aves_extra/main/screenshots/play/en/1.png" alt='Collection screenshot' height="400" /><img src="https://raw.githubusercontent.com/deckerst/aves_extra/main/screenshots/play/en/2.png" alt='Image screenshot' height="400" /><img src="https://raw.githubusercontent.com/deckerst/aves_extra/main/screenshots/play/en/5.png" alt='Stats screenshot' height="400" /><img src="https://raw.githubusercontent.com/deckerst/aves_extra/main/screenshots/play/en/3.png" alt='Info (basic) screenshot' height="400" /><img src="https://raw.githubusercontent.com/deckerst/aves_extra/main/screenshots/play/en/4.png" alt='Info (metadata) screenshot' height="400" /><img src="https://raw.githubusercontent.com/deckerst/aves_extra/main/screenshots/play/en/6.png" alt='Countries screenshot' height="400" />
 
 ## Changelog
 
diff --git a/fastlane/metadata/android/de/images/phoneScreenshots/1.png b/fastlane/metadata/android/de/images/phoneScreenshots/1.png
new file mode 100644
index 000000000..7bb979df1
Binary files /dev/null and b/fastlane/metadata/android/de/images/phoneScreenshots/1.png differ
diff --git a/fastlane/metadata/android/de/images/phoneScreenshots/2.png b/fastlane/metadata/android/de/images/phoneScreenshots/2.png
new file mode 100644
index 000000000..b770a7c9e
Binary files /dev/null and b/fastlane/metadata/android/de/images/phoneScreenshots/2.png differ
diff --git a/fastlane/metadata/android/de/images/phoneScreenshots/3.png b/fastlane/metadata/android/de/images/phoneScreenshots/3.png
new file mode 100644
index 000000000..56ef9ded6
Binary files /dev/null and b/fastlane/metadata/android/de/images/phoneScreenshots/3.png differ
diff --git a/fastlane/metadata/android/de/images/phoneScreenshots/4.png b/fastlane/metadata/android/de/images/phoneScreenshots/4.png
new file mode 100644
index 000000000..0a8c2deb7
Binary files /dev/null and b/fastlane/metadata/android/de/images/phoneScreenshots/4.png differ
diff --git a/fastlane/metadata/android/de/images/phoneScreenshots/5.png b/fastlane/metadata/android/de/images/phoneScreenshots/5.png
new file mode 100644
index 000000000..a048d09d4
Binary files /dev/null and b/fastlane/metadata/android/de/images/phoneScreenshots/5.png differ
diff --git a/fastlane/metadata/android/de/images/phoneScreenshots/6.png b/fastlane/metadata/android/de/images/phoneScreenshots/6.png
new file mode 100644
index 000000000..e42e4d034
Binary files /dev/null and b/fastlane/metadata/android/de/images/phoneScreenshots/6.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png
index 1b9e0262c..4674df71c 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png
index b2e45ff00..d699af62a 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png
index f8e7cee24..20457a45f 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png
index dc95c05ab..92fec2632 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png
index 64a8a9588..95ef69497 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/6.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/6.png
index 336e6e21d..c2383bd70 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/6.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/6.png differ
diff --git a/fastlane/metadata/android/es-MX/images/phoneScreenshots/1.png b/fastlane/metadata/android/es-MX/images/phoneScreenshots/1.png
new file mode 100644
index 000000000..a4ca6bdf7
Binary files /dev/null and b/fastlane/metadata/android/es-MX/images/phoneScreenshots/1.png differ
diff --git a/fastlane/metadata/android/es-MX/images/phoneScreenshots/2.png b/fastlane/metadata/android/es-MX/images/phoneScreenshots/2.png
new file mode 100644
index 000000000..bc1654404
Binary files /dev/null and b/fastlane/metadata/android/es-MX/images/phoneScreenshots/2.png differ
diff --git a/fastlane/metadata/android/es-MX/images/phoneScreenshots/3.png b/fastlane/metadata/android/es-MX/images/phoneScreenshots/3.png
new file mode 100644
index 000000000..f86f0c4a2
Binary files /dev/null and b/fastlane/metadata/android/es-MX/images/phoneScreenshots/3.png differ
diff --git a/fastlane/metadata/android/es-MX/images/phoneScreenshots/4.png b/fastlane/metadata/android/es-MX/images/phoneScreenshots/4.png
new file mode 100644
index 000000000..b5eb49bcc
Binary files /dev/null and b/fastlane/metadata/android/es-MX/images/phoneScreenshots/4.png differ
diff --git a/fastlane/metadata/android/es-MX/images/phoneScreenshots/5.png b/fastlane/metadata/android/es-MX/images/phoneScreenshots/5.png
new file mode 100644
index 000000000..7021c0374
Binary files /dev/null and b/fastlane/metadata/android/es-MX/images/phoneScreenshots/5.png differ
diff --git a/fastlane/metadata/android/es-MX/images/phoneScreenshots/6.png b/fastlane/metadata/android/es-MX/images/phoneScreenshots/6.png
new file mode 100644
index 000000000..7735c2cb3
Binary files /dev/null and b/fastlane/metadata/android/es-MX/images/phoneScreenshots/6.png differ
diff --git a/fastlane/metadata/android/fr/images/phoneScreenshots/1.png b/fastlane/metadata/android/fr/images/phoneScreenshots/1.png
new file mode 100644
index 000000000..eb62e1b14
Binary files /dev/null and b/fastlane/metadata/android/fr/images/phoneScreenshots/1.png differ
diff --git a/fastlane/metadata/android/fr/images/phoneScreenshots/2.png b/fastlane/metadata/android/fr/images/phoneScreenshots/2.png
new file mode 100644
index 000000000..6aa5def2a
Binary files /dev/null and b/fastlane/metadata/android/fr/images/phoneScreenshots/2.png differ
diff --git a/fastlane/metadata/android/fr/images/phoneScreenshots/3.png b/fastlane/metadata/android/fr/images/phoneScreenshots/3.png
new file mode 100644
index 000000000..ad50c09d1
Binary files /dev/null and b/fastlane/metadata/android/fr/images/phoneScreenshots/3.png differ
diff --git a/fastlane/metadata/android/fr/images/phoneScreenshots/4.png b/fastlane/metadata/android/fr/images/phoneScreenshots/4.png
new file mode 100644
index 000000000..070238313
Binary files /dev/null and b/fastlane/metadata/android/fr/images/phoneScreenshots/4.png differ
diff --git a/fastlane/metadata/android/fr/images/phoneScreenshots/5.png b/fastlane/metadata/android/fr/images/phoneScreenshots/5.png
new file mode 100644
index 000000000..cc70a692c
Binary files /dev/null and b/fastlane/metadata/android/fr/images/phoneScreenshots/5.png differ
diff --git a/fastlane/metadata/android/fr/images/phoneScreenshots/6.png b/fastlane/metadata/android/fr/images/phoneScreenshots/6.png
new file mode 100644
index 000000000..7961778de
Binary files /dev/null and b/fastlane/metadata/android/fr/images/phoneScreenshots/6.png differ
diff --git a/fastlane/metadata/android/ko/images/phoneScreenshots/1.png b/fastlane/metadata/android/ko/images/phoneScreenshots/1.png
new file mode 100644
index 000000000..d4fcc34c3
Binary files /dev/null and b/fastlane/metadata/android/ko/images/phoneScreenshots/1.png differ
diff --git a/fastlane/metadata/android/ko/images/phoneScreenshots/2.png b/fastlane/metadata/android/ko/images/phoneScreenshots/2.png
new file mode 100644
index 000000000..13a2135ee
Binary files /dev/null and b/fastlane/metadata/android/ko/images/phoneScreenshots/2.png differ
diff --git a/fastlane/metadata/android/ko/images/phoneScreenshots/3.png b/fastlane/metadata/android/ko/images/phoneScreenshots/3.png
new file mode 100644
index 000000000..b9593c029
Binary files /dev/null and b/fastlane/metadata/android/ko/images/phoneScreenshots/3.png differ
diff --git a/fastlane/metadata/android/ko/images/phoneScreenshots/4.png b/fastlane/metadata/android/ko/images/phoneScreenshots/4.png
new file mode 100644
index 000000000..3bfa8781a
Binary files /dev/null and b/fastlane/metadata/android/ko/images/phoneScreenshots/4.png differ
diff --git a/fastlane/metadata/android/ko/images/phoneScreenshots/5.png b/fastlane/metadata/android/ko/images/phoneScreenshots/5.png
new file mode 100644
index 000000000..ad6518250
Binary files /dev/null and b/fastlane/metadata/android/ko/images/phoneScreenshots/5.png differ
diff --git a/fastlane/metadata/android/ko/images/phoneScreenshots/6.png b/fastlane/metadata/android/ko/images/phoneScreenshots/6.png
new file mode 100644
index 000000000..6aaa08e7e
Binary files /dev/null and b/fastlane/metadata/android/ko/images/phoneScreenshots/6.png differ
diff --git a/fastlane/metadata/android/ru/images/phoneScreenshots/1.png b/fastlane/metadata/android/ru/images/phoneScreenshots/1.png
new file mode 100644
index 000000000..80af968b3
Binary files /dev/null and b/fastlane/metadata/android/ru/images/phoneScreenshots/1.png differ
diff --git a/fastlane/metadata/android/ru/images/phoneScreenshots/2.png b/fastlane/metadata/android/ru/images/phoneScreenshots/2.png
new file mode 100644
index 000000000..1d42a1cb0
Binary files /dev/null and b/fastlane/metadata/android/ru/images/phoneScreenshots/2.png differ
diff --git a/fastlane/metadata/android/ru/images/phoneScreenshots/3.png b/fastlane/metadata/android/ru/images/phoneScreenshots/3.png
new file mode 100644
index 000000000..811a42242
Binary files /dev/null and b/fastlane/metadata/android/ru/images/phoneScreenshots/3.png differ
diff --git a/fastlane/metadata/android/ru/images/phoneScreenshots/4.png b/fastlane/metadata/android/ru/images/phoneScreenshots/4.png
new file mode 100644
index 000000000..daa6be34e
Binary files /dev/null and b/fastlane/metadata/android/ru/images/phoneScreenshots/4.png differ
diff --git a/fastlane/metadata/android/ru/images/phoneScreenshots/5.png b/fastlane/metadata/android/ru/images/phoneScreenshots/5.png
new file mode 100644
index 000000000..b22e9d202
Binary files /dev/null and b/fastlane/metadata/android/ru/images/phoneScreenshots/5.png differ
diff --git a/fastlane/metadata/android/ru/images/phoneScreenshots/6.png b/fastlane/metadata/android/ru/images/phoneScreenshots/6.png
new file mode 100644
index 000000000..0a4a2630a
Binary files /dev/null and b/fastlane/metadata/android/ru/images/phoneScreenshots/6.png differ
diff --git a/scripts/screenshot_post_process.sh b/scripts/screenshot_post_process.sh
index ac1aabf5d..1cafcd4a6 100755
--- a/scripts/screenshot_post_process.sh
+++ b/scripts/screenshot_post_process.sh
@@ -28,10 +28,10 @@ for source in raw/*/*; do
   fi
 done
 
-# izzy: scale down
+# izzy: scale down + fastlane folder structure
 for source in overlay/*/*; do
   if [[ -f "$source" ]]; then
-    target=${source/overlay/izzy}
+    target=$(echo "$source" | sed -e 's/overlay\/\(.*\)\//izzy\/\1\/images\/phoneScreenshots\//g')
     echo "$source -> $target"
     mkdir -p "$(dirname "$target")"
     convert -resize 350x "$source" "$target"
diff --git a/test_driver/driver_screenshots_test.dart b/test_driver/driver_screenshots_test.dart
index 3391bf2e6..93b70b251 100644
--- a/test_driver/driver_screenshots_test.dart
+++ b/test_driver/driver_screenshots_test.dart
@@ -14,11 +14,14 @@ import 'utils/driver_extension.dart';
 late FlutterDriver driver;
 String _languageCode = '';
 
+final languageCodes = SupportedLocales.languagesByLanguageCode.keys;
 const outputDirectory = 'screenshots/raw';
 
 void main() {
   group('[Aves app]', () {
     setUpAll(() async {
+      await Future.forEach(languageCodes, (languageCode) => Directory('$outputDirectory/$languageCode').create(recursive: true));
+
       await copyContent(screenshotsSourceDir, screenshotsTargetDirAdb);
       await Future.forEach<String>(
           [
@@ -38,8 +41,8 @@ void main() {
     });
 
     test('scan media dir', () => driver.scanMediaDir(screenshotsTargetDirAndroid));
-    SupportedLocales.languagesByLanguageCode.keys.forEach((languageCode) async {
-      await Directory('$outputDirectory/$_languageCode').create(recursive: true);
+
+    languageCodes.forEach((languageCode) {
       setLanguage(languageCode);
       configureCollectionVisibility(AppDebugAction.prepScreenshotThumbnails);
       collection();
@@ -141,7 +144,7 @@ void info() {
 
     await _takeScreenshot(driver, '3');
 
-    await driver.scroll(verticalPageView, 0, -750, const Duration(milliseconds: 600));
+    await driver.scroll(verticalPageView, 0, -680, const Duration(milliseconds: 600));
     await Future.delayed(const Duration(seconds: 1));
 
     final gpsTile = find.descendant(