diff --git a/android/app/src/main/res/drawable/bg_search_wheel_background_rect.xml b/android/app/src/main/res/drawable/bg_search_wheel_background_rect.xml
index 16b051606..19855012a 100644
--- a/android/app/src/main/res/drawable/bg_search_wheel_background_rect.xml
+++ b/android/app/src/main/res/drawable/bg_search_wheel_background_rect.xml
@@ -2,6 +2,6 @@
 <shape
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:shape="rectangle">
-  <solid android:color="@color/bg_panel"/>
+  <solid android:color="@color/bg_window"/>
   <corners android:radius="100dp"/>
 </shape>
\ No newline at end of file
diff --git a/android/app/src/main/res/drawable/bg_search_wheel_background_round.xml b/android/app/src/main/res/drawable/bg_search_wheel_background_round.xml
index 1286abf9b..55230467d 100644
--- a/android/app/src/main/res/drawable/bg_search_wheel_background_round.xml
+++ b/android/app/src/main/res/drawable/bg_search_wheel_background_round.xml
@@ -2,5 +2,5 @@
 <shape
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:shape="oval">
-  <solid android:color="@color/bg_panel"/>
+  <solid android:color="@color/bg_window"/>
 </shape>
\ No newline at end of file
diff --git a/android/app/src/main/res/layout/dialog_missed_map.xml b/android/app/src/main/res/layout/dialog_missed_map.xml
index a0dd58b5d..4214804b9 100644
--- a/android/app/src/main/res/layout/dialog_missed_map.xml
+++ b/android/app/src/main/res/layout/dialog_missed_map.xml
@@ -24,7 +24,7 @@
     android:id="@+id/items_frame"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?panel">
+    android:background="?windowBackgroundForced">
     <include
       layout="@layout/item_missed_map"
       android:layout_width="match_parent"
diff --git a/android/app/src/main/res/layout/dialog_missed_maps.xml b/android/app/src/main/res/layout/dialog_missed_maps.xml
index 08035f53d..14c8ff0d6 100644
--- a/android/app/src/main/res/layout/dialog_missed_maps.xml
+++ b/android/app/src/main/res/layout/dialog_missed_maps.xml
@@ -26,7 +26,7 @@
     android:id="@+id/items_frame"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="?panel"
+    android:background="?windowBackgroundForced"
     android:listSelector="?clickableBackground"
     android:drawSelectorOnTop="true"/>
 
diff --git a/android/app/src/main/res/layout/edit_bookmark_common.xml b/android/app/src/main/res/layout/edit_bookmark_common.xml
index 3df8e3497..2773898a9 100644
--- a/android/app/src/main/res/layout/edit_bookmark_common.xml
+++ b/android/app/src/main/res/layout/edit_bookmark_common.xml
@@ -60,7 +60,7 @@
       android:layout_below="@id/tv__bookmark_set_title"
       android:layout_centerVertical="true"
       android:layout_marginEnd="@dimen/margin_quadruple"
-      android:background="?attr/selectableItemBackground"
+      android:background="?selectableItemBackground"
       android:clickable="true"
       android:paddingTop="@dimen/margin_quarter_plus"
       android:paddingBottom="@dimen/margin_half_plus"
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..7ec17f737 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="?cardBackground"
   android:orientation="vertical"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
@@ -11,7 +11,6 @@
     style="@style/MwmWidget.ToolbarStyle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?colorPrimary"
     android:gravity="end|center_vertical"
     android:theme="@style/MwmWidget.ToolbarTheme">
   </com.google.android.material.appbar.MaterialToolbar>
diff --git a/android/app/src/main/res/layout/fragment_edit_bookmark.xml b/android/app/src/main/res/layout/fragment_edit_bookmark.xml
index 95caa905b..dad4f9c17 100644
--- a/android/app/src/main/res/layout/fragment_edit_bookmark.xml
+++ b/android/app/src/main/res/layout/fragment_edit_bookmark.xml
@@ -18,7 +18,7 @@
         app:srcCompat="@drawable/ic_done"
         android:layout_width="?actionBarSize"
         android:layout_height="?actionBarSize"
