diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index 278d472d4..c8ae0781e 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -714,7 +714,7 @@ public final class VideoDetailFragment
     }
 
     private void initThumbnailViews(@NonNull final StreamInfo info) {
-        PicassoHelper.loadThumbnail(info.getThumbnailUrl()).tag(PICASSO_VIDEO_DETAILS_TAG)
+        PicassoHelper.loadDetailsThumbnail(info.getThumbnailUrl()).tag(PICASSO_VIDEO_DETAILS_TAG)
                 .into(binding.detailThumbnailImageView, new Callback() {
                     @Override
                     public void onSuccess() {
@@ -1551,7 +1551,8 @@ public final class VideoDetailFragment
             binding.detailUploaderThumbnailView.setVisibility(View.GONE);
         }
 
-        final Drawable buddyDrawable = AppCompatResources.getDrawable(activity, R.drawable.buddy);
+        final Drawable buddyDrawable
+                = AppCompatResources.getDrawable(activity, R.drawable.placeholder_person);
         binding.detailSubChannelThumbnailView.setImageDrawable(buddyDrawable);
         binding.detailUploaderThumbnailView.setImageDrawable(buddyDrawable);
 
@@ -2360,8 +2361,8 @@ public final class VideoDetailFragment
                                    @Nullable final String thumbnailUrl) {
         binding.overlayTitleTextView.setText(isEmpty(overlayTitle) ? "" : overlayTitle);
         binding.overlayChannelTextView.setText(isEmpty(uploader) ? "" : uploader);
-        binding.overlayThumbnail.setImageResource(R.drawable.dummy_thumbnail_dark);
-        PicassoHelper.loadThumbnail(thumbnailUrl).tag(PICASSO_VIDEO_DETAILS_TAG)
+        binding.overlayThumbnail.setImageDrawable(null);
+        PicassoHelper.loadDetailsThumbnail(thumbnailUrl).tag(PICASSO_VIDEO_DETAILS_TAG)
                 .into(binding.overlayThumbnail);
     }
 
diff --git a/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistAppendDialog.java b/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistAppendDialog.java
index a874cdd62..a97eb0c18 100644
--- a/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistAppendDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistAppendDialog.java
@@ -145,7 +145,8 @@ public final class PlaylistAppendDialog extends PlaylistDialog {
         final Toast successToast = Toast.makeText(getContext(),
                 R.string.playlist_add_stream_success, Toast.LENGTH_SHORT);
 
-        if (playlist.thumbnailUrl.equals("drawable://" + R.drawable.dummy_thumbnail_playlist)) {
+        if (playlist.thumbnailUrl
+                .equals("drawable://" + R.drawable.placeholder_thumbnail_playlist)) {
             playlistDisposables.add(manager
                     .changePlaylistThumbnail(playlist.uid, streams.get(0).getThumbnailUrl())
                     .observeOn(AndroidSchedulers.mainThread())
diff --git a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
index 4bffc0983..b4af73d08 100644
--- a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
@@ -613,7 +613,7 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
             newThumbnailUrl = ((PlaylistStreamEntry) itemListAdapter.getItemsList().get(0))
                     .getStreamEntity().getThumbnailUrl();
         } else {
-            newThumbnailUrl = "drawable://" + R.drawable.dummy_thumbnail_playlist;
+            newThumbnailUrl = "drawable://" + R.drawable.placeholder_thumbnail_playlist;
         }
 
         changeThumbnailUrl(newThumbnailUrl);
diff --git a/app/src/main/java/org/schabi/newpipe/player/Player.java b/app/src/main/java/org/schabi/newpipe/player/Player.java
index 100563765..36da0124a 100644
--- a/app/src/main/java/org/schabi/newpipe/player/Player.java
+++ b/app/src/main/java/org/schabi/newpipe/player/Player.java
@@ -3108,7 +3108,7 @@ public final class Player implements
     public Bitmap getThumbnail() {
         if (currentThumbnail == null) {
             currentThumbnail = BitmapFactory.decodeResource(
-                    context.getResources(), R.drawable.dummy_thumbnail);
+                    context.getResources(), R.drawable.placeholder_thumbnail_video);
         }
         return currentThumbnail;
     }
diff --git a/app/src/main/java/org/schabi/newpipe/util/PicassoHelper.java b/app/src/main/java/org/schabi/newpipe/util/PicassoHelper.java
index aabc459d0..a104660f4 100644
--- a/app/src/main/java/org/schabi/newpipe/util/PicassoHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/PicassoHelper.java
@@ -97,19 +97,23 @@ public final class PicassoHelper {
 
 
     public static RequestCreator loadAvatar(final String url) {
-        return loadImageDefault(url, R.drawable.buddy);
+        return loadImageDefault(url, R.drawable.placeholder_person);
     }
 
     public static RequestCreator loadThumbnail(final String url) {
-        return loadImageDefault(url, R.drawable.dummy_thumbnail);
+        return loadImageDefault(url, R.drawable.placeholder_thumbnail_video);
+    }
+
+    public static RequestCreator loadDetailsThumbnail(final String url) {
+        return loadImageDefault(url, R.drawable.placeholder_thumbnail_video, false);
     }
 
     public static RequestCreator loadBanner(final String url) {
-        return loadImageDefault(url, R.drawable.channel_banner);
+        return loadImageDefault(url, R.drawable.placeholder_channel_banner);
     }
 
     public static RequestCreator loadPlaylistThumbnail(final String url) {
-        return loadImageDefault(url, R.drawable.dummy_thumbnail_playlist);
+        return loadImageDefault(url, R.drawable.placeholder_thumbnail_playlist);
     }
 
     public static RequestCreator loadSeekbarThumbnailPreview(final String url) {
@@ -189,15 +193,24 @@ public final class PicassoHelper {
 
 
     private static RequestCreator loadImageDefault(final String url, final int placeholderResId) {
+        return loadImageDefault(url, placeholderResId, true);
+    }
+
+    private static RequestCreator loadImageDefault(final String url, final int placeholderResId,
+                                                   final boolean showPlaceholderWhileLoading) {
         if (!shouldLoadImages || isBlank(url)) {
             return picassoInstance
                     .load((String) null)
                     .placeholder(placeholderResId) // show placeholder when no image should load
                     .error(placeholderResId);
         } else {
-            return picassoInstance
+            final RequestCreator requestCreator = picassoInstance
                     .load(url)
-                    .error(placeholderResId); // don't show placeholder while loading, only on error
+                    .error(placeholderResId);
+            if (showPlaceholderWhileLoading) {
+                requestCreator.placeholder(placeholderResId);
+            }
+            return requestCreator;
         }
     }
 }
diff --git a/app/src/main/res/drawable-nodpi/buddy.png b/app/src/main/res/drawable-nodpi/buddy.png
deleted file mode 100644
index 8713ee02b..000000000
Binary files a/app/src/main/res/drawable-nodpi/buddy.png and /dev/null differ
diff --git a/app/src/main/res/drawable-nodpi/buddy_channel_item.png b/app/src/main/res/drawable-nodpi/buddy_channel_item.png
deleted file mode 100644
index 64d4cb1a0..000000000
Binary files a/app/src/main/res/drawable-nodpi/buddy_channel_item.png and /dev/null differ
diff --git a/app/src/main/res/drawable-nodpi/dummy_thumbnail.png b/app/src/main/res/drawable-nodpi/dummy_thumbnail.png
deleted file mode 100644
index 86f454186..000000000
Binary files a/app/src/main/res/drawable-nodpi/dummy_thumbnail.png and /dev/null differ
diff --git a/app/src/main/res/drawable-nodpi/dummy_thumbnail_dark.png b/app/src/main/res/drawable-nodpi/dummy_thumbnail_dark.png
deleted file mode 100644
index 02f698918..000000000
Binary files a/app/src/main/res/drawable-nodpi/dummy_thumbnail_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-nodpi/dummy_thumbnail_playlist.png b/app/src/main/res/drawable-nodpi/dummy_thumbnail_playlist.png
deleted file mode 100644
index 9ba84fdb4..000000000
Binary files a/app/src/main/res/drawable-nodpi/dummy_thumbnail_playlist.png and /dev/null differ
diff --git a/app/src/main/res/drawable-nodpi/channel_banner.png b/app/src/main/res/drawable-nodpi/placeholder_channel_banner.png
similarity index 100%
rename from app/src/main/res/drawable-nodpi/channel_banner.png
rename to app/src/main/res/drawable-nodpi/placeholder_channel_banner.png
diff --git a/app/src/main/res/drawable/placeholder_person.xml b/app/src/main/res/drawable/placeholder_person.xml
new file mode 100644
index 000000000..2b3229e8f
--- /dev/null
+++ b/app/src/main/res/drawable/placeholder_person.xml
@@ -0,0 +1,20 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+  <path
+      android:pathData="M0,0 L24,0 L24,24 L0,24 z"
+      android:fillColor="@color/placeholder_background" />
+
+  <group android:scaleX="0.8333333"
+      android:scaleY="0.8333333"
+      android:translateX="2"
+      android:translateY="2">
+    <path
+        android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"
+        android:fillColor="@color/placeholder_foreground" />
+  </group>
+
+</vector>
diff --git a/app/src/main/res/drawable/placeholder_thumbnail_playlist.xml b/app/src/main/res/drawable/placeholder_thumbnail_playlist.xml
new file mode 100644
index 000000000..de286d860
--- /dev/null
+++ b/app/src/main/res/drawable/placeholder_thumbnail_playlist.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="9dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M0,0h24v24h-24z"
+      android:fillColor="@color/placeholder_background" />
+  <path
+      android:pathData="M13,12L8,17.5L8,6.5"
+      android:fillColor="@color/placeholder_foreground" />
+  <path
+      android:pathData="M16,12L11,17.5L11,6.5"
+      android:fillColor="@color/placeholder_foreground" />
+</vector>
diff --git a/app/src/main/res/drawable/placeholder_thumbnail_video.xml b/app/src/main/res/drawable/placeholder_thumbnail_video.xml
new file mode 100644
index 000000000..0b262f923
--- /dev/null
+++ b/app/src/main/res/drawable/placeholder_thumbnail_video.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="9dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M0,0h24v24h-24z"
+      android:fillColor="@color/placeholder_background" />
+  <path
+      android:pathData="M15,12L9,17.5L9,6.5"
+      android:fillColor="@color/placeholder_foreground" />
+</vector>
diff --git a/app/src/main/res/layout-large-land/fragment_video_detail.xml b/app/src/main/res/layout-large-land/fragment_video_detail.xml
index d8e52b354..5904724ad 100644
--- a/app/src/main/res/layout-large-land/fragment_video_detail.xml
+++ b/app/src/main/res/layout-large-land/fragment_video_detail.xml
@@ -57,7 +57,7 @@
                             android:scaleType="fitCenter"
                             tools:ignore="RtlHardcoded"
                             tools:layout_height="200dp"
-                            tools:src="@drawable/dummy_thumbnail" />
+                            tools:src="@drawable/placeholder_thumbnail_video" />
 
                         <ImageView
                             android:id="@+id/detail_thumbnail_play_button"
@@ -271,7 +271,7 @@
                                         android:layout_width="@dimen/video_item_detail_uploader_image_size"
                                         android:layout_height="@dimen/video_item_detail_uploader_image_size"
                                         android:contentDescription="@string/detail_uploader_thumbnail_view_description"
-                                        android:src="@drawable/buddy"
+                                        android:src="@drawable/placeholder_person"
                                         app:shapeAppearance="@style/CircularImageView" />
 
                                     <com.google.android.material.imageview.ShapeableImageView
@@ -280,7 +280,7 @@
                                         android:layout_height="@dimen/video_item_detail_sub_channel_image_size"
                                         android:layout_gravity="bottom|right"
                                         android:contentDescription="@string/detail_sub_channel_thumbnail_view_description"
-                                        android:src="@drawable/buddy"
+                                        android:src="@drawable/placeholder_person"
                                         android:visibility="gone"
                                         app:shapeAppearance="@style/CircularImageView"
                                         tools:visibility="visible" />
@@ -645,7 +645,7 @@
             android:paddingLeft="@dimen/video_item_search_padding"
             android:paddingRight="@dimen/video_item_search_padding"
             android:scaleType="fitCenter"
-            android:src="@drawable/dummy_thumbnail" />
+            android:src="@drawable/placeholder_thumbnail_video" />
 
         <LinearLayout
             android:id="@+id/overlay_metadata_layout"
diff --git a/app/src/main/res/layout/channel_header.xml b/app/src/main/res/layout/channel_header.xml
index 3365e66e2..9d1304635 100644
--- a/app/src/main/res/layout/channel_header.xml
+++ b/app/src/main/res/layout/channel_header.xml
@@ -18,7 +18,7 @@
             android:background="@android:color/black"
             android:fitsSystemWindows="true"
             android:scaleType="fitCenter"
-            android:src="@drawable/channel_banner"
+            android:src="@drawable/placeholder_channel_banner"
             tools:ignore="ContentDescription" />
 
         <FrameLayout
@@ -33,7 +33,7 @@
                 android:layout_width="@dimen/channel_avatar_size"
                 android:layout_height="@dimen/channel_avatar_size"
                 android:padding="1dp"
-                android:src="@drawable/buddy"
+                android:src="@drawable/placeholder_person"
                 app:shapeAppearance="@style/CircularImageView"
                 app:strokeColor="#ffffff"
                 app:strokeWidth="2dp" />
@@ -44,7 +44,7 @@
                 android:layout_height="@dimen/sub_channel_avatar_size"
                 android:layout_gravity="bottom|right"
                 android:padding="1dp"
-                android:src="@drawable/buddy"
+                android:src="@drawable/placeholder_person"
                 android:visibility="gone"
                 app:shapeAppearance="@style/CircularImageView"
                 app:strokeColor="#ffffff"
diff --git a/app/src/main/res/layout/fragment_video_detail.xml b/app/src/main/res/layout/fragment_video_detail.xml
index 18655283e..c794c5a55 100644
--- a/app/src/main/res/layout/fragment_video_detail.xml
+++ b/app/src/main/res/layout/fragment_video_detail.xml
@@ -47,7 +47,7 @@
                         android:scaleType="fitCenter"
                         tools:ignore="RtlHardcoded"
                         tools:layout_height="200dp"
-                        tools:src="@drawable/dummy_thumbnail" />
+                        tools:src="@drawable/placeholder_thumbnail_video" />
 
                     <ImageView
                         android:id="@+id/detail_thumbnail_play_button"
@@ -258,7 +258,7 @@
                                     android:layout_width="@dimen/video_item_detail_uploader_image_size"
                                     android:layout_height="@dimen/video_item_detail_uploader_image_size"
                                     android:contentDescription="@string/detail_uploader_thumbnail_view_description"
-                                    android:src="@drawable/buddy"
+                                    android:src="@drawable/placeholder_person"
                                     app:shapeAppearance="@style/CircularImageView" />
 
                                 <com.google.android.material.imageview.ShapeableImageView
@@ -267,7 +267,7 @@
                                     android:layout_height="@dimen/video_item_detail_sub_channel_image_size"
                                     android:layout_gravity="bottom|right"
                                     android:contentDescription="@string/detail_sub_channel_thumbnail_view_description"
-                                    android:src="@drawable/buddy"
+                                    android:src="@drawable/placeholder_person"
                                     android:visibility="gone"
                                     app:shapeAppearance="@style/CircularImageView"
                                     tools:ignore="RtlHardcoded"
@@ -618,8 +618,7 @@
             android:gravity="center_vertical"
             android:paddingLeft="@dimen/video_item_search_padding"
             android:paddingRight="@dimen/video_item_search_padding"
-            android:scaleType="fitCenter"
-            android:src="@drawable/dummy_thumbnail" />
+            android:scaleType="fitCenter" />
 
         <LinearLayout
             android:id="@+id/overlay_metadata_layout"
diff --git a/app/src/main/res/layout/item_stream_segment.xml b/app/src/main/res/layout/item_stream_segment.xml
index 2dc414ac9..e9bdfe3ac 100644
--- a/app/src/main/res/layout/item_stream_segment.xml
+++ b/app/src/main/res/layout/item_stream_segment.xml
@@ -18,7 +18,7 @@
         android:layout_width="0dp"
         android:layout_height="@dimen/play_queue_thumbnail_width"
         android:scaleType="fitCenter"
-        android:src="@drawable/dummy_thumbnail"
+        android:src="@drawable/placeholder_thumbnail_video"
         app:layout_constraintDimensionRatio="16:9"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/list_channel_grid_item.xml b/app/src/main/res/layout/list_channel_grid_item.xml
index d9084bbe9..3112a849f 100644
--- a/app/src/main/res/layout/list_channel_grid_item.xml
+++ b/app/src/main/res/layout/list_channel_grid_item.xml
@@ -18,7 +18,7 @@
         android:layout_centerHorizontal="true"
         android:layout_margin="2dp"
         android:contentDescription="@string/detail_uploader_thumbnail_view_description"
-        android:src="@drawable/buddy_channel_item"
+        android:src="@drawable/placeholder_person"
         app:shapeAppearance="@style/CircularImageView"
         tools:ignore="RtlHardcoded" />
 
diff --git a/app/src/main/res/layout/list_channel_item.xml b/app/src/main/res/layout/list_channel_item.xml
index c09c17ead..cf4685e50 100644
--- a/app/src/main/res/layout/list_channel_item.xml
+++ b/app/src/main/res/layout/list_channel_item.xml
@@ -64,7 +64,7 @@
         android:layout_height="@dimen/video_item_search_avatar_image_height"
         android:layout_marginLeft="@dimen/video_item_search_avatar_left_margin"
         android:layout_marginRight="@dimen/video_item_search_avatar_right_margin"
-        android:src="@drawable/buddy"
+        android:src="@drawable/placeholder_person"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/itemTitleView"
         app:layout_constraintHorizontal_bias="0.5"
diff --git a/app/src/main/res/layout/list_channel_mini_item.xml b/app/src/main/res/layout/list_channel_mini_item.xml
index b66e07a12..473709bbd 100644
--- a/app/src/main/res/layout/list_channel_mini_item.xml
+++ b/app/src/main/res/layout/list_channel_mini_item.xml
@@ -17,7 +17,7 @@
         android:layout_centerVertical="true"
         android:layout_marginStart="3dp"
         android:layout_marginRight="15dp"
-        android:src="@drawable/buddy_channel_item"
+        android:src="@drawable/placeholder_person"
         app:shapeAppearance="@style/CircularImageView"
         tools:ignore="RtlHardcoded" />
 
diff --git a/app/src/main/res/layout/list_comments_item.xml b/app/src/main/res/layout/list_comments_item.xml
index 4358c438f..ad73c5ff4 100644
--- a/app/src/main/res/layout/list_comments_item.xml
+++ b/app/src/main/res/layout/list_comments_item.xml
@@ -20,7 +20,7 @@
         android:layout_marginLeft="3dp"
         android:layout_marginRight="@dimen/comment_item_avatar_right_margin"
         android:focusable="false"
-        android:src="@drawable/buddy"
+        android:src="@drawable/placeholder_person"
         app:shapeAppearance="@style/CircularImageView"
         tools:ignore="RtlHardcoded" />
 
diff --git a/app/src/main/res/layout/list_comments_mini_item.xml b/app/src/main/res/layout/list_comments_mini_item.xml
index 6bd363311..606a237c5 100644
--- a/app/src/main/res/layout/list_comments_mini_item.xml
+++ b/app/src/main/res/layout/list_comments_mini_item.xml
@@ -17,7 +17,7 @@
         android:layout_centerVertical="true"
         android:layout_marginStart="3dp"
         android:layout_marginRight="15dp"
-        android:src="@drawable/buddy_channel_item"
+        android:src="@drawable/placeholder_person"
         app:shapeAppearance="@style/CircularImageView"
         tools:ignore="RtlHardcoded" />
 
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 e052e9ac0..3ab69448d 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_centerHorizontal="true"
         android:layout_marginRight="@dimen/video_item_search_image_right_margin"
         android:scaleType="fitStart"
-        android:src="@drawable/dummy_thumbnail_playlist"
+        android:src="@drawable/placeholder_thumbnail_playlist"
         tools:ignore="RtlHardcoded" />
 
     <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 452596af9..15e9bd87a 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_alignParentTop="true"
         android:layout_marginRight="@dimen/video_item_search_image_right_margin"
         android:scaleType="fitStart"
-        android:src="@drawable/dummy_thumbnail_playlist"
+        android:src="@drawable/placeholder_thumbnail_playlist"
         tools:ignore="RtlHardcoded" />
 
     <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 b08c90d94..a1f70144d 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_alignParentTop="true"
         android:layout_marginRight="@dimen/video_item_search_image_right_margin"
         android:scaleType="fitStart"
-        android:src="@drawable/dummy_thumbnail_playlist"
+        android:src="@drawable/placeholder_thumbnail_playlist"
         tools:ignore="RtlHardcoded" />
 
     <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 b8192bbc1..9d5636f48 100644
--- a/app/src/main/res/layout/list_stream_grid_item.xml
+++ b/app/src/main/res/layout/list_stream_grid_item.xml
@@ -15,7 +15,7 @@
         android:layout_width="@dimen/video_item_grid_thumbnail_image_width"
         android:layout_height="@dimen/video_item_grid_thumbnail_image_height"
         android:scaleType="fitCenter"
-        android:src="@drawable/dummy_thumbnail"
+        android:src="@drawable/placeholder_thumbnail_video"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/list_stream_item.xml b/app/src/main/res/layout/list_stream_item.xml
index 1117a028e..793942568 100644
--- a/app/src/main/res/layout/list_stream_item.xml
+++ b/app/src/main/res/layout/list_stream_item.xml
@@ -15,7 +15,7 @@
         android:layout_width="@dimen/video_item_search_thumbnail_image_width"
         android:layout_height="@dimen/video_item_search_thumbnail_image_height"
         android:scaleType="fitCenter"
-        android:src="@drawable/dummy_thumbnail"
+        android:src="@drawable/placeholder_thumbnail_video"
         app:layout_constraintBottom_toTopOf="@+id/itemProgressView"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="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 d33c9d4ba..2eab66eaf 100644
--- a/app/src/main/res/layout/list_stream_mini_item.xml
+++ b/app/src/main/res/layout/list_stream_mini_item.xml
@@ -18,7 +18,7 @@
         android:layout_alignParentTop="true"
         android:layout_marginRight="@dimen/video_item_search_image_right_margin"
         android:scaleType="fitCenter"
-        android:src="@drawable/dummy_thumbnail"
+        android:src="@drawable/placeholder_thumbnail_video"
         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 3d61e57bf..601ca584e 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_centerHorizontal="true"
         android:layout_marginRight="@dimen/video_item_search_image_right_margin"
         android:scaleType="fitCenter"
-        android:src="@drawable/dummy_thumbnail"
+        android:src="@drawable/placeholder_thumbnail_video"
         tools:ignore="RtlHardcoded" />
 
     <org.schabi.newpipe.views.NewPipeTextView
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 49d34a157..0beee54d3 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_alignParentTop="true"
         android:layout_marginRight="@dimen/video_item_search_image_right_margin"
         android:scaleType="fitCenter"
-        android:src="@drawable/dummy_thumbnail"
+        android:src="@drawable/placeholder_thumbnail_video"
         tools:ignore="RtlHardcoded" />
 
     <org.schabi.newpipe.views.NewPipeTextView
diff --git a/app/src/main/res/layout/picker_subscription_item.xml b/app/src/main/res/layout/picker_subscription_item.xml
index c858ccc4e..6ebc10051 100644
--- a/app/src/main/res/layout/picker_subscription_item.xml
+++ b/app/src/main/res/layout/picker_subscription_item.xml
@@ -22,7 +22,7 @@
             android:layout_width="48dp"
             android:layout_height="48dp"
             app:shapeAppearance="@style/CircularImageView"
-            tools:src="@drawable/buddy_channel_item" />
+            tools:src="@drawable/placeholder_person" />
 
         <org.schabi.newpipe.views.NewPipeTextView
             android:id="@+id/title_view"
diff --git a/app/src/main/res/layout/play_queue_item.xml b/app/src/main/res/layout/play_queue_item.xml
index 7d672dc8b..2ad9d3e89 100644
--- a/app/src/main/res/layout/play_queue_item.xml
+++ b/app/src/main/res/layout/play_queue_item.xml
@@ -18,7 +18,7 @@
         android:layout_marginTop="@dimen/video_item_search_image_right_margin"
         android:layout_marginBottom="@dimen/video_item_search_image_right_margin"
         android:scaleType="fitCenter"
-        android:src="@drawable/dummy_thumbnail"
+        android:src="@drawable/placeholder_thumbnail_video"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/player.xml b/app/src/main/res/layout/player.xml
index b8b60b3f8..60cbcf7c4 100644
--- a/app/src/main/res/layout/player.xml
+++ b/app/src/main/res/layout/player.xml
@@ -397,7 +397,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:paddingTop="2dp"
-                        android:src="@drawable/dummy_thumbnail"
+                        android:src="@drawable/placeholder_thumbnail_video"
                         android:visibility="gone"
                         tools:visibility="visible" />
 
diff --git a/app/src/main/res/layout/playlist_header.xml b/app/src/main/res/layout/playlist_header.xml
index 7c85a6d0d..9c038db3a 100644
--- a/app/src/main/res/layout/playlist_header.xml
+++ b/app/src/main/res/layout/playlist_header.xml
@@ -45,7 +45,7 @@
                 android:layout_alignParentLeft="true"
                 android:layout_centerVertical="true"
                 android:padding="0.7dp"
-                android:src="@drawable/buddy"
+                android:src="@drawable/placeholder_person"
                 app:shapeAppearance="@style/CircularImageView"
                 app:strokeColor="#ffffff"
                 app:strokeWidth="1dp" />
diff --git a/app/src/main/res/layout/select_channel_item.xml b/app/src/main/res/layout/select_channel_item.xml
index cfaaf2760..c5fd51bb8 100644
--- a/app/src/main/res/layout/select_channel_item.xml
+++ b/app/src/main/res/layout/select_channel_item.xml
@@ -19,7 +19,7 @@
         android:layout_alignParentTop="true"
         android:layout_marginStart="3dp"
         android:layout_marginRight="8dp"
-        android:src="@drawable/buddy"
+        android:src="@drawable/placeholder_person"
         app:shapeAppearance="@style/CircularImageView"
         tools:ignore="RtlHardcoded" />
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 281fd9ce7..73e8a0cb1 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -6,6 +6,9 @@
 
     <color name="ic_launcher_background">#CD201F</color>
 
+    <color name="placeholder_background">#999999</color>
+    <color name="placeholder_foreground">#6C6C6C</color>
+
     <!-- Light Theme -->
     <color name="light_background_color">#EEEEEE</color>
     <color name="light_dialog_background_color">#EEEEEE</color>
diff --git a/assets/buddy_channel_item.svg b/assets/buddy_channel_item.svg
deleted file mode 100644
index 4dec41f9d..000000000
--- a/assets/buddy_channel_item.svg
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="200" height="200" viewBox="0 0 187.5 187.5"
-    id="svg2" version="1.1" inkscape:version="0.92.0 r" sodipodi:docname="buddy_channel_item.svg"
-    inkscape:export-filename="/home/the-scrabi/Projects/NewPipe/app/src/main/res/drawable-nodpi/buddy_channel_item.png"
-    inkscape:export-xdpi="96" inkscape:export-ydpi="96">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.6269531"
-     inkscape:cx="-8.1138818"
-     inkscape:cy="101.30232"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1012"
-     inkscape:window-x="0"
-     inkscape:window-y="32"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-864.86216)">
-    <rect
-       style="opacity:0.997;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.6875;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect4136"
-       width="187.5"
-       height="187.5"
-       x="0"
-       y="864.86218" />
-    <g
-       id="g4487"
-       transform="matrix(0.5625,0,0,0.5625,37.5,418.22093)">
-      <ellipse
-         ry="75"
-         rx="100"
-         cy="1052.3622"
-         cx="100"
-         id="path4152"
-         style="opacity:0.997;fill:#6c6c6c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <circle
-         r="60"
-         cy="942.36218"
-         cx="100"
-         id="path4154"
-         style="opacity:0.997;fill:#6c6c6c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    </g>
-  </g>
-</svg>
diff --git a/assets/dummy_thumbnail.svg b/assets/dummy_thumbnail.svg
new file mode 100644
index 000000000..bdea80b55
--- /dev/null
+++ b/assets/dummy_thumbnail.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="200px" height="200px" viewBox="0 0 200 200" id="svg2" version="1.1" xmlns="http://www.w3.org/2000/svg">
+  <g id="layer1" transform="matrix(1.03744, 0, 0, 0.835106, 0, -678.408142)">
+    <rect style="opacity: 0.997; fill: rgb(153, 153, 153); fill-opacity: 1; fill-rule: nonzero; stroke: none; stroke-width: 5; stroke-miterlimit: 4; stroke-dasharray: none; stroke-opacity: 1;" id="rect4136" width="192.949" height="240" y="812.362"/>
+    <path style="opacity:0.997;fill:#6c6c6c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4164" d="M 120.491 931.134 L 98.133 945.904 L 73.02 962.046 L 72.51 933.742 L 72.295 902.173 L 95.163 915.706 L 120.491 931.134 Z" transform="matrix(1, 0.000081, -0.000052, 1, 0.048923, -0.007806)"/>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/assets/dummy_thumbnail_playlist.svg b/assets/dummy_thumbnail_playlist.svg
new file mode 100644
index 000000000..bd4b190aa
--- /dev/null
+++ b/assets/dummy_thumbnail_playlist.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="200px" height="200px" viewBox="0 0 200 200" id="svg2" version="1.1" xmlns="http://www.w3.org/2000/svg">
+  <g id="layer1" transform="matrix(1.03744, 0, 0, 0.835106, 0, -678.408142)">
+    <rect style="opacity: 0.997; fill: rgb(153, 153, 153); fill-opacity: 1; fill-rule: nonzero; stroke: none; stroke-width: 5; stroke-miterlimit: 4; stroke-dasharray: none; stroke-opacity: 1;" id="rect4136" width="192.949" height="240" y="812.362"/>
+    <path style="opacity:0.997;fill:#6c6c6c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4164" d="M 110.852 931.134 L 88.494 945.904 L 63.381 962.046 L 62.871 933.742 L 62.656 902.173 L 85.524 915.706 L 110.852 931.134 Z" transform="matrix(1, 0.000081, -0.000052, 1, 0.048923, -0.007025)"/>
+    <path style="opacity:0.997;fill:#6c6c6c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path-1" d="M 134.95 931.133 L 112.592 945.903 L 87.479 962.045 L 86.969 933.741 L 86.754 902.172 L 109.622 915.705 L 134.95 931.133 Z" transform="matrix(1, 0.000081, -0.000052, 1, 0.048901, -0.008782)"/>
+  </g>
+</svg>
\ No newline at end of file