diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index c23b0fe367..e00576b455 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -225,8 +225,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
             lp.width = (account < 0 || !collapsable ? 1 : level) * dp12;
             vwLevel.setLayoutParams(lp);
 
-            ivExpander.setImageResource(folder.collapsed
-                    ? R.drawable.baseline_expand_more_24 : R.drawable.baseline_expand_less_24);
+            ivExpander.setImageLevel(folder.collapsed ? 1 /* more */ : 0 /* less */);
             ivExpander.setVisibility(account < 0 || !collapsable ? View.GONE : (folder.childs > 0 ? View.VISIBLE : View.INVISIBLE));
 
             ivNotify.setVisibility(folder.notify ? View.VISIBLE : View.GONE);
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index a2675a694a..340ec35013 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -526,7 +526,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
             // Expander
             boolean expanded = (viewType == ViewType.THREAD && properties.getValue("expanded", message.id));
-            ivExpander.setImageResource(expanded ? R.drawable.baseline_expand_less_24 : R.drawable.baseline_expand_more_24);
+            ivExpander.setImageLevel(expanded ? 0 /* less */ : 1 /* more */);
             if (viewType == ViewType.THREAD && threading)
                 ivExpander.setVisibility(EntityFolder.DRAFTS.equals(message.folderType) ? View.INVISIBLE : View.VISIBLE);
             else
@@ -774,7 +774,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             vwBody.setVisibility(show_html ? View.INVISIBLE : View.GONE);
 
             // Addresses
-            ivExpanderAddress.setImageResource(show_addresses ? R.drawable.baseline_expand_less_24 : R.drawable.baseline_expand_more_24);
+            ivExpanderAddress.setImageLevel(show_addresses ? 0 /* less */ : 1 /* more */);
 
             String from = MessageHelper.formatAddresses(message.from);
             String to = MessageHelper.formatAddresses(message.to);
@@ -1287,7 +1287,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 boolean expanded = !properties.getValue("expanded", message.id);
                 properties.setValue("expanded", message.id, expanded);
 
-                ivExpander.setImageResource(expanded ? R.drawable.baseline_expand_less_24 : R.drawable.baseline_expand_more_24);
+                ivExpander.setImageLevel(expanded ? 0 /* less*/ : 1 /* more */);
 
                 if (expanded) {
                     bindExpanded(message);
diff --git a/app/src/main/res/drawable/expander.xml b/app/src/main/res/drawable/expander.xml
new file mode 100644
index 0000000000..50b0b78d8a
--- /dev/null
+++ b/app/src/main/res/drawable/expander.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<level-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:drawable="@drawable/baseline_expand_less_24"
+        android:maxLevel="0" />
+    <item
+        android:drawable="@drawable/baseline_expand_more_24"
+        android:maxLevel="1" />
+</level-list>
diff --git a/app/src/main/res/layout/item_folder.xml b/app/src/main/res/layout/item_folder.xml
index 4a6f515938..489095a7b0 100644
--- a/app/src/main/res/layout/item_folder.xml
+++ b/app/src/main/res/layout/item_folder.xml
@@ -47,7 +47,7 @@
             android:contentDescription="@string/title_legend_expander"
             android:paddingStart="12dp"
             android:paddingEnd="12dp"
-            android:src="@drawable/baseline_expand_less_24"
+            android:src="@drawable/expander"
             app:layout_constraintBottom_toBottomOf="@+id/paddingBottom"
             app:layout_constraintStart_toEndOf="@+id/vwLevel"
             app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/item_message_compact.xml b/app/src/main/res/layout/item_message_compact.xml
index 290ff97553..cac65417c9 100644
--- a/app/src/main/res/layout/item_message_compact.xml
+++ b/app/src/main/res/layout/item_message_compact.xml
@@ -39,7 +39,7 @@
             android:layout_marginStart="6dp"
             android:background="?android:attr/selectableItemBackgroundBorderless"
             android:contentDescription="@string/title_legend_expander"
-            android:src="@drawable/baseline_expand_less_24"
+            android:src="@drawable/expander"
             android:visibility="visible"
             app:layout_constraintBottom_toBottomOf="@+id/paddingBottom"
             app:layout_constraintStart_toEndOf="@id/vwColor"
@@ -339,7 +339,7 @@
             android:layout_marginEnd="6dp"
             android:background="?android:attr/selectableItemBackground"
             android:contentDescription="@string/title_legend_expander"
-            android:src="@drawable/baseline_expand_less_24"
+            android:src="@drawable/expander"
             android:visibility="visible"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/item_message_normal.xml b/app/src/main/res/layout/item_message_normal.xml
index ecc36ab1ae..3f2aa6f2a7 100644
--- a/app/src/main/res/layout/item_message_normal.xml
+++ b/app/src/main/res/layout/item_message_normal.xml
@@ -38,7 +38,7 @@
             android:layout_marginStart="6dp"
             android:background="?android:attr/selectableItemBackgroundBorderless"
             android:contentDescription="@string/title_legend_expander"
-            android:src="@drawable/baseline_expand_less_24"
+            android:src="@drawable/expander"
             android:visibility="visible"
             app:layout_constraintBottom_toBottomOf="@+id/paddingBottom"
             app:layout_constraintStart_toEndOf="@id/vwColor"
@@ -332,7 +332,7 @@
             android:layout_marginEnd="6dp"
             android:background="?android:attr/selectableItemBackground"
             android:contentDescription="@string/title_legend_expander"
-            android:src="@drawable/baseline_expand_less_24"
+            android:src="@drawable/expander"
             android:visibility="visible"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"