diff --git a/android/app/src/main/java/app/organicmaps/editor/AdvancedTimetableFragment.java b/android/app/src/main/java/app/organicmaps/editor/AdvancedTimetableFragment.java
index 9a795fafd..ffba644c7 100644
--- a/android/app/src/main/java/app/organicmaps/editor/AdvancedTimetableFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/AdvancedTimetableFragment.java
@@ -87,8 +87,8 @@ public class AdvancedTimetableFragment extends BaseMwmFragment implements View.O
   private void setExampleDrawables(@DrawableRes int left, @DrawableRes int right)
   {
     mExamplesTitle.setCompoundDrawablesRelativeWithIntrinsicBounds(
-        Graphics.tint(requireActivity(), left, androidx.appcompat.R.attr.colorAccent), null,
-        Graphics.tint(requireActivity(), right, androidx.appcompat.R.attr.colorAccent), null);
+        Graphics.tint(requireActivity(), left, com.google.android.material.R.attr.colorSecondary), null,
+        Graphics.tint(requireActivity(), right, com.google.android.material.R.attr.colorSecondary), null);
   }
 
   @Override
diff --git a/android/app/src/main/java/app/organicmaps/maplayer/SearchWheel.java b/android/app/src/main/java/app/organicmaps/maplayer/SearchWheel.java
index 1d05d8e58..962b7b15a 100644
--- a/android/app/src/main/java/app/organicmaps/maplayer/SearchWheel.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/SearchWheel.java
@@ -215,7 +215,7 @@ public class SearchWheel implements View.OnClickListener
     final SearchOption searchOption = mMapButtonsViewModel.getSearchOption().getValue();
     mSearchButton.setImageDrawable(Graphics.tint(
         mSearchButton.getContext(), searchOption == null ? R.drawable.ic_routing_search_off : searchOption.mDrawableOff,
-        androidx.appcompat.R.attr.colorAccent));
+        com.google.android.material.R.attr.colorSecondary));
   }
 
   @Override
diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java b/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
index 66b4502da..f8d338ae5 100644
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
@@ -261,9 +261,9 @@ final class RoutingBottomMenuController implements View.OnClickListener
     {
       UiUtils.show(mActionButton);
       Drawable icon = ContextCompat.getDrawable(mContext, R.drawable.ic_location_crosshair);
-      int colorAccent = ContextCompat.getColor(
-          mContext, UiUtils.getStyledResourceId(mContext, androidx.appcompat.R.attr.colorAccent));
-      mActionIcon.setImageDrawable(Graphics.tint(icon, colorAccent));
+      int colorSecondary = ContextCompat.getColor(
+          mContext, UiUtils.getStyledResourceId(mContext, com.google.android.material.R.attr.colorSecondary));
+      mActionIcon.setImageDrawable(Graphics.tint(icon, colorSecondary));
     }
     else
     {
diff --git a/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java b/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java
index 38b4994ab..7ce6cedfe 100644
--- a/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java
@@ -65,7 +65,7 @@ class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHol
     @AttrRes
     int getTintAttr()
     {
-      return androidx.appcompat.R.attr.colorAccent;
+      return com.google.android.material.R.attr.colorSecondary;
     }
 
     abstract TextView getTitleView();
diff --git a/android/app/src/main/java/app/organicmaps/search/TabAdapter.java b/android/app/src/main/java/app/organicmaps/search/TabAdapter.java
index 470b77d32..314fad9c9 100644
--- a/android/app/src/main/java/app/organicmaps/search/TabAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/search/TabAdapter.java
@@ -92,7 +92,7 @@ class TabAdapter extends FragmentPagerAdapter
       editor.putInt(Config.KEY_PREF_LAST_SEARCHED_TAB, tab.getPosition());
       editor.apply();
       super.onTabSelected(tab);
-      Graphics.tint(mContext, tab.getIcon(), androidx.appcompat.R.attr.colorAccent);
+      Graphics.tint(mContext, tab.getIcon(), com.google.android.material.R.attr.colorSecondary);
     }
 
     @Override
diff --git a/android/app/src/main/java/app/organicmaps/settings/VoiceInstructionsSettingsFragment.java b/android/app/src/main/java/app/organicmaps/settings/VoiceInstructionsSettingsFragment.java
index 1c198c69c..4e3bea88e 100644
--- a/android/app/src/main/java/app/organicmaps/settings/VoiceInstructionsSettingsFragment.java
+++ b/android/app/src/main/java/app/organicmaps/settings/VoiceInstructionsSettingsFragment.java
@@ -328,7 +328,7 @@ public class VoiceInstructionsSettingsFragment extends BaseXmlSettingsFragment
     // Set link color.
     link.setSpan(
         new ForegroundColorSpan(ContextCompat.getColor(
-            requireContext(), UiUtils.getStyledResourceId(requireContext(), androidx.appcompat.R.attr.colorAccent))),
+            requireContext(), UiUtils.getStyledResourceId(requireContext(), com.google.android.material.R.attr.colorSecondary))),
         0, ttsLinkText.length(), 0);
     ttsLangInfoLink.setSummary(link);
 
diff --git a/android/app/src/main/java/app/organicmaps/widget/menu/MyPositionButton.java b/android/app/src/main/java/app/organicmaps/widget/menu/MyPositionButton.java
index 875ed86a1..12030791f 100644
--- a/android/app/src/main/java/app/organicmaps/widget/menu/MyPositionButton.java
+++ b/android/app/src/main/java/app/organicmaps/widget/menu/MyPositionButton.java
@@ -52,7 +52,7 @@ public class MyPositionButton
     if (mode == LocationState.FOLLOW || mode == LocationState.FOLLOW_AND_ROTATE
         || mode == LocationState.PENDING_POSITION)
     {
-      colorAttr = androidx.appcompat.R.attr.colorAccent;
+      colorAttr = com.google.android.material.R.attr.colorSecondary;
       if (mode == LocationState.PENDING_POSITION)
         sizeDimen = R.dimen.map_button_size;
       else
diff --git a/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java b/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
index e25f922db..f5c01d931 100644
--- a/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
+++ b/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
@@ -167,7 +167,7 @@ public class NavMenu
   public void refreshTts()
   {
     mTts.setImageDrawable(TtsPlayer.isEnabled()
-                              ? Graphics.tint(mActivity, R.drawable.ic_voice_on, androidx.appcompat.R.attr.colorAccent)
+                              ? Graphics.tint(mActivity, R.drawable.ic_voice_on, com.google.android.material.R.attr.colorSecondary)
                               : Graphics.tint(mActivity, R.drawable.ic_voice_off));
   }
 
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
index 5f9ebf711..2c5b332f0 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
@@ -478,7 +478,7 @@ public class PlacePageView extends Fragment
       final int editPlaceButtonColor =
           Editor.nativeShouldEnableEditPlace()
               ? ContextCompat.getColor(getContext(),
-                                       UiUtils.getStyledResourceId(getContext(), androidx.appcompat.R.attr.colorAccent))
+                                       UiUtils.getStyledResourceId(getContext(), com.google.android.material.R.attr.colorSecondary))
               : getResources().getColor(R.color.button_accent_text_disabled);
       mTvEditPlace.setTextColor(editPlaceButtonColor);
       mTvAddBusiness.setTextColor(editPlaceButtonColor);
