diff --git a/android/app/src/main/res/drawable/ic_layers_isoline_active.xml b/android/app/src/main/res/drawable/ic_layers_isoline_active.xml
index 4b6c46c59a..a55d34c1b1 100644
--- a/android/app/src/main/res/drawable/ic_layers_isoline_active.xml
+++ b/android/app/src/main/res/drawable/ic_layers_isoline_active.xml
@@ -6,73 +6,26 @@
   <path
       android:pathData="M7,0H47C48.8565,0 50.637,0.7375 51.9497,2.0503C53.2625,3.363 54,5.1435 54,7V47C54,48.8565 53.2625,50.637 51.9497,51.9497C50.637,53.2625 48.8565,54 47,54H7C5.1435,54 3.363,53.2625 2.0503,51.9497C0.7375,50.637 0,48.8565 0,47L0,7C0,5.1435 0.7375,3.363 2.0503,2.0503C3.363,0.7375 5.1435,0 7,0V0Z"
       android:fillColor="#249CF2"/>
+  <clip-path
+      android:pathData="M2,7C2,4.2386 4.2386,2 7,2H47C49.7614,2 52,4.2386 52,7V47C52,49.7614 49.7614,52 47,52H7C4.2386,52 2,49.7614 2,47V7Z"/>
   <path
-      android:pathData="M47,2H7C4.2386,2 2,4.2386 2,7V47C2,49.7614 4.2386,52 7,52H47C49.7614,52 52,49.7614 52,47V7C52,4.2386 49.7614,2 47,2Z"
-      android:fillColor="#E0DCD5"/>
-  <group>
-    <clip-path
-        android:pathData="M2,7C2,4.2386 4.2386,2 7,2H47C49.7614,2 52,4.2386 52,7V47C52,49.7614 49.7614,52 47,52H7C4.2386,52 2,49.7614 2,47V7Z"/>
-    <path
-        android:pathData="M2,7C2,4.2386 4.2386,2 7,2H47C49.7614,2 52,4.2386 52,7V47C52,49.7614 49.7614,52 47,52H7C4.2386,52 2,49.7614 2,47V7Z"
-        android:fillColor="#E4E8EB"/>
-    <path
-        android:pathData="M36.25,-9l-23,23l12.625,12.625l23,-23z"
-        android:fillColor="#D6DBA5"/>
-    <path
-        android:pathData="M53.625,3.625l-22.875,22.875l24.375,24.375l22.875,-22.875z"
-        android:fillColor="#A2CBDB"/>
-    <path
-        android:pathData="M0.625,5.125l-10.1875,10.1875l11.875,11.875l10.1875,-10.1875z"
-        android:fillColor="#A2CBDB"/>
-    <path
-        android:pathData="M4.5,52.75l21.375,-21.375l18.625,18.625l-21.375,21.375z"
-        android:fillColor="#D6DBA5"/>
-    <path
-        android:pathData="M34.7668,64.1845l-4.5052,1.9048l-12.6325,-29.8777l4.5052,-1.9048z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M48,-2l8.4853,8.4853l-50.3327,50.3327l-8.4853,-8.4853z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M28.1663,-3.8337l3.4587,3.4587l-31.875,31.875l-3.4587,-3.4587z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M-3,5l8.4853,-8.4853l50.9117,50.9117l-8.4853,8.4853z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M22.5,-2C22,-0.6667 17.0211,-0.7706 19.5,1C23,3.5 27,20.5 16.5,19.5C8.3505,18.7239 6.5,28.8771 13.8743,32C18.8133,34.0916 26.2077,33.7262 30.5585,31C37.8685,26.4196 42.7899,17.9983 51.5,19.5C55.5199,20.1931 61.6667,24.6667 61.5,24.5"
-        android:strokeAlpha="0.5"
-        android:strokeWidth="1.5"
-        android:fillColor="#00000000"
-        android:strokeColor="#838383"
-        android:fillAlpha="0.5"/>
-    <path
-        android:pathData="M31.5,-3C34.4801,-0.9007 28.9403,23.8397 20,23C15,22.5304 14.5,28 19.5,28.5C33.4394,29.8939 37,4 56,8.5"
-        android:strokeAlpha="0.5"
-        android:strokeWidth="1.5"
-        android:fillColor="#00000000"
-        android:strokeColor="#838383"
-        android:fillAlpha="0.5"/>
-    <path
-        android:pathData="M12,0C11.8333,1.6667 13.6,7 14,9C14.9,13.5 11.5,16 8,15.5C5.9592,15.2085 0,14.5 -2.5,17M54,36.5C49.5,37.5 47.7802,36.2435 45,33C42,29.5 34.5,32 33.5,38C32.6527,43.0838 37,47.5 42.5,47.5C51.0147,47.5 55,44 55,44"
-        android:strokeAlpha="0.5"
-        android:strokeWidth="1.5"
-        android:fillColor="#00000000"
-        android:strokeColor="#838383"
-        android:fillAlpha="0.5"/>
-    <path
-        android:pathData="M-8,38C14,33 35.0443,50.5372 36.5,57"
-        android:strokeAlpha="0.5"
-        android:strokeWidth="1.5"
-        android:fillColor="#00000000"
-        android:strokeColor="#838383"
-        android:fillAlpha="0.5"/>
-    <path
-        android:pathData="M-3,50.5132C1.9782,44.655 15.857,43.2391 17,54"
-        android:strokeAlpha="0.5"
-        android:strokeWidth="1.5"
-        android:fillColor="#00000000"
-        android:strokeColor="#838383"
-        android:fillAlpha="0.5"/>
-  </group>
+      android:pathData="m54,3.782c0,-2.089 -1.693,-3.782 -3.778,-3.782l-46.44,0c-2.085,0 -3.782,1.693 -3.782,3.782l0,46.436c0,2.089 1.697,3.782 3.782,3.782l46.44,0c2.085,0 3.778,-1.693 3.778,-3.782z"
+      android:fillColor="#e0ded0"/>
+  <clip-path
+      android:pathData="m54,3.782c0,-2.089 -1.693,-3.782 -3.778,-3.782l-46.44,0c-2.085,0 -3.782,1.693 -3.782,3.782l0,46.436c0,2.089 1.697,3.782 3.782,3.782l46.44,0c2.085,0 3.778,-1.693 3.778,-3.782z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m30.339,39.992l-3.364,1.378l-0.36,-0.88l1.063,-0.435l-1.091,-2.663l-1.063,0.435l-0.337,-0.822q0.244,-0.1 0.456,-0.218 0.211,-0.122 0.331,-0.254 0.141,-0.157 0.174,-0.328 0.033,-0.171 -0.037,-0.38l1.12,-0.459l1.709,4.172l1.039,-0.426z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m33.313,34.945q0.281,0.318 0.402,0.699 0.122,0.376 0.066,0.771 -0.068,0.431 -0.308,0.823 -0.239,0.387 -0.659,0.757 -0.493,0.43 -0.901,0.653 -0.403,0.223 -0.699,0.319l-0.796,-0.902l0.115,-0.102q0.38,-0.072 0.755,-0.227 0.375,-0.155 0.66,-0.407 0.173,-0.152 0.339,-0.367 0.167,-0.22 0.193,-0.428 0.018,-0.167 -0.013,-0.296 -0.028,-0.131 -0.19,-0.315 -0.126,-0.143 -0.281,-0.186 -0.155,-0.049 -0.312,-0.022 -0.228,0.04 -0.461,0.197 -0.235,0.154 -0.405,0.304 -0.247,0.218 -0.436,0.462 -0.189,0.239 -0.322,0.431l-0.121,0.106l-2.032,-2.304l2.904,-2.562l0.689,0.782l-1.914,1.688l0.588,0.666q0.08,-0.08 0.207,-0.197 0.127,-0.122 0.226,-0.209 0.337,-0.298 0.659,-0.464 0.322,-0.172 0.615,-0.226 0.383,-0.069 0.743,0.057 0.358,0.123 0.689,0.499z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m34.352,30.196q0.621,0.296 1.059,0.643 0.435,0.345 0.635,0.732 0.204,0.397 0.186,0.859 -0.021,0.46 -0.288,1.021 -0.263,0.551 -0.614,0.862 -0.351,0.311 -0.789,0.397 -0.44,0.09 -0.971,-0.029 -0.534,-0.121 -1.154,-0.417 -0.64,-0.305 -1.059,-0.643 -0.418,-0.337 -0.629,-0.737 -0.207,-0.399 -0.183,-0.865 0.024,-0.467 0.282,-1.008 0.269,-0.564 0.62,-0.867 0.348,-0.304 0.794,-0.391 0.438,-0.087 0.966,0.031 0.524,0.116 1.144,0.412zM33.743,31.474q-0.891,-0.425 -1.351,-0.43 -0.463,-0.006 -0.657,0.4 -0.194,0.406 0.103,0.762 0.293,0.354 1.191,0.783 0.875,0.417 1.346,0.423 0.471,0.006 0.662,-0.393 0.19,-0.399 -0.111,-0.762 -0.301,-0.362 -1.182,-0.783z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m34.903,25.659q0.679,0.107 1.198,0.315 0.515,0.207 0.817,0.521 0.308,0.322 0.423,0.77 0.111,0.447 0.014,1.061 -0.095,0.603 -0.343,1.001 -0.248,0.398 -0.643,0.606 -0.396,0.212 -0.939,0.248 -0.546,0.036 -1.225,-0.071 -0.701,-0.11 -1.198,-0.315 -0.497,-0.204 -0.813,-0.528 -0.312,-0.323 -0.422,-0.777 -0.11,-0.454 -0.017,-1.047 0.097,-0.618 0.347,-1.008 0.247,-0.391 0.65,-0.601 0.396,-0.208 0.935,-0.245 0.535,-0.038 1.214,0.069zM34.683,27.057q-0.975,-0.154 -1.417,-0.027 -0.446,0.126 -0.516,0.57 -0.07,0.444 0.315,0.701 0.382,0.256 1.364,0.411 0.957,0.151 1.411,0.022 0.453,-0.129 0.522,-0.566 0.069,-0.437 -0.323,-0.699 -0.392,-0.262 -1.356,-0.414z"/>
+  <path
+      android:pathData="m0,21.494c4.717,0.64 9.081,3.088 11.418,4.997 6.604,5.403 16.296,-1.053 14.937,-9.588 -0.507,-3.174 -4.03,-10.321 -4.594,-16.185 -0.022,-0.241 -0.043,-0.482 -0.054,-0.719l1.312,0c0.011,0.198 0.025,0.395 0.047,0.593 0.561,5.838 4.08,12.945 4.584,16.102 1.542,9.714 -9.545,16.957 -17.062,10.814 -2.171,-1.776 -6.212,-4.084 -10.587,-4.713zM7.941,0c0.158,0.866 0.428,1.596 0.787,2.229 0.769,1.359 1.938,2.236 3.182,2.984 1.833,1.104 3.832,1.952 5.227,3.412 3.466,3.627 2.808,7.679 0.471,9.994 -2.34,2.312 -6.421,2.937 -9.908,-0.381 -1.456,-1.384 -3.609,-4.062 -5.863,-5.676 -0.611,-0.439 -1.229,-0.805 -1.837,-1.025l0,-1.352c0.863,0.23 1.74,0.694 2.599,1.309 2.304,1.654 4.515,4.379 6.004,5.795 2.847,2.711 6.173,2.286 8.081,0.399 1.913,-1.891 2.337,-5.195 -0.493,-8.157 -1.319,-1.38 -3.225,-2.153 -4.957,-3.196 -1.434,-0.863 -2.757,-1.891 -3.645,-3.462 -0.453,-0.798 -0.794,-1.736 -0.978,-2.872zM0,33.789c4.098,-0.503 7.46,0.011 10.271,2.401 3.372,2.872 7.355,3.954 11.087,3.688l0.489,1.262c-4.159,0.406 -8.642,-0.733 -12.424,-3.951 -2.57,-2.186 -5.658,-2.57 -9.422,-2.081zM0,47.809c4.645,-1.981 7.999,-0.313 11.213,0.794 18.669,6.431 32.509,-8.107 32.729,-19.693 0.054,-2.937 0.403,-17.554 3.286,-27.534 0.137,-0.467 0.277,-0.928 0.424,-1.377l1.377,0c-0.187,0.561 -0.37,1.143 -0.543,1.744 -2.847,9.85 -3.182,24.291 -3.235,27.189 -0.23,12.23 -14.761,27.696 -34.461,20.908 -3.063,-1.053 -6.262,-2.736 -10.788,-0.586zM36.827,0c-0.881,3.074 -1.215,6.025 -1.291,7.859 -0.158,3.714 0.352,6.82 0.715,9.843 0.252,2.117 0.435,4.195 0.295,6.406l-1.312,-0.05c0.14,-2.143 -0.04,-4.152 -0.284,-6.198 -0.37,-3.088 -0.881,-6.262 -0.723,-10.059 0.075,-1.83 0.403,-4.738 1.24,-7.801zM37.7,54c10.059,-3.419 14.232,-10.591 16.3,-18.201l0,4.235c-2.193,5.662 -5.925,10.774 -12.759,13.966z"
+      android:fillColor="#8d8d8d"/>
 </vector>
