diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 86bdadc494..0a7e8fb475 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -343,10 +343,13 @@
       </intent-filter>
 
     </activity>
+    <activity
+        android:name="app.organicmaps.base.BaseMwmFragmentActivity"
+        android:configChanges="uiMode" />
 
     <activity
         android:name="app.organicmaps.DownloadResourcesLegacyActivity"
-        android:configChanges="orientation|screenLayout|screenSize"
+        android:configChanges="uiMode|orientation|screenLayout|screenSize" />
         android:screenOrientation="fullUser"/>
 
     <activity-alias
@@ -374,7 +377,7 @@
 
     <activity
         android:name="app.organicmaps.downloader.DownloaderActivity"
-        android:configChanges="orientation|screenLayout|screenSize"
+        android:configChanges="uiMode|orientation|screenLayout|screenSize"
         android:screenOrientation="fullUser"
         android:label="@string/download_maps"
         android:parentActivityName="app.organicmaps.MwmActivity"
@@ -382,7 +385,7 @@
 
     <activity
         android:name="app.organicmaps.search.SearchActivity"
-        android:configChanges="orientation|screenLayout|screenSize"
+        android:configChanges="uiMode|orientation|screenLayout|screenSize"
         android:screenOrientation="fullUser"
         android:label="@string/search_map"
         android:parentActivityName="app.organicmaps.MwmActivity"
@@ -390,7 +393,7 @@
 
     <activity
         android:name="app.organicmaps.settings.SettingsActivity"
-        android:configChanges="orientation|screenLayout|screenSize"
+        android:configChanges="uiMode|orientation|screenLayout|screenSize"
         android:screenOrientation="fullUser"
         android:label="@string/settings"
         android:parentActivityName="app.organicmaps.MwmActivity" />
@@ -399,6 +402,7 @@
         android:name="app.organicmaps.help.HelpActivity"
         android:label="@string/about_menu_title"
         android:parentActivityName="app.organicmaps.MwmActivity"
+        android:configChanges="uiMode"
         android:exported="false">
       <intent-filter>
         <action android:name="app.organicmaps.help.HelpActivity" />
@@ -408,7 +412,7 @@
 
     <activity
         android:name="app.organicmaps.bookmarks.BookmarkCategoriesActivity"
-        android:configChanges="orientation|screenLayout|screenSize"
+        android:configChanges="uiMode|orientation|screenLayout|screenSize"
         android:screenOrientation="fullUser"
         android:label="@string/bookmarks_and_tracks"
         android:parentActivityName="app.organicmaps.MwmActivity"
@@ -416,7 +420,7 @@
 
     <activity
         android:name="app.organicmaps.bookmarks.BookmarkListActivity"
-        android:configChanges="orientation|screenLayout|screenSize"
+        android:configChanges="uiMode|orientation|screenLayout|screenSize"
         android:screenOrientation="fullUser"
         android:label="@string/bookmarks"
         android:parentActivityName="app.organicmaps.bookmarks.BookmarkCategoriesActivity"
@@ -424,7 +428,7 @@
 
     <activity
         android:name="app.organicmaps.editor.EditorActivity"
-        android:configChanges="orientation|screenLayout|screenSize"
+        android:configChanges="uiMode|orientation|screenLayout|screenSize"
         android:screenOrientation="fullUser"
         android:label="@string/edit_place"
         android:parentActivityName="app.organicmaps.MwmActivity"
@@ -432,33 +436,41 @@
 
     <activity
         android:name="app.organicmaps.editor.ProfileActivity"
+        android:configChanges="uiMode"
         android:parentActivityName="app.organicmaps.settings.SettingsActivity" />
 
     <activity
         android:name="app.organicmaps.editor.FeatureCategoryActivity"
         android:parentActivityName="app.organicmaps.MwmActivity"
+        android:configChanges="uiMode"
         android:windowSoftInputMode="adjustResize" />
 
     <activity
         android:name="app.organicmaps.editor.ReportActivity"
+        android:configChanges="uiMode"
         android:parentActivityName="app.organicmaps.MwmActivity" />
 
     <activity
         android:name="app.organicmaps.editor.OsmLoginActivity"
+        android:configChanges="uiMode"
         android:parentActivityName="app.organicmaps.MwmActivity" />
 
     <activity
       android:name="app.organicmaps.bookmarks.BookmarkCategorySettingsActivity"
       android:label="@string/edit"
