diff --git a/android/app/src/main/java/app/organicmaps/maplayer/LayerBottomSheetItem.java b/android/app/src/main/java/app/organicmaps/maplayer/LayerBottomSheetItem.java
index 7e34542a3..1114b96ec 100644
--- a/android/app/src/main/java/app/organicmaps/maplayer/LayerBottomSheetItem.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/LayerBottomSheetItem.java
@@ -46,7 +46,7 @@ public class LayerBottomSheetItem
       break;
     case SUBWAY:
       drawableResId = R.drawable.ic_layers_subway;
-      buttonTextResource = R.string.button_layer_subway;
+      buttonTextResource = R.string.subway;
       break;
     case ISOLINES:
       drawableResId = R.drawable.ic_layers_isoline;
diff --git a/android/app/src/main/res/drawable/downloader_done_night.xml b/android/app/src/main/res/drawable-night/downloader_done.xml
similarity index 94%
rename from android/app/src/main/res/drawable/downloader_done_night.xml
rename to android/app/src/main/res/drawable-night/downloader_done.xml
index 74ae3d345..64618de23 100644
--- a/android/app/src/main/res/drawable/downloader_done_night.xml
+++ b/android/app/src/main/res/drawable-night/downloader_done.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="oval">
-            <solid android:color="@color/dl_done_night" />
+            <solid android:color="@color/dl_done" />
             <size
                 android:width="40dp"
                 android:height="40dp" />
diff --git a/android/app/src/main/res/drawable/downloader_download_night.xml b/android/app/src/main/res/drawable-night/downloader_download.xml
similarity index 92%
rename from android/app/src/main/res/drawable/downloader_download_night.xml
rename to android/app/src/main/res/drawable-night/downloader_download.xml
index de8b69c3c..10740954d 100644
--- a/android/app/src/main/res/drawable/downloader_download_night.xml
+++ b/android/app/src/main/res/drawable-night/downloader_download.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="oval">
-            <solid android:color="@color/dl_download_night" />
+            <solid android:color="@color/dl_download" />
             <size
                 android:width="40dp"
                 android:height="40dp" />
diff --git a/android/app/src/main/res/drawable/downloader_folder_night.xml b/android/app/src/main/res/drawable-night/downloader_folder.xml
similarity index 92%
rename from android/app/src/main/res/drawable/downloader_folder_night.xml
rename to android/app/src/main/res/drawable-night/downloader_folder.xml
index 00fa330a4..711951947 100644
--- a/android/app/src/main/res/drawable/downloader_folder_night.xml
+++ b/android/app/src/main/res/drawable-night/downloader_folder.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="oval">
-            <solid android:color="@color/dl_download_night" />
+            <solid android:color="@color/dl_download" />
             <size
                 android:width="40dp"
                 android:height="40dp" />
diff --git a/android/app/src/main/res/drawable/downloader_folder_done_night.xml b/android/app/src/main/res/drawable-night/downloader_folder_done.xml
similarity index 93%
rename from android/app/src/main/res/drawable/downloader_folder_done_night.xml
rename to android/app/src/main/res/drawable-night/downloader_folder_done.xml
index 7745e86f9..b170525c8 100644
--- a/android/app/src/main/res/drawable/downloader_folder_done_night.xml
+++ b/android/app/src/main/res/drawable-night/downloader_folder_done.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="oval">
-            <solid android:color="@color/dl_done_night" />
+            <solid android:color="@color/dl_done" />
             <size
                 android:width="40dp"
                 android:height="40dp" />
diff --git a/android/app/src/main/res/drawable/ic_layers_isoline_dark.xml b/android/app/src/main/res/drawable-night/ic_layers_isoline.xml
similarity index 99%
rename from android/app/src/main/res/drawable/ic_layers_isoline_dark.xml
rename to android/app/src/main/res/drawable-night/ic_layers_isoline.xml
index 305cca79c..b07c9c642 100644
--- a/android/app/src/main/res/drawable/ic_layers_isoline_dark.xml
+++ b/android/app/src/main/res/drawable-night/ic_layers_isoline.xml
@@ -10,7 +10,7 @@
         android:pathData="M0,-0l54,0l0,54l-54,0z"
         android:strokeLineJoin="round"
         android:strokeWidth="10.145"
-        android:fillColor="#242020"
+        android:fillColor="#181715"
         android:fillType="evenOdd"
         android:strokeColor="#00000000"/>
     <path
