Use vector drawables instead of PNGs for material icons

For all manually-created images PNG have been kept.
- rename all icon attrs to have a `ic_` prefix
- always use `_24dp` icons, because there is no real difference, since they are vector drawables
- always use the original name found on material.io for icon drawables, as to not create confusion and possibly duplicates. Icon names can still be different from real drawable names, though I have made some of them compliant to this or maybe more meaningul.
- remove duplicate `getIconByAttr()` in ThemeHelper (use `resolveResourceIdFromAttr()`
- use standard icons for `expand_more` and `expand_less` instead of triangles
- use `play_button_outline` instead of custom PNG as play button in VideoDetailFragment (questionable, as there is no shadow anymore)

app/src/main/java/org/schabi/newpipe/MainActivity.java

@@ -175,24 +175,24 @@ public class MainActivity extends AppCompatActivity {
                 .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_channel));
         drawerItems.getMenu()
                 .add(R.id.menu_tabs_group, ITEM_ID_FEED, ORDER, R.string.fragment_feed_title)
-                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.rss));
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_rss));
         drawerItems.getMenu()
                 .add(R.id.menu_tabs_group, ITEM_ID_BOOKMARKS, ORDER, R.string.tab_bookmarks)
                 .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_bookmark));
         drawerItems.getMenu()
                 .add(R.id.menu_tabs_group, ITEM_ID_DOWNLOADS, ORDER, R.string.downloads)
-                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.download));
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_file_download));
         drawerItems.getMenu()
                 .add(R.id.menu_tabs_group, ITEM_ID_HISTORY, ORDER, R.string.action_history)
-                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.history));
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_history));
 
         //Settings and About
         drawerItems.getMenu()
                 .add(R.id.menu_options_about_group, ITEM_ID_SETTINGS, ORDER, R.string.settings)
-                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.settings));
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_settings));
         drawerItems.getMenu()
                 .add(R.id.menu_options_about_group, ITEM_ID_ABOUT, ORDER, R.string.tab_about)
-                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.info));
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_info_outline));
 
         toggle = new ActionBarDrawerToggle(this, drawer, toolbar, R.string.drawer_open,
                 R.string.drawer_close);
@@ -343,7 +343,7 @@ public class MainActivity extends AppCompatActivity {
     }
 
     private void showServices() {
-        serviceArrow.setImageResource(R.drawable.ic_arrow_drop_up_white_24dp);
+        serviceArrow.setImageResource(R.drawable.ic_expand_less_white_24dp);
 
         for (StreamingService s : NewPipe.getServices()) {
             final String title = s.getServiceInfo().getName()
@@ -408,7 +408,7 @@ public class MainActivity extends AppCompatActivity {
     }
 
     private void showTabs() throws ExtractionException {
-        serviceArrow.setImageResource(R.drawable.ic_arrow_drop_down_white_24dp);
+        serviceArrow.setImageResource(R.drawable.ic_expand_more_white_24dp);
 
         //Tabs
         int currentServiceId = ServiceHelper.getSelectedServiceId(this);
@@ -429,24 +429,24 @@ public class MainActivity extends AppCompatActivity {
                 .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_channel));
         drawerItems.getMenu()
                 .add(R.id.menu_tabs_group, ITEM_ID_FEED, ORDER, R.string.fragment_feed_title)
-                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.rss));
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_rss));
         drawerItems.getMenu()
                 .add(R.id.menu_tabs_group, ITEM_ID_BOOKMARKS, ORDER, R.string.tab_bookmarks)
                 .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_bookmark));
         drawerItems.getMenu()
                 .add(R.id.menu_tabs_group, ITEM_ID_DOWNLOADS, ORDER, R.string.downloads)
-                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.download));
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_file_download));
         drawerItems.getMenu()
                 .add(R.id.menu_tabs_group, ITEM_ID_HISTORY, ORDER, R.string.action_history)
