From 45094b0c383d922f1b0f750a0b16e157d0e4e932 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Sat, 20 Sep 2025 17:20:33 +0200
Subject: [PATCH] [android] Apply M3 theme like app theme

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
---
 .../organicmaps/editor/FromToTimePicker.java  |   2 +-
 .../res/color/m3_dark_highlighted_text.xml    |  20 +++
 .../main/res/color/m3_highlighted_text.xml    |  20 +++
 .../main/res/layout/dialog_sorting_types.xml  |  16 +-
 .../main/res/layout/edit_bookmark_common.xml  |   3 +-
 .../src/main/res/layout/fragment_editor.xml   |  16 +-
 .../layout/fragment_timetable_advanced.xml    |   1 +
 .../res/layout/item_bookmark_category.xml     |   6 +-
 .../layout/item_bookmark_category_choose.xml  |   4 +-
 .../src/main/res/layout/item_editor_input.xml |   1 -
 .../app/src/main/res/layout/item_phone.xml    |   1 +
 .../src/main/res/layout/item_selection.xml    |   3 +-
 .../app/src/main/res/layout/item_street.xml   |   3 +-
 .../src/main/res/layout/item_timetable.xml    |   2 +-
 .../main/res/layout/map_buttons_layers.xml    |   1 -
 .../app/src/main/res/layout/routing_plan.xml  |  25 ++-
 .../src/main/res/values-night/m3_colors.xml   | 144 ++++++++++++++++++
 .../app/src/main/res/values-night/themes.xml  |  54 ++++++-
 android/app/src/main/res/values/dimens.xml    |   1 +
 android/app/src/main/res/values/m3_colors.xml | 144 ++++++++++++++++++
 .../app/src/main/res/values/styles-editor.xml |  11 ++
 android/app/src/main/res/values/styles.xml    |  19 ++-
 android/app/src/main/res/values/themes.xml    |  66 ++++++--
 23 files changed, 499 insertions(+), 64 deletions(-)
 create mode 100644 android/app/src/main/res/color/m3_dark_highlighted_text.xml
 create mode 100644 android/app/src/main/res/color/m3_highlighted_text.xml
 create mode 100644 android/app/src/main/res/values-night/m3_colors.xml
 create mode 100644 android/app/src/main/res/values/m3_colors.xml

diff --git a/android/app/src/main/java/app/organicmaps/editor/FromToTimePicker.java b/android/app/src/main/java/app/organicmaps/editor/FromToTimePicker.java
index c344c0f32..8f032a994 100644
--- a/android/app/src/main/java/app/organicmaps/editor/FromToTimePicker.java
+++ b/android/app/src/main/java/app/organicmaps/editor/FromToTimePicker.java
@@ -158,7 +158,7 @@ public class FromToTimePicker
                                              .setTitleText(title)
                                              .setTimeFormat(mIs24HourFormat ? TimeFormat.CLOCK_24H : TimeFormat.CLOCK_12H)
                                              .setInputMode(mInputMode)
-                                             .setTheme(R.style.MwmMain_MaterialTimePicker)
+                                             .setTheme(R.style.MwmTheme_MaterialTimePicker)
                                              .setHour((int) time.hours)
                                              .setMinute((int) time.minutes);
 
diff --git a/android/app/src/main/res/color/m3_dark_highlighted_text.xml b/android/app/src/main/res/color/m3_dark_highlighted_text.xml
new file mode 100644
index 000000000..c9ac3abdf
--- /dev/null
+++ b/android/app/src/main/res/color/m3_dark_highlighted_text.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+-->
+<!-- Material3 alternative to textColorHighlight for dark theme -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:alpha="@dimen/material_emphasis_medium" android:color="@color/m3_sys_color_dark_primary" />
+</selector>
diff --git a/android/app/src/main/res/color/m3_highlighted_text.xml b/android/app/src/main/res/color/m3_highlighted_text.xml
new file mode 100644
index 000000000..ab960c74a
--- /dev/null
+++ b/android/app/src/main/res/color/m3_highlighted_text.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+-->
+<!-- Material3 alternative to textColorHighlight for light theme -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:alpha="@dimen/material_emphasis_medium" android:color="?attr/colorOnPrimaryContainer" />
+</selector>
diff --git a/android/app/src/main/res/layout/dialog_sorting_types.xml b/android/app/src/main/res/layout/dialog_sorting_types.xml
index 50e43174c..1def89a8b 100644
--- a/android/app/src/main/res/layout/dialog_sorting_types.xml
+++ b/android/app/src/main/res/layout/dialog_sorting_types.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:layout_margin="@dimen/margin_double_and_half"
@@ -32,7 +33,8 @@
       android:layout_height="wrap_content"
       android:padding="@dimen/margin_half_double_plus"
       android:checked="true"
-      android:text="@string/by_default"/>
+      android:text="@string/by_default"
+      app:buttonTint="@null"/>
 
     <RadioButton
       style="?fontSubtitle1"
@@ -41,7 +43,8 @@
       android:layout_height="wrap_content"
       android:padding="@dimen/margin_half_double_plus"
       android:checked="false"
-      android:text="@string/by_name"/>
+      android:text="@string/by_name"
+      app:buttonTint="@null"/>
 
     <RadioButton
       style="?fontSubtitle1"
@@ -50,7 +53,8 @@
       android:layout_height="wrap_content"
       android:padding="@dimen/margin_half_double_plus"
       android:checked="false"
-      android:text="@string/by_type"/>
+      android:text="@string/by_type"
+      app:buttonTint="@null"/>
 
     <RadioButton
       style="?fontSubtitle1"
@@ -59,7 +63,8 @@
       android:layout_height="wrap_content"
       android:padding="@dimen/margin_half_double_plus"
       android:checked="false"
-      android:text="@string/by_distance"/>
+      android:text="@string/by_distance"
+      app:buttonTint="@null"/>
 
     <RadioButton
       style="?fontSubtitle1"
@@ -68,6 +73,7 @@
       android:layout_height="wrap_content"
       android:padding="@dimen/margin_half_double_plus"
       android:checked="false"
-      android:text="@string/by_date"/>
+      android:text="@string/by_date"
+      app:buttonTint="@null"/>
   </RadioGroup>
 </LinearLayout>
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 19256bcc1..be18fcf66 100644
--- a/android/app/src/main/res/layout/edit_bookmark_common.xml
+++ b/android/app/src/main/res/layout/edit_bookmark_common.xml
@@ -91,8 +91,9 @@
     style="?fontBody1"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_marginEnd="@dimen/margin_half"
+    android:layout_marginStart="@dimen/margin_half"
     android:layout_below="@id/rl__bookmark_set"
-    android:layout_margin="@dimen/margin_half"
     android:hint="@string/placepage_personal_notes_hint"
     android:textColorHint="?android:textColorSecondary">
 
diff --git a/android/app/src/main/res/layout/fragment_editor.xml b/android/app/src/main/res/layout/fragment_editor.xml
index 3f14a84be..0981aaa2c 100644
--- a/android/app/src/main/res/layout/fragment_editor.xml
+++ b/android/app/src/main/res/layout/fragment_editor.xml
@@ -23,7 +23,7 @@
         android:textAppearance="@style/MwmTextAppearance.Body4"/>
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/cv__category"
-        style="@style/MwmWidget.Editor.CardView">
+        style="@style/MwmWidget.M3.Editor.CardView">
       <RelativeLayout
           android:id="@+id/category"
           style="@style/MwmWidget.Editor.MetadataBlock"
