diff --git a/android/app/src/main/java/app/organicmaps/car/screens/CategoriesScreen.java b/android/app/src/main/java/app/organicmaps/car/screens/CategoriesScreen.java
index 7598bfbf0c..a15fd8e90a 100644
--- a/android/app/src/main/java/app/organicmaps/car/screens/CategoriesScreen.java
+++ b/android/app/src/main/java/app/organicmaps/car/screens/CategoriesScreen.java
@@ -30,15 +30,15 @@ public class CategoriesScreen extends BaseMapScreen
   private record CategoryData(@StringRes int nameResId, @DrawableRes int iconResId, @DrawableRes int iconNightResId)
   {
   }
-
+  //TODO: previously handled theme by itself, but now icons are dynamic so not needed.
   private static final List<CategoryData> CATEGORIES = Arrays.asList(
-      new CategoryData(R.string.category_fuel, R.drawable.ic_category_fuel, R.drawable.ic_category_fuel_night),
-      new CategoryData(R.string.category_parking, R.drawable.ic_category_parking, R.drawable.ic_category_parking_night),
-      new CategoryData(R.string.category_eat, R.drawable.ic_category_eat, R.drawable.ic_category_eat_night),
-      new CategoryData(R.string.category_food, R.drawable.ic_category_food, R.drawable.ic_category_food_night),
-      new CategoryData(R.string.category_hotel, R.drawable.ic_category_hotel, R.drawable.ic_category_hotel_night),
-      new CategoryData(R.string.category_toilet, R.drawable.ic_category_toilet, R.drawable.ic_category_toilet_night),
-      new CategoryData(R.string.category_rv, R.drawable.ic_category_rv, R.drawable.ic_category_rv_night)
+      new CategoryData(R.string.category_fuel, R.drawable.ic_category_fuel, R.drawable.ic_category_fuel),
+      new CategoryData(R.string.category_parking, R.drawable.ic_category_parking, R.drawable.ic_category_parking),
+      new CategoryData(R.string.category_eat, R.drawable.ic_category_eat, R.drawable.ic_category_eat),
+      new CategoryData(R.string.category_food, R.drawable.ic_category_food, R.drawable.ic_category_food),
+      new CategoryData(R.string.category_hotel, R.drawable.ic_category_hotel, R.drawable.ic_category_hotel),
+      new CategoryData(R.string.category_toilet, R.drawable.ic_category_toilet, R.drawable.ic_category_toilet),
+      new CategoryData(R.string.category_rv, R.drawable.ic_category_rv, R.drawable.ic_category_rv)
   );
 
   private final int MAX_CATEGORIES_SIZE;
diff --git a/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButton.java b/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButton.java
index 7d254867c0..5b1b0f339f 100644
--- a/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButton.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButton.java
@@ -39,14 +39,14 @@ public class TrafficButton
   {
     Context context = trafficBtn.getContext();
     Resources res = context.getResources();
-    final int animResId = ThemeUtils.getResource(context, R.attr.trafficLoadingAnimation);
+    final int animResId = R.drawable.anim_traffic_loading;
     return (AnimationDrawable) Objects.requireNonNull(ResourcesCompat.getDrawable(res, animResId, context.getTheme()));
   }
 
   void turnOff()
   {
     stopWaitingAnimation();
-// Don't set theme programatically - use an xml with a night variant instead.
+// Don't set theme programatically - use an xml with a night variant instead. Also convert to svg.
 //    mButton.setImageResource(ThemeUtils.isNightTheme(mButton.getContext()) ? R.drawable.ic_traffic_on_night
 //                                                                           : R.drawable.ic_traffic_on);
   }
@@ -54,7 +54,7 @@ public class TrafficButton
   void turnOn()
   {
     stopWaitingAnimation();
-// Don't set theme programatically - use an xml with a night variant instead.
+// Don't set theme programatically - use an xml with a night variant instead.  Also convert to svg.
 //    mButton.setImageResource(ThemeUtils.isNightTheme(mButton.getContext()) ? R.drawable.ic_traffic_on_night
 //                                                                           : R.drawable.ic_traffic_on);
   }