-                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.history));
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_history));
 
         //Settings and About
         drawerItems.getMenu()
                 .add(R.id.menu_options_about_group, ITEM_ID_SETTINGS, ORDER, R.string.settings)
-                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.settings));
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_settings));
         drawerItems.getMenu()
                 .add(R.id.menu_options_about_group, ITEM_ID_ABOUT, ORDER, R.string.tab_about)
-                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.info));
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_info_outline));
     }
 
     @Override

app/src/main/java/org/schabi/newpipe/RouterActivity.java

@@ -366,26 +366,26 @@ public class RouterActivity extends AppCompatActivity {
 
         returnList.add(new AdapterChoiceItem(getString(R.string.show_info_key),
                 getString(R.string.show_info),
-                resolveResourceIdFromAttr(context, R.attr.info)));
+                resolveResourceIdFromAttr(context, R.attr.ic_info_outline)));
 
         if (capabilities.contains(VIDEO) && !(isExtVideoEnabled && linkType != LinkType.STREAM)) {
             returnList.add(new AdapterChoiceItem(getString(R.string.video_player_key),
                     getString(R.string.video_player),
-                    resolveResourceIdFromAttr(context, R.attr.play)));
+                    resolveResourceIdFromAttr(context, R.attr.ic_play_arrow)));
             returnList.add(new AdapterChoiceItem(getString(R.string.popup_player_key),
                     getString(R.string.popup_player),
-                    resolveResourceIdFromAttr(context, R.attr.popup)));
+                    resolveResourceIdFromAttr(context, R.attr.ic_popup)));
         }
 
         if (capabilities.contains(AUDIO) && !(isExtAudioEnabled && linkType != LinkType.STREAM)) {
             returnList.add(new AdapterChoiceItem(getString(R.string.background_player_key),
                     getString(R.string.background_player),
-                    resolveResourceIdFromAttr(context, R.attr.audio)));
+                    resolveResourceIdFromAttr(context, R.attr.ic_headset)));
         }
 
         returnList.add(new AdapterChoiceItem(getString(R.string.download_key),
                 getString(R.string.download),
-                resolveResourceIdFromAttr(context, R.attr.download)));
+                resolveResourceIdFromAttr(context, R.attr.ic_file_download)));
 
         return returnList;
     }

app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java

@@ -399,8 +399,8 @@ public class DownloadDialog extends DialogFragment
         boolean isLight = ThemeHelper.isLightThemeSelected(getActivity());
 
         toolbar.setTitle(R.string.download_dialog_title);
-        toolbar.setNavigationIcon(isLight ? R.drawable.ic_arrow_back_black_24dp
-                : R.drawable.ic_arrow_back_white_24dp);
+        toolbar.setNavigationIcon(
+            ThemeHelper.resolveResourceIdFromAttr(requireContext(), R.attr.ic_arrow_back));
         toolbar.inflateMenu(R.menu.dialog_url);
         toolbar.setNavigationOnClickListener(v -> getDialog().dismiss());
         toolbar.setNavigationContentDescription(R.string.cancel);

app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java

@@ -85,6 +85,7 @@ import org.schabi.newpipe.util.PermissionHelper;
 import org.schabi.newpipe.util.ShareUtils;
 import org.schabi.newpipe.util.StreamItemAdapter;
 import org.schabi.newpipe.util.StreamItemAdapter.StreamSizeWrapper;
+import org.schabi.newpipe.util.ThemeHelper;
 import org.schabi.newpipe.views.AnimatedProgressBar;
 import org.schabi.newpipe.views.LargeTextMovementMethod;
 
@@ -495,13 +496,15 @@ public class VideoDetailFragment extends BaseStateFragment<StreamInfo>
             videoTitleTextView.setMaxLines(1);
             videoDescriptionRootLayout.setVisibility(View.GONE);
             videoDescriptionView.setFocusable(false);