@@ -64,7 +64,7 @@
     </com.google.android.material.card.MaterialCardView>
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/cv__charging_station"
-        style="@style/MwmWidget.Editor.CardView"
+        style="@style/MwmWidget.M3.Editor.CardView"
         android:visibility="gone">
       <LinearLayout
           android:layout_width="match_parent"
@@ -86,12 +86,12 @@
     </com.google.android.material.card.MaterialCardView>
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/cv__name"
-        style="@style/MwmWidget.Editor.CardView">
+        style="@style/MwmWidget.M3.Editor.CardView">
       <include layout="@layout/localized_name"/>
     </com.google.android.material.card.MaterialCardView>
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/cv__address"
-        style="@style/MwmWidget.Editor.CardView">
+        style="@style/MwmWidget.M3.Editor.CardView">
       <LinearLayout
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
@@ -147,7 +147,7 @@
 
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/cv__details"
-        style="@style/MwmWidget.Editor.CardView">
+        style="@style/MwmWidget.M3.Editor.CardView">
       <LinearLayout
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
@@ -327,7 +327,7 @@
 
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/cv__social_media"
-        style="@style/MwmWidget.Editor.CardView">
+        style="@style/MwmWidget.M3.Editor.CardView">
       <LinearLayout
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
@@ -369,7 +369,7 @@
 
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/cv__building"
-        style="@style/MwmWidget.Editor.CardView">
+        style="@style/MwmWidget.M3.Editor.CardView">
       <LinearLayout
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
@@ -394,7 +394,7 @@
 
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/cv__more"
-        style="@style/MwmWidget.Editor.CardView"
+        style="@style/MwmWidget.M3.Editor.CardView"
         android:layout_marginBottom="@dimen/margin_base">
       <LinearLayout
           android:layout_width="match_parent"
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 6f0bf7e6f..b96765d76 100644
--- a/android/app/src/main/res/layout/fragment_timetable_advanced.xml
+++ b/android/app/src/main/res/layout/fragment_timetable_advanced.xml
@@ -16,6 +16,7 @@
     <com.google.android.material.card.MaterialCardView
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
+      style="@style/MwmWidget.M3.Editor.CardView"
       card_view:cardBackgroundColor="?cardBackground"
       card_view:cardCornerRadius="2dp"
       card_view:cardElevation="4dp">
diff --git a/android/app/src/main/res/layout/item_bookmark_category.xml b/android/app/src/main/res/layout/item_bookmark_category.xml
index 2777c7989..e26b9cdc0 100644
--- a/android/app/src/main/res/layout/item_bookmark_category.xml
+++ b/android/app/src/main/res/layout/item_bookmark_category.xml
@@ -8,8 +8,8 @@
   android:background="@drawable/bg_clickable_card">
   <com.google.android.material.checkbox.MaterialCheckBox
     android:id="@+id/checkbox"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
+    android:layout_width="40dp"
+    android:layout_height="40dp"
     android:layout_alignBottom="@id/bottom_line_container"
     android:layout_alignParentStart="true"
     android:layout_alignParentTop="true"
@@ -18,7 +18,7 @@
     android:layout_marginStart="8dp"
     android:background="@null"
     android:button="@drawable/visibility_selector"
-    android:buttonTint="?accentColorSelector"
+    app:buttonTint="@color/accent_color_selector"
     android:padding="@dimen/margin_half" />
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/name"
diff --git a/android/app/src/main/res/layout/item_bookmark_category_choose.xml b/android/app/src/main/res/layout/item_bookmark_category_choose.xml
index 62ed8d056..3504b6a13 100644
--- a/android/app/src/main/res/layout/item_bookmark_category_choose.xml
+++ b/android/app/src/main/res/layout/item_bookmark_category_choose.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="48dp"
     android:background="?clickableBackground"
@@ -14,7 +15,8 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:clickable="false"
-    android:focusable="false"/>
+    android:focusable="false"
+    app:buttonTint="@null"/>
 
   <com.google.android.material.textview.MaterialTextView
       android:id="@+id/tv__set_name"
diff --git a/android/app/src/main/res/layout/item_editor_input.xml b/android/app/src/main/res/layout/item_editor_input.xml
index 84f750754..5660f5e9f 100644
--- a/android/app/src/main/res/layout/item_editor_input.xml
+++ b/android/app/src/main/res/layout/item_editor_input.xml
@@ -18,7 +18,6 @@
     android:layout_width="0dp"
     android:layout_centerVertical="true"
     android:layout_marginStart="14dp"
-    android:textColorHint="?android:textColorSecondary"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toEndOf="@+id/icon"
diff --git a/android/app/src/main/res/layout/item_phone.xml b/android/app/src/main/res/layout/item_phone.xml
index bfc8fe6eb..a0d99e72f 100644
--- a/android/app/src/main/res/layout/item_phone.xml
+++ b/android/app/src/main/res/layout/item_phone.xml
@@ -5,6 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="@dimen/height_item_oneline"
     android:background="?clickableBackground"
+    android:layout_marginTop="@dimen/margin_half"
     android:paddingStart="@dimen/margin_half_plus"
     android:paddingEnd="@dimen/margin_half_plus">
 
diff --git a/android/app/src/main/res/layout/item_selection.xml b/android/app/src/main/res/layout/item_selection.xml
index 470a6f3cd..842e99c4a 100644
--- a/android/app/src/main/res/layout/item_selection.xml
+++ b/android/app/src/main/res/layout/item_selection.xml
@@ -19,7 +19,8 @@
     android:layout_marginEnd="@dimen/margin_base"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent"/>
+    app:layout_constraintTop_toTopOf="parent"
+    app:buttonTint="@null"/>
 
   <LinearLayout
     android:layout_width="match_parent"
diff --git a/android/app/src/main/res/layout/item_street.xml b/android/app/src/main/res/layout/item_street.xml
index 95ff1473d..5d5e1f560 100644
--- a/android/app/src/main/res/layout/item_street.xml
+++ b/android/app/src/main/res/layout/item_street.xml
@@ -19,7 +19,8 @@
     android:layout_marginEnd="@dimen/margin_base"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent"/>
+    app:layout_constraintTop_toTopOf="parent"
+    app:buttonTint="@null"/>
 
   <LinearLayout
     android:layout_width="match_parent"
diff --git a/android/app/src/main/res/layout/item_timetable.xml b/android/app/src/main/res/layout/item_timetable.xml
index 1400b4f49..1d68cf757 100644
--- a/android/app/src/main/res/layout/item_timetable.xml
+++ b/android/app/src/main/res/layout/item_timetable.xml
@@ -3,7 +3,7 @@
   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"
-  style="@style/MwmWidget.Editor.CardView"
+  style="@style/MwmWidget.M3.Editor.CardView"
   android:layout_marginBottom="@dimen/margin_half"
   android:layout_marginTop="@dimen/margin_half">
 
diff --git a/android/app/src/main/res/layout/map_buttons_layers.xml b/android/app/src/main/res/layout/map_buttons_layers.xml
index 621641f55..1596db477 100644
--- a/android/app/src/main/res/layout/map_buttons_layers.xml
+++ b/android/app/src/main/res/layout/map_buttons_layers.xml
@@ -4,7 +4,6 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:id="@+id/layers_button"
   style="@style/MwmWidget.M3.FAB.MapButton"