diff --git a/android/app/src/main/res/drawable/ic_layers_outdoors_dark.xml b/android/app/src/main/res/drawable-night/ic_layers_outdoors.xml
similarity index 97%
rename from android/app/src/main/res/drawable/ic_layers_outdoors_dark.xml
rename to android/app/src/main/res/drawable-night/ic_layers_outdoors.xml
index 5458c3d51..768fe35dd 100644
--- a/android/app/src/main/res/drawable/ic_layers_outdoors_dark.xml
+++ b/android/app/src/main/res/drawable-night/ic_layers_outdoors.xml
@@ -10,7 +10,7 @@
         android:pathData="M0,0h54v54h-54z"
         android:strokeLineJoin="round"
         android:strokeWidth="40.5"
-        android:fillColor="#141c00"
+        android:fillColor="#202510"
         android:strokeLineCap="round"/>
     <path
         android:pathData="M19,55C27,43 46,50 48,38"
@@ -32,13 +32,13 @@
         android:pathData="M0,26.678V0H37C23,19 10,10 0,26.678Z"
         android:strokeLineJoin="round"
         android:strokeWidth="0.359493"
-        android:fillColor="#28281a"
+        android:fillColor="#322c20"
         android:fillType="evenOdd"/>
     <path
         android:pathData="M0,18.769V0C8.873,0 17.747,0 26.62,0 20.264,11.234 4.943,6.676 0,18.769Z"
         android:strokeLineJoin="round"
         android:strokeWidth="0.359493"
-        android:fillColor="#002222"
+        android:fillColor="#344e54"
         android:fillType="evenOdd"/>
     <path
         android:pathData="m7,34c-1.101,0 -2,0.899 -2,2 0,1.101 0.899,2 2,2L7.297,38L6.934,40L5,40c-1.101,0 -2,0.899 -2,2 0,1.101 0.899,2 2,2L6.209,44L5.693,46.838C5.49,47.962 6.358,49 7.5,49 8.565,49 9.472,48.24 9.662,47.193L10.242,44h5.525l0.572,3.191C16.528,48.239 17.435,49 18.5,49c1.142,-0 2.01,-1.035 1.809,-2.16L19.799,44L21,44c1.101,0 2,-0.899 2,-2 0,-1.101 -0.899,-2 -2,-2L19.08,40L18.723,38L19,38c1.101,0 2,-0.899 2,-2 0,-1.101 -0.899,-2 -2,-2zM11.332,38h3.359l0.357,2L10.969,40Z"
@@ -58,7 +58,7 @@
     <path
         android:pathData="m34.5,9c-1.229,0 -2.228,0.893 -2.437,2.063 -0.545,0.128 -1.058,0.476 -1.375,1.031l-3.25,6.906c-0.272,0.615 -0.437,1.287 -0.437,2 0,2.75 2.25,5 5,5 2.155,0 3.989,-1.391 4.688,-3.313 0.398,0.196 0.842,0.312 1.313,0.312 0.47,0 0.915,-0.116 1.312,-0.312 0.699,1.922 2.533,3.313 4.688,3.313 2.749,0 5,-2.251 5,-5 0,-0.713 -0.166,-1.385 -0.437,-2L45.312,12.094C44.995,11.539 44.483,11.19 43.937,11.063 43.728,9.894 42.729,9 41.5,9c-1.208,0 -2.204,0.861 -2.437,2L36.938,11C36.704,9.861 35.708,9 34.5,9ZM32,18c1.669,0 3,1.331 3,3 0,1.669 -1.331,3 -3,3 -1.669,0 -3,-1.331 -3,-3 0,-1.669 1.331,-3 3,-3zM44,18c1.669,0 3,1.331 3,3 0,1.669 -1.331,3 -3,3 -1.669,0 -3,-1.331 -3,-3 0,-1.669 1.331,-3 3,-3zM38,19c0.555,0 1,0.445 1,1 0,0.554 -0.445,1 -1,1 -0.555,0 -1,-0.445 -1,-1C37,19.445 37.445,19 38,19Z"
         android:strokeWidth="1.27289"
-        android:fillColor="#7f5933"
+        android:fillColor="#6e4426"
         android:fillType="evenOdd"/>
   </group>
 </vector>
diff --git a/android/app/src/main/res/drawable/ic_layers_subway_dark.xml b/android/app/src/main/res/drawable-night/ic_layers_subway.xml
similarity index 94%
rename from android/app/src/main/res/drawable/ic_layers_subway_dark.xml
rename to android/app/src/main/res/drawable-night/ic_layers_subway.xml
index d607f1297..586ab5349 100644
--- a/android/app/src/main/res/drawable/ic_layers_subway_dark.xml
+++ b/android/app/src/main/res/drawable-night/ic_layers_subway.xml
@@ -10,21 +10,21 @@
         android:pathData="M0,0h54v54h-54z"
         android:strokeLineJoin="round"
         android:strokeWidth="40.5"