-            videoTitleToggleArrow.setImageResource(R.drawable.arrow_down);
+            videoTitleToggleArrow.setImageResource(
+                    ThemeHelper.resolveResourceIdFromAttr(requireContext(), R.attr.ic_expand_more));
         } else {
             videoTitleTextView.setMaxLines(10);
             videoDescriptionRootLayout.setVisibility(View.VISIBLE);
             videoDescriptionView.setFocusable(true);
             videoDescriptionView.setMovementMethod(new LargeTextMovementMethod());
-            videoTitleToggleArrow.setImageResource(R.drawable.arrow_up);
+            videoTitleToggleArrow.setImageResource(
+                    ThemeHelper.resolveResourceIdFromAttr(requireContext(), R.attr.ic_expand_less));
         }
     }
 
@@ -1114,7 +1117,7 @@ public class VideoDetailFragment extends BaseStateFragment<StreamInfo>
         animateView(videoTitleTextView, true, 0);
 
         videoDescriptionRootLayout.setVisibility(View.GONE);
-        videoTitleToggleArrow.setImageResource(R.drawable.arrow_down);
+        videoTitleToggleArrow.setImageResource(R.drawable.ic_expand_more_white_24dp);
         videoTitleToggleArrow.setVisibility(View.GONE);
         videoTitleRoot.setClickable(false);
 
@@ -1230,7 +1233,7 @@ public class VideoDetailFragment extends BaseStateFragment<StreamInfo>
         videoDescriptionView.setVisibility(View.GONE);
         videoTitleRoot.setClickable(true);
         videoTitleToggleArrow.setVisibility(View.VISIBLE);