-  android:tint="?iconTint"
   android:contentDescription="@string/layers_title"
   app:tint="?accentColorSelector"
   app:srcCompat="@drawable/ic_layers" />
diff --git a/android/app/src/main/res/layout/routing_plan.xml b/android/app/src/main/res/layout/routing_plan.xml
index 2aa5a813d..fa46ed821 100644
--- a/android/app/src/main/res/layout/routing_plan.xml
+++ b/android/app/src/main/res/layout/routing_plan.xml
@@ -43,9 +43,8 @@
 
           <app.organicmaps.widget.RoutingToolbarButton
               android:id="@+id/vehicle"
-              style="@style/Widget.AppCompat.CompoundButton.RadioButton"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
+              android:layout_width="@dimen/routing_toolbar_button"
+              android:layout_height="@dimen/routing_toolbar_button"
               android:layout_marginStart="@dimen/routing_selector_wheel_margin"
               android:contentDescription="@string/vehicle"
               tools:button="@drawable/ic_car"
@@ -53,9 +52,8 @@
 
           <app.organicmaps.widget.RoutingToolbarButton
               android:id="@+id/pedestrian"
-              style="@style/Widget.AppCompat.CompoundButton.RadioButton"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
+              android:layout_width="@dimen/routing_toolbar_button"
+              android:layout_height="@dimen/routing_toolbar_button"
               android:layout_marginStart="12dp"
               android:layout_marginEnd="12dp"
               android:contentDescription="@string/pedestrian"
@@ -64,9 +62,8 @@
 
           <app.organicmaps.widget.RoutingToolbarButton
               android:id="@+id/transit"
-              style="@style/Widget.AppCompat.CompoundButton.RadioButton"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
+              android:layout_width="@dimen/routing_toolbar_button"
+              android:layout_height="@dimen/routing_toolbar_button"
               android:layout_marginEnd="@dimen/margin_half_plus"
               android:contentDescription="@string/subway"
               tools:button="@drawable/ic_route_planning_metro_40px"
@@ -74,9 +71,8 @@
 
           <app.organicmaps.widget.RoutingToolbarButton
               android:id="@+id/bicycle"
-              style="@style/Widget.AppCompat.CompoundButton.RadioButton"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
+              android:layout_width="@dimen/routing_toolbar_button"
+              android:layout_height="@dimen/routing_toolbar_button"
               android:layout_marginEnd="12dp"
               android:contentDescription="@string/bicycle"
               tools:button="@drawable/ic_bike"
@@ -84,9 +80,8 @@
 
           <app.organicmaps.widget.RoutingToolbarButton
               android:id="@+id/ruler"
-              style="@style/Widget.AppCompat.CompoundButton.RadioButton"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
+              android:layout_width="@dimen/routing_toolbar_button"
+              android:layout_height="@dimen/routing_toolbar_button"
               android:layout_marginEnd="12dp"
               android:contentDescription="@string/ruler"
               tools:button="@drawable/ic_ruler_route"