diff --git a/android/app/src/main/res/layout-land/altitude_chart_panel.xml b/android/app/src/main/res/layout-land/altitude_chart_panel.xml
index 23758503b..f5fcb7822 100644
--- a/android/app/src/main/res/layout-land/altitude_chart_panel.xml
+++ b/android/app/src/main/res/layout-land/altitude_chart_panel.xml
@@ -40,7 +40,7 @@
           android:layout_gravity="center_horizontal"
           android:textAppearance="@style/MwmTextAppearance.Body3"
           android:fontFamily="@string/robotoMedium"
-          android:textColor="?colorAccent"
+          android:textColor="?colorSecondary"
           android:gravity="center"
           tools:text="↗ 43 m ↘ 88 m"
           tools:visibility="visible" />
diff --git a/android/app/src/main/res/layout-land/layout_nav_top.xml b/android/app/src/main/res/layout-land/layout_nav_top.xml
index c7657a544..4636a4159 100644
--- a/android/app/src/main/res/layout-land/layout_nav_top.xml
+++ b/android/app/src/main/res/layout-land/layout_nav_top.xml
@@ -118,7 +118,7 @@
       app:layout_constraintTop_toBottomOf="@id/street_frame"
       app:lanesActiveLaneTintColor="?navLaneArrowActiveColor"
       app:lanesInactiveLaneTintColor="?navLaneArrowInactiveColor"
-      app:lanesBackgroundColor="?colorAccent"
+      app:lanesBackgroundColor="?colorSecondary"
       app:lanesCornerRadius="@dimen/margin_quarter"
       app:lanesEditModeLanesCount="10"
       tools:visibility="visible" />
diff --git a/android/app/src/main/res/layout-land/onmap_downloader.xml b/android/app/src/main/res/layout-land/onmap_downloader.xml
index 534b556cc..4f722e2b4 100644
--- a/android/app/src/main/res/layout-land/onmap_downloader.xml
+++ b/android/app/src/main/res/layout-land/onmap_downloader.xml
@@ -70,7 +70,7 @@
           android:layout_width="@dimen/downloader_status_size"
           android:layout_height="@dimen/downloader_status_size"
           android:layout_gravity="center"
-          app:wheelProgressColor="?colorAccent"
+          app:wheelProgressColor="?colorSecondary"
           app:wheelSecondaryColor="?dividerHorizontal"
           app:wheelThickness="@dimen/margin_eighth"
           android:visibility="visible"
diff --git a/android/app/src/main/res/layout-land/routing_details.xml b/android/app/src/main/res/layout-land/routing_details.xml
index 14b958aa8..b939b06e9 100644
--- a/android/app/src/main/res/layout-land/routing_details.xml
+++ b/android/app/src/main/res/layout-land/routing_details.xml
@@ -19,7 +19,7 @@
     android:layout_height="@dimen/altitude_chart_time_distance_height"
     android:textAppearance="@style/MwmTextAppearance.Body3"
     android:fontFamily="@string/robotoMedium"
-    android:textColor="?colorAccent"
+    android:textColor="?colorSecondary"
     android:visibility="gone"
     tools:text="43 m"
     tools:visibility="visible"/>
diff --git a/android/app/src/main/res/layout-w1020dp-land/altitude_chart_panel.xml b/android/app/src/main/res/layout-w1020dp-land/altitude_chart_panel.xml
index c61c04995..414abd3bb 100644
--- a/android/app/src/main/res/layout-w1020dp-land/altitude_chart_panel.xml
+++ b/android/app/src/main/res/layout-w1020dp-land/altitude_chart_panel.xml
@@ -40,7 +40,7 @@
           android:layout_gravity="center_horizontal"
           android:textAppearance="@style/MwmTextAppearance.Body3"
           android:fontFamily="@string/robotoMedium"
-          android:textColor="?colorAccent"
+          android:textColor="?colorSecondary"
           android:gravity="center"
           tools:text="↗ 43 m ↘ 88 m"
           tools:visibility="visible" />
diff --git a/android/app/src/main/res/layout-w1020dp-land/routing_details.xml b/android/app/src/main/res/layout-w1020dp-land/routing_details.xml
index 683231a5e..c5f4ed7e2 100644
--- a/android/app/src/main/res/layout-w1020dp-land/routing_details.xml
+++ b/android/app/src/main/res/layout-w1020dp-land/routing_details.xml
@@ -30,7 +30,7 @@
     android:layout_alignParentEnd="true"
     android:textAppearance="@style/MwmTextAppearance.Body3"
     android:fontFamily="@string/robotoMedium"
-    android:textColor="?colorAccent"
+    android:textColor="?colorSecondary"
     android:visibility="gone"
     tools:text="43 m"
     tools:visibility="visible"/>
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 b1dbc08bf..1ba9dddf8 100644
--- a/android/app/src/main/res/layout/activity_download_resources.xml
+++ b/android/app/src/main/res/layout/activity_download_resources.xml
@@ -23,7 +23,7 @@
         android:layout_width="90dp"
         android:layout_height="90dp"
         app:srcCompat="@drawable/ic_download"
-        app:tint="?android:colorAccent"/>
+        app:tint="?colorSecondary"/>
       <com.google.android.material.textview.MaterialTextView
         android:id="@+id/head_message"
         style="?fontHeadline6"
diff --git a/android/app/src/main/res/layout/altitude_chart_panel.xml b/android/app/src/main/res/layout/altitude_chart_panel.xml
index 2b7f6003a..cb9e66d79 100644
--- a/android/app/src/main/res/layout/altitude_chart_panel.xml
+++ b/android/app/src/main/res/layout/altitude_chart_panel.xml
@@ -37,7 +37,7 @@
           android:layout_height="@dimen/altitude_chart_time_distance_height"
           android:textAppearance="@style/MwmTextAppearance.Body3"
           android:fontFamily="@string/robotoMedium"
-          android:textColor="?colorAccent"
+          android:textColor="?colorSecondary"
           android:layout_gravity="end"
           android:gravity="center"
           android:visibility="gone"
diff --git a/android/app/src/main/res/layout/button_with_progress.xml b/android/app/src/main/res/layout/button_with_progress.xml
index e2ad9083e..d7511c20a 100644
--- a/android/app/src/main/res/layout/button_with_progress.xml
+++ b/android/app/src/main/res/layout/button_with_progress.xml
@@ -13,7 +13,7 @@
     android:layout_marginStart="@dimen/margin_base"
     android:text="@string/download_country_ask"
     android:textAppearance="?fontBody2"