-        videoTitleToggleArrow.setImageResource(R.drawable.arrow_down);
+        videoTitleToggleArrow.setImageResource(R.drawable.ic_expand_more_white_24dp);
         videoDescriptionRootLayout.setVisibility(View.GONE);
 
         if (info.getUploadDate() != null) {

app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionListAdapter.java

@@ -117,8 +117,8 @@ public class SuggestionListAdapter
             queryView = rootView.findViewById(R.id.suggestion_search);
             insertView = rootView.findViewById(R.id.suggestion_insert);
 
-            historyResId = resolveResourceIdFromAttr(rootView.getContext(), R.attr.history);
-            searchResId = resolveResourceIdFromAttr(rootView.getContext(), R.attr.search);
+            historyResId = resolveResourceIdFromAttr(rootView.getContext(), R.attr.ic_history);
+            searchResId = resolveResourceIdFromAttr(rootView.getContext(), R.attr.ic_search);
         }
 
         private static int resolveResourceIdFromAttr(final Context context,

app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java

@@ -362,14 +362,14 @@ public class StatisticsPlaylistFragment
         if (sortMode == StatisticSortMode.LAST_PLAYED) {
             sortMode = StatisticSortMode.MOST_PLAYED;
             setTitle(getString(R.string.title_most_played));
-            sortButtonIcon
-                    .setImageResource(ThemeHelper.getIconByAttr(R.attr.history, getContext()));
+            sortButtonIcon.setImageResource(
+                ThemeHelper.resolveResourceIdFromAttr(requireContext(), R.attr.ic_history));
             sortButtonText.setText(R.string.title_last_played);
         } else {
             sortMode = StatisticSortMode.LAST_PLAYED;
             setTitle(getString(R.string.title_last_played));
-            sortButtonIcon
-                    .setImageResource(ThemeHelper.getIconByAttr(R.attr.filter, getContext()));
+            sortButtonIcon.setImageResource(
+                ThemeHelper.resolveResourceIdFromAttr(requireContext(), R.attr.ic_filter_list));
             sortButtonText.setText(R.string.title_most_played);
         }
         startLoading(true);

app/src/main/java/org/schabi/newpipe/local/subscription/FeedGroupIcon.kt

@@ -20,10 +20,10 @@ enum class FeedGroupIcon(
     ALL(0, R.attr.ic_asterisk),
     MUSIC(1, R.attr.ic_music_note),
     EDUCATION(2, R.attr.ic_school),
-    FITNESS(3, R.attr.ic_fitness),
+    FITNESS(3, R.attr.ic_fitness_center),
     SPACE(4, R.attr.ic_telescope),
     COMPUTER(5, R.attr.ic_computer),
-    GAMING(6, R.attr.ic_videogame),
+    GAMING(6, R.attr.ic_videogame_asset),
     SPORTS(7, R.attr.ic_sports),
     NEWS(8, R.attr.ic_megaphone),
     FAVORITES(9, R.attr.ic_heart),
@@ -32,17 +32,17 @@ enum class FeedGroupIcon(
     TREND(12, R.attr.ic_trending_up),
     MOVIE(13, R.attr.ic_movie),
     BACKUP(14, R.attr.ic_backup),
-    ART(15, R.attr.palette),
+    ART(15, R.attr.ic_palette),
     PERSON(16, R.attr.ic_person),
     PEOPLE(17, R.attr.ic_people),
     MONEY(18, R.attr.ic_money),
-    KIDS(19, R.attr.ic_kids),
+    KIDS(19, R.attr.ic_child_care),
     FOOD(20, R.attr.ic_fastfood),
     SMILE(21, R.attr.ic_smile),
     EXPLORE(22, R.attr.ic_explore),
     RESTAURANT(23, R.attr.ic_restaurant),
     MIC(24, R.attr.ic_mic),
-    HEADSET(25, R.attr.audio),
+    HEADSET(25, R.attr.ic_headset),
     RADIO(26, R.attr.ic_radio),
     SHOPPING_CART(27, R.attr.ic_shopping_cart),
     WATCH_LATER(28, R.attr.ic_watch_later),
@@ -54,7 +54,7 @@ enum class FeedGroupIcon(
     WORLD(34, R.attr.ic_world),
     STAR(35, R.attr.ic_stars),
     SUN(36, R.attr.ic_sunny),
-    RSS(37, R.attr.rss);
+    RSS(37, R.attr.ic_rss);
 
     @DrawableRes
     fun getDrawableRes(context: Context): Int {

app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java

@@ -655,7 +655,7 @@ public final class BackgroundPlayer extends Service {
             super.onPlaying();
             resetNotification();
             updateNotificationThumbnail();
-            updateNotification(R.drawable.ic_pause_white);
+            updateNotification(R.drawable.ic_pause_white_24dp);
         }
 
         @Override
@@ -663,7 +663,7 @@ public final class BackgroundPlayer extends Service {
             super.onPaused();
             resetNotification();
             updateNotificationThumbnail();
-            updateNotification(R.drawable.ic_play_arrow_white);
+            updateNotification(R.drawable.ic_play_arrow_white_24dp);
         }
 
         @Override
@@ -677,7 +677,7 @@ public final class BackgroundPlayer extends Service {
                 notRemoteView.setProgressBar(R.id.notificationProgressBar, 100, 100, false);
             }
             updateNotificationThumbnail();
-            updateNotification(R.drawable.ic_replay_white);
+            updateNotification(R.drawable.ic_replay_white_24dp);
         }
     }
 }

app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java

@@ -491,7 +491,7 @@ public final class MainVideoPlayer extends AppCompatActivity
 
     protected void setMuteButton(final ImageButton muteButton, final boolean isMuted) {
         muteButton.setImageDrawable(AppCompatResources.getDrawable(getApplicationContext(), isMuted
-                ? R.drawable.ic_volume_off_white_72dp : R.drawable.ic_volume_up_white_72dp));
+                ? R.drawable.ic_volume_off_white_24dp : R.drawable.ic_volume_up_white_24dp));
     }
 
 
