diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java
index ff7af70e8..142517e29 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java
@@ -125,6 +125,7 @@ public  class       ContributionsActivity
             if (mediaDetails != null && savedInstanceState.getBoolean("mediaDetailsVisible")) {
                 // Feels awful that we have to reset this manually!
                 getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+                getSupportActionBar().setDisplayShowCustomEnabled(true);
             }
         }
         requestAuthToken();
diff --git a/app/src/main/res/layout/theme_toggle_layout.xml b/app/src/main/res/layout/theme_toggle_layout.xml
new file mode 100644
index 000000000..70b18cec7
--- /dev/null
+++ b/app/src/main/res/layout/theme_toggle_layout.xml
@@ -0,0 +1,18 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
+    android:orientation="horizontal"
+    android:weightSum="3">
+    <TextView
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="2"/>
+    <ImageButton
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:src="?attr/toggleButtonIcon"
+        />
+</LinearLayout>
diff --git a/app/src/main/res/menu/fragment_contributions_list.xml b/app/src/main/res/menu/fragment_contributions_list.xml
index 20a08cedc..4324f5681 100644
--- a/app/src/main/res/menu/fragment_contributions_list.xml
+++ b/app/src/main/res/menu/fragment_contributions_list.xml
@@ -30,7 +30,7 @@
         />
     <item android:id="@+id/menu_theme_toggle"
         android:title="Night mode"
-        android:icon="?attr/toggleButtonIcon"
+        android:actionLayout="@layout/theme_toggle_layout"
         app:showAsAction="never"
         />
     <item android:id="@+id/menu_refresh"