-        android:background="?attr/selectableItemBackgroundBorderless"
+        android:background="?selectableItemBackgroundBorderless"
         android:layout_gravity="end|center_vertical"
         android:scaleType="centerInside"
         android:contentDescription="@string/save" />
diff --git a/android/app/src/main/res/layout/fragment_editor_host.xml b/android/app/src/main/res/layout/fragment_editor_host.xml
index f815e061a..1d545ba15 100644
--- a/android/app/src/main/res/layout/fragment_editor_host.xml
+++ b/android/app/src/main/res/layout/fragment_editor_host.xml
@@ -48,7 +48,6 @@
   <FrameLayout
     android:id="@+id/fragment_container"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?panel"/>
+    android:layout_height="match_parent" />
 
 </LinearLayout>
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..9ef647ad3 100644
--- a/android/app/src/main/res/layout/fragment_osm_profile.xml
+++ b/android/app/src/main/res/layout/fragment_osm_profile.xml
@@ -12,7 +12,6 @@
     style="@style/MwmWidget.ToolbarStyle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?colorPrimary"
     android:gravity="end|center_vertical"
     android:theme="@style/MwmWidget.ToolbarTheme">
     <com.google.android.material.imageview.ShapeableImageView
diff --git a/android/app/src/main/res/layout/fragment_report.xml b/android/app/src/main/res/layout/fragment_report.xml
index 5f8f53fb4..a5a3a00d7 100644
--- a/android/app/src/main/res/layout/fragment_report.xml
+++ b/android/app/src/main/res/layout/fragment_report.xml
@@ -22,8 +22,7 @@
   <ScrollView
     android:id="@+id/scrollView"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?panel">
+    android:layout_height="match_parent">
 
     <LinearLayout
       android:layout_width="match_parent"
diff --git a/android/app/src/main/res/layout/fragment_search.xml b/android/app/src/main/res/layout/fragment_search.xml
index aa0358e2a..9b9b0d8aa 100644
--- a/android/app/src/main/res/layout/fragment_search.xml
+++ b/android/app/src/main/res/layout/fragment_search.xml
@@ -15,7 +15,7 @@
       android:id="@+id/app_bar"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:background="?attr/colorPrimary"
+      android:background="?colorPrimary"
       android:elevation="@dimen/dp_0"
       app:elevation="@dimen/dp_0">
         <include
diff --git a/android/app/src/main/res/layout/manage_route_bottom_sheet.xml b/android/app/src/main/res/layout/manage_route_bottom_sheet.xml
index eb3ba2a4e..ee8089cb7 100644
--- a/android/app/src/main/res/layout/manage_route_bottom_sheet.xml
+++ b/android/app/src/main/res/layout/manage_route_bottom_sheet.xml
@@ -45,7 +45,7 @@
     android:paddingStart="0dp"
     android:paddingEnd="@dimen/altitude_chart_container_padding_left">
 
-    <View
+    <com.google.android.material.divider.MaterialDivider
       android:layout_width="match_parent"
       android:layout_height="@dimen/divider_height"
       android:background="?dividerHorizontal"/>
diff --git a/android/app/src/main/res/layout/place_page_details.xml b/android/app/src/main/res/layout/place_page_details.xml
index a5ae4c7c2..2803e70a2 100644
--- a/android/app/src/main/res/layout/place_page_details.xml
+++ b/android/app/src/main/res/layout/place_page_details.xml
@@ -4,7 +4,7 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:background="?panel"
+  android:background="?windowBackgroundForced"
   android:orientation="vertical">
 
 
diff --git a/android/app/src/main/res/layout/place_page_preview.xml b/android/app/src/main/res/layout/place_page_preview.xml
index 0ae3361a0..f1691ba64 100644
--- a/android/app/src/main/res/layout/place_page_preview.xml
+++ b/android/app/src/main/res/layout/place_page_preview.xml
@@ -155,7 +155,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/margin_half_plus"
         android:layout_marginBottom="@dimen/margin_quarter"
-        android:background="?attr/selectableItemBackground"
+        android:background="?selectableItemBackground"
         android:gravity="center"
         android:orientation="horizontal"
         android:paddingStart="@dimen/margin_quarter"