@@ -989,7 +989,7 @@ public final class MainVideoPlayer extends AppCompatActivity
         @Override
         public void onBlocked() {
             super.onBlocked();
-            playPauseButton.setImageResource(R.drawable.ic_pause_white);
+            playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp);
             animatePlayButtons(false, 100);
             animateView(closeButton, false, DEFAULT_CONTROLS_DURATION);
             getRootView().setKeepScreenOn(true);
@@ -1005,7 +1005,7 @@ public final class MainVideoPlayer extends AppCompatActivity
         public void onPlaying() {
             super.onPlaying();
             animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false, 80, 0, () -> {
-                playPauseButton.setImageResource(R.drawable.ic_pause_white);
+                playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp);
                 animatePlayButtons(true, 200);
                 playPauseButton.requestFocus();
                 animateView(closeButton, false, DEFAULT_CONTROLS_DURATION);
@@ -1018,7 +1018,7 @@ public final class MainVideoPlayer extends AppCompatActivity
         public void onPaused() {
             super.onPaused();
             animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false, 80, 0, () -> {
-                playPauseButton.setImageResource(R.drawable.ic_play_arrow_white);
+                playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp);
                 animatePlayButtons(true, 200);
                 playPauseButton.requestFocus();
                 animateView(closeButton, false, DEFAULT_CONTROLS_DURATION);
@@ -1039,7 +1039,7 @@ public final class MainVideoPlayer extends AppCompatActivity
         @Override
         public void onCompleted() {
             animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false, 0, 0, () -> {
-                playPauseButton.setImageResource(R.drawable.ic_replay_white);
+                playPauseButton.setImageResource(R.drawable.ic_replay_white_24dp);
                 animatePlayButtons(true, DEFAULT_CONTROLS_DURATION);
                 animateView(closeButton, true, DEFAULT_CONTROLS_DURATION);
             });
@@ -1368,12 +1368,12 @@ public final class MainVideoPlayer extends AppCompatActivity
                 }
 
                 final int resId = currentProgressPercent <= 0
-                        ? R.drawable.ic_volume_off_white_72dp
+                        ? R.drawable.ic_volume_off_white_24dp
                         : currentProgressPercent < 0.25
-                        ? R.drawable.ic_volume_mute_white_72dp
+                        ? R.drawable.ic_volume_mute_white_24dp
                         : currentProgressPercent < 0.75
-                        ? R.drawable.ic_volume_down_white_72dp
-                        : R.drawable.ic_volume_up_white_72dp;
+                        ? R.drawable.ic_volume_down_white_24dp
+                        : R.drawable.ic_volume_up_white_24dp;
 
                 playerImpl.getVolumeImageView().setImageDrawable(
                         AppCompatResources.getDrawable(getApplicationContext(), resId)
@@ -1400,10 +1400,10 @@ public final class MainVideoPlayer extends AppCompatActivity
                 }
 
                 final int resId = currentProgressPercent < 0.25
-                        ? R.drawable.ic_brightness_low_white_72dp
+                        ? R.drawable.ic_brightness_low_white_24dp
                         : currentProgressPercent < 0.75
-                                ? R.drawable.ic_brightness_medium_white_72dp
-                                : R.drawable.ic_brightness_high_white_72dp;
+                                ? R.drawable.ic_brightness_medium_white_24dp
+                                : R.drawable.ic_brightness_high_white_24dp;
 
                 playerImpl.getBrightnessImageView().setImageDrawable(
                         AppCompatResources.getDrawable(getApplicationContext(), resId)

app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java

@@ -892,7 +892,7 @@ public final class PopupVideoPlayer extends Service {
         public void onBlocked() {
             super.onBlocked();
             resetNotification();
-            updateNotification(R.drawable.ic_play_arrow_white);
+            updateNotification(R.drawable.ic_play_arrow_white_24dp);
         }
 
         @Override
@@ -902,9 +902,9 @@ public final class PopupVideoPlayer extends Service {
             updateWindowFlags(ONGOING_PLAYBACK_WINDOW_FLAGS);
 
             resetNotification();
-            updateNotification(R.drawable.ic_pause_white);
+            updateNotification(R.drawable.ic_pause_white_24dp);
 
-            videoPlayPause.setBackgroundResource(R.drawable.ic_pause_white);
+            videoPlayPause.setBackgroundResource(R.drawable.ic_pause_white_24dp);
             hideControls(DEFAULT_CONTROLS_DURATION, DEFAULT_CONTROLS_HIDE_TIME);
 
             startForeground(NOTIFICATION_ID, notBuilder.build());
@@ -914,7 +914,7 @@ public final class PopupVideoPlayer extends Service {
         public void onBuffering() {
             super.onBuffering();
             resetNotification();
-            updateNotification(R.drawable.ic_play_arrow_white);
+            updateNotification(R.drawable.ic_play_arrow_white_24dp);
         }
 
         @Override
@@ -924,8 +924,8 @@ public final class PopupVideoPlayer extends Service {
             updateWindowFlags(IDLE_WINDOW_FLAGS);
 
             resetNotification();
-            updateNotification(R.drawable.ic_play_arrow_white);
-            videoPlayPause.setBackgroundResource(R.drawable.ic_play_arrow_white);
+            updateNotification(R.drawable.ic_play_arrow_white_24dp);
+            videoPlayPause.setBackgroundResource(R.drawable.ic_play_arrow_white_24dp);
 
             stopForeground(false);
         }
@@ -934,9 +934,9 @@ public final class PopupVideoPlayer extends Service {
         public void onPausedSeek() {
             super.onPausedSeek();
             resetNotification();
-            updateNotification(R.drawable.ic_play_arrow_white);
+            updateNotification(R.drawable.ic_play_arrow_white_24dp);
 
-            videoPlayPause.setBackgroundResource(R.drawable.ic_pause_white);
+            videoPlayPause.setBackgroundResource(R.drawable.ic_pause_white_24dp);
         }
 
         @Override
@@ -946,8 +946,8 @@ public final class PopupVideoPlayer extends Service {
             updateWindowFlags(IDLE_WINDOW_FLAGS);
 
             resetNotification();
-            updateNotification(R.drawable.ic_replay_white);
-            videoPlayPause.setBackgroundResource(R.drawable.ic_replay_white);
+            updateNotification(R.drawable.ic_replay_white_24dp);
+            videoPlayPause.setBackgroundResource(R.drawable.ic_replay_white_24dp);
 
             stopForeground(false);
         }

app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java

@@ -643,13 +643,13 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
     private void onStateChanged(final int state) {
         switch (state) {
             case BasePlayer.STATE_PAUSED:
-                playPauseButton.setImageResource(R.drawable.ic_play_arrow_white);
+                playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp);
                 break;
             case BasePlayer.STATE_PLAYING:
-                playPauseButton.setImageResource(R.drawable.ic_pause_white);
+                playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp);
                 break;
             case BasePlayer.STATE_COMPLETED:
-                playPauseButton.setImageResource(R.drawable.ic_replay_white);
+                playPauseButton.setImageResource(R.drawable.ic_replay_white_24dp);
                 break;
             default:
                 break;
@@ -717,9 +717,9 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
             // using rootView.getContext() because getApplicationContext() didn't work
             item.setIcon(player.isMuted()
                     ? ThemeHelper.resolveResourceIdFromAttr(rootView.getContext(),
-                            R.attr.volume_off)
+                            R.attr.ic_volume_off)
                     : ThemeHelper.resolveResourceIdFromAttr(rootView.getContext(),
-                            R.attr.volume_on));
+                            R.attr.ic_volume_up));
         }
     }
 }

