diff --git a/app/src/main/java/de/danoeh/antennapod/view/RecursiveRadioGroup.java b/app/src/main/java/de/danoeh/antennapod/view/RecursiveRadioGroup.java
index 162f524bf..ee5e7c51d 100644
--- a/app/src/main/java/de/danoeh/antennapod/view/RecursiveRadioGroup.java
+++ b/app/src/main/java/de/danoeh/antennapod/view/RecursiveRadioGroup.java
@@ -2,7 +2,6 @@ package de.danoeh.antennapod.view;
import android.content.Context;
import android.util.AttributeSet;
-import android.view.ActionMode;
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
diff --git a/app/src/main/res/layout/filter_dialog_row.xml b/app/src/main/res/layout/filter_dialog_row.xml
index bf90e17e0..ef0ceb9a4 100644
--- a/app/src/main/res/layout/filter_dialog_row.xml
+++ b/app/src/main/res/layout/filter_dialog_row.xml
@@ -25,8 +25,8 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
- android:background="@color/filter_dialog_button_background_light"
- android:textColor="@color/filter_dialog_button_text_light"
+ android:background="@drawable/filter_dialog_button_background_light"
+ android:textColor="@drawable/filter_dialog_button_text_light"
android:button="@android:color/transparent"
android:layout_marginRight="2dp"
android:layout_marginEnd="2dp"
@@ -40,8 +40,8 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
- android:background="@color/filter_dialog_button_background_light"
- android:textColor="@color/filter_dialog_button_text_light"
+ android:background="@drawable/filter_dialog_button_background_light"
+ android:textColor="@drawable/filter_dialog_button_text_light"
android:button="@android:color/transparent"
android:checked="false"
android:foreground="?attr/selectableItemBackground"
@@ -54,7 +54,7 @@
android:id="@+id/filter_dialog_clear"
android:layout_width="48dp"
android:layout_height="48dp"
- android:background="@drawable/ic_filter_close_light"
+ android:background="@drawable/filter_dialog_button_clear"
android:button="@android:color/transparent"
android:foreground="?attr/selectableItemBackground"
android:tag=""
diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItemFilterGroup.java b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItemFilterGroup.java
index 7a0eac2e3..45f22ef00 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItemFilterGroup.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItemFilterGroup.java
@@ -6,10 +6,10 @@ public enum FeedItemFilterGroup {
PLAYED(new ItemProperties(R.string.hide_played_episodes_label, "played"),
new ItemProperties(R.string.not_played, "unplayed")),
PAUSED(new ItemProperties(R.string.hide_paused_episodes_label, "paused"),
- new ItemProperties(R.string.not_paused, "")),
+ new ItemProperties(R.string.not_paused, "_no_id_not_paused")),
FAVORITE(new ItemProperties(R.string.hide_is_favorite_label, "is_favorite"),
- new ItemProperties(R.string.not_favorite, "")),
- MEDIA(new ItemProperties(R.string.has_media, ""),
+ new ItemProperties(R.string.not_favorite, "_no_id_not_favorite")),
+ MEDIA(new ItemProperties(R.string.has_media, "_no_id_no_media"),
new ItemProperties(R.string.no_media, "no_media")),
QUEUED(new ItemProperties(R.string.queued_label, "queued"),
new ItemProperties(R.string.not_queued_label, "not_queued")),
diff --git a/core/src/main/res/color/filter_dialog_button_background_light.xml b/core/src/main/res/color/filter_dialog_button_background_light.xml
deleted file mode 100644
index c6dd0d6cb..000000000
--- a/core/src/main/res/color/filter_dialog_button_background_light.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/core/src/main/res/color/filter_dialog_button_clear.xml b/core/src/main/res/color/filter_dialog_button_clear.xml
deleted file mode 100644
index 1ef3e3e57..000000000
--- a/core/src/main/res/color/filter_dialog_button_clear.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/core/src/main/res/drawable/filter_dialog_button_background_light.xml b/core/src/main/res/drawable/filter_dialog_button_background_light.xml
new file mode 100644
index 000000000..c3a1b385e
--- /dev/null
+++ b/core/src/main/res/drawable/filter_dialog_button_background_light.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/core/src/main/res/drawable/filter_dialog_button_clear.xml b/core/src/main/res/drawable/filter_dialog_button_clear.xml
new file mode 100644
index 000000000..33e3888b9
--- /dev/null
+++ b/core/src/main/res/drawable/filter_dialog_button_clear.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/core/src/main/res/color/filter_dialog_button_text_light.xml b/core/src/main/res/drawable/filter_dialog_button_text_light.xml
similarity index 64%
rename from core/src/main/res/color/filter_dialog_button_text_light.xml
rename to core/src/main/res/drawable/filter_dialog_button_text_light.xml
index 0a5388eb9..4d75670b7 100644
--- a/core/src/main/res/color/filter_dialog_button_text_light.xml
+++ b/core/src/main/res/drawable/filter_dialog_button_text_light.xml
@@ -1,5 +1,5 @@
-
+
-
+
\ No newline at end of file
diff --git a/core/src/main/res/drawable/ic_filter_close_dark.xml b/core/src/main/res/drawable/ic_filter_close_dark.xml
new file mode 100644
index 000000000..b25b42df3
--- /dev/null
+++ b/core/src/main/res/drawable/ic_filter_close_dark.xml
@@ -0,0 +1,56 @@
+
+
+
+ -
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/core/src/main/res/drawable/ic_filter_close_light.xml b/core/src/main/res/drawable/ic_filter_close_light.xml
index 1d695cd0f..003b82834 100644
--- a/core/src/main/res/drawable/ic_filter_close_light.xml
+++ b/core/src/main/res/drawable/ic_filter_close_light.xml
@@ -10,7 +10,7 @@
+ android:color="@color/master_switch_background_light" />
@@ -28,7 +28,7 @@
+ android:color="@color/master_switch_background_light" />
@@ -46,8 +46,9 @@
+ android:color="@color/master_switch_background_light" />
+