diff --git a/app/src/main/java/org/tasks/activities/PlaceSettingsActivity.kt b/app/src/main/java/org/tasks/activities/PlaceSettingsActivity.kt
index 33976cf6d..076cbf219 100644
--- a/app/src/main/java/org/tasks/activities/PlaceSettingsActivity.kt
+++ b/app/src/main/java/org/tasks/activities/PlaceSettingsActivity.kt
@@ -7,6 +7,7 @@ import android.view.ViewGroup
 import android.view.ViewGroup.LayoutParams.MATCH_PARENT
 import android.widget.LinearLayout
 import androidx.activity.compose.setContent
+import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -90,9 +91,6 @@ class PlaceSettingsActivity : BaseListSettingsActivity(),
 
         sliderPos.floatValue = (place.radius / STEP * STEP).toFloat()
 
-        val dark = preferences.mapTheme == 2
-                || preferences.mapTheme == 0 && tasksTheme.themeBase.isDarkTheme(this)
-
         updateTheme()
 
         setContent {
@@ -132,7 +130,7 @@ class PlaceSettingsActivity : BaseListSettingsActivity(),
                             disabledInactiveTickColor = colorResource(id = R.color.text_tertiary)
                         )
                     )
-
+                    val dark = isSystemInDarkTheme()
                     AndroidView(
                         factory = { ctx ->
                             viewHolder = LinearLayout(ctx).apply {
diff --git a/app/src/main/java/org/tasks/location/LocationPickerActivity.kt b/app/src/main/java/org/tasks/location/LocationPickerActivity.kt
index 75bfb3d44..4cd5f8b33 100644
--- a/app/src/main/java/org/tasks/location/LocationPickerActivity.kt
+++ b/app/src/main/java/org/tasks/location/LocationPickerActivity.kt
@@ -125,8 +125,7 @@ class LocationPickerActivity : AppCompatActivity(), Toolbar.OnMenuItemClickListe
         toolbar.setOnMenuItemClickListener(this)
         val themeColor = theme.themeColor
         themeColor.applyToNavigationBar(this)
-        val dark = preferences.mapTheme == 2
-                || preferences.mapTheme == 0 && theme.themeBase.isDarkTheme(this)
+        val dark = theme.themeBase.isDarkTheme(this)
         map.init(this, this, dark)
         val params = appBarLayout.layoutParams as CoordinatorLayout.LayoutParams
         val behavior = AppBarLayout.Behavior()
diff --git a/app/src/main/java/org/tasks/preferences/Preferences.kt b/app/src/main/java/org/tasks/preferences/Preferences.kt
index 7664e245f..4b51a47a5 100644
--- a/app/src/main/java/org/tasks/preferences/Preferences.kt
+++ b/app/src/main/java/org/tasks/preferences/Preferences.kt
@@ -228,9 +228,6 @@ class Preferences @JvmOverloads constructor(
     val fontSize: Int
         get() = getInt(R.string.p_fontSize, 16)
 
-    val mapTheme: Int
-        get() = getIntegerFromString(R.string.p_map_theme, 0)
-
     fun getIntegerFromString(keyResource: Int, defaultValue: Int): Int =
         getIntegerFromString(context.getString(keyResource), defaultValue)
 
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index a27f995ab..1d125c172 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -486,7 +486,6 @@
     <string name="picker_mode_time">وضع منتقي الوقت</string>
     <string name="picker_mode_date">وضع منتقي التاريخ</string>
     <string name="remove_user_confirmation">%1$s لا يملك حق الوصول ل%2$s</string>
-    <string name="map_theme_use_app_theme">استخدم ثيم التطبيق</string>
     <string name="account_not_included">غير مشمول في اشتراكات \"ضع سعرك\"</string>
     <string name="app_password_save">استخدم بيانات الاعتماد هذه لتكوين تطبيق تابع لجهة خارجية. يمنحون حق الوصول الكامل إلى حساب Tasks.org الخاص بك ، ولا تكتبها بالاسفل أو تشاركها مع أي شخص!</string>
     <string name="app_passwords_more_info">قم بمزامنة المهام والتقويمات الخاصة بك مع تطبيقات سطح المكتب والأجهزة المحمولة التابعة لجهات خارجية. اضغط هنا لمزيد من المعلومات</string>
@@ -549,7 +548,6 @@
     <string name="clear_completed_tasks_confirmation">أزل المهام المتممة؟</string>
     <string name="hardware_support_required">مطلوب دعم الأجهزة</string>
     <string name="restart_required">أعد تشغيل التطبيق ليأخذ هذا التغيير تأثيره</string>
-    <string name="map_theme">قالب الخارطة</string>
     <string name="opacity_footer">عتمة التذييل</string>
     <string name="opacity_header">عتمة العنوان</string>
     <string name="opacity_row">عتمة الصف</string>
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index 6008572f8..20d91a130 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -528,7 +528,6 @@
     <string name="local_lists">Местни списъци</string>
     <string name="background_location_permission_required">Tasks събира данни за местоположението, за да прави напомняния на тази основа, дори и когато приложението е затворено или не се използва.</string>
     <string name="when_started">При започване</string>
-    <string name="map_theme">Тема на картата</string>
     <string name="wearable_notifications_summary">Показване на известия на носимото устройство</string>
     <string name="color_wheel">Цветно колело</string>
     <string name="notification_troubleshooting_summary">Докоснете тук, ако имате проблеми с известията</string>
@@ -654,7 +653,6 @@
     <string name="hint_customize_edit_body">Можете да настроите екрана като подреждате или премахвате полета</string>
     <string name="account_not_included">Не е включено в абонамента „Посочете своя цена“</string>
     <string name="upgrade_desktop_access_description">Синхронизиране с клиенти като Outlook и Apple Reminders</string>
-    <string name="map_theme_use_app_theme">С темата на приложението</string>
     <string name="app_password_enter_description">Дайте име на паролата (по избор)</string>
     <string name="android_auto_backup_device_summary">Трябва да изберете услуга за резервни копия в настройките на устройството. Не всички устройства предлагат такава услуга.</string>
     <string name="copied_to_clipboard">%s копирано в междинната памет</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 12c1a917d..8d57d8e7e 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -493,7 +493,6 @@
     <string name="theme_black">Negre</string>
     <string name="hardware_support_required">Es requereix suport per al maquinari</string>
     <string name="widget_settings">Preferències del giny</string>
-    <string name="map_theme">Mapa del tema</string>
     <string name="color">Color</string>
     <string name="icon">Icona</string>
     <string name="theme_dark">Fosc</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 8952b7083..04b2d710d 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -528,7 +528,6 @@
     <string name="email">E-mail</string>
     <string name="location_arrived">Příchod v %s</string>
     <string name="subscription">Předplatné</string>
-    <string name="map_theme">Vzhled mapy</string>
     <string name="next_saturday">Příští sobota</string>
     <string name="next_friday">Příští pátek</string>
     <string name="next_thursday">Příští čtvrtek</string>
@@ -563,7 +562,6 @@
     <string name="chip_appearance">Vzhled známek</string>
     <string name="chips">Známky</string>
     <string name="your_subscription_expired">Platnost vašeho předplatného skončila. Pokud chcete službu dále využívat, obnovte ho.</string>
-    <string name="map_theme_use_app_theme">Stejný vzhled jako aplikace</string>
     <string name="account_not_included">Nezahrnuto v předplatném typu „Zaplaťte kolik chcete“</string>
     <string name="tasks_org_account_required">Je vyžadován účet na Tasks.org</string>
     <string name="tasks_org_account">Účet na Tasks.org</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index adf64ce8c..ec735063e 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -586,7 +586,6 @@
     <string name="remove_user_confirmation">%1$s har ikke længere adgang til %2$s</string>
     <string name="remove_user">Fjern bruger\?</string>
     <string name="list_members">Liste over medlemmer</string>
-    <string name="map_theme_use_app_theme">Brug app-tema</string>
     <string name="tasks_org_account_required">Tasks.org konto kræves</string>
     <string name="privacy">Privatliv</string>
     <string name="open_source">Åben kildekode</string>
@@ -606,7 +605,6 @@
     <string name="tasks_org_description">Synkroniser dine opgaver med Tasks.org</string>
     <string name="background_location_permission_required">Opgaver indsamler placeringsdata for at muliggøre placeringsbaserede påmindelser, selv når appen er lukket eller ikke er i brug.</string>
     <string name="subscription">Abonnement</string>
-    <string name="map_theme">Korttema</string>
     <string name="default_recurrence">Standard gentagelse</string>
     <string name="default_tags">Standard-tags</string>
     <string name="filter_criteria_unstarted">Ikke påbegyndt</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index f620930b4..9a68f4d59 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -589,8 +589,6 @@
     <string name="support">Support</string>
     <string name="social">Sozial</string>
     <string name="follow_twitter">Folgen Sie @tasks_org</string>
-    <string name="map_theme">Kartendesign</string>
-    <string name="map_theme_use_app_theme">Anwendungsthema nutzen</string>
     <string name="tasks_org_account_required">Tasks.org-Konto erforderlich</string>
     <string name="invite_awaiting_response">Einladung wartet auf Antwort</string>
     <string name="remove_user_confirmation">%1$s wird keinen Zugriff mehr auf %2$s haben</string>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index 2349b91df..302136b1e 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -596,7 +596,6 @@
     <string name="automatic_backups">Aŭtomata savkopio</string>
     <string name="android_auto_backup">Savkopia Servo de Android</string>
     <string name="last_backup">Lasta savkopio: %s</string>
-    <string name="map_theme">Mapa etoso</string>
     <string name="TPl_notification">Tempumiloj Aktivaj por %s!</string>
     <string name="alarm_before_due">%s antaŭ limdato</string>
     <string name="no_app_found">Neniu programeto povis pritrakti ĉi tiun peton</string>
@@ -628,7 +627,6 @@
     <string name="remove_user_confirmation">%1$s ne plu povos atingi %2$s</string>
     <string name="share_list">Komunigi liston</string>
     <string name="not_signed_in">Ne ensalutinte</string>
-    <string name="map_theme_use_app_theme">Uzi etoson de programeto</string>
     <string name="widget_id">Fenestraĵa ID: %d</string>
     <string name="sort_start_group">Komenci %s</string>
     <string name="open_last_viewed_list">Malfermi liston de laste rigardita</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 41dc97b06..b40b8ef7c 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -605,9 +605,7 @@
     <string name="tasks_org_account">Cuenta de Tasks.org</string>
     <string name="subscription">Suscripción</string>
     <string name="widget_show_title">Mostrar título</string>
-    <string name="map_theme_use_app_theme">Utilizar el tema de la aplicación</string>
     <string name="tasks_org_account_required">Se requiere una cuenta de Tasks.org</string>
-    <string name="map_theme">Tema del mapa</string>
     <string name="privacy">Privacidad</string>
     <string name="open_source">Código abierto</string>
     <string name="issue_tracker">Seguimiento de problemas</string>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index 0b27196c8..8cf624beb 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -314,7 +314,6 @@
     <string name="randomly">Juhuslikult</string>
     <string name="show_unstarted">Näita alustamata</string>
     <string name="icon">Ikoon</string>
-    <string name="map_theme">Kaardi teema</string>
     <string name="theme_dynamic">Dünaamiline</string>
     <string name="theme_system_default">Süsteemi vaikeseade</string>
     <string name="repeats_yearly">iga aasta</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index a61133571..9df77b648 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -586,9 +586,7 @@
     <string name="CFC_startBefore_text">Hasiera: \?</string>
     <string name="default_due_date">Lehenetsitako epemuga data</string>
     <string name="default_start_date">Lehenetsitako hasiera data</string>
-    <string name="map_theme_use_app_theme">Aplikazioaren gaia erabili</string>
     <string name="tasks_org_account_required">Tasks.org kontua behar da</string>
-    <string name="map_theme">Maparen gaia</string>
     <string name="privacy">Pribatutasuna</string>
     <string name="open_source">Kode irekia</string>
     <string name="issue_tracker">Gorabeheren arakatzailea</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index b41ad802f..5b85e9645 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -528,7 +528,6 @@
     <string name="remove_user_confirmation">%1$s ei enää pääse %2$s:een</string>
     <string name="remove_user">Poista käyttäjä\?</string>
     <string name="list_members">Luettelo jäsenistä</string>
-    <string name="map_theme_use_app_theme">Käytä sovelluksen teemaa</string>
     <string name="account_not_included">Ei sisälly \"Nimeä hintasi\" -tilauksiin</string>
     <string name="tasks_org_account_required">Tarvitaan Tasks.org-tili</string>
     <string name="tasks_org_account">Tasks.org-tili</string>
@@ -586,7 +585,6 @@
     <string name="subscription">Tilaus</string>
     <string name="caldav_home_set_not_found">Kotijoukkoa ei löytynyt</string>
     <string name="repeat_monthly_fifth_week">viides</string>
-    <string name="map_theme">Kartta-teema</string>
     <string name="default_recurrence">Oletusarvoinen toistuvuus</string>
     <string name="default_tags">Oletustunnisteet</string>
     <string name="no_app_found">Yksikään sovellus ei pysty käsittelemään tätä pyyntöä</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 3d30e4360..fa1bff9c1 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -605,8 +605,6 @@
     <string name="tasks_org_account">Compte « Tasks.org »</string>
     <string name="subscription">Abonnement</string>
     <string name="widget_show_title">Afficher le titre</string>
-    <string name="map_theme">Thème de la carte</string>
-    <string name="map_theme_use_app_theme">Utiliser le thème de l’application</string>
     <string name="tasks_org_account_required">Compte « Tasks.org » requis</string>
     <string name="privacy">Confidentialité</string>
     <string name="open_source">Code source ouvert</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 54ccbc153..37630f46d 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -405,7 +405,6 @@
     <string name="account">Conta</string>
     <string name="custom_filter_has_subtask">Ten subtarefas</string>
     <string name="tasks_org_account_required">Precísase de conta en Tasks.org</string>
-    <string name="map_theme_use_app_theme">Empregar estilo de aplicativo</string>
     <string name="remove_user">Borrar usuario\?</string>
     <string name="share_list">Compartir lista</string>
     <string name="invite_invalid">Convite non válido</string>
@@ -478,7 +477,6 @@
     <string name="url_required">Precísase a URL</string>
     <string name="opacity_row">Opacidade da fila</string>
     <string name="opacity_footer">Opacidade do rodapé</string>
-    <string name="map_theme">Estilo de mapa</string>
     <string name="launcher_icon">Icona de escritorio</string>
     <string name="theme_system_default">Predefinido do sistema</string>
     <string name="repeats_single_number_of_times">Repetir %1$s, ocorre que %2$d %3$s</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 8e11db6d0..c28e76293 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -183,7 +183,6 @@
     <string name="remove_user_confirmation">%1$s više neće moći pristup na %2$s</string>
     <string name="remove_user">Ukloniti korisnika\?</string>
     <string name="list_members">Članovi popisa</string>
-    <string name="map_theme_use_app_theme">Koristi temu programa</string>
     <string name="account_not_included">Nije uključeno s pretplatama „Odredi tvoju cijenu”</string>
     <string name="tasks_org_account_required">Tasks.org račun je obavezan</string>
     <string name="tasks_org_account">Tasks.org račun</string>
@@ -352,7 +351,6 @@
     <string name="accent">Isticanje</string>
     <string name="icon">Ikona</string>
     <string name="color">Boja</string>
-    <string name="map_theme">Tema karte</string>
     <string name="theme">Tema</string>
     <string name="opacity_footer">Neprozirnost podnožja</string>
     <string name="opacity_row">Neprozirnost redaka</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index a404b9cf3..4702027ce 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -583,9 +583,7 @@
     <string name="default_start_date">Alapértelmezett kezdő dátum</string>
     <string name="SSD_sort_start">Kezdés dátuma szerint</string>
     <string name="widget_show_title">Cím megjelenítése</string>
-    <string name="map_theme_use_app_theme">Alkalmazás témájának használata</string>
     <string name="tasks_org_account_required">Tasks.org fiók szükséges</string>
-    <string name="map_theme">Térkép téma</string>
     <string name="privacy">Adatvédelem</string>
     <string name="open_source">Nyílt forráskódú</string>
     <string name="issue_tracker">Hibakövető</string>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index c7d8fbcf0..8a94ee58d 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -569,9 +569,7 @@
     <string name="default_start_date">Tanggal mulai bawaan</string>
     <string name="always_display_full_date">Tampilkan tanggal penuh</string>
     <string name="widget_show_title">Tampilkan judul</string>
-    <string name="map_theme_use_app_theme">Gunakan Tema Aplikasi</string>
     <string name="tasks_org_account_required">Akun Tasks.org Dibutuhkan</string>
-    <string name="map_theme">Tema Peta</string>
     <string name="privacy">Privasi</string>
     <string name="open_source">Sumber Terbuka</string>
     <string name="issue_tracker">Pelacak isu</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 117140341..f98ab534c 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -607,12 +607,10 @@
     <string name="remove_user_confirmation">%1$s non avrà più accesso a %2$s</string>
     <string name="remove_user">Vuoi rimuovere l\'utente\?</string>
     <string name="invite">Invita</string>
-    <string name="map_theme">Tema della mappa</string>
     <string name="invite_invalid">Invito non valido</string>
     <string name="invite_awaiting_response">Invito in attesa di risposta</string>
     <string name="invite_declined">Invito rifiutato</string>
     <string name="email">E-mail</string>
-    <string name="map_theme_use_app_theme">Usa il tema dell\'app</string>
     <string name="support">Supporto</string>
     <string name="more_options">Altre opzioni</string>
     <string name="tasks_org_account_required">È richiesto un account Tasks.org</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index d5eebcbfb..a794b052e 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -635,7 +635,6 @@
     <string name="remove_user_confirmation">%1$s לא תהיה עוד גישה אל %2$s</string>
     <string name="remove_user">האם להסיר משתמש\?</string>
     <string name="list_members">פרט חברים</string>
-    <string name="map_theme_use_app_theme">שימוש בערכת נושא של אפליקציה</string>
     <string name="account_not_included">לא כלול במנויי \'תן שם למחיר שלך\'</string>
     <string name="tasks_org_account_required">Tasks.org נדרש חשבון</string>
     <string name="tasks_org_account">חשבון Tasks.org</string>
@@ -650,7 +649,6 @@
     <string name="sort_start_group">התחל %s</string>
     <string name="tasks_org_description">סנכרן את המשימות שלך עם Tasks.org</string>
     <string name="subscription">מנוי</string>
-    <string name="map_theme">נושא המפה</string>
     <string name="show_unstarted">הצג לא התחיל</string>
     <string name="widget_show_title">הצג כותרת</string>
     <string name="next_saturday">בשבת הבאה</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 395703265..c0bda512d 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -415,7 +415,6 @@
     <string name="opacity_row">行の透明度</string>
     <string name="opacity_footer">フッターの透明度</string>
     <string name="opacity_header">ヘッダーの透明度</string>
-    <string name="map_theme">地図のテーマ</string>
     <string name="default_tags">デフォルトのタグ</string>
     <string name="menu_discard_changes">変更を破棄</string>
     <string name="date_shortcut_tomorrow_night">明日の夜</string>
@@ -584,7 +583,6 @@
     <string name="tasks_org_account_required">Tasks.org のアカウントが必要です</string>
     <string name="account_not_included">「価格はあなた次第」でのサブスクリプションには含まれていません</string>
     <string name="list_members">リストメンバー</string>
-    <string name="map_theme_use_app_theme">アプリのテーマを使用</string>
     <string name="picker_mode_text">文字</string>
     <string name="picker_mode_time">時間選択の方法</string>
     <string name="remove_user_confirmation">%1$s は %2$s にアクセスできなくなります</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index bf076474b..5e1e6de59 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -592,7 +592,6 @@
     <string name="share_list">목록 공유</string>
     <string name="remove_user_confirmation">%1$s는 이제 %2$s에 접근할 수 없습니다</string>
     <string name="remove_user">사용자를 삭제할까요\?</string>
-    <string name="map_theme_use_app_theme">앱 테마 사용</string>
     <string name="tasks_org_account_required">Tasks.org 계정 필요</string>
     <string name="tasks_org_account">Tasks.org 계정</string>
     <string name="copied_to_clipboard">클립보드로 %s 건 복사</string>
@@ -616,7 +615,6 @@
     <string name="decsync_selection_description">파일 기반 동기화</string>
     <string name="tasks_org_description">Tasks.org에 할일 동기화</string>
     <string name="subscription">구독</string>
-    <string name="map_theme">지도 테마</string>
     <string name="filter_criteria_unstarted">시작하지 않음</string>
     <string name="widget_show_title">제목 표시</string>
     <string name="next_saturday">다음 토요일</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index ef174cb04..33d1b9fb4 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -465,7 +465,6 @@
     <string name="preferences_advanced">Išplėstiniai</string>
     <string name="show_advanced_settings">Rodyti išplėstinius nustatymus</string>
     <string name="widget_open_list">Atidaryti sąrašą</string>
-    <string name="map_theme">Žemėlapio tema</string>
     <string name="start_date">Pradžios data</string>
     <string name="SSD_sort_my_order">Mano užsakymas</string>
     <string name="upgrade_desktop_access">Darbalaukio prieiga</string>
@@ -487,7 +486,6 @@
     <string name="astrid_sort_order">Astrid rankinis rūšiavimas</string>
     <string name="cancel">Atšaukti</string>
     <string name="ok">Patvirtinti</string>
-    <string name="map_theme_use_app_theme">Naudoti programėlės temą</string>
     <string name="list_members">Sąrašo nariai</string>
     <string name="remove_user">Pašalinti vartotoją\?</string>
     <string name="remove_user_confirmation">%1$s nebeturės prieigos prie %2$s</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 07104bf29..2ab44b077 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -588,9 +588,7 @@
     <string name="sort_due_group">Frist %s</string>
     <string name="tasks_org_account">Tasks.org-konto</string>
     <string name="widget_show_title">Vis tittel</string>
-    <string name="map_theme_use_app_theme">Bruk programdrakt</string>
     <string name="tasks_org_account_required">Tasks.org-konto kreves</string>
-    <string name="map_theme">Kartdrakt</string>
     <string name="list_members">Liste over medlemmer</string>
     <string name="social">Sosialt</string>
     <string name="remove_user_confirmation">%1$s vil ikke lenger ha tilgang til %2$s</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 1790da00b..70c9d6b1f 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -583,8 +583,6 @@
     <string name="tasks_org_account">Tasks.org account</string>
     <string name="subscription">Abonnement</string>
     <string name="widget_show_title">Titel tonen</string>
-    <string name="map_theme">Landkaart thema</string>
-    <string name="map_theme_use_app_theme">App thema</string>
     <string name="tasks_org_account_required">Een Tasks.org account vereist</string>
     <string name="support">Ondersteuning</string>
     <string name="privacy">Privacy</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index b64584f46..f02748ce8 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -601,9 +601,7 @@
     <string name="subscription">Subskrypcja</string>
     <string name="account_not_included">Nie obejmuje subskrypcji \"Podaj swoją cenę\"</string>
     <string name="widget_show_title">Pokaż tytuł</string>
-    <string name="map_theme_use_app_theme">Użyj motywu aplikacji</string>
     <string name="tasks_org_account_required">Wymagane konto Tasks.org</string>
-    <string name="map_theme">Motyw mapy</string>
     <string name="privacy">Prywatność</string>
     <string name="social">Media społecznościowe</string>
     <string name="follow_twitter">Obserwuj @tasks_org</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index dea39cfa7..c464ed217 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -554,7 +554,6 @@
     <string name="background_location_permission_required">Tasks coleta dados de localização para permitir lembretes baseados em localização, mesmo quando o aplicativo está fechado ou não estiver sendo usado.</string>
     <string name="subscription">Assinatura</string>
     <string name="repeat_monthly_fifth_week">quinto</string>
-    <string name="map_theme">Tema do mapa</string>
     <string name="default_recurrence">Recorrência padrão</string>
     <string name="default_tags">Etiquetas padrões</string>
     <string name="no_app_found">Nenhum aplicativo pode atender a esta solicitação</string>
@@ -585,7 +584,6 @@
     <string name="remove_user_confirmation">%1$s não terá mais acesso a %2$s</string>
     <string name="remove_user">Remover usuário\?</string>
     <string name="list_members">Lista de membros</string>
-    <string name="map_theme_use_app_theme">Usar tema do aplicativo</string>
     <string name="account_not_included">Não incluído nas assinaturas de \'Dê o seu preço\'</string>
     <string name="tasks_org_account_required">É necessária uma conta em Tasks.org</string>
     <string name="tasks_org_account">Conta do Tasks.org</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 928f1b667..67a239783 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -559,7 +559,6 @@
     <string name="remove_user_confirmation">%1$s deixará de ter acesso a %2$s</string>
     <string name="remove_user">Remover utilizador\?</string>
     <string name="list_members">Lista de membros</string>
-    <string name="map_theme_use_app_theme">Usar tema da aplicação</string>
     <string name="account_not_included">Não incluído nas subscrições de \'Dê o seu preço\'</string>
     <string name="tasks_org_account_required">É necessária uma conta no Tasks.org</string>
     <string name="tasks_org_account">Conta Tasks.org</string>
@@ -609,7 +608,6 @@
     <string name="tasks_org_description">Sincronize as suas tarefas com o Tasks.org</string>
     <string name="subscription">Subscrição</string>
     <string name="repeat_monthly_fifth_week">quinto</string>
-    <string name="map_theme">Tema do mapa</string>
     <string name="default_recurrence">Recorrência predefinida</string>
     <string name="no_app_found">Nenhuma aplicação pode manipular este pedido</string>
     <string name="filter_criteria_unstarted">Não iniciada</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index f3f69ac8f..24d7d98a4 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -39,7 +39,6 @@
     <string name="remove_user_confirmation">%1$s nu va mai avea acces la %2$s</string>
     <string name="remove_user">Elimini utilizatorul\?</string>
     <string name="list_members">Lista membrilor</string>
-    <string name="map_theme_use_app_theme">Utilizează tema aplicației</string>
     <string name="account_not_included">Nu este inclus în abonamentele \'Spune prețul\'</string>
     <string name="tasks_org_account_required">Cont Tasks.org necesar</string>
     <string name="tasks_org_account">Cont Tasks.org</string>
@@ -175,7 +174,6 @@
     <string name="launcher_icon">Pictograma lansatorului</string>
     <string name="icon">Pictogramă</string>
     <string name="color">Culoare</string>
-    <string name="map_theme">Tema hărții</string>
     <string name="theme">Temă</string>
     <string name="opacity_footer">Opacitatea subsolului de pagină</string>
     <string name="opacity_row">Opacitatea rândului</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index f5a6aa5ff..dd581a3b2 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -607,9 +607,7 @@
     <string name="tasks_org_account">Аккаунт Tasks.org</string>
     <string name="subscription">Подписка</string>
     <string name="widget_show_title">Показать заголовок</string>
-    <string name="map_theme_use_app_theme">Использовать тему приложения</string>
     <string name="tasks_org_account_required">Требуется учетная запись Tasks.org</string>
-    <string name="map_theme">Тема карты</string>
     <string name="follow_twitter">Следите за @task_org</string>
     <string name="privacy">Конфиденциальность</string>
     <string name="open_source">Открытый исходный код</string>
diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml
index 3b288c4b1..d5c7322a6 100644
--- a/app/src/main/res/values-si/strings.xml
+++ b/app/src/main/res/values-si/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="github_sponsor">අනුග්‍රාහකයා</string>
-    <string name="map_theme_use_app_theme">යෙදුම් තේමාව භාවිතා කරන්න</string>
     <string name="picker_mode_date">දින තේරීම් ආකාරය</string>
     <string name="invite_invalid">ආරාධනය අවලංගුයි</string>
     <string name="share_list">ලැයිස්තුව බෙදාගන්න</string>
@@ -36,7 +35,6 @@
     <string name="widget_due_date_below_title">මාතෘකාවට පහළින්</string>
     <string name="widget_due_date_after_title">මාතෘකාවෙන් පසු</string>
     <string name="widget_settings">විජට් සැකසුම්</string>
-    <string name="map_theme">සිතියම් තේමාව</string>
     <string name="default_recurrence">පෙරනිමි පුනරාවර්තනය</string>
     <string name="back_button_saves_task">පසුපස බොත්තම මඟින් කාර්යය සුරකිනු ඇත</string>
     <string name="geofence_radius">අරය</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index f7fc93b64..20ab4941e 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -463,7 +463,6 @@
     <string name="remove_user_confirmation">%1$s kommer inte längre att ha tillgång till %2$s</string>
     <string name="remove_user">Ta bort användaren\?</string>
     <string name="list_members">Förteckning över medlemmar</string>
-    <string name="map_theme_use_app_theme">Använd app-tema</string>
     <string name="account_not_included">Ingår inte i abonnemangen \"Ange ditt pris\"</string>
     <string name="tasks_org_account_required">Tasks.org-konto krävs</string>
     <string name="app_password_delete_confirmation">Alla appar som använder detta lösenord kommer att loggas ut</string>
@@ -577,7 +576,6 @@
     <string name="widget_due_date_below_title">Under titeln</string>
     <string name="widget_due_date_after_title">Efter titeln</string>
     <string name="theme_system_default">Systemets standardinställning</string>
-    <string name="map_theme">Tema för kartor</string>
     <string name="opacity_footer">Opacitet för sidfot</string>
     <string name="opacity_row">Radens opacitet</string>
     <string name="opacity_header">Opacitet för rubriken</string>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 2a7dd8577..a2dd8cb1c 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -57,7 +57,6 @@
     <string name="remove_user_confirmation">%1$s จะไม่สามารถเข้าถึง %2$s ได้อีกต่อไป</string>
     <string name="remove_user">ลบผู้ใช้หรือไม่\?</string>
     <string name="list_members">รายชื่อสมาชิก</string>
-    <string name="map_theme_use_app_theme">ใช้ธีมแอป</string>
     <string name="tasks_org_account_required">Tasks.org บัญชีลูกค้า</string>
     <string name="tasks_org_account">Tasks.org บัญชี</string>
     <string name="copied_to_clipboard">%s คัดลอกไปยังคลิปบอร์ดแล้ว</string>
@@ -294,7 +293,6 @@
     <string name="accent">สำเนียง</string>
     <string name="icon">ไอคอน</string>
     <string name="color">สี</string>
-    <string name="map_theme">ชุดรูปแบบแผนที่</string>
     <string name="theme">หัวข้อ</string>
     <string name="opacity_footer">ความทึบของท้ายกระดาษ</string>
     <string name="opacity_row">ความทึบของแถว</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 02fe48e5f..d21dabce0 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -588,9 +588,7 @@
     <string name="tasks_org_account">Tasks.org hesabı</string>
     <string name="subscription">Abonelik</string>
     <string name="widget_show_title">Başlığı göster</string>
-    <string name="map_theme_use_app_theme">Uygulama gövdesi kullan</string>
     <string name="tasks_org_account_required">Tasks.org hesabı gerekli</string>
-    <string name="map_theme">Harita gövdesi</string>
     <string name="privacy">Gizlilik</string>
     <string name="open_source">Açık kaynak</string>
     <string name="issue_tracker">Sorun izleyicisi</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 9fe58ce3e..b3b3aad93 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -606,9 +606,7 @@
     <string name="tasks_org_account">Обліковий запис Tasks.org</string>
     <string name="subscription">Підписка</string>
     <string name="widget_show_title">Показати заголовок</string>
-    <string name="map_theme_use_app_theme">Використовувати тему застосунку</string>
     <string name="tasks_org_account_required">Потрібен обліковий запис Tasks.org</string>
-    <string name="map_theme">Тема карти</string>
     <string name="cancel">Скасувати</string>
     <string name="ok">Гаразд</string>
     <string name="privacy">Приватність</string>
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index 92f0d60c5..cdbcf2a6b 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -336,7 +336,6 @@
     <string name="accent">ایکسنٹ</string>
     <string name="icon">آئیکن</string>
     <string name="color">رنگ</string>
-    <string name="map_theme">میپ تھیم</string>
     <string name="theme">تھیم</string>
     <string name="opacity_footer">نچلے حصے کی شفافیت</string>
     <string name="opacity_row">قطار کی شفافیت</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index da75c28e8..4b935c4f5 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -83,7 +83,6 @@
     <string name="remove_user_confirmation">%1$s sẽ không còn quyền truy cập vào %2$s nữa</string>
     <string name="remove_user">Xoá người dùng\?</string>
     <string name="list_members">Liệt kê các thành viên</string>
-    <string name="map_theme_use_app_theme">Sử dụng chủ đề ứng dụng</string>
     <string name="account_not_included">Không được bao gồm với các gói đăng ký \'Đặt giá của bạn\'</string>
     <string name="tasks_org_account_required">Yêu cầu tài khoản Tasks.org</string>
     <string name="tasks_org_account">Tài khoản Tasks.org</string>
@@ -345,7 +344,6 @@
     <string name="accent">Màu nổi bật</string>
     <string name="icon">Biểu tượng</string>
     <string name="color">Màu</string>
-    <string name="map_theme">Chủ đề của bản đồ</string>
     <string name="theme">Chủ đề</string>
     <string name="opacity_footer">Độ mờ của chân trang</string>
     <string name="opacity_row">Độ mờ của hàng</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 4bc8d56f1..3544b3c8c 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -577,9 +577,7 @@
     <string name="tasks_org_account">Tasks.org 账户</string>
     <string name="subscription">订阅</string>
     <string name="widget_show_title">显示标题</string>
-    <string name="map_theme_use_app_theme">使用应用主题</string>
     <string name="tasks_org_account_required">需要 Tasks.org 账户</string>
-    <string name="map_theme">地图主题</string>
     <string name="privacy">隐私</string>
     <string name="open_source">开源</string>
     <string name="issue_tracker">问题跟踪器</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 47b77bd68..aa968aba5 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -505,7 +505,6 @@
     <string name="email">電子郵件</string>
     <string name="repeats_from">重複開始</string>
     <string name="list">清單</string>
-    <string name="map_theme">地圖主題</string>
     <string name="opacity_row">行列透明度</string>
     <string name="next_saturday">下週六</string>
     <string name="next_friday">下週五</string>
@@ -651,7 +650,6 @@
     <string name="list_members">清單成員</string>
     <string name="invite_invalid">邀請無效</string>
     <string name="picker_mode_date">日期選擇模式</string>
-    <string name="map_theme_use_app_theme">使用應用程式主題</string>
     <string name="picker_mode_text">文字</string>
     <string name="upgrade_tasks_org_account_description">與 Tasks.org 同步，並與其他用戶協作</string>
     <string name="upgrade_more_customization">更多自訂</string>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 3649f10cf..0f16ec60e 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -138,18 +138,6 @@
     <item>2</item>
   </string-array>
 
-  <string-array name="map_theme_names">
-    <item>@string/map_theme_use_app_theme</item>
-    <item>@string/theme_light</item>
-    <item>@string/theme_dark</item>
-  </string-array>
-
-  <string-array name="map_theme_values">
-    <item>0</item>
-    <item>1</item>
-    <item>2</item>
-  </string-array>
-
   <string-array name="date_picker_modes">
     <item>@string/picker_mode_calendar</item>
     <item>@string/picker_mode_text</item>
diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml
index 862e9e806..37f76faba 100644
--- a/app/src/main/res/values/keys.xml
+++ b/app/src/main/res/values/keys.xml
@@ -426,7 +426,6 @@
   <string name="event_create_shortcut">create_shortcut</string>
   <string name="event_create_widget">create_widget</string>
   <string name="param_type">type</string>
-  <string name="p_map_theme">map_theme</string>
   <string name="p_picker_mode_date">picker_mode_date</string>
   <string name="p_picker_mode_time">picker_mode_time</string>
   <string name="p_markdown">markdown</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index de15a2d07..6fff08a51 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -383,7 +383,6 @@ File %1$s contained %2$s.\n\n
   <string name="opacity_row">Row opacity</string>
   <string name="opacity_footer">Footer opacity</string>
   <string name="theme">Theme</string>
-  <string name="map_theme">Map theme</string>
   <string name="color">Color</string>
   <string name="icon">Icon</string>
   <string name="accent">Accent</string>
@@ -670,7 +669,6 @@ File %1$s contained %2$s.\n\n
   <string name="tasks_org_account">Tasks.org account</string>
   <string name="tasks_org_account_required">Tasks.org account required</string>
   <string name="account_not_included">Not included with \'Name your price\' subscriptions</string>
-  <string name="map_theme_use_app_theme">Use app theme</string>
   <string name="list_members">List members</string>
   <string name="remove_user">Remove user?</string>
   <string name="remove_user_confirmation">%1$s will no longer have access to %2$s</string>
diff --git a/app/src/main/res/xml/preferences_look_and_feel.xml b/app/src/main/res/xml/preferences_look_and_feel.xml
index 37106ffc9..f3d0875f5 100644
--- a/app/src/main/res/xml/preferences_look_and_feel.xml
+++ b/app/src/main/res/xml/preferences_look_and_feel.xml
@@ -19,14 +19,6 @@
     android:key="@string/p_theme_launcher"
     android:title="@string/launcher_icon" />
 
-  <ListPreference
-    android:defaultValue="0"
-    android:key="@string/p_map_theme"
-    android:title="@string/map_theme"
-    android:entries="@array/map_theme_names"
-    android:entryValues="@array/map_theme_values"
-    android:summary="%s" />
-
   <SwitchPreferenceCompat
       android:defaultValue="false"
       android:key="@string/p_markdown"