diff --git a/android/app/src/main/java/app/organicmaps/ChartController.java b/android/app/src/main/java/app/organicmaps/ChartController.java
index cd5ce84c8d..664bbfdfe7 100644
--- a/android/app/src/main/java/app/organicmaps/ChartController.java
+++ b/android/app/src/main/java/app/organicmaps/ChartController.java
@@ -126,7 +126,7 @@ public class ChartController implements OnChartValueSelectedListener,
     x.setGranularityEnabled(true);
     x.setTextColor(ThemeUtils.getColor(mContext, R.attr.elevationProfileAxisLabelColor));
     x.setPosition(XAxis.XAxisPosition.BOTTOM);
-    x.setAxisLineColor(ThemeUtils.getColor(mContext, R.attr.dividerHorizontal));
+    x.setAxisLineColor(ThemeUtils.getColor(mContext, androidx.appcompat.R.attr.dividerHorizontal));
     x.setAxisLineWidth(mContext.getResources().getDimensionPixelSize(R.dimen.divider_height));
     ValueFormatter xAxisFormatter = new AxisValueFormatter(mChart);
     x.setValueFormatter(xAxisFormatter);
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 42b843b1b4..8adec6c59f 100644
--- a/android/app/src/main/java/app/organicmaps/editor/AdvancedTimetableFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/AdvancedTimetableFragment.java
@@ -88,8 +88,8 @@ public class AdvancedTimetableFragment extends BaseMwmFragment
 
   private void setExampleDrawables(@DrawableRes int left, @DrawableRes int right)
   {
-    mExamplesTitle.setCompoundDrawablesRelativeWithIntrinsicBounds(Graphics.tint(requireActivity(), left, R.attr.colorAccent), null,
-                                                           Graphics.tint(requireActivity(), right, R.attr.colorAccent), null);
+    mExamplesTitle.setCompoundDrawablesRelativeWithIntrinsicBounds(Graphics.tint(requireActivity(), left, androidx.appcompat.R.attr.colorAccent), null,
+                                                           Graphics.tint(requireActivity(), right, androidx.appcompat.R.attr.colorAccent), 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 9c24c5ba1a..d9e8e9e2d6 100644
--- a/android/app/src/main/java/app/organicmaps/maplayer/SearchWheel.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/SearchWheel.java
@@ -222,7 +222,7 @@ public class SearchWheel implements View.OnClickListener
                                                  searchOption == null ?
                                                  R.drawable.ic_routing_search_off :
                                                  searchOption.mDrawableOff,
-                                                 R.attr.colorAccent));
+                                                 androidx.appcompat.R.attr.colorAccent));
   }
 
   @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 968b9147bb..d2ff7ab2b1 100644
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
@@ -255,7 +255,7 @@ final class RoutingBottomMenuController implements View.OnClickListener
       UiUtils.show(mActionButton);
       Drawable icon = ContextCompat.getDrawable(mContext, R.drawable.ic_my_location);
       int colorAccent = ContextCompat.getColor(mContext,
-                                               UiUtils.getStyledResourceId(mContext, R.attr.colorAccent));
+                                               UiUtils.getStyledResourceId(mContext, androidx.appcompat.R.attr.colorAccent));
       mActionIcon.setImageDrawable(Graphics.tint(icon, colorAccent));
     }
     else
diff --git a/android/app/src/main/java/app/organicmaps/routing/TransitStepView.java b/android/app/src/main/java/app/organicmaps/routing/TransitStepView.java
index cf30ba769d..4b9754ff95 100644
--- a/android/app/src/main/java/app/organicmaps/routing/TransitStepView.java
+++ b/android/app/src/main/java/app/organicmaps/routing/TransitStepView.java
@@ -110,7 +110,7 @@ public class TransitStepView extends View implements MultilineLayoutManager.Sque
       case RULER:
         return ThemeUtils.getColor(context, R.attr.transitRulerBackground);
       case INTERMEDIATE_POINT:
-        return ThemeUtils.getColor(context, R.attr.colorPrimary);
+        return ThemeUtils.getColor(context, androidx.appcompat.R.attr.colorPrimary);
       default:
         return info.getColor();
     }
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 518af9bc96..42967349a1 100644
--- a/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java
@@ -64,7 +64,7 @@ class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHol
 
     @AttrRes int getTintAttr()
     {
-      return R.attr.colorAccent;
+      return androidx.appcompat.R.attr.colorAccent;
     }
 
     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 0c17a6e78b..72fab7d021 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
     public void onTabSelected(TabLayout.Tab tab)
     {
       super.onTabSelected(tab);
-      Graphics.tint(mContext, tab.getIcon(), R.attr.colorAccent);
+      Graphics.tint(mContext, tab.getIcon(), androidx.appcompat.R.attr.colorAccent);
     }
 
     @Override
diff --git a/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java b/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
index cf8406598c..9c323f665b 100644
--- a/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
+++ b/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
@@ -382,7 +382,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment
     final Spannable link = new SpannableString(ttsLinkText + "↗");
     // Set link color.
     link.setSpan(new ForegroundColorSpan(ContextCompat.getColor(requireContext(),
-                                                                UiUtils.getStyledResourceId(requireContext(), R.attr.colorAccent))),
+                                                                UiUtils.getStyledResourceId(requireContext(), androidx.appcompat.R.attr.colorAccent))),
                  0, ttsLinkText.length(), 0);
     ttsLangInfoLink.setSummary(link);
 
diff --git a/android/app/src/main/java/app/organicmaps/util/UiUtils.java b/android/app/src/main/java/app/organicmaps/util/UiUtils.java
index 834d73d1aa..fcd8943097 100644
--- a/android/app/src/main/java/app/organicmaps/util/UiUtils.java
+++ b/android/app/src/main/java/app/organicmaps/util/UiUtils.java
@@ -195,7 +195,7 @@ public final class UiUtils
 
   public static void showHomeUpButton(Toolbar toolbar)
   {
-    toolbar.setNavigationIcon(ThemeUtils.getResource(toolbar.getContext(), R.attr.homeAsUpIndicator));
+    toolbar.setNavigationIcon(ThemeUtils.getResource(toolbar.getContext(), androidx.appcompat.R.attr.homeAsUpIndicator));
   }
 
   public static boolean isTablet(@NonNull Context context)
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 a247bea67d..841ea9c923 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
@@ -49,7 +49,7 @@ public class MyPositionButton
     @DimenRes int sizeDimen = R.dimen.map_button_icon_size;
     if (mode == LocationState.FOLLOW || mode == LocationState.FOLLOW_AND_ROTATE || mode == LocationState.PENDING_POSITION)
     {
-      colorAttr = R.attr.colorAccent;
+      colorAttr = androidx.appcompat.R.attr.colorAccent;
       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 eb564c0aca..33f8169fd2 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
@@ -169,7 +169,7 @@ public class NavMenu
   public void refreshTts()
   {
     mTts.setImageDrawable(TtsPlayer.isEnabled() ? Graphics.tint(mActivity, R.drawable.ic_voice_on,
-        R.attr.colorAccent)
+        androidx.appcompat.R.attr.colorAccent)
         : Graphics.tint(mActivity, R.drawable.ic_voice_off));
   }
 
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java
index b0a225a993..a703e8fb14 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java
@@ -120,7 +120,7 @@ public class PlacePageController extends Fragment implements
     mViewportMinHeight = res.getDimensionPixelSize(R.dimen.viewport_min_height);
     mButtonsHeight = (int) res.getDimension(R.dimen.place_page_buttons_height);
     mMaxButtons = res.getInteger(R.integer.pp_buttons_max);
-    mRoutingHeaderHeight = (int) res.getDimension(ThemeUtils.getResource(requireContext(), R.attr.actionBarSize));
+    mRoutingHeaderHeight = (int) res.getDimension(ThemeUtils.getResource(requireContext(), androidx.appcompat.R.attr.actionBarSize));
 
     mCoordinator = activity.findViewById(R.id.coordinator);
     mPlacePage = view.findViewById(R.id.placepage);
diff --git a/android/gradle.properties b/android/gradle.properties
index edb9042821..ca6d9ff78d 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -6,7 +6,7 @@ org.gradle.caching=true
 org.gradle.jvmargs=-Xmx1024m -Xms256m
 android.useAndroidX=true
 android.native.buildOutput=verbose
-android.nonTransitiveRClass=false
+android.nonTransitiveRClass=true
 android.nonFinalResIds=false
 
 # Autogenerated by tools/unix/generate_localizations.sh