-        android:fillColor="#262222"
+        android:fillColor="#181715"
         android:strokeLineCap="round"/>
     <path
         android:pathData="M8,61V-7"
         android:strokeLineJoin="round"
         android:strokeWidth="4"
         android:fillColor="#e3e1d2"
-        android:strokeColor="#4b4643"
+        android:strokeColor="#4c4b4b"
         android:strokeLineCap="round"/>
     <path
         android:pathData="M63,61C51,43 39,43 -5,43"
         android:strokeLineJoin="round"
         android:strokeWidth="4"
         android:fillColor="#00000000"
-        android:strokeColor="#4b4643"
+        android:strokeColor="#4c4b4b"
         android:strokeLineCap="round"/>
     <path
         android:pathData="M27,27H0m27,0h27"
diff --git a/android/app/src/main/res/drawable/ic_layers_isoline_light.xml b/android/app/src/main/res/drawable/ic_layers_isoline.xml
similarity index 99%
rename from android/app/src/main/res/drawable/ic_layers_isoline_light.xml
rename to android/app/src/main/res/drawable/ic_layers_isoline.xml
index cf6508078..f78e8da78 100644
--- a/android/app/src/main/res/drawable/ic_layers_isoline_light.xml
+++ b/android/app/src/main/res/drawable/ic_layers_isoline.xml
@@ -10,7 +10,7 @@
         android:pathData="M0,-0l54,0l0,54l-54,0z"
         android:strokeLineJoin="round"
         android:strokeWidth="10.145"
-        android:fillColor="#ccc7ba"
+        android:fillColor="#f5e8d6"
         android:fillType="evenOdd"
         android:strokeColor="#00000000"/>
     <path
diff --git a/android/app/src/main/res/drawable/ic_layers_outdoors_light.xml b/android/app/src/main/res/drawable/ic_layers_outdoors.xml
similarity index 58%
rename from android/app/src/main/res/drawable/ic_layers_outdoors_light.xml
rename to android/app/src/main/res/drawable/ic_layers_outdoors.xml
index d90788471..cc538ea14 100644
--- a/android/app/src/main/res/drawable/ic_layers_outdoors_light.xml
+++ b/android/app/src/main/res/drawable/ic_layers_outdoors.xml
@@ -10,7 +10,7 @@
         android:pathData="M0,0h54v54h-54z"
         android:strokeLineJoin="round"
         android:strokeWidth="40.5"
-        android:fillColor="#c1cc89"
+        android:fillColor="#a2ba4e"
         android:strokeLineCap="round"/>
     <path
         android:pathData="M19,55C27,43 46,50 48,38"
@@ -30,36 +30,23 @@
         android:pathData="M0,26.678V0H37C23,19 10,10 0,26.678Z"
         android:strokeLineJoin="round"
         android:strokeWidth="0.359493"
-        android:fillColor="#fcec7e"
+        android:fillColor="#fadda0"
         android:fillType="evenOdd"/>
     <path
         android:pathData="M0,18.769V0C8.873,0 17.747,0 26.62,0 20.264,11.234 4.943,6.676 0,18.769Z"
         android:strokeLineJoin="round"
         android:strokeWidth="0.359493"
-        android:fillColor="#8bd3e0"
+        android:fillColor="#89cddc"
         android:fillType="evenOdd"/>