diff --git a/android/app/src/main/res/drawable/ic_layers_isoline_active_night.xml b/android/app/src/main/res/drawable/ic_layers_isoline_active_night.xml
deleted file mode 100644
index 018728ce87..0000000000
--- a/android/app/src/main/res/drawable/ic_layers_isoline_active_night.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="54dp"
-    android:height="54dp"
-    android:viewportWidth="54"
-    android:viewportHeight="54">
-  <path
-      android:pathData="M7,0H47C48.8565,0 50.637,0.7375 51.9497,2.0503C53.2625,3.363 54,5.1435 54,7V47C54,48.8565 53.2625,50.637 51.9497,51.9497C50.637,53.2625 48.8565,54 47,54H7C5.1435,54 3.363,53.2625 2.0503,51.9497C0.7375,50.637 0,48.8565 0,47L0,7C0,5.1435 0.7375,3.363 2.0503,2.0503C3.363,0.7375 5.1435,0 7,0V0Z"
-      android:fillColor="#4BB9E6"/>
-  <group>
-    <clip-path
-        android:pathData="M2,7C2,4.2386 4.2386,2 7,2H47C49.7614,2 52,4.2386 52,7V47C52,49.7614 49.7614,52 47,52H7C4.2386,52 2,49.7614 2,47V7Z"/>
-    <path
-        android:pathData="M2,7C2,4.2386 4.2386,2 7,2H47C49.7614,2 52,4.2386 52,7V47C52,49.7614 49.7614,52 47,52H7C4.2386,52 2,49.7614 2,47V7Z"
-        android:fillColor="#E4E8EB"/>
-    <path
-        android:pathData="M36.25,-9l-23,23l12.625,12.625l23,-23z"
-        android:fillColor="#D6DBA5"/>
-    <path
-        android:pathData="M53.625,3.625l-22.875,22.875l24.375,24.375l22.875,-22.875z"
-        android:fillColor="#A2CBDB"/>
-    <path
-        android:pathData="M0.625,5.125l-10.1875,10.1875l11.875,11.875l10.1875,-10.1875z"
-        android:fillColor="#A2CBDB"/>
-    <path
-        android:pathData="M4.5,52.75l21.375,-21.375l18.625,18.625l-21.375,21.375z"
-        android:fillColor="#D6DBA5"/>
-    <path
-        android:pathData="M34.7668,64.1845l-4.5052,1.9048l-12.6325,-29.8777l4.5052,-1.9048z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M48,-2l8.4853,8.4853l-50.3327,50.3327l-8.4853,-8.4853z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M28.1663,-3.8337l3.4587,3.4587l-31.875,31.875l-3.4587,-3.4587z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M-3,5l8.4853,-8.4853l50.9117,50.9117l-8.4853,8.4853z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M22.5,-2C22,-0.6667 17.0211,-0.7706 19.5,1C23,3.5 27,20.5 16.5,19.5C8.3505,18.7239 6.5,28.8771 13.8743,32C18.8133,34.0916 26.2077,33.7262 30.5585,31C37.8685,26.4196 42.7899,17.9983 51.5,19.5C55.5199,20.1931 61.6667,24.6667 61.5,24.5"
-        android:strokeAlpha="0.5"
-        android:strokeWidth="1.5"
-        android:fillColor="#00000000"
-        android:strokeColor="#838383"
-        android:fillAlpha="0.5"/>
-    <path
-        android:pathData="M31.5,-3C34.4801,-0.9007 28.9403,23.8397 20,23C15,22.5304 14.5,28 19.5,28.5C33.4394,29.8939 37,4 56,8.5"
-        android:strokeAlpha="0.5"
-        android:strokeWidth="1.5"
-        android:fillColor="#00000000"
-        android:strokeColor="#838383"
-        android:fillAlpha="0.5"/>
-    <path
-        android:pathData="M12,0C11.8333,1.6667 13.6,7 14,9C14.9,13.5 11.5,16 8,15.5C5.9592,15.2085 0,14.5 -2.5,17M54,36.5C49.5,37.5 47.7802,36.2435 45,33C42,29.5 34.5,32 33.5,38C32.6527,43.0838 37,47.5 42.5,47.5C51.0147,47.5 55,44 55,44"
-        android:strokeAlpha="0.5"
-        android:strokeWidth="1.5"
-        android:fillColor="#00000000"
-        android:strokeColor="#838383"
-        android:fillAlpha="0.5"/>
-    <path
-        android:pathData="M-8,38C14,33 35.0443,50.5372 36.5,57"
-        android:strokeAlpha="0.5"
-        android:strokeWidth="1.5"
-        android:fillColor="#00000000"
-        android:strokeColor="#838383"
-        android:fillAlpha="0.5"/>
-    <path
-        android:pathData="M-3,50.5132C1.9782,44.655 15.857,43.2391 17,54"
-        android:strokeAlpha="0.5"
-        android:strokeWidth="1.5"
-        android:fillColor="#00000000"
-        android:strokeColor="#838383"
-        android:fillAlpha="0.5"/>
-  </group>
-</vector>
diff --git a/android/app/src/main/res/drawable/ic_layers_isoline_inactive.xml b/android/app/src/main/res/drawable/ic_layers_isoline_inactive.xml
index b1e2d379e6..1b54673331 100644
--- a/android/app/src/main/res/drawable/ic_layers_isoline_inactive.xml
+++ b/android/app/src/main/res/drawable/ic_layers_isoline_inactive.xml
@@ -4,72 +4,23 @@
     android:viewportWidth="54"
     android:viewportHeight="54">
   <path
