Fixed conflicts from cherry picking

Author: litetex

app/src/main/java/org/schabi/newpipe/settings/serviceinstances/AbstractServiceInstanceListFragment.java

@@ -331,7 +331,7 @@ protected int getIconForInstance(final I instance) {
                 .filter(c -> c.createdClass().isInstance(instance))
                 .map(InstanceTypeCreator::icon)
                 .findFirst()
-                .orElse(R.drawable.place_holder_circle);
+                .orElse(R.drawable.ic_placeholder_circle);
     }
 
     /*//////////////////////////////////////////////////////////////////////////

app/src/main/java/org/schabi/newpipe/settings/serviceinstances/peertube/PeertubeInstanceListFragment.java

@@ -23,7 +23,7 @@ public static class PeerTubeInstanceTypeCreator
         public PeerTubeInstanceTypeCreator() {
             super(
                     PeertubeInstance.SERVICE_NAME,
-                    R.drawable.place_holder_peertube,
+                    R.drawable.ic_placeholder_peertube,
                     PeertubeInstance.class,
                     PeertubeInstance::new,
                     R.string.peertube_instance_list_url);

app/src/main/java/org/schabi/newpipe/settings/serviceinstances/youtubelike/YouTubeLikeInstanceListFragment.java

@@ -36,7 +36,7 @@ public static class YouTubeInstanceTypeCreator
         public YouTubeInstanceTypeCreator() {
             super(
                     YoutubeInstance.SERVICE_NAME,
-                    R.drawable.place_holder_youtube,
+                    R.drawable.ic_placeholder_yt,
                     YoutubeInstance.class);
         }
 
@@ -63,7 +63,7 @@ public static class InvidiousInstanceTypeCreator
         public InvidiousInstanceTypeCreator() {
             super(
                     InvidiousInstance.SERVICE_NAME,
-                    R.drawable.place_holder_circle, // TODO
+                    R.drawable.ic_placeholder_circle, // TODO
                     InvidiousInstance.class,
                     InvidiousInstance::new,
                     R.string.invidious_instance_list_url);