diff --git a/app/src/main/res/layout/list_stream_card_item.xml b/app/src/main/res/layout/list_stream_card_item.xml
index cd6584c5c..54122dddb 100644
--- a/app/src/main/res/layout/list_stream_card_item.xml
+++ b/app/src/main/res/layout/list_stream_card_item.xml
@@ -5,11 +5,11 @@
     android:id="@+id/itemRoot"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="@dimen/channel_item_grid_padding"
-    android:paddingBottom="@dimen/channel_item_grid_padding"
     android:background="?attr/selectableItemBackground"
     android:clickable="true"
-    android:focusable="true">
+    android:focusable="true"
+    android:paddingTop="@dimen/channel_item_grid_padding"
+    android:paddingBottom="@dimen/channel_item_grid_padding">
 
     <com.google.android.material.imageview.ShapeableImageView
         android:id="@+id/itemThumbnailView"
@@ -23,7 +23,8 @@
         app:layout_constraintDimensionRatio="16:9"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:shapeAppearance="@style/RoundedImageView" />
 
     <org.schabi.newpipe.views.NewPipeTextView
         android:id="@+id/itemDurationView"
@@ -47,10 +48,10 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/margin_small"
+        android:layout_marginTop="@dimen/margin_small"
         android:layout_marginEnd="@dimen/margin_small"
         android:ellipsize="end"
         android:maxLines="2"
-        android:layout_marginTop="@dimen/margin_small"
         android:textAppearance="?textAppearanceListItem"
         app:layout_constraintEnd_toEndOf="@id/itemThumbnailView"
         app:layout_constraintStart_toStartOf="@id/itemThumbnailView"
@@ -64,8 +65,8 @@
         android:layout_marginTop="@dimen/spacing_micro"
         android:layout_marginEnd="@dimen/margin_small"
         android:ellipsize="end"
-        android:lines="1"
         android:includeFontPadding="false"
+        android:lines="1"
         android:textAppearance="?android:textAppearanceSmall"
         app:layout_constraintEnd_toStartOf="@id/itemAdditionalDetails"
         app:layout_constraintStart_toStartOf="@id/itemVideoTitleView"
@@ -77,8 +78,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:ellipsize="end"
-        android:lines="1"
         android:includeFontPadding="false"
+        android:lines="1"
         android:textAppearance="?android:textAppearanceSmall"
         app:layout_constraintBottom_toBottomOf="@id/itemUploaderView"
         app:layout_constraintEnd_toEndOf="@+id/itemVideoTitleView"
diff --git a/app/src/main/res/layout/list_stream_grid_item.xml b/app/src/main/res/layout/list_stream_grid_item.xml
index 4cdd250ef..7b7e73078 100644
--- a/app/src/main/res/layout/list_stream_grid_item.xml
+++ b/app/src/main/res/layout/list_stream_grid_item.xml
@@ -18,7 +18,8 @@
         android:src="@drawable/placeholder_thumbnail_video"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:shapeAppearance="@style/RoundedImageView" />
 
     <org.schabi.newpipe.views.NewPipeTextView
         android:id="@+id/itemDurationView"
diff --git a/app/src/main/res/layout/list_stream_mini_item.xml b/app/src/main/res/layout/list_stream_mini_item.xml
index 4f9a72745..9e796ca1d 100644
--- a/app/src/main/res/layout/list_stream_mini_item.xml
+++ b/app/src/main/res/layout/list_stream_mini_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemRoot"
     android:layout_width="match_parent"
@@ -19,6 +20,7 @@
         android:layout_marginRight="@dimen/video_item_search_image_right_margin"
         android:scaleType="fitCenter"
         android:src="@drawable/placeholder_thumbnail_video"
+        app:shapeAppearance="@style/RoundedImageView"
         tools:ignore="RtlHardcoded" />
 
     <org.schabi.newpipe.views.NewPipeTextView
diff --git a/app/src/main/res/layout/list_stream_playlist_card_item.xml b/app/src/main/res/layout/list_stream_playlist_card_item.xml
index bc712e36d..76dd03f7a 100644
--- a/app/src/main/res/layout/list_stream_playlist_card_item.xml
+++ b/app/src/main/res/layout/list_stream_playlist_card_item.xml
@@ -21,6 +21,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
+        app:shapeAppearance="@style/RoundedImageView"
         tools:ignore="RtlHardcoded" />
 
     <org.schabi.newpipe.views.NewPipeTextView
diff --git a/app/src/main/res/layout/list_stream_playlist_grid_item.xml b/app/src/main/res/layout/list_stream_playlist_grid_item.xml
index 6ab5f374b..db176a7f4 100644
--- a/app/src/main/res/layout/list_stream_playlist_grid_item.xml
+++ b/app/src/main/res/layout/list_stream_playlist_grid_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/itemRoot"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -11,6 +12,7 @@
 
     <com.google.android.material.imageview.ShapeableImageView
         android:id="@+id/itemThumbnailView"
+        app:shapeAppearance="@style/RoundedImageView"
         android:layout_width="@dimen/video_item_grid_thumbnail_image_width"
         android:layout_height="@dimen/video_item_grid_thumbnail_image_height"
         android:layout_alignParentTop="true"
diff --git a/app/src/main/res/layout/list_stream_playlist_item.xml b/app/src/main/res/layout/list_stream_playlist_item.xml
index 0773a4d88..015cfb50e 100644
--- a/app/src/main/res/layout/list_stream_playlist_item.xml
+++ b/app/src/main/res/layout/list_stream_playlist_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemRoot"
     android:layout_width="match_parent"
@@ -19,6 +20,7 @@
         android:layout_marginRight="@dimen/video_item_search_image_right_margin"
         android:scaleType="fitCenter"
         android:src="@drawable/placeholder_thumbnail_video"
+        app:shapeAppearance="@style/RoundedImageView"
         tools:ignore="RtlHardcoded" />
 
     <org.schabi.newpipe.views.NewPipeTextView
diff --git a/app/src/main/res/layout/play_queue_item.xml b/app/src/main/res/layout/play_queue_item.xml
index b37f6d7fd..830656d4f 100644
--- a/app/src/main/res/layout/play_queue_item.xml
+++ b/app/src/main/res/layout/play_queue_item.xml
@@ -21,7 +21,8 @@
         android:src="@drawable/placeholder_thumbnail_video"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:shapeAppearance="@style/RoundedImageView" />
 
     <org.schabi.newpipe.views.NewPipeTextView
         android:id="@+id/itemDurationView"
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/00.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/00.png
index 3a74f5a5b..41cbd8df8 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/00.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/00.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/01.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/01.png
index 1b0edbb57..c7819b228 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/01.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/01.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/02.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/02.png
index 4b5301c4b..2eb946848 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/02.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/02.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/05.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/05.png
index 6c9c12d70..688ca4001 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/05.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/05.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/06.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/06.png
index f236028af..cdf7bf83a 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/06.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/06.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/07.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/07.png
index c6cadacdb..eddf97925 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/07.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/07.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/08.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/08.png
index e4b9ca249..20e74b811 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/08.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/08.png differ
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/09.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/09.png
deleted file mode 100644
index 38bcb178d..000000000
Binary files a/fastlane/metadata/android/en-US/images/tenInchScreenshots/09.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/10.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/10.png
deleted file mode 100644
index 3093ded5e..000000000
Binary files a/fastlane/metadata/android/en-US/images/tenInchScreenshots/10.png and /dev/null differ