diff --git a/app/src/main/res/layout/channel_header.xml b/app/src/main/res/layout/channel_header.xml
index 86a308b9f..3365e66e2 100644
--- a/app/src/main/res/layout/channel_header.xml
+++ b/app/src/main/res/layout/channel_header.xml
@@ -17,7 +17,7 @@
             android:layout_height="70dp"
             android:background="@android:color/black"
             android:fitsSystemWindows="true"
-            android:scaleType="centerCrop"
+            android:scaleType="fitCenter"
             android:src="@drawable/channel_banner"
             tools:ignore="ContentDescription" />
 
diff --git a/app/src/main/res/layout/item_stream_segment.xml b/app/src/main/res/layout/item_stream_segment.xml
index 3c7631788..2dc414ac9 100644
--- a/app/src/main/res/layout/item_stream_segment.xml
+++ b/app/src/main/res/layout/item_stream_segment.xml
@@ -17,7 +17,7 @@
         android:id="@+id/previewImage"
         android:layout_width="0dp"
         android:layout_height="@dimen/play_queue_thumbnail_width"
-        android:scaleType="centerCrop"
+        android:scaleType="fitCenter"
         android:src="@drawable/dummy_thumbnail"
         app:layout_constraintDimensionRatio="16:9"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/list_playlist_grid_item.xml b/app/src/main/res/layout/list_playlist_grid_item.xml
index c68e780f9..2357458ff 100644
--- a/app/src/main/res/layout/list_playlist_grid_item.xml
+++ b/app/src/main/res/layout/list_playlist_grid_item.xml
@@ -17,7 +17,7 @@
         android:layout_alignParentTop="true"
         android:layout_centerHorizontal="true"
         android:layout_marginRight="@dimen/video_item_search_image_right_margin"
-        android:scaleType="centerCrop"
+        android:scaleType="fitStart"
         android:src="@drawable/dummy_thumbnail_playlist"
         tools:ignore="RtlHardcoded" />
 
@@ -26,7 +26,7 @@
         android:layout_width="@dimen/playlist_item_thumbnail_stream_count_width"
         android:layout_height="match_parent"
         android:layout_alignTop="@id/itemThumbnailView"
-        android:layout_alignRight="@id/itemThumbnailView"
+        android:layout_alignEnd="@id/itemThumbnailView"
         android:layout_alignBottom="@id/itemThumbnailView"
         android:background="@color/playlist_stream_count_background_color"
         android:gravity="center"
@@ -38,7 +38,6 @@
         android:textStyle="bold"
         app:drawableTint="@color/duration_text_color"
         app:drawableTopCompat="@drawable/ic_playlist_play"
-        tools:ignore="RtlHardcoded"
         tools:text="314159" />
 
     <org.schabi.newpipe.views.NewPipeTextView
diff --git a/app/src/main/res/layout/list_playlist_item.xml b/app/src/main/res/layout/list_playlist_item.xml
index 6643207a9..8207a7365 100644
--- a/app/src/main/res/layout/list_playlist_item.xml
+++ b/app/src/main/res/layout/list_playlist_item.xml
@@ -18,7 +18,7 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
         android:layout_marginRight="@dimen/video_item_search_image_right_margin"
-        android:scaleType="centerCrop"
+        android:scaleType="fitStart"
         android:src="@drawable/dummy_thumbnail_playlist"
         tools:ignore="RtlHardcoded" />
 
@@ -27,7 +27,7 @@
         android:layout_width="@dimen/playlist_item_thumbnail_stream_count_width"
         android:layout_height="match_parent"
         android:layout_alignTop="@id/itemThumbnailView"
-        android:layout_alignRight="@id/itemThumbnailView"
+        android:layout_alignEnd="@id/itemThumbnailView"
         android:layout_alignBottom="@id/itemThumbnailView"
         android:background="@color/playlist_stream_count_background_color"
         android:gravity="center"
@@ -39,7 +39,6 @@
         android:textStyle="bold"
         app:drawableTint="@color/duration_text_color"
         app:drawableTopCompat="@drawable/ic_playlist_play"
-        tools:ignore="RtlHardcoded"
         tools:text="314159" />
 
     <org.schabi.newpipe.views.NewPipeTextView
diff --git a/app/src/main/res/layout/list_playlist_mini_item.xml b/app/src/main/res/layout/list_playlist_mini_item.xml
index a6bab9f2c..bbad6efd0 100644
--- a/app/src/main/res/layout/list_playlist_mini_item.xml
+++ b/app/src/main/res/layout/list_playlist_mini_item.xml
@@ -18,7 +18,7 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
         android:layout_marginRight="@dimen/video_item_search_image_right_margin"