-      android:pathData="M47,2H7C4.2386,2 2,4.2386 2,7V47C2,49.7614 4.2386,52 7,52H47C49.7614,52 52,49.7614 52,47V7C52,4.2386 49.7614,2 47,2Z"
-      android:fillColor="#E0DCD5"/>
-  <group>
-    <clip-path
-        android:pathData="M2,7C2,4.2386 4.2386,2 7,2H47C49.7614,2 52,4.2386 52,7V47C52,49.7614 49.7614,52 47,52H7C4.2386,52 2,49.7614 2,47V7Z"/>
-    <path
-        android:pathData="M2,7C2,4.2386 4.2386,2 7,2H47C49.7614,2 52,4.2386 52,7V47C52,49.7614 49.7614,52 47,52H7C4.2386,52 2,49.7614 2,47V7Z"
-        android:fillColor="#E4E8EB"/>
-    <path
-        android:pathData="M36.25,-9l-23,23l12.625,12.625l23,-23z"
-        android:fillColor="#D6DBA5"/>
-    <path
-        android:pathData="M53.625,3.625l-22.875,22.875l24.375,24.375l22.875,-22.875z"
-        android:fillColor="#A2CBDB"/>
-    <path
-        android:pathData="M0.625,5.125l-10.1875,10.1875l11.875,11.875l10.1875,-10.1875z"
-        android:fillColor="#A2CBDB"/>
-    <path
-        android:pathData="M4.5,52.75l21.375,-21.375l18.625,18.625l-21.375,21.375z"
-        android:fillColor="#D6DBA5"/>
-    <path
-        android:pathData="M34.7669,64.1845l-4.5052,1.9048l-12.6325,-29.8777l4.5052,-1.9048z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M48,-2l8.4853,8.4853l-50.3327,50.3327l-8.4853,-8.4853z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M28.1663,-3.8337l3.4587,3.4587l-31.875,31.875l-3.4587,-3.4587z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M-3,5l8.4853,-8.4853l50.9117,50.9117l-8.4853,8.4853z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M22.5,-2C22,-0.6667 17.0211,-0.7706 19.5,1C23,3.5 27,20.5 16.5,19.5C8.3505,18.7239 6.5,28.8771 13.8743,32C18.8133,34.0916 26.2077,33.7262 30.5585,31C37.8685,26.4196 42.7899,17.9983 51.5,19.5C55.5199,20.1931 61.6667,24.6667 61.5,24.5"
-        android:strokeAlpha="0.5"
-        android:strokeWidth="1.5"
-        android:fillColor="#00000000"
-        android:strokeColor="#838383"
-        android:fillAlpha="0.5"/>
-    <path
-        android:pathData="M31.5,-3C34.4801,-0.9007 28.9403,23.8397 20,23C15,22.5304 14.5,28 19.5,28.5C33.4394,29.8939 37,4 56,8.5"
-        android:strokeAlpha="0.5"
-        android:strokeWidth="1.5"
-        android:fillColor="#00000000"
-        android:strokeColor="#838383"
-        android:fillAlpha="0.5"/>
-    <path
-        android:pathData="M12,0C11.8333,1.6667 13.6,7 14,9C14.9,13.5 11.5,16 8,15.5C5.9592,15.2085 0,14.5 -2.5,17M54,36.5C49.5,37.5 47.7802,36.2435 45,33C42,29.5 34.5,32 33.5,38C32.6527,43.0838 37,47.5 42.5,47.5C51.0147,47.5 55,44 55,44"
-        android:strokeAlpha="0.5"
-        android:strokeWidth="1.5"
-        android:fillColor="#00000000"
-        android:strokeColor="#838383"
-        android:fillAlpha="0.5"/>
-    <path
-        android:pathData="M-8,38C14,33 35.0443,50.5372 36.5,57"
-        android:strokeAlpha="0.5"
-        android:strokeWidth="1.5"
-        android:fillColor="#00000000"
-        android:strokeColor="#838383"
-        android:fillAlpha="0.5"/>
-    <path
-        android:pathData="M-3,50.5132C1.9782,44.655 15.857,43.2391 17,54"
-        android:strokeAlpha="0.5"
-        android:strokeWidth="1.5"
-        android:fillColor="#00000000"
-        android:strokeColor="#838383"
-        android:fillAlpha="0.5"/>
-  </group>
+      android:pathData="m54,3.782c0,-2.089 -1.693,-3.782 -3.778,-3.782l-46.44,0c-2.085,0 -3.782,1.693 -3.782,3.782l0,46.436c0,2.089 1.697,3.782 3.782,3.782l46.44,0c2.085,0 3.778,-1.693 3.778,-3.782z"
+      android:fillColor="#e0ded0"/>
+  <clip-path
+      android:pathData="m54,3.782c0,-2.089 -1.693,-3.782 -3.778,-3.782l-46.44,0c-2.085,0 -3.782,1.693 -3.782,3.782l0,46.436c0,2.089 1.697,3.782 3.782,3.782l46.44,0c2.085,0 3.778,-1.693 3.778,-3.782z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m30.339,39.992l-3.364,1.378l-0.36,-0.88l1.063,-0.435l-1.091,-2.663l-1.063,0.435l-0.337,-0.822q0.244,-0.1 0.456,-0.218 0.211,-0.122 0.331,-0.254 0.141,-0.157 0.174,-0.328 0.033,-0.171 -0.037,-0.38l1.12,-0.459l1.709,4.172l1.039,-0.426z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m33.313,34.945q0.281,0.318 0.402,0.699 0.122,0.376 0.066,0.771 -0.068,0.431 -0.308,0.823 -0.239,0.387 -0.659,0.757 -0.493,0.43 -0.901,0.653 -0.403,0.223 -0.699,0.319l-0.796,-0.902l0.115,-0.102q0.38,-0.072 0.755,-0.227 0.375,-0.155 0.66,-0.407 0.173,-0.152 0.339,-0.367 0.167,-0.22 0.193,-0.428 0.018,-0.167 -0.013,-0.296 -0.028,-0.131 -0.19,-0.315 -0.126,-0.143 -0.281,-0.186 -0.155,-0.049 -0.312,-0.022 -0.228,0.04 -0.461,0.197 -0.235,0.154 -0.405,0.304 -0.247,0.218 -0.436,0.462 -0.189,0.239 -0.322,0.431l-0.121,0.106l-2.032,-2.304l2.904,-2.562l0.689,0.782l-1.914,1.688l0.588,0.666q0.08,-0.08 0.207,-0.197 0.127,-0.122 0.226,-0.209 0.337,-0.298 0.659,-0.464 0.322,-0.172 0.615,-0.226 0.383,-0.069 0.743,0.057 0.358,0.123 0.689,0.499z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m34.352,30.196q0.621,0.296 1.059,0.643 0.435,0.345 0.635,0.732 0.204,0.397 0.186,0.859 -0.021,0.46 -0.288,1.021 -0.263,0.551 -0.614,0.862 -0.351,0.311 -0.789,0.397 -0.44,0.09 -0.971,-0.029 -0.534,-0.121 -1.154,-0.417 -0.64,-0.305 -1.059,-0.643 -0.418,-0.337 -0.629,-0.737 -0.207,-0.399 -0.183,-0.865 0.024,-0.467 0.282,-1.008 0.269,-0.564 0.62,-0.867 0.348,-0.304 0.794,-0.391 0.438,-0.087 0.966,0.031 0.524,0.116 1.144,0.412zM33.743,31.474q-0.891,-0.425 -1.351,-0.43 -0.463,-0.006 -0.657,0.4 -0.194,0.406 0.103,0.762 0.293,0.354 1.191,0.783 0.875,0.417 1.346,0.423 0.471,0.006 0.662,-0.393 0.19,-0.399 -0.111,-0.762 -0.301,-0.362 -1.182,-0.783z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m34.903,25.659q0.679,0.107 1.198,0.315 0.515,0.207 0.817,0.521 0.308,0.322 0.423,0.77 0.111,0.447 0.014,1.061 -0.095,0.603 -0.343,1.001 -0.248,0.398 -0.643,0.606 -0.396,0.212 -0.939,0.248 -0.546,0.036 -1.225,-0.071 -0.701,-0.11 -1.198,-0.315 -0.497,-0.204 -0.813,-0.528 -0.312,-0.323 -0.422,-0.777 -0.11,-0.454 -0.017,-1.047 0.097,-0.618 0.347,-1.008 0.247,-0.391 0.65,-0.601 0.396,-0.208 0.935,-0.245 0.535,-0.038 1.214,0.069zM34.683,27.057q-0.975,-0.154 -1.417,-0.027 -0.446,0.126 -0.516,0.57 -0.07,0.444 0.315,0.701 0.382,0.256 1.364,0.411 0.957,0.151 1.411,0.022 0.453,-0.129 0.522,-0.566 0.069,-0.437 -0.323,-0.699 -0.392,-0.262 -1.356,-0.414z"/>
+  <path
+      android:pathData="m0,21.494c4.717,0.64 9.081,3.088 11.418,4.997 6.604,5.403 16.296,-1.053 14.937,-9.588 -0.507,-3.174 -4.03,-10.321 -4.594,-16.185 -0.022,-0.241 -0.043,-0.482 -0.054,-0.719l1.312,0c0.011,0.198 0.025,0.395 0.047,0.593 0.561,5.838 4.08,12.945 4.584,16.102 1.542,9.714 -9.545,16.957 -17.062,10.814 -2.171,-1.776 -6.212,-4.084 -10.587,-4.713zM7.941,0c0.158,0.866 0.428,1.596 0.787,2.229 0.769,1.359 1.938,2.236 3.182,2.984 1.833,1.104 3.832,1.952 5.227,3.412 3.466,3.627 2.808,7.679 0.471,9.994 -2.34,2.312 -6.421,2.937 -9.908,-0.381 -1.456,-1.384 -3.609,-4.062 -5.863,-5.676 -0.611,-0.439 -1.229,-0.805 -1.837,-1.025l0,-1.352c0.863,0.23 1.74,0.694 2.599,1.309 2.304,1.654 4.515,4.379 6.004,5.795 2.847,2.711 6.173,2.286 8.081,0.399 1.913,-1.891 2.337,-5.195 -0.493,-8.157 -1.319,-1.38 -3.225,-2.153 -4.957,-3.196 -1.434,-0.863 -2.757,-1.891 -3.645,-3.462 -0.453,-0.798 -0.794,-1.736 -0.978,-2.872zM0,33.789c4.098,-0.503 7.46,0.011 10.271,2.401 3.372,2.872 7.355,3.954 11.087,3.688l0.489,1.262c-4.159,0.406 -8.642,-0.733 -12.424,-3.951 -2.57,-2.186 -5.658,-2.57 -9.422,-2.081zM0,47.809c4.645,-1.981 7.999,-0.313 11.213,0.794 18.669,6.431 32.509,-8.107 32.729,-19.693 0.054,-2.937 0.403,-17.554 3.286,-27.534 0.137,-0.467 0.277,-0.928 0.424,-1.377l1.377,0c-0.187,0.561 -0.37,1.143 -0.543,1.744 -2.847,9.85 -3.182,24.291 -3.235,27.189 -0.23,12.23 -14.761,27.696 -34.461,20.908 -3.063,-1.053 -6.262,-2.736 -10.788,-0.586zM36.827,0c-0.881,3.074 -1.215,6.025 -1.291,7.859 -0.158,3.714 0.352,6.82 0.715,9.843 0.252,2.117 0.435,4.195 0.295,6.406l-1.312,-0.05c0.14,-2.143 -0.04,-4.152 -0.284,-6.198 -0.37,-3.088 -0.881,-6.262 -0.723,-10.059 0.075,-1.83 0.403,-4.738 1.24,-7.801zM37.7,54c10.059,-3.419 14.232,-10.591 16.3,-18.201l0,4.235c-2.193,5.662 -5.925,10.774 -12.759,13.966z"
+      android:fillColor="#8d8d8d"/>
 </vector>