diff --git a/android/app/src/main/res/values-night/m3_colors.xml b/android/app/src/main/res/values-night/m3_colors.xml
new file mode 100644
index 000000000..020da60eb
--- /dev/null
+++ b/android/app/src/main/res/values-night/m3_colors.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="md_theme_primary">#9FD49C</color>
+    <color name="md_theme_onPrimary">#063911</color>
+    <color name="md_theme_primaryContainer">#215025</color>
+    <color name="md_theme_onPrimaryContainer">#BAF0B6</color>
+    <color name="md_theme_secondary">#9BD4A0</color>
+    <color name="md_theme_onSecondary">#003915</color>
+    <color name="md_theme_secondaryContainer">#1B5129</color>
+    <color name="md_theme_onSecondaryContainer">#B6F1BB</color>
+    <color name="md_theme_tertiary">#A1CED5</color>
+    <color name="md_theme_onTertiary">#00363C</color>
+    <color name="md_theme_tertiaryContainer">#1F4D53</color>
+    <color name="md_theme_onTertiaryContainer">#BCEBF1</color>
+    <color name="md_theme_error">#FFB4AB</color>
+    <color name="md_theme_onError">#690005</color>
+    <color name="md_theme_errorContainer">#93000A</color>
+    <color name="md_theme_onErrorContainer">#FFDAD6</color>
+    <color name="md_theme_background">#10140F</color>
+    <color name="md_theme_onBackground">#E0E4DB</color>
+    <color name="md_theme_surface">#0E1513</color>
+    <color name="md_theme_onSurface">#DEE4E0</color>
+    <color name="md_theme_surfaceVariant">#424940</color>
+    <color name="md_theme_onSurfaceVariant">#C2C9BD</color>
+    <color name="md_theme_outline">#8C9388</color>
+    <color name="md_theme_outlineVariant">#424940</color>
+    <color name="md_theme_scrim">#000000</color>
+    <color name="md_theme_inverseSurface">#DEE4E0</color>
+    <color name="md_theme_inverseOnSurface">#2B322F</color>
+    <color name="md_theme_inversePrimary">#39693B</color>
+    <color name="md_theme_primaryFixed">#BAF0B6</color>
+    <color name="md_theme_onPrimaryFixed">#002106</color>
+    <color name="md_theme_primaryFixedDim">#9FD49C</color>
+    <color name="md_theme_onPrimaryFixedVariant">#215025</color>
+    <color name="md_theme_secondaryFixed">#B6F1BB</color>
+    <color name="md_theme_onSecondaryFixed">#002109</color>
+    <color name="md_theme_secondaryFixedDim">#9BD4A0</color>
+    <color name="md_theme_onSecondaryFixedVariant">#1B5129</color>
+    <color name="md_theme_tertiaryFixed">#BCEBF1</color>
+    <color name="md_theme_onTertiaryFixed">#001F23</color>
+    <color name="md_theme_tertiaryFixedDim">#A1CED5</color>
+    <color name="md_theme_onTertiaryFixedVariant">#1F4D53</color>
+    <color name="md_theme_surfaceDim">#0E1513</color>
+    <color name="md_theme_surfaceBright">#343B38</color>
+    <color name="md_theme_surfaceContainerLowest">#090F0E</color>
+    <color name="md_theme_surfaceContainerLow">#171D1B</color>
+    <color name="md_theme_surfaceContainer">#1B211F</color>
+    <color name="md_theme_surfaceContainerHigh">#252B29</color>
+    <color name="md_theme_surfaceContainerHighest">#303634</color>
+    <color name="md_theme_primary_mediumContrast">#B4EAB0</color>
+    <color name="md_theme_onPrimary_mediumContrast">#002D09</color>
+    <color name="md_theme_primaryContainer_mediumContrast">#6B9D6A</color>
+    <color name="md_theme_onPrimaryContainer_mediumContrast">#000000</color>
+    <color name="md_theme_secondary_mediumContrast">#B0EAB5</color>
+    <color name="md_theme_onSecondary_mediumContrast">#002D0F</color>
+    <color name="md_theme_secondaryContainer_mediumContrast">#679D6E</color>
+    <color name="md_theme_onSecondaryContainer_mediumContrast">#000000</color>
+    <color name="md_theme_tertiary_mediumContrast">#B6E4EB</color>
+    <color name="md_theme_onTertiary_mediumContrast">#002A2F</color>
+    <color name="md_theme_tertiaryContainer_mediumContrast">#6C989E</color>
+    <color name="md_theme_onTertiaryContainer_mediumContrast">#000000</color>
+    <color name="md_theme_error_mediumContrast">#FFD2CC</color>
+    <color name="md_theme_onError_mediumContrast">#540003</color>
+    <color name="md_theme_errorContainer_mediumContrast">#FF5449</color>
+    <color name="md_theme_onErrorContainer_mediumContrast">#000000</color>
+    <color name="md_theme_background_mediumContrast">#10140F</color>
+    <color name="md_theme_onBackground_mediumContrast">#E0E4DB</color>
+    <color name="md_theme_surface_mediumContrast">#0E1513</color>
+    <color name="md_theme_onSurface_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_surfaceVariant_mediumContrast">#424940</color>
+    <color name="md_theme_onSurfaceVariant_mediumContrast">#D8DED3</color>
+    <color name="md_theme_outline_mediumContrast">#ADB4A9</color>
+    <color name="md_theme_outlineVariant_mediumContrast">#8B9288</color>
+    <color name="md_theme_scrim_mediumContrast">#000000</color>
+    <color name="md_theme_inverseSurface_mediumContrast">#DEE4E0</color>
+    <color name="md_theme_inverseOnSurface_mediumContrast">#252B29</color>
+    <color name="md_theme_inversePrimary_mediumContrast">#225227</color>
+    <color name="md_theme_primaryFixed_mediumContrast">#BAF0B6</color>
+    <color name="md_theme_onPrimaryFixed_mediumContrast">#001603</color>
+    <color name="md_theme_primaryFixedDim_mediumContrast">#9FD49C</color>
+    <color name="md_theme_onPrimaryFixedVariant_mediumContrast">#0E3F16</color>
+    <color name="md_theme_secondaryFixed_mediumContrast">#B6F1BB</color>
+    <color name="md_theme_onSecondaryFixed_mediumContrast">#001505</color>
+    <color name="md_theme_secondaryFixedDim_mediumContrast">#9BD4A0</color>
+    <color name="md_theme_onSecondaryFixedVariant_mediumContrast">#053F1A</color>
+    <color name="md_theme_tertiaryFixed_mediumContrast">#BCEBF1</color>
+    <color name="md_theme_onTertiaryFixed_mediumContrast">#001417</color>
+    <color name="md_theme_tertiaryFixedDim_mediumContrast">#A1CED5</color>
+    <color name="md_theme_onTertiaryFixedVariant_mediumContrast">#083C42</color>
+    <color name="md_theme_surfaceDim_mediumContrast">#0E1513</color>
+    <color name="md_theme_surfaceBright_mediumContrast">#3F4643</color>
+    <color name="md_theme_surfaceContainerLowest_mediumContrast">#040807</color>
+    <color name="md_theme_surfaceContainerLow_mediumContrast">#191F1D</color>
+    <color name="md_theme_surfaceContainer_mediumContrast">#232927</color>
+    <color name="md_theme_surfaceContainerHigh_mediumContrast">#2E3432</color>
+    <color name="md_theme_surfaceContainerHighest_mediumContrast">#393F3D</color>
+    <color name="md_theme_primary_highContrast">#C7FEC3</color>
+    <color name="md_theme_onPrimary_highContrast">#000000</color>
+    <color name="md_theme_primaryContainer_highContrast">#9BD098</color>
+    <color name="md_theme_onPrimaryContainer_highContrast">#000F02</color>
+    <color name="md_theme_secondary_highContrast">#C3FEC8</color>
+    <color name="md_theme_onSecondary_highContrast">#000000</color>
+    <color name="md_theme_secondaryContainer_highContrast">#97D09D</color>
+    <color name="md_theme_onSecondaryContainer_highContrast">#000F03</color>
+    <color name="md_theme_tertiary_highContrast">#CAF8FF</color>
+    <color name="md_theme_onTertiary_highContrast">#000000</color>
+    <color name="md_theme_tertiaryContainer_highContrast">#9DCAD1</color>
+    <color name="md_theme_onTertiaryContainer_highContrast">#000E10</color>
+    <color name="md_theme_error_highContrast">#FFECE9</color>
+    <color name="md_theme_onError_highContrast">#000000</color>
+    <color name="md_theme_errorContainer_highContrast">#FFAEA4</color>
+    <color name="md_theme_onErrorContainer_highContrast">#220001</color>
+    <color name="md_theme_background_highContrast">#10140F</color>
+    <color name="md_theme_onBackground_highContrast">#E0E4DB</color>
+    <color name="md_theme_surface_highContrast">#0E1513</color>
+    <color name="md_theme_onSurface_highContrast">#FFFFFF</color>
+    <color name="md_theme_surfaceVariant_highContrast">#424940</color>
+    <color name="md_theme_onSurfaceVariant_highContrast">#FFFFFF</color>
+    <color name="md_theme_outline_highContrast">#EBF2E6</color>
+    <color name="md_theme_outlineVariant_highContrast">#BEC5B9</color>
+    <color name="md_theme_scrim_highContrast">#000000</color>
+    <color name="md_theme_inverseSurface_highContrast">#DEE4E0</color>
+    <color name="md_theme_inverseOnSurface_highContrast">#000000</color>
+    <color name="md_theme_inversePrimary_highContrast">#225227</color>
+    <color name="md_theme_primaryFixed_highContrast">#BAF0B6</color>
+    <color name="md_theme_onPrimaryFixed_highContrast">#000000</color>
+    <color name="md_theme_primaryFixedDim_highContrast">#9FD49C</color>
+    <color name="md_theme_onPrimaryFixedVariant_highContrast">#001603</color>
+    <color name="md_theme_secondaryFixed_highContrast">#B6F1BB</color>
+    <color name="md_theme_onSecondaryFixed_highContrast">#000000</color>
+    <color name="md_theme_secondaryFixedDim_highContrast">#9BD4A0</color>
+    <color name="md_theme_onSecondaryFixedVariant_highContrast">#001505</color>
+    <color name="md_theme_tertiaryFixed_highContrast">#BCEBF1</color>
+    <color name="md_theme_onTertiaryFixed_highContrast">#000000</color>
+    <color name="md_theme_tertiaryFixedDim_highContrast">#A1CED5</color>
+    <color name="md_theme_onTertiaryFixedVariant_highContrast">#001417</color>
+    <color name="md_theme_surfaceDim_highContrast">#0E1513</color>
+    <color name="md_theme_surfaceBright_highContrast">#4B514F</color>
+    <color name="md_theme_surfaceContainerLowest_highContrast">#000000</color>
+    <color name="md_theme_surfaceContainerLow_highContrast">#1B211F</color>
+    <color name="md_theme_surfaceContainer_highContrast">#2B322F</color>
+    <color name="md_theme_surfaceContainerHigh_highContrast">#363D3A</color>
+    <color name="md_theme_surfaceContainerHighest_highContrast">#424846</color>
+</resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-night/themes.xml b/android/app/src/main/res/values-night/themes.xml
index 5ee2b2f18..6bd0730eb 100644
--- a/android/app/src/main/res/values-night/themes.xml
+++ b/android/app/src/main/res/values-night/themes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-  <style name="MwmTheme.Base" parent="Theme.MaterialComponents.DayNight.NoActionBar.Bridge">
+  <style name="MwmTheme.Base" parent="Theme.Material3.DayNight.NoActionBar">
     <item name="materialCalendarStyle">@style/Widget.MaterialComponents.MaterialCalendar</item>
     <item name="materialCalendarFullscreenTheme">@style/MwmWidget.MaterialCalendar.Theme.FullScreen.Dark</item>
     <item name="materialCalendarTheme">@style/MwmWidget.MaterialCalendar.Theme.Dark</item>
