diff --git a/android/res/drawable-hdpi/ic_planning_route_isomaps_off_dark_off.png b/android/res/drawable-hdpi/ic_planning_route_isomaps_off_dark_off.png
deleted file mode 100755
index faa630f2af..0000000000
Binary files a/android/res/drawable-hdpi/ic_planning_route_isomaps_off_dark_off.png and /dev/null differ
diff --git a/android/res/drawable-hdpi/ic_planning_route_isomaps_off_light_off.png b/android/res/drawable-hdpi/ic_planning_route_isomaps_off_light_off.png
deleted file mode 100755
index 3c61a036a2..0000000000
Binary files a/android/res/drawable-hdpi/ic_planning_route_isomaps_off_light_off.png and /dev/null differ
diff --git a/android/res/drawable-hdpi/ic_subway_off.png b/android/res/drawable-hdpi/ic_subway_off.png
deleted file mode 100644
index 64614be0e6..0000000000
Binary files a/android/res/drawable-hdpi/ic_subway_off.png and /dev/null differ
diff --git a/android/res/drawable-hdpi/ic_subway_off_night.png b/android/res/drawable-hdpi/ic_subway_off_night.png
deleted file mode 100644
index b98d303179..0000000000
Binary files a/android/res/drawable-hdpi/ic_subway_off_night.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/ic_planning_route_isomaps_off_dark_off.png b/android/res/drawable-mdpi/ic_planning_route_isomaps_off_dark_off.png
deleted file mode 100755
index 49fa09057b..0000000000
Binary files a/android/res/drawable-mdpi/ic_planning_route_isomaps_off_dark_off.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/ic_planning_route_isomaps_off_light_off.png b/android/res/drawable-mdpi/ic_planning_route_isomaps_off_light_off.png
deleted file mode 100755
index d978e10f69..0000000000
Binary files a/android/res/drawable-mdpi/ic_planning_route_isomaps_off_light_off.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/ic_subway_off.png b/android/res/drawable-mdpi/ic_subway_off.png
deleted file mode 100644
index c4cc136211..0000000000
Binary files a/android/res/drawable-mdpi/ic_subway_off.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/ic_subway_off_night.png b/android/res/drawable-mdpi/ic_subway_off_night.png
deleted file mode 100644
index 1d70b7de34..0000000000
Binary files a/android/res/drawable-mdpi/ic_subway_off_night.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/ic_planning_route_isomaps_off_dark_off.png b/android/res/drawable-xhdpi/ic_planning_route_isomaps_off_dark_off.png
deleted file mode 100755
index 16197264d8..0000000000
Binary files a/android/res/drawable-xhdpi/ic_planning_route_isomaps_off_dark_off.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/ic_planning_route_isomaps_off_light_off.png b/android/res/drawable-xhdpi/ic_planning_route_isomaps_off_light_off.png
deleted file mode 100755
index 7488ea1338..0000000000
Binary files a/android/res/drawable-xhdpi/ic_planning_route_isomaps_off_light_off.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/ic_subway_off.png b/android/res/drawable-xhdpi/ic_subway_off.png
deleted file mode 100644
index 4c7d5fd627..0000000000
Binary files a/android/res/drawable-xhdpi/ic_subway_off.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/ic_subway_off_night.png b/android/res/drawable-xhdpi/ic_subway_off_night.png
deleted file mode 100644
index 184b681086..0000000000
Binary files a/android/res/drawable-xhdpi/ic_subway_off_night.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/ic_planning_route_isomaps_off_dark_off.png b/android/res/drawable-xxhdpi/ic_planning_route_isomaps_off_dark_off.png
deleted file mode 100755
index a6b4783f77..0000000000
Binary files a/android/res/drawable-xxhdpi/ic_planning_route_isomaps_off_dark_off.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/ic_planning_route_isomaps_off_light_off.png b/android/res/drawable-xxhdpi/ic_planning_route_isomaps_off_light_off.png
deleted file mode 100755
index 38bff0a294..0000000000
Binary files a/android/res/drawable-xxhdpi/ic_planning_route_isomaps_off_light_off.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/ic_subway_off.png b/android/res/drawable-xxhdpi/ic_subway_off.png
deleted file mode 100644
index f525513d0b..0000000000
Binary files a/android/res/drawable-xxhdpi/ic_subway_off.png and /dev/null differ
diff --git a/android/res/drawable-xxhdpi/ic_subway_off_night.png b/android/res/drawable-xxhdpi/ic_subway_off_night.png
deleted file mode 100644
index 660b84a58e..0000000000
Binary files a/android/res/drawable-xxhdpi/ic_subway_off_night.png and /dev/null differ
diff --git a/android/res/drawable-xxxhdpi/ic_planning_route_isomaps_off_dark_off.png b/android/res/drawable-xxxhdpi/ic_planning_route_isomaps_off_dark_off.png
deleted file mode 100755
index 976db8230c..0000000000
Binary files a/android/res/drawable-xxxhdpi/ic_planning_route_isomaps_off_dark_off.png and /dev/null differ
diff --git a/android/res/drawable-xxxhdpi/ic_planning_route_isomaps_off_light_off.png b/android/res/drawable-xxxhdpi/ic_planning_route_isomaps_off_light_off.png
deleted file mode 100755
index 00c4f9fbb9..0000000000
Binary files a/android/res/drawable-xxxhdpi/ic_planning_route_isomaps_off_light_off.png and /dev/null differ
diff --git a/android/res/drawable-xxxhdpi/ic_subway_off.png b/android/res/drawable-xxxhdpi/ic_subway_off.png
deleted file mode 100644
index 4afe11a798..0000000000
Binary files a/android/res/drawable-xxxhdpi/ic_subway_off.png and /dev/null differ
diff --git a/android/res/drawable-xxxhdpi/ic_subway_off_night.png b/android/res/drawable-xxxhdpi/ic_subway_off_night.png
deleted file mode 100644
index cca0bca295..0000000000
Binary files a/android/res/drawable-xxxhdpi/ic_subway_off_night.png and /dev/null differ
diff --git a/android/res/drawable/bg_guides_light_selected.xml b/android/res/drawable/bg_guides_light_selected.xml
index 0c67d48312..c54873625d 100644
--- a/android/res/drawable/bg_guides_light_selected.xml
+++ b/android/res/drawable/bg_guides_light_selected.xml
@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android">
   <item android:drawable="@drawable/bg_circle"/>
   <item
