diff --git a/OsmAnd/copy_widget_icons.sh b/OsmAnd/copy_widget_icons.sh
new file mode 100755
index 0000000000..299235327c
--- /dev/null
+++ b/OsmAnd/copy_widget_icons.sh
@@ -0,0 +1,6 @@
+cp -f res/drawable-hdpi/widget_* res/drawable-large/
+cp -f res/drawable-xxhdpi/widget_* res/drawable-large-hdpi/
+cp -f res/drawable-xhdpi/widget_* res/drawable-large-xhdpi/
+cp -f res/drawable-hdpi/map_* res/drawable-large/
+cp -f res/drawable-xhdpi/map_* res/drawable-large-hdpi/
+cp -f res/drawable-xxhdpi/map_* res/drawable-large-xhdpi/
diff --git a/OsmAnd/res/drawable-hdpi/bg_left_pushed.9.png b/OsmAnd/res/drawable-hdpi/bg_left_pushed.9.png
deleted file mode 100644
index 8c27dac158..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/bg_left_pushed.9.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/bg_left_simple.9.png b/OsmAnd/res/drawable-hdpi/bg_left_simple.9.png
deleted file mode 100644
index 1f5403ca73..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/bg_left_simple.9.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/bg_leftr_pushed.9.png b/OsmAnd/res/drawable-hdpi/bg_leftr_pushed.9.png
deleted file mode 100644
index 690d2dc47c..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/bg_leftr_pushed.9.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/bg_leftr_simple.9.png b/OsmAnd/res/drawable-hdpi/bg_leftr_simple.9.png
deleted file mode 100644
index 42e343bd80..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/bg_leftr_simple.9.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/bg_right_pushed.9.png b/OsmAnd/res/drawable-hdpi/bg_right_pushed.9.png
deleted file mode 100644
index 0d840db46f..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/bg_right_pushed.9.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/bg_right_simple.9.png b/OsmAnd/res/drawable-hdpi/bg_right_simple.9.png
deleted file mode 100644
index fd76ae0651..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/bg_right_simple.9.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/bg_rightr_pushed.9.png b/OsmAnd/res/drawable-hdpi/bg_rightr_pushed.9.png
deleted file mode 100644
index 6b569c097e..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/bg_rightr_pushed.9.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/bg_rightr_simple.9.png b/OsmAnd/res/drawable-hdpi/bg_rightr_simple.9.png
deleted file mode 100644
index 3a8a28e84a..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/bg_rightr_simple.9.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/bg_striped_img.png b/OsmAnd/res/drawable-hdpi/bg_striped_img.png
deleted file mode 100644
index ab8487a50f..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/bg_striped_img.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/bg_striped_split_img.png b/OsmAnd/res/drawable-hdpi/bg_striped_split_img.png
deleted file mode 100644
index 4c780ea284..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/bg_striped_split_img.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/button_icon_favorites.png b/OsmAnd/res/drawable-hdpi/button_icon_favorites.png
deleted file mode 100644
index 81cd5d7395..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/button_icon_favorites.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/button_icon_map.png b/OsmAnd/res/drawable-hdpi/button_icon_map.png
deleted file mode 100644
index b5a0b48a48..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/button_icon_map.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/button_icon_search.png b/OsmAnd/res/drawable-hdpi/button_icon_search.png
deleted file mode 100644
index c396c82ca7..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/button_icon_search.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/button_icon_settings.png b/OsmAnd/res/drawable-hdpi/button_icon_settings.png
deleted file mode 100644
index 5fa115f9b2..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/button_icon_settings.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/expandable_category_empty.png b/OsmAnd/res/drawable-hdpi/expandable_category_empty.png
deleted file mode 100644
index 82c0a79f7d..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/expandable_category_empty.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/expandable_category_pushed.png b/OsmAnd/res/drawable-hdpi/expandable_category_pushed.png
deleted file mode 100644
index 4a00927047..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/expandable_category_pushed.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/expandable_category_unpushed.png b/OsmAnd/res/drawable-hdpi/expandable_category_unpushed.png
deleted file mode 100644
index a1fb25baa8..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/expandable_category_unpushed.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/headline_close_button__original.png b/OsmAnd/res/drawable-hdpi/headline_close_button__original.png
deleted file mode 100644
index 92e7198cda..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/headline_close_button__original.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/headline_close_button_pressed__original.png b/OsmAnd/res/drawable-hdpi/headline_close_button_pressed__original.png
deleted file mode 100644
index bca7554a8c..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/headline_close_button_pressed__original.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/help_icon_pressed.png b/OsmAnd/res/drawable-hdpi/help_icon_pressed.png
deleted file mode 100644
index ebb3386fa4..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/help_icon_pressed.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/help_icon_pressed__original.png b/OsmAnd/res/drawable-hdpi/help_icon_pressed__original.png
deleted file mode 100644
index d3cb4baee5..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/help_icon_pressed__original.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/help_icon_simple.png b/OsmAnd/res/drawable-hdpi/help_icon_simple.png
deleted file mode 100644
index 0345c1404a..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/help_icon_simple.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/help_icon_simple__original.png b/OsmAnd/res/drawable-hdpi/help_icon_simple__original.png
deleted file mode 100644
index 6ab6f1e9cc..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/help_icon_simple__original.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_ac_close.png b/OsmAnd/res/drawable-hdpi/ic_ac_close.png
deleted file mode 100644
index f664f8ef8f..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_ac_close.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_ac_help.png b/OsmAnd/res/drawable-hdpi/ic_ac_help.png
deleted file mode 100644
index 746232e70f..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_ac_help.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_ac_settings.png b/OsmAnd/res/drawable-hdpi/ic_ac_settings.png
deleted file mode 100644
index fbeb62be37..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_ac_settings.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_altitude.png b/OsmAnd/res/drawable-hdpi/ic_action_altitude.png
new file mode 100644
index 0000000000..43a9f8b8e6
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_action_altitude.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_car_light.png b/OsmAnd/res/drawable-hdpi/ic_action_car_light.png
deleted file mode 100644
index c563fb2cbe..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_car_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_close_light.png b/OsmAnd/res/drawable-hdpi/ic_action_close_light.png
deleted file mode 100644
index 033515a8cb..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_close_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_flag_light.png b/OsmAnd/res/drawable-hdpi/ic_action_flag_light.png
deleted file mode 100644
index a0dcd52862..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_flag_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_flage_light.png b/OsmAnd/res/drawable-hdpi/ic_action_flage_light.png
deleted file mode 100644
index 7f8b531ab0..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_flage_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_foot_light.png b/OsmAnd/res/drawable-hdpi/ic_action_foot_light.png
deleted file mode 100644
index c46ec83562..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_foot_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gabout_light.png b/OsmAnd/res/drawable-hdpi/ic_action_gabout_light.png
deleted file mode 100644
index 7c8bf76b29..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gabout_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gcall_light.png b/OsmAnd/res/drawable-hdpi/ic_action_gcall_light.png
deleted file mode 100644
index 92e81ec867..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gcall_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gdirections_light.png b/OsmAnd/res/drawable-hdpi/ic_action_gdirections_light.png
deleted file mode 100644
index ebfaf653eb..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gdirections_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gdiscard_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_gdiscard_dark.png
deleted file mode 100644
index 6d3ebd5391..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gdiscard_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gdiscard_light.png b/OsmAnd/res/drawable-hdpi/ic_action_gdiscard_light.png
deleted file mode 100644
index 6abcd9ef61..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gdiscard_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gfav_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_gfav_dark.png
deleted file mode 100644
index b3c423534a..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gfav_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gfav_light.png b/OsmAnd/res/drawable-hdpi/ic_action_gfav_light.png
deleted file mode 100644
index 81c699222c..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gfav_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_ghelp_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_ghelp_dark.png
deleted file mode 100644
index ff296848fb..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_ghelp_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_ghelp_light.png b/OsmAnd/res/drawable-hdpi/ic_action_ghelp_light.png
deleted file mode 100644
index 16fe91efa8..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_ghelp_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_glabel_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_glabel_dark.png
deleted file mode 100644
index d12909acf7..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_glabel_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_glabel_light.png b/OsmAnd/res/drawable-hdpi/ic_action_glabel_light.png
deleted file mode 100644
index b09586011d..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_glabel_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gps_info.png b/OsmAnd/res/drawable-hdpi/ic_action_gps_info.png
new file mode 100644
index 0000000000..d1a0d21a8e
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_action_gps_info.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gremove_light.png b/OsmAnd/res/drawable-hdpi/ic_action_gremove_light.png
deleted file mode 100644
index 7e38b57220..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gremove_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_grot_left_light.png b/OsmAnd/res/drawable-hdpi/ic_action_grot_left_light.png
deleted file mode 100644
index 38fefff1f1..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_grot_left_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_grot_right_light.png b/OsmAnd/res/drawable-hdpi/ic_action_grot_right_light.png
deleted file mode 100644
index ac0cb61e08..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_grot_right_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gsave_light.png b/OsmAnd/res/drawable-hdpi/ic_action_gsave_light.png
deleted file mode 100644
index dee6152107..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gsave_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gsearch_light.png b/OsmAnd/res/drawable-hdpi/ic_action_gsearch_light.png
deleted file mode 100644
index fc8eefde32..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gsearch_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gsettings_light.png b/OsmAnd/res/drawable-hdpi/ic_action_gsettings_light.png
deleted file mode 100644
index 8e30d967af..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gsettings_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gshare_light.png b/OsmAnd/res/drawable-hdpi/ic_action_gshare_light.png
deleted file mode 100644
index 7da4056ec9..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gshare_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gup_light.png b/OsmAnd/res/drawable-hdpi/ic_action_gup_light.png
deleted file mode 100644
index 98b021c7ee..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gup_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_intermediate.png b/OsmAnd/res/drawable-hdpi/ic_action_intermediate.png
new file mode 100644
index 0000000000..f0a437ff2c
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_action_intermediate.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_max_speed.png b/OsmAnd/res/drawable-hdpi/ic_action_max_speed.png
new file mode 100644
index 0000000000..c4da2b3232
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_action_max_speed.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_next_turn.png b/OsmAnd/res/drawable-hdpi/ic_action_next_turn.png
new file mode 100644
index 0000000000..e503119f9d
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_action_next_turn.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_photo_light.png b/OsmAnd/res/drawable-hdpi/ic_action_photo_light.png
deleted file mode 100644
index b9b0dda82d..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_photo_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_pin_light.png b/OsmAnd/res/drawable-hdpi/ic_action_pin_light.png
deleted file mode 100644
index c0905dad91..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_pin_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_play_light.png b/OsmAnd/res/drawable-hdpi/ic_action_play_light.png
deleted file mode 100644
index 3a691a6fe5..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_play_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_plus_light.png b/OsmAnd/res/drawable-hdpi/ic_action_plus_light.png
deleted file mode 100644
index 07b40677fe..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_plus_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_polygom_light.png b/OsmAnd/res/drawable-hdpi/ic_action_polygom_light.png
deleted file mode 100644
index 204e4215a7..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_polygom_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_quit_light.png b/OsmAnd/res/drawable-hdpi/ic_action_quit_light.png
deleted file mode 100644
index b71b512a04..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_quit_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_redo_light.png b/OsmAnd/res/drawable-hdpi/ic_action_redo_light.png
deleted file mode 100644
index 15e3622a2c..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_redo_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_refresh_light.png b/OsmAnd/res/drawable-hdpi/ic_action_refresh_light.png
deleted file mode 100644
index 174670e155..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_refresh_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_road_light.png b/OsmAnd/res/drawable-hdpi/ic_action_road_light.png
deleted file mode 100644
index 5525654806..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_road_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_road_works_light.png b/OsmAnd/res/drawable-hdpi/ic_action_road_works_light.png
deleted file mode 100644
index f9eadf7c8e..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_road_works_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_ruler_light.png b/OsmAnd/res/drawable-hdpi/ic_action_ruler_light.png
deleted file mode 100644
index b4486674cb..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_ruler_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_sail_boat_light.png b/OsmAnd/res/drawable-hdpi/ic_action_sail_boat_light.png
deleted file mode 100644
index 266ae3b625..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_sail_boat_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_search_light.png b/OsmAnd/res/drawable-hdpi/ic_action_search_light.png
deleted file mode 100644
index 5adc2459f7..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_search_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_settings2_light.png b/OsmAnd/res/drawable-hdpi/ic_action_settings2_light.png
deleted file mode 100644
index cbcbaf452c..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_settings2_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_signpost_light.png b/OsmAnd/res/drawable-hdpi/ic_action_signpost_light.png
deleted file mode 100644
index f750fdaf03..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_signpost_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_speed.png b/OsmAnd/res/drawable-hdpi/ic_action_speed.png
new file mode 100644
index 0000000000..3d5efa1f9f
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_action_speed.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_street_view_light.png b/OsmAnd/res/drawable-hdpi/ic_action_street_view_light.png
deleted file mode 100644
index 871854843c..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_street_view_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_target.png b/OsmAnd/res/drawable-hdpi/ic_action_target.png
new file mode 100644
index 0000000000..85b4f0212c
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_action_target.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_text_light.png b/OsmAnd/res/drawable-hdpi/ic_action_text_light.png
deleted file mode 100644
index 78a7c53905..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_text_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_time.png b/OsmAnd/res/drawable-hdpi/ic_action_time.png
new file mode 100644
index 0000000000..7fe237faa1
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_action_time.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_time_to_distance.png b/OsmAnd/res/drawable-hdpi/ic_action_time_to_distance.png
new file mode 100644
index 0000000000..dd73ddcb00
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_action_time_to_distance.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_trekking_light.png b/OsmAnd/res/drawable-hdpi/ic_action_trekking_light.png
deleted file mode 100644
index 7c2a857d0a..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_trekking_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_truck_light.png b/OsmAnd/res/drawable-hdpi/ic_action_truck_light.png
deleted file mode 100644
index 16b5bea8a9..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_truck_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_undo_light.png b/OsmAnd/res/drawable-hdpi/ic_action_undo_light.png
deleted file mode 100644
index 5eea77a984..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_undo_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_up_light.png b/OsmAnd/res/drawable-hdpi/ic_action_up_light.png
deleted file mode 100644
index 5b33826e55..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_up_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_video_light.png b/OsmAnd/res/drawable-hdpi/ic_action_video_light.png
deleted file mode 100644
index 31f9506eeb..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_video_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_wmap_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_wmap_dark.png
deleted file mode 100644
index 3166b8de78..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_wmap_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_wmap_light.png b/OsmAnd/res/drawable-hdpi/ic_action_wmap_light.png
deleted file mode 100644
index b3f3cbb7b7..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_wmap_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_configure_screen_light.png b/OsmAnd/res/drawable-hdpi/ic_configure_screen_light.png
deleted file mode 100644
index 9efca901c5..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_configure_screen_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_dashboard_light.png b/OsmAnd/res/drawable-hdpi/ic_dashboard_light.png
deleted file mode 100644
index b27be60ed7..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_dashboard_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_extension_light.png b/OsmAnd/res/drawable-hdpi/ic_extension_light.png
deleted file mode 100644
index 4d650905e1..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_extension_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_layer_bottom_light.png b/OsmAnd/res/drawable-hdpi/ic_layer_bottom_light.png
deleted file mode 100644
index a827212023..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_layer_bottom_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_layer_top_light.png b/OsmAnd/res/drawable-hdpi/ic_layer_top_light.png
deleted file mode 100644
index 1f21e3e38e..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_layer_top_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_osmo_light.png b/OsmAnd/res/drawable-hdpi/ic_osmo_light.png
deleted file mode 100644
index 024a0a16a2..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_osmo_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_play_light.png b/OsmAnd/res/drawable-hdpi/ic_play_light.png
deleted file mode 100644
index 39c080a9f4..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_play_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_world_globe_light.png b/OsmAnd/res/drawable-hdpi/ic_world_globe_light.png
deleted file mode 100644
index 25cdcb94da..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_world_globe_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/la_backtoloc_enabled.png b/OsmAnd/res/drawable-hdpi/la_backtoloc_enabled.png
deleted file mode 100644
index 11567f3e64..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/la_backtoloc_enabled.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/la_backtoloc_enabled_white.png b/OsmAnd/res/drawable-hdpi/la_backtoloc_enabled_white.png
deleted file mode 100644
index 62c934c3ad..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/la_backtoloc_enabled_white.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/la_backtoloc_tracked.png b/OsmAnd/res/drawable-hdpi/la_backtoloc_tracked.png
deleted file mode 100644
index 607bbc35bd..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/la_backtoloc_tracked.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/bt_round_1_shadow.png b/OsmAnd/res/drawable-hdpi/map_bt_round_1_shadow.png
similarity index 100%
rename from OsmAnd/res/drawable-hdpi/bt_round_1_shadow.png
rename to OsmAnd/res/drawable-hdpi/map_bt_round_1_shadow.png
diff --git a/OsmAnd/res/drawable-hdpi/bt_round_2_shadow.png b/OsmAnd/res/drawable-hdpi/map_bt_round_2_shadow.png
similarity index 100%
rename from OsmAnd/res/drawable-hdpi/bt_round_2_shadow.png
rename to OsmAnd/res/drawable-hdpi/map_bt_round_2_shadow.png
diff --git a/OsmAnd/res/drawable-hdpi/map_btn_cancel_o.png b/OsmAnd/res/drawable-hdpi/map_btn_cancel_o.png
deleted file mode 100644
index ddff6ccea2..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/map_btn_cancel_o.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/map_btn_cancel_p.png b/OsmAnd/res/drawable-hdpi/map_btn_cancel_p.png
deleted file mode 100644
index 7f4d171d32..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/map_btn_cancel_p.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/map_btn_hmenu_o.png b/OsmAnd/res/drawable-hdpi/map_btn_hmenu_o.png
deleted file mode 100644
index 0338eee326..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/map_btn_hmenu_o.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/map_btn_hmenu_p.png b/OsmAnd/res/drawable-hdpi/map_btn_hmenu_p.png
deleted file mode 100644
index d2fe88e7d1..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/map_btn_hmenu_p.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/map_btn_info_o.png b/OsmAnd/res/drawable-hdpi/map_btn_info_o.png
deleted file mode 100644
index b470fbf544..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/map_btn_info_o.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/map_btn_info_p.png b/OsmAnd/res/drawable-hdpi/map_btn_info_p.png
deleted file mode 100644
index 83e32a23f4..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/map_btn_info_p.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/map_btn_menu_o.png b/OsmAnd/res/drawable-hdpi/map_btn_menu_o.png
deleted file mode 100644
index dca9ec1d0d..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/map_btn_menu_o.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/map_btn_menu_p.png b/OsmAnd/res/drawable-hdpi/map_btn_menu_p.png
deleted file mode 100644
index 84f5222e10..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/map_btn_menu_p.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/map_btn_navigate_o.png b/OsmAnd/res/drawable-hdpi/map_btn_navigate_o.png
deleted file mode 100644
index 3d5c591dfb..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/map_btn_navigate_o.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/map_btn_navigate_p.png b/OsmAnd/res/drawable-hdpi/map_btn_navigate_p.png
deleted file mode 100644
index 0614f81f8d..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/map_btn_navigate_p.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/map_btn_ok_o.png b/OsmAnd/res/drawable-hdpi/map_btn_ok_o.png
deleted file mode 100644
index 6daf38f82b..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/map_btn_ok_o.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/map_btn_ok_p.png b/OsmAnd/res/drawable-hdpi/map_btn_ok_p.png
deleted file mode 100644
index 386683bd5f..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/map_btn_ok_p.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/map_btn_signpost_p.png b/OsmAnd/res/drawable-hdpi/map_btn_signpost_p.png
deleted file mode 100644
index 5573f531f5..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/map_btn_signpost_p.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_zoom_in.png b/OsmAnd/res/drawable-hdpi/map_zoom_in.png
similarity index 100%
rename from OsmAnd/res/drawable-hdpi/ic_action_zoom_in.png
rename to OsmAnd/res/drawable-hdpi/map_zoom_in.png
diff --git a/OsmAnd/res/drawable-hdpi/map_zoom_in_o.png b/OsmAnd/res/drawable-hdpi/map_zoom_in_o.png
deleted file mode 100644
index c8ec8bbb57..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/map_zoom_in_o.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/map_zoom_in_p.png b/OsmAnd/res/drawable-hdpi/map_zoom_in_p.png
deleted file mode 100644
index afec60184b..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/map_zoom_in_p.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_zoom_out.png b/OsmAnd/res/drawable-hdpi/map_zoom_out.png
similarity index 100%
rename from OsmAnd/res/drawable-hdpi/ic_action_zoom_out.png
rename to OsmAnd/res/drawable-hdpi/map_zoom_out.png
diff --git a/OsmAnd/res/drawable-hdpi/map_zoom_out_o.png b/OsmAnd/res/drawable-hdpi/map_zoom_out_o.png
deleted file mode 100644
index 4106a3ffbf..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/map_zoom_out_o.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/map_zoom_out_p.png b/OsmAnd/res/drawable-hdpi/map_zoom_out_p.png
deleted file mode 100644
index 0d0b577002..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/map_zoom_out_p.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/tab_icon_panel.png b/OsmAnd/res/drawable-hdpi/tab_icon_panel.png
deleted file mode 100644
index 51fe490516..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/tab_icon_panel.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/tab_icon_panel_pushed.9.png b/OsmAnd/res/drawable-hdpi/tab_icon_panel_pushed.9.png
deleted file mode 100644
index 8e86d0e6e2..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/tab_icon_panel_pushed.9.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/tab_icon_panel_pushed_line.png b/OsmAnd/res/drawable-hdpi/tab_icon_panel_pushed_line.png
deleted file mode 100644
index a67cf9175d..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/tab_icon_panel_pushed_line.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/tab_plugin_screen_icon.png b/OsmAnd/res/drawable-hdpi/tab_plugin_screen_icon.png
deleted file mode 100644
index 6ab9ec80ce..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/tab_plugin_screen_icon.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/tab_settings_screen_icon.png b/OsmAnd/res/drawable-hdpi/tab_settings_screen_icon.png
deleted file mode 100644
index 6ab9ec80ce..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/tab_settings_screen_icon.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/tab_text_separator.png b/OsmAnd/res/drawable-hdpi/tab_text_separator.png
deleted file mode 100644
index 903370a2e9..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/tab_text_separator.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_config_dark.png b/OsmAnd/res/drawable-hdpi/widget_config_dark.png
deleted file mode 100644
index 2ffe46589b..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_config_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_config_light.png b/OsmAnd/res/drawable-hdpi/widget_config_light.png
deleted file mode 100644
index 5ca33b93d5..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_config_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/zoom_background.9.png b/OsmAnd/res/drawable-hdpi/zoom_background.9.png
deleted file mode 100644
index 8244dcee75..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/zoom_background.9.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/bt_round_1_shadow.png b/OsmAnd/res/drawable-large-hdpi/map_bt_round_1_shadow.png
similarity index 100%
rename from OsmAnd/res/drawable-xhdpi/bt_round_1_shadow.png
rename to OsmAnd/res/drawable-large-hdpi/map_bt_round_1_shadow.png
diff --git a/OsmAnd/res/drawable-xhdpi/bt_round_2_shadow.png b/OsmAnd/res/drawable-large-hdpi/map_bt_round_2_shadow.png
similarity index 100%
rename from OsmAnd/res/drawable-xhdpi/bt_round_2_shadow.png
rename to OsmAnd/res/drawable-large-hdpi/map_bt_round_2_shadow.png
diff --git a/OsmAnd/res/drawable-large-hdpi/map_compass.png b/OsmAnd/res/drawable-large-hdpi/map_compass.png
new file mode 100644
index 0000000000..d953bc4d09
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_compass.png differ
diff --git a/OsmAnd/res/drawable-large-hdpi/map_compass_bearing.png b/OsmAnd/res/drawable-large-hdpi/map_compass_bearing.png
new file mode 100644
index 0000000000..ef302192a3
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_compass_bearing.png differ
diff --git a/OsmAnd/res/drawable-large-hdpi/map_compass_bearing_white.png b/OsmAnd/res/drawable-large-hdpi/map_compass_bearing_white.png
new file mode 100644
index 0000000000..d8d2dd9fa7
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_compass_bearing_white.png differ
diff --git a/OsmAnd/res/drawable-mdpi/la_backtoloc_tracked.png b/OsmAnd/res/drawable-large-hdpi/map_compass_niu.png
similarity index 50%
rename from OsmAnd/res/drawable-mdpi/la_backtoloc_tracked.png
rename to OsmAnd/res/drawable-large-hdpi/map_compass_niu.png
index 728cab0b10..05f8351357 100644
Binary files a/OsmAnd/res/drawable-mdpi/la_backtoloc_tracked.png and b/OsmAnd/res/drawable-large-hdpi/map_compass_niu.png differ
diff --git a/OsmAnd/res/drawable-large-hdpi/map_compass_niu_white.png b/OsmAnd/res/drawable-large-hdpi/map_compass_niu_white.png
new file mode 100644
index 0000000000..8d5dcf79fa
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_compass_niu_white.png differ
diff --git a/OsmAnd/res/drawable-large-hdpi/map_compass_white.png b/OsmAnd/res/drawable-large-hdpi/map_compass_white.png
new file mode 100644
index 0000000000..3752f958d7
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_compass_white.png differ
diff --git a/OsmAnd/res/drawable-large-hdpi/map_layers_black.png b/OsmAnd/res/drawable-large-hdpi/map_layers_black.png
new file mode 100644
index 0000000000..7c999d64ef
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_layers_black.png differ
diff --git a/OsmAnd/res/drawable-large-hdpi/map_layers_white.png b/OsmAnd/res/drawable-large-hdpi/map_layers_white.png
new file mode 100644
index 0000000000..8fcf6597cb
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_layers_white.png differ
diff --git a/OsmAnd/res/drawable-large-hdpi/map_magnifier.png b/OsmAnd/res/drawable-large-hdpi/map_magnifier.png
new file mode 100644
index 0000000000..8ef6a3567a
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_magnifier.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_zoom_in.png b/OsmAnd/res/drawable-large-hdpi/map_zoom_in.png
similarity index 100%
rename from OsmAnd/res/drawable-xhdpi/ic_action_zoom_in.png
rename to OsmAnd/res/drawable-large-hdpi/map_zoom_in.png
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_zoom_out.png b/OsmAnd/res/drawable-large-hdpi/map_zoom_out.png
similarity index 100%
rename from OsmAnd/res/drawable-xhdpi/ic_action_zoom_out.png
rename to OsmAnd/res/drawable-large-hdpi/map_zoom_out.png
diff --git a/OsmAnd/res/drawable-large-hdpi/widget_altitude.png b/OsmAnd/res/drawable-large-hdpi/widget_altitude.png
new file mode 100644
index 0000000000..661605292b
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/widget_altitude.png differ
diff --git a/OsmAnd/res/drawable-large-hdpi/widget_backtolocation_dark.png b/OsmAnd/res/drawable-large-hdpi/widget_backtolocation_dark.png
new file mode 100644
index 0000000000..9c5d73f4ef
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/widget_backtolocation_dark.png differ
diff --git a/OsmAnd/res/drawable-large-hdpi/widget_backtolocation_light.png b/OsmAnd/res/drawable-large-hdpi/widget_backtolocation_light.png
new file mode 100644
index 0000000000..35b85190a9
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/widget_backtolocation_light.png differ
diff --git a/OsmAnd/res/drawable-large-hdpi/widget_compass_dark.png b/OsmAnd/res/drawable-large-hdpi/widget_compass_dark.png
new file mode 100644
index 0000000000..5fb21bb0a3
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/widget_compass_dark.png differ
diff --git a/OsmAnd/res/drawable-large-hdpi/widget_compass_light.png b/OsmAnd/res/drawable-large-hdpi/widget_compass_light.png
new file mode 100644
index 0000000000..af1f1e4903
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/widget_compass_light.png differ
diff --git a/OsmAnd/res/drawable-large-hdpi/widget_distance.png b/OsmAnd/res/drawable-large-hdpi/widget_distance.png
new file mode 100644
index 0000000000..1cddc341d8
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/widget_distance.png differ
diff --git a/OsmAnd/res/drawable-large-hdpi/widget_gps_info.png b/OsmAnd/res/drawable-large-hdpi/widget_gps_info.png
new file mode 100644
index 0000000000..ffc7e087bf
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/widget_gps_info.png differ
diff --git a/OsmAnd/res/drawable-large-hdpi/widget_layer_dark.png b/OsmAnd/res/drawable-large-hdpi/widget_layer_dark.png
new file mode 100644
index 0000000000..77fd4ab88e
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/widget_layer_dark.png differ
diff --git a/OsmAnd/res/drawable-large-hdpi/widget_layer_light.png b/OsmAnd/res/drawable-large-hdpi/widget_layer_light.png
new file mode 100644
index 0000000000..dd086f09f2
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/widget_layer_light.png differ
diff --git a/OsmAnd/res/drawable-large-hdpi/widget_lock_screen_dark.png b/OsmAnd/res/drawable-large-hdpi/widget_lock_screen_dark.png
new file mode 100644
index 0000000000..d1b68137af
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/widget_lock_screen_dark.png differ
diff --git a/OsmAnd/res/drawable-large-hdpi/widget_lock_screen_light.png b/OsmAnd/res/drawable-large-hdpi/widget_lock_screen_light.png
new file mode 100644
index 0000000000..761eb985b3
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/widget_lock_screen_light.png differ
diff --git a/OsmAnd/res/drawable-large-hdpi/widget_reset_to_default_dark.png b/OsmAnd/res/drawable-large-hdpi/widget_reset_to_default_dark.png
new file mode 100644
index 0000000000..39f1c8ccf2
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/widget_reset_to_default_dark.png differ
diff --git a/OsmAnd/res/drawable-large-hdpi/widget_reset_to_default_light.png b/OsmAnd/res/drawable-large-hdpi/widget_reset_to_default_light.png
new file mode 100644
index 0000000000..687def40f9
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/widget_reset_to_default_light.png differ
diff --git a/OsmAnd/res/drawable-large-hdpi/widget_signpost.png b/OsmAnd/res/drawable-large-hdpi/widget_signpost.png
new file mode 100644
index 0000000000..59685418b5
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/widget_signpost.png differ
diff --git a/OsmAnd/res/drawable-large-hdpi/widget_speed.png b/OsmAnd/res/drawable-large-hdpi/widget_speed.png
new file mode 100644
index 0000000000..8231d72e64
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/widget_speed.png differ
diff --git a/OsmAnd/res/drawable-large-hdpi/widget_target.png b/OsmAnd/res/drawable-large-hdpi/widget_target.png
new file mode 100644
index 0000000000..183f5ff281
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/widget_target.png differ
diff --git a/OsmAnd/res/drawable-large-hdpi/widget_time.png b/OsmAnd/res/drawable-large-hdpi/widget_time.png
new file mode 100644
index 0000000000..46925feaf4
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/widget_time.png differ
diff --git a/OsmAnd/res/drawable-large-hdpi/widget_time_to_distance.png b/OsmAnd/res/drawable-large-hdpi/widget_time_to_distance.png
new file mode 100644
index 0000000000..d2985f11e1
Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/widget_time_to_distance.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/bt_round_1_shadow.png b/OsmAnd/res/drawable-large-xhdpi/map_bt_round_1_shadow.png
similarity index 100%
rename from OsmAnd/res/drawable-xxhdpi/bt_round_1_shadow.png
rename to OsmAnd/res/drawable-large-xhdpi/map_bt_round_1_shadow.png
diff --git a/OsmAnd/res/drawable-xxhdpi/bt_round_2_shadow.png b/OsmAnd/res/drawable-large-xhdpi/map_bt_round_2_shadow.png
similarity index 100%
rename from OsmAnd/res/drawable-xxhdpi/bt_round_2_shadow.png
rename to OsmAnd/res/drawable-large-xhdpi/map_bt_round_2_shadow.png
diff --git a/OsmAnd/res/drawable-large-xhdpi/map_compass.png b/OsmAnd/res/drawable-large-xhdpi/map_compass.png
new file mode 100644
index 0000000000..f6ab0bcc4f
Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/map_compass.png differ
diff --git a/OsmAnd/res/drawable-large-xhdpi/map_compass_bearing.png b/OsmAnd/res/drawable-large-xhdpi/map_compass_bearing.png
new file mode 100644
index 0000000000..639449d194
Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/map_compass_bearing.png differ
diff --git a/OsmAnd/res/drawable-large-xhdpi/map_compass_bearing_white.png b/OsmAnd/res/drawable-large-xhdpi/map_compass_bearing_white.png
new file mode 100644
index 0000000000..ec3ad49afd
Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/map_compass_bearing_white.png differ
diff --git a/OsmAnd/res/drawable-large-xhdpi/map_compass_niu.png b/OsmAnd/res/drawable-large-xhdpi/map_compass_niu.png
new file mode 100644
index 0000000000..1e039c7f47
Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/map_compass_niu.png differ
diff --git a/OsmAnd/res/drawable-large-xhdpi/map_compass_niu_white.png b/OsmAnd/res/drawable-large-xhdpi/map_compass_niu_white.png
new file mode 100644
index 0000000000..8c954c1a42
Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/map_compass_niu_white.png differ
diff --git a/OsmAnd/res/drawable-large-xhdpi/map_compass_white.png b/OsmAnd/res/drawable-large-xhdpi/map_compass_white.png
new file mode 100644
index 0000000000..0cba24e521
Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/map_compass_white.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_zoom_in.png b/OsmAnd/res/drawable-large-xhdpi/map_zoom_in.png
similarity index 100%
rename from OsmAnd/res/drawable-xxhdpi/ic_action_zoom_in.png
rename to OsmAnd/res/drawable-large-xhdpi/map_zoom_in.png
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_zoom_out.png b/OsmAnd/res/drawable-large-xhdpi/map_zoom_out.png
similarity index 100%
rename from OsmAnd/res/drawable-xxhdpi/ic_action_zoom_out.png
rename to OsmAnd/res/drawable-large-xhdpi/map_zoom_out.png
diff --git a/OsmAnd/res/drawable-large-xhdpi/widget_altitude.png b/OsmAnd/res/drawable-large-xhdpi/widget_altitude.png
new file mode 100644
index 0000000000..bd013ee05f
Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/widget_altitude.png differ
diff --git a/OsmAnd/res/drawable-large-xhdpi/widget_backtolocation_dark.png b/OsmAnd/res/drawable-large-xhdpi/widget_backtolocation_dark.png
new file mode 100644
index 0000000000..3ede22f80f
Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/widget_backtolocation_dark.png differ
diff --git a/OsmAnd/res/drawable-large-xhdpi/widget_backtolocation_light.png b/OsmAnd/res/drawable-large-xhdpi/widget_backtolocation_light.png
new file mode 100644
index 0000000000..b4dcc82978
Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/widget_backtolocation_light.png differ
diff --git a/OsmAnd/res/drawable-large-xhdpi/widget_compass_dark.png b/OsmAnd/res/drawable-large-xhdpi/widget_compass_dark.png
new file mode 100644
index 0000000000..9c02a647b4
Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/widget_compass_dark.png differ
diff --git a/OsmAnd/res/drawable-large-xhdpi/widget_compass_light.png b/OsmAnd/res/drawable-large-xhdpi/widget_compass_light.png
new file mode 100644
index 0000000000..183682f2de
Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/widget_compass_light.png differ
diff --git a/OsmAnd/res/drawable-large-xhdpi/widget_distance.png b/OsmAnd/res/drawable-large-xhdpi/widget_distance.png
new file mode 100644
index 0000000000..1a5b242201
Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/widget_distance.png differ
diff --git a/OsmAnd/res/drawable-large-xhdpi/widget_gps_info.png b/OsmAnd/res/drawable-large-xhdpi/widget_gps_info.png
new file mode 100644
index 0000000000..29fa12fa61
Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/widget_gps_info.png differ
diff --git a/OsmAnd/res/drawable-large-xhdpi/widget_layer_dark.png b/OsmAnd/res/drawable-large-xhdpi/widget_layer_dark.png
new file mode 100644
index 0000000000..9aa06389f9
Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/widget_layer_dark.png differ
diff --git a/OsmAnd/res/drawable-large-xhdpi/widget_layer_light.png b/OsmAnd/res/drawable-large-xhdpi/widget_layer_light.png
new file mode 100644
index 0000000000..c4b0e60a3a
Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/widget_layer_light.png differ
diff --git a/OsmAnd/res/drawable-large-xhdpi/widget_lock_screen_dark.png b/OsmAnd/res/drawable-large-xhdpi/widget_lock_screen_dark.png
new file mode 100644
index 0000000000..7b4d6c0fd5
Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/widget_lock_screen_dark.png differ
diff --git a/OsmAnd/res/drawable-large-xhdpi/widget_lock_screen_light.png b/OsmAnd/res/drawable-large-xhdpi/widget_lock_screen_light.png
new file mode 100644
index 0000000000..51875ee8eb
Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/widget_lock_screen_light.png differ
diff --git a/OsmAnd/res/drawable-large-xhdpi/widget_reset_to_default_dark.png b/OsmAnd/res/drawable-large-xhdpi/widget_reset_to_default_dark.png
new file mode 100644
index 0000000000..314632992d
Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/widget_reset_to_default_dark.png differ
diff --git a/OsmAnd/res/drawable-large-xhdpi/widget_reset_to_default_light.png b/OsmAnd/res/drawable-large-xhdpi/widget_reset_to_default_light.png
new file mode 100644
index 0000000000..98290c38d4
Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/widget_reset_to_default_light.png differ
diff --git a/OsmAnd/res/drawable-large-xhdpi/widget_signpost.png b/OsmAnd/res/drawable-large-xhdpi/widget_signpost.png
new file mode 100644
index 0000000000..71b6b8d566
Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/widget_signpost.png differ
diff --git a/OsmAnd/res/drawable-large-xhdpi/widget_speed.png b/OsmAnd/res/drawable-large-xhdpi/widget_speed.png
new file mode 100644
index 0000000000..aa69a709a5
Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/widget_speed.png differ
diff --git a/OsmAnd/res/drawable-large-xhdpi/widget_target.png b/OsmAnd/res/drawable-large-xhdpi/widget_target.png
new file mode 100644
index 0000000000..061e28887b
Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/widget_target.png differ
diff --git a/OsmAnd/res/drawable-large-xhdpi/widget_time.png b/OsmAnd/res/drawable-large-xhdpi/widget_time.png
new file mode 100644
index 0000000000..fb2fb48869
Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/widget_time.png differ
diff --git a/OsmAnd/res/drawable-large-xhdpi/widget_time_to_distance.png b/OsmAnd/res/drawable-large-xhdpi/widget_time_to_distance.png
new file mode 100644
index 0000000000..e829179a1d
Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/widget_time_to_distance.png differ
diff --git a/OsmAnd/res/drawable-large/map_bt_round_1_shadow.png b/OsmAnd/res/drawable-large/map_bt_round_1_shadow.png
new file mode 100644
index 0000000000..159d4c08b5
Binary files /dev/null and b/OsmAnd/res/drawable-large/map_bt_round_1_shadow.png differ
diff --git a/OsmAnd/res/drawable-large/map_bt_round_2_shadow.png b/OsmAnd/res/drawable-large/map_bt_round_2_shadow.png
new file mode 100644
index 0000000000..38e96be167
Binary files /dev/null and b/OsmAnd/res/drawable-large/map_bt_round_2_shadow.png differ
diff --git a/OsmAnd/res/drawable-mdpi/tab_text_separator.png b/OsmAnd/res/drawable-large/map_btn_plain_o.png
similarity index 67%
rename from OsmAnd/res/drawable-mdpi/tab_text_separator.png
rename to OsmAnd/res/drawable-large/map_btn_plain_o.png
index 1f75a58266..26e933f848 100644
Binary files a/OsmAnd/res/drawable-mdpi/tab_text_separator.png and b/OsmAnd/res/drawable-large/map_btn_plain_o.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_btn_signpost_o.png b/OsmAnd/res/drawable-large/map_btn_plain_p.png
similarity index 64%
rename from OsmAnd/res/drawable-hdpi/map_btn_signpost_o.png
rename to OsmAnd/res/drawable-large/map_btn_plain_p.png
index 8f0214ace6..657cf8d82a 100644
Binary files a/OsmAnd/res/drawable-hdpi/map_btn_signpost_o.png and b/OsmAnd/res/drawable-large/map_btn_plain_p.png differ
diff --git a/OsmAnd/res/drawable-hdpi/la_backtoloc_disabled.png b/OsmAnd/res/drawable-large/map_compass.png
similarity index 51%
rename from OsmAnd/res/drawable-hdpi/la_backtoloc_disabled.png
rename to OsmAnd/res/drawable-large/map_compass.png
index dabfb4835c..e852a4db1d 100644
Binary files a/OsmAnd/res/drawable-hdpi/la_backtoloc_disabled.png and b/OsmAnd/res/drawable-large/map_compass.png differ
diff --git a/OsmAnd/res/drawable-large/map_compass_bearing.png b/OsmAnd/res/drawable-large/map_compass_bearing.png
new file mode 100644
index 0000000000..525fec8476
Binary files /dev/null and b/OsmAnd/res/drawable-large/map_compass_bearing.png differ
diff --git a/OsmAnd/res/drawable-large/map_compass_bearing_white.png b/OsmAnd/res/drawable-large/map_compass_bearing_white.png
new file mode 100644
index 0000000000..dff3bbb54a
Binary files /dev/null and b/OsmAnd/res/drawable-large/map_compass_bearing_white.png differ
diff --git a/OsmAnd/res/drawable-mdpi/la_backtoloc_enabled_white.png b/OsmAnd/res/drawable-large/map_compass_niu.png
similarity index 52%
rename from OsmAnd/res/drawable-mdpi/la_backtoloc_enabled_white.png
rename to OsmAnd/res/drawable-large/map_compass_niu.png
index 354001b060..3ae3157990 100644
Binary files a/OsmAnd/res/drawable-mdpi/la_backtoloc_enabled_white.png and b/OsmAnd/res/drawable-large/map_compass_niu.png differ
diff --git a/OsmAnd/res/drawable-large/map_compass_niu_template.png b/OsmAnd/res/drawable-large/map_compass_niu_template.png
new file mode 100644
index 0000000000..1297b4378c
Binary files /dev/null and b/OsmAnd/res/drawable-large/map_compass_niu_template.png differ
diff --git a/OsmAnd/res/drawable-mdpi/la_backtoloc_disabled.png b/OsmAnd/res/drawable-large/map_compass_niu_white.png
similarity index 51%
rename from OsmAnd/res/drawable-mdpi/la_backtoloc_disabled.png
rename to OsmAnd/res/drawable-large/map_compass_niu_white.png
index a22621ad7b..d8091994d8 100644
Binary files a/OsmAnd/res/drawable-mdpi/la_backtoloc_disabled.png and b/OsmAnd/res/drawable-large/map_compass_niu_white.png differ
diff --git a/OsmAnd/res/drawable-large/map_compass_niu_white_template.png b/OsmAnd/res/drawable-large/map_compass_niu_white_template.png
new file mode 100644
index 0000000000..9b0a2cbc3a
Binary files /dev/null and b/OsmAnd/res/drawable-large/map_compass_niu_white_template.png differ
diff --git a/OsmAnd/res/drawable-large/map_compass_white.png b/OsmAnd/res/drawable-large/map_compass_white.png
new file mode 100644
index 0000000000..89792f78b9
Binary files /dev/null and b/OsmAnd/res/drawable-large/map_compass_white.png differ
diff --git a/OsmAnd/res/drawable-large/map_config.png b/OsmAnd/res/drawable-large/map_config.png
new file mode 100644
index 0000000000..f1365980d7
Binary files /dev/null and b/OsmAnd/res/drawable-large/map_config.png differ
diff --git a/OsmAnd/res/drawable-large/map_config_white.png b/OsmAnd/res/drawable-large/map_config_white.png
new file mode 100644
index 0000000000..d25308159e
Binary files /dev/null and b/OsmAnd/res/drawable-large/map_config_white.png differ
diff --git a/OsmAnd/res/drawable-large/map_globus.png b/OsmAnd/res/drawable-large/map_globus.png
new file mode 100644
index 0000000000..850f27cb72
Binary files /dev/null and b/OsmAnd/res/drawable-large/map_globus.png differ
diff --git a/OsmAnd/res/drawable-large/map_globus_white.png b/OsmAnd/res/drawable-large/map_globus_white.png
new file mode 100644
index 0000000000..3c00630fe5
Binary files /dev/null and b/OsmAnd/res/drawable-large/map_globus_white.png differ
diff --git a/OsmAnd/res/drawable-large/map_layers_black.png b/OsmAnd/res/drawable-large/map_layers_black.png
new file mode 100644
index 0000000000..a3ccc703e5
Binary files /dev/null and b/OsmAnd/res/drawable-large/map_layers_black.png differ
diff --git a/OsmAnd/res/drawable-large/map_layers_white.png b/OsmAnd/res/drawable-large/map_layers_white.png
new file mode 100644
index 0000000000..220c4f973a
Binary files /dev/null and b/OsmAnd/res/drawable-large/map_layers_white.png differ
diff --git a/OsmAnd/res/drawable-large/map_magnifier.png b/OsmAnd/res/drawable-large/map_magnifier.png
new file mode 100644
index 0000000000..9b509ad036
Binary files /dev/null and b/OsmAnd/res/drawable-large/map_magnifier.png differ
diff --git a/OsmAnd/res/drawable-large/map_monitoring.png b/OsmAnd/res/drawable-large/map_monitoring.png
new file mode 100644
index 0000000000..37525a18fe
Binary files /dev/null and b/OsmAnd/res/drawable-large/map_monitoring.png differ
diff --git a/OsmAnd/res/drawable-large/map_monitoring_white.png b/OsmAnd/res/drawable-large/map_monitoring_white.png
new file mode 100644
index 0000000000..41718507d7
Binary files /dev/null and b/OsmAnd/res/drawable-large/map_monitoring_white.png differ
diff --git a/OsmAnd/res/drawable-large/map_note_audio.png b/OsmAnd/res/drawable-large/map_note_audio.png
new file mode 100644
index 0000000000..871ebf7635
Binary files /dev/null and b/OsmAnd/res/drawable-large/map_note_audio.png differ
diff --git a/OsmAnd/res/drawable-large/map_note_photo.png b/OsmAnd/res/drawable-large/map_note_photo.png
new file mode 100644
index 0000000000..e8dd083904
Binary files /dev/null and b/OsmAnd/res/drawable-large/map_note_photo.png differ
diff --git a/OsmAnd/res/drawable-large/map_note_video.png b/OsmAnd/res/drawable-large/map_note_video.png
new file mode 100644
index 0000000000..6fd6304d57
Binary files /dev/null and b/OsmAnd/res/drawable-large/map_note_video.png differ
diff --git a/OsmAnd/res/drawable-large/map_pin_destination.png b/OsmAnd/res/drawable-large/map_pin_destination.png
new file mode 100644
index 0000000000..0a3f498ed4
Binary files /dev/null and b/OsmAnd/res/drawable-large/map_pin_destination.png differ
diff --git a/OsmAnd/res/drawable-large/map_pin_origin.png b/OsmAnd/res/drawable-large/map_pin_origin.png
new file mode 100644
index 0000000000..5d6dce52eb
Binary files /dev/null and b/OsmAnd/res/drawable-large/map_pin_origin.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gprint_light.png b/OsmAnd/res/drawable-large/map_zoom_in.png
similarity index 69%
rename from OsmAnd/res/drawable-hdpi/ic_action_gprint_light.png
rename to OsmAnd/res/drawable-large/map_zoom_in.png
index 7ca43b39d6..d91ac71e25 100644
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gprint_light.png and b/OsmAnd/res/drawable-large/map_zoom_in.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gprint_light.png b/OsmAnd/res/drawable-large/map_zoom_out.png
similarity index 67%
rename from OsmAnd/res/drawable-mdpi/ic_action_gprint_light.png
rename to OsmAnd/res/drawable-large/map_zoom_out.png
index 8b3c02b232..10160b0ef5 100644
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gprint_light.png and b/OsmAnd/res/drawable-large/map_zoom_out.png differ
diff --git a/OsmAnd/res/drawable-large/widget_config_dark.png b/OsmAnd/res/drawable-large/widget_config_dark.png
deleted file mode 100644
index 2ffe46589b..0000000000
Binary files a/OsmAnd/res/drawable-large/widget_config_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-large/widget_config_light.png b/OsmAnd/res/drawable-large/widget_config_light.png
deleted file mode 100644
index 5ca33b93d5..0000000000
Binary files a/OsmAnd/res/drawable-large/widget_config_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-ldpi/bg_left_pushed.9.png b/OsmAnd/res/drawable-ldpi/bg_left_pushed.9.png
deleted file mode 100644
index 8c27dac158..0000000000
Binary files a/OsmAnd/res/drawable-ldpi/bg_left_pushed.9.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-ldpi/bg_left_simple.9.png b/OsmAnd/res/drawable-ldpi/bg_left_simple.9.png
deleted file mode 100644
index 9f26a729f7..0000000000
Binary files a/OsmAnd/res/drawable-ldpi/bg_left_simple.9.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-ldpi/bg_leftr_pushed.9.png b/OsmAnd/res/drawable-ldpi/bg_leftr_pushed.9.png
deleted file mode 100644
index ab7b5fd328..0000000000
Binary files a/OsmAnd/res/drawable-ldpi/bg_leftr_pushed.9.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-ldpi/bg_leftr_simple.9.png b/OsmAnd/res/drawable-ldpi/bg_leftr_simple.9.png
deleted file mode 100644
index d9059ea8e9..0000000000
Binary files a/OsmAnd/res/drawable-ldpi/bg_leftr_simple.9.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-ldpi/bg_right_pushed.9.png b/OsmAnd/res/drawable-ldpi/bg_right_pushed.9.png
deleted file mode 100644
index 0d840db46f..0000000000
Binary files a/OsmAnd/res/drawable-ldpi/bg_right_pushed.9.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-ldpi/bg_right_simple.9.png b/OsmAnd/res/drawable-ldpi/bg_right_simple.9.png
deleted file mode 100644
index e4ed07169d..0000000000
Binary files a/OsmAnd/res/drawable-ldpi/bg_right_simple.9.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-ldpi/bg_rightr_pushed.9.png b/OsmAnd/res/drawable-ldpi/bg_rightr_pushed.9.png
deleted file mode 100644
index 9af0a42825..0000000000
Binary files a/OsmAnd/res/drawable-ldpi/bg_rightr_pushed.9.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-ldpi/bg_rightr_simple.9.png b/OsmAnd/res/drawable-ldpi/bg_rightr_simple.9.png
deleted file mode 100644
index 789129b1ac..0000000000
Binary files a/OsmAnd/res/drawable-ldpi/bg_rightr_simple.9.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-ldpi/zoom_background.9.png b/OsmAnd/res/drawable-ldpi/zoom_background.9.png
deleted file mode 100644
index 6f793b2ed8..0000000000
Binary files a/OsmAnd/res/drawable-ldpi/zoom_background.9.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/bg_left_pushed.9.png b/OsmAnd/res/drawable-mdpi/bg_left_pushed.9.png
deleted file mode 100644
index 8c27dac158..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/bg_left_pushed.9.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/bg_left_simple.9.png b/OsmAnd/res/drawable-mdpi/bg_left_simple.9.png
deleted file mode 100644
index 1f5403ca73..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/bg_left_simple.9.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/bg_leftr_pushed.9.png b/OsmAnd/res/drawable-mdpi/bg_leftr_pushed.9.png
deleted file mode 100644
index 690d2dc47c..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/bg_leftr_pushed.9.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/bg_leftr_simple.9.png b/OsmAnd/res/drawable-mdpi/bg_leftr_simple.9.png
deleted file mode 100644
index 42e343bd80..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/bg_leftr_simple.9.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/bg_right_pushed.9.png b/OsmAnd/res/drawable-mdpi/bg_right_pushed.9.png
deleted file mode 100644
index 0d840db46f..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/bg_right_pushed.9.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/bg_right_simple.9.png b/OsmAnd/res/drawable-mdpi/bg_right_simple.9.png
deleted file mode 100644
index fd76ae0651..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/bg_right_simple.9.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/bg_rightr_pushed.9.png b/OsmAnd/res/drawable-mdpi/bg_rightr_pushed.9.png
deleted file mode 100644
index 6b569c097e..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/bg_rightr_pushed.9.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/bg_rightr_simple.9.png b/OsmAnd/res/drawable-mdpi/bg_rightr_simple.9.png
deleted file mode 100644
index 3a8a28e84a..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/bg_rightr_simple.9.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_ac_close.png b/OsmAnd/res/drawable-mdpi/ic_ac_close.png
deleted file mode 100644
index bd30cd0c92..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_ac_close.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_ac_help.png b/OsmAnd/res/drawable-mdpi/ic_ac_help.png
deleted file mode 100644
index 8341644395..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_ac_help.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_ac_settings.png b/OsmAnd/res/drawable-mdpi/ic_ac_settings.png
deleted file mode 100644
index ff2c85b734..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_ac_settings.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_car_light.png b/OsmAnd/res/drawable-mdpi/ic_action_car_light.png
deleted file mode 100644
index d0e0d292e0..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_car_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_close_light.png b/OsmAnd/res/drawable-mdpi/ic_action_close_light.png
deleted file mode 100644
index b186ec4c56..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_close_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_flag_light.png b/OsmAnd/res/drawable-mdpi/ic_action_flag_light.png
deleted file mode 100644
index c65c7389e3..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_flag_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_flage_light.png b/OsmAnd/res/drawable-mdpi/ic_action_flage_light.png
deleted file mode 100644
index 78c855f4de..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_flage_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_foot_light.png b/OsmAnd/res/drawable-mdpi/ic_action_foot_light.png
deleted file mode 100644
index 434beca03a..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_foot_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gabout_light.png b/OsmAnd/res/drawable-mdpi/ic_action_gabout_light.png
deleted file mode 100644
index 19c9245f5a..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gabout_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gcall_light.png b/OsmAnd/res/drawable-mdpi/ic_action_gcall_light.png
deleted file mode 100644
index 895ffefdc3..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gcall_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gdirections_light.png b/OsmAnd/res/drawable-mdpi/ic_action_gdirections_light.png
deleted file mode 100644
index cbcbd37aa6..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gdirections_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gdiscard_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_gdiscard_dark.png
deleted file mode 100644
index d1c6a39a6b..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gdiscard_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gdiscard_light.png b/OsmAnd/res/drawable-mdpi/ic_action_gdiscard_light.png
deleted file mode 100644
index 93483b6cb1..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gdiscard_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gfav_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_gfav_dark.png
deleted file mode 100644
index 81ca73efbe..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gfav_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gfav_light.png b/OsmAnd/res/drawable-mdpi/ic_action_gfav_light.png
deleted file mode 100644
index 4709b15f9a..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gfav_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_ghelp_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_ghelp_dark.png
deleted file mode 100644
index 45eb4c390c..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_ghelp_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_ghelp_light.png b/OsmAnd/res/drawable-mdpi/ic_action_ghelp_light.png
deleted file mode 100644
index c6a0811e2c..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_ghelp_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_glabel_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_glabel_dark.png
deleted file mode 100644
index ae5aa8beee..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_glabel_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_glabel_light.png b/OsmAnd/res/drawable-mdpi/ic_action_glabel_light.png
deleted file mode 100644
index e1624220ef..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_glabel_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gremove_light.png b/OsmAnd/res/drawable-mdpi/ic_action_gremove_light.png
deleted file mode 100644
index b4378671c1..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gremove_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_grot_left_light.png b/OsmAnd/res/drawable-mdpi/ic_action_grot_left_light.png
deleted file mode 100644
index 8a5ebaccf0..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_grot_left_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_grot_right_light.png b/OsmAnd/res/drawable-mdpi/ic_action_grot_right_light.png
deleted file mode 100644
index 646a57f645..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_grot_right_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gsearch_light.png b/OsmAnd/res/drawable-mdpi/ic_action_gsearch_light.png
deleted file mode 100644
index 026c8498fd..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gsearch_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gsettings_light.png b/OsmAnd/res/drawable-mdpi/ic_action_gsettings_light.png
deleted file mode 100644
index 0e65c68243..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gsettings_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gshare_light.png b/OsmAnd/res/drawable-mdpi/ic_action_gshare_light.png
deleted file mode 100644
index 06070f59cd..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gshare_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gup_light.png b/OsmAnd/res/drawable-mdpi/ic_action_gup_light.png
deleted file mode 100644
index 19b229d1dc..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gup_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_photo_light.png b/OsmAnd/res/drawable-mdpi/ic_action_photo_light.png
deleted file mode 100644
index a6b8ae52a5..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_photo_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_pin_light.png b/OsmAnd/res/drawable-mdpi/ic_action_pin_light.png
deleted file mode 100644
index 84687f0bae..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_pin_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_play_light.png b/OsmAnd/res/drawable-mdpi/ic_action_play_light.png
deleted file mode 100644
index 90ad3f3d3f..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_play_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_plus_light.png b/OsmAnd/res/drawable-mdpi/ic_action_plus_light.png
deleted file mode 100644
index 53425e535c..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_plus_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_polygom_light.png b/OsmAnd/res/drawable-mdpi/ic_action_polygom_light.png
deleted file mode 100644
index 0490e00199..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_polygom_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_quit_light.png b/OsmAnd/res/drawable-mdpi/ic_action_quit_light.png
deleted file mode 100644
index d73d8be392..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_quit_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_redo_light.png b/OsmAnd/res/drawable-mdpi/ic_action_redo_light.png
deleted file mode 100644
index 276cb5c6e2..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_redo_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_refresh_light.png b/OsmAnd/res/drawable-mdpi/ic_action_refresh_light.png
deleted file mode 100644
index 3f287b5cb1..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_refresh_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_road_light.png b/OsmAnd/res/drawable-mdpi/ic_action_road_light.png
deleted file mode 100644
index cd7e37d031..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_road_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_road_works_light.png b/OsmAnd/res/drawable-mdpi/ic_action_road_works_light.png
deleted file mode 100644
index 469b8ca4dc..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_road_works_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_ruler_light.png b/OsmAnd/res/drawable-mdpi/ic_action_ruler_light.png
deleted file mode 100644
index c6f331744a..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_ruler_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_sail_boat_light.png b/OsmAnd/res/drawable-mdpi/ic_action_sail_boat_light.png
deleted file mode 100644
index 5d667cb882..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_sail_boat_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_search_light.png b/OsmAnd/res/drawable-mdpi/ic_action_search_light.png
deleted file mode 100644
index adab48c9c5..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_search_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_settings2_light.png b/OsmAnd/res/drawable-mdpi/ic_action_settings2_light.png
deleted file mode 100644
index ab26db2b18..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_settings2_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_signpost_light.png b/OsmAnd/res/drawable-mdpi/ic_action_signpost_light.png
deleted file mode 100644
index 25f97a314a..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_signpost_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_street_view_light.png b/OsmAnd/res/drawable-mdpi/ic_action_street_view_light.png
deleted file mode 100644
index 89ce6e6f20..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_street_view_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_text_light.png b/OsmAnd/res/drawable-mdpi/ic_action_text_light.png
deleted file mode 100644
index 0af41a9f4b..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_text_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_trekking_light.png b/OsmAnd/res/drawable-mdpi/ic_action_trekking_light.png
deleted file mode 100644
index 65df95be31..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_trekking_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_truck_light.png b/OsmAnd/res/drawable-mdpi/ic_action_truck_light.png
deleted file mode 100644
index 49640f0104..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_truck_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_undo_light.png b/OsmAnd/res/drawable-mdpi/ic_action_undo_light.png
deleted file mode 100644
index 7934577408..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_undo_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_up_light.png b/OsmAnd/res/drawable-mdpi/ic_action_up_light.png
deleted file mode 100644
index 410deff9d6..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_up_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_video_light.png b/OsmAnd/res/drawable-mdpi/ic_action_video_light.png
deleted file mode 100644
index 39a1902789..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_video_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_wmap_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_wmap_dark.png
deleted file mode 100644
index facac94afc..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_wmap_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_wmap_light.png b/OsmAnd/res/drawable-mdpi/ic_action_wmap_light.png
deleted file mode 100644
index 4a7a7d6a34..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_wmap_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_configure_screen_light.png b/OsmAnd/res/drawable-mdpi/ic_configure_screen_light.png
deleted file mode 100644
index 3bede31974..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_configure_screen_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_dashboard_light.png b/OsmAnd/res/drawable-mdpi/ic_dashboard_light.png
deleted file mode 100644
index 2035959152..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_dashboard_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_extension_light.png b/OsmAnd/res/drawable-mdpi/ic_extension_light.png
deleted file mode 100644
index 8ec55757b6..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_extension_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_layer_bottom_light.png b/OsmAnd/res/drawable-mdpi/ic_layer_bottom_light.png
deleted file mode 100644
index fe5877c5bd..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_layer_bottom_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_layer_top_light.png b/OsmAnd/res/drawable-mdpi/ic_layer_top_light.png
deleted file mode 100644
index 97db9f17eb..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_layer_top_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_osmo_light.png b/OsmAnd/res/drawable-mdpi/ic_osmo_light.png
deleted file mode 100644
index e10cc8b01f..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_osmo_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_play_light.png b/OsmAnd/res/drawable-mdpi/ic_play_light.png
deleted file mode 100644
index 448a290591..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_play_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_world_globe_light.png b/OsmAnd/res/drawable-mdpi/ic_world_globe_light.png
deleted file mode 100644
index d4ce88f6d8..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_world_globe_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/la_backtoloc_enabled.png b/OsmAnd/res/drawable-mdpi/la_backtoloc_enabled.png
deleted file mode 100644
index 84756c6372..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/la_backtoloc_enabled.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/bt_round_1_shadow.png b/OsmAnd/res/drawable-mdpi/map_bt_round_1_shadow.png
similarity index 100%
rename from OsmAnd/res/drawable-mdpi/bt_round_1_shadow.png
rename to OsmAnd/res/drawable-mdpi/map_bt_round_1_shadow.png
diff --git a/OsmAnd/res/drawable-mdpi/bt_round_2_shadow.png b/OsmAnd/res/drawable-mdpi/map_bt_round_2_shadow.png
similarity index 100%
rename from OsmAnd/res/drawable-mdpi/bt_round_2_shadow.png
rename to OsmAnd/res/drawable-mdpi/map_bt_round_2_shadow.png
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_zoom_in.png b/OsmAnd/res/drawable-mdpi/map_zoom_in.png
similarity index 100%
rename from OsmAnd/res/drawable-mdpi/ic_action_zoom_in.png
rename to OsmAnd/res/drawable-mdpi/map_zoom_in.png
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_zoom_out.png b/OsmAnd/res/drawable-mdpi/map_zoom_out.png
similarity index 100%
rename from OsmAnd/res/drawable-mdpi/ic_action_zoom_out.png
rename to OsmAnd/res/drawable-mdpi/map_zoom_out.png
diff --git a/OsmAnd/res/drawable-xhdpi/bg_striped_img.png b/OsmAnd/res/drawable-xhdpi/bg_striped_img.png
deleted file mode 100644
index 92f3fa1140..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/bg_striped_img.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/bg_striped_split_img.png b/OsmAnd/res/drawable-xhdpi/bg_striped_split_img.png
deleted file mode 100644
index e31f4a6677..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/bg_striped_split_img.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_ac_close.png b/OsmAnd/res/drawable-xhdpi/ic_ac_close.png
deleted file mode 100644
index 047cc68c60..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_ac_close.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_ac_help.png b/OsmAnd/res/drawable-xhdpi/ic_ac_help.png
deleted file mode 100644
index e8423d305c..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_ac_help.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_ac_settings.png b/OsmAnd/res/drawable-xhdpi/ic_ac_settings.png
deleted file mode 100644
index a8376cd0aa..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_ac_settings.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_car_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_car_light.png
deleted file mode 100644
index 9cae26142e..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_car_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_close_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_close_light.png
deleted file mode 100644
index f80555ec4f..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_close_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_flag_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_flag_light.png
deleted file mode 100644
index f773f91a6d..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_flag_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_flage_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_flage_light.png
deleted file mode 100644
index 2522d6ea5d..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_flage_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_foot_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_foot_light.png
deleted file mode 100644
index 174255f2bd..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_foot_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gabout_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_gabout_light.png
deleted file mode 100644
index 076a6c4504..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gabout_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gcall_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_gcall_light.png
deleted file mode 100644
index ad97736702..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gcall_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gdirections_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_gdirections_light.png
deleted file mode 100644
index 4505c9be8c..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gdirections_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gdiscard_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_gdiscard_dark.png
deleted file mode 100644
index 67f7ab19c6..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gdiscard_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gdiscard_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_gdiscard_light.png
deleted file mode 100644
index dbccaa25c6..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gdiscard_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gfav_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_gfav_dark.png
deleted file mode 100644
index ac94f5dddf..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gfav_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gfav_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_gfav_light.png
deleted file mode 100644
index 040fe57809..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gfav_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_ghelp_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_ghelp_dark.png
deleted file mode 100644
index 256c8e9f3f..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_ghelp_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_ghelp_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_ghelp_light.png
deleted file mode 100644
index 20c889329c..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_ghelp_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_glabel_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_glabel_dark.png
deleted file mode 100644
index 687e73d67d..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_glabel_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_glabel_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_glabel_light.png
deleted file mode 100644
index ca431e5be0..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_glabel_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gremove_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_gremove_light.png
deleted file mode 100644
index da57c0aec1..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gremove_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_grot_left_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_grot_left_light.png
deleted file mode 100644
index 8d9163244f..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_grot_left_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_grot_right_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_grot_right_light.png
deleted file mode 100644
index 35bf64ce55..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_grot_right_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gsave_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_gsave_light.png
deleted file mode 100644
index 232d11c34b..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gsave_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gsearch_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_gsearch_light.png
deleted file mode 100644
index 9acbdd140d..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gsearch_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gsettings_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_gsettings_light.png
deleted file mode 100644
index d0a733e52f..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gsettings_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gshare_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_gshare_light.png
deleted file mode 100644
index 12e7f5a986..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gshare_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gup_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_gup_light.png
deleted file mode 100644
index 86b6e3ebdf..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gup_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_photo_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_photo_light.png
deleted file mode 100644
index 1e23effa07..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_photo_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_pin_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_pin_light.png
deleted file mode 100644
index fe043e7778..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_pin_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_play_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_play_light.png
deleted file mode 100644
index b22a9859dc..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_play_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_plus_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_plus_light.png
deleted file mode 100644
index 572391bbc6..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_plus_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_polygom_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_polygom_light.png
deleted file mode 100644
index a9acf1c76d..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_polygom_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_quit_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_quit_light.png
deleted file mode 100644
index df3fc2fcb8..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_quit_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_redo_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_redo_light.png
deleted file mode 100644
index 9e74d98a2c..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_redo_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_refresh_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_refresh_light.png
deleted file mode 100644
index a985e0f25e..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_refresh_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_road_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_road_light.png
deleted file mode 100644
index 0521e1eea5..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_road_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_road_works_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_road_works_light.png
deleted file mode 100644
index 91aaadb1d5..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_road_works_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_ruler_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_ruler_light.png
deleted file mode 100644
index d9980ae38f..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_ruler_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_sail_boat_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_sail_boat_light.png
deleted file mode 100644
index d9d6e6c400..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_sail_boat_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_search_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_search_light.png
deleted file mode 100644
index 8a45553de0..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_search_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_settings2_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_settings2_light.png
deleted file mode 100644
index a12cddf98f..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_settings2_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_signpost_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_signpost_light.png
deleted file mode 100644
index c75d4b3c09..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_signpost_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_street_view_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_street_view_light.png
deleted file mode 100644
index 1a706b48c7..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_street_view_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_text_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_text_light.png
deleted file mode 100644
index 71e9c1dce4..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_text_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_trekking_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_trekking_light.png
deleted file mode 100644
index c5d06d6ce3..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_trekking_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_truck_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_truck_light.png
deleted file mode 100644
index 2ebc8bcd47..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_truck_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_undo_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_undo_light.png
deleted file mode 100644
index dcfcae33cc..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_undo_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_up_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_up_light.png
deleted file mode 100644
index cb289f72cf..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_up_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_video_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_video_light.png
deleted file mode 100644
index 4a9c3216a7..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_video_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_wmap_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_wmap_dark.png
deleted file mode 100644
index 4817a0a50d..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_wmap_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_wmap_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_wmap_light.png
deleted file mode 100644
index b06aee3720..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_wmap_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_configure_screen_light.png b/OsmAnd/res/drawable-xhdpi/ic_configure_screen_light.png
deleted file mode 100644
index 876c375fb0..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_configure_screen_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_dashboard_light.png b/OsmAnd/res/drawable-xhdpi/ic_dashboard_light.png
deleted file mode 100644
index 80eb49fee3..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_dashboard_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_extension_light.png b/OsmAnd/res/drawable-xhdpi/ic_extension_light.png
deleted file mode 100644
index f5bbc32e3d..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_extension_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_layer_bottom_light.png b/OsmAnd/res/drawable-xhdpi/ic_layer_bottom_light.png
deleted file mode 100644
index 74187b5ed3..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_layer_bottom_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_layer_top_light.png b/OsmAnd/res/drawable-xhdpi/ic_layer_top_light.png
deleted file mode 100644
index 83221a9179..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_layer_top_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_osmo_light.png b/OsmAnd/res/drawable-xhdpi/ic_osmo_light.png
deleted file mode 100644
index 92e58b6366..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_osmo_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_play_light.png b/OsmAnd/res/drawable-xhdpi/ic_play_light.png
deleted file mode 100644
index 6b22269e41..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_play_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_world_globe_light.png b/OsmAnd/res/drawable-xhdpi/ic_world_globe_light.png
deleted file mode 100644
index ab11f2c883..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_world_globe_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/la_backtoloc_disabled.png b/OsmAnd/res/drawable-xhdpi/la_backtoloc_disabled.png
deleted file mode 100644
index 0ae0d0a3c0..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/la_backtoloc_disabled.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/la_backtoloc_enabled.png b/OsmAnd/res/drawable-xhdpi/la_backtoloc_enabled.png
deleted file mode 100644
index 7bcb3fb060..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/la_backtoloc_enabled.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/la_backtoloc_enabled_white.png b/OsmAnd/res/drawable-xhdpi/la_backtoloc_enabled_white.png
deleted file mode 100644
index 66ec312e59..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/la_backtoloc_enabled_white.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/la_backtoloc_tracked.png b/OsmAnd/res/drawable-xhdpi/la_backtoloc_tracked.png
deleted file mode 100644
index 0ab76663f3..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/la_backtoloc_tracked.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/map_bt_round_1_shadow.png b/OsmAnd/res/drawable-xhdpi/map_bt_round_1_shadow.png
new file mode 100644
index 0000000000..2459bd66ee
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/map_bt_round_1_shadow.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/map_bt_round_2_shadow.png b/OsmAnd/res/drawable-xhdpi/map_bt_round_2_shadow.png
new file mode 100644
index 0000000000..6a25f3f7e0
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/map_bt_round_2_shadow.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gprint_light.png b/OsmAnd/res/drawable-xhdpi/map_zoom_in.png
similarity index 66%
rename from OsmAnd/res/drawable-xhdpi/ic_action_gprint_light.png
rename to OsmAnd/res/drawable-xhdpi/map_zoom_in.png
index 9265ebc973..9b69b6467a 100644
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gprint_light.png and b/OsmAnd/res/drawable-xhdpi/map_zoom_in.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gsave_light.png b/OsmAnd/res/drawable-xhdpi/map_zoom_out.png
similarity index 59%
rename from OsmAnd/res/drawable-mdpi/ic_action_gsave_light.png
rename to OsmAnd/res/drawable-xhdpi/map_zoom_out.png
index f56e13cd8d..f655c10dd9 100644
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gsave_light.png and b/OsmAnd/res/drawable-xhdpi/map_zoom_out.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_config_dark.png b/OsmAnd/res/drawable-xhdpi/widget_config_dark.png
deleted file mode 100644
index a3d2138184..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_config_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_config_light.png b/OsmAnd/res/drawable-xhdpi/widget_config_light.png
deleted file mode 100644
index e4fdd88752..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_config_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_ac_close.png b/OsmAnd/res/drawable-xxhdpi/ic_ac_close.png
deleted file mode 100644
index 237956975f..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_ac_close.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_ac_help.png b/OsmAnd/res/drawable-xxhdpi/ic_ac_help.png
deleted file mode 100644
index ec5431de61..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_ac_help.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_ac_settings.png b/OsmAnd/res/drawable-xxhdpi/ic_ac_settings.png
deleted file mode 100644
index 588432071c..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_ac_settings.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_car_light.png b/OsmAnd/res/drawable-xxhdpi/ic_action_car_light.png
deleted file mode 100644
index 099be242ae..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_car_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_flag_light.png b/OsmAnd/res/drawable-xxhdpi/ic_action_flag_light.png
deleted file mode 100644
index 922411d0e8..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_flag_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_flage_light.png b/OsmAnd/res/drawable-xxhdpi/ic_action_flage_light.png
deleted file mode 100644
index 7e5cb5122b..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_flage_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_gabout_light.png b/OsmAnd/res/drawable-xxhdpi/ic_action_gabout_light.png
deleted file mode 100644
index 3487a8c704..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_gabout_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_gdirections_light.png b/OsmAnd/res/drawable-xxhdpi/ic_action_gdirections_light.png
deleted file mode 100644
index 98a22f18ea..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_gdirections_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_gsave_light.png b/OsmAnd/res/drawable-xxhdpi/ic_action_gsave_light.png
deleted file mode 100644
index 7a0da7e3e5..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_gsave_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_gshare_light.png b/OsmAnd/res/drawable-xxhdpi/ic_action_gshare_light.png
deleted file mode 100644
index 206d31e926..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_gshare_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_photo_light.png b/OsmAnd/res/drawable-xxhdpi/ic_action_photo_light.png
deleted file mode 100644
index 9f7d907b68..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_photo_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_play_light.png b/OsmAnd/res/drawable-xxhdpi/ic_action_play_light.png
deleted file mode 100644
index 55aa04c708..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_play_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_quit_light.png b/OsmAnd/res/drawable-xxhdpi/ic_action_quit_light.png
deleted file mode 100644
index cdea64439f..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_quit_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_refresh_light.png b/OsmAnd/res/drawable-xxhdpi/ic_action_refresh_light.png
deleted file mode 100644
index cc59836e85..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_refresh_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_road_works_light.png b/OsmAnd/res/drawable-xxhdpi/ic_action_road_works_light.png
deleted file mode 100644
index de6b03e829..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_road_works_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_search_light.png b/OsmAnd/res/drawable-xxhdpi/ic_action_search_light.png
deleted file mode 100644
index 50870e6ade..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_search_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_video_light.png b/OsmAnd/res/drawable-xxhdpi/ic_action_video_light.png
deleted file mode 100644
index c00d257ae7..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_video_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_configure_screen_light.png b/OsmAnd/res/drawable-xxhdpi/ic_configure_screen_light.png
deleted file mode 100644
index 8e5253514b..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_configure_screen_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_dashboard_light.png b/OsmAnd/res/drawable-xxhdpi/ic_dashboard_light.png
deleted file mode 100644
index e1eada585c..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_dashboard_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_extension_light.png b/OsmAnd/res/drawable-xxhdpi/ic_extension_light.png
deleted file mode 100644
index c7c461686b..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_extension_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_layer_bottom_light.png b/OsmAnd/res/drawable-xxhdpi/ic_layer_bottom_light.png
deleted file mode 100644
index 90cd6e99a6..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_layer_bottom_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_layer_top_light.png b/OsmAnd/res/drawable-xxhdpi/ic_layer_top_light.png
deleted file mode 100644
index 25f6ca6d58..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_layer_top_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_osmo_light.png b/OsmAnd/res/drawable-xxhdpi/ic_osmo_light.png
deleted file mode 100644
index bab4f8f08f..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_osmo_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_play_light.png b/OsmAnd/res/drawable-xxhdpi/ic_play_light.png
deleted file mode 100644
index 6ed91cf3ad..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_play_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_world_globe_light.png b/OsmAnd/res/drawable-xxhdpi/ic_world_globe_light.png
deleted file mode 100644
index 924741ee92..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_world_globe_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/la_backtoloc_disabled.png b/OsmAnd/res/drawable-xxhdpi/la_backtoloc_disabled.png
deleted file mode 100644
index e7c01c8476..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/la_backtoloc_disabled.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/la_backtoloc_enabled.png b/OsmAnd/res/drawable-xxhdpi/la_backtoloc_enabled.png
deleted file mode 100644
index edda237eaf..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/la_backtoloc_enabled.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/la_backtoloc_enabled_white.png b/OsmAnd/res/drawable-xxhdpi/la_backtoloc_enabled_white.png
deleted file mode 100644
index eaa52f5781..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/la_backtoloc_enabled_white.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/la_backtoloc_tracked.png b/OsmAnd/res/drawable-xxhdpi/la_backtoloc_tracked.png
deleted file mode 100644
index 5cfaea3052..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/la_backtoloc_tracked.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_bt_round_1_shadow.png b/OsmAnd/res/drawable-xxhdpi/map_bt_round_1_shadow.png
new file mode 100644
index 0000000000..04833b06d2
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_bt_round_1_shadow.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_bt_round_2_shadow.png b/OsmAnd/res/drawable-xxhdpi/map_bt_round_2_shadow.png
new file mode 100644
index 0000000000..684c48808d
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_bt_round_2_shadow.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_gprint_light.png b/OsmAnd/res/drawable-xxhdpi/map_zoom_in.png
similarity index 60%
rename from OsmAnd/res/drawable-xxhdpi/ic_action_gprint_light.png
rename to OsmAnd/res/drawable-xxhdpi/map_zoom_in.png
index cc7654b078..6446fcd9dc 100644
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_gprint_light.png and b/OsmAnd/res/drawable-xxhdpi/map_zoom_in.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_zoom_out.png b/OsmAnd/res/drawable-xxhdpi/map_zoom_out.png
new file mode 100644
index 0000000000..b095f2985a
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_zoom_out.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_config_dark.png b/OsmAnd/res/drawable-xxhdpi/widget_config_dark.png
deleted file mode 100644
index 7c8539b221..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_config_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_config_light.png b/OsmAnd/res/drawable-xxhdpi/widget_config_light.png
deleted file mode 100644
index 3d268c9e6c..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_config_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable/back_to_loc.xml b/OsmAnd/res/drawable/back_to_loc.xml
deleted file mode 100644
index 0faf5acbde..0000000000
--- a/OsmAnd/res/drawable/back_to_loc.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_enabled="false" android:drawable="@drawable/la_backtoloc_disabled" />
-    <item android:state_pressed="true" android:drawable="@drawable/la_backtoloc_disabled" />
-    <item android:state_focused="true" android:drawable="@drawable/la_backtoloc_disabled" />
-    <item android:drawable="@drawable/la_backtoloc_enabled" />
-</selector>
diff --git a/OsmAnd/res/drawable/back_to_loc_tracked.xml b/OsmAnd/res/drawable/back_to_loc_tracked.xml
deleted file mode 100644
index 791fb060eb..0000000000
--- a/OsmAnd/res/drawable/back_to_loc_tracked.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_enabled="false" android:drawable="@drawable/la_backtoloc_disabled" />
-    <item android:state_pressed="true" android:drawable="@drawable/la_backtoloc_disabled" />
-    <item android:state_focused="true" android:drawable="@drawable/la_backtoloc_disabled" />
-    <item android:drawable="@drawable/la_backtoloc_tracked" />
-</selector>
diff --git a/OsmAnd/res/drawable/back_to_loc_tracked_white.xml b/OsmAnd/res/drawable/back_to_loc_tracked_white.xml
deleted file mode 100644
index 3ccee63e1b..0000000000
--- a/OsmAnd/res/drawable/back_to_loc_tracked_white.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_enabled="false" android:drawable="@drawable/la_backtoloc_disabled_white" />
-    <item android:state_pressed="true" android:drawable="@drawable/la_backtoloc_disabled_white" />
-    <item android:state_focused="true" android:drawable="@drawable/la_backtoloc_disabled_white" />
-    <item android:drawable="@drawable/la_backtoloc_tracked_white" />
-</selector>
diff --git a/OsmAnd/res/drawable/back_to_loc_white.xml b/OsmAnd/res/drawable/back_to_loc_white.xml
deleted file mode 100644
index cc7798fe48..0000000000
--- a/OsmAnd/res/drawable/back_to_loc_white.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_enabled="false" android:drawable="@drawable/la_backtoloc_disabled_white" />
-    <item android:state_pressed="true" android:drawable="@drawable/la_backtoloc_disabled_white" />
-    <item android:state_focused="true" android:drawable="@drawable/la_backtoloc_disabled_white" />
-    <item android:drawable="@drawable/la_backtoloc_enabled_white" />
-</selector>
diff --git a/OsmAnd/res/drawable/bg_left.xml b/OsmAnd/res/drawable/bg_left.xml
deleted file mode 100644
index 2a8e615388..0000000000
--- a/OsmAnd/res/drawable/bg_left.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:state_pressed="true" android:drawable="@drawable/bg_left_pushed" />
-    <item android:state_focused="true" android:drawable="@drawable/bg_left_pushed" />
-    <item android:drawable="@drawable/bg_left_simple"  />
-</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/bg_leftr.xml b/OsmAnd/res/drawable/bg_leftr.xml
deleted file mode 100644
index c8c07cc8c8..0000000000
--- a/OsmAnd/res/drawable/bg_leftr.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/bg_leftr_pushed" />
-    <item android:state_focused="true" android:drawable="@drawable/bg_leftr_pushed" />
-    <item android:drawable="@drawable/bg_leftr_simple" />
-</selector>
diff --git a/OsmAnd/res/drawable/bg_right.xml b/OsmAnd/res/drawable/bg_right.xml
deleted file mode 100644
index b557d28366..0000000000
--- a/OsmAnd/res/drawable/bg_right.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/bg_right_pushed" />
-    <item android:state_focused="true" android:drawable="@drawable/bg_right_pushed" />
-    <item android:drawable="@drawable/bg_right_simple" />
-</selector>
diff --git a/OsmAnd/res/drawable/bg_rightr.xml b/OsmAnd/res/drawable/bg_rightr.xml
deleted file mode 100644
index 73719f59d9..0000000000
--- a/OsmAnd/res/drawable/bg_rightr.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/bg_rightr_pushed" />
-    <item android:state_focused="true" android:drawable="@drawable/bg_rightr_pushed" />
-    <item android:drawable="@drawable/bg_rightr_simple" />
-</selector>
diff --git a/OsmAnd/res/drawable/bg_striped.xml b/OsmAnd/res/drawable/bg_striped.xml
deleted file mode 100644
index 77e0aab222..0000000000
--- a/OsmAnd/res/drawable/bg_striped.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/bg_striped_img"
-    android:tileMode="repeat"
-    android:dither="true" />
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/bg_striped_split.xml b/OsmAnd/res/drawable/bg_striped_split.xml
deleted file mode 100644
index 9b0e31354b..0000000000
--- a/OsmAnd/res/drawable/bg_striped_split.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/bg_striped_split_img"
-    android:tileMode="repeat"
-    android:dither="true" />
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_circle_blue_n.xml b/OsmAnd/res/drawable/btn_circle_blue_n.xml
index 45b7f8e84e..871093a039 100644
--- a/OsmAnd/res/drawable/btn_circle_blue_n.xml
+++ b/OsmAnd/res/drawable/btn_circle_blue_n.xml
@@ -4,7 +4,7 @@
     <item>
         <bitmap
             android:gravity="center"