@@ -27,7 +27,6 @@
     <item name="titleDialogTheme">@color/white_primary</item>
     <item name="textDialogTheme">@color/white_secondary</item>
     <item name="fullscreenDialogTheme">@style/MwmTheme.DialogFragment.Fullscreen</item>
-    <item name="colorPrimary">@color/bg_primary</item>
     <item name="colorControlNormal">?secondary</item>
     <item name="colorAccent">@color/base_accent</item>
     <item name="colorAccentTransparent">@color/base_accent_transparent</item>
@@ -38,6 +37,7 @@
     <item name="iconTintDisabled">@color/white_12</item>
     <item name="iconTintActive">@color/yellow</item>
     <item name="iconTintLight">@color/icon_tint_light</item>
+    <item name="android:textColorLink">?colorSecondary</item>
 
     <item name="secondary">@color/text_light_hint</item>
     <item name="dividerHorizontal">@color/divider</item>
@@ -117,15 +117,57 @@
     <item name="bottomSheetDialogTheme">@style/MwmTheme.BottomSheetDialog</item>
 
     <!-- M3 colors -->
-    <item name="colorPrimaryVariant">@color/bg_primary_dark</item>
+    <item name="colorPrimary">@color/bg_primary</item>
+    <item name="colorOnPrimary">@color/md_theme_onPrimary</item>
+    <item name="colorPrimaryContainer">@color/md_theme_primaryContainer</item>
+    <item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer</item>
     <item name="colorSecondary">@color/base_accent</item>
-    <item name="colorPrimaryContainer">?colorSecondary</item>
-    <item name="colorOnPrimaryContainer">?android:textColorPrimaryInverse</item>
+    <item name="colorOnSecondary">@color/md_theme_onSecondary</item>
+    <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer</item>
+    <item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer</item>
+    <item name="colorTertiary">@color/md_theme_tertiary</item>
+    <item name="colorOnTertiary">@color/md_theme_onTertiary</item>
+    <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer</item>
+    <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer</item>
+    <item name="colorError">@color/md_theme_error</item>
+    <item name="colorOnError">@color/md_theme_onError</item>
+    <item name="colorErrorContainer">@color/md_theme_errorContainer</item>
+    <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer</item>
+    <item name="android:colorBackground">@color/md_theme_background</item>
+    <item name="colorOnBackground">@color/md_theme_onBackground</item>
+    <item name="colorSurface">@color/md_theme_surface</item>
+    <item name="colorOnSurface">@color/md_theme_onSurface</item>
+    <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant</item>
+    <item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant</item>
+    <item name="colorOutline">@color/md_theme_outline</item>
+    <item name="colorOutlineVariant">@color/md_theme_outlineVariant</item>
+    <item name="colorSurfaceInverse">@color/md_theme_inverseSurface</item>
+    <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface</item>
+    <item name="colorPrimaryInverse">@color/md_theme_inversePrimary</item>
+    <item name="colorPrimaryFixed">@color/md_theme_primaryFixed</item>
+    <item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed</item>
+    <item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim</item>
+    <item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant</item>
+    <item name="colorSecondaryFixed">@color/md_theme_secondaryFixed</item>
+    <item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed</item>
+    <item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim</item>
+    <item name="colorOnSecondaryFixedVariant">@color/md_theme_onSecondaryFixedVariant</item>
+    <item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed</item>
+    <item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed</item>
+    <item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim</item>
+    <item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant</item>
+    <item name="colorSurfaceDim">@color/md_theme_surfaceDim</item>
+    <item name="colorSurfaceBright">@color/md_theme_surfaceBright</item>
+    <item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest</item>
+    <item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow</item>
+    <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer</item>
+    <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item>
+    <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item>
   </style>
 
   <style name="MwmTheme" parent="MwmTheme.Base"/>
 
-  <style name="MwmTheme.DialogFragment.Fullscreen" parent="Theme.AppCompat.DayNight">
+  <style name="MwmTheme.DialogFragment.Fullscreen" parent="Theme.Material3.DayNight">
     <item name="colorControlNormal">@color/text_dark_hint</item>
     <item name="android:textColorHint">@color/text_light_hint</item>
   </style>
diff --git a/android/app/src/main/res/values/dimens.xml b/android/app/src/main/res/values/dimens.xml
index 4f7919801..a1c7249e9 100644
--- a/android/app/src/main/res/values/dimens.xml
+++ b/android/app/src/main/res/values/dimens.xml
@@ -183,4 +183,5 @@
   <!--App Icons -->
   <dimen name="app_icon_border_width">0.8</dimen>
 
+  <dimen name="routing_toolbar_button">40dp</dimen>
 </resources>
