Deleted duplicate resources

67 files changed, 188 insertions, 220 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index 15d0bec4a..5d1ab2fc3 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -222,10 +222,10 @@ public class VideoplayerActivity extends MediaplayerActivity {
 
         FrameLayout.LayoutParams params = (FrameLayout.LayoutParams) skipAnimationView.getLayoutParams();
         if (isForward) {
-            skipAnimationView.setImageResource(R.drawable.ic_av_fast_forward_white_80dp);
+            skipAnimationView.setImageResource(R.drawable.ic_fast_forward_video_white);
             params.gravity = Gravity.RIGHT | Gravity.CENTER_VERTICAL;
         } else {
-            skipAnimationView.setImageResource(R.drawable.ic_av_fast_rewind_white_80dp);
+            skipAnimationView.setImageResource(R.drawable.ic_fast_rewind_video_white);
             params.gravity = Gravity.LEFT | Gravity.CENTER_VERTICAL;
         }
 
@@ -421,7 +421,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
         if (PictureInPictureUtil.supportsPictureInPicture(this)) {
             menu.findItem(R.id.player_go_to_picture_in_picture).setVisible(true);
         }
-        menu.findItem(R.id.audio_controls).setIcon(R.drawable.ic_sliders_white);
+        menu.findItem(R.id.audio_controls).setIcon(R.drawable.ic_sliders);
         return true;
     }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java
index 8380d8626..b06c94abd 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java
@@ -77,7 +77,7 @@ public class ChaptersListAdapter extends RecyclerView.Adapter<ChaptersListAdapte
             holder.link.setText(sc.getLink());
             holder.link.setOnClickListener(v -> IntentUtils.openInBrowser(context, sc.getLink()));
         }
