diff --git a/android/app/src/main/res/layout/button_new_item.xml b/android/app/src/main/res/layout/button_new_item.xml
index 9d238de6b..10d296650 100644
--- a/android/app/src/main/res/layout/button_new_item.xml
+++ b/android/app/src/main/res/layout/button_new_item.xml
@@ -8,7 +8,7 @@
     android:layout_margin="4dp"
     android:clickable="true"
     android:focusable="true"
-    app:cardBackgroundColor="?cardBackground"
+    app:cardBackgroundColor="?appBackground"
     app:cardCornerRadius="12dp"
     app:cardElevation="2dp"
     tools:showIn="@layout/item_charging_sockets">
diff --git a/android/app/src/main/res/layout/fragment_editor.xml b/android/app/src/main/res/layout/fragment_editor.xml
index 3715c47a3..fa913e98f 100644
--- a/android/app/src/main/res/layout/fragment_editor.xml
+++ b/android/app/src/main/res/layout/fragment_editor.xml
@@ -6,6 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clipToPadding="false"
+    android:background="@color/bg_editor"
     tools:context=".editor.EditorActivity">
   <LinearLayout
       android:layout_width="match_parent"
@@ -430,7 +431,6 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:layout_marginBottom="@dimen/margin_quarter"
-        app:backgroundTint="?cardBackground"
         android:textColor="@color/base_red"
         app:strokeColor="@color/base_red"
         android:text="@string/editor_business_vacant_button"/>
@@ -441,7 +441,6 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:layout_marginBottom="@dimen/margin_base"
-        app:backgroundTint="?cardBackground"
         android:textColor="@color/base_red"
         app:strokeColor="@color/base_red"
         tools:text="Reset my changes"/>
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 9ea3723ec..ab1f62182 100644
--- a/android/app/src/main/res/layout/fragment_editor_host.xml
+++ b/android/app/src/main/res/layout/fragment_editor_host.xml
@@ -2,10 +2,9 @@
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  android:background="?windowBackgroundForced"
   android:orientation="vertical">
 
   <com.google.android.material.appbar.MaterialToolbar
diff --git a/android/app/src/main/res/layout/fragment_phone.xml b/android/app/src/main/res/layout/fragment_phone.xml
index b06284dd7..77636250e 100644
--- a/android/app/src/main/res/layout/fragment_phone.xml
+++ b/android/app/src/main/res/layout/fragment_phone.xml
@@ -10,13 +10,13 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:id="@+id/frameLayout"
-        android:background="?windowBackgroundForced">
+        android:background="@color/bg_editor"
+        android:layout_marginBottom="@dimen/margin_quarter">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/phones_recycler"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?cardBackground"
             android:scrollbars="vertical" />
 
     </FrameLayout>
diff --git a/android/app/src/main/res/layout/fragment_timetable.xml b/android/app/src/main/res/layout/fragment_timetable.xml
index 700a7ea8d..0dd8ac169 100644
--- a/android/app/src/main/res/layout/fragment_timetable.xml
+++ b/android/app/src/main/res/layout/fragment_timetable.xml
@@ -9,7 +9,7 @@
     style="@style/MwmWidget.FrameLayout.Elevation"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?windowBackgroundForced"
+    android:background="@color/bg_editor"
     android:layout_above="@+id/tv__mode_switch"
     android:layout_below="@id/toolbar"/>
 
@@ -19,14 +19,13 @@
     android:layout_height="wrap_content"
     android:layout_alignTop="@+id/tv__mode_switch"
     android:layout_alignParentBottom="true"
-    android:background="?cardBackground"/>
+    android:background="@color/bg_editor"/>
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__mode_switch"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_alignParentBottom="true"
-    android:background="?clickableBackground"
     android:gravity="center_vertical"
     android:padding="@dimen/margin_base"
     android:text="@string/editor_time_advanced"
@@ -35,7 +34,7 @@
     android:textColor="?colorSecondary" />
 
   <include