app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java

@@ -682,13 +682,13 @@ public abstract class VideoPlayer extends BasePlayer
     @Override
     public void onFastRewind() {
         super.onFastRewind();
-        showAndAnimateControl(R.drawable.ic_action_av_fast_rewind, true);
+        showAndAnimateControl(R.drawable.ic_fast_rewind_white_24dp, true);
     }
 
     @Override
     public void onFastForward() {
         super.onFastForward();
-        showAndAnimateControl(R.drawable.ic_action_av_fast_forward, true);
+        showAndAnimateControl(R.drawable.ic_fast_forward_white_24dp, true);
     }
 
     /*//////////////////////////////////////////////////////////////////////////

app/src/main/java/org/schabi/newpipe/settings/tabs/Tab.java

@@ -231,7 +231,7 @@ public abstract class Tab {
         @DrawableRes
         @Override
         public int getTabIconRes(final Context context) {
-            return ThemeHelper.resolveResourceIdFromAttr(context, R.attr.rss);
+            return ThemeHelper.resolveResourceIdFromAttr(context, R.attr.ic_rss);
         }
 
         @Override
@@ -281,7 +281,7 @@ public abstract class Tab {
         @DrawableRes
         @Override
         public int getTabIconRes(final Context context) {
-            return ThemeHelper.resolveResourceIdFromAttr(context, R.attr.history);
+            return ThemeHelper.resolveResourceIdFromAttr(context, R.attr.ic_history);
         }
 
         @Override

app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java

@@ -61,7 +61,7 @@ public final class KioskTranslator {
             case "Recently added":
                 return ThemeHelper.resolveResourceIdFromAttr(c, R.attr.ic_kiosk_recent);
             case "Most liked":
-                return ThemeHelper.resolveResourceIdFromAttr(c, R.attr.thumbs_up);
+                return ThemeHelper.resolveResourceIdFromAttr(c, R.attr.ic_thumb_up);
             default:
                 return 0;
         }

app/src/main/java/org/schabi/newpipe/util/ThemeHelper.java

@@ -231,16 +231,4 @@ public final class ThemeHelper {
         return PreferenceManager.getDefaultSharedPreferences(context)
                 .getString(themeKey, defaultTheme);
     }
-
-    /**
-     * This will get the R.drawable.* resource to which attr is currently pointing to.
-     *
-     * @param attr    a R.attribute.* resource value
-     * @param context the context to use
-     * @return a R.drawable.* resource value
-     */
-    public static int getIconByAttr(final int attr, final Context context) {
-        return context.obtainStyledAttributes(new int[]{attr})
-                .getResourceId(0, -1);
-    }
 }