-            android:src="@drawable/bt_round_1_shadow" />
+            android:src="@drawable/map_bt_round_1_shadow" />
     </item>
     <item>
         
diff --git a/OsmAnd/res/drawable/btn_circle_blue_p.xml b/OsmAnd/res/drawable/btn_circle_blue_p.xml
index 117003b7fc..bdd13c6657 100644
--- a/OsmAnd/res/drawable/btn_circle_blue_p.xml
+++ b/OsmAnd/res/drawable/btn_circle_blue_p.xml
@@ -4,7 +4,7 @@
     <item>
         <bitmap
             android:gravity="center"
-            android:src="@drawable/bt_round_1_shadow" />
+            android:src="@drawable/map_bt_round_1_shadow" />
     </item>
     <item>
         
diff --git a/OsmAnd/res/drawable/btn_circle_n.xml b/OsmAnd/res/drawable/btn_circle_n.xml
index f9697ef6a0..3b425c6bd2 100644
--- a/OsmAnd/res/drawable/btn_circle_n.xml
+++ b/OsmAnd/res/drawable/btn_circle_n.xml
@@ -4,7 +4,7 @@
     <item>
         <bitmap
             android:gravity="center"
-            android:src="@drawable/bt_round_1_shadow" />
+            android:src="@drawable/map_bt_round_1_shadow" />
     </item>
     <item>
         