diff --git a/android/app/src/main/res/layout/position_chooser.xml b/android/app/src/main/res/layout/position_chooser.xml
index 2c32a1d58..2375768de 100644
--- a/android/app/src/main/res/layout/position_chooser.xml
+++ b/android/app/src/main/res/layout/position_chooser.xml
@@ -29,7 +29,7 @@
   <com.google.android.material.textview.MaterialTextView
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?panel"
+    android:background="?cardBackground"
     android:padding="@dimen/margin_base"
     android:text="@string/editor_focus_map_on_location"
     app:layout_constraintTop_toBottomOf="@+id/toolbar_point_chooser" />
diff --git a/android/app/src/main/res/layout/pp_buttons_fragment.xml b/android/app/src/main/res/layout/pp_buttons_fragment.xml
index 87580bdb3..8be42766f 100644
--- a/android/app/src/main/res/layout/pp_buttons_fragment.xml
+++ b/android/app/src/main/res/layout/pp_buttons_fragment.xml
@@ -4,7 +4,7 @@
   android:id="@+id/pp_buttons_layout"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:background="?ppButtonsBackground"
+  android:background="?windowBackgroundForced"
   android:orientation="horizontal"
   android:layout_gravity="bottom">
   <include layout="@layout/item_divider" />
diff --git a/android/app/src/main/res/layout/routing_plan.xml b/android/app/src/main/res/layout/routing_plan.xml
index fa46ed821..4607b20c5 100644
--- a/android/app/src/main/res/layout/routing_plan.xml
+++ b/android/app/src/main/res/layout/routing_plan.xml
@@ -28,7 +28,7 @@
             android:layout_width="?attr/actionBarSize"
             android:layout_height="?attr/actionBarSize"
             android:layout_alignParentStart="true"
-            android:background="?attr/selectableItemBackgroundBorderless"
+            android:background="?selectableItemBackgroundBorderless"
             app:srcCompat="?homeAsUpIndicator"
             android:scaleType="center"
             tools:src="@drawable/ic_expand_more" />
@@ -143,7 +143,7 @@
     android:id="@+id/driving_options_btn_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/drivingOptionsViewBg"
+    android:background="?drivingOptionsViewBg"
     android:foreground="@drawable/shadow_top"
     android:visibility="gone"
     tools:visibility="visible">
@@ -151,7 +151,7 @@
       android:id="@+id/driving_options_btn"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:background="?attr/selectableItemBackgroundBorderless"
+      android:background="?selectableItemBackgroundBorderless"
       android:gravity="center"
       android:minHeight="@dimen/height_block_base">
       <LinearLayout
diff --git a/android/app/src/main/res/layout/toolbar_search_controls.xml b/android/app/src/main/res/layout/toolbar_search_controls.xml
index e425e4747..61eb0a68e 100644
--- a/android/app/src/main/res/layout/toolbar_search_controls.xml
+++ b/android/app/src/main/res/layout/toolbar_search_controls.xml
@@ -14,7 +14,7 @@
     android:id="@+id/back"
     android:layout_width="?attr/actionBarSize"
     android:layout_height="?attr/actionBarSize"
-    android:background="?attr/selectableItemBackgroundBorderless"
+    android:background="?selectableItemBackgroundBorderless"
     app:srcCompat="?homeAsUpIndicator"
     android:scaleType="center"
     tools:src="@drawable/ic_expand_more"
@@ -52,7 +52,7 @@
     android:layout_height="?actionBarSize"
     android:layout_gravity="center_vertical"
     android:layout_weight="0"
-    android:background="?attr/selectableItemBackgroundBorderless"
+    android:background="?selectableItemBackgroundBorderless"
     android:contentDescription="@string/clear_the_search"
     android:scaleType="center"
     app:srcCompat="@drawable/ic_close"/>
@@ -63,7 +63,7 @@
     android:layout_height="?actionBarSize"
     android:layout_gravity="center_vertical"
     android:layout_weight="0"
-    android:background="?attr/selectableItemBackgroundBorderless"
+    android:background="?selectableItemBackgroundBorderless"
     android:contentDescription="@null"
     android:scaleType="center"
     app:srcCompat="@drawable/ic_mic_white"