app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java

@@ -224,15 +224,9 @@ public class MissionsFragment extends Fragment {
         mList.setAdapter(mAdapter);
 
         if (mSwitch != null) {
-            boolean isLight = ThemeHelper.isLightThemeSelected(mContext);
-            int icon;
-
-            if (mLinear)
-                icon = isLight ? R.drawable.ic_grid_black_24dp : R.drawable.ic_grid_white_24dp;
-            else
-                icon = isLight ? R.drawable.ic_list_black_24dp : R.drawable.ic_list_white_24dp;
-
-            mSwitch.setIcon(icon);
+            mSwitch.setIcon(mLinear
+                    ? ThemeHelper.resolveResourceIdFromAttr(requireContext(), R.attr.ic_grid)
+                    : ThemeHelper.resolveResourceIdFromAttr(requireContext(), R.attr.ic_list));
             mSwitch.setTitle(mLinear ? R.string.grid : R.string.list);
             mPrefs.edit().putBoolean("linear", mLinear).apply();
         }

app/src/main/java/us/shandian/giga/util/Utility.java

@@ -191,12 +191,12 @@ public class Utility {
     public static int getIconForFileType(FileType type) {
         switch (type) {
             case MUSIC:
-                return R.drawable.music;
+                return R.drawable.ic_headset_white_24dp;
             default:
             case VIDEO:
-                return R.drawable.video;
+                return R.drawable.ic_movie_white_24dp;
             case SUBTITLE:
-                return R.drawable.subtitle;
+                return R.drawable.ic_subtitles_white_24dp;
         }
     }