diff --git a/metadata/en-US/images/phoneScreenshots/screenshot-app-details.png b/metadata/en-US/images/phoneScreenshots/screenshot-app-details.png
deleted file mode 100644
index 85406b464..000000000
Binary files a/metadata/en-US/images/phoneScreenshots/screenshot-app-details.png and /dev/null differ
diff --git a/metadata/en-US/images/phoneScreenshots/screenshot-dark-details.png b/metadata/en-US/images/phoneScreenshots/screenshot-dark-details.png
deleted file mode 100644
index a09000392..000000000
Binary files a/metadata/en-US/images/phoneScreenshots/screenshot-dark-details.png and /dev/null differ
diff --git a/metadata/en-US/images/phoneScreenshots/screenshot-dark-home.png b/metadata/en-US/images/phoneScreenshots/screenshot-dark-home.png
deleted file mode 100644
index 692dc78ab..000000000
Binary files a/metadata/en-US/images/phoneScreenshots/screenshot-dark-home.png and /dev/null differ
diff --git a/metadata/en-US/images/phoneScreenshots/screenshot-dark-knownvuln.png b/metadata/en-US/images/phoneScreenshots/screenshot-dark-knownvuln.png
deleted file mode 100644
index 105bb9bfd..000000000
Binary files a/metadata/en-US/images/phoneScreenshots/screenshot-dark-knownvuln.png and /dev/null differ
diff --git a/metadata/en-US/images/phoneScreenshots/screenshot-knownvuln.png b/metadata/en-US/images/phoneScreenshots/screenshot-knownvuln.png
deleted file mode 100644
index 1b2fa80c0..000000000
Binary files a/metadata/en-US/images/phoneScreenshots/screenshot-knownvuln.png and /dev/null differ
diff --git a/metadata/en-US/images/phoneScreenshots/screenshot-search.png b/metadata/en-US/images/phoneScreenshots/screenshot-search.png
deleted file mode 100644
index 25b113a6a..000000000
Binary files a/metadata/en-US/images/phoneScreenshots/screenshot-search.png and /dev/null differ
diff --git a/metadata/en-US/images/phoneScreenshots/screenshot-updates.png b/metadata/en-US/images/phoneScreenshots/screenshot-updates.png
deleted file mode 100644
index 9e30b6eb7..000000000
Binary files a/metadata/en-US/images/phoneScreenshots/screenshot-updates.png and /dev/null differ
diff --git a/src/basic/fastlane/metadata/android/en-US/images/phoneScreenshots/01-latest.png b/src/basic/fastlane/metadata/android/en-US/images/phoneScreenshots/01-latest.png
new file mode 100644
index 000000000..4c5f37af5
Binary files /dev/null and b/src/basic/fastlane/metadata/android/en-US/images/phoneScreenshots/01-latest.png differ
diff --git a/src/basic/fastlane/metadata/android/en-US/images/phoneScreenshots/02-categories.png b/src/basic/fastlane/metadata/android/en-US/images/phoneScreenshots/02-categories.png
new file mode 100644
index 000000000..f803f2d32
Binary files /dev/null and b/src/basic/fastlane/metadata/android/en-US/images/phoneScreenshots/02-categories.png differ
diff --git a/src/basic/fastlane/metadata/android/en-US/images/phoneScreenshots/03-updates.png b/src/basic/fastlane/metadata/android/en-US/images/phoneScreenshots/03-updates.png
new file mode 100644
index 000000000..e7104d69b
Binary files /dev/null and b/src/basic/fastlane/metadata/android/en-US/images/phoneScreenshots/03-updates.png differ
diff --git a/src/basic/fastlane/metadata/android/en-US/images/phoneScreenshots/04-settings.png b/src/basic/fastlane/metadata/android/en-US/images/phoneScreenshots/04-settings.png
new file mode 100644
index 000000000..21779445d
Binary files /dev/null and b/src/basic/fastlane/metadata/android/en-US/images/phoneScreenshots/04-settings.png differ
diff --git a/src/basic/fastlane/metadata/android/en-US/images/phoneScreenshots/10-search.png b/src/basic/fastlane/metadata/android/en-US/images/phoneScreenshots/10-search.png
new file mode 100644
index 000000000..f3c529d5f
Binary files /dev/null and b/src/basic/fastlane/metadata/android/en-US/images/phoneScreenshots/10-search.png differ
diff --git a/src/basic/fastlane/metadata/android/en-US/images/phoneScreenshots/11-app-details.png b/src/basic/fastlane/metadata/android/en-US/images/phoneScreenshots/11-app-details.png
new file mode 100644
index 000000000..954ef4e92
Binary files /dev/null and b/src/basic/fastlane/metadata/android/en-US/images/phoneScreenshots/11-app-details.png differ
diff --git a/src/basic/fastlane/metadata/android/en-US/images/phoneScreenshots/20-repos.png b/src/basic/fastlane/metadata/android/en-US/images/phoneScreenshots/20-repos.png
new file mode 100644
index 000000000..de792c6e2
Binary files /dev/null and b/src/basic/fastlane/metadata/android/en-US/images/phoneScreenshots/20-repos.png differ
diff --git a/src/basic/fastlane/metadata/android/en-US/images/phoneScreenshots/21-repo-details.png b/src/basic/fastlane/metadata/android/en-US/images/phoneScreenshots/21-repo-details.png
new file mode 100644
index 000000000..bc5adf850
Binary files /dev/null and b/src/basic/fastlane/metadata/android/en-US/images/phoneScreenshots/21-repo-details.png differ
diff --git a/src/full/fastlane/metadata/android/en-US/images/phoneScreenshots/01-latest.png b/src/full/fastlane/metadata/android/en-US/images/phoneScreenshots/01-latest.png
new file mode 100644
index 000000000..53c3dc76e
Binary files /dev/null and b/src/full/fastlane/metadata/android/en-US/images/phoneScreenshots/01-latest.png differ
diff --git a/src/full/fastlane/metadata/android/en-US/images/phoneScreenshots/02-categories.png b/src/full/fastlane/metadata/android/en-US/images/phoneScreenshots/02-categories.png
new file mode 100644
index 000000000..043c4102b
Binary files /dev/null and b/src/full/fastlane/metadata/android/en-US/images/phoneScreenshots/02-categories.png differ
diff --git a/src/full/fastlane/metadata/android/en-US/images/phoneScreenshots/03-nearby.png b/src/full/fastlane/metadata/android/en-US/images/phoneScreenshots/03-nearby.png
new file mode 100644
index 000000000..800b4678c
Binary files /dev/null and b/src/full/fastlane/metadata/android/en-US/images/phoneScreenshots/03-nearby.png differ
diff --git a/src/full/fastlane/metadata/android/en-US/images/phoneScreenshots/04-updates.png b/src/full/fastlane/metadata/android/en-US/images/phoneScreenshots/04-updates.png
new file mode 100644
index 000000000..f42367d99
Binary files /dev/null and b/src/full/fastlane/metadata/android/en-US/images/phoneScreenshots/04-updates.png differ
diff --git a/src/full/fastlane/metadata/android/en-US/images/phoneScreenshots/05-settings.png b/src/full/fastlane/metadata/android/en-US/images/phoneScreenshots/05-settings.png
new file mode 100644
index 000000000..36b253dd0
Binary files /dev/null and b/src/full/fastlane/metadata/android/en-US/images/phoneScreenshots/05-settings.png differ
diff --git a/src/full/fastlane/metadata/android/en-US/images/phoneScreenshots/10-search.png b/src/full/fastlane/metadata/android/en-US/images/phoneScreenshots/10-search.png
new file mode 100644
index 000000000..f3c529d5f
Binary files /dev/null and b/src/full/fastlane/metadata/android/en-US/images/phoneScreenshots/10-search.png differ
diff --git a/src/full/fastlane/metadata/android/en-US/images/phoneScreenshots/11-app-details.png b/src/full/fastlane/metadata/android/en-US/images/phoneScreenshots/11-app-details.png
new file mode 100644
index 000000000..06b5cdb1a
Binary files /dev/null and b/src/full/fastlane/metadata/android/en-US/images/phoneScreenshots/11-app-details.png differ
diff --git a/src/full/fastlane/metadata/android/en-US/images/phoneScreenshots/20-repos.png b/src/full/fastlane/metadata/android/en-US/images/phoneScreenshots/20-repos.png
new file mode 100644
index 000000000..de792c6e2
Binary files /dev/null and b/src/full/fastlane/metadata/android/en-US/images/phoneScreenshots/20-repos.png differ
diff --git a/src/full/fastlane/metadata/android/en-US/images/phoneScreenshots/21-repo-details.png b/src/full/fastlane/metadata/android/en-US/images/phoneScreenshots/21-repo-details.png
new file mode 100644
index 000000000..bc5adf850
Binary files /dev/null and b/src/full/fastlane/metadata/android/en-US/images/phoneScreenshots/21-repo-details.png differ