diff --git a/android/app/src/main/res/values/m3_colors.xml b/android/app/src/main/res/values/m3_colors.xml
new file mode 100644
index 000000000..2f89e179c
--- /dev/null
+++ b/android/app/src/main/res/values/m3_colors.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="md_theme_primary">#39693B</color>
+    <color name="md_theme_onPrimary">#FFFFFF</color>
+    <color name="md_theme_primaryContainer">#BAF0B6</color>
+    <color name="md_theme_onPrimaryContainer">#215025</color>
+    <color name="md_theme_secondary">#35693F</color>
+    <color name="md_theme_onSecondary">#FFFFFF</color>
+    <color name="md_theme_secondaryContainer">#B6F1BB</color>
+    <color name="md_theme_onSecondaryContainer">#1B5129</color>
+    <color name="md_theme_tertiary">#39656B</color>
+    <color name="md_theme_onTertiary">#FFFFFF</color>
+    <color name="md_theme_tertiaryContainer">#BCEBF1</color>
+    <color name="md_theme_onTertiaryContainer">#1F4D53</color>
+    <color name="md_theme_error">#BA1A1A</color>
+    <color name="md_theme_onError">#FFFFFF</color>
+    <color name="md_theme_errorContainer">#FFDAD6</color>
+    <color name="md_theme_onErrorContainer">#93000A</color>
+    <color name="md_theme_background">#F7FBF2</color>
+    <color name="md_theme_onBackground">#181D17</color>
+    <color name="md_theme_surface">#F5FBF7</color>
+    <color name="md_theme_onSurface">#171D1B</color>
+    <color name="md_theme_surfaceVariant">#DEE5D9</color>
+    <color name="md_theme_onSurfaceVariant">#424940</color>
+    <color name="md_theme_outline">#72796F</color>
+    <color name="md_theme_outlineVariant">#C2C9BD</color>
+    <color name="md_theme_scrim">#000000</color>
+    <color name="md_theme_inverseSurface">#2B322F</color>
+    <color name="md_theme_inverseOnSurface">#ECF2EE</color>
+    <color name="md_theme_inversePrimary">#9FD49C</color>
+    <color name="md_theme_primaryFixed">#BAF0B6</color>
+    <color name="md_theme_onPrimaryFixed">#002106</color>
+    <color name="md_theme_primaryFixedDim">#9FD49C</color>
+    <color name="md_theme_onPrimaryFixedVariant">#215025</color>
+    <color name="md_theme_secondaryFixed">#B6F1BB</color>
+    <color name="md_theme_onSecondaryFixed">#002109</color>
+    <color name="md_theme_secondaryFixedDim">#9BD4A0</color>
+    <color name="md_theme_onSecondaryFixedVariant">#1B5129</color>
+    <color name="md_theme_tertiaryFixed">#BCEBF1</color>
+    <color name="md_theme_onTertiaryFixed">#001F23</color>
+    <color name="md_theme_tertiaryFixedDim">#A1CED5</color>
+    <color name="md_theme_onTertiaryFixedVariant">#1F4D53</color>
+    <color name="md_theme_surfaceDim">#D5DBD8</color>
+    <color name="md_theme_surfaceBright">#F5FBF7</color>
+    <color name="md_theme_surfaceContainerLowest">#FFFFFF</color>
+    <color name="md_theme_surfaceContainerLow">#EFF5F1</color>
+    <color name="md_theme_surfaceContainer">#E9EFEB</color>
+    <color name="md_theme_surfaceContainerHigh">#E3EAE6</color>
+    <color name="md_theme_surfaceContainerHighest">#DEE4E0</color>
+    <color name="md_theme_primary_mediumContrast">#0E3F16</color>
+    <color name="md_theme_onPrimary_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_primaryContainer_mediumContrast">#487849</color>
+    <color name="md_theme_onPrimaryContainer_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_secondary_mediumContrast">#053F1A</color>
+    <color name="md_theme_onSecondary_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_secondaryContainer_mediumContrast">#43784C</color>
+    <color name="md_theme_onSecondaryContainer_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_tertiary_mediumContrast">#083C42</color>
+    <color name="md_theme_onTertiary_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_tertiaryContainer_mediumContrast">#48747A</color>
+    <color name="md_theme_onTertiaryContainer_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_error_mediumContrast">#740006</color>
+    <color name="md_theme_onError_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_errorContainer_mediumContrast">#CF2C27</color>
+    <color name="md_theme_onErrorContainer_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_background_mediumContrast">#F7FBF2</color>
+    <color name="md_theme_onBackground_mediumContrast">#181D17</color>
+    <color name="md_theme_surface_mediumContrast">#F5FBF7</color>
+    <color name="md_theme_onSurface_mediumContrast">#0C1210</color>
+    <color name="md_theme_surfaceVariant_mediumContrast">#DEE5D9</color>
+    <color name="md_theme_onSurfaceVariant_mediumContrast">#313830</color>
+    <color name="md_theme_outline_mediumContrast">#4E544B</color>
+    <color name="md_theme_outlineVariant_mediumContrast">#686F65</color>
+    <color name="md_theme_scrim_mediumContrast">#000000</color>
+    <color name="md_theme_inverseSurface_mediumContrast">#2B322F</color>
+    <color name="md_theme_inverseOnSurface_mediumContrast">#ECF2EE</color>
+    <color name="md_theme_inversePrimary_mediumContrast">#9FD49C</color>
+    <color name="md_theme_primaryFixed_mediumContrast">#487849</color>
+    <color name="md_theme_onPrimaryFixed_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_primaryFixedDim_mediumContrast">#2F5F32</color>
+    <color name="md_theme_onPrimaryFixedVariant_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_secondaryFixed_mediumContrast">#43784C</color>
+    <color name="md_theme_onSecondaryFixed_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_secondaryFixedDim_mediumContrast">#2B5F36</color>
+    <color name="md_theme_onSecondaryFixedVariant_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_tertiaryFixed_mediumContrast">#48747A</color>
+    <color name="md_theme_onTertiaryFixed_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_tertiaryFixedDim_mediumContrast">#2E5B61</color>
+    <color name="md_theme_onTertiaryFixedVariant_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_surfaceDim_mediumContrast">#C2C8C4</color>
+    <color name="md_theme_surfaceBright_mediumContrast">#F5FBF7</color>
+    <color name="md_theme_surfaceContainerLowest_mediumContrast">#FFFFFF</color>
+    <color name="md_theme_surfaceContainerLow_mediumContrast">#EFF5F1</color>
+    <color name="md_theme_surfaceContainer_mediumContrast">#E3EAE6</color>
+    <color name="md_theme_surfaceContainerHigh_mediumContrast">#D8DEDB</color>
+    <color name="md_theme_surfaceContainerHighest_mediumContrast">#CDD3CF</color>
+    <color name="md_theme_primary_highContrast">#01340D</color>
+    <color name="md_theme_onPrimary_highContrast">#FFFFFF</color>
+    <color name="md_theme_primaryContainer_highContrast">#245328</color>
+    <color name="md_theme_onPrimaryContainer_highContrast">#FFFFFF</color>
+    <color name="md_theme_secondary_highContrast">#003413</color>
+    <color name="md_theme_onSecondary_highContrast">#FFFFFF</color>
+    <color name="md_theme_secondaryContainer_highContrast">#1E532B</color>
+    <color name="md_theme_onSecondaryContainer_highContrast">#FFFFFF</color>
+    <color name="md_theme_tertiary_highContrast">#003237</color>
+    <color name="md_theme_onTertiary_highContrast">#FFFFFF</color>
+    <color name="md_theme_tertiaryContainer_highContrast">#225055</color>
+    <color name="md_theme_onTertiaryContainer_highContrast">#FFFFFF</color>
+    <color name="md_theme_error_highContrast">#600004</color>
+    <color name="md_theme_onError_highContrast">#FFFFFF</color>
+    <color name="md_theme_errorContainer_highContrast">#98000A</color>
+    <color name="md_theme_onErrorContainer_highContrast">#FFFFFF</color>
+    <color name="md_theme_background_highContrast">#F7FBF2</color>
+    <color name="md_theme_onBackground_highContrast">#181D17</color>
+    <color name="md_theme_surface_highContrast">#F5FBF7</color>
+    <color name="md_theme_onSurface_highContrast">#000000</color>
+    <color name="md_theme_surfaceVariant_highContrast">#DEE5D9</color>
+    <color name="md_theme_onSurfaceVariant_highContrast">#000000</color>
+    <color name="md_theme_outline_highContrast">#272E26</color>
+    <color name="md_theme_outlineVariant_highContrast">#444B42</color>
+    <color name="md_theme_scrim_highContrast">#000000</color>
+    <color name="md_theme_inverseSurface_highContrast">#2B322F</color>
+    <color name="md_theme_inverseOnSurface_highContrast">#FFFFFF</color>
+    <color name="md_theme_inversePrimary_highContrast">#9FD49C</color>
+    <color name="md_theme_primaryFixed_highContrast">#245328</color>
+    <color name="md_theme_onPrimaryFixed_highContrast">#FFFFFF</color>
+    <color name="md_theme_primaryFixedDim_highContrast">#093B13</color>
+    <color name="md_theme_onPrimaryFixedVariant_highContrast">#FFFFFF</color>
+    <color name="md_theme_secondaryFixed_highContrast">#1E532B</color>
+    <color name="md_theme_onSecondaryFixed_highContrast">#FFFFFF</color>
+    <color name="md_theme_secondaryFixedDim_highContrast">#003C17</color>
+    <color name="md_theme_onSecondaryFixedVariant_highContrast">#FFFFFF</color>
+    <color name="md_theme_tertiaryFixed_highContrast">#225055</color>
+    <color name="md_theme_onTertiaryFixed_highContrast">#FFFFFF</color>
+    <color name="md_theme_tertiaryFixedDim_highContrast">#02393E</color>
+    <color name="md_theme_onTertiaryFixedVariant_highContrast">#FFFFFF</color>
+    <color name="md_theme_surfaceDim_highContrast">#B4BAB7</color>
+    <color name="md_theme_surfaceBright_highContrast">#F5FBF7</color>
+    <color name="md_theme_surfaceContainerLowest_highContrast">#FFFFFF</color>
+    <color name="md_theme_surfaceContainerLow_highContrast">#ECF2EE</color>
+    <color name="md_theme_surfaceContainer_highContrast">#DEE4E0</color>
+    <color name="md_theme_surfaceContainerHigh_highContrast">#CFD6D2</color>
+    <color name="md_theme_surfaceContainerHighest_highContrast">#C2C8C4</color>
+</resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values/styles-editor.xml b/android/app/src/main/res/values/styles-editor.xml
index da20e10a3..afedc6020 100644
--- a/android/app/src/main/res/values/styles-editor.xml
+++ b/android/app/src/main/res/values/styles-editor.xml
@@ -57,12 +57,14 @@
   <style name="MwmWidget.Editor.CustomTextInput">
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_width">match_parent</item>
+    <item name="android:textColorHint">?iconTint</item>
   </style>
 
   <style name="MwmWidget.Editor.FieldLayout">
     <item name="android:layout_width">match_parent</item>
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_marginStart">@dimen/editor_margin_left</item>
+    <item name="android:textColorHighlight">?colorPrimary</item>
   </style>
 
   <style name="MwmWidget.Editor.FieldLayout.EditText" parent="MwmWidget.Editor">