@@ -62,7 +62,7 @@ public class TrafficButton
   void markAsOutdated()
   {
     stopWaitingAnimation();
-// Don't set theme programatically - use an xml with a night variant instead.
+// Don't set theme programatically - use an xml with a night variant instead. Also convert to svg.
 //    mButton.setImageResource(ThemeUtils.isNightTheme(mButton.getContext()) ? R.drawable.ic_traffic_outdated_night
 //                                                                           : R.drawable.ic_traffic_outdated);
   }
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 e9745a52b5..a15a423cce 100644
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
@@ -146,7 +146,7 @@ final class RoutingBottomMenuController implements View.OnClickListener
     mActionIcon = mActionButton.findViewById(R.id.iv__icon);
     UiUtils.hide(mAltitudeChartFrame, mActionFrame);
     mListener = listener;
-    int dividerRes = ThemeUtils.getResource(mContext, R.attr.transitStepDivider);
+    int dividerRes = R.drawable.dot_divider;
     Drawable dividerDrawable = ContextCompat.getDrawable(mContext, dividerRes);
     Resources res = mContext.getResources();
     mTransitViewDecorator = new DotDividerItemDecoration(dividerDrawable, res.getDimensionPixelSize(R.dimen.margin_base),
diff --git a/android/app/src/main/res/drawable-night/button_accent.xml b/android/app/src/main/res/drawable-night/button_accent.xml
index 192a6af3ec..102a72b2a8 100644
--- a/android/app/src/main/res/drawable-night/button_accent.xml
+++ b/android/app/src/main/res/drawable-night/button_accent.xml
@@ -3,5 +3,5 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:color="?attr/colorBtnHighlight">
   <item android:drawable="@drawable/ripple_mask"/>
-  <item android:drawable="@drawable/button_accent_night_internal"/>
+  <item android:drawable="@drawable/button_accent_internal"/>
 </ripple>
diff --git a/android/app/src/main/res/drawable-night/button_accent_internal.xml b/android/app/src/main/res/drawable-night/button_accent_internal.xml
index 67c7755d24..d2aa33222d 100644
--- a/android/app/src/main/res/drawable-night/button_accent_internal.xml
+++ b/android/app/src/main/res/drawable-night/button_accent_internal.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector
   xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/button_accent_pressed_night"
+  <item android:drawable="@drawable/button_accent_pressed"
         android:state_pressed="true"/>
-  <item android:drawable="@drawable/button_accent_normal_night"
+  <item android:drawable="@drawable/button_accent_normal"
         android:state_enabled="true"/>
-  <item android:drawable="@drawable/button_accent_disabled_night"/>
+  <item android:drawable="@drawable/button_accent_disabled"/>
 </selector>
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 3ed8acfe81..c6cc284af4 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
@@ -48,7 +48,7 @@
       android:layout_height="wrap_content"
       android:layout_margin="@dimen/margin_half"
       android:orientation="vertical"
-      android:background="?navNextTurnFrame"
+      android:background="@drawable/bg_nav_next_turn"
       android:elevation="@dimen/nav_elevation">
       <FrameLayout
         android:layout_width="wrap_content"
@@ -92,7 +92,7 @@
       android:layout_below="@id/nav_next_turn_frame"
       android:layout_alignStart="@id/nav_next_turn_frame"
       android:layout_alignEnd="@id/nav_next_turn_frame"
-      android:background="?navNextNextTurnFrame"
+      android:background="@drawable/bg_nav_next_next_turn"
       android:elevation="@dimen/nav_elevation"
       android:visibility="gone"
       tools:visibility="visible">
diff --git a/android/app/src/main/res/layout/current_location_marker.xml b/android/app/src/main/res/layout/current_location_marker.xml
index 50ec2a1c59..7741c329b3 100644
--- a/android/app/src/main/res/layout/current_location_marker.xml
+++ b/android/app/src/main/res/layout/current_location_marker.xml
@@ -11,7 +11,7 @@
     android:id="@+id/label"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="?elevationProfileYourLocationPinBg"
+    android:background="@drawable/bg_your_location_pin"
     android:ellipsize="end"
     android:paddingStart="@dimen/margin_quarter"
     android:paddingEnd="@dimen/margin_quarter"
diff --git a/android/app/src/main/res/layout/elevation_profile.xml b/android/app/src/main/res/layout/elevation_profile.xml
index e8caa071ef..59623905aa 100644
--- a/android/app/src/main/res/layout/elevation_profile.xml
+++ b/android/app/src/main/res/layout/elevation_profile.xml
@@ -23,7 +23,7 @@
     android:layout_marginStart="@dimen/margin_half"
     android:layout_marginTop="@dimen/margin_quarter"
     android:layout_marginEnd="@dimen/margin_base_plus"
-    android:background="?altitudeBg"
+    android:background="@drawable/bg_altitude"
     android:paddingStart="@dimen/margin_quarter_plus"
     android:paddingTop="@dimen/margin_eighth"
     android:paddingEnd="@dimen/margin_quarter_plus"
@@ -39,7 +39,7 @@
     android:layout_marginStart="@dimen/margin_half"
     android:layout_marginEnd="@dimen/margin_base_plus"
     android:layout_marginBottom="@dimen/margin_base_plus"
-    android:background="?altitudeBg"
+    android:background="@drawable/bg_altitude"
     android:paddingStart="@dimen/margin_quarter_plus"
     android:paddingTop="@dimen/margin_eighth"
     android:paddingEnd="@dimen/margin_quarter_plus"
diff --git a/android/app/src/main/res/layout/elevation_profile_internal.xml b/android/app/src/main/res/layout/elevation_profile_internal.xml
index 564b3ade8f..993fafc75b 100644
--- a/android/app/src/main/res/layout/elevation_profile_internal.xml
+++ b/android/app/src/main/res/layout/elevation_profile_internal.xml
@@ -43,7 +43,7 @@
       android:layout_height="match_parent"
       android:layout_marginEnd="@dimen/margin_quarter"
       android:layout_weight="1"
-      android:background="?elevationProfilePropertyBg"
+      android:background="@drawable/bg_rounded_rect"
       android:gravity="center_horizontal"
       android:orientation="vertical"
       android:padding="@dimen/margin_quarter_plus">
@@ -73,7 +73,7 @@
       android:layout_height="match_parent"
       android:layout_marginEnd="@dimen/margin_quarter"
       android:layout_weight="1"
-      android:background="?elevationProfilePropertyBg"
+      android:background="@drawable/bg_rounded_rect"
       android:gravity="center_horizontal"
       android:orientation="vertical"
       android:padding="@dimen/margin_quarter_plus">
@@ -103,7 +103,7 @@
       android:layout_height="match_parent"
       android:layout_marginEnd="@dimen/margin_quarter"
       android:layout_weight="1"
-      android:background="?elevationProfilePropertyBg"
+      android:background="@drawable/bg_rounded_rect"
       android:gravity="center_horizontal"
       android:orientation="vertical"
       android:padding="@dimen/margin_quarter_plus">
@@ -132,7 +132,7 @@
       android:layout_width="0dp"
       android:layout_height="match_parent"
       android:layout_weight="1"
-      android:background="?elevationProfilePropertyBg"
+      android:background="@drawable/bg_rounded_rect"
       android:gravity="center_horizontal"
       android:orientation="vertical"
       android:padding="@dimen/margin_quarter_plus">
diff --git a/android/app/src/main/res/layout/floating_marker_view.xml b/android/app/src/main/res/layout/floating_marker_view.xml
index 6cee6ebd65..169678c9aa 100644
--- a/android/app/src/main/res/layout/floating_marker_view.xml
+++ b/android/app/src/main/res/layout/floating_marker_view.xml
@@ -38,7 +38,7 @@
       android:layout_marginTop="@dimen/margin_half"
       android:layout_marginBottom="@dimen/margin_half"
       android:layout_toEndOf="@id/floating_triangle"
-      android:background="?elevationProfileSelectedPointBg"
+      android:background="@drawable/bg_point_desc"
       android:elevation="@dimen/margin_eighth"
       android:maxWidth="@dimen/dialog_min_height"
       android:padding="@dimen/margin_quarter_plus"
diff --git a/android/app/src/main/res/layout/layout_nav_top.xml b/android/app/src/main/res/layout/layout_nav_top.xml
index 93ea3b9771..a3adf0d6d9 100644
--- a/android/app/src/main/res/layout/layout_nav_top.xml
+++ b/android/app/src/main/res/layout/layout_nav_top.xml
@@ -48,7 +48,7 @@
       android:layout_height="wrap_content"
       android:layout_margin="@dimen/margin_half"
       android:orientation="vertical"
-      android:background="?navNextTurnFrame"
+      android:background="@drawable/bg_nav_next_turn"
       android:elevation="@dimen/nav_elevation">
       <FrameLayout
         android:layout_width="wrap_content"
@@ -92,7 +92,7 @@
       android:layout_below="@id/nav_next_turn_frame"
       android:layout_alignStart="@id/nav_next_turn_frame"
       android:layout_alignEnd="@id/nav_next_turn_frame"
-      android:background="?navNextNextTurnFrame"
+      android:background="@drawable/bg_nav_next_next_turn"
       android:elevation="@dimen/nav_elevation"
       android:visibility="invisible"
       tools:visibility="visible">
diff --git a/android/app/src/main/res/values-night/themes-base.xml b/android/app/src/main/res/values-night/themes-base.xml
index 11d4d6eb76..2716dc5779 100644
--- a/android/app/src/main/res/values-night/themes-base.xml
+++ b/android/app/src/main/res/values-night/themes-base.xml
@@ -46,18 +46,14 @@
     <item name="ppBackground">@color/bg_cards_night</item>
     <item name="ppButtonsBackground">@color/bg_window_night</item>
 
-    <item name="navNextTurnFrame">@drawable/bg_nav_next_turn_night</item>
-    <item name="navNextNextTurnFrame">@drawable/bg_nav_next_next_turn_night</item>
     <item name="navLanesBackgroundColor">@color/base_accent_night</item>
     <item name="navLaneArrowActiveColor">@color/nav_lane_arrow_active_night</item>
     <item name="navLaneArrowInactiveColor">@color/nav_lane_arrow_inactive_night</item>
 
-    <item name="buttonBackground">@drawable/button_night</item>
     <item name="buttonTextColor">@color/button_text_night</item>
     <item name="buttonTextColorDisabled">@color/button_text_disabled_night</item>
     <item name="buttonDialogTextColor">@color/base_accent_night</item>
 
-    <item name="accentButtonBackground">@drawable/button_accent_night</item>
     <item name="accentButtonTextColor">@color/button_accent_text_night</item>
     <!-- TODO: remove accentButtonTextColorDisabled attribute and use everywhere
                accentButtonTextColor selector -->
@@ -71,9 +67,7 @@
 
     <item name="menuBackground">@color/bg_menu_night</item>
 
-    <item name="myPositionButtonAnimation">@drawable/ic_menu_location_pending_night</item>
     <item name="wheelPendingAnimation">@drawable/anim_spinner_pending</item>
-    <item name="trafficLoadingAnimation">@drawable/anim_traffic_loading_night</item>
 
     <item name="navButtonsThemeRect">@style/MwmTheme.NavButtonsRect</item>
     <item name="navButtonsThemeRound">@style/MwmTheme.NavButtonsRound</item>
@@ -85,11 +79,9 @@
     <item name="routingToolbarButtonActive">@color/routing_button_tint</item>
     <item name="routingToolbarButton">@color/bg_primary_dark_night</item>
 
-    <item name="android:listDivider">@drawable/list_divider_night</item>
 
     <item name="transitPedestrianBackground">@color/white_4</item>
     <item name="transitRulerBackground">@color/white_4</item>
-    <item name="transitStepDivider">@drawable/dot_divider_night</item>
     <item name="accentColorSelector">@color/accent_color_selector_night</item>
     <item name="android:textAppearance">@style/TextAppearance</item>
     <item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
@@ -109,12 +101,8 @@
     <item name="fontCaption">@style/TextAppearance.MdcTypographyStyles.Caption</item>
     <item name="fontOverline">@style/TextAppearance.MdcTypographyStyles.Overline</item>
     <item name="drivingOptionsViewBg">@color/driving_options_bg_black</item>
-    <item name="elevationProfilePropertyBg">@drawable/bg_rounded_rect_night</item>
     <item name="elevationProfilePropIconTint">@color/white_secondary</item>
-    <item name="altitudeBg">@drawable/bg_altitude_night</item>
     <item name="elevationProfileAxisLabelColor">@color/white_54</item>
-    <item name="elevationProfileYourLocationPinBg">@drawable/bg_your_location_pin_night</item>
-    <item name="elevationProfileSelectedPointBg">@drawable/bg_point_desc_night</item>
     <item name="elevationProfileSelectedPointTriangle">@drawable/ic_triangle_night</item>
     <item name="elevationProfileFloatingTriangle">@drawable/ic_triangle_elevation_night</item>
     <item name="elevationProfileColor">@color/elevation_profile_dark</item>
diff --git a/android/app/src/main/res/values-night/themes.xml b/android/app/src/main/res/values-night/themes.xml
index 237a0c34f4..d489133669 100644
--- a/android/app/src/main/res/values-night/themes.xml
+++ b/android/app/src/main/res/values-night/themes.xml
@@ -33,11 +33,11 @@
   </style>
 
   <style name="MwmTheme.NavButtonsRound" parent="MwmTheme">
-    <item name="searchLayoutBackground">@drawable/bg_search_wheel_background_round_night</item>
+    <item name="searchLayoutBackground">@drawable/bg_search_wheel_background_round</item>
   </style>
 
   <style name="MwmTheme.NavButtonsRect" parent="MwmTheme">
-    <item name="searchLayoutBackground">@drawable/bg_search_wheel_background_rect_night</item>
+    <item name="searchLayoutBackground">@drawable/bg_search_wheel_background_rect</item>
   </style>
 
   <style name="MwmTheme.Navigation" parent="MwmTheme">
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index 2442db2747..08f0d57134 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -49,7 +49,7 @@
   <style name="MwmWidget.Button">
     <item name="android:layout_width">wrap_content</item>
     <item name="android:layout_height">wrap_content</item>
-    <item name="android:background">?buttonBackground</item>
+    <item name="android:background">@drawable/button</item>
     <item name="android:stateListAnimator">@null</item>
     <item name="android:fontFamily">@string/robotoMedium</item>
     <item name="android:textAllCaps">true</item>
@@ -57,7 +57,7 @@
   </style>
 
   <style name="MwmWidget.Button.Accent">
-    <item name="android:background">?accentButtonBackground</item>
+    <item name="android:background">@drawable/button_accent</item>
     <item name="android:textColor">?accentButtonTextColor</item>
   </style>
 
diff --git a/android/app/src/main/res/values/themes-attrs.xml b/android/app/src/main/res/values/themes-attrs.xml
index d8ee76d584..27b5c7bdb0 100644
--- a/android/app/src/main/res/values/themes-attrs.xml
+++ b/android/app/src/main/res/values/themes-attrs.xml
@@ -18,16 +18,12 @@
     <attr name="helpIconTint" format="color" />
     <attr name="ppBackground" format="color" />
     <attr name="ppButtonsBackground" format="color" />
-    <attr name="navNextTurnFrame" format="reference" />
-    <attr name="navNextNextTurnFrame" format="reference" />
     <attr name="navLanesBackgroundColor" format="reference" />
     <attr name="navLaneArrowActiveColor" format="reference" />
     <attr name="navLaneArrowInactiveColor" format="reference" />
-    <attr name="buttonBackground" format="reference" />
     <attr name="buttonTextColor" format="color" />
     <attr name="buttonTextColorDisabled" format="color" />
     <attr name="buttonDialogTextColor" format="color" />
-    <attr name="accentButtonBackground" format="reference" />
     <attr name="accentButtonTextColor" format="color" />
     <attr name="accentButtonTextColorDisabled" format="color" />
     <attr name="redButtonBackground" format="reference" />
@@ -35,9 +31,7 @@
     <attr name="redButtonTextColorDisabled" format="color" />
     <attr name="primaryButtonBackground" format="reference" />
     <attr name="menuBackground" format="color" />
-    <attr name="myPositionButtonAnimation" format="reference" />
     <attr name="wheelPendingAnimation" format="reference" />
-    <attr name="trafficLoadingAnimation" format="reference" />
     <attr name="navButtonsThemeRect" format="reference" />
     <attr name="navButtonsThemeRound" format="reference" />
     <attr name="downloaderTheme" format="reference" />
@@ -50,7 +44,6 @@
     <attr name="transitPedestrianBackground" format="color" />
     <attr name="transitRulerBackground" format="color" />
     <attr name="colorBtnHighlight" format="color" />
-    <attr name="transitStepDivider" format="reference" />
     <attr name="colorAccentTransparent" format="reference" />
   </declare-styleable>
   <declare-styleable name="ThemeAttrs.Downloader">
@@ -66,12 +59,8 @@
   </declare-styleable>
   <declare-styleable name="ThemeAttrs.ElevationProfile">
     <attr name="elevationProfileColor" format="color" />
-    <attr name="elevationProfilePropertyBg" format="reference" />
     <attr name="elevationProfilePropIconTint" format="color" />
-    <attr name="altitudeBg" format="reference" />
     <attr name="elevationProfileAxisLabelColor" format="color" />
-    <attr name="elevationProfileYourLocationPinBg" format="reference" />
-    <attr name="elevationProfileSelectedPointBg" format="reference" />
     <attr name="elevationProfileSelectedPointTriangle" format="reference" />
     <attr name="elevationProfileFloatingTriangle" format="reference" />
   </declare-styleable>
diff --git a/android/app/src/main/res/values/themes-base.xml b/android/app/src/main/res/values/themes-base.xml
index 6ae504024b..955a55ae4b 100644
--- a/android/app/src/main/res/values/themes-base.xml
+++ b/android/app/src/main/res/values/themes-base.xml
@@ -44,18 +44,14 @@
     <item name="ppBackground">@color/bg_cards</item>
     <item name="ppButtonsBackground">?panel</item>
 
-    <item name="navNextTurnFrame">@drawable/bg_nav_next_turn</item>
-    <item name="navNextNextTurnFrame">@drawable/bg_nav_next_next_turn</item>
     <item name="navLanesBackgroundColor">@color/base_accent</item>
     <item name="navLaneArrowActiveColor">@color/nav_lane_arrow_active_light</item>
     <item name="navLaneArrowInactiveColor">@color/nav_lane_arrow_inactive_light</item>
 
-    <item name="buttonBackground">@drawable/button</item>
     <item name="buttonTextColor">@color/button_text</item>
     <item name="buttonTextColorDisabled">@color/button_text_disabled</item>
     <item name="buttonDialogTextColor">@color/base_accent</item>
 
-    <item name="accentButtonBackground">@drawable/button_accent</item>
     <item name="accentButtonTextColor">@color/button_text_accent</item>
     <!-- TODO: remove accentButtonTextColorDisabled attribute and use everywhere
                accentButtonTextColor selector -->
@@ -69,9 +65,7 @@
 
     <item name="menuBackground">@color/bg_menu</item>
 
-    <item name="myPositionButtonAnimation">@drawable/ic_menu_location_pending</item>
     <item name="wheelPendingAnimation">@drawable/anim_spinner_pending</item>
-    <item name="trafficLoadingAnimation">@drawable/anim_traffic_loading</item>
 
     <item name="navButtonsThemeRect">@style/MwmTheme.NavButtonsRect</item>
     <item name="navButtonsThemeRound">@style/MwmTheme.NavButtonsRound</item>
@@ -83,14 +77,10 @@
     <item name="routingToolbarButtonActive">@color/routing_button_tint</item>
     <item name="routingToolbarButton">@color/bg_primary_dark</item>
 
-
     <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
 
-    <item name="android:listDivider">@drawable/list_divider</item>
-
     <item name="transitPedestrianBackground">@color/black_4</item>
     <item name="transitRulerBackground">@color/black_4</item>
-    <item name="transitStepDivider">@drawable/dot_divider</item>
     <item name="outdoorsMenuEnabled">@drawable/ic_layers_outdoors_active</item>
     <item name="trafficMenuEnabled">@drawable/ic_layers_traffic_active</item>
     <item name="subwayMenuEnabled">@drawable/ic_layers_subway_active</item>
@@ -122,12 +112,8 @@
     <item name="fontCaption">@style/TextAppearance.MdcTypographyStyles.Caption</item>
     <item name="fontOverline">@style/TextAppearance.MdcTypographyStyles.Overline</item>
     <item name="drivingOptionsViewBg">@color/light_green</item>
-    <item name="elevationProfilePropertyBg">@drawable/bg_rounded_rect</item>
     <item name="elevationProfilePropIconTint">@color/black_secondary</item>
-    <item name="altitudeBg">@drawable/bg_altitude</item>
     <item name="elevationProfileAxisLabelColor">@color/black_54</item>
-    <item name="elevationProfileYourLocationPinBg">@drawable/bg_your_location_pin</item>
-    <item name="elevationProfileSelectedPointBg">@drawable/bg_point_desc</item>
     <item name="elevationProfileSelectedPointTriangle">@drawable/ic_triangle</item>
     <item name="elevationProfileFloatingTriangle">@drawable/ic_triangle_elevation</item>
     <item name="elevationProfileColor">@color/elevation_profile</item>