-    app:buttonTint="?colorAccent"
+    app:buttonTint="?colorSecondary"
     android:visibility="gone"
     tools:visibility="visible"/>
   <com.google.android.material.progressindicator.LinearProgressIndicator
@@ -26,7 +26,7 @@
     android:layout_marginEnd="@dimen/margin_base_plus"
     android:layout_marginBottom="@dimen/margin_base"
     android:indeterminate="false"
-    app:indicatorColor="?android:colorAccent"
+    app:indicatorColor="?colorSecondary"
     app:trackColor="@color/bg_routing_progress"/>
   <com.google.android.material.button.MaterialButton
     android:id="@+id/btn_download_resources"
diff --git a/android/app/src/main/res/layout/downloader_status.xml b/android/app/src/main/res/layout/downloader_status.xml
index bc8ed9909..b4175ac03 100644
--- a/android/app/src/main/res/layout/downloader_status.xml
+++ b/android/app/src/main/res/layout/downloader_status.xml
@@ -11,7 +11,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?clickableBackground"
-    wheel:wheelProgressColor="?colorAccent"
+    wheel:wheelProgressColor="?colorSecondary"
     wheel:wheelSecondaryColor="?dividerHorizontal"
     wheel:wheelThickness="@dimen/margin_eighth"/>
 
diff --git a/android/app/src/main/res/layout/fragment_editor.xml b/android/app/src/main/res/layout/fragment_editor.xml
index c6bd79f0a..136eb4052 100644
--- a/android/app/src/main/res/layout/fragment_editor.xml
+++ b/android/app/src/main/res/layout/fragment_editor.xml
@@ -221,7 +221,7 @@
               android:layout_alignParentEnd="true"
               android:layout_centerVertical="true"
               android:textAppearance="@style/MwmTextAppearance.Body1"
-              android:textColor="?colorAccent"/>
+              android:textColor="?colorSecondary"/>
         </RelativeLayout>
 
         <include
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 aa2a47061..9b9865e25 100644
--- a/android/app/src/main/res/layout/fragment_osm_profile.xml
+++ b/android/app/src/main/res/layout/fragment_osm_profile.xml
@@ -107,7 +107,7 @@
         android:paddingBottom="@dimen/margin_half"
         android:text="@string/editor_osm_history"
         android:textAppearance="@style/MwmTextAppearance.Body2"
-        android:textColor="?colorAccent"
+        android:textColor="?colorSecondary"
         app:layout_constraintTop_toTopOf="parent" />
 
     <com.google.android.material.textview.MaterialTextView
@@ -123,7 +123,7 @@
         android:paddingBottom="@dimen/margin_half"
         android:text="@string/editor_osm_notes"
         android:textAppearance="@style/MwmTextAppearance.Body2"
-        android:textColor="?colorAccent"
+        android:textColor="?colorSecondary"
         app:layout_constraintTop_toBottomOf="@id/osm_history" />
 
     <com.google.android.material.textview.MaterialTextView
@@ -140,7 +140,7 @@
         android:paddingBottom="@dimen/margin_half"
         android:text="@string/editor_more_about_osm"
         android:textAppearance="@style/MwmTextAppearance.Body3"
-        android:textColor="?colorAccent"
+        android:textColor="?colorSecondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/osm_notes"
         app:layout_constraintVertical_bias="1" />
diff --git a/android/app/src/main/res/layout/fragment_phone.xml b/android/app/src/main/res/layout/fragment_phone.xml
index 59d5c9c89..13ae40581 100644
--- a/android/app/src/main/res/layout/fragment_phone.xml
+++ b/android/app/src/main/res/layout/fragment_phone.xml
@@ -31,7 +31,7 @@
         android:text="@string/editor_add_phone"
         android:textAllCaps="true"
         android:textAppearance="@style/MwmTextAppearance.Body3"
-        android:textColor="?colorAccent"
+        android:textColor="?colorSecondary"
         app:layout_constraintBottom_toBottomOf="@+id/frameLayout" />
 
     <include
diff --git a/android/app/src/main/res/layout/fragment_suggest_country_download.xml b/android/app/src/main/res/layout/fragment_suggest_country_download.xml
index 985c55176..0c3438029 100644
--- a/android/app/src/main/res/layout/fragment_suggest_country_download.xml
+++ b/android/app/src/main/res/layout/fragment_suggest_country_download.xml
@@ -122,7 +122,7 @@
       android:layout_width="@dimen/downloader_status_size"
       android:layout_height="@dimen/downloader_status_size"
       android:background="?clickableBackground"
-      wheel:wheelProgressColor="?colorAccent"
+      wheel:wheelProgressColor="?colorSecondary"
       wheel:wheelSecondaryColor="?dividerHorizontal"
       wheel:wheelThickness="@dimen/margin_eighth"/>
   </LinearLayout>
diff --git a/android/app/src/main/res/layout/fragment_timetable.xml b/android/app/src/main/res/layout/fragment_timetable.xml
index 5a60096e7..700a7ea8d 100644
--- a/android/app/src/main/res/layout/fragment_timetable.xml
+++ b/android/app/src/main/res/layout/fragment_timetable.xml
@@ -32,7 +32,7 @@
     android:text="@string/editor_time_advanced"
     android:textAllCaps="true"
     android:textAppearance="@style/MwmTextAppearance.Body3"
-    android:textColor="?colorAccent" />
+    android:textColor="?colorSecondary" />
 
   <include
     layout="@layout/shadow_bottom"
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 aaeb8312b..0bd7259fa 100644
--- a/android/app/src/main/res/layout/fragment_timetable_advanced.xml
+++ b/android/app/src/main/res/layout/fragment_timetable_advanced.xml
@@ -60,7 +60,7 @@
           android:padding="@dimen/margin_base"
           android:text="@string/editor_example_values"
           android:textAppearance="@style/MwmTextAppearance.Body3"
-          android:textColor="?colorAccent"/>
+          android:textColor="?colorSecondary"/>
 
         <View
           android:layout_width="match_parent"
diff --git a/android/app/src/main/res/layout/fragment_timetable_picker.xml b/android/app/src/main/res/layout/fragment_timetable_picker.xml
index 16c6de9f4..4254a2c38 100644
--- a/android/app/src/main/res/layout/fragment_timetable_picker.xml
+++ b/android/app/src/main/res/layout/fragment_timetable_picker.xml
@@ -14,7 +14,7 @@
     android:elevation="@dimen/appbar_elevation"
     android:background="?android:windowBackground"
     app:tabGravity="fill"
-    app:tabIndicatorColor="?colorAccent"
+    app:tabIndicatorColor="?colorSecondary"
     app:tabMode="fixed"
     app:tabRippleColor="@android:color/transparent"
     tools:ignore="UnusedAttribute"/>
diff --git a/android/app/src/main/res/layout/item_add_street.xml b/android/app/src/main/res/layout/item_add_street.xml
index bc4bbdea0..09fc56193 100644
--- a/android/app/src/main/res/layout/item_add_street.xml
+++ b/android/app/src/main/res/layout/item_add_street.xml
@@ -15,7 +15,7 @@
     android:layout_marginEnd="@dimen/margin_double"
     android:scaleType="centerCrop"
     app:srcCompat="@drawable/ic_plus"