@@ -83,4 +85,13 @@
     <item name="android:clickable">true</item>
     <item name="android:textAppearance">@style/MwmTextAppearance.Body1</item>
   </style>
+
+  <style name="MwmWidget.M3.Editor.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">?cardBackground</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 0a7371f3f..2aded6a25 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -35,17 +35,20 @@
     <item name="maxImageSize">34dp</item>
   </style>
 
-  <style name="MwmWidget.Components.SearchWheel" parent="Theme.Material3.Dark">
+  <style name="MwmWidget.Components.SearchWheel" parent="Widget.MaterialComponents.FloatingActionButton">
     <item name="android:layout_width">wrap_content</item>
     <item name="android:layout_height">wrap_content</item>
     <item name="android:backgroundTint">?menuBackground</item>
+    <item name="backgroundTint">?menuBackground</item>
     <item name="elevation">0dp</item>
     <item name="hoveredFocusedTranslationZ">0dp</item>
     <item name="pressedTranslationZ">0dp</item>
     <item name="android:tint">?iconTint</item>
+    <item name="tint">?iconTint</item>
     <item name="maxImageSize">@dimen/map_button_icon_size</item>
     <item name="borderWidth">0dp</item>
     <item name="fabCustomSize">38dp</item>
+    <item name="ensureMinTouchTargetSize">false</item>
   </style>
 
   <style name="MwmWidget.MapButton.Bottom">
@@ -138,7 +141,7 @@
     <item name="cornerSize">50%</item>
   </style>
 
-  <style name="MwmWidget.ToolbarStyle" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar">
+  <style name="MwmWidget.ToolbarStyle" parent="ThemeOverlay.Material3.Dark.ActionBar">
     <item name="android:background">?colorPrimary</item>
     <item name="android:displayOptions">homeAsUp|showTitle</item>
     <item name="contentInsetStart">0dp</item>
@@ -155,7 +158,7 @@
     <item name="android:elevation">0dp</item>
   </style>
 
-  <style name="MwmWidget.ToolbarTheme" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar">
+  <style name="MwmWidget.ToolbarTheme" parent="ThemeOverlay.Material3.Dark.ActionBar">
     <item name="android:gravity">center_vertical</item>
     <item name="colorAccent">@android:color/white</item>
     <item name="colorSecondary">@android:color/white</item>
@@ -168,7 +171,7 @@
     <item name="colorSecondary">#FF32363A</item>
   </style>
 
-  <style name="MwmWidget.ToolbarTheme.Transparent" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar">
+  <style name="MwmWidget.ToolbarTheme.Transparent" parent="ThemeOverlay.Material3.Dark.ActionBar">
     <item name="android:gravity">center_vertical</item>
     <item name="colorAccent">@android:color/white</item>
     <item name="colorSecondary">@android:color/white</item>
@@ -178,7 +181,7 @@
 
   <style
     name="MwmWidget.ToolbarTheme.DownButton"
-    parent="ThemeOverlay.MaterialComponents.Dark.ActionBar">
+    parent="ThemeOverlay.Material3.Dark.ActionBar">
     <item name="android:gravity">center_vertical</item>
     <item name="colorAccent">@android:color/white</item>
     <item name="colorSecondary">@android:color/white</item>
@@ -315,12 +318,12 @@
   </style>
 
   <style name="MwmWidget.MaterialCalendar.Theme.FullScreen.Dark"
-    parent="ThemeOverlay.MaterialComponents.MaterialCalendar.Fullscreen">
+    parent="ThemeOverlay.Material3.MaterialCalendar.Fullscreen">
     <item name="colorSurface">@color/material_calendar_surface_dark</item>
   </style>
 
   <style name="MwmWidget.MaterialCalendar.Theme.Dark"
-    parent="ThemeOverlay.MaterialComponents.MaterialCalendar">
+    parent="ThemeOverlay.Material3.MaterialCalendar">
     <item name="colorSurface">@color/material_calendar_surface_dark</item>
   </style>
 
@@ -414,6 +417,8 @@
   <style name="MwmWidget.M3.FAB.Primary" parent="@style/Widget.Material3.FloatingActionButton.Primary">
     <item name="shapeAppearance">@style/ShapeAppearanceOverlay.Material3.FloatingActionButton</item>
     <item name="rippleColor">@null</item>
+    <item name="backgroundTint">?colorSecondary</item>
+    <item name="tint">?android:textColorPrimaryInverse</item>
   </style>
 
   <style name="MwmWidget.M3.FAB.MapButton" parent="@style/Widget.Material3.FloatingActionButton.Primary">
diff --git a/android/app/src/main/res/values/themes.xml b/android/app/src/main/res/values/themes.xml
index 8990a5a1b..6b63b0a5c 100644
--- a/android/app/src/main/res/values/themes.xml
+++ b/android/app/src/main/res/values/themes.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
   <!-- Default theme -->