diff --git a/android/app/src/main/res/drawable/ic_layers_outdoors_active.xml b/android/app/src/main/res/drawable/ic_layers_outdoors_active.xml
new file mode 100644
index 0000000000..ff0868415c
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_layers_outdoors_active.xml
@@ -0,0 +1,33 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="54dp"
+    android:height="54dp"
+    android:viewportWidth="54"
+    android:viewportHeight="54">
+  <path
+      android:pathData="M7,0H47C48.8565,0 50.637,0.7375 51.9497,2.0503C53.2625,3.363 54,5.1435 54,7V47C54,48.8565 53.2625,50.637 51.9497,51.9497C50.637,53.2625 48.8565,54 47,54H7C5.1435,54 3.363,53.2625 2.0503,51.9497C0.7375,50.637 0,48.8565 0,47L0,7C0,5.1435 0.7375,3.363 2.0503,2.0503C3.363,0.7375 5.1435,0 7,0V0Z"
+      android:fillColor="#249CF2"/>
+  <clip-path
+      android:pathData="M2,7C2,4.2386 4.2386,2 7,2H47C49.7614,2 52,4.2386 52,7V47C52,49.7614 49.7614,52 47,52H7C4.2386,52 2,49.7614 2,47V7Z"/>
+  <path
+      android:pathData="m0,3.78c-0,-2.089 1.693,-3.782 3.778,-3.782l46.439,0c2.085,0 3.782,1.693 3.782,3.782l-0,46.436c-0,2.089 -1.697,3.782 -3.782,3.782l-46.439,0c-2.085,0 -3.778,-1.693 -3.778,-3.782z"
+      android:fillColor="#d6dba1"/>
+  <path
+      android:pathData="m0,26.676l-0,-22.896c-0,-2.089 1.693,-3.782 3.778,-3.782L42.229,-0.002c-8.308,22.379 -31.657,7.028 -42.229,26.678z"
+      android:fillColor="#fcebcb"/>
+  <group>
+    <clip-path
+        android:pathData="m0,26.676l-0,-22.896c-0,-2.089 1.693,-3.782 3.778,-3.782L42.229,-0.002c-8.308,22.379 -31.657,7.028 -42.229,26.678z"/>
+    <path
+        android:pathData="m0,18.767l-0,-14.987c-0,-2.089 1.693,-3.782 3.778,-3.782l22.842,0c-6.356,11.234 -21.677,6.676 -26.62,18.769z"
+        android:fillColor="#a2ccdc"/>
+  </group>
+  <path
+      android:pathData="m0.111,51.117c-0.057,-0.253 -0.102,-0.526 -0.106,-0.867l-0,-2.494c-0,0 0.25,-0.442 0.39,-0.654l1.239,0.804c-0.375,0.578 -1.288,2.279 -1.523,3.211zM3.514,45.801 L2.566,44.667c1.167,-0.979 2.558,-1.771 4.13,-2.418l0.565,1.367c-1.425,0.586 -2.69,1.297 -3.748,2.184zM10.069,42.661 L9.671,41.239c1.421,-0.4 2.944,-0.726 4.54,-1.006l0.258,1.457c-1.546,0.27 -3.02,0.586 -4.4,0.971zM17.459,41.227 L17.254,39.761c1.485,-0.205 3.013,-0.388 4.562,-0.569l0.171,1.469c-1.539,0.179 -3.054,0.362 -4.528,0.566zM25.022,40.311 L24.852,38.842c1.501,-0.176 3.016,-0.36 4.528,-0.571l0.205,1.464c-1.523,0.212 -3.05,0.397 -4.562,0.575zM32.624,39.27 L32.378,37.811c1.501,-0.253 2.986,-0.544 4.441,-0.891l0.341,1.437c-1.485,0.354 -3.005,0.653 -4.536,0.911zM40.153,37.55 L39.721,36.135c1.451,-0.444 2.857,-0.959 4.199,-1.569l0.61,1.346c-1.398,0.635 -2.861,1.174 -4.377,1.638zM47.312,34.463 L46.554,33.194c1.269,-0.761 2.459,-1.63 3.547,-2.634l1.004,1.086c-1.163,1.073 -2.433,2.005 -3.793,2.817zM53.261,29.329 L52.101,28.409c0.451,-0.566 1.504,-2.056 1.898,-2.691l-0,2.633c-0.114,0.211 -0.254,0.369 -0.739,0.979z"
+      android:fillColor="#59512c"/>
+  <path
+      android:pathData="m45.175,53.998l-3.383,0c-0.701,-0.334 -0.002,0.006 -0.652,-0.317l0.655,-1.325c0.645,0.319 2.687,1.31 3.38,1.642zM39.153,51.007 L38.462,52.315c-1.461,-0.773 -2.772,-1.514 -3.941,-2.239l0.778,-1.257c1.142,0.707 2.425,1.434 3.853,2.188zM32.873,47.186 L31.993,48.374c-1.442,-1.068 -2.571,-2.117 -3.412,-3.175l1.158,-0.919c0.772,0.97 1.812,1.927 3.135,2.907zM28.404,41.909 L27.004,42.384c-0.264,-0.784 -0.402,-1.588 -0.417,-2.424l1.479,-0.026c0.011,0.683 0.122,1.338 0.337,1.976z"
+      android:fillColor="#ce6f6f"/>
+  <path
+      android:pathData="m27.015,32.518c-0.694,0 -1.355,-0.266 -1.833,-0.697 -0.651,1.977 -2.513,3.408 -4.706,3.408 -2.732,0 -4.95,-2.218 -4.95,-4.95 0,-0.91 0.244,-1.762 0.672,-2.491 0.018,-0.036 0.04,-0.068 0.058,-0.101l4.016,-6.697c0.467,-0.73 1.291,-1.118 2.168,-1.219l0.359,-0.457c0.805,-1.186 3.149,-0.28 2.836,1.247l-0.072,0.367c-0.054,0.18 0.209,0.302 0.32,0.165 0.309,-0.381 0.629,-0.489 1.118,-0.489 0.489,0 0.809,0.101 1.118,0.482 0.115,0.14 0.363,0.014 0.309,-0.162l-0.061,-0.363c-0.313,-1.528 2.031,-2.434 2.836,-1.247l0.359,0.457c0.877,0.101 1.7,0.489 2.168,1.219l4.016,6.697c0.018,0.032 0.04,0.065 0.058,0.101 0.428,0.73 0.672,1.582 0.672,2.491 0,2.732 -2.218,4.95 -4.95,4.95 -2.193,0 -4.055,-1.431 -4.706,-3.408 -0.478,0.431 -1.111,0.697 -1.805,0.697zM20.476,26.91c-1.859,0 -3.365,1.51 -3.365,3.368 0,1.855 1.506,3.365 3.365,3.365 1.859,0 3.365,-1.51 3.365,-3.365 0,-1.859 -1.506,-3.368 -3.365,-3.368zM27.001,28.718c-0.611,0 -1.118,0.496 -1.118,1.107 0,0.611 0.521,1.104 1.132,1.104 0.611,0 1.104,-0.493 1.104,-1.104 0,-0.611 -0.507,-1.107 -1.118,-1.107zM33.525,26.91c-1.859,0 -3.365,1.51 -3.365,3.368 0,1.855 1.506,3.365 3.365,3.365 1.859,0 3.365,-1.51 3.365,-3.365 0,-1.859 -1.506,-3.368 -3.365,-3.368z"
+      android:fillColor="#694c27"/>
+</vector>
diff --git a/android/app/src/main/res/drawable/ic_layers_outdoors_inactive.xml b/android/app/src/main/res/drawable/ic_layers_outdoors_inactive.xml
new file mode 100644
index 0000000000..952bf0824e
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_layers_outdoors_inactive.xml
@@ -0,0 +1,28 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="54dp"
+    android:height="54dp"
+    android:viewportWidth="54"
+    android:viewportHeight="54">
+  <path
+      android:pathData="m0,3.78c-0,-2.089 1.693,-3.782 3.778,-3.782l46.439,0c2.085,0 3.782,1.693 3.782,3.782l-0,46.436c-0,2.089 -1.697,3.782 -3.782,3.782l-46.439,0c-2.085,0 -3.778,-1.693 -3.778,-3.782z"
+      android:fillColor="#d6dba1"/>
+  <path
+      android:pathData="m0,26.676l-0,-22.896c-0,-2.089 1.693,-3.782 3.778,-3.782L42.229,-0.002c-8.308,22.379 -31.657,7.028 -42.229,26.678z"
+      android:fillColor="#fcebcb"/>
+  <group>
+    <clip-path
+        android:pathData="m0,26.676l-0,-22.896c-0,-2.089 1.693,-3.782 3.778,-3.782L42.229,-0.002c-8.308,22.379 -31.657,7.028 -42.229,26.678z"/>
+    <path
+        android:pathData="m0,18.767l-0,-14.987c-0,-2.089 1.693,-3.782 3.778,-3.782l22.842,0c-6.356,11.234 -21.677,6.676 -26.62,18.769z"
+        android:fillColor="#a2ccdc"/>
+  </group>
+  <path
+      android:pathData="m0.111,51.117c-0.057,-0.253 -0.102,-0.526 -0.106,-0.867l-0,-2.494c-0,0 0.25,-0.442 0.39,-0.654l1.239,0.804c-0.375,0.578 -1.288,2.279 -1.523,3.211zM3.514,45.801 L2.566,44.667c1.167,-0.979 2.558,-1.771 4.13,-2.418l0.565,1.367c-1.425,0.586 -2.69,1.297 -3.748,2.184zM10.069,42.661 L9.671,41.239c1.421,-0.4 2.944,-0.726 4.54,-1.006l0.258,1.457c-1.546,0.27 -3.02,0.586 -4.4,0.971zM17.459,41.227 L17.254,39.761c1.485,-0.205 3.013,-0.388 4.562,-0.569l0.171,1.469c-1.539,0.179 -3.054,0.362 -4.528,0.566zM25.022,40.311 L24.852,38.842c1.501,-0.176 3.016,-0.36 4.528,-0.571l0.205,1.464c-1.523,0.212 -3.05,0.397 -4.562,0.575zM32.624,39.27 L32.378,37.811c1.501,-0.253 2.986,-0.544 4.441,-0.891l0.341,1.437c-1.485,0.354 -3.005,0.653 -4.536,0.911zM40.153,37.55 L39.721,36.135c1.451,-0.444 2.857,-0.959 4.199,-1.569l0.61,1.346c-1.398,0.635 -2.861,1.174 -4.377,1.638zM47.312,34.463 L46.554,33.194c1.269,-0.761 2.459,-1.63 3.547,-2.634l1.004,1.086c-1.163,1.073 -2.433,2.005 -3.793,2.817zM53.261,29.329 L52.101,28.409c0.451,-0.566 1.504,-2.056 1.898,-2.691l-0,2.633c-0.114,0.211 -0.254,0.369 -0.739,0.979z"
+      android:fillColor="#59512c"/>
+  <path
+      android:pathData="m45.175,53.998l-3.383,0c-0.701,-0.334 -0.002,0.006 -0.652,-0.317l0.655,-1.325c0.645,0.319 2.687,1.31 3.38,1.642zM39.153,51.007 L38.462,52.315c-1.461,-0.773 -2.772,-1.514 -3.941,-2.239l0.778,-1.257c1.142,0.707 2.425,1.434 3.853,2.188zM32.873,47.186 L31.993,48.374c-1.442,-1.068 -2.571,-2.117 -3.412,-3.175l1.158,-0.919c0.772,0.97 1.812,1.927 3.135,2.907zM28.404,41.909 L27.004,42.384c-0.264,-0.784 -0.402,-1.588 -0.417,-2.424l1.479,-0.026c0.011,0.683 0.122,1.338 0.337,1.976z"
+      android:fillColor="#ce6f6f"/>
+  <path
+      android:pathData="m27.015,32.518c-0.694,0 -1.355,-0.266 -1.833,-0.697 -0.651,1.977 -2.513,3.408 -4.706,3.408 -2.732,0 -4.95,-2.218 -4.95,-4.95 0,-0.91 0.244,-1.762 0.672,-2.491 0.018,-0.036 0.04,-0.068 0.058,-0.101l4.016,-6.697c0.467,-0.73 1.291,-1.118 2.168,-1.219l0.359,-0.457c0.805,-1.186 3.149,-0.28 2.836,1.247l-0.072,0.367c-0.054,0.18 0.209,0.302 0.32,0.165 0.309,-0.381 0.629,-0.489 1.118,-0.489 0.489,0 0.809,0.101 1.118,0.482 0.115,0.14 0.363,0.014 0.309,-0.162l-0.061,-0.363c-0.313,-1.528 2.031,-2.434 2.836,-1.247l0.359,0.457c0.877,0.101 1.7,0.489 2.168,1.219l4.016,6.697c0.018,0.032 0.04,0.065 0.058,0.101 0.428,0.73 0.672,1.582 0.672,2.491 0,2.732 -2.218,4.95 -4.95,4.95 -2.193,0 -4.055,-1.431 -4.706,-3.408 -0.478,0.431 -1.111,0.697 -1.805,0.697zM20.476,26.91c-1.859,0 -3.365,1.51 -3.365,3.368 0,1.855 1.506,3.365 3.365,3.365 1.859,0 3.365,-1.51 3.365,-3.365 0,-1.859 -1.506,-3.368 -3.365,-3.368zM27.001,28.718c-0.611,0 -1.118,0.496 -1.118,1.107 0,0.611 0.521,1.104 1.132,1.104 0.611,0 1.104,-0.493 1.104,-1.104 0,-0.611 -0.507,-1.107 -1.118,-1.107zM33.525,26.91c-1.859,0 -3.365,1.51 -3.365,3.368 0,1.855 1.506,3.365 3.365,3.365 1.859,0 3.365,-1.51 3.365,-3.365 0,-1.859 -1.506,-3.368 -3.365,-3.368z"
+      android:fillColor="#694c27"/>
+</vector>
diff --git a/android/app/src/main/res/drawable/ic_layers_subway_active.xml b/android/app/src/main/res/drawable/ic_layers_subway_active.xml
index 587dac7287..fbbf1f0074 100644
--- a/android/app/src/main/res/drawable/ic_layers_subway_active.xml
+++ b/android/app/src/main/res/drawable/ic_layers_subway_active.xml
@@ -6,56 +6,27 @@
   <path
       android:pathData="M7,0H47C48.8565,0 50.637,0.7375 51.9497,2.0503C53.2625,3.363 54,5.1435 54,7V47C54,48.8565 53.2625,50.637 51.9497,51.9497C50.637,53.2625 48.8565,54 47,54H7C5.1435,54 3.363,53.2625 2.0503,51.9497C0.7375,50.637 0,48.8565 0,47L0,7C0,5.1435 0.7375,3.363 2.0503,2.0503C3.363,0.7375 5.1435,0 7,0V0Z"
       android:fillColor="#249CF2"/>