-    app:tint="?colorAccent" />
+    app:tint="?colorSecondary" />
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/street"
@@ -25,6 +25,6 @@
     android:singleLine="true"
     android:text="@string/add_street"
     android:textAppearance="@style/MwmTextAppearance.Body1"
-    android:textColor="?colorAccent"/>
+    android:textColor="?colorSecondary"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android/app/src/main/res/layout/item_bookmark_button.xml b/android/app/src/main/res/layout/item_bookmark_button.xml
index de3afc21f..fb171fe61 100644
--- a/android/app/src/main/res/layout/item_bookmark_button.xml
+++ b/android/app/src/main/res/layout/item_bookmark_button.xml
@@ -15,7 +15,7 @@
     android:layout_width="@dimen/nav_icon_size"
     android:layout_height="wrap_content"
     android:layout_gravity="center_vertical"
-    app:tint="?colorAccent"
+    app:tint="?colorSecondary"
     tools:srcCompat="@drawable/ic_import" />
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/text"
@@ -26,5 +26,5 @@
     tools:text="Some text should go here"
     android:textAllCaps="true"
     android:textAppearance="@style/MwmTextAppearance.Body3"
-    android:textColor="?colorAccent"/>
+    android:textColor="?colorSecondary"/>
 </LinearLayout>
diff --git a/android/app/src/main/res/layout/item_bookmark_group_list_header.xml b/android/app/src/main/res/layout/item_bookmark_group_list_header.xml
index 5862854c2..a41eb4f05 100644
--- a/android/app/src/main/res/layout/item_bookmark_group_list_header.xml
+++ b/android/app/src/main/res/layout/item_bookmark_group_list_header.xml
@@ -31,7 +31,7 @@
     android:paddingTop="@dimen/margin_half_plus"
     android:text="@string/bookmark_lists_hide_all"
     android:textAllCaps="true"
-    android:textColor="?colorAccent"
+    android:textColor="?colorSecondary"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintTop_toTopOf="parent" />
diff --git a/android/app/src/main/res/layout/item_category_description.xml b/android/app/src/main/res/layout/item_category_description.xml
index 0a3de700d..26d032e68 100644
--- a/android/app/src/main/res/layout/item_category_description.xml
+++ b/android/app/src/main/res/layout/item_category_description.xml
@@ -36,7 +36,7 @@
         android:clickable="true"
         android:gravity="start|top"
         android:text="@string/category_desc_more"
-        android:textColor="?attr/colorAccent"
+        android:textColor="?attr/colorSecondary"
         android:layout_marginTop="2dp" />
   </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/android/app/src/main/res/layout/item_cuisine.xml b/android/app/src/main/res/layout/item_cuisine.xml
index a5b002bc4..dea81533a 100644
--- a/android/app/src/main/res/layout/item_cuisine.xml
+++ b/android/app/src/main/res/layout/item_cuisine.xml
@@ -14,7 +14,7 @@
     android:layout_width="48dp"
     android:layout_height="48dp"
     android:layout_marginEnd="@dimen/margin_double"
-    app:buttonTint="?colorAccent"/>
+    app:buttonTint="?colorSecondary"/>
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/cuisine"
diff --git a/android/app/src/main/res/layout/item_missed_map.xml b/android/app/src/main/res/layout/item_missed_map.xml
index 724131016..02dc8235f 100644
--- a/android/app/src/main/res/layout/item_missed_map.xml
+++ b/android/app/src/main/res/layout/item_missed_map.xml
@@ -17,7 +17,7 @@
     android:layout_centerVertical="true"
     android:layout_marginEnd="@dimen/margin_half"
     android:visibility="gone"
-    app:wheelProgressColor="?colorAccent"
+    app:wheelProgressColor="?colorSecondary"
     app:wheelSecondaryColor="?dividerHorizontal"
     app:wheelThickness="@dimen/margin_eighth"
     app:centerDrawable="@android:color/transparent"
diff --git a/android/app/src/main/res/layout/item_missed_map_group.xml b/android/app/src/main/res/layout/item_missed_map_group.xml
index f6d5d7b38..0075e42bb 100644
--- a/android/app/src/main/res/layout/item_missed_map_group.xml
+++ b/android/app/src/main/res/layout/item_missed_map_group.xml
@@ -17,7 +17,7 @@
     android:layout_centerVertical="true"
     android:layout_marginEnd="@dimen/margin_half"
     android:visibility="gone"
-    app:wheelProgressColor="?colorAccent"
+    app:wheelProgressColor="?colorSecondary"
     app:wheelSecondaryColor="?dividerHorizontal"
     app:wheelThickness="@dimen/margin_eighth"
     app:centerDrawable="@android:color/transparent"
@@ -32,7 +32,7 @@
     android:layout_marginEnd="@dimen/margin_base_plus"
     android:maxLines="1"
     android:textAppearance="@style/MwmTextAppearance.Body1"
-    android:textColor="?colorAccent"
+    android:textColor="?colorSecondary"
     tools:text="256 MB"/>
 
   <com.google.android.material.textview.MaterialTextView
@@ -45,6 +45,6 @@
     android:layout_alignWithParentIfMissing="true"
     android:layout_marginEnd="@dimen/margin_half"
     android:textAppearance="@style/MwmTextAppearance.Body1"
-    android:textColor="?colorAccent"
+    android:textColor="?colorSecondary"
     tools:text="Country name"/>
 </RelativeLayout>
diff --git a/android/app/src/main/res/layout/item_opening_hours.xml b/android/app/src/main/res/layout/item_opening_hours.xml
index 62708cc2f..28390537b 100644
--- a/android/app/src/main/res/layout/item_opening_hours.xml
+++ b/android/app/src/main/res/layout/item_opening_hours.xml
@@ -68,6 +68,6 @@
     android:text="@string/edit_opening_hours"
     android:textAllCaps="true"
     android:textAppearance="@style/MwmTextAppearance.Body1"
-    android:textColor="?colorAccent"/>
+    android:textColor="?colorSecondary"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/android/app/src/main/res/layout/item_search_result.xml b/android/app/src/main/res/layout/item_search_result.xml
index 98bc7967a..61868bcf3 100644
--- a/android/app/src/main/res/layout/item_search_result.xml
+++ b/android/app/src/main/res/layout/item_search_result.xml
@@ -68,6 +68,6 @@
     android:layout_alignBaseline="@id/region"
     android:layout_below="@id/description"
     android:textAppearance="@style/MwmTextAppearance.Body3"
-    android:textColor="?colorAccent"
+    android:textColor="?colorSecondary"
     tools:text="500 km"/>
 </RelativeLayout>