diff --git a/OsmAnd/res/drawable/btn_circle_night_n.xml b/OsmAnd/res/drawable/btn_circle_night_n.xml
index 3f95be5536..3e2cfa0917 100644
--- a/OsmAnd/res/drawable/btn_circle_night_n.xml
+++ b/OsmAnd/res/drawable/btn_circle_night_n.xml
@@ -4,7 +4,7 @@
     <item>
         <bitmap
             android:gravity="center"
-            android:src="@drawable/bt_round_1_shadow" />
+            android:src="@drawable/map_bt_round_1_shadow" />
     </item>
     <item>
         <inset
diff --git a/OsmAnd/res/drawable/btn_circle_night_p.xml b/OsmAnd/res/drawable/btn_circle_night_p.xml
index 3af02134e6..8d77d8d876 100644
--- a/OsmAnd/res/drawable/btn_circle_night_p.xml
+++ b/OsmAnd/res/drawable/btn_circle_night_p.xml
@@ -4,7 +4,7 @@
     <item>
         <bitmap
             android:gravity="center"
-            android:src="@drawable/bt_round_1_shadow" />
+            android:src="@drawable/map_bt_round_1_shadow" />
     </item>
     <item>
         
diff --git a/OsmAnd/res/drawable/btn_circle_p.xml b/OsmAnd/res/drawable/btn_circle_p.xml
index b18c1b3d5a..2557a04105 100644
--- a/OsmAnd/res/drawable/btn_circle_p.xml
+++ b/OsmAnd/res/drawable/btn_circle_p.xml
@@ -4,7 +4,7 @@
     <item>
         <bitmap
             android:gravity="center"
-            android:src="@drawable/bt_round_1_shadow" />
+            android:src="@drawable/map_bt_round_1_shadow" />
     </item>
     <item>
         
diff --git a/OsmAnd/res/drawable/btn_circle_trans_n.xml b/OsmAnd/res/drawable/btn_circle_trans_n.xml
index 175fe28af9..6ecb4ca500 100644
--- a/OsmAnd/res/drawable/btn_circle_trans_n.xml
+++ b/OsmAnd/res/drawable/btn_circle_trans_n.xml
@@ -4,7 +4,7 @@
     <item>
         <bitmap
             android:gravity="center"
-            android:src="@drawable/bt_round_1_shadow" />
+            android:src="@drawable/map_bt_round_1_shadow" />
     </item>
     <item>
         
diff --git a/OsmAnd/res/drawable/btn_inset_circle_n.xml b/OsmAnd/res/drawable/btn_inset_circle_n.xml
index 345597df85..d8fc224940 100644
--- a/OsmAnd/res/drawable/btn_inset_circle_n.xml
+++ b/OsmAnd/res/drawable/btn_inset_circle_n.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
     <item>
-        <bitmap android:src="@drawable/bt_round_2_shadow" android:gravity="center" />
+        <bitmap android:src="@drawable/map_bt_round_2_shadow" android:gravity="center" />
     </item>
     <item>
         <inset
diff --git a/OsmAnd/res/drawable/btn_inset_circle_night_n.xml b/OsmAnd/res/drawable/btn_inset_circle_night_n.xml
index 8b2b1aed6c..04449bf544 100644
--- a/OsmAnd/res/drawable/btn_inset_circle_night_n.xml
+++ b/OsmAnd/res/drawable/btn_inset_circle_night_n.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
     <item>
-        <bitmap android:src="@drawable/bt_round_2_shadow" android:gravity="center" />
+        <bitmap android:src="@drawable/map_bt_round_2_shadow" android:gravity="center" />
     </item>
     <item>
         <inset
diff --git a/OsmAnd/res/drawable/btn_inset_circle_night_p.xml b/OsmAnd/res/drawable/btn_inset_circle_night_p.xml
index e4ba55870f..ec75118283 100644
--- a/OsmAnd/res/drawable/btn_inset_circle_night_p.xml
+++ b/OsmAnd/res/drawable/btn_inset_circle_night_p.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
     <item>
-        <bitmap android:src="@drawable/bt_round_2_shadow" android:gravity="center" />
+        <bitmap android:src="@drawable/map_bt_round_2_shadow" android:gravity="center" />
     </item>
     <item>
         <inset
diff --git a/OsmAnd/res/drawable/btn_inset_circle_p.xml b/OsmAnd/res/drawable/btn_inset_circle_p.xml
index 7890976523..e1c6bc62d9 100644
--- a/OsmAnd/res/drawable/btn_inset_circle_p.xml
+++ b/OsmAnd/res/drawable/btn_inset_circle_p.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
     <item>
         
-         <bitmap android:src="@drawable/bt_round_2_shadow" android:gravity="center" />
+         <bitmap android:src="@drawable/map_bt_round_2_shadow" android:gravity="center" />
         
     </item>  
     <item>
diff --git a/OsmAnd/res/drawable/btn_inset_circle_transparent.xml b/OsmAnd/res/drawable/btn_inset_circle_transparent.xml
index 076678237a..14b39af523 100644
--- a/OsmAnd/res/drawable/btn_inset_circle_transparent.xml
+++ b/OsmAnd/res/drawable/btn_inset_circle_transparent.xml
@@ -4,6 +4,6 @@
     <item>
         <bitmap
             android:gravity="center"
-            android:src="@drawable/bt_round_2_shadow" />
+            android:src="@drawable/map_bt_round_2_shadow" />
     </item>
 </selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/expandable_category.xml b/OsmAnd/res/drawable/expandable_category.xml
deleted file mode 100644
index 4d646217c8..0000000000
--- a/OsmAnd/res/drawable/expandable_category.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- When selected, use grey -->
-    <item android:drawable="@drawable/expandable_category_pushed" android:state_checked="true"/>
-    <!-- When not selected, use white -->
-    <item android:drawable="@drawable/expandable_category_unpushed" android:state_checked="false"/>
-
-</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/help_icon.xml b/OsmAnd/res/drawable/help_icon.xml
deleted file mode 100644
index f4c9cc31ce..0000000000
--- a/OsmAnd/res/drawable/help_icon.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_pressed="true" android:drawable="@drawable/help_icon_pressed" />
-	<item android:state_focused="true" android:drawable="@drawable/help_icon_pressed" />
-    <item android:drawable="@drawable/help_icon_simple" />
-</selector>
diff --git a/OsmAnd/res/drawable/map_btn_cancel.xml b/OsmAnd/res/drawable/map_btn_cancel.xml
deleted file mode 100644
index 887819a70d..0000000000
--- a/OsmAnd/res/drawable/map_btn_cancel.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/map_btn_cancel_p" />
-    <item android:state_enabled="false" android:drawable="@drawable/map_btn_cancel_p" />
-    <item android:drawable="@drawable/map_btn_cancel_o" />
-</selector>
diff --git a/OsmAnd/res/drawable/map_btn_hmenu.xml b/OsmAnd/res/drawable/map_btn_hmenu.xml
deleted file mode 100644
index de5537e033..0000000000
--- a/OsmAnd/res/drawable/map_btn_hmenu.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/map_btn_hmenu_p" />
-    <item android:state_enabled="false" android:drawable="@drawable/map_btn_hmenu_p" />
-    <item android:drawable="@drawable/map_btn_hmenu_o" />
-</selector>
diff --git a/OsmAnd/res/drawable/map_btn_info.xml b/OsmAnd/res/drawable/map_btn_info.xml
deleted file mode 100644
index 3430164b08..0000000000
--- a/OsmAnd/res/drawable/map_btn_info.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/map_btn_info_p" />
-    <item android:state_enabled="false" android:drawable="@drawable/map_btn_info_p" />
-    <item android:state_checked="true" android:drawable="@drawable/map_btn_info_p" />
-    <item android:drawable="@drawable/map_btn_info_o" />
-</selector>
diff --git a/OsmAnd/res/drawable/map_btn_menu.xml b/OsmAnd/res/drawable/map_btn_menu.xml
deleted file mode 100644
index 8024ab38e1..0000000000
--- a/OsmAnd/res/drawable/map_btn_menu.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/map_btn_menu_p" />
-    <item android:state_enabled="false" android:drawable="@drawable/map_btn_menu_p" />
-    <item android:drawable="@drawable/map_btn_menu_o" />
-</selector>
diff --git a/OsmAnd/res/drawable/map_btn_navigate.xml b/OsmAnd/res/drawable/map_btn_navigate.xml
deleted file mode 100644
index 3e52bfd986..0000000000
--- a/OsmAnd/res/drawable/map_btn_navigate.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/map_btn_navigate_p" />
-    <item android:state_enabled="false" android:drawable="@drawable/map_btn_navigate_p" />
-    <item android:drawable="@drawable/map_btn_navigate_o" />
-</selector>
diff --git a/OsmAnd/res/drawable/map_btn_signpost.xml b/OsmAnd/res/drawable/map_btn_signpost.xml
deleted file mode 100644
index 2ba7595ef6..0000000000
--- a/OsmAnd/res/drawable/map_btn_signpost.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/map_btn_signpost_p" />
-    <item android:state_enabled="false" android:drawable="@drawable/map_btn_signpost_p" />
-    <item android:drawable="@drawable/map_btn_signpost_o" />
-</selector>
diff --git a/OsmAnd/res/drawable/map_zoom_in.xml b/OsmAnd/res/drawable/map_zoom_in.xml
deleted file mode 100644
index 794067bf67..0000000000
--- a/OsmAnd/res/drawable/map_zoom_in.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/map_zoom_in_p" />
-    <item android:state_enabled="false" android:drawable="@drawable/map_zoom_in_p" />
-    <item android:drawable="@drawable/map_zoom_in_o" />
-</selector>
diff --git a/OsmAnd/res/drawable/map_zoom_out.xml b/OsmAnd/res/drawable/map_zoom_out.xml
deleted file mode 100644
index 563d631640..0000000000
--- a/OsmAnd/res/drawable/map_zoom_out.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/map_zoom_out_p" />
-    <item android:state_enabled="false" android:drawable="@drawable/map_zoom_out_p" />
-    <item android:drawable="@drawable/map_zoom_out_o" />
-</selector>
diff --git a/OsmAnd/res/drawable/tab_icon_background.xml b/OsmAnd/res/drawable/tab_icon_background.xml
deleted file mode 100644
index 92debb2c3d..0000000000
--- a/OsmAnd/res/drawable/tab_icon_background.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/tab_icon_panel_background_pushed" android:state_selected="true"/>  
-    <item android:drawable="@drawable/tab_icon_panel_background" />
-
-</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/tab_icon_panel_background.xml b/OsmAnd/res/drawable/tab_icon_panel_background.xml
deleted file mode 100644
index 5047a0ed7e..0000000000
--- a/OsmAnd/res/drawable/tab_icon_panel_background.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item>
-        <bitmap android:src="@drawable/tab_icon_panel" />
-    </item>
-    <item>
-        <bitmap android:src="@drawable/tab_icon_panel_pushed_line" />
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/tab_icon_panel_background_pushed.xml b/OsmAnd/res/drawable/tab_icon_panel_background_pushed.xml
deleted file mode 100644
index 8f1b3d273a..0000000000
--- a/OsmAnd/res/drawable/tab_icon_panel_background_pushed.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item>
-        <bitmap android:src="@drawable/tab_icon_panel" />
-    </item>
-    <item>
-        <bitmap android:src="@drawable/tab_icon_panel_pushed" />
-    </item>
-    <item>
-        <bitmap android:src="@drawable/tab_icon_panel_pushed_line" />
-    </item> 
-</layer-list>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/dash_gpx_track_item.xml b/OsmAnd/res/layout/dash_gpx_track_item.xml
index 0ca15dcd13..233bc54208 100644
--- a/OsmAnd/res/layout/dash_gpx_track_item.xml
+++ b/OsmAnd/res/layout/dash_gpx_track_item.xml
@@ -166,7 +166,7 @@
 			android:layout_height="@dimen/list_item_height"
 			android:background="?attr/options_button_background"
 			android:focusable="false"
-			android:src="?attr/list_settings_icon"
+			android:src="?attr/ic_action_overflow"
 			android:visibility="gone"/>
 
 		<include android:layout_width="wrap_content"
diff --git a/OsmAnd/res/layout/expandable_list_item_category.xml b/OsmAnd/res/layout/expandable_list_item_category.xml
index 61d7d103af..78acc4b92c 100644
--- a/OsmAnd/res/layout/expandable_list_item_category.xml
+++ b/OsmAnd/res/layout/expandable_list_item_category.xml
@@ -20,8 +20,7 @@
         android:id="@+id/explist_indicator"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:src="@drawable/expandable_category_unpushed" />
+        android:layout_gravity="center_vertical"/>
 
     <TextView
         android:id="@+id/category_name"
@@ -41,7 +40,7 @@
 		android:focusable="false"
 		android:visibility="gone"
 		android:background="?attr/options_button_background"
-		android:src="?attr/list_settings_icon"/>
+		android:src="?attr/ic_action_overflow"/>
     
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/favorites_list_item.xml b/OsmAnd/res/layout/favorites_list_item.xml
index 24ca3a0c6a..7cc385d27a 100644
--- a/OsmAnd/res/layout/favorites_list_item.xml
+++ b/OsmAnd/res/layout/favorites_list_item.xml
@@ -102,7 +102,7 @@
             android:visibility="invisible"
             android:layout_marginLeft="@dimen/dashFavIconMargin"
             android:background="?attr/dashboard_button"
-            android:src="@drawable/ic_action_gdirections_light" />
+            android:src="@drawable/ic_action_remove_light" />
         <ImageButton
             android:id="@+id/options"
             android:layout_width="@dimen/dashListItemHeight"
@@ -110,7 +110,7 @@
             android:layout_gravity="center_vertical"
             android:visibility="gone"
             android:background="?attr/options_button_background"
-            android:src="?attr/list_settings_icon" />
+            android:src="?attr/ic_action_overflow" />
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/local_index_list_item.xml b/OsmAnd/res/layout/local_index_list_item.xml
index 28898746b0..96fe7338e9 100644
--- a/OsmAnd/res/layout/local_index_list_item.xml
+++ b/OsmAnd/res/layout/local_index_list_item.xml
@@ -75,6 +75,6 @@
 		android:layout_height="@dimen/list_item_height"
 		android:background="?attr/options_button_background"
 		android:focusable="false"
-		android:src="?attr/list_settings_icon"/>
+		android:src="?attr/ic_action_overflow"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/map_hud_widget.xml b/OsmAnd/res/layout/map_hud_widget.xml
index 7497e20b4e..601731b77a 100644
--- a/OsmAnd/res/layout/map_hud_widget.xml
+++ b/OsmAnd/res/layout/map_hud_widget.xml
@@ -24,7 +24,7 @@
             android:layout_width="@dimen/map_widget_image"
             android:layout_height="@dimen/map_widget_image"
             android:layout_gravity="center"
-            android:src="@drawable/ic_action_close_light"
+            android:src="@drawable/ic_action_remove_light"
             android:visibility="gone"
             />
     </FrameLayout>