-    layout="@layout/shadow_bottom"
+    layout="@layout/item_divider"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_above="@id/tv__mode_switch"/>
diff --git a/android/app/src/main/res/layout/fragment_timetable_advanced.xml b/android/app/src/main/res/layout/fragment_timetable_advanced.xml
index bd729e103..51514a767 100644
--- a/android/app/src/main/res/layout/fragment_timetable_advanced.xml
+++ b/android/app/src/main/res/layout/fragment_timetable_advanced.xml
@@ -5,7 +5,7 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="?windowBackgroundForced">
+  android:background="@color/bg_editor">
 
   <LinearLayout
     android:layout_width="match_parent"
@@ -17,8 +17,7 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_marginTop="@dimen/margin_half"
-      style="@style/MwmWidget.M3.Editor.CardView"
-      app:cardBackgroundColor="?cardBackground">
+      style="@style/MwmWidget.M3.Editor.CardView">
 
       <LinearLayout
         android:id="@+id/examples"
diff --git a/android/app/src/main/res/layout/fragment_timetable_simple.xml b/android/app/src/main/res/layout/fragment_timetable_simple.xml
index 92df7c031..60b198a99 100644
--- a/android/app/src/main/res/layout/fragment_timetable_simple.xml
+++ b/android/app/src/main/res/layout/fragment_timetable_simple.xml
@@ -4,7 +4,7 @@
   android:id="@+id/recycler"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="?windowBackgroundForced"
+  android:background="@color/bg_editor"
   android:paddingStart="@dimen/margin_half"
   android:paddingEnd="@dimen/margin_half"
   android:scrollbars="vertical"/>
diff --git a/android/app/src/main/res/layout/item_charge_socket.xml b/android/app/src/main/res/layout/item_charge_socket.xml
index eeb49abef..04fecac58 100644
--- a/android/app/src/main/res/layout/item_charge_socket.xml
+++ b/android/app/src/main/res/layout/item_charge_socket.xml
@@ -6,7 +6,7 @@
     android:layout_margin="4dp"
     android:clickable="true"
     android:focusable="true"
-    app:cardBackgroundColor="?cardBackground"
+    app:cardBackgroundColor="?appBackground"
     app:cardCornerRadius="12dp"
     app:cardElevation="2dp">
 
diff --git a/android/app/src/main/res/layout/item_charging_sockets.xml b/android/app/src/main/res/layout/item_charging_sockets.xml
index 5ca42266e..e0dfde78a 100644
--- a/android/app/src/main/res/layout/item_charging_sockets.xml
+++ b/android/app/src/main/res/layout/item_charging_sockets.xml
@@ -21,5 +21,6 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:text="@string/edit_socket_info_tooltip"
-      android:textAppearance="?android:attr/textAppearanceSmall" />
+      android:textAppearance="?android:attr/textAppearanceSmall"
+      android:layout_marginBottom="@dimen/margin_quarter"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/android/app/src/main/res/layout/localized_name.xml b/android/app/src/main/res/layout/localized_name.xml
index d0cabef51..3f45c124c 100644
--- a/android/app/src/main/res/layout/localized_name.xml
+++ b/android/app/src/main/res/layout/localized_name.xml
@@ -7,6 +7,7 @@
   android:orientation="vertical"
   android:paddingEnd="@dimen/margin_base"
   android:paddingStart="@dimen/margin_base"
+  android:background="@color/fg_editor"
   android:animateLayoutChanges="true">
 
   <com.google.android.material.textview.MaterialTextView
@@ -20,7 +21,12 @@
     android:textAppearance="@style/MwmTextAppearance.Body3"
     tools:drawableEnd="@drawable/ic_expand_more" />
 
-  <include layout="@layout/recycler_default" />
+  <androidx.recyclerview.widget.RecyclerView
+    android:id="@+id/recycler"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/fg_editor"
+    android:scrollbars="vertical"/>
 
   <com.google.android.material.button.MaterialButton
     android:id="@+id/more_names"