diff --git a/android/app/src/main/res/layout/item_search_suggest.xml b/android/app/src/main/res/layout/item_search_suggest.xml
index 967a63867..b8c64011f 100644
--- a/android/app/src/main/res/layout/item_search_suggest.xml
+++ b/android/app/src/main/res/layout/item_search_suggest.xml
@@ -3,7 +3,7 @@
           xmlns:app="http://schemas.android.com/apk/res-auto"
           xmlns:tools="http://schemas.android.com/tools"
           style="@style/MwmWidget.TextView.Search"
-          android:textColor="?colorAccent"
+          android:textColor="?colorSecondary"
           android:textAlignment="viewStart"
           app:drawableStartCompat="@drawable/ic_search"
           tools:text="Some suggest title"/>
diff --git a/android/app/src/main/res/layout/item_timetable.xml b/android/app/src/main/res/layout/item_timetable.xml
index 35a41c25b..cc5b5f042 100644
--- a/android/app/src/main/res/layout/item_timetable.xml
+++ b/android/app/src/main/res/layout/item_timetable.xml
@@ -276,7 +276,7 @@
         android:text="@string/editor_time_add_closed"
         android:textAllCaps="true"
         android:textAppearance="@style/MwmTextAppearance.Body1"
-        android:textColor="?colorAccent"/>
+        android:textColor="?colorSecondary"/>
 
     </LinearLayout>
 
diff --git a/android/app/src/main/res/layout/layout_nav_bottom.xml b/android/app/src/main/res/layout/layout_nav_bottom.xml
index 643d15a3f..99ddc9918 100644
--- a/android/app/src/main/res/layout/layout_nav_bottom.xml
+++ b/android/app/src/main/res/layout/layout_nav_bottom.xml
@@ -26,7 +26,7 @@
       style="@style/Widget.MaterialComponents.LinearProgressIndicator"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      app:indicatorColor="?colorAccent"
+      app:indicatorColor="?colorSecondary"
       app:trackCornerRadius="@dimen/nav_progress_head"
       app:trackThickness="@dimen/nav_progress"
       app:trackColor="@color/bg_routing_progress" />
diff --git a/android/app/src/main/res/layout/onmap_downloader.xml b/android/app/src/main/res/layout/onmap_downloader.xml
index 9d71c51c1..1d7665670 100644
--- a/android/app/src/main/res/layout/onmap_downloader.xml
+++ b/android/app/src/main/res/layout/onmap_downloader.xml
@@ -63,7 +63,7 @@
         android:layout_width="@dimen/downloader_status_size"
         android:layout_height="@dimen/downloader_status_size"
         android:layout_gravity="center"
-        app:wheelProgressColor="?colorAccent"
+        app:wheelProgressColor="?colorSecondary"
         app:wheelSecondaryColor="?dividerHorizontal"
         app:wheelThickness="@dimen/margin_eighth"
         android:visibility="visible"
diff --git a/android/app/src/main/res/layout/place_page_bluesky.xml b/android/app/src/main/res/layout/place_page_bluesky.xml
index a289defed..e463f88f2 100644
--- a/android/app/src/main/res/layout/place_page_bluesky.xml
+++ b/android/app/src/main/res/layout/place_page_bluesky.xml
@@ -13,7 +13,7 @@
     android:id="@+id/iv__place_bluesky"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_bluesky_white"
-    app:tint="?colorAccent"/>
+    app:tint="?colorSecondary"/>
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_bluesky_page"
diff --git a/android/app/src/main/res/layout/place_page_description_layout.xml b/android/app/src/main/res/layout/place_page_description_layout.xml
index f33131135..39b69d07a 100644
--- a/android/app/src/main/res/layout/place_page_description_layout.xml
+++ b/android/app/src/main/res/layout/place_page_description_layout.xml
@@ -34,7 +34,7 @@
     android:layout_marginBottom="@dimen/margin_base"
     android:textAppearance="?android:attr/textAppearance"
     android:gravity="start|top"
-    android:textColor="?attr/colorAccent"
+    android:textColor="?attr/colorSecondary"
     android:text="@string/category_desc_more"
     android:background="@android:color/transparent"/>
   <include
diff --git a/android/app/src/main/res/layout/place_page_email.xml b/android/app/src/main/res/layout/place_page_email.xml
index 4feb01da5..16d5f8965 100644
--- a/android/app/src/main/res/layout/place_page_email.xml
+++ b/android/app/src/main/res/layout/place_page_email.xml
@@ -12,7 +12,7 @@
     android:id="@+id/iv__place_email"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_email"
-    app:tint="?colorAccent" />
+    app:tint="?colorSecondary" />
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_email"
diff --git a/android/app/src/main/res/layout/place_page_facebook.xml b/android/app/src/main/res/layout/place_page_facebook.xml
index 2175af308..dd0984d83 100644
--- a/android/app/src/main/res/layout/place_page_facebook.xml
+++ b/android/app/src/main/res/layout/place_page_facebook.xml
@@ -11,7 +11,7 @@
     android:id="@+id/iv__place_facebook"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_facebook_white"
-    app:tint="?colorAccent"/>
+    app:tint="?colorSecondary"/>
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_facebook_page"
diff --git a/android/app/src/main/res/layout/place_page_fediverse.xml b/android/app/src/main/res/layout/place_page_fediverse.xml
index 66f40a0c8..0e0564381 100644
--- a/android/app/src/main/res/layout/place_page_fediverse.xml
+++ b/android/app/src/main/res/layout/place_page_fediverse.xml
@@ -13,7 +13,7 @@
     android:id="@+id/iv__place_fediverse"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_mastodon_white"
-    app:tint="?colorAccent"/>
+    app:tint="?colorSecondary"/>
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_fediverse_page"
diff --git a/android/app/src/main/res/layout/place_page_instagram.xml b/android/app/src/main/res/layout/place_page_instagram.xml
index afa79eed7..890a228ad 100644
--- a/android/app/src/main/res/layout/place_page_instagram.xml
+++ b/android/app/src/main/res/layout/place_page_instagram.xml
@@ -12,7 +12,7 @@
     android:id="@+id/iv__place_instagram"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_instagram_white"
-    app:tint="?colorAccent"/>
+    app:tint="?colorSecondary"/>
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_instagram_page"
diff --git a/android/app/src/main/res/layout/place_page_line.xml b/android/app/src/main/res/layout/place_page_line.xml
index 4b64a5573..b0499dc8c 100644
--- a/android/app/src/main/res/layout/place_page_line.xml
+++ b/android/app/src/main/res/layout/place_page_line.xml
@@ -11,7 +11,7 @@
     android:id="@+id/iv__place_line"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_line_white"
-    app:tint="?colorAccent"/>
+    app:tint="?colorSecondary"/>
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_line_page"
diff --git a/android/app/src/main/res/layout/place_page_open_in.xml b/android/app/src/main/res/layout/place_page_open_in.xml
index f3b3ea501..82880977d 100644
--- a/android/app/src/main/res/layout/place_page_open_in.xml
+++ b/android/app/src/main/res/layout/place_page_open_in.xml
@@ -12,7 +12,7 @@
     android:id="@+id/iv__place_open_in"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_open_in"
