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 a8b06d26c..3aa543822 100644
--- a/android/app/src/main/java/app/organicmaps/maplayer/LayerBottomSheetItem.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/LayerBottomSheetItem.java
@@ -13,9 +13,7 @@ import app.organicmaps.util.ThemeUtils;
 public class LayerBottomSheetItem
 {
   @DrawableRes
-  private final int mEnabledStateDrawableResId;
-  @DrawableRes
-  private final int mDisabledStateDrawableResId;
+  private final int mDrawableResId;
   @StringRes
   private final int mTitleResId;
   @NonNull
@@ -23,12 +21,10 @@ public class LayerBottomSheetItem
   @NonNull
   private final OnItemClickListener<LayerBottomSheetItem> mItemClickListener;
 
-  LayerBottomSheetItem(@DrawableRes int enabledStateDrawableResId, @DrawableRes int disabledStateDrawableResId,
-                       @StringRes int titleResId, @NonNull Mode mode,
+  LayerBottomSheetItem(@DrawableRes int drawableResId, @StringRes int titleResId, @NonNull Mode mode,
                        @NonNull OnItemClickListener<LayerBottomSheetItem> itemClickListener)
   {
-    mEnabledStateDrawableResId = enabledStateDrawableResId;
-    mDisabledStateDrawableResId = disabledStateDrawableResId;
+    mDrawableResId = drawableResId;
     mTitleResId = titleResId;
     mMode = mode;
     mItemClickListener = itemClickListener;
@@ -37,35 +33,32 @@ public class LayerBottomSheetItem
   public static LayerBottomSheetItem create(@NonNull Context mContext, Mode mode,
                                             @NonNull OnItemClickListener<LayerBottomSheetItem> layerItemClickListener)
   {
-    int disabledResource = 0;
-    int enabledResource = 0;
+    @AttrRes
+    int drawableRes = 0;
+    @StringRes
     int buttonTextResource = R.string.layers_title;
     switch (mode)
     {
     case OUTDOORS:
-      disabledResource = R.attr.outdoorsMenuDisabled;
-      enabledResource = R.attr.outdoorsMenuEnabled;
+      drawableRes = R.attr.outdoorsMenuIcon;
       buttonTextResource = R.string.button_layer_outdoor;
       break;
     case SUBWAY:
-      disabledResource = R.attr.subwayMenuDisabled;
-      enabledResource = R.attr.subwayMenuEnabled;
-      buttonTextResource = R.string.subway;
+      drawableRes = R.attr.subwayMenuIcon;
+      buttonTextResource = R.string.button_layer_subway;
       break;
     case ISOLINES:
-      disabledResource = R.attr.isoLinesMenuDisabled;
-      enabledResource = R.attr.isoLinesMenuEnabled;
+      drawableRes = R.attr.isolinesMenuIcon;
       buttonTextResource = R.string.button_layer_isolines;
       break;
     case TRAFFIC:
-      disabledResource = R.attr.trafficMenuDisabled;
-      enabledResource = R.attr.trafficMenuEnabled;
+      drawableRes = R.attr.trafficMenuIcon;
       buttonTextResource = R.string.button_layer_traffic;
       break;
     }
-    int disabled = ThemeUtils.getResource(mContext, disabledResource);
-    int enabled = ThemeUtils.getResource(mContext, enabledResource);
-    return new LayerBottomSheetItem(enabled, disabled, buttonTextResource, mode, layerItemClickListener);
+    @DrawableRes
+    final int drawableResId = ThemeUtils.getResource(mContext, drawableRes);
+    return new LayerBottomSheetItem(drawableResId, buttonTextResource, mode, layerItemClickListener);
   }
 
   @NonNull
@@ -75,15 +68,9 @@ public class LayerBottomSheetItem
   }
 
   @DrawableRes
-  public int getEnabledStateDrawable()
+  public int getDrawable()
   {
-    return mEnabledStateDrawableResId;
-  }
-
-  @DrawableRes
-  public int getDisabledStateDrawable()
-  {
-    return mDisabledStateDrawableResId;
+    return mDrawableResId;
   }
 
   @StringRes
diff --git a/android/app/src/main/java/app/organicmaps/maplayer/LayersAdapter.java b/android/app/src/main/java/app/organicmaps/maplayer/LayersAdapter.java
index fc8021cc7..e54c40482 100644
--- a/android/app/src/main/java/app/organicmaps/maplayer/LayersAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/LayersAdapter.java
@@ -45,7 +45,8 @@ public class LayersAdapter extends RecyclerView.Adapter<LayerHolder>
     holder.mTitle.setText(item.getTitle());
     boolean isNewLayer = SharedPropertiesUtils.shouldShowNewMarkerForLayerMode(item.getMode());
     UiUtils.showIf(isNewLayer, holder.mNewMarker);
-    holder.mButton.setImageResource(isEnabled ? item.getEnabledStateDrawable() : item.getDisabledStateDrawable());
+    holder.mButton.setBackgroundResource(item.getDrawable());
+    holder.mButton.setActivated(isEnabled);
     holder.mListener = item::onClick;
   }
 
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
deleted file mode 100644
index a55d34c1b..000000000
--- a/android/app/src/main/res/drawable/ic_layers_isoline_active.xml
+++ /dev/null
@@ -1,31 +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="#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="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_dark.xml b/android/app/src/main/res/drawable/ic_layers_isoline_dark.xml
new file mode 100644
index 000000000..305cca79c
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_layers_isoline_dark.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">
+  <group>
+    <clip-path
+        android:pathData="M10,0L44,0A10,10 0,0 1,54 10L54,44A10,10 0,0 1,44 54L10,54A10,10 0,0 1,0 44L0,10A10,10 0,0 1,10 0z"/>
+    <path
+        android:pathData="M0,-0l54,0l0,54l-54,0z"
+        android:strokeLineJoin="round"
+        android:strokeWidth="10.145"
+        android:fillColor="#242020"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
+    <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 4.855,4.954 8.587,4.688l0.489,1.262c-4.159,0.406 -6.142,-1.733 -9.924,-4.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.061,3.349 0.061,3.349l-1.312,-0.05c0,0 0.195,-1.095 -0.05,-3.14 -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:strokeLineJoin="round"
+        android:fillColor="#496149"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="m25.767,43.426q-0.638,0.426 -1.277,0.541 -0.638,0.109 -1.182,-0.091 -0.545,-0.2 -0.9,-0.697l1.092,-0.729q0.274,0.357 0.737,0.365 0.463,0.008 0.922,-0.299 0.487,-0.325 0.632,-0.786 0.145,-0.461 -0.124,-0.863 -0.277,-0.414 -0.775,-0.457 -0.497,-0.05 -1.074,0.335l-0.536,0.358 -0.559,-0.837 0.536,-0.358q0.471,-0.315 0.605,-0.756 0.134,-0.442 -0.132,-0.84 -0.258,-0.386 -0.672,-0.444 -0.413,-0.065 -0.839,0.22 -0.418,0.279 -0.585,0.707 -0.162,0.425 0.083,0.819l-1.044,0.697q-0.328,-0.509 -0.305,-1.082 0.027,-0.576 0.354,-1.105 0.329,-0.537 0.913,-0.927 0.605,-0.404 1.204,-0.475 0.599,-0.071 1.097,0.148 0.5,0.212 0.806,0.671 0.342,0.512 0.272,1.057 -0.07,0.546 -0.488,0.984l0.033,0.049q0.693,-0.334 1.285,-0.177 0.596,0.154 0.976,0.722 0.339,0.508 0.316,1.098 -0.023,0.59 -0.374,1.154 -0.352,0.564 -0.997,0.995zM31.126,39.126q-0.516,0.492 -1.104,0.682 -0.588,0.19 -1.149,0.084 -0.56,-0.113 -0.985,-0.538l0.915,-0.873q0.331,0.305 0.785,0.264 0.45,-0.045 0.807,-0.385 0.424,-0.405 0.426,-0.947 0.004,-0.542 -0.422,-0.987 -0.428,-0.449 -0.987,-0.469 -0.559,-0.027 -0.99,0.384 -0.24,0.229 -0.382,0.54 -0.142,0.304 -0.138,0.577l-0.986,0.678 -2.317,-2.973 3.049,-2.909 0.755,0.791 -2.264,2.161 1.183,1.544 0.028,-0.027q-0.017,-0.315 0.147,-0.68 0.161,-0.369 0.479,-0.673 0.477,-0.455 1.067,-0.586 0.587,-0.135 1.18,0.055 0.593,0.183 1.075,0.688 0.499,0.523 0.646,1.158 0.147,0.635 -0.057,1.276 -0.205,0.634 -0.759,1.163zM35.698,33.933q-0.79,1.068 -2.014,1.079 -1.225,0.005 -2.649,-1.049 -1.421,-1.051 -1.775,-2.231 -0.354,-1.179 0.433,-2.243 0.784,-1.06 2.016,-1.066 1.231,-0.006 2.652,1.045 1.425,1.054 1.775,2.231 0.349,1.17 -0.438,2.233zM34.819,33.282q0.424,-0.573 0.097,-1.289 -0.324,-0.72 -1.337,-1.469 -1.017,-0.752 -1.803,-0.855 -0.784,-0.106 -1.208,0.467 -0.424,0.573 -0.092,1.298 0.328,0.722 1.341,1.472 1.013,0.749 1.793,0.853 0.783,0.099 1.21,-0.478zM39.414,27.877q-0.594,1.188 -1.797,1.411 -1.205,0.216 -2.791,-0.576 -1.581,-0.79 -2.134,-1.891 -0.553,-1.1 0.039,-2.284 0.589,-1.179 1.801,-1.398 1.212,-0.219 2.793,0.572 1.586,0.792 2.134,1.891 0.546,1.092 -0.045,2.275zM38.436,27.388q0.319,-0.638 -0.127,-1.286 -0.443,-0.653 -1.57,-1.216 -1.131,-0.565 -1.924,-0.53 -0.79,0.031 -1.109,0.668 -0.319,0.638 0.133,1.295 0.448,0.655 1.575,1.218 1.127,0.563 1.913,0.53 0.788,-0.037 1.109,-0.679z"
+        android:strokeLineJoin="round"
+        android:strokeWidth="3"
+        android:fillColor="#496149"
+        android:fillType="evenOdd"/>
+  </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
deleted file mode 100644
index 1b5467333..000000000
--- a/android/app/src/main/res/drawable/ic_layers_isoline_inactive.xml
+++ /dev/null
@@ -1,26 +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="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_light.xml b/android/app/src/main/res/drawable/ic_layers_isoline_light.xml
new file mode 100644
index 000000000..cf6508078
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_layers_isoline_light.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">
+  <group>
+    <clip-path
+        android:pathData="M10,0L44,0A10,10 0,0 1,54 10L54,44A10,10 0,0 1,44 54L10,54A10,10 0,0 1,0 44L0,10A10,10 0,0 1,10 0z"/>
+    <path
+        android:pathData="M0,-0l54,0l0,54l-54,0z"
+        android:strokeLineJoin="round"
+        android:strokeWidth="10.145"
+        android:fillColor="#ccc7ba"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
+    <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 4.855,4.954 8.587,4.688l0.489,1.262c-4.159,0.406 -6.142,-1.733 -9.924,-4.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.061,3.349 0.061,3.349l-1.312,-0.05c0,0 0.195,-1.095 -0.05,-3.14 -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:strokeLineJoin="round"
+        android:fillColor="#496149"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="m25.767,43.426q-0.638,0.426 -1.277,0.541 -0.638,0.109 -1.182,-0.091 -0.545,-0.2 -0.9,-0.697l1.092,-0.729q0.274,0.357 0.737,0.365 0.463,0.008 0.922,-0.299 0.487,-0.325 0.632,-0.786 0.145,-0.461 -0.124,-0.863 -0.277,-0.414 -0.775,-0.457 -0.497,-0.05 -1.074,0.335l-0.536,0.358 -0.559,-0.837 0.536,-0.358q0.471,-0.315 0.605,-0.756 0.134,-0.442 -0.132,-0.84 -0.258,-0.386 -0.672,-0.444 -0.413,-0.065 -0.839,0.22 -0.418,0.279 -0.585,0.707 -0.162,0.425 0.083,0.819l-1.044,0.697q-0.328,-0.509 -0.305,-1.082 0.027,-0.576 0.354,-1.105 0.329,-0.537 0.913,-0.927 0.605,-0.404 1.204,-0.475 0.599,-0.071 1.097,0.148 0.5,0.212 0.806,0.671 0.342,0.512 0.272,1.057 -0.07,0.546 -0.488,0.984l0.033,0.049q0.693,-0.334 1.285,-0.177 0.596,0.154 0.976,0.722 0.339,0.508 0.316,1.098 -0.023,0.59 -0.374,1.154 -0.352,0.564 -0.997,0.995zM31.126,39.126q-0.516,0.492 -1.104,0.682 -0.588,0.19 -1.149,0.084 -0.56,-0.113 -0.985,-0.538l0.915,-0.873q0.331,0.305 0.785,0.264 0.45,-0.045 0.807,-0.385 0.424,-0.405 0.426,-0.947 0.004,-0.542 -0.422,-0.987 -0.428,-0.449 -0.987,-0.469 -0.559,-0.027 -0.99,0.384 -0.24,0.229 -0.382,0.54 -0.142,0.304 -0.138,0.577l-0.986,0.678 -2.317,-2.973 3.049,-2.909 0.755,0.791 -2.264,2.161 1.183,1.544 0.028,-0.027q-0.017,-0.315 0.147,-0.68 0.161,-0.369 0.479,-0.673 0.477,-0.455 1.067,-0.586 0.587,-0.135 1.18,0.055 0.593,0.183 1.075,0.688 0.499,0.523 0.646,1.158 0.147,0.635 -0.057,1.276 -0.205,0.634 -0.759,1.163zM35.698,33.933q-0.79,1.068 -2.014,1.079 -1.225,0.005 -2.649,-1.049 -1.421,-1.051 -1.775,-2.231 -0.354,-1.179 0.433,-2.243 0.784,-1.06 2.016,-1.066 1.231,-0.006 2.652,1.045 1.425,1.054 1.775,2.231 0.349,1.17 -0.438,2.233zM34.819,33.282q0.424,-0.573 0.097,-1.289 -0.324,-0.72 -1.337,-1.469 -1.017,-0.752 -1.803,-0.855 -0.784,-0.106 -1.208,0.467 -0.424,0.573 -0.092,1.298 0.328,0.722 1.341,1.472 1.013,0.749 1.793,0.853 0.783,0.099 1.21,-0.478zM39.414,27.877q-0.594,1.188 -1.797,1.411 -1.205,0.216 -2.791,-0.576 -1.581,-0.79 -2.134,-1.891 -0.553,-1.1 0.039,-2.284 0.589,-1.179 1.801,-1.398 1.212,-0.219 2.793,0.572 1.586,0.792 2.134,1.891 0.546,1.092 -0.045,2.275zM38.436,27.388q0.319,-0.638 -0.127,-1.286 -0.443,-0.653 -1.57,-1.216 -1.131,-0.565 -1.924,-0.53 -0.79,0.031 -1.109,0.668 -0.319,0.638 0.133,1.295 0.448,0.655 1.575,1.218 1.127,0.563 1.913,0.53 0.788,-0.037 1.109,-0.679z"
+        android:strokeLineJoin="round"
+        android:strokeWidth="3"
+        android:fillColor="#496149"
+        android:fillType="evenOdd"/>
+  </group>
+</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
deleted file mode 100644
index ff0868415..000000000
--- a/android/app/src/main/res/drawable/ic_layers_outdoors_active.xml
+++ /dev/null
@@ -1,33 +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="#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_dark.xml b/android/app/src/main/res/drawable/ic_layers_outdoors_dark.xml
new file mode 100644
index 000000000..5458c3d51
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_layers_outdoors_dark.xml
@@ -0,0 +1,64 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="54dp"
+    android:height="54dp"
+    android:viewportWidth="54"
+    android:viewportHeight="54">
+  <group>
+    <clip-path
+        android:pathData="M10,0L44,0A10,10 0,0 1,54 10L54,44A10,10 0,0 1,44 54L10,54A10,10 0,0 1,0 44L0,10A10,10 0,0 1,10 0z"/>
+    <path
+        android:pathData="M0,0h54v54h-54z"
+        android:strokeLineJoin="round"
+        android:strokeWidth="40.5"
+        android:fillColor="#141c00"
+        android:strokeLineCap="round"/>
+    <path
+        android:pathData="M19,55C27,43 46,50 48,38"
+        android:strokeLineJoin="round"
+        android:strokeWidth="3"
+        android:fillColor="#00000000"
+        android:strokeColor="#5f532d"
+        android:strokeLineCap="butt"/>
+    <path
+        android:pathData="M55,33C33,45 19,17 -1,33"
+        android:strokeAlpha="0.8"
+        android:strokeLineJoin="round"
+        android:strokeWidth="3"
+        android:fillColor="#00000000"
+        android:strokeColor="#a05012"
+        android:fillAlpha="0.8"
+        android:strokeLineCap="butt"/>
+    <path
+        android:pathData="M0,26.678V0H37C23,19 10,10 0,26.678Z"
+        android:strokeLineJoin="round"
+        android:strokeWidth="0.359493"
+        android:fillColor="#28281a"
+        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: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"
+        android:strokeAlpha="0.50277"
+        android:fillColor="#111111"
+        android:strokeColor="#00000000"/>
+    <path
+        android:pathData="m6,36a1,1 0,0 0,1 1L8.496,37L7.77,41L5,41a1,1 0,0 0,-1 1,1 1,0 0,0 1,1L7.406,43L6.678,47.016A0.835,0.835 0,0 0,7.5 48,1.198 1.198,0 0,0 8.678,47.016L9.406,43h7.197l0.72,4.016A1.195,1.195 0,0 0,18.5 48,0.837 0.837,0 0,0 19.324,47.016L18.604,43L21,43a1,1 0,0 0,1 -1,1 1,0 0,0 -1,-1L18.244,41L17.527,37L19,37a1,1 0,0 0,1 -1,1 1,0 0,0 -1,-1L7,35a1,1 0,0 0,-1 1zM10.496,37h5.031l0.717,4h-6.475z"
+        android:strokeAlpha="0.50277"
+        android:fillColor="#5a5858"
+        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,24 38.269,24 38.53,23.972 38.781,23.92 39.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:strokeWidth="1.27289"
+        android:fillColor="#111111"
+        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:fillType="evenOdd"/>
+  </group>
+</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
deleted file mode 100644
index 952bf0824..000000000
--- a/android/app/src/main/res/drawable/ic_layers_outdoors_inactive.xml
+++ /dev/null
@@ -1,28 +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="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_light.xml b/android/app/src/main/res/drawable/ic_layers_outdoors_light.xml
new file mode 100644
index 000000000..d90788471
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_layers_outdoors_light.xml
@@ -0,0 +1,65 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="54dp"
+    android:height="54dp"
+    android:viewportWidth="54"
+    android:viewportHeight="54">
+  <group>
+    <clip-path
+        android:pathData="M10,0L44,0A10,10 0,0 1,54 10L54,44A10,10 0,0 1,44 54L10,54A10,10 0,0 1,0 44L0,10A10,10 0,0 1,10 0z"/>
+    <path
+        android:pathData="M0,0h54v54h-54z"
+        android:strokeLineJoin="round"
+        android:strokeWidth="40.5"
+        android:fillColor="#c1cc89"
+        android:strokeLineCap="round"/>
+    <path
+        android:pathData="M19,55C27,43 46,50 48,38"
+        android:strokeLineJoin="round"
+        android:strokeWidth="3"
+        android:fillColor="#00000000"
+        android:strokeColor="#635730"
+        android:strokeLineCap="butt"/>
+    <path
+        android:pathData="M55,33C33,45 19,17 -1,33"
+        android:strokeLineJoin="round"
+        android:strokeWidth="3"
+        android:fillColor="#00000000"
+        android:strokeColor="#a05012"
+        android:strokeLineCap="butt"/>
+    <path
+        android:pathData="M0,26.678V0H37C23,19 10,10 0,26.678Z"
+        android:strokeLineJoin="round"
+        android:strokeWidth="0.359493"
+        android:fillColor="#fcec7e"
+        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: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: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
new file mode 100644
index 000000000..514f02497
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_layers_outline_selector.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:state_activated="true">
+    <shape android:shape="rectangle">
+      <corners android:radius="8dp" />
+      <solid android:color="@android:color/transparent" />
+      <stroke android:width="2dp" android:color="#249CF2" />
+    </shape>
+  </item>
+  <item>
+    <shape android:shape="rectangle">
+      <solid android:color="@android:color/transparent" />
+    </shape>
+  </item>
+</selector>
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
deleted file mode 100644
index fbbf1f007..000000000
--- a/android/app/src/main/res/drawable/ic_layers_subway_active.xml
+++ /dev/null
@@ -1,32 +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="#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="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_dark.xml b/android/app/src/main/res/drawable/ic_layers_subway_dark.xml
new file mode 100644
index 000000000..d607f1297
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_layers_subway_dark.xml
@@ -0,0 +1,60 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="54dp"
+    android:height="54dp"
+    android:viewportWidth="54"
+    android:viewportHeight="54">
+  <group>
+    <clip-path
+        android:pathData="M10,0L44,0A10,10 0,0 1,54 10L54,44A10,10 0,0 1,44 54L10,54A10,10 0,0 1,0 44L0,10A10,10 0,0 1,10 0z"/>
+    <path
+        android:pathData="M0,0h54v54h-54z"
+        android:strokeLineJoin="round"
+        android:strokeWidth="40.5"
+        android:fillColor="#262222"
+        android:strokeLineCap="round"/>
+    <path
+        android:pathData="M8,61V-7"
+        android:strokeLineJoin="round"
+        android:strokeWidth="4"
+        android:fillColor="#e3e1d2"
+        android:strokeColor="#4b4643"
+        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:strokeLineCap="round"/>
+    <path
+        android:pathData="M27,27H0m27,0h27"
+        android:strokeLineJoin="round"
+        android:strokeWidth="6"
+        android:fillColor="#00000000"
+        android:strokeColor="#a80000"
+        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="#006294"
+        android:strokeLineCap="round"/>
+    <path
+        android:pathData="M27,27m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"
+        android:strokeLineJoin="round"
+        android:strokeWidth="3.55556"
+        android:fillColor="#000000"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="round"/>
+    <path
+        android:pathData="M27,27m-6,0a6,6 0,1 1,12 0a6,6 0,1 1,-12 0"
+        android:strokeAlpha="0.8"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2.667"
+        android:fillColor="#ffffff"
+        android:strokeColor="#00000000"
+        android:fillAlpha="0.8"
+        android:strokeLineCap="round"/>
+  </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
deleted file mode 100644
index 2a6ef02d4..000000000
--- a/android/app/src/main/res/drawable/ic_layers_subway_inactive.xml
+++ /dev/null
@@ -1,27 +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="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_light.xml b/android/app/src/main/res/drawable/ic_layers_subway_light.xml
new file mode 100644
index 000000000..a36a2c4eb
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_layers_subway_light.xml
@@ -0,0 +1,58 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="54dp"
+    android:height="54dp"
+    android:viewportWidth="54"
+    android:viewportHeight="54">
+  <group>
+    <clip-path
+        android:pathData="M10,0L44,0A10,10 0,0 1,54 10L54,44A10,10 0,0 1,44 54L10,54A10,10 0,0 1,0 44L0,10A10,10 0,0 1,10 0z"/>
+    <path
+        android:pathData="M0,0h54v54h-54z"
+        android:strokeLineJoin="round"
+        android:strokeWidth="40.5"
+        android:fillColor="#ede8d6"
+        android:strokeLineCap="round"/>
+    <path
+        android:pathData="M8,61V-7"
+        android:strokeLineJoin="round"
+        android:strokeWidth="4"
+        android:fillColor="#e3e1d2"
+        android:strokeColor="#f8f8f8"
+        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:strokeLineCap="round"/>
+    <path
+        android:pathData="M27,27H0m27,0h27"
+        android:strokeLineJoin="round"
+        android:strokeWidth="6"
+        android:fillColor="#00000000"
+        android:strokeColor="#dc0000"
+        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:strokeLineCap="round"/>
+    <path
+        android:pathData="M27,27m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"
+        android:strokeLineJoin="round"
+        android:strokeWidth="3.55556"
+        android:fillColor="#000000"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="round"/>
+    <path
+        android:pathData="M27,27m-6,0a6,6 0,1 1,12 0a6,6 0,1 1,-12 0"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2.66667"
+        android:fillColor="#ffffff"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="round"/>
+  </group>
+</vector>
diff --git a/android/app/src/main/res/layout/item_layer.xml b/android/app/src/main/res/layout/item_layer.xml
index 459844931..376f4b340 100644
--- a/android/app/src/main/res/layout/item_layer.xml
+++ b/android/app/src/main/res/layout/item_layer.xml
@@ -20,7 +20,8 @@
       android:background="@null"
       android:minWidth="@dimen/margin_double_plus"
       android:minHeight="@dimen/margin_double_plus"
-      tools:background="?attr/subwayMenuDisabled" />
+      android:src="@drawable/ic_layers_outline_selector"
+      tools:background="?attr/subwayMenuIcon" />
 
     <View
       android:id="@+id/marker"
diff --git a/android/app/src/main/res/values/attrs.xml b/android/app/src/main/res/values/attrs.xml
index 4db620a25..2721ec905 100644
--- a/android/app/src/main/res/values/attrs.xml
+++ b/android/app/src/main/res/values/attrs.xml
@@ -65,14 +65,6 @@
     <attr name="subTitleDefault" format="reference"/>
   </declare-styleable>
 
-  <attr name="trafficMenuDisabled" format="reference"/>
-  <attr name="subwayMenuDisabled" format="reference"/>
-  <attr name="isoLinesMenuDisabled" format="reference"/>
-  <attr name="outdoorsMenuDisabled" format="reference"/>
-  <attr name="trafficMenuEnabled" format="reference"/>
-  <attr name="subwayMenuEnabled" format="reference"/>
-  <attr name="isoLinesMenuEnabled" format="reference"/>
-  <attr name="outdoorsMenuEnabled" format="reference"/>
   <attr name="accentColorSelector" format="color"/>
   <attr name="bookingFilterTitleColor" format="color"/>
   <attr name="adsRemovalOptionsBg" format="reference"/>