-    <path
-        android:pathData="m7,34c-1.101,0 -2,0.899 -2,2 0,1.101 0.899,2 2,2L7.297,38L6.934,40L5,40c-1.101,0 -2,0.899 -2,2 0,1.101 0.899,2 2,2h1.209l-0.516,2.838C5.49,47.962 6.358,49 7.5,49 8.565,49 9.472,48.24 9.662,47.193L10.242,44h5.525l0.572,3.191C16.528,48.239 17.435,49 18.5,49c1.142,-0 2.01,-1.035 1.809,-2.16L19.799,44L21,44c1.101,0 2,-0.899 2,-2 0,-1.101 -0.899,-2 -2,-2L19.08,40L18.723,38L19,38c1.101,0 2,-0.899 2,-2 0,-1.101 -0.899,-2 -2,-2zM11.332,38h3.359l0.357,2L10.969,40Z"
-        android:strokeAlpha="0.301662"
-        android:fillColor="#ffffff"
-        android:strokeColor="#00000000"
-        android:fillAlpha="0.6"/>
     <path
         android:pathData="m6,36a1,1 45,0 0,1 1L8.496,37L7.77,41L5,41a1,1 135,0 0,-1 1,1 1,45 0,0 1,1L7.406,43L6.678,47.016A0.835,0.835 50.137,0 0,7.5 48,1.198 1.198,140.137 0,0 8.678,47.016L9.406,43h7.197l0.72,4.016A1.195,1.195 39.918,0 0,18.5 48,0.837 0.837,129.918 0,0 19.324,47.016L18.604,43L21,43a1,1 135,0 0,1 -1,1 1,45 0,0 -1,-1l-2.756,0 -0.717,-4L19,37a1,1 135,0 0,1 -1,1 1,45 0,0 -1,-1L7,35a1,1 135,0 0,-1 1zM10.496,37h5.031l0.717,4h-6.475z"
         android:strokeAlpha="0.50277"
         android:fillColor="#717065"
         android:strokeColor="#00000000"/>
-    <path
-        android:pathData="m34.5,8c-1.512,0 -2.774,0.956 -3.262,2.293 -0.57,0.262 -1.075,0.701 -1.42,1.305l-0.02,0.035 -3.271,6.951 -0.004,0.012C26.203,19.321 26,20.131 26,21c0,3.302 2.698,6 6,6 2.241,0 4.191,-1.248 5.219,-3.08C37.47,23.972 37.731,24 38,24c0.269,0 0.53,-0.028 0.781,-0.08C39.809,25.752 41.759,27 44,27c3.302,0 6,-2.699 6,-6 0,-0.869 -0.203,-1.679 -0.523,-2.404l-0.004,-0.01 -3.271,-6.953 -0.02,-0.035C45.836,10.994 45.332,10.555 44.762,10.293 44.274,8.956 43.012,8 41.5,8 40.107,8 38.91,8.818 38.35,10L37.65,10C37.09,8.818 35.893,8 34.5,8ZM32,19c0.568,0 1.058,0.222 1.418,0.582C33.778,19.942 34,20.432 34,21 34,21.568 33.778,22.058 33.418,22.418 33.058,22.778 32.568,23 32,23 31.432,23 30.942,22.778 30.582,22.418 30.222,22.058 30,21.568 30,21 30,20.432 30.222,19.942 30.582,19.582 30.942,19.222 31.432,19 32,19ZM44,19c0.568,0 1.058,0.222 1.418,0.582C45.778,19.942 46,20.432 46,21 46,21.568 45.778,22.058 45.418,22.418 45.058,22.778 44.568,23 44,23 43.432,23 42.942,22.778 42.582,22.418 42.222,22.058 42,21.568 42,21 42,20.432 42.222,19.942 42.582,19.582 42.942,19.222 43.432,19 44,19Z"
-        android:strokeAlpha="0.6"
-        android:strokeWidth="1.27289"
-        android:fillColor="#ffffff"
-        android:fillAlpha="0.6"
-        android:fillType="evenOdd"/>
     <path
         android:pathData="m34.5,9c-1.229,0 -2.228,0.893 -2.437,2.063 -0.545,0.128 -1.058,0.476 -1.375,1.031l-3.25,6.906c-0.272,0.615 -0.437,1.287 -0.437,2 0,2.75 2.25,5 5,5 2.155,0 3.989,-1.391 4.688,-3.313 0.398,0.196 0.842,0.312 1.313,0.312 0.47,0 0.915,-0.116 1.312,-0.312 0.699,1.922 2.533,3.313 4.688,3.313 2.749,0 5,-2.251 5,-5 0,-0.713 -0.166,-1.385 -0.437,-2L45.312,12.094C44.995,11.539 44.483,11.19 43.937,11.063 43.728,9.894 42.729,9 41.5,9c-1.208,0 -2.204,0.861 -2.437,2L36.938,11C36.704,9.861 35.708,9 34.5,9ZM32,18c1.669,0 3,1.331 3,3 0,1.669 -1.331,3 -3,3 -1.669,0 -3,-1.331 -3,-3 0,-1.669 1.331,-3 3,-3zM44,18c1.669,0 3,1.331 3,3 0,1.669 -1.331,3 -3,3 -1.669,0 -3,-1.331 -3,-3 0,-1.669 1.331,-3 3,-3zM38,19c0.555,0 1,0.445 1,1 0,0.554 -0.445,1 -1,1 -0.555,0 -1,-0.445 -1,-1C37,19.445 37.445,19 38,19Z"
         android:strokeWidth="1.27289"