-    app:tint="?colorAccent"/>
+    app:tint="?colorSecondary"/>
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_open_in"
diff --git a/android/app/src/main/res/layout/place_page_panoramax.xml b/android/app/src/main/res/layout/place_page_panoramax.xml
index 5d6710ab6..3cc625558 100644
--- a/android/app/src/main/res/layout/place_page_panoramax.xml
+++ b/android/app/src/main/res/layout/place_page_panoramax.xml
@@ -13,7 +13,7 @@
     android:id="@+id/iv__place_panoramax"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_panoramax"
-    app:tint="?colorAccent"/>
+    app:tint="?colorSecondary"/>
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_panoramax"
diff --git a/android/app/src/main/res/layout/place_page_phone_item.xml b/android/app/src/main/res/layout/place_page_phone_item.xml
index 5413f0cdb..dd02e0af8 100644
--- a/android/app/src/main/res/layout/place_page_phone_item.xml
+++ b/android/app/src/main/res/layout/place_page_phone_item.xml
@@ -13,7 +13,7 @@
     android:id="@+id/iv__place_phone"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_phone"
-    app:tint="?colorAccent"/>
+    app:tint="?colorSecondary"/>
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_phone"
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 c40e48dbf..91c45feb7 100644
--- a/android/app/src/main/res/layout/place_page_preview.xml
+++ b/android/app/src/main/res/layout/place_page_preview.xml
@@ -168,7 +168,7 @@
           android:layout_gravity="center"
           android:scaleType="center"
           app:srcCompat="@drawable/ic_direction_pagepreview"
-          app:tint="?colorAccent" />
+          app:tint="?colorSecondary" />
         <com.google.android.material.textview.MaterialTextView
           android:id="@+id/tv__straight_distance"
           android:layout_width="wrap_content"
diff --git a/android/app/src/main/res/layout/place_page_twitter.xml b/android/app/src/main/res/layout/place_page_twitter.xml
index 2422954d4..aa6a115da 100644
--- a/android/app/src/main/res/layout/place_page_twitter.xml
+++ b/android/app/src/main/res/layout/place_page_twitter.xml
@@ -12,7 +12,7 @@
     android:id="@+id/iv__place_twitter"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_twitterx_white"
-    app:tint="?colorAccent"/>
+    app:tint="?colorSecondary"/>
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_twitter_page"
diff --git a/android/app/src/main/res/layout/place_page_vk.xml b/android/app/src/main/res/layout/place_page_vk.xml
index a8af9e611..5c8b64b1b 100644
--- a/android/app/src/main/res/layout/place_page_vk.xml
+++ b/android/app/src/main/res/layout/place_page_vk.xml
@@ -12,7 +12,7 @@
     android:id="@+id/iv__place_vk"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_vk_white"
-    app:tint="?colorAccent"/>
+    app:tint="?colorSecondary"/>
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_vk_page"
diff --git a/android/app/src/main/res/layout/place_page_website.xml b/android/app/src/main/res/layout/place_page_website.xml
index e7cd66fc6..f3f07ea87 100644
--- a/android/app/src/main/res/layout/place_page_website.xml
+++ b/android/app/src/main/res/layout/place_page_website.xml
@@ -12,7 +12,7 @@
     android:id="@+id/iv__place_website"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_website"
-    app:tint="?colorAccent"/>
+    app:tint="?colorSecondary"/>
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_website"
diff --git a/android/app/src/main/res/layout/place_page_website_menu.xml b/android/app/src/main/res/layout/place_page_website_menu.xml
index 379c9dade..78d10f363 100644
--- a/android/app/src/main/res/layout/place_page_website_menu.xml
+++ b/android/app/src/main/res/layout/place_page_website_menu.xml
@@ -12,7 +12,7 @@
     android:id="@+id/iv__place_website_menu"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_website_menu"
-    app:tint="?colorAccent"/>
+    app:tint="?colorSecondary"/>
 
   <LinearLayout
     android:layout_width="match_parent"
diff --git a/android/app/src/main/res/layout/place_page_wikimedia.xml b/android/app/src/main/res/layout/place_page_wikimedia.xml
index 96d1d2b16..8cea26a9d 100644
--- a/android/app/src/main/res/layout/place_page_wikimedia.xml
+++ b/android/app/src/main/res/layout/place_page_wikimedia.xml
@@ -11,7 +11,7 @@
     android:id="@+id/iv__place_wikimedia"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_wikimedia_commons_white"
-    app:tint="?colorAccent" />
+    app:tint="?colorSecondary" />
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_wikimedia"
diff --git a/android/app/src/main/res/layout/place_page_wikipedia_fragment.xml b/android/app/src/main/res/layout/place_page_wikipedia_fragment.xml
index 9d2b1e44e..c1d253a78 100644
--- a/android/app/src/main/res/layout/place_page_wikipedia_fragment.xml
+++ b/android/app/src/main/res/layout/place_page_wikipedia_fragment.xml
@@ -15,7 +15,7 @@
       android:id="@+id/iv__place_wiki"
       style="@style/PlacePageMetadataIcon"
       app:srcCompat="@drawable/ic_wiki"
-      app:tint="?colorAccent" />
+      app:tint="?colorSecondary" />
     <com.google.android.material.textview.MaterialTextView
       android:id="@+id/tv__place_wiki"
       android:layout_width="match_parent"
diff --git a/android/app/src/main/res/layout/routing_action_panel.xml b/android/app/src/main/res/layout/routing_action_panel.xml
index 496d8a313..40ade18a9 100644
--- a/android/app/src/main/res/layout/routing_action_panel.xml
+++ b/android/app/src/main/res/layout/routing_action_panel.xml
@@ -19,7 +19,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       app:srcCompat="@drawable/ic_search"
-      app:tint="?colorAccent"
+      app:tint="?colorSecondary"
       android:layout_marginStart="@dimen/margin_base"
       android:layout_marginEnd="@dimen/margin_base"/>
     <com.google.android.material.textview.MaterialTextView
@@ -31,7 +31,7 @@
       android:layout_marginEnd="@dimen/margin_base"
       android:layout_marginTop="@dimen/routing_action_panel_margin_vert"
       android:layout_marginBottom="@dimen/routing_action_panel_margin_vert"
-      android:textColor="?colorAccent"
+      android:textColor="?colorSecondary"
       tools:text="Add start point to plan a route."/>
   </LinearLayout>
   <LinearLayout
@@ -55,6 +55,6 @@
       android:layout_height="wrap_content"
       android:layout_margin="@dimen/margin_base"
       app:srcCompat="@drawable/ic_location_crosshair"
-      tools:tint="?colorAccent"/>
+      tools:tint="?colorSecondary"/>
   </LinearLayout>
 </LinearLayout>