+  <clip-path
+      android:pathData="M2,7C2,4.2386 4.2386,2 7,2H47C49.7614,2 52,4.2386 52,7V47C52,49.7614 49.7614,52 47,52H7C4.2386,52 2,49.7614 2,47V7Z"/>
   <path
-      android:pathData="M47,2H7C4.2386,2 2,4.2386 2,7V47C2,49.7614 4.2386,52 7,52H47C49.7614,52 52,49.7614 52,47V7C52,4.2386 49.7614,2 47,2Z"
-      android:fillColor="#E0DCD5"/>
-  <group>
-    <clip-path
-        android:pathData="M2,7C2,4.2386 4.2386,2 7,2H47C49.7614,2 52,4.2386 52,7V47C52,49.7614 49.7614,52 47,52H7C4.2386,52 2,49.7614 2,47V7Z"/>
-    <path
-        android:pathData="M2,7C2,4.2386 4.2386,2 7,2H47C49.7614,2 52,4.2386 52,7V47C52,49.7614 49.7614,52 47,52H7C4.2386,52 2,49.7614 2,47V7Z"
-        android:fillColor="#E4E8EB"/>
-    <path
-        android:pathData="M36.25,-9l-23,23l12.625,12.625l23,-23z"
-        android:fillColor="#D6DBA5"/>
-    <path
-        android:pathData="M53.625,3.625l-22.875,22.875l24.375,24.375l22.875,-22.875z"
-        android:fillColor="#A2CBDB"/>
-    <path
-        android:pathData="M0.625,5.125l-10.1875,10.1875l11.875,11.875l10.1875,-10.1875z"
-        android:fillColor="#A2CBDB"/>
-    <path
-        android:pathData="M4.5,52.75l21.375,-21.375l18.625,18.625l-21.375,21.375z"
-        android:fillColor="#D6DBA5"/>
-    <path
-        android:pathData="M34.7668,64.1845l-4.5052,1.9048l-12.6325,-29.8777l4.5052,-1.9048z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M48,-2l8.375,8.375l-50.3327,50.3327l-8.375,-8.375z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M28.1663,-3.8337l3.4587,3.4587l-31.875,31.875l-3.4587,-3.4587z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M-3,5l8.4853,-8.4853l50.9117,50.9117l-8.4853,8.4853z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M51.5625,4l3.5355,3.5355l-52.5625,52.5625l-3.5355,-3.5355z"
-        android:fillColor="#FFB90B"/>
-    <path
-        android:pathData="M70.5458,36.8V36.8C57.2939,27.9546 41.0904,24.6871 25.4462,27.7054L-6.028,33.7778"
-        android:strokeWidth="5"
-        android:fillColor="#00000000"
-        android:strokeColor="#FF5C5C"/>
-    <path
-        android:pathData="M34,-10V-10C34,6.3169 27.468,21.9547 15.8617,33.4235L0.3524,48.7491"
-        android:strokeWidth="5"
-        android:fillColor="#00000000"
-        android:strokeColor="#06AAFA"/>
-    <path
-        android:pathData="M27,27m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"
-        android:strokeWidth="4"
-        android:fillColor="#ffffff"
-        android:strokeColor="#000000"/>
-  </group>
+      android:pathData="m53.998,3.772c0,-2.083 -1.693,-3.772 -3.778,-3.772l-46.438,0c-2.085,0 -3.782,1.689 -3.782,3.772l0,46.314c0,2.083 1.697,3.772 3.782,3.772l46.438,0c2.085,0 3.778,-1.689 3.778,-3.772z"
+      android:fillColor="#dcdde5"/>
+  <path
+      android:pathData="m0.001,42.614l53.998,0l0,-5.454l-53.998,-0.156z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="m24.024,53.858c0,-10.706 -1.129,-26.787 1.833,-39.455 1.327,-5.669 3.48,-10.66 6.755,-14.403l10.001,0c-6.201,2.406 -9.264,8.501 -10.957,15.755 -2.862,12.23 -1.679,27.766 -1.679,38.103z"
+      android:fillColor="#fe5b60"/>
+  <path
+      android:pathData="m12.171,54 l0.065,-54l5.687,0l-0.025,54z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M0.003,24.677l53.997,0l0,5.938l-53.997,0z"
+      android:fillColor="#01adff"/>
+  <path
+      android:pathData="M27.648,27.908m-7.533,0a7.514,7.533 90,1 1,15.067 0a7.514,7.533 90,1 1,-15.067 0"
+      android:fillColor="#ffffff"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m27.648,19.111c4.864,0 8.817,3.942 8.817,8.797 0,4.857 -3.953,8.795 -8.817,8.795 -4.868,0 -8.821,-3.938 -8.821,-8.795 0,-4.855 3.953,-8.797 8.821,-8.797zM27.648,21.677c-3.449,0 -6.246,2.792 -6.246,6.23 0,3.441 2.798,6.231 6.246,6.231 3.444,0 6.246,-2.79 6.246,-6.231 0,-3.438 -2.802,-6.23 -6.246,-6.23z"/>
 </vector>