+      android:configChanges="uiMode"
       android:windowSoftInputMode="stateVisible"/>
     <activity
       android:name="app.organicmaps.widget.placepage.PlaceDescriptionActivity"
+      android:configChanges="uiMode"
       android:label="@string/place_description_title"/>
     <activity
       android:name="app.organicmaps.settings.DrivingOptionsActivity"
+      android:configChanges="uiMode"
       android:label="@string/driving_options_title"/>
     <activity
-        android:name="app.organicmaps.MapPlaceholderActivity"/>
+      android:name="app.organicmaps.MapPlaceholderActivity"
+      android:configChanges="uiMode" />
     <activity
         android:name="app.organicmaps.car.screens.permissions.RequestPermissionsActivity"/>
     <service
diff --git a/android/app/src/main/java/app/organicmaps/SplashActivity.java b/android/app/src/main/java/app/organicmaps/SplashActivity.java
index 37c7cd976b..27f1c635ba 100644
--- a/android/app/src/main/java/app/organicmaps/SplashActivity.java
+++ b/android/app/src/main/java/app/organicmaps/SplashActivity.java
@@ -7,6 +7,7 @@ import static app.organicmaps.api.Const.EXTRA_PICK_POINT;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.Configuration;
 import android.os.Bundle;
 import android.util.Log;
 
@@ -25,6 +26,7 @@ import app.organicmaps.location.LocationHelper;
 import app.organicmaps.util.Config;
 import app.organicmaps.util.LocationUtils;
 import app.organicmaps.util.SharingUtils;
+import app.organicmaps.util.ThemeSwitcher;
 import app.organicmaps.util.ThemeUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.concurrency.UiThread;
@@ -121,6 +123,14 @@ public class SplashActivity extends AppCompatActivity
     mApiRequest = null;
   }
 
+  @Override
+  public void onConfigurationChanged(@NonNull Configuration newConfig)
+  {
+    super.onConfigurationChanged(newConfig);
+    ThemeSwitcher.INSTANCE.restart(false);
+    UiThread.runLater(this::recreate);
+  }
+  
   private void showFatalErrorDialog(@StringRes int titleId, @StringRes int messageId, Exception error)
   {
     mCanceled = true;
diff --git a/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java b/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java
index 16cc5397c1..b5a1f31bd0 100644
--- a/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java
+++ b/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java
@@ -4,6 +4,7 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
+import android.content.res.Configuration;
 import android.media.AudioManager;
 import android.os.Bundle;
 import android.view.MenuItem;
@@ -25,6 +26,7 @@ import app.organicmaps.R;
 import app.organicmaps.SplashActivity;
 import app.organicmaps.util.Config;
 import app.organicmaps.util.RtlUtils;
+import app.organicmaps.util.ThemeSwitcher;
 import app.organicmaps.util.ThemeUtils;
 import app.organicmaps.util.concurrency.UiThread;
 import app.organicmaps.util.log.Logger;
@@ -132,6 +134,14 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity
     }
   }
 