diff --git a/android/app/src/main/res/layout/routing_details.xml b/android/app/src/main/res/layout/routing_details.xml
index 50b91bff0..6307d0917 100644
--- a/android/app/src/main/res/layout/routing_details.xml
+++ b/android/app/src/main/res/layout/routing_details.xml
@@ -12,7 +12,7 @@
     android:layout_height="@dimen/altitude_chart_time_distance_height"
     android:textAppearance="@style/MwmTextAppearance.Body3"
     android:fontFamily="@string/robotoMedium"
-    android:textColor="?colorAccent"
+    android:textColor="?colorSecondary"
     android:layout_gravity="end"
     android:gravity="center"
     android:layout_alignParentEnd="true"
diff --git a/android/app/src/main/res/layout/routing_plan.xml b/android/app/src/main/res/layout/routing_plan.xml
index 078a92f0d..86f975c72 100644
--- a/android/app/src/main/res/layout/routing_plan.xml
+++ b/android/app/src/main/res/layout/routing_plan.xml
@@ -48,7 +48,7 @@
               android:layout_marginStart="@dimen/routing_selector_wheel_margin"
               android:contentDescription="@string/vehicle"
               tools:button="@drawable/ic_car"
-              tools:buttonTint="?colorAccent" />
+              tools:buttonTint="?colorSecondary" />
 
           <app.organicmaps.widget.RoutingToolbarButton
               android:id="@+id/pedestrian"
diff --git a/android/app/src/main/res/values-night-v27/themes.xml b/android/app/src/main/res/values-night-v27/themes.xml
index 0d4df4912..87388ede0 100644
--- a/android/app/src/main/res/values-night-v27/themes.xml
+++ b/android/app/src/main/res/values-night-v27/themes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <style name="MwmTheme.Night.MainActivity">
-        <item name="android:colorPrimaryDark">@android:color/black</item>
+        <item name="colorPrimaryVariant">@android:color/black</item>
         <item name="android:windowBackground">@null</item>
         <item name="android:windowTranslucentNavigation">false</item>
         <!-- Allows to show the app behind the camera notch in landscape and when hiding the status bar -->
diff --git a/android/app/src/main/res/values-night/themes.xml b/android/app/src/main/res/values-night/themes.xml
index 4bab7064b..888d0138e 100644
--- a/android/app/src/main/res/values-night/themes.xml
+++ b/android/app/src/main/res/values-night/themes.xml
@@ -13,7 +13,7 @@
         <item name="android:textColorPrimaryInverse">@color/text_dark</item>
         <item name="android:textColorSecondary">@color/text_light_subtitle</item>
         <item name="android:windowBackground">?windowBackgroundForced</item>
-        <item name="android:colorPrimaryDark">@color/bg_primary_dark_night</item>
+        <item name="colorPrimaryVariant">@color/bg_primary_dark_night</item>
         <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
         <item name="android:fontFamily">@string/robotoRegular</item>
         <item name="android:colorBackgroundCacheHint">@null</item>
@@ -30,7 +30,7 @@
         <item name="fullscreenDialogTheme">@style/MwmTheme.DialogFragment.Fullscreen.Night</item>
         <item name="colorPrimary">@color/bg_primary_night</item>
         <item name="colorControlNormal">?secondary</item>
-        <item name="colorAccent">@color/base_accent_night</item>
+        <item name="colorSecondary">@color/base_accent_night</item>
         <item name="colorAccentTransparent">@color/base_accent_transparent</item>
         <item name="colorBtnHighlight">@color/white_24</item>
         <item name="panel">@color/bg_panel_night</item>
@@ -132,7 +132,7 @@
 
     <!-- Theme is overridden in v27 folder to handle cutouts -->
     <style name="MwmTheme.Night.MainActivity">
-        <item name="android:colorPrimaryDark">@android:color/black</item>
+        <item name="colorPrimaryVariant">@android:color/black</item>
         <item name="android:windowBackground">@null</item>
         <item name="android:windowTranslucentNavigation">false</item>
     </style>
@@ -147,7 +147,7 @@
     </style>
 
     <style name="MwmTheme.Night.AlertDialog" parent="Theme.MaterialComponents.Dialog.Alert">
-        <item name="colorAccent">?buttonDialogTextColor</item>
+        <item name="colorSecondary">?buttonDialogTextColor</item>
         <item name="colorPrimary">?buttonDialogTextColor</item>
         <item name="android:background">?cardBackground</item>
         <!-- Used for the message in the dialog -->
@@ -163,8 +163,8 @@
 
     <style name="MwmTheme.DialogFragment.Fullscreen.Night" parent="Theme.AppCompat">
         <item name="colorPrimary">@color/bg_primary_night</item>
-        <item name="android:colorPrimaryDark">?statusBar</item>
-        <item name="colorAccent">@color/base_accent_night</item>
+        <item name="colorPrimaryVariant">?statusBar</item>
+        <item name="colorSecondary">@color/base_accent_night</item>
         <item name="clickableBackground">?selectableItemBackground</item>
         <item name="colorControlNormal">@color/text_dark_hint</item>
         <item name="android:windowIsFloating">false</item>
@@ -182,7 +182,7 @@
     </style>
 
     <style name="MwmMain.DialogFragment.TimePicker.Night" parent="Theme.MaterialComponents.Dialog.Alert">
-        <item name="colorAccent">@color/base_accent_night</item>
+        <item name="colorSecondary">@color/base_accent_night</item>
         <item name="colorPrimary">?buttonDialogTextColor</item>
         <item name="android:fontFamily">@string/robotoMedium</item>
         <item name="android:windowBackground">@color/bg_cards_night</item>
diff --git a/android/app/src/main/res/values-v27/themes.xml b/android/app/src/main/res/values-v27/themes.xml
index ff2be3c5e..2965eda39 100644
--- a/android/app/src/main/res/values-v27/themes.xml
+++ b/android/app/src/main/res/values-v27/themes.xml
@@ -2,7 +2,7 @@
 <!-- Cutouts API is available for API >= 27 -->
 <resources>
   <style name="MwmTheme.MainActivity">
-    <item name="android:colorPrimaryDark">@android:color/black</item>
+    <item name="colorPrimaryVariant">@android:color/black</item>
     <item name="android:windowBackground">@null</item>
     <item name="android:windowTranslucentNavigation">false</item>
     <!-- Allows to show the app behind the camera notch in landscape and when hiding the status bar -->
diff --git a/android/app/src/main/res/values/styles-editor.xml b/android/app/src/main/res/values/styles-editor.xml
index e88d81250..b6f80eb52 100644
--- a/android/app/src/main/res/values/styles-editor.xml
+++ b/android/app/src/main/res/values/styles-editor.xml
@@ -38,7 +38,7 @@
     <item name="android:layout_width">wrap_content</item>
     <item name="android:layout_height">wrap_content</item>
     <item name="android:checked">true</item>
-    <item name="buttonTint">?colorAccent</item>
+    <item name="buttonTint">?colorSecondary</item>
   </style>
 
   <style name="MwmWidget.Editor.DayText">