-        holder.secondaryActionIcon.setImageResource(ThemeUtils.getDrawableFromAttr(context, R.attr.av_play));
+        holder.secondaryActionIcon.setImageResource(R.drawable.ic_play_48dp);
         holder.secondaryActionButton.setContentDescription(context.getString(R.string.play_chapter));
         holder.secondaryActionButton.setOnClickListener(v -> {
             if (callback != null) {
@@ -92,7 +92,7 @@ public class ChaptersListAdapter extends RecyclerView.Adapter<ChaptersListAdapte
             progress = Math.max(progress, CircularProgressBar.MINIMUM_PERCENTAGE);
             progress = Math.min(progress, CircularProgressBar.MAXIMUM_PERCENTAGE);
             holder.progressBar.setPercentage(progress, position);
-            holder.secondaryActionIcon.setImageResource(ThemeUtils.getDrawableFromAttr(context, R.attr.av_replay));
+            holder.secondaryActionIcon.setImageResource(R.drawable.ic_replay);
         } else {
             holder.itemView.setBackgroundColor(ContextCompat.getColor(context, android.R.color.transparent));
             holder.progressBar.setPercentage(0, null);
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java
index 811e1e31b..896daae18 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java
@@ -20,7 +20,6 @@ import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.DBTasks;
 import de.danoeh.antennapod.core.storage.DownloadRequestException;
 import de.danoeh.antennapod.core.storage.DownloadRequester;
-import de.danoeh.antennapod.ui.common.ThemeUtils;
 import de.danoeh.antennapod.view.viewholder.DownloadItemViewHolder;
 
 /**
@@ -82,8 +81,7 @@ public class DownloadLogAdapter extends BaseAdapter {
                 holder.secondaryActionButton.setOnClickListener(null);
                 holder.secondaryActionButton.setTag(null);
             } else {
-                holder.secondaryActionIcon.setImageResource(
-                        ThemeUtils.getDrawableFromAttr(context, R.attr.navigation_refresh));
+                holder.secondaryActionIcon.setImageResource(R.drawable.ic_refresh);
                 holder.secondaryActionButton.setVisibility(View.VISIBLE);
 
                 if (status.getFeedfileType() == Feed.FEEDFILETYPE_FEED) {
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java
index 9363edc9f..f559d4f74 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java
@@ -15,7 +15,6 @@ import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.service.download.DownloadRequest;
 import de.danoeh.antennapod.core.service.download.DownloadStatus;
 import de.danoeh.antennapod.core.service.download.Downloader;
-import de.danoeh.antennapod.ui.common.ThemeUtils;
 import de.danoeh.antennapod.ui.common.CircularProgressBar;
 
 public class DownloadlistAdapter extends BaseAdapter {
@@ -64,7 +63,7 @@ public class DownloadlistAdapter extends BaseAdapter {
         }
 
         holder.title.setText(request.getTitle());
-        holder.secondaryActionIcon.setImageResource(ThemeUtils.getDrawableFromAttr(context, R.attr.navigation_cancel));
+        holder.secondaryActionIcon.setImageResource(R.drawable.ic_cancel);
         holder.secondaryActionButton.setContentDescription(context.getString(R.string.cancel_download_label));
         holder.secondaryActionButton.setTag(downloader);
         holder.secondaryActionButton.setOnClickListener(butSecondaryListener);
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
index 8d7add297..816d36353 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
@@ -33,7 +33,6 @@ import de.danoeh.antennapod.fragment.NavDrawerFragment;
 import de.danoeh.antennapod.fragment.PlaybackHistoryFragment;
 import de.danoeh.antennapod.fragment.QueueFragment;
 import de.danoeh.antennapod.fragment.SubscriptionFragment;
-import de.danoeh.antennapod.ui.common.ThemeUtils;
 import org.apache.commons.lang3.ArrayUtils;
 
 import java.lang.ref.WeakReference;
@@ -109,34 +108,22 @@ public class NavListAdapter extends RecyclerView.Adapter<NavListAdapter.Holder>
     }
 
     private @DrawableRes int getDrawable(String tag) {
-        Activity context = activity.get();
-        if (context == null) {
-            return 0;
-        }
-        int icon;
         switch (tag) {
             case QueueFragment.TAG:
-                icon = R.attr.stat_playlist;
-                break;
+                return R.drawable.ic_playlist;
             case EpisodesFragment.TAG:
-                icon = R.attr.feed;
-                break;
+                return R.drawable.ic_feed;
             case DownloadsFragment.TAG:
-                icon = R.attr.av_download;
-                break;
+                return R.drawable.ic_download;
             case PlaybackHistoryFragment.TAG:
-                icon = R.attr.ic_history;
-                break;
+                return R.drawable.ic_history;
             case SubscriptionFragment.TAG:
-                icon = R.attr.ic_folder;
-                break;
+                return R.drawable.ic_folder;
             case AddFeedFragment.TAG:
-                icon = R.attr.content_new;
-                break;
+                return R.drawable.ic_add;
             default:
                 return 0;
         }
-        return ThemeUtils.getDrawableFromAttr(context, icon);
     }
 
     public List<String> getFragmentTags() {
@@ -349,7 +336,7 @@ public class NavListAdapter extends RecyclerView.Adapter<NavListAdapter.Holder>
             holder.count.setVisibility(View.GONE);
         }
         Glide.with(context).clear(holder.image);
-        holder.image.setImageResource(ThemeUtils.getDrawableFromAttr(context, R.attr.ic_folder));
+        holder.image.setImageResource(R.drawable.ic_folder);
         holder.failure.setVisibility(View.GONE);
     }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java
index fc97cace5..b18fea481 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java
@@ -24,7 +24,6 @@ import de.danoeh.antennapod.core.feed.LocalFeedUpdater;
 import de.danoeh.antennapod.core.storage.NavDrawerData;
 import de.danoeh.antennapod.fragment.FeedItemlistFragment;
 import de.danoeh.antennapod.fragment.SubscriptionFragment;
-import de.danoeh.antennapod.ui.common.ThemeUtils;
 import jp.shts.android.library.TriangleLabelView;
 
 /**
@@ -115,7 +114,7 @@ public class SubscriptionsAdapter extends BaseAdapter implements AdapterView.OnI
                     .load();
         } else {
             new CoverLoader(mainActivityRef.get())
-                    .withResource(ThemeUtils.getDrawableFromAttr(mainActivityRef.get(), R.attr.ic_folder))
+                    .withResource(R.drawable.ic_folder)
                     .withPlaceholderView(holder.feedTitle, true)
                     .withCoverView(holder.imageView)
                     .load();
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/AddToQueueActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/AddToQueueActionButton.java
index a8001eeb1..f68e9761f 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/AddToQueueActionButton.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/AddToQueueActionButton.java
@@ -1,7 +1,7 @@
 package de.danoeh.antennapod.adapter.actionbutton;
 
 import android.content.Context;
-import androidx.annotation.AttrRes;
+import androidx.annotation.DrawableRes;
 import androidx.annotation.StringRes;
 
 import de.danoeh.antennapod.R;
@@ -20,9 +20,9 @@ class AddToQueueActionButton extends ItemActionButton {
     }
 
     @Override
-    @AttrRes
+    @DrawableRes
     public int getDrawable() {
-        return R.attr.content_new;
+        return R.drawable.ic_add;
     }
 
     @Override
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/CancelDownloadActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/CancelDownloadActionButton.java
index a31d2fdc0..d4a7713d9 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/CancelDownloadActionButton.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/CancelDownloadActionButton.java
@@ -1,7 +1,7 @@
 package de.danoeh.antennapod.adapter.actionbutton;
 
 import android.content.Context;
-import androidx.annotation.AttrRes;
+import androidx.annotation.DrawableRes;
 import androidx.annotation.StringRes;
 import android.widget.Toast;
 
@@ -25,9 +25,9 @@ public class CancelDownloadActionButton extends ItemActionButton {
     }
 
     @Override
-    @AttrRes
+    @DrawableRes
     public int getDrawable() {
-        return R.attr.navigation_cancel;
+        return R.drawable.ic_cancel;
     }
 
     @Override
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DeleteActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DeleteActionButton.java
index 45cce23b8..3de3019bb 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DeleteActionButton.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DeleteActionButton.java
@@ -2,7 +2,7 @@ package de.danoeh.antennapod.adapter.actionbutton;
 
 import android.content.Context;
 import android.view.View;
-import androidx.annotation.AttrRes;
+import androidx.annotation.DrawableRes;
 import androidx.annotation.StringRes;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.feed.FeedItem;
@@ -22,9 +22,9 @@ public class DeleteActionButton extends ItemActionButton {
     }
 
     @Override
-    @AttrRes
+    @DrawableRes
     public int getDrawable() {
-        return R.attr.ic_delete;
+        return R.drawable.ic_delete;
     }
 
     @Override
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DownloadActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DownloadActionButton.java
index 0f7c2bdd0..689ecceb0 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DownloadActionButton.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DownloadActionButton.java
@@ -4,7 +4,7 @@ import android.content.Context;
 import android.view.View;
 import android.widget.Toast;
 
-import androidx.annotation.AttrRes;
+import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
 
@@ -33,9 +33,9 @@ public class DownloadActionButton extends ItemActionButton {
     }
 
     @Override
-    @AttrRes
+    @DrawableRes
     public int getDrawable() {
-        return R.attr.av_download;
+        return R.drawable.ic_download;
     }
 
     @Override
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/ItemActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/ItemActionButton.java
index 35f0a717f..c694c0a0e 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/ItemActionButton.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/ItemActionButton.java
@@ -2,7 +2,7 @@ package de.danoeh.antennapod.adapter.actionbutton;
 
 import android.content.Context;
 import android.widget.ImageView;
-import androidx.annotation.AttrRes;
+import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
 import android.view.View;
@@ -11,7 +11,6 @@ import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.storage.DownloadRequester;
-import de.danoeh.antennapod.ui.common.ThemeUtils;
 
 public abstract class ItemActionButton {
     FeedItem item;
@@ -23,7 +22,7 @@ public abstract class ItemActionButton {
     @StringRes
     public abstract int getLabel();
 
-    @AttrRes
+    @DrawableRes
     public abstract int getDrawable();
 
     public abstract void onClick(Context context);
@@ -62,6 +61,6 @@ public abstract class ItemActionButton {
         button.setVisibility(getVisibility());
         button.setContentDescription(context.getString(getLabel()));
         button.setOnClickListener((view) -> onClick(context));
-        icon.setImageResource(ThemeUtils.getDrawableFromAttr(context, getDrawable()));
+        icon.setImageResource(getDrawable());
     }
 }
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/MarkAsPlayedActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/MarkAsPlayedActionButton.java
index 14fa94f7a..2eab092af 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/MarkAsPlayedActionButton.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/MarkAsPlayedActionButton.java
@@ -1,7 +1,7 @@
 package de.danoeh.antennapod.adapter.actionbutton;
 
 import android.content.Context;
-import androidx.annotation.AttrRes;
+import androidx.annotation.DrawableRes;
 import androidx.annotation.StringRes;
 import android.view.View;
 
@@ -22,9 +22,9 @@ public class MarkAsPlayedActionButton extends ItemActionButton {
     }
 
     @Override
-    @AttrRes
+    @DrawableRes
     public int getDrawable() {
-        return R.attr.navigation_accept;
+        return R.drawable.ic_check;
     }
 
     @Override
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PauseActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PauseActionButton.java
index 4ac03c50e..ec6284e82 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PauseActionButton.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PauseActionButton.java
@@ -1,7 +1,7 @@
 package de.danoeh.antennapod.adapter.actionbutton;
 
 import android.content.Context;
-import androidx.annotation.AttrRes;
+import androidx.annotation.DrawableRes;
 import androidx.annotation.StringRes;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.feed.FeedItem;
@@ -23,9 +23,9 @@ public class PauseActionButton extends ItemActionButton {
     }
 
     @Override
-    @AttrRes
+    @DrawableRes
     public int getDrawable() {
-        return R.attr.av_pause;
+        return R.drawable.ic_pause;
     }
 
     @Override
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PlayActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PlayActionButton.java
index 512f1a512..467af5aa2 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PlayActionButton.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PlayActionButton.java
@@ -1,7 +1,7 @@
 package de.danoeh.antennapod.adapter.actionbutton;
 
 import android.content.Context;
-import androidx.annotation.AttrRes;
+import androidx.annotation.DrawableRes;
 import androidx.annotation.StringRes;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.feed.FeedItem;
@@ -24,9 +24,9 @@ public class PlayActionButton extends ItemActionButton {
     }
 
     @Override
-    @AttrRes
+    @DrawableRes
     public int getDrawable() {
-        return R.attr.av_play;
+        return R.drawable.ic_play_24dp;
     }
 
     @Override
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PlayLocalActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PlayLocalActionButton.java
index 78ea3b93f..86ac3db7d 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PlayLocalActionButton.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PlayLocalActionButton.java
@@ -1,7 +1,7 @@
 package de.danoeh.antennapod.adapter.actionbutton;
 
 import android.content.Context;
-import androidx.annotation.AttrRes;
+import androidx.annotation.DrawableRes;
 import androidx.annotation.StringRes;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.feed.FeedItem;
@@ -23,9 +23,9 @@ public class PlayLocalActionButton extends ItemActionButton {
     }
 
     @Override
-    @AttrRes
+    @DrawableRes
     public int getDrawable() {
-        return R.attr.av_play;
+        return R.drawable.ic_play_24dp;
     }
 
     @Override
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/StreamActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/StreamActionButton.java
index 8a892a621..ce7c467e1 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/StreamActionButton.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/StreamActionButton.java
@@ -2,7 +2,7 @@ package de.danoeh.antennapod.adapter.actionbutton;
 
 import android.content.Context;
 
-import androidx.annotation.AttrRes;
+import androidx.annotation.DrawableRes;
 import androidx.annotation.StringRes;
 
 import de.danoeh.antennapod.R;
@@ -28,9 +28,9 @@ public class StreamActionButton extends ItemActionButton {
     }
 
     @Override
-    @AttrRes
+    @DrawableRes
     public int getDrawable() {
-        return R.attr.action_stream;
+        return R.drawable.ic_stream;
     }
 
     @Override
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/VisitWebsiteActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/VisitWebsiteActionButton.java
index e45280eed..41b8ecb4c 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/VisitWebsiteActionButton.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/VisitWebsiteActionButton.java
@@ -2,7 +2,7 @@ package de.danoeh.antennapod.adapter.actionbutton;
 
 import android.content.Context;
 import android.view.View;
-import androidx.annotation.AttrRes;
+import androidx.annotation.DrawableRes;
 import androidx.annotation.StringRes;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.feed.FeedItem;
@@ -21,9 +21,9 @@ public class VisitWebsiteActionButton extends ItemActionButton {
     }
 
     @Override
-    @AttrRes
+    @DrawableRes
     public int getDrawable() {
-        return R.attr.location_web_site;
+        return R.drawable.ic_web;
     }
 
     @Override
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java b/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
index e1e8f1c2e..071dcc158 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
@@ -28,7 +28,6 @@ import de.danoeh.antennapod.core.storage.DownloadRequester;
 import de.danoeh.antennapod.core.util.FeedItemPermutors;
 import de.danoeh.antennapod.core.util.LongList;
 import de.danoeh.antennapod.core.util.SortOrder;
-import de.danoeh.antennapod.ui.common.ThemeUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -215,10 +214,10 @@ public class EpisodesApplyActionFragment extends Fragment implements Toolbar.OnM
     public void refreshToolbarState() {
         MenuItem selectAllItem = toolbar.getMenu().findItem(R.id.select_toggle);
         if (checkedIds.size() == episodes.size()) {
-            selectAllItem.setIcon(ThemeUtils.getDrawableFromAttr(getContext(), R.attr.ic_select_none));
+            selectAllItem.setIcon(R.drawable.ic_select_none);
             selectAllItem.setTitle(R.string.deselect_all_label);
         } else {
-            selectAllItem.setIcon(ThemeUtils.getDrawableFromAttr(getContext(), R.attr.ic_select_all));
+            selectAllItem.setIcon(R.drawable.ic_select_all);
             selectAllItem.setTitle(R.string.select_all_label);
         }
     }
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/TagSettingsDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/TagSettingsDialog.java
index 24a0cc192..422ed5012 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/TagSettingsDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/TagSettingsDialog.java
@@ -81,7 +81,7 @@ public class TagSettingsDialog extends DialogFragment {
         public TagSelectionAdapter.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
             Chip chip = new Chip(getContext());
             chip.setCloseIconVisible(true);
-            chip.setCloseIconResource(R.drawable.ic_delete_black);
+            chip.setCloseIconResource(R.drawable.ic_delete);
             return new TagSelectionAdapter.ViewHolder(chip);
         }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java
index 65e7c4424..cd6f006ac 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java
@@ -98,7 +98,7 @@ public class VariableSpeedDialog extends DialogFragment {
 
         addCurrentSpeedChip = root.findViewById(R.id.add_current_speed_chip);
         addCurrentSpeedChip.setCloseIconVisible(true);
-        addCurrentSpeedChip.setCloseIconResource(R.drawable.ic_add_black);
+        addCurrentSpeedChip.setCloseIconResource(R.drawable.ic_add);
         addCurrentSpeedChip.setOnCloseIconClickListener(v -> addCurrentSpeed());
         addCurrentSpeedChip.setOnClickListener(v -> addCurrentSpeed());
 
@@ -126,7 +126,7 @@ public class VariableSpeedDialog extends DialogFragment {
         public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
             Chip chip = new Chip(getContext());
             chip.setCloseIconVisible(true);
-            chip.setCloseIconResource(R.drawable.ic_delete_black);
+            chip.setCloseIconResource(R.drawable.ic_delete);
             return new ViewHolder(chip);
         }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ChaptersFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ChaptersFragment.java
index acda462bd..7f9a2fa59 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ChaptersFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ChaptersFragment.java
@@ -60,7 +60,7 @@ public class ChaptersFragment extends Fragment {
 
         EmptyViewHandler emptyView = new EmptyViewHandler(getContext());
         emptyView.attachToRecyclerView(recyclerView);
-        emptyView.setIcon(R.attr.ic_bookmark);
+        //emptyView.setIcon(R.attr.ic_bookmark); TODO
         emptyView.setTitle(R.string.no_chapters_head_label);
         emptyView.setMessage(R.string.no_chapters_label);
 
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
index 3519a34b4..2de586968 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
@@ -146,7 +146,7 @@ public class CompletedDownloadsFragment extends Fragment {
 
     private void addEmptyView() {
         emptyView = new EmptyViewHandler(getActivity());
-        emptyView.setIcon(R.attr.av_download);
+        emptyView.setIcon(R.drawable.ic_download);
         emptyView.setTitle(R.string.no_comp_downloads_head_label);
         emptyView.setMessage(R.string.no_comp_downloads_label);
         emptyView.attachToRecyclerView(recyclerView);
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java
index 2e11ea4ec..5f9cd6cc0 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java
@@ -81,7 +81,7 @@ public class DownloadLogFragment extends ListFragment {
         lv.setPadding(0, vertPadding, 0, vertPadding);
 
         EmptyViewHandler emptyView = new EmptyViewHandler(getActivity());
-        emptyView.setIcon(R.attr.av_download);
+        emptyView.setIcon(R.drawable.ic_download);
         emptyView.setTitle(R.string.no_log_downloads_head_label);
         emptyView.setMessage(R.string.no_log_downloads_label);
         emptyView.attachToListView(getListView());
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesListFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesListFragment.java
index 39f935bbe..067f41b24 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesListFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesListFragment.java
@@ -216,7 +216,7 @@ public abstract class EpisodesListFragment extends Fragment {
 
         emptyView = new EmptyViewHandler(getContext());
         emptyView.attachToRecyclerView(recyclerView);
-        emptyView.setIcon(R.attr.feed);
+        emptyView.setIcon(R.drawable.ic_feed);
         emptyView.setTitle(R.string.no_all_episodes_head_label);
         emptyView.setMessage(R.string.no_all_episodes_label);
 
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FavoriteEpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FavoriteEpisodesFragment.java
index e1fd36731..729cc39d2 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/FavoriteEpisodesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/FavoriteEpisodesFragment.java
@@ -55,7 +55,7 @@ public class FavoriteEpisodesFragment extends EpisodesListFragment {
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View root = super.onCreateView(inflater, container, savedInstanceState);
-        emptyView.setIcon(R.attr.ic_unfav);
+        emptyView.setIcon(R.drawable.ic_star);
         emptyView.setTitle(R.string.no_fav_episodes_head_label);
         emptyView.setMessage(R.string.no_fav_episodes_label);
 
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FeedInfoFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FeedInfoFragment.java
index 81e400f97..89a75b1dd 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/FeedInfoFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/FeedInfoFragment.java
@@ -13,6 +13,7 @@ import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.AppCompatDrawableManager;
 import androidx.appcompat.widget.Toolbar;
 import androidx.documentfile.provider.DocumentFile;
 import androidx.fragment.app.Fragment;
@@ -49,7 +50,6 @@ import de.danoeh.antennapod.core.storage.DownloadRequestException;
 import de.danoeh.antennapod.core.storage.StatisticsItem;
 import de.danoeh.antennapod.core.util.Converter;
 import de.danoeh.antennapod.core.util.IntentUtils;
-import de.danoeh.antennapod.ui.common.ThemeUtils;
 import de.danoeh.antennapod.core.util.syndication.HtmlToPlainText;
 import de.danoeh.antennapod.fragment.preferences.StatisticsFragment;
 import de.danoeh.antennapod.menuhandler.FeedMenuHandler;
@@ -137,9 +137,9 @@ public class FeedInfoFragment extends Fragment implements Toolbar.OnMenuItemClic
             @Override
             protected void doTint(Context themedContext) {
                 toolbar.getMenu().findItem(R.id.visit_website_item)
-                        .setIcon(ThemeUtils.getDrawableFromAttr(themedContext, R.attr.location_web_site));
+                        .setIcon(AppCompatDrawableManager.get().getDrawable(themedContext, R.drawable.ic_web));
                 toolbar.getMenu().findItem(R.id.share_parent)
-                        .setIcon(ThemeUtils.getDrawableFromAttr(themedContext, R.attr.ic_share));
+                        .setIcon(AppCompatDrawableManager.get().getDrawable(themedContext, R.drawable.ic_share));
             }
         };
         iconTintManager.updateTint();
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java
index 7a363bcc1..2194ff8b1 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java
@@ -20,6 +20,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatDrawableManager;
 import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.RecyclerView;
@@ -56,7 +57,6 @@ import de.danoeh.antennapod.core.storage.DownloadRequestException;
 import de.danoeh.antennapod.core.storage.DownloadRequester;
 import de.danoeh.antennapod.core.util.FeedItemPermutors;
 import de.danoeh.antennapod.core.util.FeedItemUtil;
-import de.danoeh.antennapod.ui.common.ThemeUtils;
 import de.danoeh.antennapod.core.util.gui.MoreContentListFooterUtil;
 import de.danoeh.antennapod.dialog.EpisodesApplyActionFragment;
 import de.danoeh.antennapod.dialog.FilterDialog;
@@ -176,13 +176,13 @@ public class FeedItemlistFragment extends Fragment implements AdapterView.OnItem
             @Override
             protected void doTint(Context themedContext) {
                 toolbar.getMenu().findItem(R.id.sort_items)
-                        .setIcon(ThemeUtils.getDrawableFromAttr(themedContext, R.attr.ic_sort));
+                        .setIcon(AppCompatDrawableManager.get().getDrawable(themedContext, R.drawable.ic_sort));
                 toolbar.getMenu().findItem(R.id.filter_items)
-                        .setIcon(ThemeUtils.getDrawableFromAttr(themedContext, R.attr.ic_filter));
+                        .setIcon(AppCompatDrawableManager.get().getDrawable(themedContext, R.drawable.ic_filter));
                 toolbar.getMenu().findItem(R.id.refresh_item)
-                        .setIcon(ThemeUtils.getDrawableFromAttr(themedContext, R.attr.navigation_refresh));
+                        .setIcon(AppCompatDrawableManager.get().getDrawable(themedContext, R.drawable.ic_refresh));
                 toolbar.getMenu().findItem(R.id.action_search)
-                        .setIcon(ThemeUtils.getDrawableFromAttr(themedContext, R.attr.action_search));
+                        .setIcon(AppCompatDrawableManager.get().getDrawable(themedContext, R.drawable.ic_search));
             }
         };
         iconTintManager.updateTint();
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
index 224210d63..497d6f5b0 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
@@ -6,7 +6,6 @@ import android.os.Bundle;
 import android.text.Layout;
 import android.text.TextUtils;
 import android.util.Log;
-import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -357,15 +356,12 @@ public class ItemFragment extends Fragment {
 
         butAction1Text.setText(actionButton1.getLabel());
         butAction1Text.setTransformationMethod(null);
-        TypedValue typedValue = new TypedValue();
-        getContext().getTheme().resolveAttribute(actionButton1.getDrawable(), typedValue, true);
-        butAction1Icon.setImageResource(typedValue.resourceId);
+        butAction1Icon.setImageResource(actionButton1.getDrawable());
         butAction1.setVisibility(actionButton1.getVisibility());
 
         butAction2Text.setText(actionButton2.getLabel());
         butAction2Text.setTransformationMethod(null);
-        getContext().getTheme().resolveAttribute(actionButton2.getDrawable(), typedValue, true);
-        butAction2Icon.setImageResource(typedValue.resourceId);
+        butAction2Icon.setImageResource(actionButton2.getDrawable());
         butAction2.setVisibility(actionButton2.getVisibility());
     }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java
index e97b7cd7f..6ec101439 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java
@@ -81,7 +81,7 @@ public class PlaybackHistoryFragment extends Fragment implements Toolbar.OnMenuI
         progressBar = root.findViewById(R.id.progLoading);
 
         emptyView = new EmptyViewHandler(getActivity());
-        emptyView.setIcon(R.attr.ic_history);
+        emptyView.setIcon(R.drawable.ic_history);
         emptyView.setTitle(R.string.no_history_head_label);
         emptyView.setMessage(R.string.no_history_label);
         emptyView.attachToRecyclerView(recyclerView);
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
index 5eb71b984..7b6f43a1b 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
@@ -537,7 +537,7 @@ public class QueueFragment extends Fragment implements Toolbar.OnMenuItemClickLi
 
         emptyView = new EmptyViewHandler(getContext());
         emptyView.attachToRecyclerView(recyclerView);
-        emptyView.setIcon(R.attr.stat_playlist);
+        emptyView.setIcon(R.drawable.ic_playlist);
         emptyView.setTitle(R.string.no_items_header_label);
         emptyView.setMessage(R.string.no_items_label);
 
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/RunningDownloadsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/RunningDownloadsFragment.java
index fc500a223..132561aa0 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/RunningDownloadsFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/RunningDownloadsFragment.java
@@ -61,7 +61,7 @@ public class RunningDownloadsFragment extends ListFragment {
         setListAdapter(adapter);
 
         EmptyViewHandler emptyView = new EmptyViewHandler(getActivity());
-        emptyView.setIcon(R.attr.av_download);
+        emptyView.setIcon(R.drawable.ic_download);
         emptyView.setTitle(R.string.no_run_downloads_head_label);
         emptyView.setMessage(R.string.no_run_downloads_label);
         emptyView.attachToListView(getListView());
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java
index e791da1c6..9309bd1ea 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java
@@ -133,7 +133,7 @@ public class SearchFragment extends Fragment {
 
         emptyViewHandler = new EmptyViewHandler(getContext());
         emptyViewHandler.attachToRecyclerView(recyclerView);
-        emptyViewHandler.setIcon(R.attr.action_search);
+        emptyViewHandler.setIcon(R.drawable.ic_search);
         emptyViewHandler.setTitle(R.string.search_status_no_results);
         EventBus.getDefault().register(this);
 
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java
index f6b7e74bb..b8ef2d43c 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java
@@ -207,7 +207,7 @@ public class SubscriptionFragment extends Fragment implements Toolbar.OnMenuItem
 
     private void setupEmptyView() {
         emptyView = new EmptyViewHandler(getContext());
-        emptyView.setIcon(R.attr.ic_folder);
+        emptyView.setIcon(R.drawable.ic_folder);
         emptyView.setTitle(R.string.no_subscriptions_head_label);
         emptyView.setMessage(R.string.no_subscriptions_label);
         emptyView.attachToListView(subscriptionGridLayout);
diff --git a/app/src/main/java/de/danoeh/antennapod/menuhandler/MenuItemUtils.java b/app/src/main/java/de/danoeh/antennapod/menuhandler/MenuItemUtils.java
index fbfdf537f..b42244160 100644
--- a/app/src/main/java/de/danoeh/antennapod/menuhandler/MenuItemUtils.java
+++ b/app/src/main/java/de/danoeh/antennapod/menuhandler/MenuItemUtils.java
@@ -24,10 +24,10 @@ public class MenuItemUtils extends de.danoeh.antennapod.core.menuhandler.MenuIte
         final MenuItem queueLock = menu.findItem(R.id.queue_lock);
         if (UserPreferences.isQueueLocked()) {
             queueLock.setTitle(de.danoeh.antennapod.R.string.unlock_queue);
-            queueLock.setIcon(ThemeUtils.getDrawableFromAttr(context, R.attr.ic_lock_open));
+            queueLock.setIcon(R.drawable.ic_lock_open);
         } else {
             queueLock.setTitle(de.danoeh.antennapod.R.string.lock_queue);
-            queueLock.setIcon(ThemeUtils.getDrawableFromAttr(context, R.attr.ic_lock_closed));
+            queueLock.setIcon(R.drawable.ic_lock_closed);
         }
     }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/view/EmptyViewHandler.java b/app/src/main/java/de/danoeh/antennapod/view/EmptyViewHandler.java
index d4bf44aa5..ce8f08511 100644
--- a/app/src/main/java/de/danoeh/antennapod/view/EmptyViewHandler.java
+++ b/app/src/main/java/de/danoeh/antennapod/view/EmptyViewHandler.java
@@ -6,7 +6,7 @@ import android.view.Gravity;
 import android.widget.AbsListView;

 import android.widget.FrameLayout;

 import android.widget.ListAdapter;

-import androidx.annotation.AttrRes;

+import androidx.annotation.DrawableRes;

 import androidx.recyclerview.widget.RecyclerView;

 import android.view.View;

 import android.view.ViewGroup;

@@ -15,7 +15,6 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;

 

 import de.danoeh.antennapod.R;

-import de.danoeh.antennapod.ui.common.ThemeUtils;

 

 public class EmptyViewHandler {

     private boolean layoutAdded = false;

@@ -23,7 +22,6 @@ public class EmptyViewHandler {
     private ListAdapter listAdapter;

     private RecyclerView.Adapter<?> recyclerAdapter;

 

-    private final Context context;

     private final View emptyView;

     private final TextView tvTitle;

     private final TextView tvMessage;

@@ -31,7 +29,6 @@ public class EmptyViewHandler {
 

     public EmptyViewHandler(Context context) {

         emptyView = View.inflate(context, R.layout.empty_view_layout, null);

-        this.context = context;

         tvTitle = emptyView.findViewById(R.id.emptyViewTitle);

         tvMessage = emptyView.findViewById(R.id.emptyViewMessage);

         ivIcon = emptyView.findViewById(R.id.emptyViewIcon);

@@ -49,8 +46,8 @@ public class EmptyViewHandler {
         tvMessage.setText(message);

     }

 

-    public void setIcon(@AttrRes int iconAttr) {

-        ivIcon.setImageResource(ThemeUtils.getDrawableFromAttr(context, iconAttr));

+    public void setIcon(@DrawableRes int icon) {

+        ivIcon.setImageResource(icon);

         ivIcon.setVisibility(View.VISIBLE);

     }

 

diff --git a/app/src/main/java/de/danoeh/antennapod/view/PlayButton.java b/app/src/main/java/de/danoeh/antennapod/view/PlayButton.java
index 691a15ca2..04b277fb4 100644
--- a/app/src/main/java/de/danoeh/antennapod/view/PlayButton.java
+++ b/app/src/main/java/de/danoeh/antennapod/view/PlayButton.java
@@ -7,7 +7,6 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatImageButton;
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.ui.common.ThemeUtils;
 
 public class PlayButton extends AppCompatImageButton {
     private boolean isShowPlay = true;
@@ -34,10 +33,9 @@ public class PlayButton extends AppCompatImageButton {
             this.isShowPlay = showPlay;
             setContentDescription(getContext().getString(showPlay ? R.string.play_label : R.string.pause_label));
             if (isVideoScreen) {
-                setImageResource(showPlay ? R.drawable.ic_av_play_white_80dp : R.drawable.ic_av_pause_white_80dp);
+                setImageResource(showPlay ? R.drawable.ic_play_video_white : R.drawable.ic_pause_video_white);
             } else if (!isShown()) {
-                setImageResource(ThemeUtils.getDrawableFromAttr(getContext(),
-                        showPlay ? R.attr.av_play : R.attr.av_pause));
+                setImageResource(showPlay ? R.drawable.ic_play_48dp : R.drawable.ic_pause);
             } else if (showPlay) {
                 AnimatedVectorDrawableCompat drawable = AnimatedVectorDrawableCompat.create(
                         getContext(), R.drawable.ic_animate_pause_play);
diff --git a/app/src/main/res/layout/addfeed.xml b/app/src/main/res/layout/addfeed.xml
index d6ebd58d7..a6e0fc9ea 100644
--- a/app/src/main/res/layout/addfeed.xml
+++ b/app/src/main/res/layout/addfeed.xml
@@ -34,7 +34,7 @@
                     android:layout_marginLeft="8dp"
                     android:layout_marginRight="8dp"
                     android:contentDescription="@string/search_podcast_hint"
-                    app:srcCompat="?attr/action_search"
+                    app:srcCompat="@drawable/ic_search"
                     android:id="@+id/searchButton"
                     android:scaleType="center"/>
 
@@ -90,8 +90,8 @@
                     android:id="@+id/addViaUrlButton"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:drawableStartCompat="?attr/feed"
-                    app:drawableLeftCompat="?attr/feed"
+                    app:drawableStartCompat="@drawable/ic_feed"
+                    app:drawableLeftCompat="@drawable/ic_feed"
                     style="@style/AddPodcastTextView"
                     android:text="@string/add_podcast_by_url"/>
 
@@ -99,8 +99,8 @@
                     android:id="@+id/addLocalFolderButton"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:drawableStartCompat="?attr/ic_folder"
-                    app:drawableLeftCompat="?attr/ic_folder"
+                    app:drawableStartCompat="@drawable/ic_folder"
+                    app:drawableLeftCompat="@drawable/ic_folder"
                     style="@style/AddPodcastTextView"
                     android:text="@string/add_local_folder"/>
 
@@ -108,8 +108,8 @@
                     android:id="@+id/searchItunesButton"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:drawableStartCompat="?attr/action_search"
-                    app:drawableLeftCompat="?attr/action_search"
+                    app:drawableStartCompat="@drawable/ic_search"
+                    app:drawableLeftCompat="@drawable/ic_search"
                     style="@style/AddPodcastTextView"
                     android:text="@string/search_itunes_label"/>
 
@@ -117,8 +117,8 @@
                     android:id="@+id/searchFyydButton"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:drawableStartCompat="?attr/action_search"
-                    app:drawableLeftCompat="?attr/action_search"
+                    app:drawableStartCompat="@drawable/ic_search"
+                    app:drawableLeftCompat="@drawable/ic_search"
                     style="@style/AddPodcastTextView"
                     android:text="@string/search_fyyd_label"/>
 
@@ -126,8 +126,8 @@
                     android:id="@+id/searchGPodderButton"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:drawableStartCompat="?attr/action_search"
-                    app:drawableLeftCompat="?attr/action_search"
+                    app:drawableStartCompat="@drawable/ic_search"
+                    app:drawableLeftCompat="@drawable/ic_search"
                     style="@style/AddPodcastTextView"
                     android:text="@string/browse_gpoddernet_label"/>
 
@@ -135,8 +135,8 @@
                     android:id="@+id/searchPodcastIndexButton"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:drawableStartCompat="?attr/action_search"
-                    app:drawableLeftCompat="?attr/action_search"
+                    app:drawableStartCompat="@drawable/ic_search"
+                    app:drawableLeftCompat="@drawable/ic_search"
                     style="@style/AddPodcastTextView"
                     android:text="@string/search_podcastindex_label"/>
 
@@ -144,8 +144,8 @@
                     android:id="@+id/opmlImportButton"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:drawableStartCompat="?attr/av_download"
-                    app:drawableLeftCompat="?attr/av_download"
+                    app:drawableStartCompat="@drawable/ic_download"
+                    app:drawableLeftCompat="@drawable/ic_download"
                     style="@style/AddPodcastTextView"
                     android:text="@string/opml_add_podcast_label"/>
         </LinearLayout>
diff --git a/app/src/main/res/layout/audioplayer_fragment.xml b/app/src/main/res/layout/audioplayer_fragment.xml
index 4ecb5ae38..c173371d3 100644
--- a/app/src/main/res/layout/audioplayer_fragment.xml
+++ b/app/src/main/res/layout/audioplayer_fragment.xml
@@ -153,9 +153,9 @@
                     android:layout_centerVertical="true"
                     android:background="?attr/selectableItemBackgroundBorderless"
                     android:contentDescription="@string/pause_label"
-                    app:srcCompat="?attr/av_play"
+                    app:srcCompat="@drawable/ic_play_48dp"
                     android:scaleType="fitCenter"
-                    tools:srcCompat="@drawable/ic_av_play_white_24dp"/>
+                    tools:srcCompat="@drawable/ic_play_48dp"/>
 
             <de.danoeh.antennapod.ui.common.CircularProgressBar
                     android:layout_width="@dimen/audioplayer_playercontrols_length_big"
@@ -188,9 +188,9 @@
                     android:layout_centerVertical="true"
                     android:background="?attr/selectableItemBackgroundBorderless"
                     android:contentDescription="@string/rewind_label"
-                    app:srcCompat="?attr/av_rewind"
+                    app:srcCompat="@drawable/ic_fast_rewind"
                     android:scaleType="fitCenter"
-                    tools:srcCompat="@drawable/ic_av_fast_rewind_white_48dp"/>
+                    tools:srcCompat="@drawable/ic_fast_rewind"/>
 
             <TextView
                     android:id="@+id/txtvRev"
@@ -216,7 +216,7 @@
                     android:layout_centerVertical="true"
                     android:background="?attr/selectableItemBackgroundBorderless"
                     android:contentDescription="@string/playback_speed"
-                    tools:srcCompat="@drawable/ic_playback_speed_white"
+                    tools:srcCompat="@drawable/ic_playback_speed"
                     app:foregroundColor="?attr/action_icon_color"/>
 
             <TextView
@@ -245,9 +245,9 @@
                     android:layout_centerVertical="true"
                     android:background="?attr/selectableItemBackgroundBorderless"
                     android:contentDescription="@string/fast_forward_label"
-                    app:srcCompat="?attr/av_fast_forward"
+                    app:srcCompat="@drawable/ic_fast_forward"
                     android:scaleType="fitCenter"
-                    tools:srcCompat="@drawable/ic_av_fast_forward_white_48dp"/>
+                    tools:srcCompat="@drawable/ic_fast_forward"/>
 
             <TextView
                     android:id="@+id/txtvFF"
@@ -273,9 +273,9 @@
                     android:layout_centerVertical="true"
                     android:background="?attr/selectableItemBackgroundBorderless"
                     android:scaleType="fitCenter"
-                    app:srcCompat="?attr/av_skip"
+                    app:srcCompat="@drawable/ic_skip_48dp"
                     android:contentDescription="@string/skip_episode_label"
-                    tools:srcCompat="@drawable/ic_av_skip_white_48dp"/>
+                    tools:srcCompat="@drawable/ic_skip_48dp"/>
         </RelativeLayout>
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/edit_tags_dialog.xml b/app/src/main/res/layout/edit_tags_dialog.xml
index 9fb6292b2..2e7774cea 100644
--- a/app/src/main/res/layout/edit_tags_dialog.xml
+++ b/app/src/main/res/layout/edit_tags_dialog.xml
@@ -33,7 +33,7 @@
         <ImageButton
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                app:srcCompat="?attr/content_new"
+                app:srcCompat="@drawable/ic_add"
                 android:contentDescription="@string/new_label"
                 android:id="@+id/newTagButton"/>
     </LinearLayout>
diff --git a/app/src/main/res/layout/empty_view_layout.xml b/app/src/main/res/layout/empty_view_layout.xml
index da2040d93..c6de8d2d0 100644
--- a/app/src/main/res/layout/empty_view_layout.xml
+++ b/app/src/main/res/layout/empty_view_layout.xml
@@ -14,7 +14,7 @@
             android:layout_width="32dp"

             android:layout_height="32dp"

             android:visibility="gone"

-            tools:src="@drawable/ic_feed_black"

+            tools:src="@drawable/ic_feed"

             tools:visibility="visible"/>

 

     <TextView

diff --git a/app/src/main/res/layout/episodes_apply_action_fragment.xml b/app/src/main/res/layout/episodes_apply_action_fragment.xml
index 304588e3e..78827a12a 100644
--- a/app/src/main/res/layout/episodes_apply_action_fragment.xml
+++ b/app/src/main/res/layout/episodes_apply_action_fragment.xml
@@ -47,7 +47,7 @@
             android:id="@+id/fabSD"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:sdMainFabClosedSrc="?attr/batch_edit_fab_icon"
+            app:sdMainFabClosedSrc="@drawable/ic_fab_edit"
             app:sdOverlayLayout="@id/fabSDOverlay"
             android:layout_marginEnd="16dp"
             android:layout_marginRight="16dp"
diff --git a/app/src/main/res/layout/external_player_fragment.xml b/app/src/main/res/layout/external_player_fragment.xml
index 4f200162a..fa881e622 100644
--- a/app/src/main/res/layout/external_player_fragment.xml
+++ b/app/src/main/res/layout/external_player_fragment.xml
@@ -63,10 +63,10 @@
                 android:layout_height="match_parent"
                 android:contentDescription="@string/pause_label"
                 android:background="?attr/selectableItemBackground"
-                app:srcCompat="?attr/av_play"
+                app:srcCompat="@drawable/ic_play_48dp"
                 android:scaleType="fitCenter"
                 android:padding="8dp"
-                tools:src="@drawable/ic_av_play_white_48dp"/>
+                tools:src="@drawable/ic_play_48dp"/>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/feeditem_fragment.xml b/app/src/main/res/layout/feeditem_fragment.xml
index 049182803..256f45fe7 100644
--- a/app/src/main/res/layout/feeditem_fragment.xml
+++ b/app/src/main/res/layout/feeditem_fragment.xml
@@ -126,7 +126,7 @@
                     android:layout_marginEnd="8dp"
                     android:layout_marginTop="12dp"
                     android:layout_marginBottom="12dp"
-                    tools:src="@drawable/ic_settings_black" />
+                    tools:src="@drawable/ic_settings" />
 
                 <TextView
                     android:textAppearance="@style/TextAppearance.AppCompat.Button"
@@ -154,7 +154,7 @@
                     android:layout_marginEnd="8dp"
                     android:layout_marginTop="12dp"
                     android:layout_marginBottom="12dp"
-                    tools:src="@drawable/ic_settings_black" />
+                    tools:src="@drawable/ic_settings" />
 
                 <TextView
                     android:textAppearance="@style/TextAppearance.AppCompat.Button"
diff --git a/app/src/main/res/layout/feeditemlist_item.xml b/app/src/main/res/layout/feeditemlist_item.xml
index 63092cfb3..37b88d1b5 100644
--- a/app/src/main/res/layout/feeditemlist_item.xml
+++ b/app/src/main/res/layout/feeditemlist_item.xml
@@ -114,24 +114,21 @@
                 <ImageView
                         android:layout_width="14sp"
                         android:layout_height="14sp"
-                        app:srcCompat="?attr/type_video"
-                        tools:srcCompat="@drawable/ic_videocam_black_24dp"
+                        app:srcCompat="@drawable/ic_videocam"
                         android:contentDescription="@string/media_type_video_label"
                         android:id="@+id/ivIsVideo"/>
 
                 <ImageView
                         android:layout_width="14sp"
                         android:layout_height="14sp"
-                        app:srcCompat="?attr/ic_unfav"
-                        tools:srcCompat="@drawable/ic_star_black"
+                        app:srcCompat="@drawable/ic_star"
                         android:contentDescription="@string/is_favorite_label"
                         android:id="@+id/isFavorite"/>
 
                 <ImageView
                         android:layout_width="14sp"
                         android:layout_height="14sp"
-                        app:srcCompat="?attr/stat_playlist"
-                        tools:srcCompat="@drawable/ic_playlist_black"
+                        app:srcCompat="@drawable/ic_playlist"
                         android:contentDescription="@string/in_queue_label"
                         android:id="@+id/ivInPlaylist"/>
 
diff --git a/app/src/main/res/layout/fragment_subscriptions.xml b/app/src/main/res/layout/fragment_subscriptions.xml
index c738300c5..61d33f534 100644
--- a/app/src/main/res/layout/fragment_subscriptions.xml
+++ b/app/src/main/res/layout/fragment_subscriptions.xml
@@ -65,5 +65,5 @@
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
             android:contentDescription="@string/add_feed_label"
-            app:srcCompat="@drawable/ic_add_white"/>
+            app:srcCompat="@drawable/ic_add"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/gpodnet_podcast_listitem.xml b/app/src/main/res/layout/gpodnet_podcast_listitem.xml
index 99991e919..56d351d62 100644
--- a/app/src/main/res/layout/gpodnet_podcast_listitem.xml
+++ b/app/src/main/res/layout/gpodnet_podcast_listitem.xml
@@ -65,7 +65,7 @@
             <ImageView
                     android:layout_width="14sp"
                     android:layout_height="14sp"
-                    app:srcCompat="?attr/feed"/>
+                    app:srcCompat="@drawable/ic_feed"/>
             <TextView
                     android:id="@+id/txtvSubscribers"
                     style="@style/AntennaPod.TextView.ListItemSecondaryTitle"
diff --git a/app/src/main/res/layout/nav_list.xml b/app/src/main/res/layout/nav_list.xml
index 669a0cf44..a24ea3fba 100644
--- a/app/src/main/res/layout/nav_list.xml
+++ b/app/src/main/res/layout/nav_list.xml
@@ -30,7 +30,7 @@
             android:cropToPadding="true"
             android:padding="8dp"
             android:scaleType="centerCrop"
-            app:srcCompat="?attr/ic_settings"
+            app:srcCompat="@drawable/ic_settings"
             tools:background="@android:color/holo_orange_dark"
             tools:src="@android:drawable/sym_def_app_icon" />
 
diff --git a/app/src/main/res/layout/storage_error.xml b/app/src/main/res/layout/storage_error.xml
index 7b0579927..6a7fda341 100644
--- a/app/src/main/res/layout/storage_error.xml
+++ b/app/src/main/res/layout/storage_error.xml
@@ -14,7 +14,7 @@
         android:layout_width="36dp"
         android:layout_height="36dp"
         android:layout_margin="8dp"
-        app:srcCompat="?attr/storage" />
+        app:srcCompat="@drawable/ic_storage" />
 
     <TextView
         android:id="@+id/textView1"
diff --git a/app/src/main/res/layout/videoplayer_activity.xml b/app/src/main/res/layout/videoplayer_activity.xml
index fc902602c..f5a163849 100644
--- a/app/src/main/res/layout/videoplayer_activity.xml
+++ b/app/src/main/res/layout/videoplayer_activity.xml
@@ -39,7 +39,7 @@
             android:layout_margin="8dp"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:contentDescription="@string/rewind_label"
-            app:srcCompat="@drawable/ic_av_fast_rewind_white_80dp" />
+            app:srcCompat="@drawable/ic_fast_rewind_video_white" />
 
         <de.danoeh.antennapod.view.PlayButton
             android:id="@+id/butPlay"
@@ -48,7 +48,7 @@
             android:layout_margin="8dp"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:contentDescription="@string/pause_label"
-            app:srcCompat="@drawable/ic_av_pause_white_80dp" />
+            app:srcCompat="@drawable/ic_pause_video_white" />
 
         <ImageButton
             android:id="@+id/butFF"
@@ -57,7 +57,7 @@
             android:layout_margin="8dp"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:contentDescription="@string/fast_forward_label"
-            app:srcCompat="@drawable/ic_av_fast_forward_white_80dp" />
+            app:srcCompat="@drawable/ic_fast_forward_video_white" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/menu/downloads.xml b/app/src/main/res/menu/downloads.xml
index c8ee20e35..142f251fc 100644
--- a/app/src/main/res/menu/downloads.xml
+++ b/app/src/main/res/menu/downloads.xml
@@ -5,14 +5,14 @@
         android:id="@+id/episode_actions"
         android:menuCategory="container"
         android:title="@string/multi_select"
-        android:icon="?attr/checkbox_multiple"
+        android:icon="@drawable/ic_check_multiple"
         android:visible="false"
         app:showAsAction="ifRoom" />
     <item
         android:id="@+id/clear_logs_item"
         android:menuCategory="container"
         android:title="@string/clear_history_label"
-        android:icon="?attr/ic_delete"
+        android:icon="@drawable/ic_delete"
         android:visible="false"
         app:showAsAction="ifRoom" />
     <item
@@ -20,5 +20,5 @@
         android:title="@string/refresh_label"
         android:menuCategory="container"
         app:showAsAction="ifRoom"
-        android:icon="?attr/navigation_refresh"/>
+        android:icon="@drawable/ic_refresh"/>
 </menu>
diff --git a/app/src/main/res/menu/episodes.xml b/app/src/main/res/menu/episodes.xml
index 2fac77375..22121c905 100644
--- a/app/src/main/res/menu/episodes.xml
+++ b/app/src/main/res/menu/episodes.xml
@@ -5,7 +5,7 @@
 
     <item
         android:id="@+id/action_search"
-        android:icon="?attr/action_search"
+        android:icon="@drawable/ic_search"
         custom:showAsAction="collapseActionView|always"
         custom:actionViewClass="androidx.appcompat.widget.SearchView"
         android:title="@string/search_label"/>
@@ -15,11 +15,11 @@
         android:title="@string/refresh_label"
         android:menuCategory="container"
         custom:showAsAction="always"
-        android:icon="?attr/navigation_refresh"/>
+        android:icon="@drawable/ic_refresh"/>
 
     <item
         android:id="@+id/filter_items"
-        android:icon="?attr/ic_filter"
+        android:icon="@drawable/ic_filter"
         android:menuCategory="container"
         android:title="@string/filter"
         android:visible="false"
@@ -31,7 +31,7 @@
         android:menuCategory="container"
         custom:showAsAction="collapseActionView"
         android:visible="false"
-        android:icon="?attr/navigation_accept"/>
+        android:icon="@drawable/ic_check"/>
 
     <item
         android:id="@+id/remove_all_new_flags_item"
@@ -39,6 +39,6 @@
         android:menuCategory="container"
         custom:showAsAction="collapseActionView"
         android:visible="false"
-        android:icon="?attr/navigation_accept"/>
+        android:icon="@drawable/ic_check"/>
 
 </menu>
diff --git a/app/src/main/res/menu/episodes_apply_action_options.xml b/app/src/main/res/menu/episodes_apply_action_options.xml
index 181300fc5..221ec4d59 100644
--- a/app/src/main/res/menu/episodes_apply_action_options.xml
+++ b/app/src/main/res/menu/episodes_apply_action_options.xml
@@ -4,7 +4,7 @@
 
     <item
         android:id="@+id/sort"
-        android:icon="?attr/ic_sort"
+        android:icon="@drawable/ic_sort"
         android:title="@string/sort"
         app:showAsAction="always">
         <menu>
@@ -25,7 +25,7 @@
 
     <item
         android:id="@+id/select_options"
-        android:icon="?attr/ic_filter"
+        android:icon="@drawable/ic_filter"
         android:title="@string/filter"
         app:showAsAction="always">
 
diff --git a/app/src/main/res/menu/episodes_apply_action_speeddial.xml b/app/src/main/res/menu/episodes_apply_action_speeddial.xml
index 370cedd90..a2f509ec5 100644
--- a/app/src/main/res/menu/episodes_apply_action_speeddial.xml
+++ b/app/src/main/res/menu/episodes_apply_action_speeddial.xml
@@ -6,29 +6,29 @@
          visually it will be shown at the bottom of the list of actions.
       -->
     <item android:id="@+id/delete_batch"
-        android:icon="?attr/ic_delete"
+        android:icon="@drawable/ic_delete"
         android:title="@string/delete_episode_label"
         />
     <item android:id="@+id/download_batch"
-        android:icon="?attr/av_download"
+        android:icon="@drawable/ic_download"
         android:title="@string/download_label"
         />
     <item android:id="@+id/mark_unread_batch"
-        android:icon="?attr/navigation_cancel"
+        android:icon="@drawable/ic_cancel"
         android:title="@string/mark_unread_label"
         />
     <item
         android:id="@+id/mark_read_batch"
-        android:icon="?attr/navigation_accept"
+        android:icon="@drawable/ic_check"
         android:title="@string/mark_read_label"
         />
     <item android:id="@+id/remove_from_queue_batch"
-        android:icon="?attr/content_remove_from_queue"
+        android:icon="@drawable/ic_remove"
         android:title="@string/remove_from_queue_label"
         />
     <item
         android:id="@+id/add_to_queue_batch"
-        android:icon="?attr/content_new"
+        android:icon="@drawable/ic_add"
         android:title="@string/add_to_queue_label"
         />
 </menu>
diff --git a/app/src/main/res/menu/feedinfo.xml b/app/src/main/res/menu/feedinfo.xml
index a5fbe0c20..83ad079b4 100644
--- a/app/src/main/res/menu/feedinfo.xml
+++ b/app/src/main/res/menu/feedinfo.xml
@@ -3,7 +3,7 @@
       xmlns:custom="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/visit_website_item"
-        android:icon="?attr/location_web_site"
+        android:icon="@drawable/ic_web"
         custom:showAsAction="ifRoom|collapseActionView"
         android:title="@string/visit_website_label"
         android:visible="true"/>
@@ -11,7 +11,7 @@
         android:id="@+id/share_parent"
         custom:showAsAction="ifRoom"
         android:title="@string/share_label_with_ellipses"
-        android:icon="?attr/ic_share"
+        android:icon="@drawable/ic_share"
         android:visible="true">
         <menu android:id="@+id/share_submenu">
             <item
diff --git a/app/src/main/res/menu/feeditem_options.xml b/app/src/main/res/menu/feeditem_options.xml
index c29229e37..5b33539e1 100644
--- a/app/src/main/res/menu/feeditem_options.xml
+++ b/app/src/main/res/menu/feeditem_options.xml
@@ -64,7 +64,7 @@
 
     <item
         android:id="@+id/visit_website_item"
-        android:icon="?attr/location_web_site"
+        android:icon="@drawable/ic_web"
         custom:showAsAction="ifRoom|collapseActionView"
         android:title="@string/visit_website_label">
     </item>
diff --git a/app/src/main/res/menu/feedlist.xml b/app/src/main/res/menu/feedlist.xml
index 3614cfffa..85e7a95ba 100644
--- a/app/src/main/res/menu/feedlist.xml
+++ b/app/src/main/res/menu/feedlist.xml
@@ -4,21 +4,21 @@
 
     <item
         android:id="@+id/sort_items"
-        android:icon="?attr/ic_sort"
+        android:icon="@drawable/ic_sort"
         android:menuCategory="container"
         android:title="@string/sort"
         custom:showAsAction="always">
     </item>
     <item
         android:id="@+id/filter_items"
-        android:icon="?attr/ic_filter"
+        android:icon="@drawable/ic_filter"
         android:menuCategory="container"
         android:title="@string/filter"
         custom:showAsAction="always">
     </item>
     <item
         android:id="@+id/refresh_item"
-        android:icon="?attr/navigation_refresh"
+        android:icon="@drawable/ic_refresh"
         android:menuCategory="container"
         android:title="@string/refresh_label"
         custom:showAsAction="always">
@@ -32,7 +32,7 @@
 
     <item
         android:id="@+id/action_search"
-        android:icon="?attr/action_search"
+        android:icon="@drawable/ic_search"
         custom:showAsAction="always|collapseActionView"
         custom:actionViewClass="androidx.appcompat.widget.SearchView"
         android:title="@string/search_label"/>
@@ -40,13 +40,13 @@
     <item
         android:id="@+id/episode_actions"
         android:menuCategory="container"
-        android:icon="?attr/checkbox_multiple"
+        android:icon="@drawable/ic_check_multiple"
         android:title="@string/multi_select"
         custom:showAsAction="collapseActionView">
     </item>
     <item
         android:id="@+id/visit_website_item"
-        android:icon="?attr/location_web_site"
+        android:icon="@drawable/ic_web"
         android:menuCategory="container"
         custom:showAsAction="collapseActionView"
         android:title="@string/visit_website_label"
@@ -79,7 +79,7 @@
 
     <item
         android:id="@+id/remove_item"
-        android:icon="?attr/ic_delete"
+        android:icon="@drawable/ic_delete"
         android:menuCategory="container"
         android:title="@string/remove_feed_label"
         android:visible="true"
diff --git a/app/src/main/res/menu/mediaplayer.xml b/app/src/main/res/menu/mediaplayer.xml
index 8afdba369..a9f15317b 100644
--- a/app/src/main/res/menu/mediaplayer.xml
+++ b/app/src/main/res/menu/mediaplayer.xml
@@ -4,40 +4,40 @@
 
     <item
         android:id="@+id/add_to_favorites_item"
-        android:icon="?attr/ic_fav"
+        android:icon="@drawable/ic_star_border"
         android:title="@string/add_to_favorite_label"
         custom:showAsAction="always">
     </item>
     <item
         android:id="@+id/remove_from_favorites_item"
-        android:icon="?attr/ic_unfav"
+        android:icon="@drawable/ic_star"
         android:title="@string/remove_from_favorite_label"
         custom:showAsAction="always">
     </item>
 
     <item
         android:id="@+id/disable_sleeptimer_item"
-        android:icon="?attr/ic_sleep_off"
+        android:icon="@drawable/ic_sleep_off"
         custom:showAsAction="always"
         android:title="@string/sleep_timer_label">
     </item>
     <item
         android:id="@+id/set_sleeptimer_item"
-        android:icon="?attr/ic_sleep"
+        android:icon="@drawable/ic_sleep"
         custom:showAsAction="always"
         android:title="@string/set_sleeptimer_label">
     </item>
 
     <item
         android:id="@+id/audio_controls"
-        android:icon="?attr/ic_sliders"
+        android:icon="@drawable/ic_sliders"
         android:title="@string/audio_controls"
         custom:showAsAction="always">
     </item>
 
     <item
         android:id="@+id/open_feed_item"
-        android:icon="?attr/feed"
+        android:icon="@drawable/ic_feed"
         custom:showAsAction="collapseActionView"
         android:title="@string/open_podcast"
         android:visible="false">
@@ -45,7 +45,7 @@
 
     <item
         android:id="@+id/visit_website_item"
-        android:icon="?attr/location_web_site"
+        android:icon="@drawable/ic_web"
         custom:showAsAction="collapseActionView"
         android:title="@string/visit_website_label"
         android:visible="false">
diff --git a/app/src/main/res/menu/online_search.xml b/app/src/main/res/menu/online_search.xml
index 93d93157a..374a054fa 100644
--- a/app/src/main/res/menu/online_search.xml
+++ b/app/src/main/res/menu/online_search.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:custom="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/action_search"
-        android:icon="?attr/action_search"
+        android:icon="@drawable/ic_search"
         custom:showAsAction="collapseActionView|ifRoom"
         custom:actionViewClass="androidx.appcompat.widget.SearchView"
         android:title="@string/search_label"/>
diff --git a/app/src/main/res/menu/opml_selection_options.xml b/app/src/main/res/menu/opml_selection_options.xml
index 8b3310dc2..1b7bc9331 100644
--- a/app/src/main/res/menu/opml_selection_options.xml
+++ b/app/src/main/res/menu/opml_selection_options.xml
@@ -4,14 +4,14 @@
 
     <item
         android:id="@id/select_all_item"
-        android:icon="?attr/ic_select_all"
+        android:icon="@drawable/ic_select_all"
         android:title="@string/select_all_label"
         custom:showAsAction="ifRoom">
     </item>
 
     <item
         android:id="@id/deselect_all_item"
-        android:icon="?attr/ic_select_none"
+        android:icon="@drawable/ic_select_none"
         android:title="@string/deselect_all_label"
         custom:showAsAction="ifRoom">
     </item>
diff --git a/app/src/main/res/menu/playback_history.xml b/app/src/main/res/menu/playback_history.xml
index 5362f0a25..f8cfd76b0 100644
--- a/app/src/main/res/menu/playback_history.xml
+++ b/app/src/main/res/menu/playback_history.xml
@@ -3,7 +3,7 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/clear_history_item"
-        android:icon="?attr/ic_delete"
+        android:icon="@drawable/ic_delete"
         android:title="@string/clear_history_label"
         app:showAsAction="ifRoom"/>
 </menu>
diff --git a/app/src/main/res/menu/queue.xml b/app/src/main/res/menu/queue.xml
index 43702e07f..adf44b8b1 100644
--- a/app/src/main/res/menu/queue.xml
+++ b/app/src/main/res/menu/queue.xml
@@ -14,11 +14,11 @@
         android:title="@string/refresh_label"
         android:menuCategory="container"
         custom:showAsAction="always"
-        android:icon="?attr/navigation_refresh"/>
+        android:icon="@drawable/ic_refresh"/>
 
     <item
         android:id="@+id/action_search"
-        android:icon="?attr/action_search"
+        android:icon="@drawable/ic_search"
         custom:showAsAction="collapseActionView|ifRoom"
         custom:actionViewClass="androidx.appcompat.widget.SearchView"
         android:title="@string/search_label"/>
@@ -114,7 +114,7 @@
         android:id="@+id/clear_queue"
         android:title="@string/clear_queue_label"
         custom:showAsAction="collapseActionView"
-        android:icon="?attr/navigation_accept"/>
+        android:icon="@drawable/ic_check"/>
 
     <item
         android:id="@+id/episode_actions"
diff --git a/app/src/main/res/menu/search.xml b/app/src/main/res/menu/search.xml
index d3a2477be..f6ef15516 100644
--- a/app/src/main/res/menu/search.xml
+++ b/app/src/main/res/menu/search.xml
@@ -4,7 +4,7 @@
         xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
             android:id="@+id/action_search"
-            android:icon="?attr/action_search"
+            android:icon="@drawable/ic_search"
             app:showAsAction="collapseActionView|always"
             app:actionViewClass="androidx.appcompat.widget.SearchView"
             android:title="@string/search_label"/>
diff --git a/app/src/main/res/menu/statistics.xml b/app/src/main/res/menu/statistics.xml
index eb2a51550..9e4b7fab1 100644
--- a/app/src/main/res/menu/statistics.xml
+++ b/app/src/main/res/menu/statistics.xml
@@ -10,7 +10,7 @@
 
     <item
         android:id="@+id/statistics_mode"
-        android:icon="?attr/ic_filter"
+        android:icon="@drawable/ic_filter"
         android:title="@string/statistics_mode"
         custom:showAsAction="never">
     </item>
diff --git a/app/src/main/res/menu/subscriptions.xml b/app/src/main/res/menu/subscriptions.xml
index 99acc4bb6..b1cc89eb6 100644
--- a/app/src/main/res/menu/subscriptions.xml
+++ b/app/src/main/res/menu/subscriptions.xml
@@ -7,7 +7,7 @@
             android:title="@string/refresh_label"
             android:menuCategory="container"
             custom:showAsAction="always"
-            android:icon="?attr/navigation_refresh"/>
+            android:icon="@drawable/ic_refresh"/>
 
 
     <item
diff --git a/app/src/main/res/xml/feed_settings.xml b/app/src/main/res/xml/feed_settings.xml
index 8a63ac8e9..457ff6e5b 100644
--- a/app/src/main/res/xml/feed_settings.xml
+++ b/app/src/main/res/xml/feed_settings.xml
@@ -5,7 +5,7 @@
 
     <SwitchPreferenceCompat
             android:key="keepUpdated"
-            android:icon="?attr/navigation_refresh"
+            android:icon="@drawable/ic_refresh"
             android:title="@string/keep_updated"
             android:summary="@string/keep_updated_summary"/>
 
@@ -13,38 +13,38 @@
             android:key="episodeNotification"
             android:defaultValue="false"
             android:dependency="keepUpdated"
-            android:icon="?attr/ic_notifications"
+            android:icon="@drawable/ic_notifications"
             android:title="@string/episode_notification"
             android:summary="@string/episode_notification_summary"/>
 
     <Preference
             android:key="authentication"
-            android:icon="?attr/ic_key"
+            android:icon="@drawable/ic_key"
             android:title="@string/authentication_label"
             android:summary="@string/authentication_descr"/>
 
     <Preference
             android:key="tags"
-            android:icon="?attr/ic_folder"
+            android:icon="@drawable/ic_folder"
             android:title="@string/feed_folders_label"
             android:summary="@string/feed_folders_summary"/>
 
     <ListPreference
             android:key="feedPlaybackSpeed"
-            android:icon="?attr/ic_settings_speed"
+            android:icon="@drawable/ic_playback_speed"
             android:title="@string/playback_speed"
             android:summary="@string/pref_feed_playback_speed_sum"/>
 
     <Preference
             android:key="feedAutoSkip"
-            android:icon="?attr/ic_settings_skip"
+            android:icon="@drawable/ic_skip_24dp"
             android:summary="@string/pref_feed_skip_sum"
             android:title="@string/pref_feed_skip" />
 
     <ListPreference
             android:entries="@array/spnAutoDeleteItems"
             android:entryValues="@array/spnAutoDeleteValues"
-            android:icon="?attr/ic_delete"
+            android:icon="@drawable/ic_delete"
             android:title="@string/auto_delete_label"
             android:summary="@string/feed_auto_download_global"
             android:key="autoDelete"/>
@@ -52,7 +52,7 @@
     <ListPreference
             android:entries="@array/spnVolumeReductionItems"
             android:entryValues="@array/spnVolumeReductionValues"
-            android:icon="?attr/ic_volume_adaption"
+            android:icon="@drawable/ic_volume_adaption"
             android:summary="@string/feed_volume_reduction_summary"
             android:title="@string/feed_volume_reduction"
             android:defaultValue="off"
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 8cf31a20f..523c7cd0f 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -13,41 +13,41 @@
             android:key="prefScreenInterface"
             android:title="@string/user_interface_label"
             android:summary="@string/user_interface_sum"
-            android:icon="?attr/ic_appearance" />
+            android:icon="@drawable/ic_appearance" />
 
     <Preference
             android:key="prefScreenPlayback"
             android:title="@string/playback_pref"
             android:summary="@string/playback_pref_sum"
-            android:icon="?attr/ic_settings_playback" />
+            android:icon="@drawable/ic_play_24dp" />
 
     <Preference
             android:key="prefScreenNetwork"
             android:title="@string/network_pref"
             android:summary="@string/network_pref_sum"
-            android:icon="?attr/ic_network" />
+            android:icon="@drawable/ic_network" />
 
     <Preference
             android:key="prefScreenGpodder"
             android:title="@string/synchronization_pref"
             android:summary="@string/synchronization_sum"
-            android:icon="?attr/ic_unfav" />
+            android:icon="@drawable/ic_star" />
 
     <Preference
             android:key="prefScreenStorage"
             android:title="@string/storage_pref"
             android:summary="@string/storage_sum"
-            android:icon="?attr/storage" />
+            android:icon="@drawable/ic_storage" />
 
     <Preference
             android:key="notifications"
             android:title="@string/notification_pref_fragment"
-            android:icon="?attr/ic_notifications"/>
+            android:icon="@drawable/ic_notifications"/>
 
     <Preference
             android:key="statistics"
             android:title="@string/statistics_label"
-            android:icon="?attr/statistics" />
+            android:icon="@drawable/ic_statistics" />
 
     <PreferenceCategory
             android:key="project"
@@ -55,22 +55,22 @@
         <Preference
             android:key="prefDocumentation"
             android:title="@string/documentation_support"
-            android:icon="?attr/ic_questionmark" />
+            android:icon="@drawable/ic_questionmark" />
         <Preference
             android:key="prefViewForum"
             android:title="@string/visit_user_forum"
-            android:icon="?attr/ic_chat" />
+            android:icon="@drawable/ic_chat" />
         <Preference
             android:key="prefContribute"
             android:title="@string/pref_contribute"
-            android:icon="?attr/ic_contribute" />
+            android:icon="@drawable/ic_contribute" />
         <Preference
             android:key="prefSendBugReport"
             android:title="@string/bug_report_title"
-            android:icon="?attr/ic_bug" />
+            android:icon="@drawable/ic_bug" />
         <Preference
             android:key="prefAbout"
             android:title="@string/about_pref"
-            android:icon="?attr/action_about" />
+            android:icon="@drawable/ic_info" />
     </PreferenceCategory>
 </PreferenceScreen>
diff --git a/app/src/main/res/xml/preferences_about.xml b/app/src/main/res/xml/preferences_about.xml
index f56b7f2ac..1312d5466 100644
--- a/app/src/main/res/xml/preferences_about.xml
+++ b/app/src/main/res/xml/preferences_about.xml
@@ -7,21 +7,21 @@
     <Preference
             android:key="about_version"
             android:title="@string/antennapod_version"
-            android:icon="?attr/ic_unfav"
+            android:icon="@drawable/ic_star"
             android:summary="1.7.2 (asd8qs)"/>
     <Preference
             android:key="about_contributors"
-            android:icon="?attr/ic_settings"
+            android:icon="@drawable/ic_settings"
             android:summary="@string/contributors_summary"
             android:title="@string/contributors"/>
     <Preference
             android:key="about_privacy_policy"
-            android:icon="?attr/ic_questionmark"
+            android:icon="@drawable/ic_questionmark"
             android:summary="www.antennapod.org/privacy"
             android:title="@string/privacy_policy"/>
     <Preference
             android:key="about_licenses"
-            android:icon="?attr/action_about"
+            android:icon="@drawable/ic_info"
             android:summary="@string/licenses_summary"
             android:title="@string/licenses"/>