1 files changed, 15 insertions, 5 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/view/ToolbarIconTintManager.java b/app/src/main/java/de/danoeh/antennapod/view/ToolbarIconTintManager.java
index dcf8ff20d..37d8db03e 100644
--- a/app/src/main/java/de/danoeh/antennapod/view/ToolbarIconTintManager.java
+++ b/app/src/main/java/de/danoeh/antennapod/view/ToolbarIconTintManager.java
@@ -1,7 +1,9 @@
 package de.danoeh.antennapod.view;
 
 import android.content.Context;
-import android.graphics.PorterDuff;
+import android.graphics.PorterDuff.Mode;
+import android.graphics.PorterDuffColorFilter;
+import android.graphics.drawable.Drawable;
 import android.view.ContextThemeWrapper;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.view.ViewCompat;
@@ -33,12 +35,20 @@ public abstract class ToolbarIconTintManager implements AppBarLayout.OnOffsetCha
     public void updateTint() {
         if (isTinted) {
             doTint(new ContextThemeWrapper(context, R.style.Theme_AntennaPod_Dark));
-            toolbar.getNavigationIcon().setColorFilter(0xffffffff, PorterDuff.Mode.SRC_ATOP);
-            toolbar.getOverflowIcon().setColorFilter(0xffffffff, PorterDuff.Mode.SRC_ATOP);
+            safeSetColorFilter(toolbar.getNavigationIcon(), new PorterDuffColorFilter(0xffffffff, Mode.SRC_ATOP));
+            safeSetColorFilter(toolbar.getOverflowIcon(), new PorterDuffColorFilter(0xffffffff, Mode.SRC_ATOP));
+            safeSetColorFilter(toolbar.getCollapseIcon(), new PorterDuffColorFilter(0xffffffff, Mode.SRC_ATOP));
         } else {
             doTint(context);
-            toolbar.getNavigationIcon().clearColorFilter();
-            toolbar.getOverflowIcon().clearColorFilter();
+            safeSetColorFilter(toolbar.getNavigationIcon(), null);
+            safeSetColorFilter(toolbar.getOverflowIcon(), null);
+            safeSetColorFilter(toolbar.getCollapseIcon(), null);
+        }
+    }
+
+    private void safeSetColorFilter(Drawable icon, PorterDuffColorFilter filter) {
+        if (icon != null) {
+            icon.setColorFilter(filter);
         }
     }