-  <style name="MwmTheme.Base" parent="Theme.MaterialComponents.Light.NoActionBar.Bridge">
-    <item name="materialCalendarStyle">@style/Widget.MaterialComponents.MaterialCalendar</item>
-    <item name="materialCalendarFullscreenTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar.Fullscreen</item>
-    <item name="materialCalendarTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar</item>
+  <style name="MwmTheme.Base" parent="Theme.Material3.Light.NoActionBar">
+    <item name="materialCalendarStyle">@style/Widget.Material3.MaterialCalendar</item>
+    <item name="materialCalendarFullscreenTheme">@style/ThemeOverlay.Material3.MaterialCalendar.Fullscreen</item>
+    <item name="materialCalendarTheme">@style/ThemeOverlay.Material3.MaterialCalendar</item>
     <item name="android:listViewStyle">@style/MwmWidget.ListView</item>
     <item name="android:textViewStyle">@style/MwmWidget.TextView</item>
     <item name="android:forceDarkAllowed" tools:targetApi="Q">false</item>
@@ -26,7 +26,6 @@
     <item name="titleDialogTheme">@color/black_primary</item>
     <item name="textDialogTheme">@color/black_secondary</item>
     <item name="fullscreenDialogTheme">@style/MwmTheme.DialogFragment.Fullscreen</item>
-    <item name="colorPrimary">@color/bg_primary</item>
     <item name="colorControlNormal">?secondary</item>
     <item name="colorAccent">@color/base_accent</item>
     <item name="colorAccentTransparent">@color/base_accent_transparent</item>
@@ -37,6 +36,7 @@
     <item name="iconTintDisabled">@color/black_12</item>
     <item name="iconTintActive">@color/yellow</item>
     <item name="iconTintLight">@color/icon_tint_light</item>
+    <item name="android:textColorLink">?colorSecondary</item>
 
     <item name="secondary">@color/text_dark_hint</item>
     <item name="dividerHorizontal">@color/divider</item>
@@ -124,10 +124,52 @@
     <item name="bottomSheetDialogTheme">@style/MwmTheme.BottomSheetDialog</item>
 
     <!-- M3 colors -->
-    <item name="colorPrimaryVariant">@color/bg_primary_dark</item>
+    <item name="colorPrimary">@color/bg_primary</item>
+    <item name="colorOnPrimary">@color/md_theme_onPrimary</item>
+    <item name="colorPrimaryContainer">@color/md_theme_primaryContainer</item>
+    <item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer</item>
     <item name="colorSecondary">@color/base_accent</item>
-    <item name="colorPrimaryContainer">?colorSecondary</item>
-    <item name="colorOnPrimaryContainer">?android:textColorPrimaryInverse</item>
+    <item name="colorOnSecondary">@color/md_theme_onSecondary</item>
+    <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer</item>
+    <item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer</item>
+    <item name="colorTertiary">@color/md_theme_tertiary</item>
+    <item name="colorOnTertiary">@color/md_theme_onTertiary</item>
+    <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer</item>
+    <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer</item>
+    <item name="colorError">@color/md_theme_error</item>
+    <item name="colorOnError">@color/md_theme_onError</item>
+    <item name="colorErrorContainer">@color/md_theme_errorContainer</item>
+    <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer</item>
+    <item name="android:colorBackground">@color/md_theme_background</item>
+    <item name="colorOnBackground">@color/md_theme_onBackground</item>
+    <item name="colorSurface">@color/md_theme_surface</item>
+    <item name="colorOnSurface">@color/md_theme_onSurface</item>
+    <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant</item>
+    <item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant</item>
+    <item name="colorOutline">@color/md_theme_outline</item>
+    <item name="colorOutlineVariant">@color/md_theme_outlineVariant</item>
+    <item name="colorSurfaceInverse">@color/md_theme_inverseSurface</item>
+    <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface</item>
+    <item name="colorPrimaryInverse">@color/md_theme_inversePrimary</item>
+    <item name="colorPrimaryFixed">@color/md_theme_primaryFixed</item>
+    <item name="colorOnPrimaryFixed">@color/md_theme_onPrimaryFixed</item>
+    <item name="colorPrimaryFixedDim">@color/md_theme_primaryFixedDim</item>
+    <item name="colorOnPrimaryFixedVariant">@color/md_theme_onPrimaryFixedVariant</item>
+    <item name="colorSecondaryFixed">@color/md_theme_secondaryFixed</item>
+    <item name="colorOnSecondaryFixed">@color/md_theme_onSecondaryFixed</item>
+    <item name="colorSecondaryFixedDim">@color/md_theme_secondaryFixedDim</item>
+    <item name="colorOnSecondaryFixedVariant">@color/md_theme_onSecondaryFixedVariant</item>
+    <item name="colorTertiaryFixed">@color/md_theme_tertiaryFixed</item>
+    <item name="colorOnTertiaryFixed">@color/md_theme_onTertiaryFixed</item>
+    <item name="colorTertiaryFixedDim">@color/md_theme_tertiaryFixedDim</item>
+    <item name="colorOnTertiaryFixedVariant">@color/md_theme_onTertiaryFixedVariant</item>
+    <item name="colorSurfaceDim">@color/md_theme_surfaceDim</item>
+    <item name="colorSurfaceBright">@color/md_theme_surfaceBright</item>
+    <item name="colorSurfaceContainerLowest">@color/md_theme_surfaceContainerLowest</item>
+    <item name="colorSurfaceContainerLow">@color/md_theme_surfaceContainerLow</item>
+    <item name="colorSurfaceContainer">@color/md_theme_surfaceContainer</item>
+    <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item>
+    <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item>
 
   </style>
 
@@ -161,7 +203,7 @@
     <item name="android:windowBackground">@color/bg_window</item>
   </style>
 
-  <style name="MwmTheme.AlertDialog" parent="Theme.MaterialComponents.DayNight.Dialog.Alert">
+  <style name="MwmTheme.AlertDialog" parent="Theme.Material3.DayNight.Dialog.Alert">
     <item name="colorAccent">?buttonDialogTextColor</item>
     <item name="colorSecondary">?buttonDialogTextColor</item>
     <item name="colorPrimary">?buttonDialogTextColor</item>
@@ -180,7 +222,7 @@
     <item name="android:textColor">?titleDialogTheme</item>
   </style>
 
-  <style name="MwmTheme.DialogFragment.Fullscreen" parent="Theme.AppCompat.Light">
+  <style name="MwmTheme.DialogFragment.Fullscreen" parent="Theme.Material3.Light">
     <item name="android:colorPrimaryDark">?statusBar</item>
     <item name="colorAccent">@color/base_accent</item>
     <item name="colorPrimary">@color/bg_primary</item>
@@ -215,7 +257,7 @@
     <item name="android:windowBackground">@android:color/white</item>
   </style>
 
-  <style name="MwmMain.MaterialTimePicker" parent="ThemeOverlay.MaterialComponents.TimePicker">
+  <style name="MwmTheme.MaterialTimePicker" parent="ThemeOverlay.MaterialComponents.TimePicker">
     <item name="colorAccent">@color/base_accent</item>
     <item name="colorSecondary">@color/base_accent</item>
     <item name="colorPrimary">?buttonDialogTextColor</item>
@@ -247,7 +289,7 @@
     <item name="iconTint">@color/white_primary</item>
   </style>
 
-  <style name="PopupMenu" parent="ThemeOverlay.MaterialComponents">
+  <style name="PopupMenu" parent="ThemeOverlay.Material3">
     <item name="android:popupBackground">?windowBackgroundForced</item>
   </style>
 </resources>