diff --git a/README.md b/README.md
index 30c63e5fb..956f968db 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 <div align="center">
   <img src="https://libre-tube.github.io/images/gh-banner.png" width="auto" height="auto" alt="LibreTube">
-  
+
 [![GPL-v3](https://libre-tube.github.io/assets/widgets/license-widget.svg)](https://www.gnu.org/licenses/gpl-3.0.en.html)
 </div><div align="center" style="width:100%; display:flex; justify-content:space-between;">
 
@@ -63,10 +63,13 @@ Screenshots
 
 <div style="width:100%; display:flex; justify-content:space-between;">
 
-[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_1.png" width=20% alt="Home">](fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_1.png)
-[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_2.png" width=20% alt="Home">](fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_2.png)
-[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_3.png" width=20% alt="Subscriptions">](fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_3.png)
-[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_4.png" width=20% alt="Library">](fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_4.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_1.jpg" width=19% alt="Home">](fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_1.jpg)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_2.jpg" width=19% alt="Home">](fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_2.jpg)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_3.jpg" width=19% alt="Subscriptions">](fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_3.jpg)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_4.jpg" width=19% alt="Library">](fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_4.jpg)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_9.jpg" width=19% alt="Channel Overview">](fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_9.jpg)
+
+* For more [Screenshot](https://github.com/libre-tube/LibreTube/blob/master/SCREEN_SHOT.md) 
 
 </div>
 
diff --git a/SCREEN_SHOT.md b/SCREEN_SHOT.md
new file mode 100644
index 000000000..5476e6645
--- /dev/null
+++ b/SCREEN_SHOT.md
@@ -0,0 +1,18 @@
+# Screen Shots
+
+<div align="center" style="width:100%; display:flex; justify-content:space-between;">
+
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_1.jpg" width=30% alt="Home">](fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_1.jpg)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_2.jpg" width=30% alt="Home">](fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_2.jpg)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_3.jpg" width=30% alt="Subscriptions">](fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_3.jpg)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_4.jpg" width=30% alt="Library">](fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_4.jpg)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_5.jpg" width=30% alt="Search">](fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_5.jpg)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_6.jpg" width=30% alt="Player">](fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_6.jpg)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_7.jpg" width=30% alt="Personal Playlist">](fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_7.jpg)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_8.jpg" width=30% alt="Playlist Bookmark">](fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_8.jpg)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_9.jpg" width=30% alt="Channel Overview">](fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_9.jpg)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_10.jpg" width=30% alt="Help">](fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_10.jpg)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_11.jpg" width=30% alt="About">](fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_11.jpg)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_12.jpg" width=30% alt="Settings">](fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_12.jpg)
+
+</div>
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_1.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_1.jpg
new file mode 100644
index 000000000..e7792cd6d
Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_1.jpg differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_1.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_1.png
deleted file mode 100644
index 13358690c..000000000
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_1.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_10.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_10.jpg
new file mode 100644
index 000000000..f023f89ca
Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_10.jpg differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_11.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_11.jpg
new file mode 100644
index 000000000..6d31c7ccb
Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_11.jpg differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_12.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_12.jpg
new file mode 100644
index 000000000..2ac6b640e
Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_12.jpg differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_2.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_2.jpg
new file mode 100644
index 000000000..96758a0aa
Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_2.jpg differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_2.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_2.png
deleted file mode 100644
index 886506069..000000000
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_2.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_3.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_3.jpg
new file mode 100644
index 000000000..1b76e7aa3
Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_3.jpg differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_3.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_3.png
deleted file mode 100644
index 70755d18b..000000000
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_3.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_4.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_4.jpg
new file mode 100644
index 000000000..9254bc3bc
Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_4.jpg differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_4.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_4.png
deleted file mode 100644
index 9ef228e09..000000000
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_4.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_5.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_5.jpg
new file mode 100644
index 000000000..cfb34c0d8
Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_5.jpg differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_6.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_6.jpg
new file mode 100644
index 000000000..f8f88dd81
Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_6.jpg differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_7.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_7.jpg
new file mode 100644
index 000000000..9f15942f4
Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_7.jpg differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_8.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_8.jpg
new file mode 100644
index 000000000..f87d1ca02
Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_8.jpg differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_9.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_9.jpg
new file mode 100644
index 000000000..1aff2f1db
Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/Screenshot_9.jpg differ