diff --git a/OsmAnd/res/layout/note.xml b/OsmAnd/res/layout/note.xml
index 5bcba71386..6272b97758 100644
--- a/OsmAnd/res/layout/note.xml
+++ b/OsmAnd/res/layout/note.xml
@@ -72,7 +72,7 @@
 			android:layout_gravity="center_vertical"
 			android:background="?attr/options_button_background"
 			android:focusable="false"
-			android:src="?attr/list_settings_icon"/>
+			android:src="?attr/ic_action_overflow"/>
 
 		<ImageButton
 			android:id="@+id/play"
@@ -81,7 +81,7 @@
 			android:layout_gravity="center_vertical"
 			android:layout_marginLeft="@dimen/dashFavIconMargin"
 			android:background="?attr/dashboard_button"
-			android:src="@drawable/ic_play_light"/>
+			android:src="@drawable/ic_play_dark"/>
 		</LinearLayout>
 
 
diff --git a/OsmAnd/res/layout/open_hours_list_item.xml b/OsmAnd/res/layout/open_hours_list_item.xml
index 935f31a90c..da9d78d93e 100644
--- a/OsmAnd/res/layout/open_hours_list_item.xml
+++ b/OsmAnd/res/layout/open_hours_list_item.xml
@@ -15,7 +15,7 @@
         android:id="@+id/remove"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="?attr/reset_image"
+        android:background="@drawable/ic_action_delete_dark"
         android:contentDescription="@string/shared_string_delete"
         android:paddingLeft="2dp"
         android:paddingRight="2dp"
diff --git a/OsmAnd/res/layout/osmo_group_item.xml b/OsmAnd/res/layout/osmo_group_item.xml
index 3f0e35d101..5f672d9464 100644
--- a/OsmAnd/res/layout/osmo_group_item.xml
+++ b/OsmAnd/res/layout/osmo_group_item.xml
@@ -13,8 +13,7 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="center_vertical"
-		android:paddingLeft="6dp"
-		android:src="@drawable/expandable_category_unpushed"/>
+		android:paddingLeft="6dp"/>
 
 	<TextView
 		android:id="@+id/category_name"
diff --git a/OsmAnd/res/layout/plugin.xml b/OsmAnd/res/layout/plugin.xml
index b048498434..42aa9a61e9 100644
--- a/OsmAnd/res/layout/plugin.xml
+++ b/OsmAnd/res/layout/plugin.xml
@@ -39,9 +39,7 @@
 				android:layout_marginBottom="9dp"
 				android:layout_marginTop="9dp"
 				android:background="?attr/expandable_list_item_background"
-				android:drawableLeft="?attr/ic_action_settings"
 				android:drawablePadding="10dp"
-				android:drawableStart="?attr/ic_action_settings"
 				android:paddingLeft="0dp"
 				android:paddingRight="16dp"
 				android:text="@string/shared_string_settings"
@@ -115,7 +113,7 @@
 			<ImageView
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:src="?attr/ic_world_globe"/>
+				android:id="@+id/ic_world_globe"/>
 
 			<net.osmand.plus.widgets.TextViewEx
 				android:layout_width="wrap_content"
diff --git a/OsmAnd/res/layout/plugins_list_item.xml b/OsmAnd/res/layout/plugins_list_item.xml
index 3f2dd7ab88..54e9253a9f 100644
--- a/OsmAnd/res/layout/plugins_list_item.xml
+++ b/OsmAnd/res/layout/plugins_list_item.xml
@@ -60,6 +60,6 @@
         android:layout_height="@dimen/dashListItemHeight"
         android:layout_gravity="center"
         android:background="?attr/options_button_background"
-        android:src="?attr/list_settings_icon" />
+        android:src="?attr/ic_action_overflow" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/search_address.xml b/OsmAnd/res/layout/search_address.xml
index 5f2fa23ac0..5233219159 100644
--- a/OsmAnd/res/layout/search_address.xml
+++ b/OsmAnd/res/layout/search_address.xml
@@ -45,7 +45,7 @@
                         android:id="@+id/ResetCountry"
                         android:layout_gravity="center_vertical"
                         android:layout_marginRight="5dp"
-                        android:background="?attr/reset_image"
+                        android:background="@drawable/ic_action_remove_dark"
                         android:contentDescription="@string/shared_string_clear" />
                 </TableRow>
 
@@ -67,7 +67,7 @@
                         android:id="@+id/ResetCity"
                         android:layout_gravity="center_vertical"
                         android:layout_marginRight="5dp"
-                        android:background="?attr/reset_image"
+                        android:background="@drawable/ic_action_remove_dark"
                         android:contentDescription="@string/shared_string_clear" />
                 </TableRow>
 
@@ -89,7 +89,7 @@
                         android:id="@+id/ResetStreet"
                         android:layout_gravity="center_vertical"
                         android:layout_marginRight="5dp"
-                        android:background="?attr/reset_image"
+                        android:background="@drawable/ic_action_remove_dark"
                         android:contentDescription="@string/shared_string_clear" />
                 </TableRow>
 
@@ -112,7 +112,7 @@
                         android:id="@+id/ResetBuilding"
                         android:layout_gravity="center_vertical"
                         android:layout_marginRight="5dp"
-                        android:background="?attr/reset_image"
+                        android:background="@drawable/ic_action_remove_dark"
                         android:contentDescription="@string/shared_string_clear" />
                 </TableRow>
             </TableLayout>
diff --git a/OsmAnd/res/layout/search_history_list_item.xml b/OsmAnd/res/layout/search_history_list_item.xml
index 8c4607949d..2889f00e64 100644
--- a/OsmAnd/res/layout/search_history_list_item.xml
+++ b/OsmAnd/res/layout/search_history_list_item.xml
@@ -90,7 +90,7 @@
             android:layout_gravity="center_vertical"
             android:background="?attr/options_button_background"
             android:focusable="false"
-            android:src="?attr/list_settings_icon"
+            android:src="?attr/ic_action_overflow"
             android:visibility="gone" />
 
         <ImageButton
@@ -100,7 +100,7 @@
             android:layout_gravity="center_vertical"
             android:layout_marginLeft="@dimen/dashFavIconMargin"
             android:background="?attr/dashboard_button"
-            android:src="@drawable/ic_action_gdirections_light"
+            android:src="@drawable/ic_action_remove_light"
             android:visibility="gone" />
     </LinearLayout>
 
diff --git a/OsmAnd/res/layout/search_transport.xml b/OsmAnd/res/layout/search_transport.xml
deleted file mode 100644
index a546497ab9..0000000000
--- a/OsmAnd/res/layout/search_transport.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- This file is at /res/layout/list.xml -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/RootLayout"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <ProgressBar
-            android:id="@+id/ProgressBar"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-        <Button
-            android:id="@+id/SearchTransportLevelButton"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1" />
-
-        <TextView
-            android:id="@+id/SearchAreaText"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="" />
-    </LinearLayout>
-
-    <RelativeLayout
-        android:id="@+id/RelativeLayout"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_gravity="center">
-
-        <ListView
-            android:id="@android:id/list"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_below="@+id/listView"/>
-
-        <ListView
-            android:id="@+id/listView"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"/>
-    </RelativeLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/search_transport_list_item.xml b/OsmAnd/res/layout/search_transport_list_item.xml
deleted file mode 100644
index 974ce2afd0..0000000000
--- a/OsmAnd/res/layout/search_transport_list_item.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:paddingLeft="@dimen/list_content_padding"
-    android:paddingRight="@dimen/list_content_padding"
-    android:orientation="horizontal">
-
-    <ImageView
-        android:id="@+id/search_icon"
-        android:layout_width="25dp"
-        android:layout_height="fill_parent"
-        android:paddingTop="2dp" />
-
-    <TextView
-        android:id="@+id/label"
-        style="@style/ListText.Small"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/search_transport_route_item.xml b/OsmAnd/res/layout/search_transport_route_item.xml
deleted file mode 100644
index a3e1ee7d2f..0000000000
--- a/OsmAnd/res/layout/search_transport_route_item.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:paddingLeft="@dimen/list_content_padding"
-    android:paddingRight="@dimen/list_content_padding"
-    android:orientation="horizontal">
-
-    <!-- 	<TextView android:id="@+id/distance_label" android:layout_marginLeft="5dp"
-            android:layout_width="80dp" android:layout_height="fill_parent" android:gravity="left"
-            android:textSize="20sp"/>  -->
-    <TextView
-        android:id="@+id/label"
-        style="@style/ListText"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1" />
-
-    <ImageButton
-        android:id="@+id/remove"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/reset_image"
-        android:contentDescription="@string/shared_string_delete"
-        android:paddingLeft="2dp"
-        android:paddingTop="2dp" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/values-large/sizes.xml b/OsmAnd/res/values-large/sizes.xml
index 519f16d700..8a5f59926d 100644
--- a/OsmAnd/res/values-large/sizes.xml
+++ b/OsmAnd/res/values-large/sizes.xml
@@ -1,29 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="dashHeaderHeight">60dp</dimen>
-    <dimen name="subHeaderPadding">3dp</dimen>
-    <dimen name="subHeaderMarginLeft">22dp</dimen>
-    <dimen name="showAllButtonMarginRight">21dp</dimen>
-    <dimen name="showAllButtonHeight">54dp</dimen>
-    <dimen name="dashListItemHeight">75dp</dimen>
-    <dimen name="dashFavIconSize">42dp</dimen>
-    <dimen name="dashFavIconMargin">18dp</dimen>
-    <dimen name="dashFavDirectionSize">15dp</dimen>
-    <dimen name="dashMapMargin">3dp</dimen>
-    <dimen name="dashProgressTextSize">27sp</dimen>
-    <dimen name="dashNoteIconSize">42dp</dimen>
-    <dimen name="dashPluginPadding">6dp</dimen>
-    <dimen name="dashPluginMargin">12dp</dimen>
-    <dimen name="dashSearchBtnHeight">135dp</dimen>
-    <dimen name="dashSearchPaddingTop">25dp</dimen>
-    <dimen name="dashSearchPaddingBot">15dp</dimen>
-    <dimen name="dashPadding">9dp</dimen>
-    <dimen name="dashAboutTextSize">30sp</dimen>
-    <dimen name="dashCardMargin">6dp</dimen>
+    <dimen name="map_trans_seek_size">120dp</dimen>
+	<dimen name="map_widget_text_size">35sp</dimen>
+	<dimen name="map_widget_text_size_small">23sp</dimen>
+	<dimen name="map_button_text_size">27sp</dimen>
+	<dimen name="map_route_buttons_width">90dp</dimen>
+	<dimen name="map_route_buttons_height">81dp</dimen>
+	<dimen name="map_route_buttons_height_land">72dp</dimen>
+	
+	<dimen name="map_address_height">60dp</dimen>
+	<dimen name="map_button_size">75dp</dimen>
+	<dimen name="map_ruler_width">180dp</dimen>
+	<dimen name="map_ruler_bottom_margin">14dp</dimen>
+	<dimen name="map_button_shadow_width">81dp</dimen>
+	<dimen name="map_alarm_size">116dp</dimen>
+	<dimen name="map_alarm_text_size">37sp</dimen>
+	
+	<dimen name="map_alarm_bottom_margin">140dp</dimen>
+	<dimen name="map_alarm_bottom_margin_land">78dp</dimen>
+	<dimen name="map_button_shadow_height">127dp</dimen>
+	<dimen name="map_widget_icon">32dp</dimen>
+	<dimen name="map_widget_height">48dp</dimen>
+	<dimen name="map_widget_image">120dp</dimen>
+	<dimen name="map_button_spacing">19dp</dimen>
+	<dimen name="map_button_spacing_land">12dp</dimen>
+	<dimen name="map_button_margin">6dp</dimen>
+	<dimen name="map_routing_progress_width">150dp</dimen>
+	
+	<dimen name="map_button_shadow_margin">4dp</dimen>
+	<dimen name="map_button_inset_shadow">2dp</dimen>
+	<dimen name="map_button_inset">6dp</dimen>
+	<dimen name="map_button_rect_rad">4dp</dimen>
+	<dimen name="map_button_stroke">1px</dimen>
 
-    <!-- TextSizes -->
-    <dimen name="showAllButtonTextSize">16sp</dimen>
-    <dimen name="subHeaderTextSize">21sp</dimen>
-    <dimen name="dashFavNameTextSize">24sp</dimen>
-    <dimen name="dashParkingTextSize">24sp</dimen>
+    
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values/attrs.xml b/OsmAnd/res/values/attrs.xml
index b305a00245..0e6e6fa55c 100644
--- a/OsmAnd/res/values/attrs.xml
+++ b/OsmAnd/res/values/attrs.xml
@@ -6,14 +6,10 @@
     <declare-styleable name="OsmAndTheme">
 		<attr name="list_divider" format="color"/>
         <attr name="expandable_category_color" format="reference"/>
-        <attr name="reset_image" format="reference"/>
         <attr name="bottomToolBarColor" format="color" />
 		<attr name="downloadButtonBackground" format="reference" />
 		<attr name="card_bg" format="reference" />
-		<attr name="ic_action_check" format="reference" />
-		<attr name="ic_extension" format="reference" />
-		<attr name="ic_overflow_menu" format="reference" />
-		<attr name="ic_plugin_options" format="reference" />
+		<attr name="ic_action_overflow" format="reference" />
 		<attr name="dashboardGeneralButtonStyle" format="reference" />
 		<attr name="options_button_background" format="reference"/>
 		<attr name="dashboardSubHeaderStyle" format="reference" />
@@ -24,17 +20,14 @@
 		<attr name="ic_action_home2" format="reference" />
 		<attr name="ic_action_marker2" format="reference" />
 		<attr name="search_background" format="reference" />
-		<attr name="ic_action_settings" format="reference" />
 		<attr name="switch_ex_background" format="reference" />
 		<attr name="switch_ex_text_color" format="color|reference" />
 		<attr name="bg_plugin_logo_disabled" format="reference" />
 		<attr name="plugin_details_header_bg" format="color|reference" />
 		<attr name="plugin_details_install_header_bg" format="color|reference" />
-		<attr name="ic_world_globe" format="reference" />
 		<attr name="plugin_description_header_text_color" format="color|reference" />
 		<attr name="expandable_list_item_background" format="color"/>
 		<attr name="expandable_list_background" format="color"/>
-		<attr name="list_settings_icon" format="reference"/>
 		<attr name="size_progress_bar" format="reference"/>
 		<attr name="dash_parking_bg" format="reference"/>
 		<attr name="osmo_header_background" format="color"/>
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index e6a3040b71..7a13ab49ff 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -118,9 +118,9 @@
     </style>
 
 	<style name="OsmandLightTheme" parent="Theme.AppCompat.Light">
+	    <item name="ic_action_overflow">@drawable/ic_overflow_menu_light</item>
 		<item name="options_button_background">@drawable/dashboard_button_light</item>
 		<item name="list_divider">@color/list_divider_dark</item>
-        <item name="reset_image">@drawable/ic_action_delete_light</item> <!--  @drawable/a_1_navigation_cancel_light -->
         <item name="expandable_category_color">?android:attr/colorBackground</item>
         <item name="bottomToolBarColor">@color/tool_bar_color_light</item>
 		<item name="downloadButtonBackground">@drawable/download_light</item>
@@ -134,10 +134,6 @@
         <item name="android:actionBarStyle">@style/Widget.Styled.ActionBarLight</item>
         <item name="actionBarStyle">@style/Widget.Styled.ActionBarLight</item>
 		<item name="card_bg">@drawable/bg_card_light</item>
-		<item name="ic_action_check">@drawable/ic_action_check_light</item>
-		<item name="ic_extension">@drawable/ic_extension_light</item>
-		<item name="ic_overflow_menu">@drawable/ic_overflow_menu_light</item>
-		<item name="ic_plugin_options">@drawable/ic_plugin_options_light</item>
 		<item name="dashboardGeneralButtonStyle">@style/DashboardGeneralButton.Light</item>
 		<item name="dashboardSubHeaderStyle">@style/DashboardSubHeader.Light</item>
 		<item name="dashboard_divider">@color/dashboard_divider_light</item>
@@ -147,7 +143,6 @@
 		<item name="ic_action_home2">@drawable/ic_action_home2_light</item>
 		<item name="ic_action_marker2">@drawable/ic_action_marker2_light</item>
         <item name="search_background">@color/search_background_dark</item>
-		<item name="ic_action_settings">@drawable/ic_action_settings_light</item>
         <item name="android:actionModeCloseDrawable">@drawable/action_mode_back</item>
         <item name="actionModeCloseDrawable">@drawable/action_mode_back</item>
         <item name="android:actionModeStyle">@style/WhiteActionMode</item>
@@ -159,20 +154,18 @@
 		<item name="bg_plugin_logo_disabled">@drawable/bg_plugin_logo_disabled_light</item>
 		<item name="plugin_details_header_bg">@color/plugin_details_header_bg_light</item>
 		<item name="plugin_details_install_header_bg">@color/plugin_details_install_header_bg_light</item>
-		<item name="ic_world_globe">@drawable/ic_world_globe_light</item>
 		<item name="plugin_description_header_text_color">#727272</item>
 		<item name="expandable_list_item_background">@drawable/expandable_list_item_background_light</item>
 		<item name="expandable_list_background">@color/color_white</item>
-		<item name="list_settings_icon">@drawable/ic_overflow_menu_light</item>
 		<item name="size_progress_bar">@drawable/size_progressbar_light</item>
 		<item name="dash_parking_bg">@drawable/dash_parking_light</item>
 		<item name="osmo_header_background">@color/osmo_header_light</item>
 	</style>
 
     <style name="OsmandDarkTheme" parent="Theme.AppCompat">
+        <item name="ic_action_overflow">@drawable/ic_overflow_menu_dark</item>
 		<item name="options_button_background">@drawable/dashboard_button_dark</item>
 		<item name="list_divider">@color/list_divider_light</item>
-        <item name="reset_image">@drawable/ic_action_delete_dark</item> <!--  @drawable/a_1_navigation_cancel_dark -->
         <item name="expandable_category_color">?android:attr/colorBackground</item>
         <item name="bottomToolBarColor">@color/tool_bar_color_dark</item>
 		<item name="downloadButtonBackground">@drawable/download_dark</item>
@@ -185,10 +178,6 @@
         <item name="android:actionBarStyle">@style/Widget.Styled.ActionBarDark</item>
         <item name="actionBarStyle">@style/Widget.Styled.ActionBarDark</item>
 		<item name="card_bg">@drawable/bg_card_dark</item>
-		<item name="ic_action_check">@drawable/ic_action_check_dark</item>
-		<item name="ic_extension">@drawable/ic_extension_dark</item>
-		<item name="ic_overflow_menu">@drawable/ic_overflow_menu_dark</item>
-		<item name="ic_plugin_options">@drawable/ic_plugin_options_dark</item>
 		<item name="dashboardGeneralButtonStyle">@style/DashboardGeneralButton.Dark</item>
 		<item name="dashboardSubHeaderStyle">@style/DashboardSubHeader.Dark</item>
 		<item name="dashboard_divider">@color/dashboard_divider_dark</item>
@@ -198,17 +187,14 @@
 		<item name="ic_action_home2">@drawable/ic_action_home2_dark</item>
 		<item name="ic_action_marker2">@drawable/ic_action_marker2_dark</item>
 		<item name="search_background">@color/color_white</item>
-		<item name="ic_action_settings">@drawable/ic_action_settings_dark</item>
 		<item name="switch_ex_background">@drawable/switch_ex_background_dark</item>
 		<item name="switch_ex_text_color">@color/switch_ex_button_text_dark</item>
 		<item name="bg_plugin_logo_disabled">@drawable/bg_plugin_logo_disabled_dark</item>
 		<item name="plugin_details_header_bg">@color/list_item_background_dark</item>
 		<item name="plugin_details_install_header_bg">@color/plugin_details_install_header_bg_dark</item>
-		<item name="ic_world_globe">@drawable/ic_world_globe_dark</item>
 		<item name="plugin_description_header_text_color">#70818c</item>
 		<item name="expandable_list_item_background">@drawable/expandable_list_item_background_dark</item>
 		<item name="expandable_list_background">@color/list_background_dark</item>
-		<item name="list_settings_icon">@drawable/ic_overflow_menu_dark</item>
 		<item name="size_progress_bar">@drawable/size_progressbar_dark</item>
 		<item name="dash_parking_bg">@drawable/dash_parking_dark</item>
 		<item name="osmo_header_background">@color/osmo_header_dark</item>
diff --git a/OsmAnd/src/net/osmand/access/AccessibilityPlugin.java b/OsmAnd/src/net/osmand/access/AccessibilityPlugin.java
index cd02bc3a24..a096d0c5a4 100644
--- a/OsmAnd/src/net/osmand/access/AccessibilityPlugin.java
+++ b/OsmAnd/src/net/osmand/access/AccessibilityPlugin.java
@@ -4,12 +4,7 @@ import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
-import net.osmand.plus.activities.SettingsActivity;
 import android.app.Activity;
