diff --git a/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButton.java b/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButton.java
index 5b1b0f339f..db803ddfc1 100644
--- a/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButton.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButton.java
@@ -46,7 +46,7 @@ public class TrafficButton
   void turnOff()
   {
     stopWaitingAnimation();
-// Don't set theme programatically - use an xml with a night variant instead. Also convert to svg.
+// TODO: Don't set theme programatically - use an xml with a night variant instead. Also convert to svg.
 //    mButton.setImageResource(ThemeUtils.isNightTheme(mButton.getContext()) ? R.drawable.ic_traffic_on_night
 //                                                                           : R.drawable.ic_traffic_on);
   }
@@ -54,7 +54,7 @@ public class TrafficButton
   void turnOn()
   {
     stopWaitingAnimation();
-// Don't set theme programatically - use an xml with a night variant instead.  Also convert to svg.
+// TODO: Don't set theme programatically - use an xml with a night variant instead.  Also convert to svg.
 //    mButton.setImageResource(ThemeUtils.isNightTheme(mButton.getContext()) ? R.drawable.ic_traffic_on_night
 //                                                                           : R.drawable.ic_traffic_on);
   }
@@ -62,7 +62,7 @@ public class TrafficButton
   void markAsOutdated()
   {
     stopWaitingAnimation();
-// Don't set theme programatically - use an xml with a night variant instead. Also convert to svg.
+// TODO: Don't set theme programatically - use an xml with a night variant instead. Also convert to svg.
 //    mButton.setImageResource(ThemeUtils.isNightTheme(mButton.getContext()) ? R.drawable.ic_traffic_outdated_night
 //                                                                           : R.drawable.ic_traffic_outdated);
   }
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 ffd94ea11e..74af42bc49 100644
--- a/android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java
+++ b/android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java
@@ -93,7 +93,7 @@ public enum ThemeSwitcher
       return calcAutoTheme();
     else if (ThemeUtils.isNavAutoTheme(mContext, theme))
     {
-      // navauto always falls back to light mode
+      // navauto should always be light, except in nav mode
       if (RoutingController.get().isVehicleNavigation())
         return calcAutoTheme();
       else
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 43d47f7df6..aa8a86786b 100644
--- a/android/app/src/main/java/app/organicmaps/util/ThemeUtils.java
+++ b/android/app/src/main/java/app/organicmaps/util/ThemeUtils.java
@@ -50,44 +50,24 @@ public final class ThemeUtils
     return defaultTheme.equals(theme);
   }
 
-  public static boolean isNightTheme(@NonNull Context context)
-  {
-    return isNightTheme(context, Config.getThemeSettings(context));
-  }
-
   public static boolean isNightTheme(@NonNull Context context, String theme)
   {
     String nightTheme = context.getString(R.string.theme_night);
     return nightTheme.equals(theme);
   }
 
-  public static boolean isSystemTheme(@NonNull Context context)
-  {
-    return isSystemTheme(context, Config.getThemeSettings(context));
-  }
-
   public static boolean isSystemTheme(@NonNull Context context, String theme)
   {
     String followSystemTheme = context.getString(R.string.theme_follow_system);
     return followSystemTheme.equals(theme);
   }
 
-  public static boolean isNavAutoTheme(@NonNull Context context)
-  {
-    return isNavAutoTheme(context, Config.getThemeSettings(context));
-  }
-
   public static boolean isNavAutoTheme(@NonNull Context context, String theme)
   {
     String navAutoTheme = context.getString(R.string.theme_nav_auto);
     return navAutoTheme.equals(theme);
   }
 
-  public static boolean isAutoTheme(@NonNull Context context)
-  {
-    return isSystemTheme(context, Config.getThemeSettings(context));
-  }
-
   public static boolean isAutoTheme(@NonNull Context context, String theme)
   {
     String followSystemTheme = context.getString(R.string.theme_auto);