-        android:fillColor="#7f5933"
+        android:fillColor="#9c6136"
         android:fillType="evenOdd"/>
   </group>
 </vector>
diff --git a/android/app/src/main/res/drawable/ic_layers_outline_selector.xml b/android/app/src/main/res/drawable/ic_layers_outline_selector.xml
index 514f02497..d92d4b36b 100644
--- a/android/app/src/main/res/drawable/ic_layers_outline_selector.xml
+++ b/android/app/src/main/res/drawable/ic_layers_outline_selector.xml
@@ -4,7 +4,7 @@
     <shape android:shape="rectangle">
       <corners android:radius="8dp" />
       <solid android:color="@android:color/transparent" />
-      <stroke android:width="2dp" android:color="#249CF2" />
+      <stroke android:width="2dp" android:color="@color/base_accent" />
     </shape>
   </item>
   <item>
diff --git a/android/app/src/main/res/drawable/ic_layers_subway_light.xml b/android/app/src/main/res/drawable/ic_layers_subway.xml
similarity index 91%
rename from android/app/src/main/res/drawable/ic_layers_subway_light.xml
rename to android/app/src/main/res/drawable/ic_layers_subway.xml
index a36a2c4eb..d081e0f7c 100644
--- a/android/app/src/main/res/drawable/ic_layers_subway_light.xml
+++ b/android/app/src/main/res/drawable/ic_layers_subway.xml
@@ -10,35 +10,35 @@
         android:pathData="M0,0h54v54h-54z"
         android:strokeLineJoin="round"
         android:strokeWidth="40.5"
-        android:fillColor="#ede8d6"
+        android:fillColor="#f5eada"
         android:strokeLineCap="round"/>
     <path
         android:pathData="M8,61V-7"
         android:strokeLineJoin="round"
         android:strokeWidth="4"
         android:fillColor="#e3e1d2"
-        android:strokeColor="#f8f8f8"
+        android:strokeColor="#ffffff"
         android:strokeLineCap="round"/>
     <path
         android:pathData="M63,61C51,43 39,43 -5,43"
         android:strokeLineJoin="round"
         android:strokeWidth="4"
         android:fillColor="#00000000"
-        android:strokeColor="#f8f8f8"
+        android:strokeColor="#ffffff"
         android:strokeLineCap="round"/>
     <path
         android:pathData="M27,27H0m27,0h27"
         android:strokeLineJoin="round"
         android:strokeWidth="6"
         android:fillColor="#00000000"
-        android:strokeColor="#dc0000"
+        android:strokeColor="#e51b23"
         android:strokeLineCap="round"/>
     <path
         android:pathData="M48,-8C38,2 30,17 27,27 23.905,37.316 22,48 22,60"
         android:strokeLineJoin="round"
         android:strokeWidth="6"
         android:fillColor="#00000000"
-        android:strokeColor="#0084c8"
+        android:strokeColor="#249CF2"
         android:strokeLineCap="round"/>
     <path
         android:pathData="M27,27m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"
diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
index a27b7c0c8..717751f5a 100644
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -121,7 +121,7 @@
   <color name="yellow">#FFC800</color>
 
   <color name="elevation_profile_dot_enabled">#FF9600</color>
-  <color name="elevation_profile">#1E96F0</color>
+  <color name="elevation_profile">@color/base_accent</color>
 
   <color name="active_track_recording">#0057ff</color>
 
diff --git a/android/app/src/main/res/values/themes.xml b/android/app/src/main/res/values/themes.xml
index 6f477bc14..824463200 100644
--- a/android/app/src/main/res/values/themes.xml
+++ b/android/app/src/main/res/values/themes.xml
@@ -84,14 +84,6 @@
     <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>
-    <item name="isoLinesMenuEnabled">@drawable/ic_layers_isoline_active</item>
-    <item name="outdoorsMenuDisabled">@drawable/ic_layers_outdoors_inactive</item>
-    <item name="trafficMenuDisabled">@drawable/ic_layers_traffic_inactive</item>
-    <item name="subwayMenuDisabled">@drawable/ic_layers_subway_inactive</item>
-    <item name="isoLinesMenuDisabled">@drawable/ic_layers_isoline_inactive</item>
     <item name="accentColorSelector">@color/accent_color_selector</item>
     <item name="android:textAppearance">@style/TextAppearance</item>
     <item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>