diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
index 9b81c6c7a..ed858dad8 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
@@ -1424,7 +1424,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
         if (actionBar == null) {
             return;
         }
-        actionBar.setHomeAsUpIndicator(R.drawable.ic_arrow_back_24dp);
+        actionBar.setHomeAsUpIndicator(0);
         final FragmentManager fragmentManager = getFragmentManager();
         final Fragment mainFragment = fragmentManager.findFragmentById(R.id.main_fragment);
         if (mainFragment instanceof ConversationFragment conversationFragment) {
diff --git a/src/main/res/values-night/themes.xml b/src/main/res/values-night/themes.xml
index e67701045..55469713f 100644
--- a/src/main/res/values-night/themes.xml
+++ b/src/main/res/values-night/themes.xml
@@ -28,6 +28,7 @@
         <item name="colorOnSurfaceInverse">@color/md_theme_dark_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/md_theme_dark_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/md_theme_dark_inversePrimary</item>
+        <item name="homeAsUpIndicator">@drawable/ic_arrow_back_24dp</item>
 
         <item name="ic_chat_unselected" type="reference">@drawable/outline_chat_white_24</item>
         <item name="ic_chat_selected" type="reference">@drawable/chat_selected_white_24</item>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index ff078688c..bc28e3280 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -52,6 +52,7 @@
         <item name="colorPrimaryInverse">@color/md_theme_light_inversePrimary</item>
         <item name="materialDrawerStyle">@style/Widget.MaterialDrawerStyle</item>
         <item name="materialDrawerHeaderStyle">@style/Widget.MaterialDrawerHeaderStyle</item>
+        <item name="homeAsUpIndicator">@drawable/ic_arrow_back_24dp</item>
 
         <item name="ic_chat_unselected" type="reference">@drawable/outline_chat_black_24</item>
         <item name="ic_chat_selected" type="reference">@drawable/chat_selected_black_24</item>
@@ -67,5 +68,4 @@
         tools:ignore="ResourceCycle">
         <item name="widgetLayout">@layout/material_switch</item>
     </style>
-
 </resources>