+  @Override
+  public void onConfigurationChanged(@NonNull Configuration newConfig)
+  {
+    super.onConfigurationChanged(newConfig);
+    ThemeSwitcher.INSTANCE.restart(false);
+    UiThread.runLater(this::recreate);
+  }
+
   @Override
   public boolean onOptionsItemSelected(MenuItem item)
   {
diff --git a/android/app/src/main/java/app/organicmaps/car/screens/settings/SettingsScreen.java b/android/app/src/main/java/app/organicmaps/car/screens/settings/SettingsScreen.java
index 3c493b2ac6..5bbc6d3f22 100644
--- a/android/app/src/main/java/app/organicmaps/car/screens/settings/SettingsScreen.java
+++ b/android/app/src/main/java/app/organicmaps/car/screens/settings/SettingsScreen.java
@@ -75,7 +75,7 @@ public class SettingsScreen extends BaseMapScreen
   private Item createThemeItem()
   {
     final Row.Builder builder = new Row.Builder();
-    builder.setTitle(getCarContext().getString(R.string.pref_map_style_title));
+    builder.setTitle(getCarContext().getString(R.string.pref_appearance_title));
     builder.addText(getCarContext().getString(ThemeUtils.getThemeMode(getCarContext()).getTitleId()));
     builder.setOnClickListener(() -> getScreenManager().push(new ThemeScreen(getCarContext(), getSurfaceRenderer())));
     builder.setBrowsable(true);
diff --git a/android/app/src/main/java/app/organicmaps/car/screens/settings/ThemeScreen.java b/android/app/src/main/java/app/organicmaps/car/screens/settings/ThemeScreen.java
index 530a3259b5..f2a83959e8 100644
--- a/android/app/src/main/java/app/organicmaps/car/screens/settings/ThemeScreen.java
+++ b/android/app/src/main/java/app/organicmaps/car/screens/settings/ThemeScreen.java
@@ -47,7 +47,7 @@ public class ThemeScreen extends BaseMapScreen
   {
     final Header.Builder builder = new Header.Builder();
     builder.setStartHeaderAction(Action.BACK);
-    builder.setTitle(getCarContext().getString(R.string.pref_map_style_title));
+    builder.setTitle(getCarContext().getString(R.string.pref_appearance_title));
     return builder.build();
   }
 
@@ -56,7 +56,7 @@ public class ThemeScreen extends BaseMapScreen
   {
     final ItemList.Builder builder = new ItemList.Builder();
     final ThemeUtils.ThemeMode currentThemeMode = ThemeUtils.getThemeMode(getCarContext());
-    builder.addItem(createRadioButton(ThemeUtils.ThemeMode.AUTO, currentThemeMode));
+    builder.addItem(createRadioButton(ThemeUtils.ThemeMode.FOLLOW_SYSTEM, currentThemeMode));
     builder.addItem(createRadioButton(ThemeUtils.ThemeMode.NIGHT, currentThemeMode));
     builder.addItem(createRadioButton(ThemeUtils.ThemeMode.LIGHT, currentThemeMode));
     return new ListTemplate.Builder().setHeader(createHeader()).setSingleList(builder.build()).build();
diff --git a/android/app/src/main/java/app/organicmaps/car/util/ThemeUtils.java b/android/app/src/main/java/app/organicmaps/car/util/ThemeUtils.java
index cb6806cfd5..f38dc77add 100644
--- a/android/app/src/main/java/app/organicmaps/car/util/ThemeUtils.java
+++ b/android/app/src/main/java/app/organicmaps/car/util/ThemeUtils.java
@@ -17,9 +17,9 @@ public final class ThemeUtils
 {
   public enum ThemeMode
   {
-    AUTO(R.string.auto, R.string.theme_auto),
-    LIGHT(R.string.off, R.string.theme_default),
-    NIGHT(R.string.on, R.string.theme_night);
+    LIGHT(R.string.light, R.string.theme_default),
+    NIGHT(R.string.dark, R.string.theme_night),
+    FOLLOW_SYSTEM(R.string.follow_system, R.string.theme_follow_system);
 
     ThemeMode(@StringRes int titleId, @StringRes int prefsKeyId)
     {
@@ -58,7 +58,7 @@ public final class ThemeUtils
   @UiThread
   public static void update(@NonNull CarContext context, @NonNull ThemeMode oldThemeMode)
   {
-    final ThemeMode newThemeMode = oldThemeMode == ThemeMode.AUTO ? (context.isDarkMode() ? ThemeMode.NIGHT : ThemeMode.LIGHT) : oldThemeMode;
+    final ThemeMode newThemeMode = oldThemeMode == ThemeMode.FOLLOW_SYSTEM ? (context.isDarkMode() ? ThemeMode.NIGHT : ThemeMode.LIGHT) : oldThemeMode;
 
     @Framework.MapStyle
     int newMapStyle;
@@ -74,7 +74,7 @@ public final class ThemeUtils
   public static boolean isNightMode(@NonNull CarContext context)
   {
     final ThemeMode themeMode = getThemeMode(context);
-    return themeMode == ThemeMode.NIGHT || (themeMode == ThemeMode.AUTO && context.isDarkMode());
+    return themeMode == ThemeMode.NIGHT || (themeMode == ThemeMode.FOLLOW_SYSTEM && context.isDarkMode());
   }
 
   @SuppressLint("ApplySharedPref")
@@ -88,13 +88,13 @@ public final class ThemeUtils
   @NonNull
   public static ThemeMode getThemeMode(@NonNull CarContext context)
   {
-    final String autoTheme = context.getString(R.string.theme_auto);
+    final String followSystemTheme = context.getString(R.string.theme_follow_system);
     final String lightTheme = context.getString(R.string.theme_default);
     final String nightTheme = context.getString(R.string.theme_night);
-    final String themeMode = getSharedPreferences(context).getString(THEME_KEY, autoTheme);
+    final String themeMode = getSharedPreferences(context).getString(THEME_KEY, followSystemTheme);
 
-    if (themeMode.equals(autoTheme))
-      return ThemeMode.AUTO;
+    if (themeMode.equals(followSystemTheme))
+      return ThemeMode.FOLLOW_SYSTEM;
     else if (themeMode.equals(lightTheme))
       return ThemeMode.LIGHT;
     else if (themeMode.equals(nightTheme))
diff --git a/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java b/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
index b7d8e35f69..2597c3fd4c 100644
--- a/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
+++ b/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
@@ -507,10 +507,9 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
 
   enum ThemeMode
   {
+    FOLLOW_SYSTEM(R.string.theme_follow_system),
     DEFAULT(R.string.theme_default),
-    NIGHT(R.string.theme_night),
-    AUTO(R.string.theme_auto),
-    NAV_AUTO(R.string.theme_nav_auto);
+    NIGHT(R.string.theme_night);
 
     private final int mModeStringId;
 
@@ -527,7 +526,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
         if (context.getResources().getString(each.mModeStringId).equals(src))
           return each;
       }
-      return AUTO;
+      return FOLLOW_SYSTEM;
     }
   }
 
diff --git a/android/app/src/main/java/app/organicmaps/util/Config.java b/android/app/src/main/java/app/organicmaps/util/Config.java
index 2f9cdbf882..55670340d9 100644
--- a/android/app/src/main/java/app/organicmaps/util/Config.java
+++ b/android/app/src/main/java/app/organicmaps/util/Config.java
@@ -275,12 +275,12 @@ public final class Config
   @NonNull
   public static String getUiThemeSettings(@NonNull Context context)
   {
-    String autoTheme = MwmApplication.from(context).getString(R.string.theme_auto);
-    String res = getString(KEY_MISC_UI_THEME_SETTINGS, autoTheme);
-    if (ThemeUtils.isValidTheme(context, res) || ThemeUtils.isAutoTheme(context, res) || ThemeUtils.isNavAutoTheme(context, res))
+    String followSystemTheme = MwmApplication.from(context).getString(R.string.theme_follow_system);
+    String res = getString(KEY_MISC_UI_THEME_SETTINGS, followSystemTheme);
+    if (ThemeUtils.isValidTheme(context, res) || ThemeUtils.isFollowSystemTheme(context, res))
       return res;
 
-    return autoTheme;
+    return followSystemTheme;
   }
 
   public static boolean setUiThemeSettings(@NonNull Context context, String theme)
diff --git a/android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java b/android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java
index d70055b0f9..b1bdc24177 100644
--- a/android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java
+++ b/android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java
@@ -1,21 +1,15 @@
 package app.organicmaps.util;
 
 import android.app.Activity;
-import android.app.UiModeManager;
 import android.content.Context;
-import android.location.Location;
-import android.os.Build;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatDelegate;
 import app.organicmaps.Framework;
 import app.organicmaps.MwmApplication;
-import app.organicmaps.R;
 import app.organicmaps.display.DisplayManager;
 import app.organicmaps.downloader.DownloaderStatusIcon;
-import app.organicmaps.location.LocationHelper;
 import app.organicmaps.routing.RoutingController;
-import app.organicmaps.util.concurrency.UiThread;
 
 public enum ThemeSwitcher
 {
@@ -24,37 +18,37 @@ public enum ThemeSwitcher
   private static final long CHECK_INTERVAL_MS = 30 * 60 * 1000;
   private static boolean mRendererActive = false;
 
-  private final Runnable mAutoThemeChecker = new Runnable()
-  {
-    @Override
-    public void run()
-    {
-      String nightTheme = MwmApplication.from(mContext).getString(R.string.theme_night);
-      String defaultTheme = MwmApplication.from(mContext).getString(R.string.theme_default);
-      String theme = defaultTheme;
-      Location last = LocationHelper.from(mContext).getSavedLocation();
-
-      boolean navAuto = RoutingController.get().isNavigating() && ThemeUtils.isNavAutoTheme(mContext);
-
-      if (navAuto || ThemeUtils.isAutoTheme(mContext))
-      {
-        if (last == null)
-          theme = Config.getCurrentUiTheme(mContext);
-        else
-        {
-          long currentTime = System.currentTimeMillis() / 1000;
-          boolean day = Framework.nativeIsDayTime(currentTime, last.getLatitude(), last.getLongitude());
-          theme = (day ? defaultTheme : nightTheme);
-        }
-      }
-
-      setThemeAndMapStyle(theme);
-      UiThread.cancelDelayedTasks(mAutoThemeChecker);
-
-      if (navAuto || ThemeUtils.isAutoTheme(mContext))
-        UiThread.runLater(mAutoThemeChecker, CHECK_INTERVAL_MS);
-    }
-  };
+//  private final Runnable mAutoThemeChecker = new Runnable()
+//  {
+//    @Override
+//    public void run()
+//    {
+//      String nightTheme = MwmApplication.from(mContext).getString(R.string.theme_night);
+//      String defaultTheme = MwmApplication.from(mContext).getString(R.string.theme_default);
+//      String theme = defaultTheme;
+//      Location last = LocationHelper.from(mContext).getSavedLocation();
+//
+//      boolean navAuto = RoutingController.get().isNavigating() && ThemeUtils.isNavAutoTheme(mContext);
+//
+//      if (navAuto || ThemeUtils.isAutoTheme(mContext))
+//      {
+//        if (last == null)
+//          theme = Config.getCurrentUiTheme(mContext);
+//        else
+//        {
+//          long currentTime = System.currentTimeMillis() / 1000;
+//          boolean day = Framework.nativeIsDayTime(currentTime, last.getLatitude(), last.getLongitude());
+//          theme = (day ? defaultTheme : nightTheme);
+//        }
+//      }
+//
+//      setThemeAndMapStyle(theme);
+//      UiThread.cancelDelayedTasks(mAutoThemeChecker);
+//
+//      if (navAuto || ThemeUtils.isAutoTheme(mContext))
+//        UiThread.runLater(mAutoThemeChecker, CHECK_INTERVAL_MS);
+//    }
+//  };
 
   @SuppressWarnings("NotNullFieldNotInitialized")
   @NonNull
@@ -79,32 +73,34 @@ public enum ThemeSwitcher
   {
     mRendererActive = isRendererActive;
     String theme = Config.getUiThemeSettings(mContext);
-    if (ThemeUtils.isAutoTheme(mContext, theme) || ThemeUtils.isNavAutoTheme(mContext, theme))
-    {
-      mAutoThemeChecker.run();
-      return;
-    }
+//    if (ThemeUtils.isAutoTheme(mContext, theme) || ThemeUtils.isNavAutoTheme(mContext, theme))
+//    {
+//      mAutoThemeChecker.run();
+//      return;
+//    }
+    setAndroidTheme(theme);
 
-    UiThread.cancelDelayedTasks(mAutoThemeChecker);
-    setThemeAndMapStyle(theme);
+    final String themeToApply = ThemeUtils.getAndroidTheme(mContext);
+    final int style = getStyle(themeToApply);
+    setThemeAndMapStyle(themeToApply, style);
   }
 
-  private void setThemeAndMapStyle(@NonNull String theme)
+  private void setAndroidTheme(@NonNull String theme)
   {
-    UiModeManager uiModeManager = (UiModeManager) mContext.getSystemService(Context.UI_MODE_SERVICE);
-    String oldTheme = Config.getCurrentUiTheme(mContext);
-    @Framework.MapStyle
-    int oldStyle = Framework.nativeGetMapStyle();
+    if (ThemeUtils.isFollowSystemTheme(mContext, theme))
+      AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
+    else if (ThemeUtils.isNightTheme(mContext, theme))
+      AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+    else if (ThemeUtils.isDefaultTheme(mContext, theme))
+      AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+  }
 
+  private int getStyle(@NonNull String theme)
+  {
     @Framework.MapStyle
     int style;
     if (ThemeUtils.isNightTheme(mContext, theme))
     {
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
-        uiModeManager.setApplicationNightMode(UiModeManager.MODE_NIGHT_YES);
-      else
-        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
-
       if (RoutingController.get().isVehicleNavigation())
         style = Framework.MAP_STYLE_VEHICLE_DARK;
       else if (Framework.nativeIsOutdoorsLayerEnabled())
@@ -114,11 +110,6 @@ public enum ThemeSwitcher
     }
     else
     {
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
-        uiModeManager.setApplicationNightMode(UiModeManager.MODE_NIGHT_NO);
-      else
-        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
-
       if (RoutingController.get().isVehicleNavigation())
         style = Framework.MAP_STYLE_VEHICLE_CLEAR;
       else if (Framework.nativeIsOutdoorsLayerEnabled())
@@ -127,6 +118,13 @@ public enum ThemeSwitcher
         style = Framework.MAP_STYLE_CLEAR;
     }
 
+    return style;
+  }
+
+  private void setThemeAndMapStyle(@NonNull String theme, @Framework.MapStyle int style)
+  {
+    String oldTheme = Config.getCurrentUiTheme(mContext);
+
     if (!theme.equals(oldTheme))
     {
       Config.setCurrentUiTheme(mContext, theme);
diff --git a/android/app/src/main/java/app/organicmaps/util/ThemeUtils.java b/android/app/src/main/java/app/organicmaps/util/ThemeUtils.java
index c121c8d313..b3613e7cab 100644
--- a/android/app/src/main/java/app/organicmaps/util/ThemeUtils.java
+++ b/android/app/src/main/java/app/organicmaps/util/ThemeUtils.java
@@ -1,6 +1,7 @@
 package app.organicmaps.util;
 
 import android.content.Context;
+import android.content.res.Configuration;
 import android.content.res.TypedArray;
 import android.util.TypedValue;
 
@@ -8,7 +9,7 @@ import androidx.annotation.AttrRes;
 import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.StyleRes;
-
+import androidx.appcompat.app.AppCompatDelegate;
 import app.organicmaps.R;
 
 public final class ThemeUtils
@@ -45,6 +46,25 @@ public final class ThemeUtils
     return VALUE_BUFFER.resourceId;
   }
 
+  public static String getAndroidTheme(@NonNull Context context)
+  {
+    String nightTheme = context.getString(R.string.theme_night);
+    String defaultTheme = context.getString(R.string.theme_default);
+
+    if (AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_YES)
+      return nightTheme;
+
+    if (AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_NO)
+      return defaultTheme;
+
+    int nightModeFlags = context.getResources()
+                                .getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+    if (nightModeFlags == Configuration.UI_MODE_NIGHT_YES)
+      return nightTheme;
+    else
+      return defaultTheme;
+  }
+
   public static boolean isDefaultTheme(@NonNull Context context)
   {
     return isDefaultTheme(context, Config.getCurrentUiTheme(context));
@@ -67,15 +87,15 @@ public final class ThemeUtils
     return nightTheme.equals(theme);
   }
 
-  public static boolean isAutoTheme(@NonNull Context context)
+  public static boolean isFollowSystemTheme(@NonNull Context context)
   {
-    return isAutoTheme(context, Config.getUiThemeSettings(context));
+    return isFollowSystemTheme(context, Config.getCurrentUiTheme(context));
   }
 
-  public static boolean isAutoTheme(@NonNull Context context, String theme)
+  public static boolean isFollowSystemTheme(@NonNull Context context, String theme)
   {
-    String autoTheme = context.getString(R.string.theme_auto);
-    return autoTheme.equals(theme);
+    String followSystemTheme = context.getString(R.string.theme_follow_system);
+    return followSystemTheme.equals(theme);
   }
 
   public static boolean isNavAutoTheme(@NonNull Context context)
diff --git a/android/app/src/main/res/values/donottranslate.xml b/android/app/src/main/res/values/donottranslate.xml
index 976c1ecd7c..79c9be7f89 100644
--- a/android/app/src/main/res/values/donottranslate.xml
+++ b/android/app/src/main/res/values/donottranslate.xml
@@ -53,6 +53,7 @@
   <string name="theme_night" translatable="false">night</string>
   <string name="theme_auto" translatable="false">auto</string>
   <string name="theme_nav_auto" translatable="false">nav-auto</string>
+  <string name="theme_follow_system" translatable="false">follow-system</string>
 
   <!-- Tags -->
   <string name="tag_menu_collapse" translatable="false">collapse</string>
diff --git a/android/app/src/main/res/values/string-arrays.xml b/android/app/src/main/res/values/string-arrays.xml
index ee0e6210fd..a5e7c4fd81 100644
--- a/android/app/src/main/res/values/string-arrays.xml
+++ b/android/app/src/main/res/values/string-arrays.xml
@@ -23,20 +23,16 @@
     <item>0</item>
     <item>1</item>
   </string-array>
-
-  <string-array name="map_style">
-    <item>@string/off</item>
-    <item>@string/on</item>
-    <item>@string/auto</item>
-    <item>@string/nav_auto</item>
+  <string-array name="appearance">
+    <item>@string/follow_system</item>
+    <item>@string/light</item>
+    <item>@string/dark</item>
   </string-array>
-
-  <string-array name="map_style_values"
+  <string-array name="appearance_values"
                 translatable="false">
+    <item>@string/theme_follow_system</item>
     <item>@string/theme_default</item>
     <item>@string/theme_night</item>
-    <item>@string/theme_auto</item>
-    <item>@string/theme_nav_auto</item>
   </string-array>
 
   <string-array name="speed_cameras">
diff --git a/android/app/src/main/res/xml/prefs_main.xml b/android/app/src/main/res/xml/prefs_main.xml
index e162e025d6..6f278ca16c 100644
--- a/android/app/src/main/res/xml/prefs_main.xml
+++ b/android/app/src/main/res/xml/prefs_main.xml
@@ -14,6 +14,13 @@
     android:key="@string/pref_settings_general"
     android:title="@string/prefs_group_general"
     android:order="2">
+    <ListPreference
+      android:entries="@array/appearance"
+      android:entryValues="@array/appearance_values"
+      android:key="@string/pref_map_style"
+      android:title="@string/pref_appearance_title"
+      app:singleLineTitle="false"
+      android:order="1" />
     <ListPreference
       android:key="@string/pref_munits"
       android:title="@string/measurement_units"
@@ -21,23 +28,23 @@
       android:summary="@string/measurement_units_summary"
       android:entries="@array/measument_units"
       android:entryValues="@array/measument_units_values"
-      android:order="1"/>
+      android:order="2"/>
     <SwitchPreferenceCompat
       android:key="@string/pref_show_zoom_buttons"
       android:title="@string/pref_zoom_title"
       app:singleLineTitle="false"
       android:summary="@string/pref_zoom_summary"
-      android:order="2"/>
+      android:order="3"/>
     <SwitchPreferenceCompat
       android:key="@string/pref_3d_buildings"
       android:title="@string/pref_map_3d_buildings_title"
       app:singleLineTitle="false"
-      android:order="3"/>
+      android:order="4"/>
     <SwitchPreferenceCompat
       android:key="@string/pref_autodownload"
       android:title="@string/autodownload"
       app:singleLineTitle="false"
-      android:order="4"/>
+      android:order="5"/>
     <SwitchPreferenceCompat
       android:key="@string/pref_large_fonts_size"
       android:title="@string/big_font"
@@ -62,13 +69,13 @@
       app:singleLineTitle="false"
       android:summary="@string/enable_logging_warning_message"
       android:defaultValue="false"
-      android:order="12"/>
+      android:order="9"/>
     <SwitchPreferenceCompat
       android:key="@string/pref_emulate_bad_external_storage"
       android:title="@string/setting_emulate_bad_storage"
       app:singleLineTitle="false"
       android:defaultValue="false"
-      android:order="13"/>
+      android:order="10"/>
     <ListPreference
       android:key="@string/pref_use_mobile_data"
       android:title="@string/mobile_data"
@@ -76,7 +83,7 @@
       android:summary="@string/mobile_data_description"
       android:entries="@array/mobile_data_options"
       android:entryValues="@array/mobile_data_options_values"
-      android:order="14"/>
+      android:order="11"/>
     <ListPreference
       android:key="@string/pref_power_management"
       android:title="@string/power_managment_title"
@@ -84,60 +91,53 @@
       android:summary="@string/power_managment_description"
       android:entries="@array/power_management_scheme"
       android:entryValues="@array/power_management_scheme_values"
-      android:order="15"/>
+      android:order="12"/>
     <SwitchPreferenceCompat
       android:key="@string/pref_keep_screen_on"
       android:title="@string/enable_keep_screen_on"
       app:singleLineTitle="false"
       android:summary="@string/enable_keep_screen_on_description"
       android:defaultValue="false"
-      android:order="16"/>
+      android:order="13"/>
     <SwitchPreferenceCompat
       android:key="@string/pref_show_on_lock_screen"
       android:title="@string/enable_show_on_lock_screen"
       app:singleLineTitle="false"
       android:summary="@string/enable_show_on_lock_screen_description"
       android:defaultValue="true"
-      android:order="17"/>
+      android:order="14"/>
     <Preference
-        android:key="@string/pref_map_locale"
-        android:title="@string/change_map_locale"
-        app:singleLineTitle="false"
-        android:persistent="false"
-        android:order="18"/>
+      android:key="@string/pref_map_locale"
+      android:title="@string/change_map_locale"
+      app:singleLineTitle="false"
+      android:persistent="false"
+      android:order="15"/>
   </androidx.preference.PreferenceCategory>
 
   <androidx.preference.PreferenceCategory
     android:key="@string/pref_navigation"
     android:title="@string/prefs_group_route"
     android:order="3">
-    <ListPreference
-      android:key="@string/pref_map_style"
-      android:title="@string/pref_map_style_title"
-      app:singleLineTitle="false"
-      android:entries="@array/map_style"
-      android:entryValues="@array/map_style_values"
-      android:order="1"/>
     <SwitchPreferenceCompat
       android:key="@string/pref_3d"
       android:title="@string/pref_map_3d_title"
       app:singleLineTitle="false"
-      android:order="2"/>
+      android:order="1" />
     <SwitchPreferenceCompat
       android:key="@string/pref_auto_zoom"
       android:title="@string/pref_map_auto_zoom"
       app:singleLineTitle="false"
-      android:order="3"/>
+      android:order="2" />
     <Preference
       android:key="@string/pref_tts_screen"
       android:title="@string/pref_tts_enable_title"
       app:singleLineTitle="false"
       android:persistent="false"
-      android:order="4">
+      android:order="3">
     </Preference>
     <PreferenceScreen
       android:key="@string/prefs_routing"
-      android:order="5"
+      android:order="4"
       android:title="@string/driving_options_title">
       <intent
         android:targetClass="app.organicmaps.settings.DrivingOptionsActivity"
diff --git a/data/strings/strings.txt b/data/strings/strings.txt
index ab0d4f09a8..e73f62b54c 100644
--- a/data/strings/strings.txt
+++ b/data/strings/strings.txt
@@ -5715,7 +5715,7 @@
 
   [pref_appearance_title]
     comment = Settings «Map» category: «Appearance» title
-    tags = ios
+    tags = android,ios
     en = Appearance
     ar = المظهر
     az = Görünüş
@@ -5759,9 +5759,9 @@
     zh-Hans = 外观
     zh-Hant = 外觀
 
-  [pref_appearance_light]
-    comment = Settings "Appearance" category: "Light" title, should be consistent with the pref_appearance_title translation.
-    tags = ios
+  [light]
+    comment = Generic «Light» string (eg. light theme, not lamps)
+    tags = android,ios
     en = Light
     ar = فاتح
     az = Parlaq
@@ -5805,9 +5805,9 @@
     zh-Hans = 浅色
     zh-Hant = 淺色
 
-  [pref_appearance_dark]
-    comment = Settings "Appearance" category: "Dark" title, should be consistent with the pref_appearance_title translation.
-    tags = ios
+  [dark]
+    comment = Generic «Dark» string
+    tags = android,ios
     en = Dark
     ar = داكن
     az = Tünd
@@ -5851,6 +5851,53 @@
     zh-Hans = 深色
     zh-Hant = 深色
 
+  [follow_system]
+    comment = Appearance setting, OM should follow the system theme
+    tags = android
+    en = Follow System
+    af = Volg Stelsel
+    ar = نظام المتابعة
+    az = Sistemi izləyin
+    be = Сачыце за сістэмай
+    bg = Следване на системата
+    ca = Seguiu el sistema
+    cs = Sledování systému
+    da = Følg systemet
+    de = System folgen
+    el = Ακολουθήστε το σύστημα
+    es = Sistema de seguimiento
+    et = Jälgi süsteemi
+    eu = Jarraitu Sistema
+    fa = سیستم را دنبال کنید
+    fi = Seuraa järjestelmää
+    fr = Suivre le système
+    he = עקוב אחר מערכת
+    hi = सिस्टम का पालन करें
+    hu = Rendszer követése
+    id = Ikuti Sistem
+    it = Seguire il sistema
+    ja = フォローシステム
+    ko = 팔로우 시스템
+    lt = Sekite sistemą
+    lv = Sekojiet sistēmai
+    mr = सिस्टम फॉलो करा
+    nb = Følg systemet
+    nl = Systeem volgen
+    pl = Proszę śledzić system
+    pt = Siga o sistema
+    pt-BR = Seguir o sistema
+    ro = Urmați sistemul
+    ru = Система следования
+    sk = Sledovanie systému
+    sv = Följ systemet
+    sw = Fuata Mfumo
+    th = ติดตามระบบ
+    tr = Sistemi Takip Edin
+    uk = Система стеження
+    vi = Theo dõi hệ thống
+    zh-Hans = 遵循系统
+    zh-Hant = 關注系統
+
   [off]
     comment = Generic «Off» string
     tags = android,ios