-import android.content.Intent;
-import android.preference.Preference;
-import android.preference.Preference.OnPreferenceClickListener;
-import android.preference.PreferenceScreen;
 
 public class AccessibilityPlugin extends OsmandPlugin {
 	private static final String ID = "osmand.accessibility";
@@ -54,7 +49,6 @@ public class AccessibilityPlugin extends OsmandPlugin {
 	
 	@Override
 	public int getLogoResourceId() {
-		// TODO
-		return super.getLogoResourceId();
+		return R.drawable.ic_plugin_accessibility;
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/ApplicationMode.java b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
index 4d2e877e08..8bcda3ede2 100644
--- a/OsmAnd/src/net/osmand/plus/ApplicationMode.java
+++ b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
@@ -21,33 +21,33 @@ public class ApplicationMode {
 	 * DEFAULT("Browse map"), CAR("Car"), BICYCLE("Bicycle"), PEDESTRIAN("Pedestrian");
 	 */
 	public static final ApplicationMode DEFAULT = create(R.string.app_mode_default, "default").speed(1.5f, 5).arrivalDistance(90).defLocation().
-			icon(R.drawable.ic_browse_map, R.drawable.app_mode_globus_light, R.drawable.app_mode_globus_dark).reg();
+			icon(R.drawable.ic_browse_map, R.drawable.app_mode_globus_dark).reg();
 	
 	public static final ApplicationMode CAR = create(R.string.app_mode_car, "car").speed(15.3f, 35).arrivalDistance(90).carLocation().
-			icon(R.drawable.ic_car, R.drawable.ic_action_car_light, R.drawable.ic_action_car_dark).reg();
+			icon(R.drawable.ic_car, R.drawable.ic_action_car_dark).reg();
 	
 	public static final ApplicationMode BICYCLE = create(R.string.app_mode_bicycle, "bicycle").speed(5.5f, 15).arrivalDistance(60).bicycleLocation().
-			icon(R.drawable.ic_bicycle, R.drawable.ic_action_bicycle_light, R.drawable.ic_action_bicycle_dark).reg();
+			icon(R.drawable.ic_bicycle, R.drawable.ic_action_bicycle_dark).reg();
 	
 	public static final ApplicationMode PEDESTRIAN = create(R.string.app_mode_pedestrian, "pedestrian").speed(1.5f, 5).arrivalDistance(45).
-			icon(R.drawable.ic_pedestrian, R.drawable.ic_action_pedestrian_light, R.drawable.ic_action_pedestrian_dark).reg();
+			icon(R.drawable.ic_pedestrian, R.drawable.ic_action_pedestrian_dark).reg();
 	
 	public static final ApplicationMode AIRCRAFT = create(R.string.app_mode_aircraft, "aircraft").speed(40f, 100).carLocation().
-			icon(R.drawable.ic_aircraft, R.drawable.ic_action_aircraft_light, R.drawable.ic_action_aircraft_dark).reg();
+			icon(R.drawable.ic_aircraft,R.drawable.ic_action_aircraft_dark).reg();
 	
 	public static final ApplicationMode BOAT = create(R.string.app_mode_boat, "boat").speed(5.5f, 20).carLocation().
-			icon(R.drawable.ic_sail_boat, R.drawable.ic_action_sail_boat_light, R.drawable.ic_action_sail_boat_dark).reg();
+			icon(R.drawable.ic_sail_boat, R.drawable.ic_action_sail_boat_dark).reg();
 	
 	public static final ApplicationMode HIKING = create(R.string.app_mode_hiking, "hiking").speed(1.5f, 5).parent(PEDESTRIAN).
-			icon(R.drawable.ic_trekking, R.drawable.ic_action_trekking_light, R.drawable.ic_action_trekking_dark).reg();
+			icon(R.drawable.ic_trekking, R.drawable.ic_action_trekking_dark).reg();
 	
 	public static final ApplicationMode MOTORCYCLE = create(R.string.app_mode_motorcycle, "motorcycle").speed(15.3f, 40).
 			carLocation().parent(CAR).
-			icon(R.drawable.ic_motorcycle, R.drawable.ic_action_motorcycle_light, R.drawable.ic_action_motorcycle_dark).reg();
+			icon(R.drawable.ic_motorcycle, R.drawable.ic_action_motorcycle_dark).reg();
 	
 	public static final ApplicationMode TRUCK = create(R.string.app_mode_truck, "truck").speed(15.3f, 40).
 			carLocation().parent(CAR).
-			icon(R.drawable.ic_truck, R.drawable.ic_action_truck_light, R.drawable.ic_action_truck_dark).reg();
+			icon(R.drawable.ic_truck, R.drawable.ic_action_truck_dark).reg();
 	
 	static {
 		ApplicationMode[] exceptPedestrianAndDefault = new ApplicationMode[] { CAR, BICYCLE, BOAT, AIRCRAFT };
@@ -94,9 +94,8 @@ public class ApplicationMode {
 			return applicationMode;
 		}
 		
-		public ApplicationModeBuilder icon(int bigIcon, int smallIconLight, int smallIconDark) {
+		public ApplicationModeBuilder icon(int bigIcon, int smallIconDark) {
 			applicationMode.iconId = bigIcon;
-			applicationMode.smallIconLight = smallIconLight;
 			applicationMode.smallIconDark = smallIconDark;
 			return this;
 		}
@@ -150,7 +149,6 @@ public class ApplicationMode {
 	private ApplicationMode parent;
 	private int iconId = R.drawable.ic_browse_map;
 	private int smallIconDark = R.drawable.app_mode_globus_dark ;
-	private int smallIconLight = R.drawable.app_mode_globus_light ;
 	private float defaultSpeed = 10f;
 	private int minDistanceForTurn = 50;
 	private int arrivalDistance = 90;
@@ -235,8 +233,8 @@ public class ApplicationMode {
 		return parent;
 	}
 	
-	public int getSmallIcon(boolean nightMode) {
-		return nightMode? smallIconDark : smallIconLight;
+	public int getSmallIconDark() {
+		return smallIconDark ;
 	}
 	
 	public boolean hasFastSpeed(){
diff --git a/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java b/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java
index c0b81de131..292a95ce96 100644
--- a/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java
@@ -1,6 +1,5 @@
 package net.osmand.plus;
 
-import android.widget.*;
 import gnu.trove.list.array.TIntArrayList;
 
 import java.util.ArrayList;
@@ -8,15 +7,21 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 
+import net.osmand.plus.activities.actions.AppModeDialog;
+import net.osmand.plus.dialogs.ConfigureMapMenu;
 import android.app.Activity;
 import android.content.Context;
 import android.graphics.Typeface;
+import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
-import net.osmand.plus.activities.actions.AppModeDialog;
-import net.osmand.plus.dialogs.ConfigureMapMenu;
+import android.widget.ImageView;
+import android.widget.ProgressBar;
+import android.widget.TextView;
 
 public class ContextMenuAdapter {
 
@@ -124,11 +129,17 @@ public class ContextMenuAdapter {
 		selectedList.set(pos, s);
 	}
 	
-	public int getImageId(int pos, boolean light) {
-		if(!light || iconListLight.get(pos) == 0) {
-			return iconList.get(pos);
+	
+	public Drawable getImage(OsmandApplication ctx, int pos, boolean light) {
+		int lst = iconList.get(pos);
+		if(lst != 0) {
+			return ctx.getResources().getDrawable(lst);
 		}
-		return iconListLight.get(pos);
+		int lstLight = iconListLight.get(pos);
+		if(lstLight != 0) {
+			return ctx.getIconsCache().getActionBarIcon(lstLight, light);
+		}
+		return null;
 	}
 	
 	public int getBackgroundColor(Context ctx, boolean holoLight) {
@@ -178,10 +189,9 @@ public class ContextMenuAdapter {
 			this.icon = icon;
 			return this;
 		}
-
-		public Item icons(int icon, int lightIcon) {
-			this.icon = icon;
-			this.lightIcon = lightIcon;
+		
+		public Item iconColor(int icon) {
+			this.lightIcon = icon;
 			return this;
 		}
 
@@ -236,6 +246,8 @@ public class ContextMenuAdapter {
 			return this;
 		}
 
+		
+
 	}
 	
 	public String[] getItemNames() {
@@ -276,6 +288,7 @@ public class ContextMenuAdapter {
 	
 	public ArrayAdapter<?> createListAdapter(final Activity activity, final boolean holoLight) {
 		final int layoutId = defaultLayoutId;
+		final OsmandApplication app = ((OsmandApplication) activity.getApplication());
 		ArrayAdapter<String> listAdapter = new ArrayAdapter<String>(activity, layoutId, R.id.title,
 				getItemNames()) {
 			@Override
@@ -289,7 +302,7 @@ public class ContextMenuAdapter {
 						@Override
 						public void onClick(View view) {
 							if (selected.size() > 0) {
-								((OsmandApplication) activity.getApplication()).getSettings().APPLICATION_MODE.set(selected.iterator().next());
+								app.getSettings().APPLICATION_MODE.set(selected.iterator().next());
 								notifyDataSetChanged();
 							}
 							if (changeAppModeListener != null) {
@@ -305,9 +318,9 @@ public class ContextMenuAdapter {
 				TextView tv = (TextView) v.findViewById(R.id.title);
 				tv.setText(isCategory(position) ? getItemName(position).toUpperCase() : getItemName(position));
 
-				int imageId = getImageId(position, holoLight);
-				if (imageId != 0) {
-					((ImageView) v.findViewById(R.id.icon)).setImageResource(imageId);
+				Drawable imageId = getImage(app, position, holoLight);
+				if (imageId != null) {
+					((ImageView) v.findViewById(R.id.icon)).setImageDrawable(imageId);
 					v.findViewById(R.id.icon).setVisibility(View.VISIBLE);
 				} else if (v.findViewById(R.id.icon) != null){
 					v.findViewById(R.id.icon).setVisibility(View.GONE);
diff --git a/OsmAnd/src/net/osmand/plus/IconsCache.java b/OsmAnd/src/net/osmand/plus/IconsCache.java
index 56859e2713..09796c54f6 100644
--- a/OsmAnd/src/net/osmand/plus/IconsCache.java
+++ b/OsmAnd/src/net/osmand/plus/IconsCache.java
@@ -28,14 +28,6 @@ public class IconsCache {
 		return d;
 	}
 	
-	public Drawable getContentIcon(int id, int lightContentColor, int darkContentColor) {
-		return getDrawable(id, app.getSettings().isLightContent() ? lightContentColor : darkContentColor);
-	}
-	
-	public Drawable getContentIcon(int id, int lightContentColor) {
-		return getDrawable(id, app.getSettings().isLightContent() ? lightContentColor : 0);
-	}
-	
 	public Drawable getIcon(int id, int colorId) {
 		return getDrawable(id, colorId);
 	}
@@ -45,4 +37,13 @@ public class IconsCache {
 		return getDrawable(id, app.getSettings().isLightContent() ? R.color.icon_color_light : 0);
 	}
 
+
+	public Drawable getActionBarIcon(int id) {
+		return getDrawable(id, app.getSettings().isLightActionBar() ? R.color.icon_color_light : 0);
+	}
+	
+	public Drawable getActionBarIcon(int id, boolean light) {
+		return getDrawable(id, light ? R.color.icon_color_light : 0);
+	}
+
 }
diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index 7865dd2e04..930b2306d3 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -1774,7 +1774,7 @@ public class OsmandSettings {
 			new IntPreference("osmand_theme", OSMAND_DARK_THEME).makeGlobal().cache();
 	
 	public boolean isLightActionBar(){
-		return OSMAND_THEME.get() == OSMAND_LIGHT_THEME;
+		return true;
 	}
 	
 
diff --git a/OsmAnd/src/net/osmand/plus/activities/EditPOIFilterActivity.java b/OsmAnd/src/net/osmand/plus/activities/EditPOIFilterActivity.java
index 4b675097bf..cd4c3c700f 100644
--- a/OsmAnd/src/net/osmand/plus/activities/EditPOIFilterActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/EditPOIFilterActivity.java
@@ -105,15 +105,15 @@ public class EditPOIFilterActivity extends OsmandListActivity {
 			return super.onCreateOptionsMenu(menu);
 		}
 		createMenuItem(menu, SAVE_FILTER, R.string.edit_filter_save_as_menu_item, 
-				R.drawable.ic_action_gsave_dark, R.drawable.ic_action_gsave_dark ,
+				R.drawable.ic_action_gsave_dark ,
 				MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
 		createMenuItem(menu, FILTER, R.string.filter_current_poiButton, 
-				0, 0,
+				0, 
 				//R.drawable.a_1_navigation_accept_light, R.drawable.a_1_navigation_accept_dark,
 				MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT | MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
 		if(!filter.isStandardFilter()){
 			createMenuItem(menu, DELETE_FILTER, R.string.shared_string_delete, 
-					R.drawable.ic_action_gdiscard_dark, R.drawable.ic_action_gdiscard_dark,
+					R.drawable.ic_action_delete_light,
 					MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
 		}
 		return super.onCreateOptionsMenu(menu);
diff --git a/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java b/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java
index 535b5c89d9..d21f71c879 100644
--- a/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java
@@ -111,16 +111,16 @@ public class HelpActivity extends OsmandActionBarActivity {
 			getClearToolbar(false);
 		}
 		createMenuItem(menu, HOME, R.string.home, 
-				R.drawable.ic_action_home_dark, R.drawable.ic_action_home_dark,
+				R.drawable.ic_action_home_dark,
 				MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
 		createMenuItem(menu, BACK, R.string.shared_string_previous,
-				R.drawable.ic_action_undo_dark, R.drawable.ic_action_undo_dark,
+				R.drawable.ic_action_undo_dark,
 				MenuItemCompat.SHOW_AS_ACTION_ALWAYS );
 		createMenuItem(menu, FORWARD, R.string.shared_string_next,
-				R.drawable.ic_action_redo_dark, R.drawable.ic_action_redo_dark,
+				R.drawable.ic_action_redo_dark,
 				MenuItemCompat.SHOW_AS_ACTION_ALWAYS );
 		createMenuItem(menu, CLOSE, R.string.shared_string_close, 
-				R.drawable.ic_action_close_dark, R.drawable.ic_action_close_dark,
+				R.drawable.ic_action_close_dark,
 				MenuItemCompat.SHOW_AS_ACTION_ALWAYS );
 		return super.onCreateOptionsMenu(menu);
 	}
@@ -152,11 +152,10 @@ public class HelpActivity extends OsmandActionBarActivity {
 		return false;
 	}
 	
-	public MenuItem createMenuItem(Menu m, int id, int titleRes, int iconLight, int iconDark, int menuItemType) {
-		int r = isLightActionBar() ? iconLight : iconDark;
+	public MenuItem createMenuItem(Menu m, int id, int titleRes, int iconDark, int menuItemType) {
 		MenuItem menuItem = m.add(0, id, 0, titleRes);
-		if (r != 0) {
-			menuItem.setIcon(r);
+		if (iconDark != 0) {
+			menuItem.setIcon(getMyApplication().getIconsCache().getActionBarIcon(iconDark));
 		}
 		MenuItemCompat.setShowAsAction(menuItem, menuItemType);
 		menuItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
@@ -168,10 +167,6 @@ public class HelpActivity extends OsmandActionBarActivity {
 		return menuItem;
 	}
 	
-	public boolean isLightActionBar() {
-		return ((OsmandApplication) getApplication()).getSettings().isLightActionBar();
-	}
-
 	public Toolbar getClearToolbar(boolean visible) {
 		final Toolbar tb = (Toolbar) findViewById(R.id.bottomControls);
 		tb.setTitle(null);
diff --git a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
index f6265c8202..33dae4689a 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
@@ -159,12 +159,12 @@ public class MainMenuActivity extends BaseDownloadActivity implements OsmAndLoca
 
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
-		MenuItem menuItem = menu.add(0, HELP_ID, 0, R.string.shared_string_help).setIcon(R.drawable.ic_ac_help);
-		MenuItemCompat.setShowAsAction(menuItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
-		menuItem = menu.add(0, SETTINGS_ID, 0, R.string.shared_string_settings).setIcon(R.drawable.ic_ac_settings);
-		MenuItemCompat.setShowAsAction(menuItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
-		menuItem = menu.add(0, EXIT_ID, 0, R.string.shared_string_exit).setIcon(R.drawable.ic_ac_close);
-		MenuItemCompat.setShowAsAction(menuItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+//		MenuItem menuItem = menu.add(0, HELP_ID, 0, R.string.shared_string_help).setIcon(R.drawable.ic_ac_help);
+//		MenuItemCompat.setShowAsAction(menuItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+//		menuItem = menu.add(0, SETTINGS_ID, 0, R.string.shared_string_settings).setIcon(R.drawable.ic_ac_settings);
+//		MenuItemCompat.setShowAsAction(menuItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+//		menuItem = menu.add(0, EXIT_ID, 0, R.string.shared_string_exit).setIcon(R.drawable.ic_ac_close);
+//		MenuItemCompat.setShowAsAction(menuItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
 		return true;
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
index 644ff213ee..b7e6a23c4a 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
@@ -34,7 +34,6 @@ import net.osmand.plus.TargetPointsHelper;
 import net.osmand.plus.activities.actions.OsmAndDialogs;
 import net.osmand.plus.activities.actions.ShareLocation;
 import net.osmand.plus.activities.search.SearchActivity;
-import net.osmand.plus.development.OsmandDevelopmentPlugin;
 import net.osmand.plus.dialogs.ConfigureMapMenu;
 import net.osmand.plus.dialogs.FavoriteDialogs;
 import net.osmand.plus.helpers.WaypointDialogHelper;
@@ -50,6 +49,7 @@ import android.app.AlertDialog.Builder;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.view.View;
@@ -292,28 +292,24 @@ public class MapActivityActions implements DialogProvider {
 		final ContextMenuAdapter adapter = iadapter == null ? new ContextMenuAdapter(mapActivity) : iadapter;
 
 		if(!mapActivity.getRoutingHelper().isFollowingMode() && !mapActivity.getRoutingHelper().isRoutePlanningMode()) {
-			adapter.item(R.string.context_menu_item_directions_to).icons(
-					R.drawable.ic_action_gdirections_dark, R.drawable.ic_action_gdirections_light).reg();
-			adapter.item(R.string.context_menu_item_directions_from).icons(
-					R.drawable.ic_action_gdirections_dark, R.drawable.ic_action_gdirections_light).reg();
+			adapter.item(R.string.context_menu_item_directions_to).iconColor(
+					R.drawable.ic_action_gdirections_dark).reg();
+			adapter.item(R.string.context_menu_item_directions_from).iconColor(
+					R.drawable.ic_action_gdirections_dark).reg();
 		}
 		final TargetPointsHelper targets = getMyApplication().getTargetPointsHelper();
 		if(targets.getPointToNavigate() != null) {
-			adapter.item(R.string.context_menu_item_destination_point).icons(R.drawable.ic_action_flag_dark,
-					R.drawable.ic_action_flag_light).reg();
-			adapter.item(R.string.context_menu_item_intermediate_point).icons(R.drawable.ic_action_flage_dark,
-					R.drawable.ic_action_flage_light).reg();
+			adapter.item(R.string.context_menu_item_destination_point).iconColor(R.drawable.ic_action_flag_dark).reg();
+			adapter.item(R.string.context_menu_item_intermediate_point).iconColor(R.drawable.ic_action_flage_dark).reg();
 		// For button-less search UI
 		} else {
-			adapter.item(R.string.context_menu_item_destination_point).icons(R.drawable.ic_action_flag_dark,
-					R.drawable.ic_action_flag_light).reg();
+			adapter.item(R.string.context_menu_item_destination_point).iconColor(R.drawable.ic_action_flag_dark).reg();
 		}
-		adapter.item(R.string.context_menu_item_search).icons(R.drawable.ic_action_search_dark, 
-				R.drawable.ic_action_search_light).reg();
-		adapter.item(R.string.context_menu_item_share_location).icons(
-				R.drawable.ic_action_gshare_dark, R.drawable.ic_action_gshare_light).reg();
-		adapter.item(R.string.shared_string_add_to_favorites).icons(
-				R.drawable.ic_action_fav_dark, R.drawable.ic_action_fav_light ).reg();
+		adapter.item(R.string.context_menu_item_search).iconColor(R.drawable.ic_action_search_dark).reg();
+		adapter.item(R.string.context_menu_item_share_location).iconColor(
+				R.drawable.ic_action_gshare_dark).reg();
+		adapter.item(R.string.shared_string_add_to_favorites).iconColor(
+				R.drawable.ic_action_fav_dark).reg();
 		
 		
 
@@ -655,15 +651,12 @@ public class MapActivityActions implements DialogProvider {
 			boolean mute = routingHelper.getVoiceRouter().isMute();
 			int t = mute ? R.string.menu_mute_on : R.string.menu_mute_off;
 			int icon;
-			int iconLight;
 			if(mute) {
 				icon = R.drawable.a_10_device_access_volume_muted_dark;
-				iconLight = R.drawable.a_10_device_access_volume_muted_light;
 			} else{
 				icon = R.drawable.a_10_device_access_volume_on_dark;
-				iconLight = R.drawable.a_10_device_access_volume_on_light;
 			}
-			optionsMenuHelper.item(t).icons(icon, iconLight)
+			optionsMenuHelper.item(t).iconColor(icon)
 				.listen(new OnContextMenuClick() {
 				@Override
 				public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
@@ -674,7 +667,7 @@ public class MapActivityActions implements DialogProvider {
 		}
 		if(!routingHelper.isFollowingMode() && !routingHelper.isRoutePlanningMode()) {
 			optionsMenuHelper.item(R.string.get_directions)
-				.icons(R.drawable.ic_action_gdirections_dark, R.drawable.ic_action_gdirections_light)
+				.iconColor(R.drawable.ic_action_gdirections_dark)
 				.listen(new OnContextMenuClick() {
 					@Override
 						public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
@@ -686,7 +679,7 @@ public class MapActivityActions implements DialogProvider {
 			optionsMenuHelper.item(
 					routingHelper.isRoutePlanningMode() ? R.string.continue_navigation :
 					R.string.pause_navigation)
-			.icons(R.drawable.ic_action_gdirections_dark, R.drawable.ic_action_gdirections_light)
+			.iconColor(R.drawable.ic_action_gdirections_dark)
 			.listen(new OnContextMenuClick() {
 				@Override
 					public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
@@ -713,7 +706,7 @@ public class MapActivityActions implements DialogProvider {
 			} else {
 				nav = R.string.clear_destination;
 			}
-			optionsMenuHelper.item(nav).icons(R.drawable.ic_action_remove_dark, R.drawable.ic_action_remove_light) 
+			optionsMenuHelper.item(nav).iconColor(R.drawable.ic_action_remove_dark) 
 				.listen(new OnContextMenuClick() {
 				@Override
 				public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
@@ -727,7 +720,7 @@ public class MapActivityActions implements DialogProvider {
 			}).reg();
 		}
 		if (getTargets().getPointToNavigate() != null) {
-			optionsMenuHelper.item(R.string.target_points).icons(R.drawable.ic_action_flage_dark, R.drawable.ic_action_flage_light)
+			optionsMenuHelper.item(R.string.target_points).iconColor(R.drawable.ic_action_flage_dark)
 					.listen(new OnContextMenuClick() {
 						@Override
 						public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos,
@@ -739,7 +732,7 @@ public class MapActivityActions implements DialogProvider {
 		}
 		if(routingHelper.isRouteCalculated()) {
 			optionsMenuHelper.item(R.string.impassable_road)
-			.icons(R.drawable.ic_action_road_works_dark, R.drawable.ic_action_road_works_light)
+			.iconColor(R.drawable.ic_action_road_works_dark)
 			.listen(new OnContextMenuClick() {
 				@Override
 					public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
@@ -751,7 +744,7 @@ public class MapActivityActions implements DialogProvider {
 		
 		// 5-9. Default actions (Layers, Configure Map screen, Settings, Search, Favorites) 
 		optionsMenuHelper.item(R.string.search_button)
-				.icons(R.drawable.ic_action_search_dark, R.drawable.ic_action_search_light)
+				.iconColor(R.drawable.ic_action_search_dark)
 				.listen(new OnContextMenuClick() {
 					@Override
 					public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
@@ -768,7 +761,7 @@ public class MapActivityActions implements DialogProvider {
 				}).reg();
 
 		optionsMenuHelper.item(R.string.shared_string_my_places)
-				.icons(R.drawable.ic_action_fav_dark, R.drawable.ic_action_fav_light).listen(new OnContextMenuClick() {
+				.iconColor(R.drawable.ic_action_fav_dark).listen(new OnContextMenuClick() {
 					@Override
 					public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
 						Intent newIntent = new Intent(mapActivity, mapActivity.getMyApplication().getAppCustomization()
@@ -781,7 +774,7 @@ public class MapActivityActions implements DialogProvider {
 		
 
 		optionsMenuHelper.item(R.string.show_point_options)
-		.icons(R.drawable.ic_action_marker_dark, R.drawable.ic_action_marker_light)
+		.iconColor(R.drawable.ic_action_marker_dark)
 		.listen(new OnContextMenuClick() {
 			@Override
 			public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
@@ -790,7 +783,7 @@ public class MapActivityActions implements DialogProvider {
 			}
 		}).reg();
 
-		optionsMenuHelper.item(R.string.configure_map).icons(R.drawable.ic_action_layers_dark, R.drawable.ic_action_layers_light)
+		optionsMenuHelper.item(R.string.configure_map).iconColor(R.drawable.ic_action_layers_dark)
 				.listen(new OnContextMenuClick() {
 					@Override
 					public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
@@ -799,7 +792,7 @@ public class MapActivityActions implements DialogProvider {
 					}
 				}).reg();
 
-		optionsMenuHelper.item(R.string.layer_map_appearance).icons(R.drawable.ic_configure_screen_dark, R.drawable.ic_configure_screen_light)
+		optionsMenuHelper.item(R.string.layer_map_appearance).iconColor(R.drawable.ic_configure_screen_dark)
 			.listen(new OnContextMenuClick() {
 				@Override
 				public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
@@ -809,7 +802,7 @@ public class MapActivityActions implements DialogProvider {
 			}).reg();
 
 		optionsMenuHelper.item(R.string.shared_string_settings)
-		.icons(R.drawable.ic_action_settings_enabled_dark, R.drawable.ic_action_settings_enabled_light)
+		.iconColor(R.drawable.ic_action_settings_enabled_dark)
 		.listen(new OnContextMenuClick() {
 			@Override
 			public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
@@ -821,7 +814,7 @@ public class MapActivityActions implements DialogProvider {
 
 		//////////// Others
 		OsmandPlugin.registerOptionsMenu(mapActivity, optionsMenuHelper);
-		optionsMenuHelper.item(R.string.shared_string_exit).icons(R.drawable.ic_action_quit_dark, R.drawable.ic_action_quit_light )
+		optionsMenuHelper.item(R.string.shared_string_exit).icon(R.drawable.ic_action_quit_dark )
 					.listen(new OnContextMenuClick() {
 			@Override
 			public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
@@ -969,9 +962,9 @@ public class MapActivityActions implements DialogProvider {
 			for (int i = 0; i < qa.length(); i++) {
 
 				ActionItem ai = new ActionItem();
-				int id = qa.getImageId(i, true);
-				if (id != 0) {
-					ai.setIcon(activity.getResources().getDrawable(id));
+				Drawable id = qa.getImage(app, i, true);
+				if (id != null) {
+					ai.setIcon(id);
 				}
 				final int ki = i;
 				ai.setTitle(qa.getItemName(i));
diff --git a/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java b/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java
index 0d8bd57e91..4c6e8b3dbf 100644
--- a/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java
@@ -122,7 +122,7 @@ public class NavigatePointFragment extends Fragment implements SearchActivityChi
 		}
 		MenuItem menuItem = menu.add(0, NAVIGATE_TO, 0, R.string.context_menu_item_directions_to);
 		MenuItemCompat.setShowAsAction(menuItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
-		menuItem = menuItem.setIcon(light ? R.drawable.ic_action_gdirections_light : R.drawable.ic_action_gdirections_dark);
+		menuItem = menuItem.setIcon(app.getIconsCache().getActionBarIcon(R.drawable.ic_action_gdirections_dark, light));
 		menuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
 
 			@Override
@@ -135,13 +135,11 @@ public class NavigatePointFragment extends Fragment implements SearchActivityChi
 		if (targets.getPointToNavigate() != null) {
 			menuItem = menu.add(0, ADD_WAYPOINT, 0, R.string.context_menu_item_intermediate_point);
 			MenuItemCompat.setShowAsAction(menuItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
-			menuItem = menuItem.setIcon(light ? R.drawable.ic_action_flage_light
-					: R.drawable.ic_action_flage_dark);
+			menuItem = menuItem.setIcon(app.getIconsCache().getActionBarIcon(R.drawable.ic_action_flage_dark, light));
 		} else {
 			menuItem = menu.add(0, ADD_WAYPOINT, 0, R.string.context_menu_item_destination_point);
 			MenuItemCompat.setShowAsAction(menuItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
-			menuItem = menuItem.setIcon(light ? R.drawable.ic_action_flag_light
-					: R.drawable.ic_action_flag_dark);
+			menuItem = menuItem.setIcon(app.getIconsCache().getActionBarIcon(R.drawable.ic_action_flag_dark, light));
 		}
 			menuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
 				@Override
@@ -153,7 +151,7 @@ public class NavigatePointFragment extends Fragment implements SearchActivityChi
 		//}
 		menuItem = menu.add(0, SHOW_ON_MAP, 0, R.string.shared_string_show_on_map);
 		MenuItemCompat.setShowAsAction(menuItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
-		menuItem = menuItem.setIcon(light ? R.drawable.ic_action_marker_light : R.drawable.ic_action_marker_dark);
+		menuItem = menuItem.setIcon(app.getIconsCache().getActionBarIcon(R.drawable.ic_action_marker_dark, light));
 
 		menuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
 			@Override
@@ -165,7 +163,7 @@ public class NavigatePointFragment extends Fragment implements SearchActivityChi
 		
 		menuItem = menu.add(0, ADD_TO_FAVORITE, 0, R.string.shared_string_add_to_favorites);
 		MenuItemCompat.setShowAsAction(menuItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
-		menuItem = menuItem.setIcon(light ? R.drawable.ic_action_fav_light : R.drawable.ic_action_fav_dark);
+		menuItem = menuItem.setIcon(app.getIconsCache().getActionBarIcon(R.drawable.ic_action_fav_dark, light));
 
 		menuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
 			@Override
diff --git a/OsmAnd/src/net/osmand/plus/activities/OpeningHoursView.java b/OsmAnd/src/net/osmand/plus/activities/OpeningHoursView.java
index cf3cfb86db..a7d00b7cb3 100644
--- a/OsmAnd/src/net/osmand/plus/activities/OpeningHoursView.java
+++ b/OsmAnd/src/net/osmand/plus/activities/OpeningHoursView.java
@@ -5,6 +5,7 @@ import java.util.Arrays;
 import java.util.Calendar;
 import java.util.List;
 
+import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.util.OpeningHoursParser.BasicOpeningHourRule;
 import net.osmand.util.OpeningHoursParser.OpeningHoursRule;
@@ -35,9 +36,11 @@ public class OpeningHoursView {
 	
 	private boolean notifyingTime = true;
 	private ListView list;
+	private OsmandApplication app;
 
 	public OpeningHoursView(Context ctx){
 		this.ctx = ctx;
+		app = (OsmandApplication) ctx.getApplicationContext();
 	}
 	
 	public View createOpeningHoursEditView(List<BasicOpeningHourRule> t){
@@ -119,6 +122,7 @@ public class OpeningHoursView {
 			}
 			TextView label = (TextView)row.findViewById(R.id.label);
 			ImageView icon = (ImageView)row.findViewById(R.id.remove);
+			icon.setBackgroundDrawable(app.getIconsCache().getContentIcon(R.drawable.ic_action_remove_dark));
 			if(selectedRule == position){
 				label.setTypeface(null, Typeface.BOLD);
 				label.setTextSize(22);
diff --git a/OsmAnd/src/net/osmand/plus/activities/OsmandListActivity.java b/OsmAnd/src/net/osmand/plus/activities/OsmandListActivity.java
index 8c24643a57..d8ca448e2b 100644
--- a/OsmAnd/src/net/osmand/plus/activities/OsmandListActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/OsmandListActivity.java
@@ -45,11 +45,10 @@ public abstract class OsmandListActivity extends
 		return false;
 	}
 
-	public MenuItem createMenuItem(Menu m, int id, int titleRes, int iconLight, int iconDark, int menuItemType) {
-		int r = isLightActionBar() ? iconLight : iconDark;
+	public MenuItem createMenuItem(Menu m, int id, int titleRes, int iconDark, int menuItemType) {
 		MenuItem menuItem = m.add(0, id, 0, titleRes);
-		if (r != 0) {
-			menuItem.setIcon(r);
+		if (iconDark != 0) {
+			menuItem.setIcon(getMyApplication().getIconsCache().getActionBarIcon(iconDark));
 		}
 		menuItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
 			@Override
diff --git a/OsmAnd/src/net/osmand/plus/activities/PluginActivity.java b/OsmAnd/src/net/osmand/plus/activities/PluginActivity.java
index c5320d9107..adcbc8198c 100644
--- a/OsmAnd/src/net/osmand/plus/activities/PluginActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/PluginActivity.java
@@ -1,5 +1,6 @@
 package net.osmand.plus.activities;
 
+import net.osmand.plus.IconsCache;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.R;
@@ -127,6 +128,8 @@ public class PluginActivity extends OsmandActionBarActivity {
 				R.id.plugin_enable_disable);
 		Button getButton = (Button)findViewById(R.id.plugin_get);
 		Button settingsButton = (Button)findViewById(R.id.plugin_settings);
+		IconsCache ic = ((OsmandApplication) getApplication()).getIconsCache();
+		settingsButton.setCompoundDrawablesWithIntrinsicBounds(ic.getContentIcon(R.drawable.ic_action_settings_dark), null, null, null);
 		View installHeader = findViewById(R.id.plugin_install_header);
 
 		if (plugin.needsInstallation()) {
@@ -134,6 +137,9 @@ public class PluginActivity extends OsmandActionBarActivity {
 			enableDisableButton.setVisibility(View.GONE);
 			settingsButton.setVisibility(View.GONE);
 			installHeader.setVisibility(View.VISIBLE);
+			((ImageView) installHeader.findViewById(R.id.ic_world_globe)).setBackgroundDrawable(ic
+					.getContentIcon(R.drawable.ic_world_globe_dark));
+
 		} else {
 			getButton.setVisibility(View.GONE);
 			enableDisableButton.setVisibility(View.VISIBLE);
diff --git a/OsmAnd/src/net/osmand/plus/activities/ShowRouteInfoActivity.java b/OsmAnd/src/net/osmand/plus/activities/ShowRouteInfoActivity.java
index 3c938a47ec..325f293d8a 100644
--- a/OsmAnd/src/net/osmand/plus/activities/ShowRouteInfoActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/ShowRouteInfoActivity.java
@@ -116,13 +116,13 @@ public class ShowRouteInfoActivity extends OsmandListActivity {
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
 		createMenuItem(menu, PRINT, R.string.print_route,
-				R.drawable.ic_action_gprint_light, R.drawable.ic_action_gprint_dark,
+				R.drawable.ic_action_gprint_dark,
 				MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
 		createMenuItem(menu, SAVE, R.string.shared_string_save_as_gpx,
-				R.drawable.ic_action_gsave_light, R.drawable.ic_action_gsave_dark,
+				R.drawable.ic_action_gsave_dark,
 				MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
 		createMenuItem(menu, SHARE, R.string.share_route_as_gpx,
-				R.drawable.ic_action_gshare_light, R.drawable.ic_action_gshare_dark,
+				R.drawable.ic_action_gshare_dark,
 				MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
 		return super.onCreateOptionsMenu(menu);
 	}
diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java
index 88a3cf65f2..9126d08351 100644
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java
@@ -42,7 +42,6 @@ public class SearchActivity extends TabActivity implements OsmAndLocationListene
 	public static final int LOCATION_TAB_INDEX = 2;
 	public static final int FAVORITES_TAB_INDEX = 3;
 	public static final int HISTORY_TAB_INDEX = 4;
-	public static final int TRANSPORT_TAB_INDEX = 5;
 	
 	protected static final int POSITION_CURRENT_LOCATION = 1;
 	protected static final int POSITION_LAST_MAP_VIEW = 2;
@@ -168,8 +167,6 @@ public class SearchActivity extends TabActivity implements OsmAndLocationListene
 			return NavigatePointFragment.class;
 		} else if(tab == HISTORY_TAB_INDEX) {
 			return SearchHistoryFragment.class;
-		} else if(tab == TRANSPORT_TAB_INDEX) {
-			return SearchTransportFragment.class;
 		} else if(tab == FAVORITES_TAB_INDEX) {
 			return FavoritesListFragment.class;
 		}
diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressFragment.java
index 763ea34fb3..f26782fa4e 100644
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressFragment.java
@@ -1,14 +1,5 @@
 package net.osmand.plus.activities.search;
 
-import java.text.MessageFormat;
-
-import android.content.pm.ActivityInfo;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.MenuItemCompat;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.MenuItem.OnMenuItemClickListener;
 import net.osmand.access.AccessibleToast;
 import net.osmand.data.LatLon;
 import net.osmand.data.PointDescription;
@@ -25,9 +16,17 @@ import net.osmand.util.Algorithms;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.view.MenuItemCompat;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.MenuItem.OnMenuItemClickListener;
 import android.view.View;
 import android.widget.Button;
+import android.widget.ImageView;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.TextView;
@@ -221,6 +220,9 @@ public class SearchAddressFragment extends Fragment {
 				}
 			}
 		});
+		OsmandApplication app = getApplication();
+		Drawable icon = getApplication().getIconsCache().getContentIcon(R.drawable.ic_action_remove_dark);
+		((ImageView)findViewById(R.id.ResetBuilding)).setBackgroundDrawable(icon);
 		findViewById(R.id.ResetBuilding).setOnClickListener(new View.OnClickListener(){
 			@Override
 			public void onClick(View v) {
@@ -231,6 +233,7 @@ public class SearchAddressFragment extends Fragment {
 				updateUI();
 			}
 		 });
+		((ImageView)findViewById(R.id.ResetStreet)).setBackgroundDrawable(icon);
 		 findViewById(R.id.ResetStreet).setOnClickListener(new View.OnClickListener(){
 			@Override
 			public void onClick(View v) {
@@ -243,6 +246,7 @@ public class SearchAddressFragment extends Fragment {
 				updateUI();
 			}
 		 });
+		 ((ImageView)findViewById(R.id.ResetCity)).setBackgroundDrawable(icon);
 		 findViewById(R.id.ResetCity).setOnClickListener(new View.OnClickListener(){
 			@Override
 			public void onClick(View v) {
@@ -257,6 +261,7 @@ public class SearchAddressFragment extends Fragment {
 				updateUI();
 			}
 		 });
+		 ((ImageView)findViewById(R.id.ResetCountry)).setBackgroundDrawable(icon);
 		 findViewById(R.id.ResetCountry).setOnClickListener(new View.OnClickListener(){
 			@Override
 			public void onClick(View v) {
diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchByNameAbstractActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchByNameAbstractActivity.java
index 48572e3829..ce1605edf2 100644
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchByNameAbstractActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchByNameAbstractActivity.java
@@ -504,12 +504,11 @@ public abstract class SearchByNameAbstractActivity<T> extends OsmandListActivity
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
 		if (sequentialSearch) {
-			boolean light = ((OsmandApplication) getApplication()).getSettings().isLightActionBar();
+			OsmandApplication app  = ((OsmandApplication) getApplication());
 			MenuItem menuItem = menu.add(0, NAVIGATE_TO, 0, R.string.context_menu_item_directions_to);
 			MenuItemCompat.setShowAsAction(menuItem,
 					MenuItemCompat.SHOW_AS_ACTION_ALWAYS | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
-			menuItem = menuItem.setIcon(light ? R.drawable.ic_action_gdirections_light
-					: R.drawable.ic_action_gdirections_dark);
+			menuItem = menuItem.setIcon(app.getIconsCache().getActionBarIcon(R.drawable.ic_action_gdirections_dark));
 			menuItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
 				@Override
 				public boolean onMenuItemClick(MenuItem item) {
@@ -522,12 +521,12 @@ public abstract class SearchByNameAbstractActivity<T> extends OsmandListActivity
 				menuItem = menu.add(0, ADD_WAYPOINT, 0, R.string.context_menu_item_intermediate_point);
 				MenuItemCompat.setShowAsAction(menuItem,
 						MenuItemCompat.SHOW_AS_ACTION_ALWAYS | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
-				menuItem = menuItem.setIcon(light ? R.drawable.ic_action_flage_light : R.drawable.ic_action_flage_dark);
+				menuItem = menuItem.setIcon(app.getIconsCache().getActionBarIcon(R.drawable.ic_action_flage_dark));
 			} else {
 				menuItem = menu.add(0, ADD_WAYPOINT, 0, R.string.context_menu_item_destination_point);
 				MenuItemCompat.setShowAsAction(menuItem,
 						MenuItemCompat.SHOW_AS_ACTION_ALWAYS | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
-				menuItem = menuItem.setIcon(light ? R.drawable.ic_action_flag_light : R.drawable.ic_action_flag_dark);
+				menuItem = menuItem.setIcon(app.getIconsCache().getActionBarIcon( R.drawable.ic_action_flag_dark));
 			}
 			menuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
 				@Override
@@ -539,7 +538,7 @@ public abstract class SearchByNameAbstractActivity<T> extends OsmandListActivity
 			menuItem = menu.add(0, SHOW_ON_MAP, 0, R.string.shared_string_show_on_map);
 			MenuItemCompat.setShowAsAction(menuItem,
 					MenuItemCompat.SHOW_AS_ACTION_ALWAYS | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
-			menuItem = menuItem.setIcon(light ? R.drawable.ic_action_marker_light : R.drawable.ic_action_marker_dark);
+			menuItem = menuItem.setIcon(app.getIconsCache().getActionBarIcon(R.drawable.ic_action_marker_dark));
 
 			menuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
 				@Override
@@ -552,7 +551,7 @@ public abstract class SearchByNameAbstractActivity<T> extends OsmandListActivity
 			menuItem = menu.add(0, ADD_TO_FAVORITE, 0, R.string.shared_string_add_to_favorites);
 			MenuItemCompat.setShowAsAction(menuItem,
 					MenuItemCompat.SHOW_AS_ACTION_ALWAYS | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
-			menuItem = menuItem.setIcon(light ? R.drawable.ic_action_fav_light : R.drawable.ic_action_fav_dark);
+			menuItem = menuItem.setIcon(app.getIconsCache().getActionBarIcon(R.drawable.ic_action_fav_dark));
 
 			menuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
 				@Override
@@ -562,7 +561,7 @@ public abstract class SearchByNameAbstractActivity<T> extends OsmandListActivity
 				}
 			});
 		} else {
-			createMenuItem(menu, 1, R.string.shared_string_ok, R.drawable.ic_action_ok_light,
+			createMenuItem(menu, 1, R.string.shared_string_ok,
 					R.drawable.ic_action_ok_dark, MenuItem.SHOW_AS_ACTION_ALWAYS);
 		}
 		return super.onCreateOptionsMenu(menu);
diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchTransportFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchTransportFragment.java
deleted file mode 100644
index 4290c152ad..0000000000
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchTransportFragment.java
+++ /dev/null
@@ -1,635 +0,0 @@
-/**
- * 
- */
-package net.osmand.plus.activities.search;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.Toolbar;
-import android.view.*;
-import net.osmand.data.LatLon;
-import net.osmand.data.TransportRoute;
-import net.osmand.data.TransportStop;
-import net.osmand.plus.OsmAndFormatter;
-import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.OsmandSettings;
-import net.osmand.plus.R;
-import net.osmand.plus.TargetPointsHelper.TargetPoint;
-import net.osmand.plus.activities.TransportRouteHelper;
-import net.osmand.plus.activities.search.SearchActivity.SearchActivityChild;
-import net.osmand.plus.resources.TransportIndexRepository;
-import net.osmand.plus.resources.TransportIndexRepository.RouteInfoLocation;
-import net.osmand.util.Algorithms;
-import net.osmand.util.MapUtils;
-import android.app.AlertDialog;
-import android.app.AlertDialog.Builder;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.graphics.Typeface;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.text.Spannable;
-import android.text.style.ForegroundColorSpan;
-import android.view.View.OnClickListener;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.ImageButton;
-import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-
-
-public class SearchTransportFragment extends Fragment implements SearchActivityChild, OnItemClickListener {
-
-	public static final String SEARCH_LAT = SearchActivity.SEARCH_LAT;
-	public static final String SEARCH_LON = SearchActivity.SEARCH_LON;
-
-	private Button searchTransportLevel;
-
-	private TextView searchArea;
-	
-	private final static int finalZoom = 13;
-	private final static int initialZoom = 17;
-	private int zoom = initialZoom;
-	private ProgressBar progress;
-
-	private LatLon lastKnownMapLocation;
-	private LatLon destinationLocation;
-	private LatLon selectedDestinationLocation;
-	
-	private TransportStopAdapter stopsAdapter;
-	private TransportRouteAdapter intermediateListAdapater;
-	private OsmandSettings settings;
-	private View view;
-	private AsyncTask<?, ?, ?> asyncTask;
-
-	private OsmandApplication getApplication() {
-		return (OsmandApplication) getActivity().getApplication();
-	}
-	
-	public View onCreateView(android.view.LayoutInflater inflater, android.view.ViewGroup container, Bundle savedInstanceState) {
-		view = inflater.inflate(R.layout.search_transport, container, false);
-		settings = getApplication().getSettings();
-		
-		searchTransportLevel = (Button) view.findViewById(R.id.SearchTransportLevelButton);
-		searchTransportLevel.setText(R.string.search_POI_level_btn);
-		
-		searchTransportLevel.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				if (!isRouteCalculated()) {
-					if (isSearchFurtherAvailable()) {
-						zoom--;
-						searchTransport();
-					}
-				} else {
-					intermediateListAdapater.clear();
-					intermediateListAdapater.add(null);
-					searchTransport();
-				}
-			}
-		});
-		searchArea = (TextView) view.findViewById(R.id.SearchAreaText);
-		progress = (ProgressBar) view.findViewById(R.id.ProgressBar);
-		progress.setVisibility(View.INVISIBLE);
-		stopsAdapter = new TransportStopAdapter(new ArrayList<RouteInfoLocation>());
-		((ListView) view.findViewById(android.R.id.list)).setAdapter(stopsAdapter);
-		((ListView) view.findViewById(android.R.id.list)).setOnItemClickListener(this);
-		
-		ListView intermediateList = (ListView) view.findViewById(R.id.listView);
-		intermediateListAdapater = new TransportRouteAdapter(TransportRouteHelper.getInstance().getRoute());
-		intermediateList.setAdapter(intermediateListAdapater);
-		
-		if(intermediateList.getCount() == 0){
-			intermediateListAdapater.add(null);
-		}
-		setHasOptionsMenu(true);
-		return view;
-	}
-	
-	@Override
-	public void onDestroy() {
-		if (intermediateListAdapater != null) {
-			ArrayList<RouteInfoLocation> lastEditedRoute = new ArrayList<RouteInfoLocation>();
-			for (int i = 0; i < intermediateListAdapater.getCount(); i++) {
-				RouteInfoLocation item = intermediateListAdapater.getItem(i);
-				if (item != null) {
-					lastEditedRoute.add(item);
-				}
-			}
-			TransportRouteHelper.getInstance().setRoute(lastEditedRoute);
-		}
-		super.onDestroy();
-	}
-	
-	@Override
-	public void onResume() {
-		super.onResume();
-		Intent intent = getActivity().getIntent();
-		LatLon startPoint = null;
-		if(intent != null){
-			double lat = intent.getDoubleExtra(SEARCH_LAT, 0);
-			double lon = intent.getDoubleExtra(SEARCH_LON, 0);
-			if(lat != 0 || lon != 0){
-				// Not commenting out the next line will cause the follwing issue:
-				// (1) When the transport search was called from the dashboard, everything still works: You can change the search origin on the tab, this resets any previous (if any) search results, and any new searches will be centered around the new origin.
-				// (2) But when the tab was called from map screen, changing the search origin on the tab keeps any search results, does not reset anything.
-				// (3) If the search origin had been changed on anoother search tab before switching to this one, new transport searches would still center around the OLD search origin (the last map view)
-				//startPoint = new LatLon(lat, lon);
-			}
-		}
-		if(startPoint == null && getActivity() instanceof SearchActivity){
-			startPoint = ((SearchActivity) getActivity()).getSearchPoint();
-		}
-		if (startPoint == null) {
-			startPoint = settings.getLastKnownMapLocation();
-		}
-		OsmandApplication app = (OsmandApplication) getApplication();
-		TargetPoint ps = app.getTargetPointsHelper().getPointToNavigate();
-		LatLon pointToNavigate = ps == null ? null : ps.point;
-		if(!Algorithms.objectEquals(pointToNavigate, this.destinationLocation) || 
-				!Algorithms.objectEquals(startPoint, this.lastKnownMapLocation)){
-			destinationLocation = pointToNavigate;
-			selectedDestinationLocation = destinationLocation;
-			lastKnownMapLocation = startPoint;
-			searchTransport();			
-		}
-	}
-	
-	@Override
-	public void locationUpdate(LatLon l) {
-		if(!Algorithms.objectEquals(l, this.lastKnownMapLocation)){
-			lastKnownMapLocation = l;
-			if(view != null) { 
-				searchTransport();
-			}
-		}
-	}
-	
-	public String getSearchArea(){
-		return " < " + 125 * (1 << (17 - zoom)) + " " + getString(R.string.m); //$NON-NLS-1$//$NON-NLS-2$
-	}
-	public boolean isSearchFurtherAvailable() {
-		return zoom >= finalZoom;
-	}
-	
-	public void searchTransport(){
-		// use progress
-		stopsAdapter.clear();
-		searchArea.setText(getSearchArea());
-		boolean routeCalculated = isRouteCalculated();
-		searchTransportLevel.setEnabled(false);
-		if (!routeCalculated && getLocationToStart() != null) {
-			final LatLon locationToStart = getLocationToStart();
-			final LatLon locationToGo = getLocationToGo();
-			List<TransportIndexRepository> rs = ((OsmandApplication)getApplication()).getResourceManager().searchTransportRepositories(locationToStart.getLatitude(), 
-					locationToStart.getLongitude());
-			if(!rs.isEmpty()){
-				final AsyncTask<?, ?, ?> previous = asyncTask;
-				AsyncTask<TransportIndexRepository, Void, List<RouteInfoLocation>> current = 
-						new AsyncTask<TransportIndexRepository, Void, List<RouteInfoLocation>>() {
-					
-					@Override
-					protected void onPreExecute() {
-						super.onPreExecute();
-						progress.setVisibility(View.VISIBLE);
-					}
-
-					@Override
-					protected List<RouteInfoLocation> doInBackground(TransportIndexRepository... params) {
-						if(previous != null) {
-							try {
-								previous.get();
-							} catch (Exception e) {
-							}
-						}
-						List<RouteInfoLocation> res  = new ArrayList<TransportIndexRepository.RouteInfoLocation>();
-						for(TransportIndexRepository repo : params){
-							List<RouteInfoLocation> r = repo.searchTransportRouteStops(locationToStart.getLatitude(), locationToStart
-									.getLongitude(), locationToGo, zoom);
-							if(r != null) {
-								res.addAll(r);
-							}
-						}
-						return res;
-					}
-					@Override
-					protected void onPostExecute(List<RouteInfoLocation> result) {
-						// isAdded() here fixes the "not attached to Activity" FC when rapidly changing screen orientation
-						if (isAdded()) {
-							stopsAdapter.setNewModel(result);
-							updateSearchMoreButton();
-							searchArea.setText(getSearchArea());
-							progress.setVisibility(View.INVISIBLE);
-							asyncTask = null;
-						}
-					}
-				};
-				asyncTask = current;
-				current.execute(rs.toArray(new TransportIndexRepository[rs.size()]));
-			}
-		} else {
-			updateSearchMoreButton();
-		}
-	}
-	
-	private void updateSearchMoreButton() {
-		if (!isRouteCalculated()) {
-			searchTransportLevel.setEnabled(isSearchFurtherAvailable());
-			searchTransportLevel.setText(R.string.search_POI_level_btn);
-		} else {
-			searchTransportLevel.setEnabled(true);
-			searchTransportLevel.setText(R.string.transport_search_again);
-		}
-		
-	}
-	
-	public String getInformation(RouteInfoLocation route, List<TransportStop> stops, int position, boolean part){
-		StringBuilder text = new StringBuilder(200);
-		double dist = 0;
-		int ind = 0;
-		int stInd = stops.size();
-		int eInd = stops.size();
-		for (TransportStop s : stops) {
-			if (s == route.getStart()) {
-				stInd = ind;
-			} 
-			if (s == route.getStop()) {
-				eInd = ind;
-			}
-			if (ind > stInd && ind <= eInd) {
-				dist += MapUtils.getDistance(stops.get(ind - 1).getLocation(), s.getLocation());
-			}
-			ind++;
-		}
-		text.append(getString(R.string.transport_route_distance)).append(" ").append(OsmAndFormatter.getFormattedDistance((int) dist, getApplication()));  //$NON-NLS-1$/
-		if(!part){
-			text.append(", ").append(getString(R.string.transport_stops_to_pass)).append(" ").append(eInd - stInd);   //$NON-NLS-1$ //$NON-NLS-2$
-			LatLon endStop = getEndStop(position - 1);
-			if (endStop != null) {
-				String before = OsmAndFormatter.getFormattedDistance((int) MapUtils.getDistance(endStop, route.getStart().getLocation()), 
-						getApplication());
-				text.append(", ").append(getString(R.string.transport_to_go_before)).append(" ").append(before); //$NON-NLS-2$//$NON-NLS-1$
-			}
-
-			LatLon stStop = getStartStop(position + 1);
-			if (stStop != null) {
-				String after = OsmAndFormatter.getFormattedDistance((int) MapUtils.getDistance(stStop, route.getStop().getLocation()), getApplication());
-				text.append(", ").append(getString(R.string.transport_to_go_after)).append(" ").append(after); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-		}
-		
-		return text.toString();
-	}
-	
-	
-	
-	 @Override
-	public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-		final RouteInfoLocation item = stopsAdapter.getItem(position);
-		Builder builder = new AlertDialog.Builder(getActivity());
-		List<String> items = new ArrayList<String>();
-		final List<TransportStop> stops = item.getDirection() ? item.getRoute().getForwardStops() : item.getRoute().getBackwardStops();
-		LatLon locationToGo = getLocationToGo();
-		LatLon locationToStart = getLocationToStart();
-		builder.setTitle(getString(R.string.transport_stop_to_go_out)+"\n"+getInformation(item, stops, getCurrentRouteLocation(), true)); //$NON-NLS-1$
-		int ind = 0;
-		for(TransportStop st : stops){
-			StringBuilder n = new StringBuilder(50);
-			n.append(ind++);
-			if(st == item.getStop()){
-				n.append("!! "); //$NON-NLS-1$
-			} else {
-				n.append(". "); //$NON-NLS-1$
-			}
-			String name = st.getName(settings.usingEnglishNames());
-			if(locationToGo != null){
-				n.append(name).append(" - ["); //$NON-NLS-1$
-				n.append(OsmAndFormatter.getFormattedDistance((int) MapUtils.getDistance(locationToGo, st.getLocation()),  getApplication())).append("]"); //$NON-NLS-1$ 
-			} else if(locationToStart != null){
-				n.append("[").append(OsmAndFormatter.getFormattedDistance((int) MapUtils.getDistance(locationToStart, st.getLocation()), getApplication())).append("] - "); //$NON-NLS-1$ //$NON-NLS-2$
-				n.append(name);
-			} else {
-				n.append(name);
-			}
-			items.add(n.toString());
-		}
-		builder.setItems(items.toArray(new String[items.size()]), new DialogInterface.OnClickListener(){
-
-			@Override
-			public void onClick(DialogInterface dialog, int which) {
-				if(which >= 0){
-					TransportStop stop = stops.get(which);
-					showContextMenuOnStop(stop, item, which);
-				}
-			}
-			
-		});
-		builder.show();
-	}
-	
-	
-	public void showContextMenuOnStop(final TransportStop stop, final RouteInfoLocation route, final int stopInd) {
-		Builder b = new AlertDialog.Builder(getActivity());
-		b.setItems(new String[] { getString(R.string.transport_finish_search), getString(R.string.transport_search_before), getString(R.string.transport_search_after) },
-				new DialogInterface.OnClickListener() {
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						int currentRouteCalculation = getCurrentRouteLocation();
-						route.setStop(stop);
-						route.setStopNumbers(stopInd);
-						if (which == 0) {
-							intermediateListAdapater.insert(route, currentRouteCalculation);
-							intermediateListAdapater.remove(null);
-							currentRouteCalculation = -1;
-						} else if (which == 1) {
-							intermediateListAdapater.insert(route, currentRouteCalculation + 1);
-						} else if (which == 2) {
-							intermediateListAdapater.insert(route, currentRouteCalculation);
-						}
-						// layout
-						zoom = initialZoom;
-						searchTransport();
-					}
-
-				});
-		b.show();
-	}
-	
-	public void showContextMenuOnRoute(final RouteInfoLocation route, final int routeInd) {
-		Builder b = new AlertDialog.Builder(getActivity());
-		List<TransportStop> stops = route.getDirection() ? route.getRoute().getForwardStops() : route.getRoute().getBackwardStops();
-		boolean en = settings.usingEnglishNames();
-		
-		String info = getInformation(route, stops, routeInd, false);
-		StringBuilder txt = new StringBuilder(300);
-		txt.append(info);
-		boolean start = false;
-		for(TransportStop s : stops){
-			if(s == route.getStart()){
-				start = true;
-			}
-			if(start){
-				txt.append("\n").append(getString(R.string.transport_Stop)).append(" : ").append(s.getName(en)); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-			if(s == route.getStop()){
-				break;
-			}
-		}
-		
-		b.setMessage(txt.toString());
-		b.setPositiveButton(getString(R.string.shared_string_ok), null);
-		b.setNeutralButton(getString(R.string.transport_search_before), new DialogInterface.OnClickListener(){
-			@Override
-			public void onClick(DialogInterface dialog, int which) {
-				int toInsert = routeInd;
-				int c = getCurrentRouteLocation();
-				if(c >= 0 && c < routeInd){
-					toInsert --;
-				}
-				intermediateListAdapater.remove(null);
-				intermediateListAdapater.insert(null, toInsert);
-				zoom = initialZoom;
-				searchTransport();	
-			}
-		});
-		b.setNegativeButton(getString(R.string.transport_search_after), new DialogInterface.OnClickListener(){
-			@Override
-			public void onClick(DialogInterface dialog, int which) {
-				int toInsert = routeInd;
-				int c = getCurrentRouteLocation();
-				if(c > routeInd || c == -1){
-					toInsert ++;
-				}
-				intermediateListAdapater.remove(null);
-				intermediateListAdapater.insert(null, toInsert);
-				zoom = initialZoom;
-				searchTransport();	
-			}
-		});
-		b.show();
-	}
-	
-	public int getCurrentRouteLocation(){
-		return intermediateListAdapater.getPosition(null);
-	}
-
-	public boolean isRouteCalculated(){
-		return getCurrentRouteLocation() == -1;
-	}
-	
-	public LatLon getLocationToStart() {
-		return getEndStop(getCurrentRouteLocation() - 1);
-	}
-	
-	public LatLon getLocationToGo() {
-		return getStartStop(getCurrentRouteLocation() + 1);
-	}
-	
-	public LatLon getStartStop(int position){
-		if(position == intermediateListAdapater.getCount()){
-			return selectedDestinationLocation;
-		}
-		RouteInfoLocation item = intermediateListAdapater.getItem(position);
-		if(item == null){
-			return getStartStop(position + 1);
-		}
-		return item.getStart().getLocation();
-	}
-
-	public LatLon getEndStop(int position){
-		if(position < 0){
-			return lastKnownMapLocation;
-		}
-		RouteInfoLocation item = intermediateListAdapater.getItem(position);
-		if(item == null){
-			return getEndStop(position -1);
-		}
-		return item.getStop().getLocation();
-	}
-
-	class TransportStopAdapter extends ArrayAdapter<RouteInfoLocation> {
-		private List<RouteInfoLocation> model;
-
-		TransportStopAdapter(List<RouteInfoLocation> list) {
-			super(getActivity(), R.layout.search_transport_list_item, list);
-			model = list;
-		}
-
-		public void setNewModel(List<RouteInfoLocation> stopsList) {
-			this.model = stopsList;
-			setNotifyOnChange(false);
-			stopsAdapter.clear();
-			for (RouteInfoLocation obj : stopsList) {
-				this.add(obj);
-			}
-			setNotifyOnChange(true);
-			this.notifyDataSetChanged();
-			
-		}
-		
-		public List<RouteInfoLocation> getModel() {
-			return model;
-		}
-
-		@Override
-		public View getView(int position, View convertView, ViewGroup parent) {
-			View row = convertView;
-			if (row == null) {
-				LayoutInflater inflater = getActivity().getLayoutInflater();
-				row = inflater.inflate(R.layout.search_transport_list_item, parent, false);
-			}
-			LatLon locationToGo = getLocationToGo();
-			LatLon locationToStart = getLocationToStart();
-			
-			TextView label = (TextView) row.findViewById(R.id.label);
-			ImageView icon = (ImageView) row.findViewById(R.id.search_icon);
-			RouteInfoLocation stop = getItem(position);
-
-			TransportRoute route = stop.getRoute();
-			StringBuilder labelW = new StringBuilder(150);
-			labelW.append(route.getType()).append(" ").append(route.getRef()); //$NON-NLS-1$
-			labelW.append(" - ["); //$NON-NLS-1$
-			
-			if (locationToGo != null) {
-				labelW.append(OsmAndFormatter.getFormattedDistance(stop.getDistToLocation(), getApplication()));
-			} else {
-				labelW.append(getString(R.string.shared_string_none));
-			}
-			labelW.append("]\n").append(route.getName(settings.usingEnglishNames())); //$NON-NLS-1$
-			if (locationToGo != null && stop.getDistToLocation() < 400) {
-//				icon.setImageResource(R.drawable.opened_poi);
-			} else {
-//				icon.setImageResource(R.drawable.poi);
-			}
-			
-			int dist = locationToStart == null ? 0 : (int) (MapUtils.getDistance(stop.getStart().getLocation(), locationToStart));
-			String distance =  OsmAndFormatter.getFormattedDistance(dist, getApplication()) + " "; //$NON-NLS-1$
-			label.setText(distance + labelW, TextView.BufferType.SPANNABLE);
-			((Spannable) label.getText()).setSpan(new ForegroundColorSpan(getResources().getColor(R.color.color_distance)), 0, distance.length() - 1, 0);
-			return (row);
-		}
-	}
-	
-	
-	class TransportRouteAdapter extends ArrayAdapter<RouteInfoLocation> {
-		TransportRouteAdapter(List<RouteInfoLocation> list) {
-			super(getActivity(), R.layout.search_transport_route_item, list);
-		}
-
-		@Override
-		public View getView(final int position, View convertView, ViewGroup parent) {
-			View row = convertView;
-			final RouteInfoLocation info = getItem(position);
-			if(info == null){
-				TextView text = new TextView(getContext());
-				LatLon st = getStartStop(position + 1);
-				LatLon end = getEndStop(position - 1);
-
-				if(st != null && end != null){
-					int dist = (int) MapUtils.getDistance(st, end);
-					text.setText(MessageFormat.format(getString(R.string.transport_searching_route), OsmAndFormatter.getFormattedDistance(dist, getApplication())));
-				} else {
-					text.setText(getString(R.string.transport_searching_transport));
-				}
-				text.setTextSize(21);
-				text.setTypeface(null, Typeface.ITALIC);
-				text.setOnClickListener(new View.OnClickListener(){
-
-					@Override
-					public void onClick(View v) {
-						if(intermediateListAdapater.getCount() > 1){
-							intermediateListAdapater.remove(null);
-							searchTransport();
-						} else {
-							if(selectedDestinationLocation == null){
-								selectedDestinationLocation = destinationLocation;
-							} else {
-								selectedDestinationLocation = null;
-							}
-							searchTransport();
-						}
-						
-					}
-					
-				});
-				return text;
-			}
-			int currentRouteLocation = getCurrentRouteLocation();
-			if (row == null || row instanceof TextView) {
-				LayoutInflater inflater = getActivity().getLayoutInflater();
-				row = inflater.inflate(R.layout.search_transport_route_item, parent, false);
-			}
-			
-			TextView label = (TextView) row.findViewById(R.id.label);
-			ImageButton icon = (ImageButton) row.findViewById(R.id.remove);
-			
-			TransportRoute route = info.getRoute();
-			icon.setVisibility(View.VISIBLE);
-			StringBuilder labelW = new StringBuilder(150);
-			labelW.append(route.getType()).append(" ").append(route.getRef()); //$NON-NLS-1$
-			boolean en = settings.usingEnglishNames();
-			labelW.append(" : ").append(info.getStart().getName(en)).append(" - ").append(info.getStop().getName(en)); //$NON-NLS-1$ //$NON-NLS-2$
-			// additional information  if route is calculated
-			if (currentRouteLocation == -1) {
-				labelW.append(" ("); //$NON-NLS-1$
-				labelW.append(info.getStopNumbers()).append(" ").append(getString(R.string.transport_stops)).append(", "); //$NON-NLS-1$ //$NON-NLS-2$
-				int startDist = (int) MapUtils.getDistance(getEndStop(position - 1), info.getStart().getLocation());
-				labelW.append(getString(R.string.transport_to_go_before)).append(" ").append(OsmAndFormatter.getFormattedDistance(startDist, getApplication())); //$NON-NLS-1$
-				if (position == getCount() - 1) {
-					LatLon stop = getStartStop(position + 1);
-					if(stop != null) {
-						int endDist = (int) MapUtils.getDistance(stop, info.getStop().getLocation());
-						labelW.append(", ").append(getString(R.string.transport_to_go_after)).append(" ").append(OsmAndFormatter.getFormattedDistance(endDist, getApplication()));  //$NON-NLS-1$ //$NON-NLS-2$
-					}
-				}
-
-				labelW.append(")"); //$NON-NLS-1$ 
-				
-			}
-			label.setText(labelW.toString());
-			icon.setOnClickListener(new View.OnClickListener(){
-				@Override
-				public void onClick(View v) {
-					int p = position;
-					intermediateListAdapater.remove(null);
-					if(!isRouteCalculated() && getCurrentRouteLocation() < p){
-						p--;
-					}
-					intermediateListAdapater.insert(null, p);
-					intermediateListAdapater.remove(info);
-					intermediateListAdapater.notifyDataSetChanged();
-					zoom = initialZoom; 
-					searchTransport();
-					
-				}
-				
-			});
-			View.OnClickListener clickListener = new View.OnClickListener(){
-				@Override
-				public void onClick(View v) {
-					showContextMenuOnRoute(info, position);
-				}
-				
-			};
-			label.setOnClickListener(clickListener);
-			return row;
-		}
-
-
-	}
-
-	@Override
-	public void onCreateOptionsMenu(Menu onCreate, MenuInflater inflater) {
-		if(getActivity() instanceof SearchActivity) {
-			 ((SearchActivity) getActivity()).getClearToolbar(false);
-		}
-	}
-
-}
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/AudioNotesLayer.java b/OsmAnd/src/net/osmand/plus/audionotes/AudioNotesLayer.java
index 4bd6f3c9dd..96df494bf2 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/AudioNotesLayer.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioNotesLayer.java
@@ -133,14 +133,14 @@ public class AudioNotesLayer extends OsmandMapLayer implements IContextMenuProvi
 
 			};
 			if(r.isPhoto()) {
-				adapter.item(R.string.recording_context_menu_show).icons(
-						R.drawable.ic_action_eye_dark, R.drawable.ic_action_eye_light).listen(listener).reg();
+				adapter.item(R.string.recording_context_menu_show).iconColor(
+						R.drawable.ic_action_eye_dark).listen(listener).reg();
 			} else {
-				adapter.item(R.string.recording_context_menu_play).icons(
-						R.drawable.ic_action_play_dark, R.drawable.ic_action_play_light).listen(listener).reg();
+				adapter.item(R.string.recording_context_menu_play).iconColor(
+						R.drawable.ic_action_play_dark).listen(listener).reg();
 			}
-			adapter.item(R.string.recording_context_menu_delete).icons(R.drawable.ic_action_delete_dark,
-					R.drawable.ic_action_delete_light).listen(listener).reg();
+			adapter.item(R.string.recording_context_menu_delete).iconColor(R.drawable.ic_action_delete_dark
+					).listen(listener).reg();
 		}
 	}
 	
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
index 2965c5bab6..8e542033cc 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
@@ -466,13 +466,13 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 			}
 		};
 		adapter.item(R.string.layer_recordings).selected(SHOW_RECORDINGS.get() ? 1 : 0)
-				.icons(R.drawable.ic_action_audio_dark, R.drawable.ic_action_audio_light).listen(listener).position(12).reg();
+				.iconColor(R.drawable.ic_action_audio_dark).listen(listener).position(12).reg();
 	}
 
 	@Override
 	public void registerMapContextMenuActions(final MapActivity mapActivity, final double latitude, final double longitude,
 											  ContextMenuAdapter adapter, Object selectedObj) {
-		adapter.item(R.string.recording_context_menu_arecord).icons(R.drawable.ic_action_micro_dark, R.drawable.ic_action_micro_light)
+		adapter.item(R.string.recording_context_menu_arecord).iconColor(R.drawable.ic_action_micro_dark)
 				.listen(new OnContextMenuClick() {
 
 					@Override
@@ -481,7 +481,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 						return true;
 					}
 				}).position(6).reg();
-		adapter.item(R.string.recording_context_menu_vrecord).icons(R.drawable.ic_action_video_dark, R.drawable.ic_action_video_light)
+		adapter.item(R.string.recording_context_menu_vrecord).iconColor(R.drawable.ic_action_video_dark)
 				.listen(new OnContextMenuClick() {
 
 					@Override
@@ -490,7 +490,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 						return true;
 					}
 				}).position(7).reg();
-		adapter.item(R.string.recording_context_menu_precord).icons(R.drawable.ic_action_photo_dark, R.drawable.ic_action_photo_light)
+		adapter.item(R.string.recording_context_menu_precord).iconColor(R.drawable.ic_action_photo_dark)
 				.listen(new OnContextMenuClick() {
 					@Override
 					public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
@@ -520,7 +520,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 			recordControl = new TextInfoWidget(activity);
 			recordControl.setImageDrawable(activity.getResources().getDrawable(R.drawable.monitoring_rec_inactive));
 			setRecordListener(recordControl, activity);
-			mapInfoLayer.registerSideWidget(recordControl, R.drawable.widget_icon_av_inactive, R.drawable.widget_icon_av_inactive,
+			mapInfoLayer.registerSideWidget(recordControl, R.drawable.ic_action_audio_dark, R.drawable.widget_icon_av_inactive,
 					R.string.map_widget_av_notes, "audionotes", false, 22);
 			mapInfoLayer.recreateControls();
 		}
@@ -1254,8 +1254,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 	
 	@Override
 	public int getLogoResourceId() {
-		// TODO
-		return super.getLogoResourceId();
+		return R.drawable.ic_action_audio_dark;
 	}
 
 	@Override
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java b/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java
index a4aba5b7ec..3157604a62 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java
@@ -32,12 +32,12 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.ArrayAdapter;
 import android.widget.EditText;
 import android.widget.ImageButton;
+import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
 /**
- * Created by Denis
- * on 18.02.2015.
+ * Created by Denis on 18.02.2015.
  */
 public class NotesFragment extends ListFragment {
 	AudioVideoNotesPlugin plugin;
@@ -73,7 +73,6 @@ public class NotesFragment extends ListFragment {
 		super.onPause();
 	}
 
-
 	public OsmandApplication getMyApplication() {
 		return (OsmandApplication) getActivity().getApplication();
 	}
@@ -95,6 +94,8 @@ public class NotesFragment extends ListFragment {
 			final AudioVideoNotesPlugin.Recording recording = getItem(position);
 			Drawable icon = DashAudioVideoNotesFragment.getNoteView(recording, row, getMyApplication());
 			icon.setColorFilter(getResources().getColor(R.color.color_distance), Mode.MULTIPLY);
+			((ImageView) row.findViewById(R.id.play)).setImageDrawable(getMyApplication().getIconsCache()
+					.getContentIcon(R.drawable.ic_play_dark));
 			row.findViewById(R.id.play).setVisibility(View.GONE);
 			ImageButton options = (ImageButton) row.findViewById(R.id.options);
 			options.setOnClickListener(new View.OnClickListener() {
@@ -114,7 +115,7 @@ public class NotesFragment extends ListFragment {
 	}
 
 	private void showOnMap(Recording recording) {
-		getMyApplication().getSettings().setMapLocationToShow(recording.getLatitude(), recording.getLongitude(), 15, 
+		getMyApplication().getSettings().setMapLocationToShow(recording.getLatitude(), recording.getLongitude(), 15,
 				new PointDescription(recording.getSearchHistoryType(), recording.getName(getActivity())), true,
 				recording); //$NON-NLS-1$
 		MapActivity.launchMapActivityMoveToTop(getActivity());
@@ -128,13 +129,9 @@ public class NotesFragment extends ListFragment {
 		boolean isPhoto = recording.isPhoto();
 		Drawable playIcon;
 		if (isPhoto) {
-			playIcon = getResources().getDrawable(R.drawable.ic_action_view);
-			if(light) {
-				playIcon = playIcon.mutate();
-				playIcon.setColorFilter(getResources().getColor(R.color.icon_color_light), Mode.MULTIPLY);
-			}
+			playIcon = getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_action_view);
 		} else {
-			playIcon = getResources().getDrawable(light ? R.drawable.ic_play_light : R.drawable.ic_play_dark);
+			playIcon = getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_play_dark);
 		}
 		item = optionsMenu.getMenu().add(isPhoto ? R.string.watch : R.string.recording_context_menu_play)
 				.setIcon(playIcon);
@@ -147,12 +144,11 @@ public class NotesFragment extends ListFragment {
 		});
 
 		Drawable showOnMap = getResources().getDrawable(R.drawable.ic_show_on_map);
-		if(light) {
+		if (light) {
 			showOnMap = showOnMap.mutate();
 			showOnMap.setColorFilter(getResources().getColor(R.color.icon_color_light), Mode.MULTIPLY);
 		}
-		item = optionsMenu.getMenu().add(R.string.shared_string_show_on_map)
-				.setIcon(showOnMap);
+		item = optionsMenu.getMenu().add(R.string.shared_string_show_on_map).setIcon(showOnMap);
 		item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
 			@Override
 			public boolean onMenuItemClick(MenuItem item) {
@@ -162,7 +158,7 @@ public class NotesFragment extends ListFragment {
 		});
 
 		item = optionsMenu.getMenu().add(R.string.shared_string_share)
-				.setIcon(light ? R.drawable.ic_action_gshare_light : R.drawable.ic_action_gshare_dark);
+				.setIcon(getMyApplication().getIconsCache().getActionBarIcon(R.drawable.ic_action_gshare_dark, light));
 		item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
 			@Override
 			public boolean onMenuItemClick(MenuItem item) {
@@ -220,8 +216,7 @@ public class NotesFragment extends ListFragment {
 	private void editNote(final Recording recording) {
 		AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
 		builder.setTitle(R.string.shared_string_rename);
-		final View v = getActivity().getLayoutInflater().inflate(R.layout.note_edit_dialog,
-				getListView(), false);
+		final View v = getActivity().getLayoutInflater().inflate(R.layout.note_edit_dialog, getListView(), false);
 		final EditText editText = (EditText) v.findViewById(R.id.name);
 		builder.setView(v);
 		editText.setText(recording.getName(getActivity()));
@@ -231,8 +226,8 @@ public class NotesFragment extends ListFragment {
 		builder.setPositiveButton(R.string.shared_string_apply, new DialogInterface.OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
-				if(!recording.setName(editText.getText().toString())) {
-					Toast.makeText(getActivity(),R.string.rename_failed,Toast.LENGTH_SHORT).show();
+				if (!recording.setName(editText.getText().toString())) {
+					Toast.makeText(getActivity(), R.string.rename_failed, Toast.LENGTH_SHORT).show();
 				}
 				listAdapter.notifyDataSetInvalidated();
 			}
@@ -241,5 +236,4 @@ public class NotesFragment extends ListFragment {
 		editText.requestFocus();
 	}
 
-
 }
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java
index 228d7e7003..a5519be424 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java
@@ -111,6 +111,7 @@ public class DashFavoritesFragment extends DashLocationFragment {
 			name.setText(point.getName());
 			name.setTypeface(Typeface.DEFAULT, point.isVisible() ? Typeface.NORMAL : Typeface.ITALIC);
 			view.findViewById(R.id.navigate_to).setVisibility(View.VISIBLE);
+			((ImageView) view.findViewById(R.id.navigate_to)).setImageDrawable(getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_action_gdirections_dark));
 			view.findViewById(R.id.navigate_to).setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View view) {
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashRecentsFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashRecentsFragment.java
index af06af610f..2a3cffabab 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashRecentsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashRecentsFragment.java
@@ -88,6 +88,7 @@ public class DashRecentsFragment extends DashLocationFragment {
 			SearchHistoryFragment.udpateHistoryItem(historyEntry, view, loc, getActivity(), getMyApplication());
 			view.findViewById(R.id.divider).setVisibility(View.VISIBLE);
 			view.findViewById(R.id.navigate_to).setVisibility(View.VISIBLE);
+			((ImageView) view.findViewById(R.id.navigate_to)).setImageDrawable(getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_action_gdirections_dark));
 			view.findViewById(R.id.navigate_to).setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View view) {
diff --git a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
index 522f6d7a3e..827a3b0d42 100644
--- a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
+++ b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
@@ -44,7 +44,7 @@ public class ConfigureMapMenu {
 	public ContextMenuAdapter createListAdapter(final MapActivity ma, final boolean advanced) {
 		ContextMenuAdapter adapter = new ContextMenuAdapter(ma, allModes);
 		adapter.setDefaultLayoutId(R.layout.drawer_list_item);
-		adapter.item(R.string.configure_map).icons(R.drawable.ic_back_drawer_dark, R.drawable.ic_back_drawer_white)
+		adapter.item(R.string.configure_map).iconColor(R.drawable.ic_back_drawer_dark)
 				.listen(new OnContextMenuClick() {
 
 					@Override
@@ -64,7 +64,7 @@ public class ConfigureMapMenu {
 
 		createLayersItems(adapter, ma);
 		if (!advanced){
-			adapter.item(R.string.btn_advanced_mode).icons(R.drawable.ic_action_settings_enabled_dark, R.drawable.ic_action_settings_enabled_light)
+			adapter.item(R.string.btn_advanced_mode).iconColor(R.drawable.ic_action_settings_enabled_dark)
 					.selected(advanced ? 1 : 0)
 					.listen(new OnContextMenuClick() {
 						@Override
@@ -170,19 +170,18 @@ public class ConfigureMapMenu {
 		adapter.item(R.string.shared_string_show).setCategory(true).layout(R.layout.drawer_list_sub_header).reg();
 		// String appMode = " [" + settings.getApplicationMode().toHumanString(view.getApplication()) +"] ";
 		adapter.item(R.string.layer_poi).selected(settings.SHOW_POI_OVER_MAP.get() ? 1 : 0)
-				.icons(R.drawable.ic_action_info_dark, R.drawable.ic_action_info_light).listen(l).reg();
+				.iconColor(R.drawable.ic_action_info_dark).listen(l).reg();
 		adapter.item(R.string.layer_amenity_label).selected(settings.SHOW_POI_LABEL.get() ? 1 : 0)
-				.icons(R.drawable.ic_action_text_dark, R.drawable.ic_action_text_light).listen(l).reg();
+				.iconColor(R.drawable.ic_action_text_dark).listen(l).reg();
 		adapter.item(R.string.shared_string_favorites).selected(settings.SHOW_FAVORITES.get() ? 1 : 0)
-				.icons(R.drawable.ic_action_fav_dark, R.drawable.ic_action_fav_light).listen(l).reg();
+				.iconColor(R.drawable.ic_action_fav_dark).listen(l).reg();
 		adapter.item(R.string.layer_gpx_layer).selected(
 				app.getSelectedGpxHelper().isShowingAnyGpxFiles() ? 1 : 0)
-//				.icons(R.drawable.ic_action_foot_dark, R.drawable.ic_action_foot_light)
-				.icons(R.drawable.ic_action_polygom_dark, R.drawable.ic_action_polygom_light)
+				.iconColor(R.drawable.ic_action_polygom_dark)
 				.listen(l).reg();
 		if(TransportRouteHelper.getInstance().routeIsCalculated()){
 			adapter.item(R.string.layer_transport_route).selected(1)
-				.icons(R.drawable.ic_action_bus_dark, R.drawable.ic_action_bus_light).listen(l).reg();
+				.iconColor(R.drawable.ic_action_bus_dark).listen(l).reg();
 		}
 		
 		OsmandPlugin.registerLayerContextMenu(activity.getMapView(), adapter, activity);
diff --git a/OsmAnd/src/net/osmand/plus/dialogs/DirectionsDialogs.java b/OsmAnd/src/net/osmand/plus/dialogs/DirectionsDialogs.java
index f6fc1e0cec..5e1afe36b6 100644
--- a/OsmAnd/src/net/osmand/plus/dialogs/DirectionsDialogs.java
+++ b/OsmAnd/src/net/osmand/plus/dialogs/DirectionsDialogs.java
@@ -1,10 +1,10 @@
 package net.osmand.plus.dialogs;
 
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
 import net.osmand.data.LatLon;
 import net.osmand.data.PointDescription;
-import net.osmand.plus.ContextMenuAdapter;
-import net.osmand.plus.ContextMenuAdapter.Item;
-import net.osmand.plus.ContextMenuAdapter.OnContextMenuClick;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.TargetPointsHelper;
@@ -17,11 +17,6 @@ import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.v7.widget.PopupMenu;
 import android.view.MenuItem;
-import android.view.View;
-import android.widget.ArrayAdapter;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 
 public class DirectionsDialogs {
 	
@@ -68,8 +63,7 @@ public class DirectionsDialogs {
 
 		final TargetPointsHelper targetPointsHelper = app.getTargetPointsHelper();
 		MenuItem item = optionsMenu.getMenu().add(
-				R.string.context_menu_item_directions_to).setIcon(light ?
-				R.drawable.ic_action_gdirections_light : R.drawable.ic_action_gdirections_dark);
+				R.string.context_menu_item_directions_to).setIcon(app.getIconsCache().getActionBarIcon(R.drawable.ic_action_gdirections_dark, light));
 		item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
 			@Override
 			public boolean onMenuItemClick(MenuItem item) {
@@ -81,12 +75,12 @@ public class DirectionsDialogs {
 
 		if (targetPointsHelper.getPointToNavigate() != null) {
 			item = optionsMenu.getMenu().add(
-					R.string.context_menu_item_intermediate_point).setIcon(light ?
-					R.drawable.ic_action_flage_light : R.drawable.ic_action_flage_dark);
+					R.string.context_menu_item_intermediate_point).setIcon(
+							app.getIconsCache().getActionBarIcon(R.drawable.ic_action_flage_dark, light));
 		} else {
 			item = optionsMenu.getMenu().add(
-					R.string.context_menu_item_destination_point).setIcon(light ?
-					R.drawable.ic_action_flag_light : R.drawable.ic_action_flag_dark);
+					R.string.context_menu_item_destination_point).setIcon(
+							app.getIconsCache().getActionBarIcon(R.drawable.ic_action_flag_dark, light));
 		}
 		item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
 			@Override
diff --git a/OsmAnd/src/net/osmand/plus/distancecalculator/DistanceCalculatorPlugin.java b/OsmAnd/src/net/osmand/plus/distancecalculator/DistanceCalculatorPlugin.java
index edbc7f240a..a724df3cd9 100644
--- a/OsmAnd/src/net/osmand/plus/distancecalculator/DistanceCalculatorPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/distancecalculator/DistanceCalculatorPlugin.java
@@ -118,7 +118,7 @@ public class DistanceCalculatorPlugin extends OsmandPlugin {
 		if (mapInfoLayer != null ) {
 			distanceControl = createDistanceControl(activity);
 			mapInfoLayer.registerSideWidget(distanceControl,
-					R.drawable.widget_distance, R.drawable.widget_distance, R.string.map_widget_distancemeasurement, "distance.measurement", false, 21);
+					R.drawable.ic_action_ruler_dark, R.drawable.widget_distance, R.string.map_widget_distancemeasurement, "distance.measurement", false, 21);
 			mapInfoLayer.recreateControls();
 			updateText();
 		}
@@ -602,8 +602,7 @@ public class DistanceCalculatorPlugin extends OsmandPlugin {
 						return true;
 					}
 				};
-				adapter.item(R.string.delete_point).icons(R.drawable.ic_action_delete_dark, 
-						R.drawable.ic_action_delete_light).listen(listener).reg();
+				adapter.item(R.string.delete_point).iconColor(R.drawable.ic_action_delete_dark).listen(listener).reg();
 			}
 		}
 
diff --git a/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java b/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
index 8d067102ea..e1f12466ff 100644
--- a/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
@@ -507,10 +507,10 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
 			}
 		};
 		optionsMenuAdapter.item(R.string.local_index_mi_reload)
-				.icon(R.drawable.ic_action_refresh_dark)
+				.iconColor(R.drawable.ic_action_refresh_dark)
 				.listen(listener).position(1).reg();
 		optionsMenuAdapter.item(R.string.shared_string_delete)
-				.icon(R.drawable.ic_action_delete_dark)
+				.iconColor(R.drawable.ic_action_delete_dark)
 				.listen(listener).position(2).reg();
 		optionsMenuAdapter.item(R.string.local_index_mi_backup)
 				.listen(listener).position(3).reg();
@@ -535,8 +535,9 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
 				item = menu.add(0, optionsMenuAdapter.getElementId(j), j + 1, optionsMenuAdapter.getItemName(j));
 				MenuItemCompat.setShowAsAction(item, MenuItemCompat.SHOW_AS_ACTION_ALWAYS );
 			}
-			if (optionsMenuAdapter.getImageId(j, isLightActionBar()) != 0) {
-				item.setIcon(optionsMenuAdapter.getImageId(j, isLightActionBar()));
+			OsmandApplication app = getMyApplication();
+			if (optionsMenuAdapter.getImage(app, j, isLightActionBar()) != null) {
+				item.setIcon(optionsMenuAdapter.getImage(app, j, isLightActionBar()));
 			}
 			
 		}
diff --git a/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java b/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java
index bbe9ae7346..03acef8e05 100644
--- a/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java
+++ b/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java
@@ -177,10 +177,6 @@ public class UpdatesIndexFragment extends ListFragment {
 		return getDownloadActivity().getMyApplication();
 	}
 
-	public boolean isLightActionBar() {
-		return ((OsmandApplication) getActivity().getApplication()).getSettings().isLightActionBar();
-	}
-
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
 		if (item.getItemId() == DownloadIndexFragment.RELOAD_ID) {
diff --git a/OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java b/OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java
index 7a56265f21..2e4e6bee27 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java
@@ -56,8 +56,8 @@ public class AvoidSpecificRoads {
 				}
 				final RouteDataObject obj = getItem(position);
 				v.findViewById(R.id.all_points).setVisibility(View.GONE);
-				((ImageView) v.findViewById(R.id.waypoint_icon)).setImageResource(app.getSettings().isLightContent() ?
-						R.drawable.ic_action_road_works_light : R.drawable.ic_action_road_works_dark);
+				((ImageView) v.findViewById(R.id.waypoint_icon)).setImageDrawable(
+						app.getIconsCache().getContentIcon(R.drawable.ic_action_road_works_dark));
 				double dist = MapUtils.getDistance(mapLocation, MapUtils.get31LatitudeY(obj.getPoint31YTile(0)),
 						MapUtils.get31LongitudeX(obj.getPoint31XTile(0)));
 				((TextView) v.findViewById(R.id.waypoint_dist)).setText(OsmAndFormatter.getFormattedDistance((float) dist, app));
@@ -65,8 +65,8 @@ public class AvoidSpecificRoads {
 				((TextView) v.findViewById(R.id.waypoint_text)).setText(getText(obj));
 				ImageButton remove = (ImageButton) v.findViewById(R.id.info_close);
 				remove.setVisibility(View.VISIBLE);
-				remove.setImageResource(app.getSettings().isLightContent() ?
-						R.drawable.ic_action_gremove_light : R.drawable.ic_action_gremove_dark);
+				remove.setImageDrawable(app.getIconsCache().getContentIcon(
+						R.drawable.ic_action_gremove_dark));
 				remove.setOnClickListener(new View.OnClickListener() {
 
 					@Override
diff --git a/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java b/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java
index 35da2fba72..d2bf4e708a 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java
@@ -185,7 +185,7 @@ public class GpxUiHelper {
 			s = s.replace('_', ' ');
 
 			adapter.item(s).selected(multipleChoice ? 0 : -1)
-					.icons(R.drawable.ic_action_info_dark, R.drawable.ic_action_info_light).reg();
+					.iconColor(R.drawable.ic_action_info_dark).reg();
 
 			//if there's some selected files - need to mark them as selected
 			if (selectedGpxList != null) {
@@ -249,7 +249,7 @@ public class GpxUiHelper {
 				// User super class to create the View
 				View v = activity.getLayoutInflater().inflate(layout, null);
 				ImageView icon = (ImageView) v.findViewById(R.id.icon);
-				icon.setImageResource(adapter.getImageId(position, light));
+				icon.setImageDrawable(adapter.getImage(app, position, light));
 				final ArrayAdapter<String> arrayAdapter = this;
 				icon.setOnClickListener(new View.OnClickListener() {
 					@Override
diff --git a/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java b/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java
index a1f59b4077..881d0db8dc 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java
@@ -190,9 +190,8 @@ public class WaypointDialogHelper {
 						remove.setVisibility(View.GONE);
 					} else {
 						remove.setVisibility(View.VISIBLE);
-						((ImageButton) remove).setImageDrawable(ctx.getResources().getDrawable(
-								app.getSettings().isLightContent() ? R.drawable.ic_action_gremove_light
-										: R.drawable.ic_action_gremove_dark));
+						((ImageButton) remove).setImageDrawable(app.getIconsCache().getContentIcon(
+										R.drawable.ic_action_gremove_dark));
 						remove.setOnClickListener(new View.OnClickListener() {
 							@Override
 							public void onClick(View view) {
@@ -624,9 +623,8 @@ public class WaypointDialogHelper {
 						remove.setVisibility(View.GONE);
 					} else {
 						remove.setVisibility(View.VISIBLE);
-						((ImageButton) remove).setImageDrawable(ctx.getResources().getDrawable(
-								app.getSettings().isLightContent() ? R.drawable.ic_action_gremove_light :
-										R.drawable.ic_action_gremove_dark));
+						((ImageButton) remove).setImageDrawable(
+								app.getIconsCache().getContentIcon(R.drawable.ic_action_gremove_dark));
 						remove.setOnClickListener(new View.OnClickListener() {
 							@Override
 							public void onClick(View view) {
diff --git a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
index 80fcaae782..162984dd17 100644
--- a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
@@ -47,7 +47,6 @@ public class OsmandMonitoringPlugin extends OsmandPlugin {
 	private OsmandApplication app;
 	private TextInfoWidget monitoringControl;
 	private LiveMonitoringHelper liveMonitoringHelper;
-	private boolean ADD_BG_TO_ACTION = true;
 	private boolean isSaving;
 
 	public OsmandMonitoringPlugin(OsmandApplication app) {
@@ -64,8 +63,7 @@ public class OsmandMonitoringPlugin extends OsmandPlugin {
 	
 	@Override
 	public int getLogoResourceId() {
-		// TODO
-		return super.getLogoResourceId();
+		return R.drawable.ic_action_gps_info;
 	}
 	
 	@Override
@@ -100,7 +98,7 @@ public class OsmandMonitoringPlugin extends OsmandPlugin {
 		monitoringControl = createMonitoringControl(activity);
 		
 		layer.registerSideWidget(monitoringControl,
-				R.drawable.monitoring_rec_big, R.drawable.monitoring_rec_big, R.string.map_widget_monitoring, "monitoring", false, 18);
+				R.drawable.ic_action_play_dark, R.drawable.monitoring_rec_big, R.string.map_widget_monitoring, "monitoring", false, 18);
 		layer.recreateControls();
 	}
 
@@ -123,7 +121,7 @@ public class OsmandMonitoringPlugin extends OsmandPlugin {
 				return true;
 			}
 		};
-		adapter.item(R.string.context_menu_item_add_waypoint).icons(R.drawable.ic_action_gnew_label_dark, R.drawable.ic_action_gnew_label_light)
+		adapter.item(R.string.context_menu_item_add_waypoint).iconColor(R.drawable.ic_action_gnew_label_dark)
 		.listen(listener).reg();
 	}
 	
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
index b5f4dbd8fa..bfaf38867e 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
@@ -1,5 +1,45 @@
 package net.osmand.plus.myplaces;
 
+import java.io.File;
+import java.text.Collator;
+import java.text.DateFormat;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
+import net.osmand.IndexConstants;
+import net.osmand.access.AccessibleToast;
+import net.osmand.plus.ContextMenuAdapter;
+import net.osmand.plus.ContextMenuAdapter.OnContextMenuClick;
+import net.osmand.plus.GPXUtilities;
+import net.osmand.plus.GPXUtilities.GPXFile;
+import net.osmand.plus.GPXUtilities.GPXTrackAnalysis;
+import net.osmand.plus.GPXUtilities.WptPt;
+import net.osmand.plus.GpxSelectionHelper;
+import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
+import net.osmand.plus.OsmAndFormatter;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.OsmandPlugin;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.activities.OsmandBaseExpandableListAdapter;
+import net.osmand.plus.activities.OsmandExpandableListFragment;
+import net.osmand.plus.activities.SavingTrackHelper;
+import net.osmand.plus.activities.TrackActivity;
+import net.osmand.plus.dialogs.DirectionsDialogs;
+import net.osmand.plus.download.LocalIndexesFragment;
+import net.osmand.plus.helpers.ScreenOrientationHelper;
+import net.osmand.plus.monitoring.OsmandMonitoringPlugin;
+import net.osmand.plus.osmedit.OsmEditingPlugin;
+import net.osmand.util.Algorithms;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.AlertDialog.Builder;
@@ -28,7 +68,6 @@ import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
-import android.widget.EditText;
 import android.widget.ExpandableListView;
 import android.widget.Filter;
 import android.widget.Filterable;
@@ -37,47 +76,6 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import net.osmand.IndexConstants;
-import net.osmand.access.AccessibleToast;
-import net.osmand.plus.ContextMenuAdapter;
-import net.osmand.plus.ContextMenuAdapter.OnContextMenuClick;
-import net.osmand.plus.GPXUtilities;
-import net.osmand.plus.GPXUtilities.GPXFile;
-import net.osmand.plus.GPXUtilities.GPXTrackAnalysis;
-import net.osmand.plus.GPXUtilities.WptPt;
-import net.osmand.plus.GpxSelectionHelper;
-import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
-import net.osmand.plus.OsmAndFormatter;
-import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.OsmandPlugin;
-import net.osmand.plus.OsmandSettings;
-import net.osmand.plus.R;
-import net.osmand.plus.activities.MapActivity;
-import net.osmand.plus.activities.OsmandBaseExpandableListAdapter;
-import net.osmand.plus.activities.OsmandExpandableListFragment;
-import net.osmand.plus.activities.SavingTrackHelper;
-import net.osmand.plus.activities.TrackActivity;
-import net.osmand.plus.dialogs.DirectionsDialogs;
-import net.osmand.plus.download.LocalIndexesFragment;
-import net.osmand.plus.helpers.ScreenOrientationHelper;
-import net.osmand.plus.monitoring.OsmandMonitoringPlugin;
-import net.osmand.plus.osmedit.OsmEditingPlugin;
-import net.osmand.util.Algorithms;
-
-import java.io.File;
-import java.text.Collator;
-import java.text.DateFormat;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-
 public class AvailableGPXFragment extends OsmandExpandableListFragment {
 
 	public static final int SEARCH_ID = -1;
@@ -370,8 +368,9 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 					}
 				});
 			}
-			if (optionsMenuAdapter.getImageId(j, isLightActionBar()) != 0) {
-				item.setIcon(optionsMenuAdapter.getImageId(j, false));
+			OsmandApplication app = getMyApplication();
+			if (optionsMenuAdapter.getImage(app, j, isLightActionBar()) != null) {
+				item.setIcon(optionsMenuAdapter.getImage(app, j, isLightActionBar()));
 			}
 
 		}
@@ -543,44 +542,6 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		allGpxAdapter.notifyDataSetChanged();
 	}
 
-	private void renameFile(GpxInfo info) {
-		final File f = info.file;
-		Builder b = new AlertDialog.Builder(getActivity());
-		if (f.exists()) {
-			final EditText editText = new EditText(getActivity());
-			editText.setPadding(7, 3, 7, 3);
-			editText.setText(f.getName());
-			b.setView(editText);
-			b.setPositiveButton(R.string.shared_string_save, new DialogInterface.OnClickListener() {
-
-				@Override
-				public void onClick(DialogInterface dialog, int which) {
-					String newName = editText.getText().toString();
-					File dest = new File(f.getParentFile(), newName);
-					if (dest.exists()) {
-						AccessibleToast.makeText(getActivity(), R.string.file_with_name_already_exists,
-								Toast.LENGTH_LONG).show();
-					} else {
-						if (!f.getParentFile().exists()) {
-							f.getParentFile().mkdirs();
-						}
-						if (f.renameTo(dest)) {
-							asyncLoader = new LoadGpxTask();
-							asyncLoader.execute(getActivity());
-						} else {
-							AccessibleToast
-									.makeText(getActivity(), R.string.file_can_not_be_renamed, Toast.LENGTH_LONG)
-									.show();
-						}
-					}
-
-				}
-			});
-			b.setNegativeButton(R.string.shared_string_cancel, null);
-			b.show();
-		}
-	}
-
 	private void showGpxOnMap(GpxInfo info) {
 		info.setGpx(GPXUtilities.loadGPXFile(app, info.file));
 		boolean e = true;
@@ -1017,7 +978,9 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 			}
 		});
 		item = optionsMenu.getMenu().add(R.string.shared_string_share)
-				.setIcon(light ? R.drawable.ic_action_gshare_light : R.drawable.ic_action_gshare_dark);
+				.setIcon(
+						getMyApplication().getIconsCache().getActionBarIcon(
+								R.drawable.ic_action_gshare_dark, light));
 		item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
 			@Override
 			public boolean onMenuItemClick(MenuItem item) {
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/SelectedGPXFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/SelectedGPXFragment.java
index f5813654f6..9172ae4ad6 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/SelectedGPXFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/SelectedGPXFragment.java
@@ -62,7 +62,6 @@ public class SelectedGPXFragment extends ListFragment {
 	public static final String ARG_TO_HIDE_CONFIG_BTN = "ARG_TO_HIDE_CONFIG_BTN";
 	protected OsmandApplication app;
 	protected SelectedGPXAdapter adapter;
-	protected boolean lightContent;
 	protected Activity activity;
 	private boolean updateEnable;
 	
@@ -147,7 +146,6 @@ public class SelectedGPXFragment extends ListFragment {
 	}
 
 	public void setContent() {
-		lightContent = app.getSettings().isLightContent();
 		adapter = new SelectedGPXAdapter(new ArrayList<GpxSelectionHelper.GpxDisplayItem>());
 		updateContent();
 		setListAdapter(adapter);
@@ -403,11 +401,9 @@ public class SelectedGPXFragment extends ListFragment {
 				icon.setVisibility(View.VISIBLE);
 				additional.setVisibility(View.INVISIBLE);
 				if (child.group.getType() == GpxDisplayItemType.TRACK_SEGMENT) {
-					icon.setImageResource(!lightContent ? R.drawable.ic_action_polygom_dark
-							: R.drawable.ic_action_polygom_light);
+					icon.setImageDrawable(app.getIconsCache().getContentIcon(R.drawable.ic_action_polygom_dark));
 				} else if (child.group.getType() == GpxDisplayItemType.TRACK_ROUTE_POINTS) {
-					icon.setImageResource(!lightContent ? R.drawable.ic_action_markers_dark
-							: R.drawable.ic_action_markers_light);
+					icon.setImageDrawable(app.getIconsCache().getContentIcon(R.drawable.ic_action_markers_dark));
 				} else {
 					int groupColor = child.group.getColor();
 					if(child.locationStart != null) {
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/DashOsmEditsFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/DashOsmEditsFragment.java
index a58308d815..6942e1d40e 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/DashOsmEditsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/DashOsmEditsFragment.java
@@ -81,12 +81,12 @@ public class DashOsmEditsFragment extends DashBaseFragment implements OsmEditsUp
 		LinearLayout osmLayout = (LinearLayout) mainView.findViewById(R.id.items);
 		osmLayout.removeAllViews();
 
-		for (final OsmPoint point : dataPoints){
+		for (final OsmPoint point : dataPoints) {
 			LayoutInflater inflater = getActivity().getLayoutInflater();
 			View view = inflater.inflate(R.layout.note, null, false);
 
 			OsmEditsFragment.getOsmEditView(view, point, getMyApplication());
-			ImageButton send =(ImageButton) view.findViewById(R.id.play);
+			ImageButton send = (ImageButton) view.findViewById(R.id.play);
 			send.setImageDrawable(getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_action_export));
 			send.setOnClickListener(new View.OnClickListener() {
 				@Override
@@ -100,11 +100,13 @@ public class DashOsmEditsFragment extends DashBaseFragment implements OsmEditsUp
 				@Override
 				public void onClick(View v) {
 					boolean poi = point.getGroup() == OsmPoint.Group.POI;
-					String name = poi ?
-							((OpenstreetmapPoint) point).getName() : ((OsmNotesPoint) point).getText();
-					getMyApplication().getSettings().setMapLocationToShow(point.getLatitude(), point.getLongitude(),
-							15, new PointDescription(poi ? PointDescription.POINT_TYPE_POI : PointDescription.POINT_TYPE_OSM_BUG, name), true,
-							point); //$NON-NLS-1$
+					String name = poi ? ((OpenstreetmapPoint) point).getName() : ((OsmNotesPoint) point).getText();
+					getMyApplication().getSettings().setMapLocationToShow(
+							point.getLatitude(),
+							point.getLongitude(),
+							15,
+							new PointDescription(poi ? PointDescription.POINT_TYPE_POI
+									: PointDescription.POINT_TYPE_OSM_BUG, name), true, point); //$NON-NLS-1$
 					MapActivity.launchMapActivityMoveToTop(getActivity());
 				}
 			});
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmBugsLayer.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmBugsLayer.java
index 1f09f58946..1224bdab35 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/OsmBugsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmBugsLayer.java
@@ -505,11 +505,11 @@ public class OsmBugsLayer extends OsmandMapLayer implements IContextMenuProvider
 					return true;
 				}
 			};
-			adapter.item(R.string.osb_comment_menu_item).icons(
-					R.drawable.ic_action_note_dark,  R.drawable.ic_action_note_light
+			adapter.item(R.string.osb_comment_menu_item).iconColor(
+					R.drawable.ic_action_note_dark
 					).listen(listener).reg();
-			adapter.item(R.string.osb_close_menu_item).icons(
-					R.drawable.ic_action_remove_dark,R.drawable.ic_action_remove_light
+			adapter.item(R.string.osb_close_menu_item).iconColor(
+					R.drawable.ic_action_remove_dark
 					).listen(listener).reg();
 		}
 	}
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java
index 0be89bce12..16ba1a5d03 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java
@@ -10,13 +10,12 @@ import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
-import net.osmand.plus.activities.TabActivity;
-import net.osmand.plus.audionotes.NotesFragment;
-import net.osmand.plus.myplaces.AvailableGPXFragment;
-import net.osmand.plus.myplaces.AvailableGPXFragment.GpxInfo;
 import net.osmand.plus.activities.EnumAdapter;
 import net.osmand.plus.activities.EnumAdapter.IEnumWithResource;
 import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.activities.TabActivity;
+import net.osmand.plus.myplaces.AvailableGPXFragment;
+import net.osmand.plus.myplaces.AvailableGPXFragment.GpxInfo;
 import net.osmand.plus.myplaces.FavoritesActivity;
 import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.util.Algorithms;
@@ -128,16 +127,12 @@ public class OsmEditingPlugin extends OsmandPlugin {
 			}
 		};
 		if(selectedObj instanceof Amenity) {
-			adapter.item(R.string.poi_context_menu_modify).icons(R.drawable.ic_action_edit_dark, 
-					R.drawable.ic_action_edit_light).listen(listener).position(1).reg();
-			adapter.item(R.string.poi_context_menu_delete).icons(R.drawable.ic_action_delete_dark, 
-					R.drawable.ic_action_delete_light).listen(listener).position(2).reg();
+			adapter.item(R.string.poi_context_menu_modify).iconColor(R.drawable.ic_action_edit_dark).listen(listener).position(1).reg();
+			adapter.item(R.string.poi_context_menu_delete).iconColor(R.drawable.ic_action_delete_dark).listen(listener).position(2).reg();
 		} else {
-			adapter.item(R.string.context_menu_item_create_poi).icons(R.drawable.ic_action_plus_dark, 
-					R.drawable.ic_action_plus_light).listen(listener).position(-1).reg();
+			adapter.item(R.string.context_menu_item_create_poi).iconColor(R.drawable.ic_action_plus_dark).listen(listener).position(-1).reg();
 		}
-		adapter.item(R.string.context_menu_item_open_bug).icons(R.drawable.ic_action_bug_dark, 
-				R.drawable.ic_action_bug_light).listen(listener).reg();
+		adapter.item(R.string.context_menu_item_open_bug).iconColor(R.drawable.ic_action_bug_dark).listen(listener).reg();
 	}
 
 	@Override
@@ -155,7 +150,7 @@ public class OsmEditingPlugin extends OsmandPlugin {
 	@Override
 	public void registerLayerContextMenuActions(OsmandMapTileView mapView, ContextMenuAdapter adapter, MapActivity mapActivity) {
 		adapter.item(R.string.layer_osm_bugs).selected(settings.SHOW_OSM_BUGS.get() ? 1 : 0)
-				.icons(R.drawable.ic_action_bug_dark, R.drawable.ic_action_bug_light).listen(new OnContextMenuClick() {
+				.iconColor(R.drawable.ic_action_bug_dark).listen(new OnContextMenuClick() {
 
 					@Override
 					public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
@@ -177,7 +172,7 @@ public class OsmEditingPlugin extends OsmandPlugin {
 	public void contextMenuFragment(final Activity la, final Fragment fragment, final Object info, ContextMenuAdapter adapter) {
 		if (fragment instanceof AvailableGPXFragment) {
 			adapter.item(R.string.local_index_mi_upload_gpx)
-					.icons(R.drawable.ic_action_gup_dark, R.drawable.ic_action_gup_light)
+					.iconColor(R.drawable.ic_action_gup_dark)
 					.listen(new OnContextMenuClick() {
 
 						@Override
@@ -194,7 +189,7 @@ public class OsmEditingPlugin extends OsmandPlugin {
 		if (fragment instanceof AvailableGPXFragment) {
 			final AvailableGPXFragment f = ((AvailableGPXFragment) fragment);
 			optionsMenuAdapter.item(R.string.local_index_mi_upload_gpx)
-					.icon(R.drawable.ic_action_export)
+					.iconColor(R.drawable.ic_action_export)
 					.listen(new OnContextMenuClick() {
 
 						@Override
diff --git a/OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java b/OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java
index 40cfb9b56f..81493603db 100644
--- a/OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java
@@ -125,8 +125,7 @@ public class OsMoPlugin extends OsmandPlugin implements OsMoReactor {
 	public void registerMapContextMenuActions(final MapActivity mapActivity, final double latitude, final double longitude,
 			ContextMenuAdapter adapter, final Object selectedObj) {
 		if(selectedObj instanceof OsMoDevice) {
-			adapter.item(R.string.osmo_center_location).icons(R.drawable.ic_action_gloc_dark, 
-					R.drawable.ic_action_gloc_light).listen(new OnContextMenuClick() {
+			adapter.item(R.string.osmo_center_location).iconColor(R.drawable.ic_action_gloc_dark).listen(new OnContextMenuClick() {
 						
 						@Override
 						public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
@@ -140,8 +139,7 @@ public class OsMoPlugin extends OsmandPlugin implements OsMoReactor {
 						}
 					}).position(0).reg();
 			if(OsMoPositionLayer.getFollowDestinationId() != null) {
-				adapter.item(R.string.osmo_cancel_moving_target).icons(R.drawable.ic_action_close_dark, 
-						R.drawable.ic_action_close_light).listen(new OnContextMenuClick() {
+				adapter.item(R.string.osmo_cancel_moving_target).iconColor(R.drawable.ic_action_close_dark).listen(new OnContextMenuClick() {
 
 							@Override
 							public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
@@ -151,8 +149,7 @@ public class OsMoPlugin extends OsmandPlugin implements OsMoReactor {
 							
 						}).position(0).reg();
 			}
-			adapter.item(R.string.osmo_set_moving_target).icons(R.drawable.ic_action_flag_dark, 
-					R.drawable.ic_action_flag_light).listen(new OnContextMenuClick() {
+			adapter.item(R.string.osmo_set_moving_target).iconColor(R.drawable.ic_action_flag_dark).listen(new OnContextMenuClick() {
 						
 						@Override
 						public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
@@ -175,7 +172,7 @@ public class OsMoPlugin extends OsmandPlugin implements OsMoReactor {
 		MapInfoLayer layer = activity.getMapLayers().getMapInfoLayer();
 		osmoControl = createOsMoControl(activity);
 		layer.registerSideWidget(osmoControl,
-				R.drawable.mon_osmo_signal_inactive, R.drawable.mon_osmo_signal_inactive, R.string.osmo_control, "osmo_control", false, 18);
+				R.drawable.ic_osmo_dark, R.drawable.mon_osmo_signal_inactive, R.string.osmo_control, "osmo_control", false, 18);
 		layer.recreateControls();
 		
 		if(olayer != null) {
@@ -291,7 +288,7 @@ public class OsMoPlugin extends OsmandPlugin implements OsMoReactor {
 	
 	@Override
 	public void registerOptionsMenuItems(final MapActivity mapActivity, ContextMenuAdapter helper) {
-		helper.item(R.string.osmo_groups).icons(R.drawable.ic_osmo_dark, R.drawable.ic_osmo_light).position(6)
+		helper.item(R.string.osmo_groups).iconColor(R.drawable.ic_osmo_dark).position(6)
 				.listen(new OnContextMenuClick() {
 					@Override
 					public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
diff --git a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java
index e416d69c23..dfac95828b 100644
--- a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java
@@ -191,7 +191,7 @@ public class ParkingPositionPlugin extends OsmandPlugin {
 		if (mapInfoLayer != null) {
 			parkingPlaceControl = createParkingPlaceInfoControl(activity);
 			mapInfoLayer.registerSideWidget(parkingPlaceControl,
-					R.drawable.widget_parking, R.drawable.widget_parking, R.string.map_widget_parking, "parking", false, 8);
+					R.drawable.ic_action_parking_dark, R.drawable.widget_parking, R.string.map_widget_parking, "parking", false, 8);
 			mapInfoLayer.recreateControls();
 		}
 	}
@@ -212,7 +212,7 @@ public class ParkingPositionPlugin extends OsmandPlugin {
 				}
 			};
 			adapter.item(R.string.context_menu_item_delete_parking_point)
-				.icons( R.drawable.ic_action_remove_dark, R.drawable.ic_action_remove_light).listen(removeListener).position(0).reg();
+				.iconColor( R.drawable.ic_action_remove_dark).listen(removeListener).position(0).reg();
 		}
 		
 		OnContextMenuClick addListener = new OnContextMenuClick() {
@@ -226,7 +226,7 @@ public class ParkingPositionPlugin extends OsmandPlugin {
 			}
 		};
 		adapter.item(R.string.context_menu_item_add_parking_point)
-		.icons( R.drawable.ic_action_parking_dark, R.drawable.ic_action_parking_light).listen(addListener).reg();
+		.iconColor( R.drawable.ic_action_parking_dark).listen(addListener).reg();
 		
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java b/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java
index cac0b1dc6a..d983113332 100644
--- a/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java
@@ -214,12 +214,12 @@ public class OsmandRasterMapsPlugin extends OsmandPlugin {
 				return true;
 			}
 		};
-		adapter.item(R.string.layer_map).icons(R.drawable.ic_action_globus_dark, R.drawable.ic_action_globus_light)
+		adapter.item(R.string.layer_map).iconColor(R.drawable.ic_action_globus_dark)
 				.listen(listener).position(3).reg();
 		adapter.item(R.string.layer_overlay).selected(overlayLayer.getMap() != null ? 1 : 0).
-				icons(R.drawable.ic_layer_top_dark, R.drawable.ic_layer_top_light).listen(listener).position(14).reg();
+				iconColor(R.drawable.ic_layer_top_dark).listen(listener).position(14).reg();
 		adapter.item(R.string.layer_underlay).selected(underlayLayer.getMap() != null ? 1 : 0) 
-				.icons(R.drawable.ic_layer_bottom_dark, R.drawable.ic_layer_bottom_light).listen(listener).position(15).reg();
+				.iconColor(R.drawable.ic_layer_bottom_dark).listen(listener).position(15).reg();
 	}
 	
 	
@@ -240,9 +240,9 @@ public class OsmandRasterMapsPlugin extends OsmandPlugin {
 					return true;
 				}
 			};
-			adapter.item(R.string.context_menu_item_update_map).icons(R.drawable.ic_action_refresh_dark, R.drawable.ic_action_refresh_light)
+			adapter.item(R.string.context_menu_item_update_map).iconColor(R.drawable.ic_action_refresh_dark)
 					.listen(listener).reg();
-			adapter.item(R.string.context_menu_item_download_map).icons(R.drawable.ic_action_gdown_dark, R.drawable.ic_action_gdown_light)
+			adapter.item(R.string.context_menu_item_download_map).iconColor(R.drawable.ic_action_gdown_dark)
 					.listen(listener).reg();
 		}
 	}
diff --git a/OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsActivity.java b/OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsActivity.java
index 9b0d8d0a28..ed69b534d3 100644
--- a/OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsActivity.java
+++ b/OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsActivity.java
@@ -241,12 +241,12 @@ public class RoutePointsActivity extends OsmandListActivity {
 			@Override
 			public boolean onCreateActionMode(ActionMode actionMode, Menu menu) {
 				selectedItem = rp;
-				createMenuItem(menu, MARK_AS_CURRENT_ID, R.string.mark_as_current, R.drawable.ic_action_signpost_light, R.drawable.ic_action_signpost_dark,
+				createMenuItem(menu, MARK_AS_CURRENT_ID, R.string.mark_as_current, R.drawable.ic_action_signpost_dark,
 						MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
 				createMenuItem(menu, AS_VISITED_ID, !rp.isVisited() ? 
-						R.string.mark_as_visited : R.string.mark_as_not_visited, R.drawable.ic_action_ok_light, R.drawable.ic_action_ok_dark,
+						R.string.mark_as_visited : R.string.mark_as_not_visited, R.drawable.ic_action_ok_dark,
 						MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
-				createMenuItem(menu, POI_ON_MAP_ID, R.string.shared_string_show_on_map, R.drawable.ic_action_map_marker_light, R.drawable.ic_action_map_marker_dark,
+				createMenuItem(menu, POI_ON_MAP_ID, R.string.shared_string_show_on_map, R.drawable.ic_action_map_marker_dark,
 						MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
 				return true;
 			}
@@ -294,10 +294,10 @@ public class RoutePointsActivity extends OsmandListActivity {
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
 		createMenuItem(menu, OK_ID, R.string.shared_string_ok, 
-				R.drawable.ic_action_map_marker_light, R.drawable.ic_action_map_marker_dark ,
+				 R.drawable.ic_action_map_marker_dark ,
 				MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
 		createMenuItem(menu, NAVIGATE_DIALOG_ID, R.string.navigate_dialog,
-				R.drawable.ic_action_gdirections_light, R.drawable.ic_action_gdirections_dark,
+			   R.drawable.ic_action_gdirections_dark,
 				MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
 		return super.onCreateOptionsMenu(menu);
 	}
diff --git a/OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsLayer.java b/OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsLayer.java
index e19b46833f..8861352c5b 100644
--- a/OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsLayer.java
@@ -97,22 +97,22 @@ public class RoutePointsLayer  extends OsmandMapLayer implements ContextMenuLaye
 			};
 
 			if (plugin.getCurrentRoute().getPointStatus(point)){
-				adapter.item(R.string.mark_as_not_visited).icons(
-						R.drawable.ic_action_gremove_dark, R.drawable.ic_action_gremove_light).listen(listener).reg();
+				adapter.item(R.string.mark_as_not_visited).iconColor(
+						R.drawable.ic_action_gremove_dark).listen(listener).reg();
 			} else {
-				adapter.item(R.string.mark_as_visited).icons(
-						R.drawable.ic_action_ok_dark, R.drawable.ic_action_ok_light).listen(listener).reg();
+				adapter.item(R.string.mark_as_visited).iconColor(
+						R.drawable.ic_action_ok_dark).listen(listener).reg();
 			}
 
 			RoutePointsPlugin.RoutePoint routePoint = plugin.getCurrentRoute().getRoutePointFromWpt(point);
 			if (routePoint != null) {
 				if (routePoint.isNextNavigate) {
 					adapter.item(R.string.navigate_to_next)
-							.icons(R.drawable.ic_action_gnext_dark, R.drawable.ic_action_gnext_light).listen(listener)
+							.iconColor(R.drawable.ic_action_gnext_dark).listen(listener)
 							.reg();
 				} else {
 					adapter.item(R.string.mark_as_current)
-							.icons(R.drawable.ic_action_signpost_dark, R.drawable.ic_action_signpost_light)
+							.iconColor(R.drawable.ic_action_signpost_dark)
 							.listen(listener).reg();
 				}
 			}
diff --git a/OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsPlugin.java b/OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsPlugin.java
index dc8ebf3e56..f6c7e7c183 100644
--- a/OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsPlugin.java
@@ -201,7 +201,7 @@ public class RoutePointsPlugin extends OsmandPlugin {
 		if (mapInfoLayer != null) {
 			routeStepsControl = createRouteStepsInfoControl(activity);
 			mapInfoLayer.registerSideWidget(routeStepsControl,
-					R.drawable.widget_signpost, R.drawable.widget_signpost, R.string.map_widget_route_points, "route_steps", false, 8);
+					R.drawable.ic_action_signpost_dark, R.drawable.widget_signpost, R.string.map_widget_route_points, "route_steps", false, 8);
 			mapInfoLayer.recreateControls();
 		}
 	}
diff --git a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java
index 739a99438b..33a7d2428f 100644
--- a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java
+++ b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java
@@ -487,7 +487,7 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
 		if(layers.getContextMenuLayer().getFirstSelectedObject() instanceof StageFavorite) {
 			final StageFavorite sf = ((StageFavorite)layers.getContextMenuLayer().getFirstSelectedObject());
 			if(selectedStage != null) {
-				adapter.item(R.string.show_waypoint_information).icons(R.drawable.ic_action_info_dark, R.drawable.ic_action_info_light ).position(0)
+				adapter.item(R.string.show_waypoint_information).iconColor(R.drawable.ic_action_info_dark).position(0)
 				.listen(new OnContextMenuClick() {
 					@Override
 					public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
@@ -538,8 +538,8 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
 				R.string.where_am_i, R.string.context_menu_item_share_location);
 		//poi
 		if (osmandSettings.SHOW_POI_OVER_MAP.get()) {
-			adapter.item(R.string.sherpafy_disable_poi).icons(
-					R.drawable.ic_action_gremove_dark, R.drawable.ic_action_gremove_light)
+			adapter.item(R.string.sherpafy_disable_poi).iconColor(
+					R.drawable.ic_action_gremove_dark)
 					.listen(new OnContextMenuClick() {
 				@Override
 				public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
@@ -549,7 +549,7 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
 				}
 			}).reg();
 		} else {
-			adapter.item(R.string.poi).icons(R.drawable.ic_action_layers_dark, R.drawable.ic_action_layers_light)
+			adapter.item(R.string.poi).iconColor(R.drawable.ic_action_layers_dark)
 					.listen(new OnContextMenuClick() {
 						@Override
 						public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
@@ -561,7 +561,7 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
 					}).reg();
 		}
 		//important info
-		adapter.item(R.string.sherpafy_tour_info_txt).icons(R.drawable.ic_action_info_dark, R.drawable.ic_action_info_light)
+		adapter.item(R.string.sherpafy_tour_info_txt).iconColor(R.drawable.ic_action_info_dark)
 				.listen(new OnContextMenuClick() {
 					@Override
 					public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
@@ -575,7 +575,7 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
 		final StageInformation stage = getSelectedStage();
 		if (stage != null && !isStageVisited(stage.order)) {
 			adapter.item(R.string.complete_stage)
-					.icons(R.drawable.ic_action_finish_flag_dark, R.drawable.ic_action_finish_flag_light)
+					.iconColor(R.drawable.ic_action_finish_flag_dark)
 					.listen(new OnContextMenuClick() {
 				@Override
 				public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
@@ -586,8 +586,8 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
 			}).reg();
 		}
 		//share my location
-		adapter.item(R.string.context_menu_item_share_location).icons(
-				R.drawable.ic_action_gshare_dark, R.drawable.ic_action_gshare_light).listen(new OnContextMenuClick() {
+		adapter.item(R.string.context_menu_item_share_location).iconColor(
+				R.drawable.ic_action_gshare_dark).listen(new OnContextMenuClick() {
 			@Override
 			public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
 				if (app.getLocationProvider().getLastKnownLocation() != null) {
diff --git a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyFavoriteFragment.java b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyFavoriteFragment.java
index fa27e7cdf3..5085d394e5 100644
--- a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyFavoriteFragment.java
+++ b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyFavoriteFragment.java
@@ -46,7 +46,7 @@ public class SherpafyFavoriteFragment extends SherpafyStageInfoFragment {
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
 		((TourViewActivity) getActivity()).createMenuItem(menu, SHOW_ON_MAP, R.string.shared_string_show_on_map,
-				R.drawable.ic_action_map_marker_light, R.drawable.ic_action_map_marker_dark,
+				R.drawable.ic_action_map_marker_dark,
 				MenuItemCompat.SHOW_AS_ACTION_IF_ROOM | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT, new MenuItem.OnMenuItemClickListener() {
 
 					@Override
diff --git a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyStageFragment.java b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyStageFragment.java
index 58d730f1d0..5fb11618fe 100644
--- a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyStageFragment.java
+++ b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyStageFragment.java
@@ -76,7 +76,7 @@ public class SherpafyStageFragment extends Fragment {
 			if(customization.isStageVisited(stage.getOrder())) {
 				text = R.string.stage_is_completed;
 			}
-			((TourViewActivity) getActivity()).createMenuItem(menu, START, text, 0, 0,
+			((TourViewActivity) getActivity()).createMenuItem(menu, START, text, 0,
 					MenuItemCompat.SHOW_AS_ACTION_IF_ROOM | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT,
 					new MenuItem.OnMenuItemClickListener() {
 						@Override
@@ -85,7 +85,7 @@ public class SherpafyStageFragment extends Fragment {
 						}
 					});
 			if (customization.isStageVisited(stage.getOrder()) && customization.getNextAvailableStage(tour) != null) {
-				((TourViewActivity) getActivity()).createMenuItem(menu, NEXT_STAGE, R.string.next_stage, 0, 0,
+				((TourViewActivity) getActivity()).createMenuItem(menu, NEXT_STAGE, R.string.next_stage, 0,
 						MenuItemCompat.SHOW_AS_ACTION_IF_ROOM | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT,
 						new MenuItem.OnMenuItemClickListener() {
 							@Override
diff --git a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyTourFragment.java b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyTourFragment.java
index d0b320ac4d..96008dd8cc 100644
--- a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyTourFragment.java
+++ b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyTourFragment.java
@@ -110,10 +110,10 @@ public class SherpafyTourFragment extends ListFragment {
 			};
 			((TourViewActivity) getActivity()).createMenuItem(menu, START,
 					current ? R.string.continue_tour : R.string.start_tour , 
-					0, 0,
+					0, 
 					MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT, oic);
 			((TourViewActivity) getActivity()).createMenuItem(menu, SHARE_ID, R.string.shared_string_share,
-					R.drawable.ic_action_gshare_light, R.drawable.ic_action_gshare_dark,
+					R.drawable.ic_action_gshare_dark,
 					MenuItem.SHOW_AS_ACTION_IF_ROOM, oic);
 		}
 	}
diff --git a/OsmAnd/src/net/osmand/plus/sherpafy/TourViewActivity.java b/OsmAnd/src/net/osmand/plus/sherpafy/TourViewActivity.java
index 64529e3988..de3e76cf29 100644
--- a/OsmAnd/src/net/osmand/plus/sherpafy/TourViewActivity.java
+++ b/OsmAnd/src/net/osmand/plus/sherpafy/TourViewActivity.java
@@ -1,7 +1,7 @@
 package net.osmand.plus.sherpafy;
 
 import java.util.WeakHashMap;
-
+import android.annotation.SuppressLint;
 import android.content.pm.ActivityInfo;
 import android.os.Build;
 import android.support.v4.view.MenuItemCompat;
@@ -62,6 +62,7 @@ public class TourViewActivity extends OsmandActionBarActivity {
 	private boolean refreshListAfterDownload;
 	private static Object selectedItem;
 
+	@SuppressLint("NewApi")
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 //		if (!(getMyApplication().getAppCustomization() instanceof SherpafyCustomization)) {
@@ -190,7 +191,7 @@ public class TourViewActivity extends OsmandActionBarActivity {
 			getSupportActionBar().setTitle(R.string.sherpafy_tours);
 		} else if (state == viewState.STATE_TOUR_VIEW) {
 		}
-		invalidateOptionsMenu();
+//		invalidateOptionsMenu();
 	}
 
 
@@ -224,13 +225,11 @@ public class TourViewActivity extends OsmandActionBarActivity {
 		}
 	}
 
-	public MenuItem createMenuItem(Menu m, int id, int titleRes, int iconLight, int iconDark, int menuItemType,
+	public MenuItem createMenuItem(Menu m, int id, int titleRes, int r, int menuItemType,
 								   final MenuItem.OnMenuItemClickListener listener) {
-		// int r = getMyApplication().getSettings().isLightActionBar() ? iconLight : iconDark;
-		int r = iconLight;
 		MenuItem menuItem = m.add(0, id, 0, titleRes);
 		if (r != 0) {
-			menuItem.setIcon(r);
+			menuItem.setIcon(getMyApplication().getIconsCache().getActionBarIcon(r));
 		}
 		MenuItemCompat.setShowAsAction(menuItem, menuItemType);
 		menuItem.setOnMenuItemClickListener(listener);
diff --git a/OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java b/OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java
index 7f430c0566..2650c383e3 100644
--- a/OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java
@@ -33,8 +33,7 @@ public class SRTMPlugin extends OsmandPlugin {
 	
 	@Override
 	public int getLogoResourceId() {
-		// TODO 
-		return super.getLogoResourceId();
+		return R.drawable.ic_plugin_srtm;
 	}
 	
 	@Override
@@ -111,7 +110,7 @@ public class SRTMPlugin extends OsmandPlugin {
 			}
 		};
 		adapter.item(R.string.layer_hillshade).selected(HILLSHADE.get()? 1 : 0)
-			.icons( R.drawable.ic_action_hillshade_dark, R.drawable.ic_action_hillshade_light).listen(listener).position(13).layout(R.layout.drawer_list_item).reg();
+			.iconColor( R.drawable.ic_action_hillshade_dark).listen(listener).position(13).layout(R.layout.drawer_list_item).reg();
 	}
 	
 	@Override
diff --git a/OsmAnd/src/net/osmand/plus/views/FavoritesLayer.java b/OsmAnd/src/net/osmand/plus/views/FavoritesLayer.java
index 8ef1190e49..5f52898536 100644
--- a/OsmAnd/src/net/osmand/plus/views/FavoritesLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/FavoritesLayer.java
@@ -222,7 +222,7 @@ public class FavoritesLayer  extends OsmandMapLayer implements ContextMenuLayer.
 				}
 			};
 			adapter.item(R.string.favourites_context_menu_delete)
-						.icons(R.drawable.ic_action_delete_dark, R.drawable.ic_action_delete_light).listen(listener)
+						.iconColor(R.drawable.ic_action_delete_dark).listen(listener)
 						.reg();
 		}
 	}
diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
index b908c5c65d..a5460167c1 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
@@ -227,7 +227,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 
 		View optionsRouteButton = mapActivity.findViewById(R.id.map_options_route_button);
 		optionsRouteControl = createHudButton((ImageView) optionsRouteButton,
-				settings.getApplicationMode().getSmallIcon(true)).setBg(R.drawable.btn_flat, R.drawable.btn_flat_night);
+				settings.getApplicationMode().getSmallIconDark()).setBg(R.drawable.btn_flat, R.drawable.btn_flat_night);
 		optionsRouteControlDialog = new MapRoutePreferencesControl(mapActivity);
 		controls.add(optionsRouteControl);
 		optionsRouteButton.setOnClickListener(new View.OnClickListener() {
@@ -328,7 +328,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 	private void initZooms() {
 		final OsmandMapTileView view = mapActivity.getMapView();
 		View zoomInButton = mapActivity.findViewById(R.id.map_zoom_in_button);
-		controls.add(createHudButton((ImageView) zoomInButton, R.drawable.ic_action_zoom_in).setRoundTransparent());
+		controls.add(createHudButton((ImageView) zoomInButton, R.drawable.map_zoom_in).setRoundTransparent());
 		zoomInButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
@@ -344,7 +344,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 		final View.OnLongClickListener listener = MapControlsLayer.getOnClickMagnifierListener(view);
 		zoomInButton.setOnLongClickListener(listener);
 		View zoomOutButton = mapActivity.findViewById(R.id.map_zoom_out_button);
-		controls.add(createHudButton((ImageView) zoomOutButton, R.drawable.ic_action_zoom_out).setRoundTransparent());
+		controls.add(createHudButton((ImageView) zoomOutButton, R.drawable.map_zoom_out).setRoundTransparent());
 		zoomOutButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
@@ -461,14 +461,15 @@ public class MapControlsLayer extends OsmandMapLayer {
 			if (!mapView.isZooming() || !OsmandPlugin.isDevelopment()) {
 				zoomText.setVisibility(View.GONE);
 				appModeIcon.setVisibility(View.VISIBLE);
-				appModeIcon.setImageResource(settings.getApplicationMode().getSmallIcon(isNight));
+				appModeIcon.setImageDrawable(app.getIconsCache().getActionBarIcon(settings.getApplicationMode().getSmallIconDark(), 
+						isNight));
 			} else {
 				zoomText.setVisibility(View.VISIBLE);
 				appModeIcon.setVisibility(View.GONE);
 				zoomText.setText(getZoomLevel(tileBox));
 			}
 		}
-		optionsRouteControl.setIconResId(settings.getApplicationMode().getSmallIcon(true));
+		optionsRouteControl.setIconResId(settings.getApplicationMode().getSmallIconDark());
 		int vis = showRouteCalculationControls ? View.VISIBLE : View.GONE;
 		if (showRouteCalculationControls) {
 			((TextView) routeGoControl.iv).setTextColor(textColor);
@@ -718,16 +719,16 @@ public class MapControlsLayer extends OsmandMapLayer {
 		mQuickAction.setOnAnchorOnTop(true);
 		List<ApplicationMode> vls = ApplicationMode.values(mapActivity.getMyApplication().getSettings());
 		final ApplicationMode[] modes = vls.toArray(new ApplicationMode[vls.size()]);
-		int[] icons = new int[vls.size()];
+		Drawable[] icons = new Drawable[vls.size()];
 		int[] values = new int[vls.size()];
 		for (int k = 0; k < modes.length; k++) {
-			icons[k] = modes[k].getSmallIcon(false);
+			icons[k] = app.getIconsCache().getIcon(modes[k].getSmallIconDark(), R.color.icon_color_light);
 			values[k] = modes[k].getStringResource();
 		}
 		for (int i = 0; i < modes.length; i++) {
 			final ActionItem action = new ActionItem();
 			action.setTitle(mapActivity.getResources().getString(values[i]));
-			action.setIcon(mapActivity.getResources().getDrawable(icons[i]));
+			action.setIcon(icons[i]);
 			final int j = i;
 			action.setOnClickListener(new OnClickListener() {
 				@Override
diff --git a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
index db3d82cd62..01ac214ea7 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
@@ -82,9 +82,9 @@ public class MapInfoLayer extends OsmandMapLayer {
 		recreateControls();
 	}
 	
-	public void registerSideWidget(TextInfoWidget widget, int drawableDark,int drawableLight, 
+	public void registerSideWidget(TextInfoWidget widget, int drawableMenu, int drawableMap, 
 			int messageId, String key, boolean left, int priorityOrder) {
-		MapWidgetRegInfo reg = mapInfoControls.registerSideWidgetInternal(widget, drawableDark, drawableLight, messageId, key, left, priorityOrder);
+		MapWidgetRegInfo reg = mapInfoControls.registerSideWidgetInternal(widget, drawableMenu, drawableMap, messageId, key, left, priorityOrder);
 		updateReg(calculateTextState(), reg);
 	}
 	
@@ -105,29 +105,29 @@ public class MapInfoLayer extends OsmandMapLayer {
 		
 		// register left stack
 		NextTurnInfoWidget bigInfoControl = ric.createNextInfoControl(map, app, false);
-		registerSideWidget(bigInfoControl, R.drawable.widget_next_turn, R.drawable.widget_next_turn, R.string.map_widget_next_turn,"next_turn", true, 5);
+		registerSideWidget(bigInfoControl, R.drawable.ic_action_next_turn, R.drawable.widget_next_turn, R.string.map_widget_next_turn,"next_turn", true, 5);
 		NextTurnInfoWidget smallInfoControl = ric.createNextInfoControl(map, app, true);
-		registerSideWidget(smallInfoControl, R.drawable.widget_next_turn, R.drawable.widget_next_turn, R.string.map_widget_next_turn_small, "next_turn_small", true,
+		registerSideWidget(smallInfoControl, R.drawable.ic_action_next_turn, R.drawable.widget_next_turn, R.string.map_widget_next_turn_small, "next_turn_small", true,
 				10);
 		NextTurnInfoWidget nextNextInfoControl = ric.createNextNextInfoControl(map, app, true);
-		registerSideWidget(nextNextInfoControl, R.drawable.widget_next_turn, R.drawable.widget_next_turn, R.string.map_widget_next_next_turn, "next_next_turn",true, 15);
+		registerSideWidget(nextNextInfoControl, R.drawable.ic_action_next_turn, R.drawable.widget_next_turn, R.string.map_widget_next_next_turn, "next_next_turn",true, 15);
 		// right stack
 		TextInfoWidget intermediateDist = ric.createIntermediateDistanceControl(map);
-		registerSideWidget(intermediateDist, R.drawable.widget_intermediate, R.drawable.widget_intermediate, R.string.map_widget_intermediate_distance, "intermediate_distance", false, 3);
+		registerSideWidget(intermediateDist, R.drawable.ic_action_intermediate, R.drawable.widget_intermediate, R.string.map_widget_intermediate_distance, "intermediate_distance", false, 3);
 		TextInfoWidget dist = ric.createDistanceControl(map);
-		registerSideWidget(dist, R.drawable.widget_target, R.drawable.widget_target, R.string.map_widget_distance, "distance", false, 5);
+		registerSideWidget(dist, R.drawable.ic_action_target, R.drawable.widget_target, R.string.map_widget_distance, "distance", false, 5);
 		TextInfoWidget time = ric.createTimeControl(map);
-		registerSideWidget(time, R.drawable.widget_time, R.drawable.widget_time, R.string.map_widget_time, "time", false, 10);
+		registerSideWidget(time, R.drawable.ic_action_time, R.drawable.widget_time, R.string.map_widget_time, "time", false, 10);
 		TextInfoWidget speed = ric.createSpeedControl(map);
-		registerSideWidget(speed, R.drawable.widget_speed, R.drawable.widget_speed, R.string.map_widget_speed, "speed", false, 15);
+		registerSideWidget(speed, R.drawable.ic_action_speed, R.drawable.widget_speed, R.string.map_widget_speed, "speed", false, 15);
 		TextInfoWidget gpsInfo = mic.createGPSInfoControl(map);
-		registerSideWidget(gpsInfo, R.drawable.widget_gps_info,  R.drawable.widget_gps_info, R.string.map_widget_gps_info, "gps_info", false, 17);
+		registerSideWidget(gpsInfo, R.drawable.ic_action_gps_info,  R.drawable.widget_gps_info, R.string.map_widget_gps_info, "gps_info", false, 17);
 		TextInfoWidget maxspeed = ric.createMaxSpeedControl(map);
-		registerSideWidget(maxspeed, R.drawable.widget_max_speed, R.drawable.widget_max_speed, R.string.map_widget_max_speed, "max_speed", false,  18);
+		registerSideWidget(maxspeed, R.drawable.ic_action_max_speed, R.drawable.widget_max_speed, R.string.map_widget_max_speed, "max_speed", false,  18);
 		TextInfoWidget alt = mic.createAltitudeControl(map);
-		registerSideWidget(alt, R.drawable.widget_altitude, R.drawable.widget_altitude, R.string.map_widget_altitude, "altitude", false, 20);
+		registerSideWidget(alt, R.drawable.ic_action_altitude, R.drawable.widget_altitude, R.string.map_widget_altitude, "altitude", false, 20);
 		TextInfoWidget plainTime = ric.createPlainTimeControl(map);
-		registerSideWidget(plainTime, R.drawable.widget_time_to_distance, R.drawable.widget_time_to_distance, R.string.map_widget_plain_time, "plain_time", false, 25);
+		registerSideWidget(plainTime, R.drawable.ic_action_time_to_distance, R.drawable.widget_time_to_distance, R.string.map_widget_plain_time, "plain_time", false, 25);
 	}
 	
 	
@@ -306,7 +306,7 @@ public class MapInfoLayer extends OsmandMapLayer {
 	public ContextMenuAdapter getViewConfigureMenuAdapter() {
 		ContextMenuAdapter cm = new ContextMenuAdapter(view.getContext());
 		cm.setDefaultLayoutId(R.layout.drawer_list_item);
-		cm.item(R.string.layer_map_appearance).icons(R.drawable.ic_back_drawer_dark, R.drawable.ic_back_drawer_white)
+		cm.item(R.string.layer_map_appearance).iconColor(R.drawable.ic_back_drawer_dark)
 				.listen(new OnContextMenuClick() {
 
 					@Override
@@ -324,7 +324,7 @@ public class MapInfoLayer extends OsmandMapLayer {
 			}
 		});
 		cm.item(R.string.map_widget_reset) 
-				.icons(R.drawable.widget_reset_to_default_dark, R.drawable.widget_reset_to_default_light).listen(new OnContextMenuClick() {
+				.iconColor(R.drawable.widget_reset_to_default_dark).listen(new OnContextMenuClick() {
 					
 					@Override
 					public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
diff --git a/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java b/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java
index c0a3c55830..31cb052e8b 100644
--- a/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java
@@ -286,15 +286,15 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon
 			};
 			if (OsmAndFormatter.getAmenityDescriptionContent(view.getApplication(), a, false).length() > 0) {
 				adapter.item(R.string.poi_context_menu_showdescription)
-						.icons(R.drawable.ic_action_note_dark, R.drawable.ic_action_note_light).listen(listener).reg();
+						.iconColor(R.drawable.ic_action_note_dark).listen(listener).reg();
 			}
 			if (a.getPhone() != null) {
 				adapter.item(R.string.poi_context_menu_call)
-						.icons(R.drawable.ic_action_call_dark, R.drawable.ic_action_call_light).listen(listener).reg();
+						.iconColor(R.drawable.ic_action_call_dark).listen(listener).reg();
 			}
 			if (a.getSite() != null) {
 				adapter.item(R.string.poi_context_menu_website)
-						.icons(R.drawable.ic_action_globus_dark, R.drawable.ic_action_globus_light).listen(listener)
+						.iconColor(R.drawable.ic_action_globus_dark).listen(listener)
 						.reg();
 			}
 		}
diff --git a/OsmAnd/src/net/osmand/plus/views/PointNavigationLayer.java b/OsmAnd/src/net/osmand/plus/views/PointNavigationLayer.java
index 05da9a52f9..eefbc49ea3 100644
--- a/OsmAnd/src/net/osmand/plus/views/PointNavigationLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/PointNavigationLayer.java
@@ -238,7 +238,7 @@ public class PointNavigationLayer extends OsmandMapLayer implements IContextMenu
 			
 			
 			adapter.item(R.string.delete_target_point)
-			.icons( R.drawable.ic_action_remove_dark, R.drawable.ic_action_remove_light).listen(listener).reg();
+			.iconColor( R.drawable.ic_action_remove_dark).listen(listener).reg();
 			
 		}
 	}
diff --git a/OsmAnd/src/net/osmand/plus/views/TransportStopsLayer.java b/OsmAnd/src/net/osmand/plus/views/TransportStopsLayer.java
index 4d5ef7c814..42a0bf739a 100644
--- a/OsmAnd/src/net/osmand/plus/views/TransportStopsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/TransportStopsLayer.java
@@ -224,7 +224,7 @@ public class TransportStopsLayer extends OsmandMapLayer implements ContextMenuLa
 				}
 			};
 			adapter.item(R.string.poi_context_menu_showdescription)
-			.icons( R.drawable.ic_action_note_dark, R.drawable.ic_action_note_light).listen(listener).reg();
+			.iconColor( R.drawable.ic_action_note_dark).listen(listener).reg();
 		}
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
index 84e5fbe576..bf63e913ad 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
@@ -89,9 +89,9 @@ public class MapWidgetRegistry {
 			}
 		}
 	}
-	public MapWidgetRegInfo registerSideWidgetInternal(TextInfoWidget widget, int drawableDark,int drawableLight, 
+	public MapWidgetRegInfo registerSideWidgetInternal(TextInfoWidget widget, int drawableMenu, int drawableMap,
 			int messageId, String key, boolean left, int priorityOrder) {
-		MapWidgetRegInfo ii = new MapWidgetRegInfo(key, widget, drawableDark, drawableLight, 
+		MapWidgetRegInfo ii = new MapWidgetRegInfo(key, widget, drawableMenu,  drawableMap,
 				messageId, priorityOrder, left);
 		for (ApplicationMode ms : ApplicationMode.values(settings)) {
 			boolean collapse = ms.isWidgetCollapsible(key);
@@ -281,7 +281,7 @@ public class MapWidgetRegistry {
 	private void addControls(final MapInfoLayer mil, final ContextMenuAdapter adapter, Set<MapWidgetRegInfo> top, final ApplicationMode mode) {
 		for(final MapWidgetRegInfo r : top){
 			adapter.item(r.messageId).selected(r.visibleCollapsed(mode) || r.visible(mode) ? 1 : 0)
-				.icons(r.drawableDark, r.drawableLight).listen(new OnContextMenuClick() {
+				.iconColor(r.drawableMenu).listen(new OnContextMenuClick() {
 				
 				@Override
 				public boolean onContextMenuClick(ArrayAdapter<?> a, int itemId, int pos, boolean isChecked) {
@@ -303,8 +303,8 @@ public class MapWidgetRegistry {
 	
 	public static class MapWidgetRegInfo implements Comparable<MapWidgetRegInfo>  {
 		public final TextInfoWidget widget;
-		public final int drawableDark;
-		public final int drawableLight;
+		public final int drawableMenu;
+		public final int drawableMap;
 		public final int messageId;
 		public final String key;
 		public final boolean left;
@@ -313,12 +313,13 @@ public class MapWidgetRegistry {
 		private final Set<ApplicationMode> visibleModes = new LinkedHashSet<ApplicationMode>();
 		private Runnable stateChangeListener = null;
 		
-		public MapWidgetRegInfo(String key, TextInfoWidget widget, int drawableDark, int drawableLight, int messageId, int priorityOrder,
+		public MapWidgetRegInfo(String key, TextInfoWidget widget, int drawableMenu, 
+				int drawableMap, int messageId, int priorityOrder,
 				boolean left) {
 			this.key = key;
 			this.widget = widget;
-			this.drawableDark = drawableDark;
-			this.drawableLight = drawableLight;
+			this.drawableMenu = drawableMenu;
+			this.drawableMap = drawableMap;
 			this.messageId = messageId;
 			this.priorityOrder = priorityOrder;
 			this.left = left;