diff --git a/android/app/src/main/res/values/styles-text.xml b/android/app/src/main/res/values/styles-text.xml
index f5f78b41a..07b1336da 100644
--- a/android/app/src/main/res/values/styles-text.xml
+++ b/android/app/src/main/res/values/styles-text.xml
@@ -95,7 +95,7 @@
 
   <style name="MwmTextAppearance.Button">
     <item name="android:textSize">@dimen/text_size_button</item>
-    <item name="android:textColor">?colorAccent</item>
+    <item name="android:textColor">?colorSecondary</item>
     <item name="android:textAllCaps">true</item>
   </style>
 
@@ -133,7 +133,7 @@
 
   <style name="MwmTextAppearance.NavMenu.Time">
     <item name="android:textSize">@dimen/text_size_nav_menu_number</item>
-    <item name="android:textColor">?colorAccent</item>
+    <item name="android:textColor">?colorSecondary</item>
   </style>
 
   <style name="MwmTextAppearance.NavMenu.Time.Dimension">
@@ -180,7 +180,7 @@
   <style name="MwmTextAppearance.PlacePage" parent="MwmTextAppearance.Body1"/>
 
   <style name="MwmTextAppearance.PlacePage.Accent">
-    <item name="android:textColor">?colorAccent</item>
+    <item name="android:textColor">?colorSecondary</item>
   </style>
 
   <style name="MwmTextAppearance.Tab" parent="MwmTextAppearance.Body3">
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index ec0e062e1..cdba5938c 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -144,18 +144,18 @@
 
   <style name="MwmWidget.ToolbarTheme" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar">
     <item name="android:gravity">center_vertical</item>
-    <item name="colorAccent">@android:color/white</item>
+    <item name="colorSecondary">@android:color/white</item>
     <item name="iconTint">@color/white_primary</item>
   </style>
 
   <style name="MwmWidget.ToolbarTheme.Light" parent="MwmWidget.ToolbarTheme">
     <item name="android:gravity">center_vertical</item>
-    <item name="colorAccent">@color/bg_window_night</item>
+    <item name="colorSecondary">@color/bg_window_night</item>
   </style>
 
   <style name="MwmWidget.ToolbarTheme.Transparent" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar">
     <item name="android:gravity">center_vertical</item>
-    <item name="colorAccent">@android:color/white</item>
+    <item name="colorSecondary">@android:color/white</item>
     <item name="android:windowActionBarOverlay">true</item>
     <item name="windowActionBarOverlay">true</item>
   </style>
@@ -164,7 +164,7 @@
     name="MwmWidget.ToolbarTheme.DownButton"
     parent="ThemeOverlay.MaterialComponents.Dark.ActionBar">
     <item name="android:gravity">center_vertical</item>
-    <item name="colorAccent">@android:color/white</item>
+    <item name="colorSecondary">@android:color/white</item>
     <item name="android:homeAsUpIndicator">@drawable/ic_down</item>
   </style>
 
@@ -364,7 +364,7 @@
     <item name="iconSize">20dp</item>
     <item name="iconTint">?accentButtonTextColor</item>
     <item name="android:textColor">?accentButtonTextColor</item>
-    <item name="backgroundTint">?colorAccent</item>
+    <item name="backgroundTint">?colorSecondary</item>
     <item name="android:textSize">14sp</item>
     <item name="textAllCaps">false</item>
     <item name="android:textAllCaps">false</item>
diff --git a/android/app/src/main/res/values/themes.xml b/android/app/src/main/res/values/themes.xml
index 640a81f0e..2649b6a62 100644
--- a/android/app/src/main/res/values/themes.xml
+++ b/android/app/src/main/res/values/themes.xml
@@ -13,7 +13,7 @@
     <item name="android:textColorPrimaryInverse">@color/text_light</item>
     <item name="android:textColorSecondary">@color/text_dark_subtitle</item>
     <item name="android:windowBackground">?windowBackgroundForced</item>
-    <item name="android:colorPrimaryDark">@color/bg_primary_dark</item>
+    <item name="colorPrimaryVariant">@color/bg_primary_dark</item>
     <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
     <item name="android:fontFamily">@string/robotoRegular</item>
     <item name="android:colorBackgroundCacheHint">@null</item>
@@ -28,7 +28,7 @@
     <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="colorSecondary">@color/base_accent</item>
     <item name="colorAccentTransparent">@color/base_accent_transparent</item>
     <item name="colorBtnHighlight">@color/white_38</item>
     <item name="panel">@color/bg_panel</item>
@@ -146,7 +146,7 @@
 
   <!-- Theme is overridden in v27 folder to handle cutouts -->
   <style name="MwmTheme.MainActivity">
-    <item name="android:colorPrimaryDark">@android:color/black</item>
+    <item name="colorPrimaryVariant">@android:color/black</item>
     <item name="android:windowBackground">@null</item>
     <item name="android:windowTranslucentNavigation">false</item>
   </style>
@@ -165,7 +165,7 @@
   </style>
 
   <style name="MwmTheme.AlertDialog" parent="Theme.MaterialComponents.Light.Dialog.Alert">
-    <item name="colorAccent">?buttonDialogTextColor</item>
+    <item name="colorSecondary">?buttonDialogTextColor</item>
     <item name="colorPrimary">?buttonDialogTextColor</item>
     <item name="android:background">?cardBackground</item>
     <item name="android:textColorPrimary">?textDialogTheme</item>
@@ -184,8 +184,8 @@
 
   <style name="MwmTheme.DialogFragment.Fullscreen" parent="Theme.AppCompat.Light">
     <item name="colorPrimary">@color/bg_primary</item>
-    <item name="android:colorPrimaryDark">?statusBar</item>
-    <item name="colorAccent">@color/base_accent</item>
+    <item name="colorPrimaryVariant">?statusBar</item>
+    <item name="colorSecondary">@color/base_accent</item>
     <item name="clickableBackground">?selectableItemBackground</item>
     <item name="colorControlNormal">@color/text_light_hint</item>
     <item name="android:windowIsFloating">false</item>
@@ -203,14 +203,14 @@
   </style>
 
   <style name="MwmTheme.DialogFragment.Fullscreen.Translucent">
-    <item name="android:colorPrimaryDark">@android:color/black</item>
+    <item name="colorPrimaryVariant">@android:color/black</item>
     <item name="android:windowBackground">@color/bg_dialog_translucent</item>
     <item name="android:windowIsTranslucent">true</item>
     <item name="android:navigationBarColor">@android:color/transparent</item>
   </style>
 
   <style name="MwmMain.DialogFragment.TimePicker" parent="Theme.MaterialComponents.Light.Dialog.Alert">
-    <item name="colorAccent">@color/base_accent</item>
+    <item name="colorSecondary">@color/base_accent</item>
     <item name="colorPrimary">?buttonDialogTextColor</item>
     <item name="android:fontFamily">@string/robotoMedium</item>
     <item name="android:windowBackground">@color/bg_cards</item>