-    android:drawable="@drawable/guides_layer_default_light"
+    android:drawable="@drawable/ic_layers_off"
     android:left="@dimen/margin_base_plus_quarter"
     android:right="@dimen/margin_base_plus_quarter"
     android:top="@dimen/margin_base_plus_quarter"
diff --git a/android/res/drawable/bg_guides_night_selected.xml b/android/res/drawable/bg_guides_night_selected.xml
index 9b9b0c95e4..1a00348b7a 100644
--- a/android/res/drawable/bg_guides_night_selected.xml
+++ b/android/res/drawable/bg_guides_night_selected.xml
@@ -4,7 +4,7 @@
   <item
     android:drawable="@drawable/bg_circle_night"/>
   <item
-    android:drawable="@drawable/guides_layer_default_dark"
+    android:drawable="@drawable/ic_layers_off_night"
     android:left="@dimen/margin_base_plus_quarter"
     android:right="@dimen/margin_base_plus_quarter"
     android:top="@dimen/margin_base_plus_quarter"
diff --git a/android/res/drawable/bg_iso_lines_light_selected.xml b/android/res/drawable/bg_iso_lines_light_selected.xml
index 772cdf6897..c54873625d 100644
--- a/android/res/drawable/bg_iso_lines_light_selected.xml
+++ b/android/res/drawable/bg_iso_lines_light_selected.xml
@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android">
   <item android:drawable="@drawable/bg_circle"/>
   <item
-    android:drawable="@drawable/ic_planning_route_isomaps_off_light_off"
+    android:drawable="@drawable/ic_layers_off"
     android:left="@dimen/margin_base_plus_quarter"
     android:right="@dimen/margin_base_plus_quarter"
     android:top="@dimen/margin_base_plus_quarter"
diff --git a/android/res/drawable/bg_iso_lines_night_selected.xml b/android/res/drawable/bg_iso_lines_night_selected.xml
index 8fd0986d4b..1a00348b7a 100644
--- a/android/res/drawable/bg_iso_lines_night_selected.xml
+++ b/android/res/drawable/bg_iso_lines_night_selected.xml
@@ -4,7 +4,7 @@
   <item
     android:drawable="@drawable/bg_circle_night"/>
   <item
-    android:drawable="@drawable/ic_planning_route_isomaps_off_dark_off"
+    android:drawable="@drawable/ic_layers_off_night"
     android:left="@dimen/margin_base_plus_quarter"
     android:right="@dimen/margin_base_plus_quarter"
     android:top="@dimen/margin_base_plus_quarter"
diff --git a/android/res/drawable/bg_subway_light_selected.xml b/android/res/drawable/bg_subway_light_selected.xml
index 8e283b5307..c54873625d 100644
--- a/android/res/drawable/bg_subway_light_selected.xml
+++ b/android/res/drawable/bg_subway_light_selected.xml
@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android">
   <item android:drawable="@drawable/bg_circle"/>
   <item
-    android:drawable="@drawable/ic_subway_off"
+    android:drawable="@drawable/ic_layers_off"
     android:left="@dimen/margin_base_plus_quarter"
     android:right="@dimen/margin_base_plus_quarter"
     android:top="@dimen/margin_base_plus_quarter"
diff --git a/android/res/drawable/bg_subway_night_selected.xml b/android/res/drawable/bg_subway_night_selected.xml
index fe5466a1a2..1a00348b7a 100644
--- a/android/res/drawable/bg_subway_night_selected.xml
+++ b/android/res/drawable/bg_subway_night_selected.xml
@@ -4,7 +4,7 @@
   <item
     android:drawable="@drawable/bg_circle_night"/>
   <item
-    android:drawable="@drawable/ic_subway_off_night"
+    android:drawable="@drawable/ic_layers_off_night"
     android:left="@dimen/margin_base_plus_quarter"
     android:right="@dimen/margin_base_plus_quarter"
     android:top="@dimen/margin_base_plus_quarter"