diff --git a/android/app/src/main/res/drawable/ic_layers_subway_active_night.xml b/android/app/src/main/res/drawable/ic_layers_subway_active_night.xml
deleted file mode 100644
index fb198f5923..0000000000
--- a/android/app/src/main/res/drawable/ic_layers_subway_active_night.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="54dp"
-    android:height="54dp"
-    android:viewportWidth="54"
-    android:viewportHeight="54">
-  <path
-      android:pathData="M7,0H47C48.8565,0 50.637,0.7375 51.9497,2.0503C53.2625,3.363 54,5.1435 54,7V47C54,48.8565 53.2625,50.637 51.9497,51.9497C50.637,53.2625 48.8565,54 47,54H7C5.1435,54 3.363,53.2625 2.0503,51.9497C0.7375,50.637 0,48.8565 0,47L0,7C0,5.1435 0.7375,3.363 2.0503,2.0503C3.363,0.7375 5.1435,0 7,0V0Z"
-      android:fillColor="#4BB9E6"/>
-  <path
-      android:pathData="M47,2H7C4.2386,2 2,4.2386 2,7V47C2,49.7614 4.2386,52 7,52H47C49.7614,52 52,49.7614 52,47V7C52,4.2386 49.7614,2 47,2Z"
-      android:fillColor="#E0DCD5"/>
-  <group>
-    <clip-path
-        android:pathData="M2,7C2,4.2386 4.2386,2 7,2H47C49.7614,2 52,4.2386 52,7V47C52,49.7614 49.7614,52 47,52H7C4.2386,52 2,49.7614 2,47V7Z"/>
-    <path
-        android:pathData="M2,7C2,4.2386 4.2386,2 7,2H47C49.7614,2 52,4.2386 52,7V47C52,49.7614 49.7614,52 47,52H7C4.2386,52 2,49.7614 2,47V7Z"
-        android:fillColor="#E4E8EB"/>
-    <path
-        android:pathData="M36.25,-9l-23,23l12.625,12.625l23,-23z"
-        android:fillColor="#D6DBA5"/>
-    <path
-        android:pathData="M53.625,3.625l-22.875,22.875l24.375,24.375l22.875,-22.875z"
-        android:fillColor="#A2CBDB"/>
-    <path
-        android:pathData="M0.625,5.125l-10.1875,10.1875l11.875,11.875l10.1875,-10.1875z"
-        android:fillColor="#A2CBDB"/>
-    <path
-        android:pathData="M4.5,52.75l21.375,-21.375l18.625,18.625l-21.375,21.375z"
-        android:fillColor="#D6DBA5"/>
-    <path
-        android:pathData="M34.7668,64.1845l-4.5052,1.9048l-12.6325,-29.8777l4.5052,-1.9048z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M48,-2l8.375,8.375l-50.3327,50.3327l-8.375,-8.375z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M28.1663,-3.8337l3.4587,3.4587l-31.875,31.875l-3.4587,-3.4587z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M-3,5l8.4853,-8.4853l50.9117,50.9117l-8.4853,8.4853z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M51.5625,4l3.5355,3.5355l-52.5625,52.5625l-3.5355,-3.5355z"
-        android:fillColor="#FFB90B"/>
-    <path
-        android:pathData="M70.5457,36.8V36.8C57.2939,27.9546 41.0904,24.6871 25.4462,27.7054L-6.0281,33.7778"
-        android:strokeWidth="5"
-        android:fillColor="#00000000"
-        android:strokeColor="#FF5C5C"/>
-    <path
-        android:pathData="M34,-10V-10C34,6.3169 27.468,21.9547 15.8617,33.4235L0.3524,48.7491"
-        android:strokeWidth="5"
-        android:fillColor="#00000000"
-        android:strokeColor="#06AAFA"/>
-    <path
-        android:pathData="M27,27m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"
-        android:strokeWidth="4"
-        android:fillColor="#ffffff"
-        android:strokeColor="#000000"/>
-  </group>
-</vector>
diff --git a/android/app/src/main/res/drawable/ic_layers_subway_inactive.xml b/android/app/src/main/res/drawable/ic_layers_subway_inactive.xml
index c700e4505b..2a6ef02d45 100644
--- a/android/app/src/main/res/drawable/ic_layers_subway_inactive.xml
+++ b/android/app/src/main/res/drawable/ic_layers_subway_inactive.xml
@@ -4,55 +4,24 @@
     android:viewportWidth="54"
     android:viewportHeight="54">
   <path
