diff --git a/android/app/src/main/res/layout-land/about.xml b/android/app/src/main/res/layout-land/about.xml
index a06e59e9b..8576f2869 100644
--- a/android/app/src/main/res/layout-land/about.xml
+++ b/android/app/src/main/res/layout-land/about.xml
@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?cardBackground"
+    android:background="?android:attr/colorBackground"
     android:clipToPadding="false"
     android:fadeScrollbars="false"
     android:fillViewport="true">
diff --git a/android/app/src/main/res/layout-land/fragment_osm_login.xml b/android/app/src/main/res/layout-land/fragment_osm_login.xml
index 5cf162618..2bf41462a 100644
--- a/android/app/src/main/res/layout-land/fragment_osm_login.xml
+++ b/android/app/src/main/res/layout-land/fragment_osm_login.xml
@@ -13,7 +13,7 @@
     android:id="@+id/scrollView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?cardBackground"
+    android:background="?android:attr/colorBackground"
     android:fadeScrollbars="false"
     android:fillViewport="true"
     android:clipToPadding="false">
diff --git a/android/app/src/main/res/layout-w1020dp/activity_settings.xml b/android/app/src/main/res/layout-w1020dp/activity_settings.xml
index 478cd6543..b7ff54a40 100644
--- a/android/app/src/main/res/layout-w1020dp/activity_settings.xml
+++ b/android/app/src/main/res/layout-w1020dp/activity_settings.xml
@@ -3,7 +3,8 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:orientation="vertical">
+  android:orientation="vertical"
+  android:background="?android:attr/colorBackground">
 
   <include
     layout="@layout/toolbar_extended"/>
diff --git a/android/app/src/main/res/layout/about.xml b/android/app/src/main/res/layout/about.xml
index 637608549..ba67ab460 100644
--- a/android/app/src/main/res/layout/about.xml
+++ b/android/app/src/main/res/layout/about.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?cardBackground"
+    android:background="?android:attr/colorBackground"
     android:clipToPadding="false"
     android:fadeScrollbars="false"
     android:fillViewport="true">
diff --git a/android/app/src/main/res/layout/activity_download_resources.xml b/android/app/src/main/res/layout/activity_download_resources.xml
index c7b428277..1f0306703 100644
--- a/android/app/src/main/res/layout/activity_download_resources.xml
+++ b/android/app/src/main/res/layout/activity_download_resources.xml
@@ -5,7 +5,7 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="?cardBackground">
+  android:background="?android:attr/colorBackground">
   <androidx.constraintlayout.widget.ConstraintLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/android/app/src/main/res/layout/activity_map_placeholder.xml b/android/app/src/main/res/layout/activity_map_placeholder.xml
index 2d3af6140..e38bb7b94 100644
--- a/android/app/src/main/res/layout/activity_map_placeholder.xml
+++ b/android/app/src/main/res/layout/activity_map_placeholder.xml
@@ -4,7 +4,7 @@
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   xmlns:app="http://schemas.android.com/apk/res-auto"
-  android:background="?cardBackground"
+  android:background="?android:attr/colorBackground"
   android:gravity="center"
   android:orientation="vertical">
 
diff --git a/android/app/src/main/res/layout/activity_request_permissions.xml b/android/app/src/main/res/layout/activity_request_permissions.xml
index 1b6ad8d60..71d2fc364 100644
--- a/android/app/src/main/res/layout/activity_request_permissions.xml
+++ b/android/app/src/main/res/layout/activity_request_permissions.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?cardBackground"
+    android:background="?android:attr/colorBackground"
     android:gravity="center"
     android:orientation="vertical">
 
diff --git a/android/app/src/main/res/layout/activity_settings.xml b/android/app/src/main/res/layout/activity_settings.xml
index 4df7f04a2..6d965b08a 100644
--- a/android/app/src/main/res/layout/activity_settings.xml
+++ b/android/app/src/main/res/layout/activity_settings.xml
@@ -3,7 +3,8 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:orientation="vertical">
+  android:orientation="vertical"
+  android:background="?android:attr/colorBackground">
 
   <include
     layout="@layout/toolbar_default"/>
diff --git a/android/app/src/main/res/layout/fragment_driving_options.xml b/android/app/src/main/res/layout/fragment_driving_options.xml
index 8460d0b16..b36484dbd 100644
--- a/android/app/src/main/res/layout/fragment_driving_options.xml
+++ b/android/app/src/main/res/layout/fragment_driving_options.xml
@@ -2,7 +2,7 @@
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
-  android:background="?attr/cardBackground"
+  android:background="?android:attr/colorBackground"
   android:orientation="vertical"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
diff --git a/android/app/src/main/res/layout/fragment_osm_login.xml b/android/app/src/main/res/layout/fragment_osm_login.xml
index 69cc6c800..6bf2296a3 100644
--- a/android/app/src/main/res/layout/fragment_osm_login.xml
+++ b/android/app/src/main/res/layout/fragment_osm_login.xml
@@ -13,7 +13,7 @@
     android:id="@+id/scrollView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?cardBackground"
+    android:background="?android:attr/colorBackground"
     android:fadeScrollbars="false"
     android:fillViewport="true"
     android:clipToPadding="false">
diff --git a/android/app/src/main/res/layout/fragment_osm_profile.xml b/android/app/src/main/res/layout/fragment_osm_profile.xml
index d672a2ee3..c65c601bf 100644
--- a/android/app/src/main/res/layout/fragment_osm_profile.xml
+++ b/android/app/src/main/res/layout/fragment_osm_profile.xml
@@ -6,7 +6,7 @@
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:orientation="vertical"
-  android:background="?cardBackground">
+  android:background="?android:attr/colorBackground">
   <com.google.android.material.appbar.MaterialToolbar
     android:id="@+id/toolbar"
     style="@style/MwmWidget.ToolbarStyle"
diff --git a/android/app/src/main/res/layout/fragment_prefs_storage.xml b/android/app/src/main/res/layout/fragment_prefs_storage.xml
index d23cba48f..1d4bbe83e 100644
--- a/android/app/src/main/res/layout/fragment_prefs_storage.xml
+++ b/android/app/src/main/res/layout/fragment_prefs_storage.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:background="?cardBackground">
+    android:background="?android:attr/colorBackground">
 
   <com.google.android.material.textview.MaterialTextView
       android:id="@+id/header"
diff --git a/android/app/src/main/res/values/themes.xml b/android/app/src/main/res/values/themes.xml
index 3336929e7..3bdce6222 100644
--- a/android/app/src/main/res/values/themes.xml
+++ b/android/app/src/main/res/values/themes.xml
@@ -191,8 +191,8 @@
   </style>
 
   <style name="MwmTheme.DownloadResourcesLegacy">
-    <item name="android:statusBarColor">@android:color/white</item>
-    <item name="android:navigationBarColor">@android:color/transparent</item>
+    <item name="android:statusBarColor">?cardBackground</item>
+    <item name="android:navigationBarColor">?cardBackground</item>
   </style>
 
   <style name="MwmTheme.CardBg">