-        android:scaleType="centerCrop"
+        android:scaleType="fitStart"
         android:src="@drawable/dummy_thumbnail_playlist"
         tools:ignore="RtlHardcoded" />
 
@@ -27,7 +27,7 @@
         android:layout_width="45dp"
         android:layout_height="match_parent"
         android:layout_alignTop="@id/itemThumbnailView"
-        android:layout_alignRight="@id/itemThumbnailView"
+        android:layout_alignEnd="@id/itemThumbnailView"
         android:layout_alignBottom="@id/itemThumbnailView"
         android:background="@color/playlist_stream_count_background_color"
         android:gravity="center"
@@ -39,7 +39,6 @@
         android:textStyle="bold"
         app:drawableTint="@color/duration_text_color"
         app:drawableTopCompat="@drawable/ic_playlist_play"
-        tools:ignore="RtlHardcoded"
         tools:text="3141" />
 
     <org.schabi.newpipe.views.NewPipeTextView
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 e770e6614..b8192bbc1 100644
--- a/app/src/main/res/layout/list_stream_grid_item.xml
+++ b/app/src/main/res/layout/list_stream_grid_item.xml
@@ -14,7 +14,7 @@
         android:id="@+id/itemThumbnailView"
         android:layout_width="@dimen/video_item_grid_thumbnail_image_width"
         android:layout_height="@dimen/video_item_grid_thumbnail_image_height"
-        android:scaleType="centerCrop"
+        android:scaleType="fitCenter"
         android:src="@drawable/dummy_thumbnail"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/list_stream_item.xml b/app/src/main/res/layout/list_stream_item.xml
index 5806ed96e..1117a028e 100644
--- a/app/src/main/res/layout/list_stream_item.xml
+++ b/app/src/main/res/layout/list_stream_item.xml
@@ -14,7 +14,7 @@
         android:id="@+id/itemThumbnailView"
         android:layout_width="@dimen/video_item_search_thumbnail_image_width"
         android:layout_height="@dimen/video_item_search_thumbnail_image_height"
-        android:scaleType="centerCrop"
+        android:scaleType="fitCenter"
         android:src="@drawable/dummy_thumbnail"
         app:layout_constraintBottom_toTopOf="@+id/itemProgressView"
         app:layout_constraintStart_toStartOf="parent"
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 5de3eac46..d33c9d4ba 100644
--- a/app/src/main/res/layout/list_stream_mini_item.xml
+++ b/app/src/main/res/layout/list_stream_mini_item.xml
@@ -17,7 +17,7 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
         android:layout_marginRight="@dimen/video_item_search_image_right_margin"
-        android:scaleType="centerCrop"
+        android:scaleType="fitCenter"
         android:src="@drawable/dummy_thumbnail"
         tools:ignore="RtlHardcoded" />
 
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 ac57ae378..e21a7238c 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
@@ -17,7 +17,7 @@
         android:layout_alignParentTop="true"
         android:layout_centerHorizontal="true"
         android:layout_marginRight="@dimen/video_item_search_image_right_margin"
-        android:scaleType="centerCrop"
+        android:scaleType="fitCenter"
         android:src="@drawable/dummy_thumbnail"
         tools:ignore="RtlHardcoded" />
 
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 9ac1045e2..428c762aa 100644
--- a/app/src/main/res/layout/list_stream_playlist_item.xml
+++ b/app/src/main/res/layout/list_stream_playlist_item.xml
@@ -18,7 +18,7 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
         android:layout_marginRight="@dimen/video_item_search_image_right_margin"
-        android:scaleType="centerCrop"
+        android:scaleType="fitCenter"
         android:src="@drawable/dummy_thumbnail"
         tools:ignore="RtlHardcoded" />
 
diff --git a/app/src/main/res/layout/play_queue_item.xml b/app/src/main/res/layout/play_queue_item.xml
index f266af091..5fb9419f6 100644
--- a/app/src/main/res/layout/play_queue_item.xml
+++ b/app/src/main/res/layout/play_queue_item.xml
@@ -17,7 +17,7 @@
         android:layout_marginStart="@dimen/video_item_search_image_right_margin"
         android:layout_marginTop="@dimen/video_item_search_image_right_margin"
         android:layout_marginBottom="@dimen/video_item_search_image_right_margin"
-        android:scaleType="centerCrop"
+        android:scaleType="fitCenter"
         android:src="@drawable/dummy_thumbnail"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"