-      android:pathData="M47,2H7C4.2386,2 2,4.2386 2,7V47C2,49.7614 4.2386,52 7,52H47C49.7614,52 52,49.7614 52,47V7C52,4.2386 49.7614,2 47,2Z"
-      android:fillColor="#E0DCD5"/>
-  <group>
-    <clip-path
-        android:pathData="M2,7C2,4.2386 4.2386,2 7,2H47C49.7614,2 52,4.2386 52,7V47C52,49.7614 49.7614,52 47,52H7C4.2386,52 2,49.7614 2,47V7Z"/>
-    <path
-        android:pathData="M2,7C2,4.2386 4.2386,2 7,2H47C49.7614,2 52,4.2386 52,7V47C52,49.7614 49.7614,52 47,52H7C4.2386,52 2,49.7614 2,47V7Z"
-        android:fillColor="#E4E8EB"/>
-    <path
-        android:pathData="M36.25,-9l-23,23l12.625,12.625l23,-23z"
-        android:fillColor="#D6DBA5"/>
-    <path
-        android:pathData="M53.625,3.625l-22.875,22.875l24.375,24.375l22.875,-22.875z"
-        android:fillColor="#A2CBDB"/>
-    <path
-        android:pathData="M0.625,5.125l-10.1875,10.1875l11.875,11.875l10.1875,-10.1875z"
-        android:fillColor="#A2CBDB"/>
-    <path
-        android:pathData="M4.5,52.75l21.375,-21.375l18.625,18.625l-21.375,21.375z"
-        android:fillColor="#D6DBA5"/>
-    <path
-        android:pathData="M34.7669,64.1845l-4.5052,1.9048l-12.6325,-29.8777l4.5052,-1.9048z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M48,-2l8.375,8.375l-50.3327,50.3327l-8.375,-8.375z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M28.1663,-3.8337l3.4587,3.4587l-31.875,31.875l-3.4587,-3.4587z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M-3,5l8.4853,-8.4853l50.9117,50.9117l-8.4853,8.4853z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M51.5625,4l3.5355,3.5355l-52.5625,52.5625l-3.5355,-3.5355z"
-        android:fillColor="#FFB90B"/>
-    <path
-        android:pathData="M70.5458,36.8V36.8C57.2939,27.9546 41.0904,24.6871 25.4462,27.7054L-6.028,33.7778"
-        android:strokeWidth="5"
-        android:fillColor="#00000000"
-        android:strokeColor="#FF5C5C"/>
-    <path
-        android:pathData="M34,-10V-10C34,6.3169 27.468,21.9547 15.8617,33.4235L0.3524,48.7491"
-        android:strokeWidth="5"
-        android:fillColor="#00000000"
-        android:strokeColor="#06AAFA"/>
-    <path
-        android:pathData="M27,27m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"
-        android:strokeWidth="4"
-        android:fillColor="#ffffff"
-        android:strokeColor="#000000"/>
-  </group>
+      android:pathData="m53.998,3.772c0,-2.083 -1.693,-3.772 -3.778,-3.772l-46.438,0c-2.085,0 -3.782,1.689 -3.782,3.772l0,46.314c0,2.083 1.697,3.772 3.782,3.772l46.438,0c2.085,0 3.778,-1.689 3.778,-3.772z"
+      android:fillColor="#dcdde5"/>
+  <path
+      android:pathData="m0.001,42.614l53.998,0l0,-5.454l-53.998,-0.156z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="m24.024,53.858c0,-10.706 -1.129,-26.787 1.833,-39.455 1.327,-5.669 3.48,-10.66 6.755,-14.403l10.001,0c-6.201,2.406 -9.264,8.501 -10.957,15.755 -2.862,12.23 -1.679,27.766 -1.679,38.103z"
+      android:fillColor="#fe5b60"/>
+  <path
+      android:pathData="m12.171,54 l0.065,-54l5.687,0l-0.025,54z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M0.003,24.677l53.997,0l0,5.938l-53.997,0z"
+      android:fillColor="#01adff"/>
+  <path
+      android:pathData="M27.648,27.908m-7.533,0a7.514,7.533 90,1 1,15.067 0a7.514,7.533 90,1 1,-15.067 0"
+      android:fillColor="#ffffff"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m27.648,19.111c4.864,0 8.817,3.942 8.817,8.797 0,4.857 -3.953,8.795 -8.817,8.795 -4.868,0 -8.821,-3.938 -8.821,-8.795 0,-4.855 3.953,-8.797 8.821,-8.797zM27.648,21.677c-3.449,0 -6.246,2.792 -6.246,6.23 0,3.441 2.798,6.231 6.246,6.231 3.444,0 6.246,-2.79 6.246,-6.231 0,-3.438 -2.802,-6.23 -6.246,-6.23z"/>
 </vector>