diff --git a/android/app/src/main/res/layout/recycler_default.xml b/android/app/src/main/res/layout/recycler_default.xml
index a00ff5978..ed0eef765 100644
--- a/android/app/src/main/res/layout/recycler_default.xml
+++ b/android/app/src/main/res/layout/recycler_default.xml
@@ -4,5 +4,5 @@
   android:id="@+id/recycler"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:background="?cardBackground"
+  android:background="?appBackground"
   android:scrollbars="vertical"/>
diff --git a/android/app/src/main/res/values-night/colors.xml b/android/app/src/main/res/values-night/colors.xml
index 7f7af0456..d7ea723a6 100644
--- a/android/app/src/main/res/values-night/colors.xml
+++ b/android/app/src/main/res/values-night/colors.xml
@@ -16,6 +16,8 @@
   <color name="bg_panel">@color/bg_window</color>
   <color name="bg_primary_dark">#FF588157</color>
   <color name="bg_app">#10140F</color>
+  <color name="bg_editor">#161b14</color>
+  <color name="fg_editor">#282e25</color>
 
   <color name="bg_menu">#CC2D3237</color>
 
diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
index 67ece1c6d..5998dc52a 100644
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -65,6 +65,8 @@
   <color name="bg_panel">@color/bg_window</color>
   <color name="bg_primary_dark">#37653F</color> <!-- secondary dark -->
   <color name="bg_app">@android:color/white</color>
+  <color name="bg_editor">#ebefe4</color>
+  <color name="fg_editor">#f9faf2</color>
 
   <color name="bg_dialog_translucent">#BB000000</color>
   <color name="bg_text_translucent">#99FFFFFF</color>
diff --git a/android/app/src/main/res/values/styles-editor.xml b/android/app/src/main/res/values/styles-editor.xml
index 52bf50066..ab77e8cd4 100644
--- a/android/app/src/main/res/values/styles-editor.xml
+++ b/android/app/src/main/res/values/styles-editor.xml
@@ -89,8 +89,16 @@
     <item name="android:layout_width">match_parent</item>
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_marginBottom">@dimen/margin_half</item>
-    <item name="cardBackgroundColor">?cardBackground</item>
+    <item name="cardBackgroundColor">@color/fg_editor</item>
     <item name="android:padding">@dimen/margin_base</item>
     <item name="cardPreventCornerOverlap">false</item>
   </style>
+    <style name="MwmWidget.M3.CardView" parent="Widget.Material3.CardView.Elevated">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginBottom">@dimen/margin_half</item>
+        <item name="cardBackgroundColor">?appBackground</item>
+        <item name="android:padding">@dimen/margin_base</item>
+        <item name="cardPreventCornerOverlap">false</item>
+    </style>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index e8811e55d..8381e529d 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -239,10 +239,6 @@
     <item name="android:foreground">@drawable/shadow_top</item>
   </style>
 
-  <style name="MwmWidget.FrameLayout.BookmarkCategories">
-    <item name="android:background">?windowBackgroundForced</item>
-  </style>
-
   <style name="MwmWidget.Counter">
     <item name="android:layout_width">wrap_content</item>
     <item name="android:layout_height">wrap_content</item>
diff --git a/android/app/src/main/res/values/themes.xml b/android/app/src/main/res/values/themes.xml
index 2fae9a9b1..53bab3816 100644
--- a/android/app/src/main/res/values/themes.xml
+++ b/android/app/src/main/res/values/themes.xml
@@ -278,10 +278,6 @@
   <style name="MwmTheme.Navigation">
     <item name="iconTint">@color/white_primary</item>
   </style>
-
-  <style name="PopupMenu" parent="ThemeOverlay.Material3">
-    <item name="android:popupBackground">?windowBackgroundForced</item>
-  </style>
     <!-- Theme required to apply M3 dialog style on preference screen -->
     <style name="MwmTheme.M3.AlertDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog">
         <item name="dialogCornerRadius">28dp</item>