diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java
index c53cc70dcf..dd44c4603f 100644
--- a/app/src/main/java/eu/faircode/email/ActivitySetup.java
+++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java
@@ -39,6 +39,7 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ListView;
+import android.widget.RadioGroup;
 import android.widget.TextView;
 
 import com.google.android.material.snackbar.Snackbar;
@@ -148,11 +149,8 @@ public class ActivitySetup extends ActivityBilling implements FragmentManager.On
                     case R.string.title_setup_import:
                         onMenuImport();
                         break;
-                    case R.string.title_setup_light_theme:
-                    case R.string.title_setup_dark_theme:
-                    case R.string.title_setup_black_theme:
-                    case R.string.title_setup_system_theme:
-                        onMenuTheme(item.getMenuId());
+                    case R.string.title_setup_theme:
+                        onMenuTheme();
                         break;
                     case R.string.title_setup_notifications:
                         onManageNotifications();
@@ -194,17 +192,7 @@ public class ActivitySetup extends ActivityBilling implements FragmentManager.On
         if (getIntentNotifications(this).resolveActivity(pm) != null)
             items.add(new DrawerItem(-4, R.drawable.baseline_notifications_24, R.string.title_setup_notifications));
 
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-        String theme = prefs.getString("theme", "system");
-        if ("light".equals(theme))
-            items.add(new DrawerItem(-5, R.drawable.baseline_palette_24, R.string.title_setup_dark_theme));
-        else if ("dark".equals(theme))
-            items.add(new DrawerItem(-6, R.drawable.baseline_palette_24, R.string.title_setup_black_theme));
-        else if ("black".equals(theme))
-            items.add(new DrawerItem(-7, R.drawable.baseline_palette_24, R.string.title_setup_system_theme));
-        else
-            items.add(new DrawerItem(-8, R.drawable.baseline_palette_24, R.string.title_setup_light_theme));
-
+        items.add(new DrawerItem(-8, R.drawable.baseline_palette_24, R.string.title_setup_theme));
         items.add(new DrawerItem(-9, R.drawable.baseline_settings_applications_24, R.string.title_setup_advanced));
         items.add(new DrawerItem(-10, R.drawable.baseline_person_24, R.string.menu_contacts));
 
@@ -380,24 +368,50 @@ public class ActivitySetup extends ActivityBilling implements FragmentManager.On
                 .show();
     }
 
-    private void onMenuTheme(int id) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-        switch (id) {
-            case R.string.title_setup_light_theme:
-                prefs.edit().putString("theme", "light").apply();
+    private void onMenuTheme() {
+        View dview = LayoutInflater.from(this).inflate(R.layout.dialog_theme, null);
+        final RadioGroup rgTheme = dview.findViewById(R.id.rgTheme);
+
+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        String theme = prefs.getString("theme", null);
+
+        switch (theme) {
+            case "dark":
+                rgTheme.check(R.id.rbThemeDark);
                 break;
-            case R.string.title_setup_dark_theme:
-                prefs.edit().putString("theme", "dark").apply();
+            case "black":
+                rgTheme.check(R.id.rbThemeBlack);
                 break;
-            case R.string.title_setup_black_theme:
-                prefs.edit().putString("theme", "black").apply();
-                break;
-            case R.string.title_setup_system_theme:
-                prefs.edit().putString("theme", "system").apply();
+            case "system":
+                rgTheme.check(R.id.rbThemeSystem);
                 break;
+            default:
+                rgTheme.check(R.id.rbThemeLight);
         }
 
-        ContactInfo.clearCache();
+        rgTheme.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(RadioGroup group, int checkedId) {
+                switch (checkedId) {
+                    case R.id.rbThemeLight:
+                        prefs.edit().putString("theme", "light").apply();
+                        break;
+                    case R.id.rbThemeDark:
+                        prefs.edit().putString("theme", "dark").apply();
+                        break;
+                    case R.id.rbThemeBlack:
+                        prefs.edit().putString("theme", "black").apply();
+                        break;
+                    case R.id.rbThemeSystem:
+                        prefs.edit().putString("theme", "system").apply();
+                        break;
+                }
+            }
+        });
+
+        new DialogBuilderLifecycle(this, this)
+                .setView(dview)
+                .show();
     }
 
     private void onMenuOptions() {
diff --git a/app/src/main/res/layout/dialog_theme.xml b/app/src/main/res/layout/dialog_theme.xml
new file mode 100644
index 0000000000..189f39a80a
--- /dev/null
+++ b/app/src/main/res/layout/dialog_theme.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="12dp">
+
+    <RadioGroup xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/rgTheme"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <RadioButton
+            android:id="@+id/rbThemeLight"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/title_setup_light_theme"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+
+        <RadioButton
+            android:id="@+id/rbThemeDark"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="@string/title_setup_dark_theme"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+
+        <RadioButton
+            android:id="@+id/rbThemeBlack"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="@string/title_setup_black_theme"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+
+        <RadioButton
+            android:id="@+id/rbThemeSystem"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="@string/title_setup_system_theme"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+    </RadioGroup>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c277179ac9..22dd220814 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -138,6 +138,7 @@
     <string name="title_setup_notifications">Manage notifications</string>
     <string name="title_setup_to_do">To do</string>
     <string name="title_setup_done">Done</string>
+    <string name="title_setup_theme">Select theme</string>
     <string name="title_setup_light_theme">Light theme</string>
     <string name="title_setup_dark_theme">Dark theme</string>
     <string name="title_setup_black_theme">Black theme</string>