diff --git a/android/app/src/main/res/drawable/ic_layers_traffic_active_night.xml b/android/app/src/main/res/drawable/ic_layers_traffic_active_night.xml
deleted file mode 100644
index 022548204b..0000000000
--- a/android/app/src/main/res/drawable/ic_layers_traffic_active_night.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="54dp"
-    android:height="54dp"
-    android:viewportWidth="54"
-    android:viewportHeight="54">
-  <path
-      android:pathData="M7,0H47C48.8565,0 50.637,0.7375 51.9497,2.0503C53.2625,3.363 54,5.1435 54,7V47C54,48.8565 53.2625,50.637 51.9497,51.9497C50.637,53.2625 48.8565,54 47,54H7C5.1435,54 3.363,53.2625 2.0503,51.9497C0.7375,50.637 0,48.8565 0,47L0,7C0,5.1435 0.7375,3.363 2.0503,2.0503C3.363,0.7375 5.1435,0 7,0V0Z"
-      android:fillColor="#4BB9E6"/>
-  <path
-      android:pathData="M47,2H7C4.2386,2 2,4.2386 2,7V47C2,49.7614 4.2386,52 7,52H47C49.7614,52 52,49.7614 52,47V7C52,4.2386 49.7614,2 47,2Z"
-      android:fillColor="#EDE8E2"/>
-  <group>
-    <clip-path
-        android:pathData="M2,7C2,4.2386 4.2386,2 7,2H47C49.7614,2 52,4.2386 52,7V47C52,49.7614 49.7614,52 47,52H7C4.2386,52 2,49.7614 2,47V7Z"/>
-    <path
-        android:pathData="M2,7C2,4.2386 4.2386,2 7,2H47C49.7614,2 52,4.2386 52,7V47C52,49.7614 49.7614,52 47,52H7C4.2386,52 2,49.7614 2,47V7Z"
-        android:fillColor="#E4E8EB"/>
-    <path
-        android:pathData="M49.625,-1.375l-25.875,25.875l-11.25,-11.25l25.875,-25.875z"
-        android:fillColor="#D6DBA5"/>
-    <path
-        android:pathData="M53.625,3.625l-22.875,22.875l24.375,24.375l22.875,-22.875z"
-        android:fillColor="#A2CBDB"/>
-    <path
-        android:pathData="M-2.125,1.875l-12.4375,12.4375l14,14l12.4375,-12.4375z"
-        android:fillColor="#A2CBDB"/>
-    <path
-        android:pathData="M4.5,52.75l21.375,-21.375l18.625,18.625l-21.375,21.375z"
-        android:fillColor="#D6DBA5"/>
-    <path
-        android:pathData="M34.7668,64.1845l-4.5052,1.9048l-12.6325,-29.8777l4.5052,-1.9048z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M48,-2l8.4853,8.4853l-50.3327,50.3327l-8.4853,-8.4853z"
-        android:fillColor="#FFB90B"/>
-    <path
-        android:pathData="M28.1663,-3.8337l3.4587,3.4587l-31.875,31.875l-3.4587,-3.4587z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M-3,5l8.4853,-8.4853l50.9117,50.9117l-8.4853,8.4853z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M61.4926,-7.0074L61.4926,-7.0074A6,6 0,0 1,61.4926 1.4779L32.7279,30.2427A6,6 0,0 1,24.2426 30.2427L24.2426,30.2427A6,6 0,0 1,24.2426 21.7574L53.0074,-7.0074A6,6 0,0 1,61.4926 -7.0074z"
-        android:fillColor="#FF5C5C"/>
-    <path
-        android:pathData="M31.0486,17.1748C34.336,16.2939 37.3441,19.3021 36.4633,22.5894L31.9332,39.4958C31.1641,42.3663 27.9335,43.5698 25.5243,42.2268C24.808,41.8275 24.381,41.0843 24.0792,40.3217L21.6652,34.2206C21.2587,33.193 20.445,32.3793 19.4174,31.9728L13.3163,29.5588C12.5537,29.2571 11.8105,28.83 11.4112,28.1137C10.0682,25.7045 11.2717,22.4739 14.1422,21.7048L31.0486,17.1748Z"
-        android:strokeWidth="4"
-        android:fillColor="#49A5EA"
-        android:strokeColor="#ffffff"/>
-  </group>
-</vector>
diff --git a/android/app/src/main/res/values/themes-base.xml b/android/app/src/main/res/values/themes-base.xml
index 26ea44992a..95d057cc82 100644
--- a/android/app/src/main/res/values/themes-base.xml
+++ b/android/app/src/main/res/values/themes-base.xml
@@ -223,9 +223,6 @@
     <item name="transitPedestrianBackground">@color/white_4</item>
     <item name="transitRulerBackground">@color/white_4</item>
     <item name="transitStepDivider">@drawable/dot_divider_night</item>
-    <item name="trafficMenuEnabled">@drawable/ic_layers_traffic_active_night</item>
-    <item name="subwayMenuEnabled">@drawable/ic_layers_subway_active_night</item>
-    <item name="isoLinesMenuEnabled">@drawable/ic_layers_isoline_active_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>