diff --git a/OsmAnd/res/drawable-hdpi/widget_altitude_day.png b/OsmAnd/res/drawable-hdpi/widget_altitude_day.png
deleted file mode 100644
index 755c8f99d1..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_altitude_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_altitude_night.png b/OsmAnd/res/drawable-hdpi/widget_altitude_night.png
deleted file mode 100644
index dd55d76103..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_altitude_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_av_audio_day.png b/OsmAnd/res/drawable-hdpi/widget_av_audio_day.png
deleted file mode 100644
index 5ea5115620..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_av_audio_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_av_audio_night.png b/OsmAnd/res/drawable-hdpi/widget_av_audio_night.png
deleted file mode 100644
index 189358f7cf..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_av_audio_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_av_photo_day.png b/OsmAnd/res/drawable-hdpi/widget_av_photo_day.png
deleted file mode 100644
index b618c1c1ae..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_av_photo_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_av_photo_night.png b/OsmAnd/res/drawable-hdpi/widget_av_photo_night.png
deleted file mode 100644
index 55596793db..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_av_photo_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_av_video_day.png b/OsmAnd/res/drawable-hdpi/widget_av_video_day.png
deleted file mode 100644
index 65b031ef97..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_av_video_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_av_video_night.png b/OsmAnd/res/drawable-hdpi/widget_av_video_night.png
deleted file mode 100644
index 1bf182e287..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_av_video_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_battery_charging_day.png b/OsmAnd/res/drawable-hdpi/widget_battery_charging_day.png
deleted file mode 100644
index fee614935b..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_battery_charging_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_battery_charging_night.png b/OsmAnd/res/drawable-hdpi/widget_battery_charging_night.png
deleted file mode 100644
index b915b5b7f4..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_battery_charging_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_battery_day.png b/OsmAnd/res/drawable-hdpi/widget_battery_day.png
deleted file mode 100644
index a82c873618..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_battery_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_battery_night.png b/OsmAnd/res/drawable-hdpi/widget_battery_night.png
deleted file mode 100644
index b63e78e5e3..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_battery_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_bearing_day.png b/OsmAnd/res/drawable-hdpi/widget_bearing_day.png
deleted file mode 100644
index 94f39bf45c..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_bearing_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_bearing_night.png b/OsmAnd/res/drawable-hdpi/widget_bearing_night.png
deleted file mode 100644
index fb28586698..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_bearing_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_coordinates_latitude_day.png b/OsmAnd/res/drawable-hdpi/widget_coordinates_latitude_day.png
deleted file mode 100644
index afcbe664e3..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_coordinates_latitude_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_coordinates_latitude_night.png b/OsmAnd/res/drawable-hdpi/widget_coordinates_latitude_night.png
deleted file mode 100644
index 64e08635fe..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_coordinates_latitude_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_coordinates_latitude_north_day.png b/OsmAnd/res/drawable-hdpi/widget_coordinates_latitude_north_day.png
deleted file mode 100644
index f91230fabe..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_coordinates_latitude_north_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_coordinates_latitude_north_night.png b/OsmAnd/res/drawable-hdpi/widget_coordinates_latitude_north_night.png
deleted file mode 100644
index 1d1fae839d..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_coordinates_latitude_north_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_coordinates_latitude_south_day.png b/OsmAnd/res/drawable-hdpi/widget_coordinates_latitude_south_day.png
deleted file mode 100644
index cf0e4682cf..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_coordinates_latitude_south_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_coordinates_latitude_south_night.png b/OsmAnd/res/drawable-hdpi/widget_coordinates_latitude_south_night.png
deleted file mode 100644
index 68563c1e6c..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_coordinates_latitude_south_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_coordinates_longitude_day.png b/OsmAnd/res/drawable-hdpi/widget_coordinates_longitude_day.png
deleted file mode 100644
index 8483e55c10..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_coordinates_longitude_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_coordinates_longitude_east_day.png b/OsmAnd/res/drawable-hdpi/widget_coordinates_longitude_east_day.png
deleted file mode 100644
index 20f08cb140..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_coordinates_longitude_east_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_coordinates_longitude_east_night.png b/OsmAnd/res/drawable-hdpi/widget_coordinates_longitude_east_night.png
deleted file mode 100644
index d05534c851..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_coordinates_longitude_east_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_coordinates_longitude_night.png b/OsmAnd/res/drawable-hdpi/widget_coordinates_longitude_night.png
deleted file mode 100644
index b98df82372..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_coordinates_longitude_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_coordinates_longitude_west_day.png b/OsmAnd/res/drawable-hdpi/widget_coordinates_longitude_west_day.png
deleted file mode 100644
index 8b3d6c84cc..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_coordinates_longitude_west_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_coordinates_longitude_west_night.png b/OsmAnd/res/drawable-hdpi/widget_coordinates_longitude_west_night.png
deleted file mode 100644
index 5387e17c51..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_coordinates_longitude_west_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_coordinates_utm_day.png b/OsmAnd/res/drawable-hdpi/widget_coordinates_utm_day.png
deleted file mode 100644
index 77ce6c000e..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_coordinates_utm_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_coordinates_utm_night.png b/OsmAnd/res/drawable-hdpi/widget_coordinates_utm_night.png
deleted file mode 100644
index 9a9809fe58..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_coordinates_utm_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_gps_info_day.png b/OsmAnd/res/drawable-hdpi/widget_gps_info_day.png
deleted file mode 100644
index 9d250b4a30..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_gps_info_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_gps_info_night.png b/OsmAnd/res/drawable-hdpi/widget_gps_info_night.png
deleted file mode 100644
index 8c9691b5f9..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_gps_info_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_hidden_day.png b/OsmAnd/res/drawable-hdpi/widget_hidden_day.png
deleted file mode 100644
index 878f75d39e..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_hidden_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_hidden_night.png b/OsmAnd/res/drawable-hdpi/widget_hidden_night.png
deleted file mode 100644
index 22a2c39b3b..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_hidden_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_icon_av_active.png b/OsmAnd/res/drawable-hdpi/widget_icon_av_active.png
deleted file mode 100644
index a89b46d105..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_icon_av_active.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_icon_av_inactive_day.png b/OsmAnd/res/drawable-hdpi/widget_icon_av_inactive_day.png
deleted file mode 100644
index ca14f8c2da..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_icon_av_inactive_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_icon_av_inactive_night.png b/OsmAnd/res/drawable-hdpi/widget_icon_av_inactive_night.png
deleted file mode 100644
index 9dec9fc472..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_icon_av_inactive_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_intermediate_day.png b/OsmAnd/res/drawable-hdpi/widget_intermediate_day.png
deleted file mode 100644
index a28bc454e0..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_intermediate_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_intermediate_night.png b/OsmAnd/res/drawable-hdpi/widget_intermediate_night.png
deleted file mode 100644
index 2879387d1d..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_intermediate_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_intermediate_time_day.png b/OsmAnd/res/drawable-hdpi/widget_intermediate_time_day.png
deleted file mode 100644
index 4cbae4cd16..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_intermediate_time_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_intermediate_time_night.png b/OsmAnd/res/drawable-hdpi/widget_intermediate_time_night.png
deleted file mode 100644
index 39532f25f9..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_intermediate_time_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_live_monitoring_rec_big_day.png b/OsmAnd/res/drawable-hdpi/widget_live_monitoring_rec_big_day.png
deleted file mode 100644
index 978b2a32c7..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_live_monitoring_rec_big_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_live_monitoring_rec_big_night.png b/OsmAnd/res/drawable-hdpi/widget_live_monitoring_rec_big_night.png
deleted file mode 100644
index e27396aeed..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_live_monitoring_rec_big_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_live_monitoring_rec_small_day.png b/OsmAnd/res/drawable-hdpi/widget_live_monitoring_rec_small_day.png
deleted file mode 100644
index a5ea3b2407..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_live_monitoring_rec_small_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_live_monitoring_rec_small_night.png b/OsmAnd/res/drawable-hdpi/widget_live_monitoring_rec_small_night.png
deleted file mode 100644
index 325637dd70..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_live_monitoring_rec_small_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_location_sharing_day.png b/OsmAnd/res/drawable-hdpi/widget_location_sharing_day.png
deleted file mode 100644
index f042cf246b..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_location_sharing_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_location_sharing_night.png b/OsmAnd/res/drawable-hdpi/widget_location_sharing_night.png
deleted file mode 100644
index 1cad588f44..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_location_sharing_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_location_sharing_off_day.png b/OsmAnd/res/drawable-hdpi/widget_location_sharing_off_day.png
deleted file mode 100644
index 587280ca72..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_location_sharing_off_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_location_sharing_off_night.png b/OsmAnd/res/drawable-hdpi/widget_location_sharing_off_night.png
deleted file mode 100644
index cbfa7e210c..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_location_sharing_off_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_location_sharing_on_day.png b/OsmAnd/res/drawable-hdpi/widget_location_sharing_on_day.png
deleted file mode 100644
index 5e41580a9d..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_location_sharing_on_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_location_sharing_on_night.png b/OsmAnd/res/drawable-hdpi/widget_location_sharing_on_night.png
deleted file mode 100644
index d675bf433b..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_location_sharing_on_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_mapillary_day.png b/OsmAnd/res/drawable-hdpi/widget_mapillary_day.png
deleted file mode 100644
index 09301a1148..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_mapillary_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_mapillary_night.png b/OsmAnd/res/drawable-hdpi/widget_mapillary_night.png
deleted file mode 100644
index 342d1e7d04..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_mapillary_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_marker_day.png b/OsmAnd/res/drawable-hdpi/widget_marker_day.png
deleted file mode 100644
index 5aaf149bec..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_marker_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_marker_night.png b/OsmAnd/res/drawable-hdpi/widget_marker_night.png
deleted file mode 100644
index bac3a61db8..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_marker_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_marker_triangle.png b/OsmAnd/res/drawable-hdpi/widget_marker_triangle.png
deleted file mode 100644
index 74fb99e324..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_marker_triangle.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_max_speed_day.png b/OsmAnd/res/drawable-hdpi/widget_max_speed_day.png
deleted file mode 100644
index c11b0a0fc0..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_max_speed_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_max_speed_night.png b/OsmAnd/res/drawable-hdpi/widget_max_speed_night.png
deleted file mode 100644
index ff0c655a41..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_max_speed_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_monitoring_rec_big_day.png b/OsmAnd/res/drawable-hdpi/widget_monitoring_rec_big_day.png
deleted file mode 100644
index 523b57cb05..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_monitoring_rec_big_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_monitoring_rec_big_night.png b/OsmAnd/res/drawable-hdpi/widget_monitoring_rec_big_night.png
deleted file mode 100644
index 62e7826796..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_monitoring_rec_big_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_monitoring_rec_inactive_day.png b/OsmAnd/res/drawable-hdpi/widget_monitoring_rec_inactive_day.png
deleted file mode 100644
index c39f19c695..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_monitoring_rec_inactive_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_monitoring_rec_inactive_night.png b/OsmAnd/res/drawable-hdpi/widget_monitoring_rec_inactive_night.png
deleted file mode 100644
index 8880e901c5..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_monitoring_rec_inactive_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_monitoring_rec_small_day.png b/OsmAnd/res/drawable-hdpi/widget_monitoring_rec_small_day.png
deleted file mode 100644
index 24be400951..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_monitoring_rec_small_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_monitoring_rec_small_night.png b/OsmAnd/res/drawable-hdpi/widget_monitoring_rec_small_night.png
deleted file mode 100644
index e27e81abfd..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_monitoring_rec_small_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_relative_bearing_day.png b/OsmAnd/res/drawable-hdpi/widget_relative_bearing_day.png
deleted file mode 100644
index c1b307d817..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_relative_bearing_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_relative_bearing_night.png b/OsmAnd/res/drawable-hdpi/widget_relative_bearing_night.png
deleted file mode 100644
index 496b0c2dc1..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_relative_bearing_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_ruler_circle_day.png b/OsmAnd/res/drawable-hdpi/widget_ruler_circle_day.png
deleted file mode 100644
index 4d11b91379..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_ruler_circle_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_ruler_circle_night.png b/OsmAnd/res/drawable-hdpi/widget_ruler_circle_night.png
deleted file mode 100644
index 2b56d8a8d3..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_ruler_circle_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_speed_day.png b/OsmAnd/res/drawable-hdpi/widget_speed_day.png
deleted file mode 100644
index 8b9ec7518f..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_speed_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_speed_night.png b/OsmAnd/res/drawable-hdpi/widget_speed_night.png
deleted file mode 100644
index e2f476429f..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_speed_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_target_day.png b/OsmAnd/res/drawable-hdpi/widget_target_day.png
deleted file mode 100644
index 4619096a30..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_target_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_target_night.png b/OsmAnd/res/drawable-hdpi/widget_target_night.png
deleted file mode 100644
index 0447d9968f..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_target_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_time_day.png b/OsmAnd/res/drawable-hdpi/widget_time_day.png
deleted file mode 100644
index 280267e0b0..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_time_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_time_night.png b/OsmAnd/res/drawable-hdpi/widget_time_night.png
deleted file mode 100644
index 11b69882f1..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_time_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_time_to_distance_day.png b/OsmAnd/res/drawable-hdpi/widget_time_to_distance_day.png
deleted file mode 100644
index 572f95321a..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_time_to_distance_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/widget_time_to_distance_night.png b/OsmAnd/res/drawable-hdpi/widget_time_to_distance_night.png
deleted file mode 100644
index 1ffb9bdea5..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/widget_time_to_distance_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_altitude_day.png b/OsmAnd/res/drawable-mdpi/widget_altitude_day.png
deleted file mode 100644
index 7526009986..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_altitude_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_altitude_night.png b/OsmAnd/res/drawable-mdpi/widget_altitude_night.png
deleted file mode 100644
index 102b5ff003..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_altitude_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_av_audio_day.png b/OsmAnd/res/drawable-mdpi/widget_av_audio_day.png
deleted file mode 100644
index bf7b1f2dec..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_av_audio_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_av_audio_night.png b/OsmAnd/res/drawable-mdpi/widget_av_audio_night.png
deleted file mode 100644
index ded524752e..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_av_audio_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_av_photo_day.png b/OsmAnd/res/drawable-mdpi/widget_av_photo_day.png
deleted file mode 100644
index 6ade74aa6f..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_av_photo_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_av_photo_night.png b/OsmAnd/res/drawable-mdpi/widget_av_photo_night.png
deleted file mode 100644
index e3d8af6e58..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_av_photo_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_av_video_day.png b/OsmAnd/res/drawable-mdpi/widget_av_video_day.png
deleted file mode 100644
index 0df7312d57..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_av_video_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_av_video_night.png b/OsmAnd/res/drawable-mdpi/widget_av_video_night.png
deleted file mode 100644
index f203c4557e..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_av_video_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_battery_charging_day.png b/OsmAnd/res/drawable-mdpi/widget_battery_charging_day.png
deleted file mode 100644
index aefb4f4448..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_battery_charging_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_battery_charging_night.png b/OsmAnd/res/drawable-mdpi/widget_battery_charging_night.png
deleted file mode 100644
index ff34ec21cf..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_battery_charging_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_battery_day.png b/OsmAnd/res/drawable-mdpi/widget_battery_day.png
deleted file mode 100644
index d1b31d2db1..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_battery_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_battery_night.png b/OsmAnd/res/drawable-mdpi/widget_battery_night.png
deleted file mode 100644
index 6af33f09f1..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_battery_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_bearing_day.png b/OsmAnd/res/drawable-mdpi/widget_bearing_day.png
deleted file mode 100644
index 73f1f5261e..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_bearing_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_bearing_night.png b/OsmAnd/res/drawable-mdpi/widget_bearing_night.png
deleted file mode 100644
index c76e9325de..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_bearing_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_coordinates_latitude_day.png b/OsmAnd/res/drawable-mdpi/widget_coordinates_latitude_day.png
deleted file mode 100644
index ea2978a25c..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_coordinates_latitude_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_coordinates_latitude_night.png b/OsmAnd/res/drawable-mdpi/widget_coordinates_latitude_night.png
deleted file mode 100644
index 2e97b76de6..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_coordinates_latitude_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_coordinates_latitude_north_day.png b/OsmAnd/res/drawable-mdpi/widget_coordinates_latitude_north_day.png
deleted file mode 100644
index a1f236ea30..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_coordinates_latitude_north_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_coordinates_latitude_north_night.png b/OsmAnd/res/drawable-mdpi/widget_coordinates_latitude_north_night.png
deleted file mode 100644
index b2b61d7978..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_coordinates_latitude_north_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_coordinates_latitude_south_day.png b/OsmAnd/res/drawable-mdpi/widget_coordinates_latitude_south_day.png
deleted file mode 100644
index 9786c95845..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_coordinates_latitude_south_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_coordinates_latitude_south_night.png b/OsmAnd/res/drawable-mdpi/widget_coordinates_latitude_south_night.png
deleted file mode 100644
index 2770fe7e97..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_coordinates_latitude_south_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_coordinates_longitude_day.png b/OsmAnd/res/drawable-mdpi/widget_coordinates_longitude_day.png
deleted file mode 100644
index bbdc955ccb..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_coordinates_longitude_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_coordinates_longitude_east_day.png b/OsmAnd/res/drawable-mdpi/widget_coordinates_longitude_east_day.png
deleted file mode 100644
index d95f7cf7e2..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_coordinates_longitude_east_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_coordinates_longitude_east_night.png b/OsmAnd/res/drawable-mdpi/widget_coordinates_longitude_east_night.png
deleted file mode 100644
index a56ea6602d..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_coordinates_longitude_east_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_coordinates_longitude_night.png b/OsmAnd/res/drawable-mdpi/widget_coordinates_longitude_night.png
deleted file mode 100644
index 6694986694..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_coordinates_longitude_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_coordinates_longitude_west_day.png b/OsmAnd/res/drawable-mdpi/widget_coordinates_longitude_west_day.png
deleted file mode 100644
index ae0c1c6bbc..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_coordinates_longitude_west_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_coordinates_longitude_west_night.png b/OsmAnd/res/drawable-mdpi/widget_coordinates_longitude_west_night.png
deleted file mode 100644
index 3cdbce0df4..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_coordinates_longitude_west_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_coordinates_utm_day.png b/OsmAnd/res/drawable-mdpi/widget_coordinates_utm_day.png
deleted file mode 100644
index 6c9d74675f..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_coordinates_utm_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_coordinates_utm_night.png b/OsmAnd/res/drawable-mdpi/widget_coordinates_utm_night.png
deleted file mode 100644
index 50a630a8b5..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_coordinates_utm_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_gps_info_day.png b/OsmAnd/res/drawable-mdpi/widget_gps_info_day.png
deleted file mode 100644
index 83caf487ce..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_gps_info_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_gps_info_night.png b/OsmAnd/res/drawable-mdpi/widget_gps_info_night.png
deleted file mode 100644
index edf9c4940c..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_gps_info_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_hidden_day.png b/OsmAnd/res/drawable-mdpi/widget_hidden_day.png
deleted file mode 100644
index e5fb55da90..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_hidden_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_hidden_night.png b/OsmAnd/res/drawable-mdpi/widget_hidden_night.png
deleted file mode 100644
index 864935e18c..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_hidden_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_icon_av_inactive_day.png b/OsmAnd/res/drawable-mdpi/widget_icon_av_inactive_day.png
deleted file mode 100644
index efbd5f3c6d..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_icon_av_inactive_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_icon_av_inactive_night.png b/OsmAnd/res/drawable-mdpi/widget_icon_av_inactive_night.png
deleted file mode 100644
index 40d730cbab..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_icon_av_inactive_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_intermediate_day.png b/OsmAnd/res/drawable-mdpi/widget_intermediate_day.png
deleted file mode 100644
index e5c91240f1..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_intermediate_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_intermediate_night.png b/OsmAnd/res/drawable-mdpi/widget_intermediate_night.png
deleted file mode 100644
index 401397274e..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_intermediate_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_intermediate_time_day.png b/OsmAnd/res/drawable-mdpi/widget_intermediate_time_day.png
deleted file mode 100644
index ca75bb70d9..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_intermediate_time_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_intermediate_time_night.png b/OsmAnd/res/drawable-mdpi/widget_intermediate_time_night.png
deleted file mode 100644
index 8cc569f29f..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_intermediate_time_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_live_monitoring_rec_big_day.png b/OsmAnd/res/drawable-mdpi/widget_live_monitoring_rec_big_day.png
deleted file mode 100644
index 3477dfa3c5..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_live_monitoring_rec_big_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_live_monitoring_rec_big_night.png b/OsmAnd/res/drawable-mdpi/widget_live_monitoring_rec_big_night.png
deleted file mode 100644
index 8ae9d0993d..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_live_monitoring_rec_big_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_live_monitoring_rec_small_day.png b/OsmAnd/res/drawable-mdpi/widget_live_monitoring_rec_small_day.png
deleted file mode 100644
index b02a8d4343..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_live_monitoring_rec_small_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_live_monitoring_rec_small_night.png b/OsmAnd/res/drawable-mdpi/widget_live_monitoring_rec_small_night.png
deleted file mode 100644
index 5ecf911646..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_live_monitoring_rec_small_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_location_sharing_day.png b/OsmAnd/res/drawable-mdpi/widget_location_sharing_day.png
deleted file mode 100644
index e157aa854d..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_location_sharing_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_location_sharing_night.png b/OsmAnd/res/drawable-mdpi/widget_location_sharing_night.png
deleted file mode 100644
index 0daa96cbe5..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_location_sharing_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_location_sharing_off_day.png b/OsmAnd/res/drawable-mdpi/widget_location_sharing_off_day.png
deleted file mode 100644
index e42bf97947..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_location_sharing_off_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_location_sharing_off_night.png b/OsmAnd/res/drawable-mdpi/widget_location_sharing_off_night.png
deleted file mode 100644
index 06b68c1a21..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_location_sharing_off_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_location_sharing_on_day.png b/OsmAnd/res/drawable-mdpi/widget_location_sharing_on_day.png
deleted file mode 100644
index 3800616648..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_location_sharing_on_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_location_sharing_on_night.png b/OsmAnd/res/drawable-mdpi/widget_location_sharing_on_night.png
deleted file mode 100644
index a87fbcb936..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_location_sharing_on_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_mapillary_day.png b/OsmAnd/res/drawable-mdpi/widget_mapillary_day.png
deleted file mode 100644
index b6749bed24..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_mapillary_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_mapillary_night.png b/OsmAnd/res/drawable-mdpi/widget_mapillary_night.png
deleted file mode 100644
index 74e6ca2b89..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_mapillary_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_marker_day.png b/OsmAnd/res/drawable-mdpi/widget_marker_day.png
deleted file mode 100644
index 9e7ba89700..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_marker_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_marker_night.png b/OsmAnd/res/drawable-mdpi/widget_marker_night.png
deleted file mode 100644
index dab9687579..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_marker_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_marker_triangle.png b/OsmAnd/res/drawable-mdpi/widget_marker_triangle.png
deleted file mode 100644
index b0d9fa24b2..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_marker_triangle.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_max_speed_day.png b/OsmAnd/res/drawable-mdpi/widget_max_speed_day.png
deleted file mode 100644
index b0f22f1ae9..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_max_speed_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_max_speed_night.png b/OsmAnd/res/drawable-mdpi/widget_max_speed_night.png
deleted file mode 100644
index 242fb7c302..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_max_speed_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_monitoring_rec_big_day.png b/OsmAnd/res/drawable-mdpi/widget_monitoring_rec_big_day.png
deleted file mode 100644
index 27cae47b76..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_monitoring_rec_big_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_monitoring_rec_big_night.png b/OsmAnd/res/drawable-mdpi/widget_monitoring_rec_big_night.png
deleted file mode 100644
index e2310eb562..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_monitoring_rec_big_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_monitoring_rec_inactive_day.png b/OsmAnd/res/drawable-mdpi/widget_monitoring_rec_inactive_day.png
deleted file mode 100644
index e95da2d603..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_monitoring_rec_inactive_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_monitoring_rec_inactive_night.png b/OsmAnd/res/drawable-mdpi/widget_monitoring_rec_inactive_night.png
deleted file mode 100644
index d8e3e7b77b..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_monitoring_rec_inactive_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_monitoring_rec_small_day.png b/OsmAnd/res/drawable-mdpi/widget_monitoring_rec_small_day.png
deleted file mode 100644
index 6a62ba857f..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_monitoring_rec_small_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_monitoring_rec_small_night.png b/OsmAnd/res/drawable-mdpi/widget_monitoring_rec_small_night.png
deleted file mode 100644
index 8d015a1cec..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_monitoring_rec_small_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_relative_bearing_day.png b/OsmAnd/res/drawable-mdpi/widget_relative_bearing_day.png
deleted file mode 100644
index 0e4e379603..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_relative_bearing_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_relative_bearing_night.png b/OsmAnd/res/drawable-mdpi/widget_relative_bearing_night.png
deleted file mode 100644
index 12b2c545dc..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_relative_bearing_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_ruler_circle_day.png b/OsmAnd/res/drawable-mdpi/widget_ruler_circle_day.png
deleted file mode 100644
index 42bcf894db..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_ruler_circle_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_ruler_circle_night.png b/OsmAnd/res/drawable-mdpi/widget_ruler_circle_night.png
deleted file mode 100644
index 26fe457c3d..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_ruler_circle_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_speed_day.png b/OsmAnd/res/drawable-mdpi/widget_speed_day.png
deleted file mode 100644
index 16089a43f2..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_speed_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_speed_night.png b/OsmAnd/res/drawable-mdpi/widget_speed_night.png
deleted file mode 100644
index cb8b5f5f3d..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_speed_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_target_day.png b/OsmAnd/res/drawable-mdpi/widget_target_day.png
deleted file mode 100644
index 96b8c88142..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_target_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_target_night.png b/OsmAnd/res/drawable-mdpi/widget_target_night.png
deleted file mode 100644
index 596e722d4f..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_target_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_time_day.png b/OsmAnd/res/drawable-mdpi/widget_time_day.png
deleted file mode 100644
index c776050242..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_time_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_time_night.png b/OsmAnd/res/drawable-mdpi/widget_time_night.png
deleted file mode 100644
index 9c7e6052a0..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_time_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_time_to_distance_day.png b/OsmAnd/res/drawable-mdpi/widget_time_to_distance_day.png
deleted file mode 100644
index a5ae614bcf..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_time_to_distance_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/widget_time_to_distance_night.png b/OsmAnd/res/drawable-mdpi/widget_time_to_distance_night.png
deleted file mode 100644
index 9f72ed52ef..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/widget_time_to_distance_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_altitude_day.png b/OsmAnd/res/drawable-xhdpi/widget_altitude_day.png
deleted file mode 100644
index 923d6435b5..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_altitude_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_altitude_night.png b/OsmAnd/res/drawable-xhdpi/widget_altitude_night.png
deleted file mode 100644
index d5cc53749f..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_altitude_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_av_audio_day.png b/OsmAnd/res/drawable-xhdpi/widget_av_audio_day.png
deleted file mode 100644
index 69a403c77e..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_av_audio_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_av_audio_night.png b/OsmAnd/res/drawable-xhdpi/widget_av_audio_night.png
deleted file mode 100644
index b7260d476e..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_av_audio_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_av_photo_day.png b/OsmAnd/res/drawable-xhdpi/widget_av_photo_day.png
deleted file mode 100644
index 4650905cf7..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_av_photo_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_av_photo_night.png b/OsmAnd/res/drawable-xhdpi/widget_av_photo_night.png
deleted file mode 100644
index 66982a0a10..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_av_photo_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_av_video_day.png b/OsmAnd/res/drawable-xhdpi/widget_av_video_day.png
deleted file mode 100644
index f11f5ae919..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_av_video_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_av_video_night.png b/OsmAnd/res/drawable-xhdpi/widget_av_video_night.png
deleted file mode 100644
index b69977c284..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_av_video_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_battery_charging_day.png b/OsmAnd/res/drawable-xhdpi/widget_battery_charging_day.png
deleted file mode 100644
index e91cf10623..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_battery_charging_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_battery_charging_night.png b/OsmAnd/res/drawable-xhdpi/widget_battery_charging_night.png
deleted file mode 100644
index ec49609559..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_battery_charging_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_battery_day.png b/OsmAnd/res/drawable-xhdpi/widget_battery_day.png
deleted file mode 100644
index c6731bf259..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_battery_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_battery_night.png b/OsmAnd/res/drawable-xhdpi/widget_battery_night.png
deleted file mode 100644
index e1d76d8663..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_battery_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_bearing_day.png b/OsmAnd/res/drawable-xhdpi/widget_bearing_day.png
deleted file mode 100644
index db643d69a3..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_bearing_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_bearing_night.png b/OsmAnd/res/drawable-xhdpi/widget_bearing_night.png
deleted file mode 100644
index 608e7342d8..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_bearing_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_coordinates_latitude_day.png b/OsmAnd/res/drawable-xhdpi/widget_coordinates_latitude_day.png
deleted file mode 100644
index fe264228da..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_coordinates_latitude_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_coordinates_latitude_night.png b/OsmAnd/res/drawable-xhdpi/widget_coordinates_latitude_night.png
deleted file mode 100644
index de8b7bb08d..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_coordinates_latitude_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_coordinates_latitude_north_day.png b/OsmAnd/res/drawable-xhdpi/widget_coordinates_latitude_north_day.png
deleted file mode 100644
index ef9b1d4921..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_coordinates_latitude_north_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_coordinates_latitude_north_night.png b/OsmAnd/res/drawable-xhdpi/widget_coordinates_latitude_north_night.png
deleted file mode 100644
index de23935ddb..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_coordinates_latitude_north_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_coordinates_latitude_south_day.png b/OsmAnd/res/drawable-xhdpi/widget_coordinates_latitude_south_day.png
deleted file mode 100644
index 0c5ccb70d3..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_coordinates_latitude_south_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_coordinates_latitude_south_night.png b/OsmAnd/res/drawable-xhdpi/widget_coordinates_latitude_south_night.png
deleted file mode 100644
index a8c68d8177..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_coordinates_latitude_south_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_coordinates_longitude_day.png b/OsmAnd/res/drawable-xhdpi/widget_coordinates_longitude_day.png
deleted file mode 100644
index 089004d130..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_coordinates_longitude_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_coordinates_longitude_east_day.png b/OsmAnd/res/drawable-xhdpi/widget_coordinates_longitude_east_day.png
deleted file mode 100644
index 3d45550fbb..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_coordinates_longitude_east_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_coordinates_longitude_east_night.png b/OsmAnd/res/drawable-xhdpi/widget_coordinates_longitude_east_night.png
deleted file mode 100644
index 329b1c9fdb..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_coordinates_longitude_east_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_coordinates_longitude_night.png b/OsmAnd/res/drawable-xhdpi/widget_coordinates_longitude_night.png
deleted file mode 100644
index be12ce8613..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_coordinates_longitude_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_coordinates_longitude_west_day.png b/OsmAnd/res/drawable-xhdpi/widget_coordinates_longitude_west_day.png
deleted file mode 100644
index 6964de3f49..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_coordinates_longitude_west_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_coordinates_longitude_west_night.png b/OsmAnd/res/drawable-xhdpi/widget_coordinates_longitude_west_night.png
deleted file mode 100644
index 2db87609f9..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_coordinates_longitude_west_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_coordinates_utm_day.png b/OsmAnd/res/drawable-xhdpi/widget_coordinates_utm_day.png
deleted file mode 100644
index c1c520d139..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_coordinates_utm_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_coordinates_utm_night.png b/OsmAnd/res/drawable-xhdpi/widget_coordinates_utm_night.png
deleted file mode 100644
index ee30b4647c..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_coordinates_utm_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_gps_info_day.png b/OsmAnd/res/drawable-xhdpi/widget_gps_info_day.png
deleted file mode 100644
index 81ab1594b0..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_gps_info_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_gps_info_night.png b/OsmAnd/res/drawable-xhdpi/widget_gps_info_night.png
deleted file mode 100644
index 74ba9bd3c0..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_gps_info_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_hidden_day.png b/OsmAnd/res/drawable-xhdpi/widget_hidden_day.png
deleted file mode 100644
index 2544472c4b..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_hidden_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_hidden_night.png b/OsmAnd/res/drawable-xhdpi/widget_hidden_night.png
deleted file mode 100644
index c6bbf2fcee..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_hidden_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_icon_av_inactive_day.png b/OsmAnd/res/drawable-xhdpi/widget_icon_av_inactive_day.png
deleted file mode 100644
index 883d9bc606..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_icon_av_inactive_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_icon_av_inactive_night.png b/OsmAnd/res/drawable-xhdpi/widget_icon_av_inactive_night.png
deleted file mode 100644
index 7f5c88317e..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_icon_av_inactive_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_intermediate_day.png b/OsmAnd/res/drawable-xhdpi/widget_intermediate_day.png
deleted file mode 100644
index e8f5f456bf..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_intermediate_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_intermediate_night.png b/OsmAnd/res/drawable-xhdpi/widget_intermediate_night.png
deleted file mode 100644
index b71f301b82..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_intermediate_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_intermediate_time_day.png b/OsmAnd/res/drawable-xhdpi/widget_intermediate_time_day.png
deleted file mode 100644
index c4d15166b5..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_intermediate_time_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_intermediate_time_night.png b/OsmAnd/res/drawable-xhdpi/widget_intermediate_time_night.png
deleted file mode 100644
index c6de96431b..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_intermediate_time_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_live_monitoring_rec_big_day.png b/OsmAnd/res/drawable-xhdpi/widget_live_monitoring_rec_big_day.png
deleted file mode 100644
index 012338139f..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_live_monitoring_rec_big_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_live_monitoring_rec_big_night.png b/OsmAnd/res/drawable-xhdpi/widget_live_monitoring_rec_big_night.png
deleted file mode 100644
index c1a5ce5880..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_live_monitoring_rec_big_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_live_monitoring_rec_small_day.png b/OsmAnd/res/drawable-xhdpi/widget_live_monitoring_rec_small_day.png
deleted file mode 100644
index f85e569009..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_live_monitoring_rec_small_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_live_monitoring_rec_small_night.png b/OsmAnd/res/drawable-xhdpi/widget_live_monitoring_rec_small_night.png
deleted file mode 100644
index 5b909d04a7..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_live_monitoring_rec_small_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_location_sharing_day.png b/OsmAnd/res/drawable-xhdpi/widget_location_sharing_day.png
deleted file mode 100644
index a7673a172a..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_location_sharing_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_location_sharing_night.png b/OsmAnd/res/drawable-xhdpi/widget_location_sharing_night.png
deleted file mode 100644
index 5e0e9b6f15..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_location_sharing_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_location_sharing_off_day.png b/OsmAnd/res/drawable-xhdpi/widget_location_sharing_off_day.png
deleted file mode 100644
index d569092886..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_location_sharing_off_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_location_sharing_off_night.png b/OsmAnd/res/drawable-xhdpi/widget_location_sharing_off_night.png
deleted file mode 100644
index 0a379c5b0b..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_location_sharing_off_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_location_sharing_on_day.png b/OsmAnd/res/drawable-xhdpi/widget_location_sharing_on_day.png
deleted file mode 100644
index 010dd37f15..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_location_sharing_on_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_location_sharing_on_night.png b/OsmAnd/res/drawable-xhdpi/widget_location_sharing_on_night.png
deleted file mode 100644
index 802dfd4c44..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_location_sharing_on_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_mapillary_day.png b/OsmAnd/res/drawable-xhdpi/widget_mapillary_day.png
deleted file mode 100644
index a251b970a6..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_mapillary_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_mapillary_night.png b/OsmAnd/res/drawable-xhdpi/widget_mapillary_night.png
deleted file mode 100644
index 2a975b9fe6..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_mapillary_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_marker_day.png b/OsmAnd/res/drawable-xhdpi/widget_marker_day.png
deleted file mode 100644
index 592950090b..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_marker_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_marker_night.png b/OsmAnd/res/drawable-xhdpi/widget_marker_night.png
deleted file mode 100644
index a44e123c1a..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_marker_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_marker_triangle.png b/OsmAnd/res/drawable-xhdpi/widget_marker_triangle.png
deleted file mode 100644
index 5b5a1149e8..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_marker_triangle.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_max_speed_day.png b/OsmAnd/res/drawable-xhdpi/widget_max_speed_day.png
deleted file mode 100644
index 346b36726e..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_max_speed_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_max_speed_night.png b/OsmAnd/res/drawable-xhdpi/widget_max_speed_night.png
deleted file mode 100644
index 08de97209f..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_max_speed_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_monitoring_rec_big_day.png b/OsmAnd/res/drawable-xhdpi/widget_monitoring_rec_big_day.png
deleted file mode 100644
index dceecad1df..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_monitoring_rec_big_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_monitoring_rec_big_night.png b/OsmAnd/res/drawable-xhdpi/widget_monitoring_rec_big_night.png
deleted file mode 100644
index 360328a20f..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_monitoring_rec_big_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_monitoring_rec_inactive_day.png b/OsmAnd/res/drawable-xhdpi/widget_monitoring_rec_inactive_day.png
deleted file mode 100644
index d1b700e940..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_monitoring_rec_inactive_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_monitoring_rec_inactive_night.png b/OsmAnd/res/drawable-xhdpi/widget_monitoring_rec_inactive_night.png
deleted file mode 100644
index 0d0c4e6873..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_monitoring_rec_inactive_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_monitoring_rec_small_day.png b/OsmAnd/res/drawable-xhdpi/widget_monitoring_rec_small_day.png
deleted file mode 100644
index 235ad81fb1..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_monitoring_rec_small_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_monitoring_rec_small_night.png b/OsmAnd/res/drawable-xhdpi/widget_monitoring_rec_small_night.png
deleted file mode 100644
index 788ff05bdb..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_monitoring_rec_small_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_relative_bearing_day.png b/OsmAnd/res/drawable-xhdpi/widget_relative_bearing_day.png
deleted file mode 100644
index f7c15f860b..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_relative_bearing_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_relative_bearing_night.png b/OsmAnd/res/drawable-xhdpi/widget_relative_bearing_night.png
deleted file mode 100644
index 975a899b62..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_relative_bearing_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_ruler_circle_day.png b/OsmAnd/res/drawable-xhdpi/widget_ruler_circle_day.png
deleted file mode 100644
index 24ef5c68e2..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_ruler_circle_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_ruler_circle_night.png b/OsmAnd/res/drawable-xhdpi/widget_ruler_circle_night.png
deleted file mode 100644
index 54daa3d858..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_ruler_circle_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_speed_day.png b/OsmAnd/res/drawable-xhdpi/widget_speed_day.png
deleted file mode 100644
index fb2d0860d3..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_speed_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_speed_night.png b/OsmAnd/res/drawable-xhdpi/widget_speed_night.png
deleted file mode 100644
index 10444ed996..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_speed_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_target_day.png b/OsmAnd/res/drawable-xhdpi/widget_target_day.png
deleted file mode 100644
index eb89ea1574..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_target_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_target_night.png b/OsmAnd/res/drawable-xhdpi/widget_target_night.png
deleted file mode 100644
index 26140686e4..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_target_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_time_day.png b/OsmAnd/res/drawable-xhdpi/widget_time_day.png
deleted file mode 100644
index f4d397a489..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_time_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_time_night.png b/OsmAnd/res/drawable-xhdpi/widget_time_night.png
deleted file mode 100644
index 155bc5049d..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_time_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_time_to_distance_day.png b/OsmAnd/res/drawable-xhdpi/widget_time_to_distance_day.png
deleted file mode 100644
index a146b1b83e..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_time_to_distance_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/widget_time_to_distance_night.png b/OsmAnd/res/drawable-xhdpi/widget_time_to_distance_night.png
deleted file mode 100644
index 20f3ea91aa..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/widget_time_to_distance_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_altitude_day.png b/OsmAnd/res/drawable-xxhdpi/widget_altitude_day.png
deleted file mode 100644
index b10fd9bf1f..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_altitude_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_altitude_night.png b/OsmAnd/res/drawable-xxhdpi/widget_altitude_night.png
deleted file mode 100644
index 4c41e6d61a..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_altitude_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_av_audio_day.png b/OsmAnd/res/drawable-xxhdpi/widget_av_audio_day.png
deleted file mode 100644
index 8fd9c308a6..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_av_audio_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_av_audio_night.png b/OsmAnd/res/drawable-xxhdpi/widget_av_audio_night.png
deleted file mode 100644
index ed045a0d11..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_av_audio_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_av_photo_day.png b/OsmAnd/res/drawable-xxhdpi/widget_av_photo_day.png
deleted file mode 100644
index 7db2ce3e5c..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_av_photo_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_av_photo_night.png b/OsmAnd/res/drawable-xxhdpi/widget_av_photo_night.png
deleted file mode 100644
index ab0bfb66fc..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_av_photo_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_av_video_day.png b/OsmAnd/res/drawable-xxhdpi/widget_av_video_day.png
deleted file mode 100644
index cf2c2777b5..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_av_video_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_av_video_night.png b/OsmAnd/res/drawable-xxhdpi/widget_av_video_night.png
deleted file mode 100644
index 030f0999ac..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_av_video_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_battery_charging_day.png b/OsmAnd/res/drawable-xxhdpi/widget_battery_charging_day.png
deleted file mode 100644
index 6b05f7f62c..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_battery_charging_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_battery_charging_night.png b/OsmAnd/res/drawable-xxhdpi/widget_battery_charging_night.png
deleted file mode 100644
index 85dd36cd64..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_battery_charging_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_battery_day.png b/OsmAnd/res/drawable-xxhdpi/widget_battery_day.png
deleted file mode 100644
index 0f2726b32e..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_battery_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_battery_night.png b/OsmAnd/res/drawable-xxhdpi/widget_battery_night.png
deleted file mode 100644
index 2bb5ee9264..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_battery_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_bearing_day.png b/OsmAnd/res/drawable-xxhdpi/widget_bearing_day.png
deleted file mode 100644
index 49acc9c374..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_bearing_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_bearing_night.png b/OsmAnd/res/drawable-xxhdpi/widget_bearing_night.png
deleted file mode 100644
index 0420bd80d5..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_bearing_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_coordinates_latitude_day.png b/OsmAnd/res/drawable-xxhdpi/widget_coordinates_latitude_day.png
deleted file mode 100644
index dee3f6d6a9..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_coordinates_latitude_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_coordinates_latitude_night.png b/OsmAnd/res/drawable-xxhdpi/widget_coordinates_latitude_night.png
deleted file mode 100644
index 85e481a7ff..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_coordinates_latitude_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_coordinates_latitude_north_day.png b/OsmAnd/res/drawable-xxhdpi/widget_coordinates_latitude_north_day.png
deleted file mode 100644
index 6ce4c6e5f2..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_coordinates_latitude_north_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_coordinates_latitude_north_night.png b/OsmAnd/res/drawable-xxhdpi/widget_coordinates_latitude_north_night.png
deleted file mode 100644
index 7d51861955..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_coordinates_latitude_north_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_coordinates_latitude_south_day.png b/OsmAnd/res/drawable-xxhdpi/widget_coordinates_latitude_south_day.png
deleted file mode 100644
index 10a698872e..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_coordinates_latitude_south_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_coordinates_latitude_south_night.png b/OsmAnd/res/drawable-xxhdpi/widget_coordinates_latitude_south_night.png
deleted file mode 100644
index 854b5bbd9e..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_coordinates_latitude_south_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_coordinates_longitude_day.png b/OsmAnd/res/drawable-xxhdpi/widget_coordinates_longitude_day.png
deleted file mode 100644
index e533b2dfd1..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_coordinates_longitude_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_coordinates_longitude_east_day.png b/OsmAnd/res/drawable-xxhdpi/widget_coordinates_longitude_east_day.png
deleted file mode 100644
index 7f361d3e06..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_coordinates_longitude_east_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_coordinates_longitude_east_night.png b/OsmAnd/res/drawable-xxhdpi/widget_coordinates_longitude_east_night.png
deleted file mode 100644
index 56ebe4e471..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_coordinates_longitude_east_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_coordinates_longitude_night.png b/OsmAnd/res/drawable-xxhdpi/widget_coordinates_longitude_night.png
deleted file mode 100644
index af70a72659..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_coordinates_longitude_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_coordinates_longitude_west_day.png b/OsmAnd/res/drawable-xxhdpi/widget_coordinates_longitude_west_day.png
deleted file mode 100644
index 54027d7678..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_coordinates_longitude_west_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_coordinates_longitude_west_night.png b/OsmAnd/res/drawable-xxhdpi/widget_coordinates_longitude_west_night.png
deleted file mode 100644
index e5a1d1aa0f..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_coordinates_longitude_west_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_coordinates_utm_day.png b/OsmAnd/res/drawable-xxhdpi/widget_coordinates_utm_day.png
deleted file mode 100644
index 1f17c3bf08..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_coordinates_utm_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_coordinates_utm_night.png b/OsmAnd/res/drawable-xxhdpi/widget_coordinates_utm_night.png
deleted file mode 100644
index e4724a0655..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_coordinates_utm_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_gps_info_day.png b/OsmAnd/res/drawable-xxhdpi/widget_gps_info_day.png
deleted file mode 100644
index dea28b37c3..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_gps_info_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_gps_info_night.png b/OsmAnd/res/drawable-xxhdpi/widget_gps_info_night.png
deleted file mode 100644
index 35003b649a..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_gps_info_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_hidden_day.png b/OsmAnd/res/drawable-xxhdpi/widget_hidden_day.png
deleted file mode 100644
index c1fbaac609..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_hidden_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_hidden_night.png b/OsmAnd/res/drawable-xxhdpi/widget_hidden_night.png
deleted file mode 100644
index 058879480b..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_hidden_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_icon_av_inactive_day.png b/OsmAnd/res/drawable-xxhdpi/widget_icon_av_inactive_day.png
deleted file mode 100644
index 1f41ab9267..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_icon_av_inactive_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_icon_av_inactive_night.png b/OsmAnd/res/drawable-xxhdpi/widget_icon_av_inactive_night.png
deleted file mode 100644
index d26b7572a3..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_icon_av_inactive_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_intermediate_day.png b/OsmAnd/res/drawable-xxhdpi/widget_intermediate_day.png
deleted file mode 100644
index a158ac3d74..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_intermediate_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_intermediate_night.png b/OsmAnd/res/drawable-xxhdpi/widget_intermediate_night.png
deleted file mode 100644
index 42674da97b..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_intermediate_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_intermediate_time_day.png b/OsmAnd/res/drawable-xxhdpi/widget_intermediate_time_day.png
deleted file mode 100644
index f1b34258e5..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_intermediate_time_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_intermediate_time_night.png b/OsmAnd/res/drawable-xxhdpi/widget_intermediate_time_night.png
deleted file mode 100644
index 5226f4bf94..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_intermediate_time_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_live_monitoring_rec_big_day.png b/OsmAnd/res/drawable-xxhdpi/widget_live_monitoring_rec_big_day.png
deleted file mode 100644
index 4669962b98..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_live_monitoring_rec_big_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_live_monitoring_rec_big_night.png b/OsmAnd/res/drawable-xxhdpi/widget_live_monitoring_rec_big_night.png
deleted file mode 100644
index bf20021550..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_live_monitoring_rec_big_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_live_monitoring_rec_small_day.png b/OsmAnd/res/drawable-xxhdpi/widget_live_monitoring_rec_small_day.png
deleted file mode 100644
index 5abf9287c4..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_live_monitoring_rec_small_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_live_monitoring_rec_small_night.png b/OsmAnd/res/drawable-xxhdpi/widget_live_monitoring_rec_small_night.png
deleted file mode 100644
index ca380dac1e..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_live_monitoring_rec_small_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_location_sharing_day.png b/OsmAnd/res/drawable-xxhdpi/widget_location_sharing_day.png
deleted file mode 100644
index e61fb7b82b..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_location_sharing_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_location_sharing_night.png b/OsmAnd/res/drawable-xxhdpi/widget_location_sharing_night.png
deleted file mode 100644
index 6f37ba384d..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_location_sharing_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_location_sharing_off_day.png b/OsmAnd/res/drawable-xxhdpi/widget_location_sharing_off_day.png
deleted file mode 100644
index 860943b7a6..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_location_sharing_off_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_location_sharing_off_night.png b/OsmAnd/res/drawable-xxhdpi/widget_location_sharing_off_night.png
deleted file mode 100644
index ca4e77402e..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_location_sharing_off_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_location_sharing_on_day.png b/OsmAnd/res/drawable-xxhdpi/widget_location_sharing_on_day.png
deleted file mode 100644
index 2150e2d21f..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_location_sharing_on_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_location_sharing_on_night.png b/OsmAnd/res/drawable-xxhdpi/widget_location_sharing_on_night.png
deleted file mode 100644
index efa4e2bdf2..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_location_sharing_on_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_mapillary_day.png b/OsmAnd/res/drawable-xxhdpi/widget_mapillary_day.png
deleted file mode 100644
index b3701cf8f0..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_mapillary_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_mapillary_night.png b/OsmAnd/res/drawable-xxhdpi/widget_mapillary_night.png
deleted file mode 100644
index ce749dfc4d..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_mapillary_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_marker_day.png b/OsmAnd/res/drawable-xxhdpi/widget_marker_day.png
deleted file mode 100644
index c559ef242a..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_marker_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_marker_night.png b/OsmAnd/res/drawable-xxhdpi/widget_marker_night.png
deleted file mode 100644
index 5eaf996a9f..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_marker_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_marker_triangle.png b/OsmAnd/res/drawable-xxhdpi/widget_marker_triangle.png
deleted file mode 100644
index c37ebe0866..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_marker_triangle.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_max_speed_day.png b/OsmAnd/res/drawable-xxhdpi/widget_max_speed_day.png
deleted file mode 100644
index dd359976f4..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_max_speed_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_max_speed_night.png b/OsmAnd/res/drawable-xxhdpi/widget_max_speed_night.png
deleted file mode 100644
index 859ad5b42b..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_max_speed_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_monitoring_rec_big_day.png b/OsmAnd/res/drawable-xxhdpi/widget_monitoring_rec_big_day.png
deleted file mode 100644
index 7e6c5df500..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_monitoring_rec_big_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_monitoring_rec_big_night.png b/OsmAnd/res/drawable-xxhdpi/widget_monitoring_rec_big_night.png
deleted file mode 100644
index 14839494ad..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_monitoring_rec_big_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_monitoring_rec_inactive_day.png b/OsmAnd/res/drawable-xxhdpi/widget_monitoring_rec_inactive_day.png
deleted file mode 100644
index 8d23795788..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_monitoring_rec_inactive_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_monitoring_rec_inactive_night.png b/OsmAnd/res/drawable-xxhdpi/widget_monitoring_rec_inactive_night.png
deleted file mode 100644
index 46b073416e..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_monitoring_rec_inactive_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_monitoring_rec_small_day.png b/OsmAnd/res/drawable-xxhdpi/widget_monitoring_rec_small_day.png
deleted file mode 100644
index 98695ff9e0..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_monitoring_rec_small_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_monitoring_rec_small_night.png b/OsmAnd/res/drawable-xxhdpi/widget_monitoring_rec_small_night.png
deleted file mode 100644
index 3ea3259148..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_monitoring_rec_small_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_relative_bearing_day.png b/OsmAnd/res/drawable-xxhdpi/widget_relative_bearing_day.png
deleted file mode 100644
index 11c99d0931..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_relative_bearing_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_relative_bearing_night.png b/OsmAnd/res/drawable-xxhdpi/widget_relative_bearing_night.png
deleted file mode 100644
index d8c834b576..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_relative_bearing_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_ruler_circle_day.png b/OsmAnd/res/drawable-xxhdpi/widget_ruler_circle_day.png
deleted file mode 100644
index ec5b244835..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_ruler_circle_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_ruler_circle_night.png b/OsmAnd/res/drawable-xxhdpi/widget_ruler_circle_night.png
deleted file mode 100644
index a8370c2210..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_ruler_circle_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_speed_day.png b/OsmAnd/res/drawable-xxhdpi/widget_speed_day.png
deleted file mode 100644
index 74692521e3..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_speed_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_speed_night.png b/OsmAnd/res/drawable-xxhdpi/widget_speed_night.png
deleted file mode 100644
index 48d9c86b31..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_speed_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_target_day.png b/OsmAnd/res/drawable-xxhdpi/widget_target_day.png
deleted file mode 100644
index 60749b7a02..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_target_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_target_night.png b/OsmAnd/res/drawable-xxhdpi/widget_target_night.png
deleted file mode 100644
index 08800c0052..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_target_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_time_day.png b/OsmAnd/res/drawable-xxhdpi/widget_time_day.png
deleted file mode 100644
index 77d7522e71..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_time_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_time_night.png b/OsmAnd/res/drawable-xxhdpi/widget_time_night.png
deleted file mode 100644
index f99a5bc6ed..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_time_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_time_to_distance_day.png b/OsmAnd/res/drawable-xxhdpi/widget_time_to_distance_day.png
deleted file mode 100644
index 1373854bd1..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_time_to_distance_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_time_to_distance_night.png b/OsmAnd/res/drawable-xxhdpi/widget_time_to_distance_night.png
deleted file mode 100644
index 2445ef4a92..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/widget_time_to_distance_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_latitude_day.png b/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_latitude_day.png
deleted file mode 100644
index f025fa2645..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_latitude_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_latitude_night.png b/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_latitude_night.png
deleted file mode 100644
index 45ba510072..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_latitude_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_latitude_north_day.png b/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_latitude_north_day.png
deleted file mode 100644
index 166bbf895c..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_latitude_north_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_latitude_north_night.png b/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_latitude_north_night.png
deleted file mode 100644
index 12d3e4001f..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_latitude_north_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_latitude_south_day.png b/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_latitude_south_day.png
deleted file mode 100644
index 41d5875091..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_latitude_south_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_latitude_south_night.png b/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_latitude_south_night.png
deleted file mode 100644
index b0427ca2c6..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_latitude_south_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_longitude_day.png b/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_longitude_day.png
deleted file mode 100644
index dac2533957..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_longitude_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_longitude_east_day.png b/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_longitude_east_day.png
deleted file mode 100644
index d4be5534bc..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_longitude_east_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_longitude_east_night.png b/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_longitude_east_night.png
deleted file mode 100644
index 8862fbceb1..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_longitude_east_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_longitude_night.png b/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_longitude_night.png
deleted file mode 100644
index 06f13e7a91..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_longitude_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_longitude_west_day.png b/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_longitude_west_day.png
deleted file mode 100644
index f408c0b6b4..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_longitude_west_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_longitude_west_night.png b/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_longitude_west_night.png
deleted file mode 100644
index 9f39415757..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_longitude_west_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_utm_day.png b/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_utm_day.png
deleted file mode 100644
index 1b4769ef3c..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_utm_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_utm_night.png b/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_utm_night.png
deleted file mode 100644
index 92f1db61dc..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/widget_coordinates_utm_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/widget_location_sharing_day.png b/OsmAnd/res/drawable-xxxhdpi/widget_location_sharing_day.png
deleted file mode 100644
index 089a3d6e1d..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/widget_location_sharing_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/widget_location_sharing_night.png b/OsmAnd/res/drawable-xxxhdpi/widget_location_sharing_night.png
deleted file mode 100644
index f0d2c8cf03..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/widget_location_sharing_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/widget_location_sharing_off_day.png b/OsmAnd/res/drawable-xxxhdpi/widget_location_sharing_off_day.png
deleted file mode 100644
index ae2293d2dc..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/widget_location_sharing_off_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/widget_location_sharing_off_night.png b/OsmAnd/res/drawable-xxxhdpi/widget_location_sharing_off_night.png
deleted file mode 100644
index 19e9e213f1..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/widget_location_sharing_off_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/widget_location_sharing_on_day.png b/OsmAnd/res/drawable-xxxhdpi/widget_location_sharing_on_day.png
deleted file mode 100644
index 8a0b1b39f4..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/widget_location_sharing_on_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/widget_location_sharing_on_night.png b/OsmAnd/res/drawable-xxxhdpi/widget_location_sharing_on_night.png
deleted file mode 100644
index 0868e1d358..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/widget_location_sharing_on_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable/widget_altitude_day.xml b/OsmAnd/res/drawable/widget_altitude_day.xml
new file mode 100644
index 0000000000..7d9115f89a
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_altitude_day.xml
@@ -0,0 +1,40 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M8.8672,12.6674L14,4.1127L23.5324,20H4.4676L0,20L7,10L8.8672,12.6674Z"
+      android:fillColor="#59361B"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M5.6676,18L7.8338,14.3897L7,13L4,18H5.6676ZM14,8L20,18H8L14,8Z"
+      android:fillColor="#FFC107"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M19.4,18H20L14,8L8,18H8.6L14,9L19.4,18ZM7.5338,14.8897L7.8338,14.3897L7,13L4,18H4.6L7,14L7.5338,14.8897Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M8.8672,12.6674L14,4.1127L23.5324,20L0,20L7,10L8.8672,12.6674Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M5.6676,18L7.8338,14.3897L7,13L4,18H5.6676Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M14,8L20,18H8L14,8Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M19.4,18H20L14,8L8,18H8.6L14,9L19.4,18Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M7.5338,14.8897L7.8338,14.3897L7,13L4,18H4.6L7,14L7.5338,14.8897Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M0,20H23.5L24,21H0V20Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_altitude_night.xml b/OsmAnd/res/drawable/widget_altitude_night.xml
new file mode 100644
index 0000000000..4335ae00ee
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_altitude_night.xml
@@ -0,0 +1,40 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M8.8672,12.6674L14,4.1127L23.5324,20H4.4676L0,20L7,10L8.8672,12.6674Z"
+      android:fillColor="#59361B"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M5.6676,18L7.8338,14.3897L7,13L4,18H5.6676ZM14,8L20,18H8L14,8Z"
+      android:fillColor="#FFC107"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M19.4,18H20L14,8L8,18H8.6L14,9L19.4,18ZM7.5338,14.8897L7.8338,14.3897L7,13L4,18H4.6L7,14L7.5338,14.8897Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M8.8672,12.6674L14,4.1127L23.5324,20L0,20L7,10L8.8672,12.6674Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M5.6676,18L7.8338,14.3897L7,13L4,18H5.6676Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M14,8L20,18H8L14,8Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M19.4,18H20L14,8L8,18H8.6L14,9L19.4,18Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M7.5338,14.8897L7.8338,14.3897L7,13L4,18H4.6L7,14L7.5338,14.8897Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M0,20H23.5L24,21H0V20Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_av_audio_day.xml b/OsmAnd/res/drawable/widget_av_audio_day.xml
new file mode 100644
index 0000000000..fbd5904c12
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_av_audio_day.xml
@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M21,10V12C21,15.9187 18.4956,19.2524 15,20.4879V24H9V20.4879C5.5044,19.2524 3,15.9187 3,12V10C9,10 15,10 21,10Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M7,5C7,2.2386 9.2386,0 12,0C14.7614,0 17,2.2386 17,5V9H20C20.5523,9 21,9.4477 21,10V11C21,14.9187 18.4956,18.2524 15,19.4879V22C15,22.5523 14.5523,23 14,23H10C9.4477,23 9,22.5523 9,22V19.4879C5.5044,18.2524 3,14.9187 3,11V10C3,9.4477 3.4477,9 4,9H7V5Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M9,5C9,3.3431 10.3431,2 12,2C13.6569,2 15,3.3431 15,5V11C15,12.6569 13.6569,14 12,14C10.3431,14 9,12.6569 9,11V5Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M13,17.9291V21H11V17.9291C7.6077,17.4439 4.9999,14.5265 4.9999,11H6.9999C6.9999,13.7614 9.2385,16 11.9999,16C14.7614,16 16.9999,13.7614 16.9999,11H18.9999C18.9999,14.5265 16.3923,17.4438 13,17.9291Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M12,2C10.3431,2 9,3.3431 9,5V6C9,4.3432 10.3431,3 12,3C13.6569,3 15,4.3432 15,6V5C15,3.3431 13.6569,2 12,2Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M18.9291,12H16.9999C16.9999,14.7614 14.7614,17 11.9999,17C9.2385,17 6.9999,14.7614 6.9999,12H5.0708C5.0241,11.6734 4.9999,11.3395 4.9999,11H6.9999C6.9999,13.7614 9.2385,16 11.9999,16C14.7614,16 16.9999,13.7614 16.9999,11H18.9999C18.9999,11.3395 18.9758,11.6734 18.9291,12Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_av_audio_night.xml b/OsmAnd/res/drawable/widget_av_audio_night.xml
new file mode 100644
index 0000000000..4565db061a
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_av_audio_night.xml
@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M21,10V12C21,15.9187 18.4956,19.2524 15,20.4879V24H9V20.4879C5.5044,19.2524 3,15.9187 3,12V10C9,10 15,10 21,10Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M7,5C7,2.2386 9.2386,0 12,0C14.7614,0 17,2.2386 17,5V9H20C20.5523,9 21,9.4477 21,10V11C21,14.9187 18.4956,18.2524 15,19.4879V22C15,22.5523 14.5523,23 14,23H10C9.4477,23 9,22.5523 9,22V19.4879C5.5044,18.2524 3,14.9187 3,11V10C3,9.4477 3.4477,9 4,9H7V5Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M9,5C9,3.3431 10.3431,2 12,2C13.6569,2 15,3.3431 15,5V11C15,12.6569 13.6569,14 12,14C10.3431,14 9,12.6569 9,11V5Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M13,17.9291V21H11V17.9291C7.6077,17.4439 4.9999,14.5265 4.9999,11H6.9999C6.9999,13.7614 9.2385,16 11.9999,16C14.7614,16 16.9999,13.7614 16.9999,11H18.9999C18.9999,14.5265 16.3923,17.4438 13,17.9291Z"
+      android:fillColor="#59361B"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_av_photo_day.xml b/OsmAnd/res/drawable/widget_av_photo_day.xml
new file mode 100644
index 0000000000..cd7cfa7b6f
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_av_photo_day.xml
@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M22,18C22,20.2091 20.2091,22 18,22H6C3.7909,22 2,20.2091 2,18C7,18 11,18 22,18Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M7.7639,3H16.2361L17.2361,5H18C20.2091,5 22,6.7909 22,9V17C22,19.2091 20.2091,21 18,21H6C3.7909,21 2,19.2091 2,17V9C2,6.7909 3.7909,5 6,5H6.7639L7.7639,3Z"
+      android:fillColor="#59361B"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M9,5H15L16,7H18C19.1046,7 20,7.8954 20,9V17C20,18.1046 19.1046,19 18,19H6C4.8954,19 4,18.1046 4,17V9C4,7.8954 4.8954,7 6,7H8L9,5ZM12,16C13.6569,16 15,14.6569 15,13C15,11.3431 13.6569,10 12,10C10.3431,10 9,11.3431 9,13C9,14.6569 10.3431,16 12,16Z"
+      android:fillColor="#FFC107"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M15,5H9L8,7H6C4.8954,7 4,7.8954 4,9V10C4,8.8954 4.8954,8 6,8H8L9,6H15L16,8H18C19.1046,8 20,8.8954 20,10V9C20,7.8954 19.1046,7 18,7H16L15,5Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M14.9585,13.5C14.7205,14.9189 13.4865,16 12,16C10.5135,16 9.2795,14.9189 9.0415,13.5C9.0142,13.6626 9,13.8296 9,14C9,15.6569 10.3431,17 12,17C13.6569,17 15,15.6569 15,14C15,13.8296 14.9858,13.6626 14.9585,13.5Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_av_photo_night.xml b/OsmAnd/res/drawable/widget_av_photo_night.xml
new file mode 100644
index 0000000000..40e93d6fa7
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_av_photo_night.xml
@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M22,18C22,20.2091 20.2091,22 18,22H6C3.7909,22 2,20.2091 2,18C7,18 11,18 22,18Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M7.7639,3H16.2361L17.2361,5H18C20.2091,5 22,6.7909 22,9V17C22,19.2091 20.2091,21 18,21H6C3.7909,21 2,19.2091 2,17V9C2,6.7909 3.7909,5 6,5H6.7639L7.7639,3Z"
+      android:fillColor="#FFC107"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M9,5H15L16,7H18C19.1046,7 20,7.8954 20,9V17C20,18.1046 19.1046,19 18,19H6C4.8954,19 4,18.1046 4,17V9C4,7.8954 4.8954,7 6,7H8L9,5ZM12,16C13.6569,16 15,14.6569 15,13C15,11.3431 13.6569,10 12,10C10.3431,10 9,11.3431 9,13C9,14.6569 10.3431,16 12,16Z"
+      android:fillColor="#59361B"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_av_video_day.xml b/OsmAnd/res/drawable/widget_av_video_day.xml
new file mode 100644
index 0000000000..eb5616269e
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_av_video_day.xml
@@ -0,0 +1,26 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M18.6161,18.7121C17.9746,20.0647 16.5965,21 15,21H5C2.7909,21 1,19.2091 1,17C1,16 1,15 1,15C1,15 19.7718,15 23,15V18C23,18.7576 22.572,19.4501 21.8944,19.7889C21.2169,20.1276 20.406,20.0545 19.8,19.6L18.6161,18.7121Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M18.6161,17.7121C17.9746,19.0647 16.5965,20 15,20H5C2.7909,20 1,18.2091 1,16V8C1,5.7909 2.7909,4 5,4H15C16.5965,4 17.9746,4.9353 18.6161,6.2879L19.8,5.4C20.406,4.9455 21.2169,4.8724 21.8944,5.2112C22.572,5.5499 23,6.2425 23,7V17C23,17.7575 22.572,18.4501 21.8944,18.7889C21.2169,19.1276 20.406,19.0545 19.8,18.6L18.6161,17.7121Z"
+      android:fillColor="#59361B"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M5,6C3.8954,6 3,6.8954 3,8V16C3,17.1046 3.8954,18 5,18H15C16.1046,18 17,17.1046 17,16V14L21,17V7L17,10V8C17,6.8954 16.1046,6 15,6H5Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M3,8C3,6.8954 3.8954,6 5,6H15C16.1046,6 17,6.8954 17,8V9C17,7.8954 16.1046,7 15,7H5C3.8954,7 3,7.8954 3,9V8Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M21,8V7L17,10V11L21,8Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_av_video_night.xml b/OsmAnd/res/drawable/widget_av_video_night.xml
new file mode 100644
index 0000000000..aee80c543f
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_av_video_night.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M18.6161,18.7121C17.9746,20.0647 16.5965,21 15,21H5C2.7909,21 1,19.2091 1,17C1,16 1,15 1,15C1,15 19.7718,15 23,15V18C23,18.7576 22.572,19.4501 21.8944,19.7889C21.2169,20.1276 20.406,20.0545 19.8,19.6L18.6161,18.7121Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M18.6161,17.7121C17.9746,19.0647 16.5965,20 15,20H5C2.7909,20 1,18.2091 1,16V8C1,5.7909 2.7909,4 5,4H15C16.5965,4 17.9746,4.9353 18.6161,6.2879L19.8,5.4C20.406,4.9455 21.2169,4.8724 21.8944,5.2112C22.572,5.5499 23,6.2425 23,7V17C23,17.7575 22.572,18.4501 21.8944,18.7889C21.2169,19.1276 20.406,19.0545 19.8,18.6L18.6161,17.7121Z"
+      android:fillColor="#FFC107"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M5,6C3.8954,6 3,6.8954 3,8V16C3,17.1046 3.8954,18 5,18H15C16.1046,18 17,17.1046 17,16V14L21,17V7L17,10V8C17,6.8954 16.1046,6 15,6H5Z"
+      android:fillColor="#59361B"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_battery_charging_day.xml b/OsmAnd/res/drawable/widget_battery_charging_day.xml
new file mode 100644
index 0000000000..aa7af9cdc1
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_battery_charging_day.xml
@@ -0,0 +1,43 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M23,12V17C23,18.6569 21.6569,20 20,20H6C4.232,20 3,18.5238 3,16.8293C1.8348,16.4175 1,15.3062 1,14V12L23,12Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M3,8C3,6.3432 4.3432,5 6,5H20C21.6569,5 23,6.3432 23,8V16C23,17.6569 21.6569,19 20,19H6C4.3432,19 3,17.6569 3,16V15.8293C1.8348,15.4175 1,14.3062 1,13V11C1,9.6938 1.8348,8.5825 3,8.1707V8Z"
+      android:fillColor="#59361B"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M5,8C5,7.4477 5.4477,7 6,7H20C20.5523,7 21,7.4477 21,8V16C21,16.5523 20.5523,17 20,17H6C5.4477,17 5,16.5523 5,16V14H4C3.4477,14 3,13.5523 3,13V11C3,10.4477 3.4477,10 4,10H5V8ZM8,9L6.5,12.5H9L8,15L11,11H8.9303L10,9H8ZM13,9.5C13,9.2239 13.2239,9 13.5,9H18.5C18.7761,9 19,9.2239 19,9.5V14.5C19,14.7761 18.7761,15 18.5,15H13.5C13.2239,15 13,14.7761 13,14.5V9.5Z"
+      android:fillColor="#FFC107"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M6,7C5.4477,7 5,7.4477 5,8V9C5,8.4477 5.4477,8 6,8H20C20.5523,8 21,8.4477 21,9V8C21,7.4477 20.5523,7 20,7H6Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M3,12C3,11.4477 3.4477,11 4,11H5V10H4C3.4477,10 3,10.4477 3,11V12Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M6.9286,12.5L6.5,13.5H8.6L9,12.5H6.9286Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M8.8571,13.8571L8,16L11,12H10.25L8.8571,13.8571Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M9.4652,11H8.9303L9.4652,10H10L9.4652,11Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M13,14.5V15.5C13,15.7761 13.2239,16 13.5,16H18.5C18.7761,16 19,15.7761 19,15.5V14.5C19,14.7761 18.7761,15 18.5,15H13.5C13.2239,15 13,14.7761 13,14.5Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_battery_charging_night.xml b/OsmAnd/res/drawable/widget_battery_charging_night.xml
new file mode 100644
index 0000000000..1411c78df4
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_battery_charging_night.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M23,12V17C23,18.6569 21.6569,20 20,20H6C4.232,20 3,18.5238 3,16.8293C1.8348,16.4175 1,15.3062 1,14V12L23,12Z"
+      android:fillColor="#59361B"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M3,8C3,6.3432 4.3432,5 6,5H20C21.6569,5 23,6.3432 23,8V16C23,17.6569 21.6569,19 20,19H6C4.3432,19 3,17.6569 3,16V15.8293C1.8348,15.4175 1,14.3062 1,13V11C1,9.6938 1.8348,8.5825 3,8.1707V8Z"
+      android:fillColor="#FFC107"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M5,8C5,7.4477 5.4477,7 6,7H20C20.5523,7 21,7.4477 21,8V16C21,16.5523 20.5523,17 20,17H6C5.4477,17 5,16.5523 5,16V14H4C3.4477,14 3,13.5523 3,13V11C3,10.4477 3.4477,10 4,10H5V8ZM8,9L6.5,12.5H9L8,15L11,11H8.9303L10,9H8ZM13,9.5C13,9.2239 13.2239,9 13.5,9H18.5C18.7761,9 19,9.2239 19,9.5V14.5C19,14.7761 18.7761,15 18.5,15H13.5C13.2239,15 13,14.7761 13,14.5V9.5Z"
+      android:fillColor="#59361B"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_battery_day.xml b/OsmAnd/res/drawable/widget_battery_day.xml
new file mode 100644
index 0000000000..2c3f0ea0e4
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_battery_day.xml
@@ -0,0 +1,31 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M23,12V17C23,18.6569 21.6569,20 20,20H6C4.232,20 3,18.5238 3,16.8293C1.8348,16.4175 1,15.3062 1,14V12L23,12Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M3,8C3,6.3432 4.3432,5 6,5H20C21.6569,5 23,6.3432 23,8V16C23,17.6569 21.6569,19 20,19H6C4.3432,19 3,17.6569 3,16V15.8293C1.8348,15.4175 1,14.3062 1,13V11C1,9.6938 1.8348,8.5825 3,8.1707V8Z"
+      android:fillColor="#59361B"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M5,8C5,7.4477 5.4477,7 6,7H20C20.5523,7 21,7.4477 21,8V16C21,16.5523 20.5523,17 20,17H6C5.4477,17 5,16.5523 5,16V14H4C3.4477,14 3,13.5523 3,13V11C3,10.4477 3.4477,10 4,10H5V8ZM13,9.5C13,9.2239 13.2239,9 13.5,9H18.5C18.7761,9 19,9.2239 19,9.5V14.5C19,14.7761 18.7761,15 18.5,15H13.5C13.2239,15 13,14.7761 13,14.5V9.5Z"
+      android:fillColor="#FFC107"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M6,7C5.4477,7 5,7.4477 5,8V9C5,8.4477 5.4477,8 6,8H20C20.5523,8 21,8.4477 21,9V8C21,7.4477 20.5523,7 20,7H6Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M3,12C3,11.4477 3.4477,11 4,11H5V10H4C3.4477,10 3,10.4477 3,11V12Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M13,14.5V15.5C13,15.7761 13.2239,16 13.5,16H18.5C18.7761,16 19,15.7761 19,15.5V14.5C19,14.7761 18.7761,15 18.5,15H13.5C13.2239,15 13,14.7761 13,14.5Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_battery_night.xml b/OsmAnd/res/drawable/widget_battery_night.xml
new file mode 100644
index 0000000000..883b3555b6
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_battery_night.xml
@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M23,12V17C23,18.6569 21.6569,20 20,20H6C4.232,20 3,18.5238 3,16.8293C1.8348,16.4175 1,15.3062 1,14V12L23,12Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M3,8C3,6.3432 4.3432,5 6,5H20C21.6569,5 23,6.3432 23,8V16C23,17.6569 21.6569,19 20,19H6C4.3432,19 3,17.6569 3,16V15.8293C1.8348,15.4175 1,14.3062 1,13V11C1,9.6938 1.8348,8.5825 3,8.1707V8Z"
+      android:fillColor="#FFC107"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M5,8C5,7.4477 5.4477,7 6,7H20C20.5523,7 21,7.4477 21,8V16C21,16.5523 20.5523,17 20,17H6C5.4477,17 5,16.5523 5,16V14H4C3.4477,14 3,13.5523 3,13V11C3,10.4477 3.4477,10 4,10H5V8ZM13,9.5C13,9.2239 13.2239,9 13.5,9H18.5C18.7761,9 19,9.2239 19,9.5V14.5C19,14.7761 18.7761,15 18.5,15H13.5C13.2239,15 13,14.7761 13,14.5V9.5Z"
+      android:fillColor="#59361B"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_bearing_day.xml b/OsmAnd/res/drawable/widget_bearing_day.xml
new file mode 100644
index 0000000000..cc5cf3975e
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_bearing_day.xml
@@ -0,0 +1,36 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M22,13C22,18.5228 17.5228,23 12,23C6.4771,23 2,18.5228 2,13C2,7.4771 6.4771,3 12,3C17.5228,3 22,7.4771 22,13Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M22,12C22,17.5228 17.5228,22 12,22C6.4771,22 2,17.5228 2,12C2,6.4771 6.4771,2 12,2C17.5228,2 22,6.4771 22,12Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M20,12C20,16.4183 16.4183,20 12,20C7.5817,20 4,16.4183 4,12C4,7.5817 7.5817,4 12,4C16.4183,4 20,7.5817 20,12Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M10.25,10L5,12H12V19L13.75,14L19,12H12V5L10.25,10Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#59361B"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M19,12L13.75,10L12,5V12H5L10.25,14L12,19V12H19Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M8,9L7,7L9,8V9H8Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M15,8V9H16L17,7L15,8Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M8,15H9V16L7,17L8,15Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M15,16V15H16L17,17L15,16Z"
+      android:fillColor="#59361B"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_bearing_night.xml b/OsmAnd/res/drawable/widget_bearing_night.xml
new file mode 100644
index 0000000000..9472ef519b
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_bearing_night.xml
@@ -0,0 +1,36 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M22,13C22,18.5228 17.5228,23 12,23C6.4771,23 2,18.5228 2,13C2,7.4771 6.4771,3 12,3C17.5228,3 22,7.4771 22,13Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M22,12C22,17.5228 17.5228,22 12,22C6.4771,22 2,17.5228 2,12C2,6.4771 6.4771,2 12,2C17.5228,2 22,6.4771 22,12Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M20,12C20,16.4183 16.4183,20 12,20C7.5817,20 4,16.4183 4,12C4,7.5817 7.5817,4 12,4C16.4183,4 20,7.5817 20,12Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M10.25,10L5,12H12V19L13.75,14L19,12H12V5L10.25,10Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#FFC107"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M19,12L13.75,10L12,5V12H5L10.25,14L12,19V12H19Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M8,9L7,7L9,8V9H8Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M15,8V9H16L17,7L15,8Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M8,15H9V16L7,17L8,15Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M15,16V15H16L17,17L15,16Z"
+      android:fillColor="#FFC107"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_coordinates_latitude_day.xml b/OsmAnd/res/drawable/widget_coordinates_latitude_day.xml
new file mode 100644
index 0000000000..62598b3dd5
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_coordinates_latitude_day.xml
@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,3C17.5228,3 22,7.4771 22,13C22,18.5228 17.5228,23 12,23C6.4771,23 2,18.5228 2,13C2,7.4771 6.4771,3 12,3Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12,2C17.5228,2 22,6.4771 22,12C22,17.5228 17.5228,22 12,22C6.4771,22 2,17.5228 2,12C2,6.4771 6.4771,2 12,2Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M12,2C17.5228,2 22,6.4771 22,12C22,17.5228 17.5228,22 12,22C6.4771,22 2,17.5228 2,12C2,6.4771 6.4771,2 12,2ZM19.2519,15.3823C17.8901,16.6703 15.6099,18 12,18C8.3901,18 6.11,16.6703 4.7481,15.3823C6.0224,18.11 8.7905,20 12,20C15.2095,20 17.9775,18.11 19.2519,15.3823ZM12,4C15.2095,4 17.9775,5.89 19.2519,8.6177C17.8901,7.3297 15.6099,6 12,6C8.3901,6 6.11,7.3297 4.7481,8.6177C6.0224,5.89 8.7905,4 12,4ZM19.3131,11C17.8401,9.6078 15.4024,8 12,8C8.5976,8 6.1599,9.6078 4.6869,11H19.3131ZM12,16C15.4024,16 17.8401,14.3922 19.3131,13H4.6869C6.1599,14.3922 8.5976,16 12,16Z"
+      android:fillColor="#59361B"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_coordinates_latitude_night.xml b/OsmAnd/res/drawable/widget_coordinates_latitude_night.xml
new file mode 100644
index 0000000000..3932f24e17
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_coordinates_latitude_night.xml
@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,3C17.5228,3 22,7.4771 22,13C22,18.5228 17.5228,23 12,23C6.4771,23 2,18.5228 2,13C2,7.4771 6.4771,3 12,3Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12,2C17.5228,2 22,6.4771 22,12C22,17.5228 17.5228,22 12,22C6.4771,22 2,17.5228 2,12C2,6.4771 6.4771,2 12,2Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M12,2C17.5228,2 22,6.4771 22,12C22,17.5228 17.5228,22 12,22C6.4771,22 2,17.5228 2,12C2,6.4771 6.4771,2 12,2ZM19.2519,15.3823C17.8901,16.6703 15.6099,18 12,18C8.3901,18 6.11,16.6703 4.7481,15.3823C6.0224,18.11 8.7905,20 12,20C15.2095,20 17.9775,18.11 19.2519,15.3823ZM12,4C15.2095,4 17.9775,5.89 19.2519,8.6177C17.8901,7.3297 15.6099,6 12,6C8.3901,6 6.11,7.3297 4.7481,8.6177C6.0224,5.89 8.7905,4 12,4ZM19.3131,11C17.8401,9.6078 15.4024,8 12,8C8.5976,8 6.1599,9.6078 4.6869,11H19.3131ZM12,16C15.4024,16 17.8401,14.3922 19.3131,13H4.6869C6.1599,14.3922 8.5976,16 12,16Z"
+      android:fillColor="#FFC107"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_coordinates_latitude_north_day.xml b/OsmAnd/res/drawable/widget_coordinates_latitude_north_day.xml
new file mode 100644
index 0000000000..cbbd167c42
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_coordinates_latitude_north_day.xml
@@ -0,0 +1,23 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,3C6.4771,3 2,7.4771 2,13C2,18.5228 6.4771,23 12,23C17.5228,23 22,18.5228 22,13C22,7.4771 17.5228,3 12,3Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12,2C6.4771,2 2,6.4771 2,12C2,17.5228 6.4771,22 12,22C17.5228,22 22,17.5228 22,12C22,6.4771 17.5228,2 12,2Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M20,12H22C22,17.5228 17.5228,22 12,22C6.4771,22 2,17.5228 2,12H4C4,13.4571 4.3896,14.8233 5.0703,16L18.9297,16C19.6104,14.8233 20,13.4571 20,12ZM12,20C14.0289,20 15.8814,19.2447 17.2916,18L6.7084,18C8.1186,19.2447 9.9711,20 12,20Z"
+      android:strokeAlpha="0.3"
+      android:fillColor="#59361B"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12,2C17.5228,2 22,6.4771 22,12C22,12.3375 21.9833,12.6711 21.9506,13H2.0494C2.0167,12.6711 2,12.3375 2,12C2,6.4771 6.4771,2 12,2ZM18.9297,8C19.4522,8.9032 19.8032,9.9181 19.9381,11L4.0619,11C4.1968,9.9181 4.5478,8.9032 5.0703,8L18.9297,8ZM6.7084,6C8.1186,4.7553 9.9711,4 12,4C14.0289,4 15.8814,4.7553 17.2916,6H6.7084Z"
+      android:fillColor="#59361B"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_coordinates_latitude_north_night.xml b/OsmAnd/res/drawable/widget_coordinates_latitude_north_night.xml
new file mode 100644
index 0000000000..7f42588c80
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_coordinates_latitude_north_night.xml
@@ -0,0 +1,23 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,3C6.4771,3 2,7.4771 2,13C2,18.5228 6.4771,23 12,23C17.5228,23 22,18.5228 22,13C22,7.4771 17.5228,3 12,3Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12,2C6.4771,2 2,6.4771 2,12C2,17.5228 6.4771,22 12,22C17.5228,22 22,17.5228 22,12C22,6.4771 17.5228,2 12,2Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M20,12H22C22,17.5228 17.5228,22 12,22C6.4771,22 2,17.5228 2,12H4C4,13.4571 4.3896,14.8233 5.0703,16L18.9297,16C19.6104,14.8233 20,13.4571 20,12ZM12,20C14.0289,20 15.8814,19.2447 17.2916,18L6.7084,18C8.1186,19.2447 9.9711,20 12,20Z"
+      android:strokeAlpha="0.3"
+      android:fillColor="#FFC107"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12,2C17.5228,2 22,6.4771 22,12C22,12.3375 21.9833,12.6711 21.9506,13H2.0494C2.0167,12.6711 2,12.3375 2,12C2,6.4771 6.4771,2 12,2ZM18.9297,8C19.4522,8.9032 19.8032,9.9181 19.9381,11L4.0619,11C4.1968,9.9181 4.5478,8.9032 5.0703,8L18.9297,8ZM6.7084,6C8.1186,4.7553 9.9711,4 12,4C14.0289,4 15.8814,4.7553 17.2916,6H6.7084Z"
+      android:fillColor="#FFC107"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_coordinates_latitude_south_day.xml b/OsmAnd/res/drawable/widget_coordinates_latitude_south_day.xml
new file mode 100644
index 0000000000..5deb0be551
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_coordinates_latitude_south_day.xml
@@ -0,0 +1,23 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,3C6.4771,3 2,7.4771 2,13C2,18.5228 6.4771,23 12,23C17.5228,23 22,18.5228 22,13C22,7.4771 17.5228,3 12,3Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12,2C6.4771,2 2,6.4771 2,12C2,17.5228 6.4771,22 12,22C17.5228,22 22,17.5228 22,12C22,6.4771 17.5228,2 12,2Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M4,12H2C2,6.4771 6.4771,2 12,2C17.5228,2 22,6.4771 22,12H20C20,10.5429 19.6104,9.1767 18.9297,8L5.0703,8C4.3896,9.1767 4,10.5429 4,12ZM12,4C9.9711,4 8.1186,4.7553 6.7084,6L17.2916,6C15.8814,4.7553 14.0289,4 12,4Z"
+      android:strokeAlpha="0.3"
+      android:fillColor="#59361B"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12,22C6.4771,22 2,17.5228 2,12C2,11.6625 2.0167,11.3289 2.0494,11H21.9506C21.9833,11.3289 22,11.6625 22,12C22,17.5228 17.5228,22 12,22ZM5.0703,16C4.5478,15.0968 4.1968,14.0819 4.0619,13L19.9381,13C19.8032,14.0819 19.4522,15.0968 18.9297,16L5.0703,16ZM17.2916,18C15.8814,19.2447 14.0289,20 12,20C9.9711,20 8.1186,19.2447 6.7084,18H17.2916Z"
+      android:fillColor="#59361B"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_coordinates_latitude_south_night.xml b/OsmAnd/res/drawable/widget_coordinates_latitude_south_night.xml
new file mode 100644
index 0000000000..07bcda77a8
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_coordinates_latitude_south_night.xml
@@ -0,0 +1,23 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,3C6.4771,3 2,7.4771 2,13C2,18.5228 6.4771,23 12,23C17.5228,23 22,18.5228 22,13C22,7.4771 17.5228,3 12,3Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12,2C6.4771,2 2,6.4771 2,12C2,17.5228 6.4771,22 12,22C17.5228,22 22,17.5228 22,12C22,6.4771 17.5228,2 12,2Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M20,12H22C22,6.4771 17.5228,2 12,2C6.4771,2 2,6.4771 2,12H4C4,10.5429 4.3896,9.1767 5.0703,8L18.9297,8C19.6104,9.1767 20,10.5429 20,12ZM12,4C14.0289,4 15.8814,4.7553 17.2916,6L6.7084,6C8.1186,4.7553 9.9711,4 12,4Z"
+      android:strokeAlpha="0.3"
+      android:fillColor="#FFC107"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12,22C17.5228,22 22,17.5228 22,12C22,11.6625 21.9833,11.3289 21.9506,11H2.0494C2.0167,11.3289 2,11.6625 2,12C2,17.5228 6.4771,22 12,22ZM18.9297,16C19.4522,15.0968 19.8032,14.0819 19.9381,13L4.0619,13C4.1968,14.0819 4.5478,15.0968 5.0703,16L18.9297,16ZM6.7084,18C8.1186,19.2447 9.9711,20 12,20C14.0289,20 15.8814,19.2447 17.2916,18H6.7084Z"
+      android:fillColor="#FFC107"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_coordinates_longitude_day.xml b/OsmAnd/res/drawable/widget_coordinates_longitude_day.xml
new file mode 100644
index 0000000000..b0c91eee99
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_coordinates_longitude_day.xml
@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,3C17.5228,3 22,7.4771 22,13C22,18.5228 17.5228,23 12,23C6.4771,23 2,18.5228 2,13C2,7.4771 6.4771,3 12,3Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12,2C17.5228,2 22,6.4771 22,12C22,17.5228 17.5228,22 12,22C6.4771,22 2,17.5228 2,12C2,6.4771 6.4771,2 12,2Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M22,12C22,17.5228 17.5228,22 12,22C6.4771,22 2,17.5228 2,12C2,6.4771 6.4771,2 12,2C17.5228,2 22,6.4771 22,12ZM8.6177,19.2519C7.3297,17.8901 6,15.6099 6,12C6,8.3901 7.3297,6.11 8.6177,4.7481C5.89,6.0224 4,8.7905 4,12C4,15.2095 5.89,17.9775 8.6177,19.2519ZM20,12C20,15.2095 18.11,17.9775 15.3823,19.2519C16.6703,17.8901 18,15.6099 18,12C18,8.3901 16.6703,6.11 15.3823,4.7481C18.11,6.0224 20,8.7905 20,12ZM13,19.3131C14.3922,17.8401 16,15.4024 16,12C16,8.5976 14.3922,6.1599 13,4.6869L13,19.3131ZM8,12C8,15.4024 9.6078,17.8401 11,19.3131L11,4.6869C9.6078,6.1599 8,8.5976 8,12Z"
+      android:fillColor="#59361B"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_coordinates_longitude_east_day.xml b/OsmAnd/res/drawable/widget_coordinates_longitude_east_day.xml
new file mode 100644
index 0000000000..b9a88b3d1e
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_coordinates_longitude_east_day.xml
@@ -0,0 +1,23 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,3C17.5228,3 22,7.4771 22,13C22,18.5228 17.5228,23 12,23C6.4771,23 2,18.5228 2,13C2,7.4771 6.4771,3 12,3Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12,2C17.5228,2 22,6.4771 22,12C22,17.5228 17.5228,22 12,22C6.4771,22 2,17.5228 2,12C2,6.4771 6.4771,2 12,2Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M11.6975,4.0056C10.216,5.3408 8,8.0056 8,12C8,15.9944 10.216,18.6592 11.6975,19.9944C12,20.5 12,21 12,21V22C6.4771,22 2,17.5228 2,12C2,6.4771 6.4771,2 12,2V3C12,3 12,3.5 11.6975,4.0056ZM8.6177,19.2519C7.3297,17.8901 6,15.6099 6,12C6,8.3901 7.3297,6.11 8.6177,4.7481C5.89,6.0224 4,8.7905 4,12C4,15.2095 5.89,17.9775 8.6177,19.2519Z"
+      android:strokeAlpha="0.3"
+      android:fillColor="#59361B"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M11,21.9506C11.3289,21.9833 11.6625,22 12,22C17.5228,22 22,17.5228 22,12C22,6.4771 17.5228,2 12,2C11.6625,2 11.3289,2.0167 11,2.0494V21.9506ZM20,12C20,15.2095 18.11,17.9775 15.3823,19.2519C16.6703,17.8901 18,15.6099 18,12C18,8.3901 16.6703,6.11 15.3823,4.7481C18.11,6.0224 20,8.7905 20,12ZM13,4.6869L13,19.3131C14.3922,17.8401 16,15.4024 16,12C16,8.5976 14.3922,6.1599 13,4.6869Z"
+      android:fillColor="#59361B"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_coordinates_longitude_east_night.xml b/OsmAnd/res/drawable/widget_coordinates_longitude_east_night.xml
new file mode 100644
index 0000000000..d7a5292557
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_coordinates_longitude_east_night.xml
@@ -0,0 +1,23 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,3C17.5228,3 22,7.4771 22,13C22,18.5228 17.5228,23 12,23C6.4771,23 2,18.5228 2,13C2,7.4771 6.4771,3 12,3Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12,2C17.5228,2 22,6.4771 22,12C22,17.5228 17.5228,22 12,22C6.4771,22 2,17.5228 2,12C2,6.4771 6.4771,2 12,2Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M11.6975,4.0056C10.216,5.3408 8,8.0056 8,12C8,15.9944 10.216,18.6592 11.6975,19.9944C12,20.5 12,21 12,21V22C6.4771,22 2,17.5228 2,12C2,6.4771 6.4771,2 12,2V3C12,3 12,3.5 11.6975,4.0056ZM8.6177,19.2519C7.3297,17.8901 6,15.6099 6,12C6,8.3901 7.3297,6.11 8.6177,4.7481C5.89,6.0224 4,8.7905 4,12C4,15.2095 5.89,17.9775 8.6177,19.2519Z"
+      android:strokeAlpha="0.3"
+      android:fillColor="#FFC107"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M11,21.9506C11.3289,21.9833 11.6625,22 12,22C17.5228,22 22,17.5228 22,12C22,6.4771 17.5228,2 12,2C11.6625,2 11.3289,2.0167 11,2.0494V21.9506ZM20,12C20,15.2095 18.11,17.9775 15.3823,19.2519C16.6703,17.8901 18,15.6099 18,12C18,8.3901 16.6703,6.11 15.3823,4.7481C18.11,6.0224 20,8.7905 20,12ZM13,4.6869L13,19.3131C14.3922,17.8401 16,15.4024 16,12C16,8.5976 14.3922,6.1599 13,4.6869Z"
+      android:fillColor="#FFC107"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_coordinates_longitude_night.xml b/OsmAnd/res/drawable/widget_coordinates_longitude_night.xml
new file mode 100644
index 0000000000..110ba4c488
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_coordinates_longitude_night.xml
@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,3C17.5228,3 22,7.4771 22,13C22,18.5228 17.5228,23 12,23C6.4771,23 2,18.5228 2,13C2,7.4771 6.4771,3 12,3Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12,2C17.5228,2 22,6.4771 22,12C22,17.5228 17.5228,22 12,22C6.4771,22 2,17.5228 2,12C2,6.4771 6.4771,2 12,2Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M22,12C22,17.5228 17.5228,22 12,22C6.4771,22 2,17.5228 2,12C2,6.4771 6.4771,2 12,2C17.5228,2 22,6.4771 22,12ZM8.6177,19.2519C7.3297,17.8901 6,15.6099 6,12C6,8.3901 7.3297,6.11 8.6177,4.7481C5.89,6.0224 4,8.7905 4,12C4,15.2095 5.89,17.9775 8.6177,19.2519ZM20,12C20,15.2095 18.11,17.9775 15.3823,19.2519C16.6703,17.8901 18,15.6099 18,12C18,8.3901 16.6703,6.11 15.3823,4.7481C18.11,6.0224 20,8.7905 20,12ZM13,19.3131C14.3922,17.8401 16,15.4024 16,12C16,8.5976 14.3922,6.1599 13,4.6869L13,19.3131ZM8,12C8,15.4024 9.6078,17.8401 11,19.3131L11,4.6869C9.6078,6.1599 8,8.5976 8,12Z"
+      android:fillColor="#FFC107"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_coordinates_longitude_west_day.xml b/OsmAnd/res/drawable/widget_coordinates_longitude_west_day.xml
new file mode 100644
index 0000000000..248806a199
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_coordinates_longitude_west_day.xml
@@ -0,0 +1,23 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,3C6.4771,3 2,7.4771 2,13C2,18.5228 6.4771,23 12,23C17.5228,23 22,18.5228 22,13C22,7.4771 17.5228,3 12,3Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12,2C6.4771,2 2,6.4771 2,12C2,17.5228 6.4771,22 12,22C17.5228,22 22,17.5228 22,12C22,6.4771 17.5228,2 12,2Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M12.3025,4.0056C13.784,5.3408 16,8.0056 16,12C16,15.9944 13.784,18.6592 12.3025,19.9944C12,20.5 12,21 12,21V22C17.5228,22 22,17.5228 22,12C22,6.4771 17.5228,2 12,2V3C12,3 12,3.5 12.3025,4.0056ZM15.3823,19.2519C16.6703,17.8901 18,15.6099 18,12C18,8.3901 16.6703,6.11 15.3823,4.7481C18.11,6.0224 20,8.7905 20,12C20,15.2095 18.11,17.9775 15.3823,19.2519Z"
+      android:strokeAlpha="0.3"
+      android:fillColor="#59361B"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M13,21.9506C12.6711,21.9833 12.3375,22 12,22C6.4771,22 2,17.5228 2,12C2,6.4771 6.4771,2 12,2C12.3375,2 12.6711,2.0167 13,2.0494V21.9506ZM4,12C4,15.2095 5.89,17.9775 8.6177,19.2519C7.3297,17.8901 6,15.6099 6,12C6,8.3901 7.3297,6.11 8.6177,4.7481C5.89,6.0224 4,8.7905 4,12ZM11,4.6869L11,19.3131C9.6078,17.8401 8,15.4024 8,12C8,8.5976 9.6078,6.1599 11,4.6869Z"
+      android:fillColor="#59361B"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_coordinates_longitude_west_night.xml b/OsmAnd/res/drawable/widget_coordinates_longitude_west_night.xml
new file mode 100644
index 0000000000..3706b921f3
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_coordinates_longitude_west_night.xml
@@ -0,0 +1,23 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,3C6.4771,3 2,7.4771 2,13C2,18.5228 6.4771,23 12,23C17.5228,23 22,18.5228 22,13C22,7.4771 17.5228,3 12,3Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12,2C6.4771,2 2,6.4771 2,12C2,17.5228 6.4771,22 12,22C17.5228,22 22,17.5228 22,12C22,6.4771 17.5228,2 12,2Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M12.3025,4.0056C13.784,5.3408 16,8.0056 16,12C16,15.9944 13.784,18.6592 12.3025,19.9944C12,20.5 12,21 12,21V22C17.5228,22 22,17.5228 22,12C22,6.4771 17.5228,2 12,2V3C12,3 12,3.5 12.3025,4.0056ZM15.3823,19.2519C16.6703,17.8901 18,15.6099 18,12C18,8.3901 16.6703,6.11 15.3823,4.7481C18.11,6.0224 20,8.7905 20,12C20,15.2095 18.11,17.9775 15.3823,19.2519Z"
+      android:strokeAlpha="0.3"
+      android:fillColor="#FFC107"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M13,21.9506C12.6711,21.9833 12.3375,22 12,22C6.4771,22 2,17.5228 2,12C2,6.4771 6.4771,2 12,2C12.3375,2 12.6711,2.0167 13,2.0494V21.9506ZM4,12C4,15.2095 5.89,17.9775 8.6177,19.2519C7.3297,17.8901 6,15.6099 6,12C6,8.3901 7.3297,6.11 8.6177,4.7481C5.89,6.0224 4,8.7905 4,12ZM11,4.6869L11,19.3131C9.6078,17.8401 8,15.4024 8,12C8,8.5976 9.6078,6.1599 11,4.6869Z"
+      android:fillColor="#FFC107"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_coordinates_utm_day.xml b/OsmAnd/res/drawable/widget_coordinates_utm_day.xml
new file mode 100644
index 0000000000..078456cae2
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_coordinates_utm_day.xml
@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M4.1285,5.1285C4.5019,3.8967 5.6462,3 7,3C8.0435,3 8.9625,3.5327 9.5,4.3411C10.0375,3.5327 10.9565,3 12,3C13.0435,3 13.9625,3.5328 14.5,4.3411C15.0375,3.5328 15.9565,3 17,3C18.3538,3 19.4981,3.8967 19.8715,5.1285C21.1033,5.5019 22,6.6462 22,8C22,9.0435 21.4672,9.9625 20.6589,10.5C21.4672,11.0375 22,11.9565 22,13C22,14.0435 21.4672,14.9625 20.6589,15.5C21.4672,16.0375 22,16.9565 22,18C22,19.3538 21.1033,20.4981 19.8715,20.8715C19.4981,22.1033 18.3538,23 17,23C15.9565,23 15.0375,22.4672 14.5,21.6589C13.9625,22.4672 13.0435,23 12,23C10.9565,23 10.0375,22.4672 9.5,21.6589C8.9625,22.4672 8.0435,23 7,23C5.6462,23 4.5019,22.1033 4.1285,20.8715C2.8967,20.4981 2,19.3538 2,18C2,16.9565 2.5328,16.0375 3.3411,15.5C2.5328,14.9625 2,14.0435 2,13C2,11.9565 2.5327,11.0375 3.3411,10.5C2.5327,9.9625 2,9.0435 2,8C2,6.6462 2.8967,5.5019 4.1285,5.1285Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M4.1285,4.1285C4.5019,2.8967 5.6462,2 7,2C8.0435,2 8.9625,2.5327 9.5,3.3411C10.0375,2.5327 10.9565,2 12,2C13.0435,2 13.9625,2.5328 14.5,3.3411C15.0375,2.5328 15.9565,2 17,2C18.3538,2 19.4981,2.8967 19.8715,4.1285C21.1033,4.5019 22,5.6462 22,7C22,8.0435 21.4672,8.9625 20.6589,9.5C21.4672,10.0375 22,10.9565 22,12C22,13.0435 21.4672,13.9625 20.6589,14.5C21.4672,15.0375 22,15.9565 22,17C22,18.3538 21.1033,19.4981 19.8715,19.8715C19.4981,21.1033 18.3538,22 17,22C15.9565,22 15.0375,21.4672 14.5,20.6589C13.9625,21.4672 13.0435,22 12,22C10.9565,22 10.0375,21.4672 9.5,20.6589C8.9625,21.4672 8.0435,22 7,22C5.6462,22 4.5019,21.1033 4.1285,19.8715C2.8967,19.4981 2,18.3538 2,17C2,15.9565 2.5328,15.0375 3.3411,14.5C2.5328,13.9625 2,13.0435 2,12C2,10.9565 2.5327,10.0375 3.3411,9.5C2.5327,8.9625 2,8.0435 2,7C2,5.6462 2.8967,4.5019 4.1285,4.1285Z"
+      android:fillColor="#59361B"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M7,4C6.4477,4 6,4.4477 6,5V6H5C4.4477,6 4,6.4477 4,7C4,7.5523 4.4477,8 5,8H6V11H5C4.4477,11 4,11.4477 4,12C4,12.5523 4.4477,13 5,13H6V16H5C4.4477,16 4,16.4477 4,17C4,17.5523 4.4477,18 5,18H6V19C6,19.5523 6.4477,20 7,20C7.5523,20 8,19.5523 8,19V18H11V19C11,19.5523 11.4477,20 12,20C12.5523,20 13,19.5523 13,19V18H16V19C16,19.5523 16.4477,20 17,20C17.5523,20 18,19.5523 18,19V18H19C19.5523,18 20,17.5523 20,17C20,16.4477 19.5523,16 19,16H18V13H19C19.5523,13 20,12.5523 20,12C20,11.4477 19.5523,11 19,11H18V8H19C19.5523,8 20,7.5523 20,7C20,6.4477 19.5523,6 19,6H18V5C18,4.4477 17.5523,4 17,4C16.4477,4 16,4.4477 16,5V6H13V5C13,4.4477 12.5523,4 12,4C11.4477,4 11,4.4477 11,5V6H8V5C8,4.4477 7.5523,4 7,4ZM8,8V11H11V8L8,8ZM13,8V11H16V8L13,8ZM16,13H13V16H16V13ZM11,16V13H8V16H11Z"
+      android:fillColor="#FFC107"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_coordinates_utm_night.xml b/OsmAnd/res/drawable/widget_coordinates_utm_night.xml
new file mode 100644
index 0000000000..5e6ce8385f
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_coordinates_utm_night.xml
@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M4.1285,5.1285C4.5019,3.8967 5.6462,3 7,3C8.0435,3 8.9625,3.5327 9.5,4.3411C10.0375,3.5327 10.9565,3 12,3C13.0435,3 13.9625,3.5328 14.5,4.3411C15.0375,3.5328 15.9565,3 17,3C18.3538,3 19.4981,3.8967 19.8715,5.1285C21.1033,5.5019 22,6.6462 22,8C22,9.0435 21.4672,9.9625 20.6589,10.5C21.4672,11.0375 22,11.9565 22,13C22,14.0435 21.4672,14.9625 20.6589,15.5C21.4672,16.0375 22,16.9565 22,18C22,19.3538 21.1033,20.4981 19.8715,20.8715C19.4981,22.1033 18.3538,23 17,23C15.9565,23 15.0375,22.4672 14.5,21.6589C13.9625,22.4672 13.0435,23 12,23C10.9565,23 10.0375,22.4672 9.5,21.6589C8.9625,22.4672 8.0435,23 7,23C5.6462,23 4.5019,22.1033 4.1285,20.8715C2.8967,20.4981 2,19.3538 2,18C2,16.9565 2.5328,16.0375 3.3411,15.5C2.5328,14.9625 2,14.0435 2,13C2,11.9565 2.5327,11.0375 3.3411,10.5C2.5327,9.9625 2,9.0435 2,8C2,6.6462 2.8967,5.5019 4.1285,5.1285Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M4.1285,4.1285C4.5019,2.8967 5.6462,2 7,2C8.0435,2 8.9625,2.5327 9.5,3.3411C10.0375,2.5327 10.9565,2 12,2C13.0435,2 13.9625,2.5328 14.5,3.3411C15.0375,2.5328 15.9565,2 17,2C18.3538,2 19.4981,2.8967 19.8715,4.1285C21.1033,4.5019 22,5.6462 22,7C22,8.0435 21.4672,8.9625 20.6589,9.5C21.4672,10.0375 22,10.9565 22,12C22,13.0435 21.4672,13.9625 20.6589,14.5C21.4672,15.0375 22,15.9565 22,17C22,18.3538 21.1033,19.4981 19.8715,19.8715C19.4981,21.1033 18.3538,22 17,22C15.9565,22 15.0375,21.4672 14.5,20.6589C13.9625,21.4672 13.0435,22 12,22C10.9565,22 10.0375,21.4672 9.5,20.6589C8.9625,21.4672 8.0435,22 7,22C5.6462,22 4.5019,21.1033 4.1285,19.8715C2.8967,19.4981 2,18.3538 2,17C2,15.9565 2.5328,15.0375 3.3411,14.5C2.5328,13.9625 2,13.0435 2,12C2,10.9565 2.5327,10.0375 3.3411,9.5C2.5327,8.9625 2,8.0435 2,7C2,5.6462 2.8967,4.5019 4.1285,4.1285Z"
+      android:fillColor="#FFC107"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M7,4C6.4477,4 6,4.4477 6,5V6H5C4.4477,6 4,6.4477 4,7C4,7.5523 4.4477,8 5,8H6V11H5C4.4477,11 4,11.4477 4,12C4,12.5523 4.4477,13 5,13H6V16H5C4.4477,16 4,16.4477 4,17C4,17.5523 4.4477,18 5,18H6V19C6,19.5523 6.4477,20 7,20C7.5523,20 8,19.5523 8,19V18H11V19C11,19.5523 11.4477,20 12,20C12.5523,20 13,19.5523 13,19V18H16V19C16,19.5523 16.4477,20 17,20C17.5523,20 18,19.5523 18,19V18H19C19.5523,18 20,17.5523 20,17C20,16.4477 19.5523,16 19,16H18V13H19C19.5523,13 20,12.5523 20,12C20,11.4477 19.5523,11 19,11H18V8H19C19.5523,8 20,7.5523 20,7C20,6.4477 19.5523,6 19,6H18V5C18,4.4477 17.5523,4 17,4C16.4477,4 16,4.4477 16,5V6H13V5C13,4.4477 12.5523,4 12,4C11.4477,4 11,4.4477 11,5V6H8V5C8,4.4477 7.5523,4 7,4ZM8,8V11H11V8L8,8ZM13,8V11H16V8L13,8ZM16,13H13V16H16V13ZM11,16V13H8V16H11Z"
+      android:fillColor="#59361B"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_distance_day.xml b/OsmAnd/res/drawable/widget_distance_day.xml
new file mode 100644
index 0000000000..58c386dc48
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_distance_day.xml
@@ -0,0 +1,33 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M1,9C1,7.8954 1.8954,7 3,7H21C22.1046,7 23,7.8954 23,9V17C23,18.1046 22.1046,19 21,19H3C1.8954,19 1,18.1046 1,17V9Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M1,8C1,6.8954 1.8954,6 3,6H21C22.1046,6 23,6.8954 23,8V16C23,17.1046 22.1046,18 21,18H3C1.8954,18 1,17.1046 1,16V8Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M19,8H21V16H3L3,8H5V12H7V8H9V12H11V8H13V12H15V8H17V12H19V8ZM1,8C1,6.8954 1.8954,6 3,6H21C22.1046,6 23,6.8954 23,8V16C23,17.1046 22.1046,18 21,18H3C1.8954,18 1,17.1046 1,16V8Z"
+      android:fillColor="#59361B"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M7,12H5V13H7V12Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M11,12H9V13H11V12Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M13,12H15V13H13V12Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M19,12H17V13H19V12Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_distance_night.xml b/OsmAnd/res/drawable/widget_distance_night.xml
new file mode 100644
index 0000000000..994d8de9d4
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_distance_night.xml
@@ -0,0 +1,33 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M1,9C1,7.8954 1.8954,7 3,7H21C22.1046,7 23,7.8954 23,9V17C23,18.1046 22.1046,19 21,19H3C1.8954,19 1,18.1046 1,17V9Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M1,8C1,6.8954 1.8954,6 3,6H21C22.1046,6 23,6.8954 23,8V16C23,17.1046 22.1046,18 21,18H3C1.8954,18 1,17.1046 1,16V8Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M19,8H21V16H3L3,8H5V12H7V8H9V12H11V8H13V12H15V8H17V12H19V8ZM1,8C1,6.8954 1.8954,6 3,6H21C22.1046,6 23,6.8954 23,8V16C23,17.1046 22.1046,18 21,18H3C1.8954,18 1,17.1046 1,16V8Z"
+      android:fillColor="#FFC107"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M7,12H5V13H7V12Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M11,12H9V13H11V12Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M13,12H15V13H13V12Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M19,12H17V13H19V12Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_gps_info_day.xml b/OsmAnd/res/drawable/widget_gps_info_day.xml
new file mode 100644
index 0000000000..d3eeafef72
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_gps_info_day.xml
@@ -0,0 +1,39 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,5V3C17.5228,3 22,7.4771 22,13H20C20,8.5817 16.4183,5 12,5Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12,7C15.3137,7 18,9.6863 18,13H16C16,10.7909 14.2091,9 12,9V7Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M15.5388,21.7876C18.3265,19 16.884,14.9411 13.4909,11.5479C10.0977,8.1548 6,7 3.2512,9.5C0.9891,11.7621 1.906,16.3466 5.2991,19.7397C8.6923,23.1328 13.2767,24.0497 15.5388,21.7876Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12,4V2C17.5228,2 22,6.4771 22,12H20C20,7.5817 16.4183,4 12,4Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M12,6C15.3137,6 18,8.6863 18,12H16C16,9.7909 14.2091,8 12,8V6Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M15.5388,20.7876C18.3265,18 16.884,13.9411 13.4909,10.5479C10.0977,7.1548 6,6 3.2512,8.5C0.9891,10.7621 1.906,15.3466 5.2991,18.7397C8.6923,22.1328 13.2767,23.0497 15.5388,20.7876Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M14.153,12.8508C15.8522,15.1128 16.4416,17.4022 15.4367,18.407C14.2023,19.6415 11.0295,18.47 8.35,15.7906C5.6706,13.1112 4.4992,9.9383 5.7336,8.7039C6.7158,7.7217 8.9249,8.2625 11.1364,9.8741C11.3736,9.3582 11.895,9 12.5,9C13.1769,9 13.7491,9.4483 13.9357,10.0643C14.5517,10.2509 15,10.8231 15,11.5C15,12.0944 14.6543,12.608 14.153,12.8508Z"
+      android:fillColor="#FFC107"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M15.8873,17.5031C16.1679,15.977 14.9873,13.4873 12.8203,11.3203C10.1409,8.6409 6.968,7.4695 5.7336,8.7039C5.3016,9.1359 5.1642,9.8053 5.2831,10.6079C5.3494,10.247 5.4975,9.94 5.7336,9.7039C6.968,8.4695 10.1409,9.6409 12.8203,12.3203C14.5621,14.0621 15.6666,16.0123 15.8873,17.5031Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12,14.5C12,14.7761 12.2239,15 12.5,15C12.7761,15 13,14.7761 13,14.5V12H13.5C13.7761,12 14,11.7761 14,11.5C14,11.2239 13.7761,11 13.5,11H13V10.5C13,10.2239 12.7761,10 12.5,10C12.2239,10 12,10.2239 12,10.5V11H9.5C9.2239,11 9,11.2239 9,11.5C9,11.7761 9.2239,12 9.5,12H12V14.5Z"
+      android:fillColor="#59361B"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_gps_info_night.xml b/OsmAnd/res/drawable/widget_gps_info_night.xml
new file mode 100644
index 0000000000..4d51f77616
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_gps_info_night.xml
@@ -0,0 +1,39 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,5V3C17.5228,3 22,7.4771 22,13H20C20,8.5817 16.4183,5 12,5Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12,7C15.3137,7 18,9.6863 18,13H16C16,10.7909 14.2091,9 12,9V7Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M15.5388,21.7876C18.3265,19 16.884,14.9411 13.4909,11.5479C10.0977,8.1548 6,7 3.2512,9.5C0.9891,11.7621 1.906,16.3466 5.2991,19.7397C8.6923,23.1328 13.2767,24.0497 15.5388,21.7876Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12,4V2C17.5228,2 22,6.4771 22,12H20C20,7.5817 16.4183,4 12,4Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M12,6C15.3137,6 18,8.6863 18,12H16C16,9.7909 14.2091,8 12,8V6Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M15.5388,20.7876C18.3265,18 16.884,13.9411 13.4909,10.5479C10.0977,7.1548 6,6 3.2512,8.5C0.9891,10.7621 1.906,15.3466 5.2991,18.7397C8.6923,22.1328 13.2767,23.0497 15.5388,20.7876Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M14.153,12.8508C15.8522,15.1128 16.4416,17.4022 15.4367,18.407C14.2023,19.6415 11.0295,18.47 8.35,15.7906C5.6706,13.1112 4.4992,9.9383 5.7336,8.7039C6.7158,7.7217 8.9249,8.2625 11.1364,9.8741C11.3736,9.3582 11.895,9 12.5,9C13.1769,9 13.7491,9.4483 13.9357,10.0643C14.5517,10.2509 15,10.8231 15,11.5C15,12.0944 14.6543,12.608 14.153,12.8508Z"
+      android:fillColor="#59361B"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M15.8873,17.5031C16.1679,15.977 14.9873,13.4873 12.8203,11.3203C10.1409,8.6409 6.968,7.4695 5.7336,8.7039C5.3016,9.1359 5.1642,9.8053 5.2831,10.6079C5.3494,10.247 5.4975,9.94 5.7336,9.7039C6.968,8.4695 10.1409,9.6409 12.8203,12.3203C14.5621,14.0621 15.6666,16.0123 15.8873,17.5031Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12,14.5C12,14.7761 12.2239,15 12.5,15C12.7761,15 13,14.7761 13,14.5V12H13.5C13.7761,12 14,11.7761 14,11.5C14,11.2239 13.7761,11 13.5,11H13V10.5C13,10.2239 12.7761,10 12.5,10C12.2239,10 12,10.2239 12,10.5V11H9.5C9.2239,11 9,11.2239 9,11.5C9,11.7761 9.2239,12 9.5,12H12V14.5Z"
+      android:fillColor="#FFC107"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_hidden_day.xml b/OsmAnd/res/drawable/widget_hidden_day.xml
new file mode 100644
index 0000000000..630b4fe8d9
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_hidden_day.xml
@@ -0,0 +1,35 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M3.7071,3.2929C3.3166,2.9024 2.6834,2.9024 2.2929,3.2929C1.9024,3.6834 1.9024,4.3166 2.2929,4.7071L4.9377,7.3519C2.4902,9.0509 0.8777,11.1967 0.2705,12.0854C0.086,12.3556 0,12.6728 0,13C0,13.3272 0.086,13.6444 0.2705,13.9146C1.3453,15.4877 5.5702,21 12,21C13.9824,21 15.7553,20.476 17.2908,19.705L20.2929,22.7071C20.6834,23.0976 21.3166,23.0976 21.7071,22.7071C22.0976,22.3166 22.0976,21.6834 21.7071,21.2929L19.0623,18.6481C21.5098,16.9491 23.1223,14.8033 23.7295,13.9146C23.914,13.6444 24,13.3272 24,13C24,12.6728 23.914,12.3556 23.7295,12.0854C22.6547,10.5123 18.4298,5 12,5C10.0176,5 8.2447,5.524 6.7092,6.295L3.7071,3.2929Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M3.7071,2.2929C3.3166,1.9024 2.6834,1.9024 2.2929,2.2929C1.9024,2.6834 1.9024,3.3166 2.2929,3.7071L4.9377,6.3519C2.4902,8.0509 0.8777,10.1967 0.2705,11.0854C0.086,11.3556 0,11.6728 0,12C0,12.3272 0.086,12.6444 0.2705,12.9146C1.3453,14.4877 5.5702,20 12,20C13.9824,20 15.7553,19.476 17.2908,18.705L20.2929,21.7071C20.6834,22.0976 21.3166,22.0976 21.7071,21.7071C22.0976,21.3166 22.0976,20.6834 21.7071,20.2929L19.0623,17.6481C21.5098,15.9491 23.1223,13.8033 23.7295,12.9146C23.914,12.6444 24,12.3272 24,12C24,11.6728 23.914,11.3556 23.7295,11.0854C22.6547,9.5123 18.4298,4 12,4C10.0176,4 8.2447,4.524 6.7092,5.295L3.7071,2.2929Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M6.3713,7.7855C3.6306,9.5541 2,12 2,12C2,12 6,18 12,18C13.3747,18 14.6445,17.685 15.7852,17.1994L13.2934,14.7076C12.9018,14.895 12.4631,15 12,15C10.3431,15 9,13.6569 9,12C9,11.5369 9.1049,11.0982 9.2924,10.7066L6.3713,7.7855Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M14.7076,13.2934C14.895,12.9018 15,12.4631 15,12C15,10.3431 13.6569,9 12,9C11.5369,9 11.0982,9.1049 10.7066,9.2924L8.2148,6.8006C9.3555,6.315 10.6253,6 12,6C18,6 22,12 22,12C22,12 20.3694,14.4459 17.6287,16.2145L14.7076,13.2934Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M2,12C2,12 3.6306,9.5541 6.3713,7.7855L9.2924,10.7066C9.1792,10.943 9.0962,11.1965 9.0481,11.4623L6.3713,8.7855C4.3925,10.0624 2.9924,11.6924 2.3669,12.5C2.126,12.189 2,12 2,12Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M15.0627,17.477C15.3089,17.3925 15.5498,17.2996 15.7852,17.1994L13.2934,14.7076C12.9018,14.895 12.4631,15 12,15C10.5135,15 9.2795,13.9189 9.0415,12.5C9.0142,12.6626 9,12.8296 9,13C9,14.6569 10.3431,16 12,16C12.4631,16 12.9018,15.895 13.2934,15.7076L15.0627,17.477Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M14.9585,12.5C14.9116,12.7795 14.8261,13.0458 14.7076,13.2934L14.9519,13.5377C14.9835,13.3633 15,13.1836 15,13C15,12.8296 14.9858,12.6626 14.9585,12.5Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M8.9373,7.523C9.884,7.1984 10.9089,7 12,7C16.935,7 20.517,11.059 21.6331,12.5C21.874,12.189 22,12 22,12C22,12 18,6 12,6C10.6253,6 9.3555,6.315 8.2148,6.8006L8.9373,7.523Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_hidden_night.xml b/OsmAnd/res/drawable/widget_hidden_night.xml
new file mode 100644
index 0000000000..5dc91cf897
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_hidden_night.xml
@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M3.7071,3.2929C3.3166,2.9024 2.6834,2.9024 2.2929,3.2929C1.9024,3.6834 1.9024,4.3166 2.2929,4.7071L4.9377,7.3519C2.4902,9.0509 0.8777,11.1967 0.2705,12.0854C0.086,12.3556 0,12.6728 0,13C0,13.3272 0.086,13.6444 0.2705,13.9146C1.3453,15.4877 5.5702,21 12,21C13.9824,21 15.7553,20.476 17.2908,19.705L20.2929,22.7071C20.6834,23.0976 21.3166,23.0976 21.7071,22.7071C22.0976,22.3166 22.0976,21.6834 21.7071,21.2929L19.0623,18.6481C21.5098,16.9491 23.1223,14.8033 23.7295,13.9146C23.914,13.6444 24,13.3272 24,13C24,12.6728 23.914,12.3556 23.7295,12.0854C22.6547,10.5123 18.4298,5 12,5C10.0176,5 8.2447,5.524 6.7092,6.295L3.7071,3.2929Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M3.7071,2.2929C3.3166,1.9024 2.6834,1.9024 2.2929,2.2929C1.9024,2.6834 1.9024,3.3166 2.2929,3.7071L4.9377,6.3519C2.4902,8.0509 0.8777,10.1967 0.2705,11.0854C0.086,11.3556 0,11.6728 0,12C0,12.3272 0.086,12.6444 0.2705,12.9146C1.3453,14.4877 5.5702,20 12,20C13.9824,20 15.7553,19.476 17.2908,18.705L20.2929,21.7071C20.6834,22.0976 21.3166,22.0976 21.7071,21.7071C22.0976,21.3166 22.0976,20.6834 21.7071,20.2929L19.0623,17.6481C21.5098,15.9491 23.1223,13.8033 23.7295,12.9146C23.914,12.6444 24,12.3272 24,12C24,11.6728 23.914,11.3556 23.7295,11.0854C22.6547,9.5123 18.4298,4 12,4C10.0176,4 8.2447,4.524 6.7092,5.295L3.7071,2.2929Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M6.3713,7.7855C3.6306,9.5541 2,12 2,12C2,12 6,18 12,18C13.3747,18 14.6445,17.685 15.7852,17.1994L13.2934,14.7076C12.9018,14.895 12.4631,15 12,15C10.3431,15 9,13.6569 9,12C9,11.5369 9.1049,11.0982 9.2924,10.7066L6.3713,7.7855Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M14.7076,13.2934C14.895,12.9018 15,12.4631 15,12C15,10.3431 13.6569,9 12,9C11.5369,9 11.0982,9.1049 10.7066,9.2924L8.2148,6.8006C9.3555,6.315 10.6253,6 12,6C18,6 22,12 22,12C22,12 20.3694,14.4459 17.6287,16.2145L14.7076,13.2934Z"
+      android:fillColor="#59361B"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_icon_av_inactive_day.xml b/OsmAnd/res/drawable/widget_icon_av_inactive_day.xml
new file mode 100644
index 0000000000..cd7cfa7b6f
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_icon_av_inactive_day.xml
@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M22,18C22,20.2091 20.2091,22 18,22H6C3.7909,22 2,20.2091 2,18C7,18 11,18 22,18Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M7.7639,3H16.2361L17.2361,5H18C20.2091,5 22,6.7909 22,9V17C22,19.2091 20.2091,21 18,21H6C3.7909,21 2,19.2091 2,17V9C2,6.7909 3.7909,5 6,5H6.7639L7.7639,3Z"
+      android:fillColor="#59361B"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M9,5H15L16,7H18C19.1046,7 20,7.8954 20,9V17C20,18.1046 19.1046,19 18,19H6C4.8954,19 4,18.1046 4,17V9C4,7.8954 4.8954,7 6,7H8L9,5ZM12,16C13.6569,16 15,14.6569 15,13C15,11.3431 13.6569,10 12,10C10.3431,10 9,11.3431 9,13C9,14.6569 10.3431,16 12,16Z"
+      android:fillColor="#FFC107"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M15,5H9L8,7H6C4.8954,7 4,7.8954 4,9V10C4,8.8954 4.8954,8 6,8H8L9,6H15L16,8H18C19.1046,8 20,8.8954 20,10V9C20,7.8954 19.1046,7 18,7H16L15,5Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M14.9585,13.5C14.7205,14.9189 13.4865,16 12,16C10.5135,16 9.2795,14.9189 9.0415,13.5C9.0142,13.6626 9,13.8296 9,14C9,15.6569 10.3431,17 12,17C13.6569,17 15,15.6569 15,14C15,13.8296 14.9858,13.6626 14.9585,13.5Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_icon_av_inactive_night.xml b/OsmAnd/res/drawable/widget_icon_av_inactive_night.xml
new file mode 100644
index 0000000000..40e93d6fa7
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_icon_av_inactive_night.xml
@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M22,18C22,20.2091 20.2091,22 18,22H6C3.7909,22 2,20.2091 2,18C7,18 11,18 22,18Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M7.7639,3H16.2361L17.2361,5H18C20.2091,5 22,6.7909 22,9V17C22,19.2091 20.2091,21 18,21H6C3.7909,21 2,19.2091 2,17V9C2,6.7909 3.7909,5 6,5H6.7639L7.7639,3Z"
+      android:fillColor="#FFC107"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M9,5H15L16,7H18C19.1046,7 20,7.8954 20,9V17C20,18.1046 19.1046,19 18,19H6C4.8954,19 4,18.1046 4,17V9C4,7.8954 4.8954,7 6,7H8L9,5ZM12,16C13.6569,16 15,14.6569 15,13C15,11.3431 13.6569,10 12,10C10.3431,10 9,11.3431 9,13C9,14.6569 10.3431,16 12,16Z"
+      android:fillColor="#59361B"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_intermediate_day.xml b/OsmAnd/res/drawable/widget_intermediate_day.xml
new file mode 100644
index 0000000000..67f7fddbef
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_intermediate_day.xml
@@ -0,0 +1,23 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M18,9L21,15H8V23H6V9H18Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M21,2L18,8L21,14H8V22H6V2H21Z"
+      android:fillColor="#59361B"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M8,12H17.7639L15.7639,8L17.7639,4H8V12Z"
+      android:fillColor="#FFC107"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M17.7639,4L16.7639,6H8V4H17.7639Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_intermediate_night.xml b/OsmAnd/res/drawable/widget_intermediate_night.xml
new file mode 100644
index 0000000000..0a0408445c
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_intermediate_night.xml
@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M18,9L21,15H8V23H6V9H18Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M21,2L18,8L21,14H8V22H6V2H21Z"
+      android:fillColor="#FFC107"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M8,12H17.7639L15.7639,8L17.7639,4H8V12Z"
+      android:fillColor="#59361B"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_intermediate_time_day.xml b/OsmAnd/res/drawable/widget_intermediate_time_day.xml
new file mode 100644
index 0000000000..37639951b8
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_intermediate_time_day.xml
@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M14,9L17,15H4V23H2V9H14Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M17,2L14,8L17,14H4V22H2V2H17Z"
+      android:fillColor="#59361B"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M4,12H13.7639L11.7639,8L13.7639,4H4V12Z"
+      android:fillColor="#FFC107"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M13.7639,4L12.7639,6H4V4H13.7639Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M16.5,16.5m-6.5,0a6.5,6.5 0,1 1,13 0a6.5,6.5 0,1 1,-13 0"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M16.5,16.5m-5.5,0a5.5,5.5 0,1 1,11 0a5.5,5.5 0,1 1,-11 0"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M16.5,20C18.433,20 20,18.433 20,16.5C20,14.567 18.433,13 16.5,13C14.567,13 13,14.567 13,16.5C13,18.433 14.567,20 16.5,20ZM17,14C17,13.7239 16.7761,13.5 16.5,13.5C16.2239,13.5 16,13.7239 16,14V16.5C16,16.7761 16.2239,17 16.5,17H19C19.2761,17 19.5,16.7761 19.5,16.5C19.5,16.2239 19.2761,16 19,16H17V14Z"
+      android:fillColor="#FFC107"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_intermediate_time_night.xml b/OsmAnd/res/drawable/widget_intermediate_time_night.xml
new file mode 100644
index 0000000000..168a4b4653
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_intermediate_time_night.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M14,9L17,15H4V23H2V9H14Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M17,2L14,8L17,14H4V22H2V2H17Z"
+      android:fillColor="#FFC107"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M4,12H13.7639L11.7639,8L13.7639,4H4V12Z"
+      android:fillColor="#59361B"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M16.5,16.5m-6.5,0a6.5,6.5 0,1 1,13 0a6.5,6.5 0,1 1,-13 0"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M16.5,16.5m-5.5,0a5.5,5.5 0,1 1,11 0a5.5,5.5 0,1 1,-11 0"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M16.5,20C18.433,20 20,18.433 20,16.5C20,14.567 18.433,13 16.5,13C14.567,13 13,14.567 13,16.5C13,18.433 14.567,20 16.5,20ZM17,14C17,13.7239 16.7761,13.5 16.5,13.5C16.2239,13.5 16,13.7239 16,14V16.5C16,16.7761 16.2239,17 16.5,17H19C19.2761,17 19.5,16.7761 19.5,16.5C19.5,16.2239 19.2761,16 19,16H17V14Z"
+      android:fillColor="#59361B"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_live_monitoring_rec_big_day.xml b/OsmAnd/res/drawable/widget_live_monitoring_rec_big_day.xml
new file mode 100644
index 0000000000..a023b6d56f
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_live_monitoring_rec_big_day.xml
@@ -0,0 +1,31 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,21C16.9706,21 21,16.9706 21,12C21,7.0294 16.9706,3 12,3C7.0294,3 3,7.0294 3,12C3,16.9706 7.0294,21 12,21ZM12,23C18.0751,23 23,18.0751 23,12C23,5.9249 18.0751,1 12,1C5.9249,1 1,5.9249 1,12C1,18.0751 5.9249,23 12,23Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M12,13m-7,0a7,7 0,1 1,14 0a7,7 0,1 1,-14 0"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12,12m-7,0a7,7 0,1 1,14 0a7,7 0,1 1,-14 0"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M17,12C17,14.7614 14.7614,17 12,17C9.2386,17 7,14.7614 7,12C7,9.2386 9.2386,7 12,7C14.7614,7 17,9.2386 17,12Z"
+      android:fillColor="#78CC5C"/>
+  <path
+      android:pathData="M12,16C14.2091,16 16,14.2091 16,12C16,9.7909 14.2091,8 12,8C9.7909,8 8,9.7909 8,12C8,14.2091 9.7909,16 12,16ZM12,17C14.7614,17 17,14.7614 17,12C17,9.2386 14.7614,7 12,7C9.2386,7 7,9.2386 7,12C7,14.7614 9.2386,17 12,17Z"
+      android:strokeAlpha="0.4"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.120000005"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M16.9753,12.5C16.9916,12.3355 17,12.1687 17,12C17,9.2386 14.7614,7 12,7C9.2386,7 7,9.2386 7,12C7,12.1687 7.0084,12.3355 7.0247,12.5C7.2755,9.9733 9.4073,8 12,8C14.5927,8 16.7245,9.9733 16.9753,12.5Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_live_monitoring_rec_big_night.xml b/OsmAnd/res/drawable/widget_live_monitoring_rec_big_night.xml
new file mode 100644
index 0000000000..5f2002e9dc
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_live_monitoring_rec_big_night.xml
@@ -0,0 +1,31 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,21C16.9706,21 21,16.9706 21,12C21,7.0294 16.9706,3 12,3C7.0294,3 3,7.0294 3,12C3,16.9706 7.0294,21 12,21ZM12,23C18.0751,23 23,18.0751 23,12C23,5.9249 18.0751,1 12,1C5.9249,1 1,5.9249 1,12C1,18.0751 5.9249,23 12,23Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M12,13m-7,0a7,7 0,1 1,14 0a7,7 0,1 1,-14 0"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12,12m-7,0a7,7 0,1 1,14 0a7,7 0,1 1,-14 0"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M17,12C17,14.7614 14.7614,17 12,17C9.2386,17 7,14.7614 7,12C7,9.2386 9.2386,7 12,7C14.7614,7 17,9.2386 17,12Z"
+      android:fillColor="#78CC5C"/>
+  <path
+      android:pathData="M12,16C14.2091,16 16,14.2091 16,12C16,9.7909 14.2091,8 12,8C9.7909,8 8,9.7909 8,12C8,14.2091 9.7909,16 12,16ZM12,17C14.7614,17 17,14.7614 17,12C17,9.2386 14.7614,7 12,7C9.2386,7 7,9.2386 7,12C7,14.7614 9.2386,17 12,17Z"
+      android:strokeAlpha="0.4"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.120000005"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M16.9753,12.5C16.9916,12.3355 17,12.1687 17,12C17,9.2386 14.7614,7 12,7C9.2386,7 7,9.2386 7,12C7,12.1687 7.0084,12.3355 7.0247,12.5C7.2755,9.9733 9.4073,8 12,8C14.5927,8 16.7245,9.9733 16.9753,12.5Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_live_monitoring_rec_small_day.xml b/OsmAnd/res/drawable/widget_live_monitoring_rec_small_day.xml
new file mode 100644
index 0000000000..035fd2d48d
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_live_monitoring_rec_small_day.xml
@@ -0,0 +1,31 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,21C16.9706,21 21,16.9706 21,12C21,7.0294 16.9706,3 12,3C7.0294,3 3,7.0294 3,12C3,16.9706 7.0294,21 12,21ZM12,23C18.0751,23 23,18.0751 23,12C23,5.9249 18.0751,1 12,1C5.9249,1 1,5.9249 1,12C1,18.0751 5.9249,23 12,23Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M12,13m-5,0a5,5 0,1 1,10 0a5,5 0,1 1,-10 0"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12,12m-5,0a5,5 0,1 1,10 0a5,5 0,1 1,-10 0"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M12,12m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
+      android:fillColor="#78CC5C"/>
+  <path
+      android:pathData="M12,14C13.1046,14 14,13.1046 14,12C14,10.8954 13.1046,10 12,10C10.8954,10 10,10.8954 10,12C10,13.1046 10.8954,14 12,14ZM12,15C13.6569,15 15,13.6569 15,12C15,10.3431 13.6569,9 12,9C10.3431,9 9,10.3431 9,12C9,13.6569 10.3431,15 12,15Z"
+      android:strokeAlpha="0.4"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.120000005"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M14.9585,12.5C14.9858,12.3374 15,12.1704 15,12C15,10.3431 13.6569,9 12,9C10.3431,9 9,10.3431 9,12C9,12.1704 9.0142,12.3374 9.0415,12.5C9.2795,11.0811 10.5135,10 12,10C13.4865,10 14.7205,11.0811 14.9585,12.5Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_live_monitoring_rec_small_night.xml b/OsmAnd/res/drawable/widget_live_monitoring_rec_small_night.xml
new file mode 100644
index 0000000000..9f72d75f47
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_live_monitoring_rec_small_night.xml
@@ -0,0 +1,31 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,21C16.9706,21 21,16.9706 21,12C21,7.0294 16.9706,3 12,3C7.0294,3 3,7.0294 3,12C3,16.9706 7.0294,21 12,21ZM12,23C18.0751,23 23,18.0751 23,12C23,5.9249 18.0751,1 12,1C5.9249,1 1,5.9249 1,12C1,18.0751 5.9249,23 12,23Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M12,13m-5,0a5,5 0,1 1,10 0a5,5 0,1 1,-10 0"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12,12m-5,0a5,5 0,1 1,10 0a5,5 0,1 1,-10 0"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M12,12m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
+      android:fillColor="#78CC5C"/>
+  <path
+      android:pathData="M12,14C13.1046,14 14,13.1046 14,12C14,10.8954 13.1046,10 12,10C10.8954,10 10,10.8954 10,12C10,13.1046 10.8954,14 12,14ZM12,15C13.6569,15 15,13.6569 15,12C15,10.3431 13.6569,9 12,9C10.3431,9 9,10.3431 9,12C9,13.6569 10.3431,15 12,15Z"
+      android:strokeAlpha="0.4"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.120000005"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M14.9585,12.5C14.9858,12.3374 15,12.1704 15,12C15,10.3431 13.6569,9 12,9C10.3431,9 9,10.3431 9,12C9,12.1704 9.0142,12.3374 9.0415,12.5C9.2795,11.0811 10.5135,10 12,10C13.4865,10 14.7205,11.0811 14.9585,12.5Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_location_sharing_day.xml b/OsmAnd/res/drawable/widget_location_sharing_day.xml
new file mode 100644
index 0000000000..5f6f50ac39
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_location_sharing_day.xml
@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M13.8091,20.8181C17.9126,19.9807 21,16.3509 21,12C21,7.0294 16.9706,3 12,3C7.0294,3 3,7.0294 3,12C3,16.3509 6.0874,19.9807 10.1909,20.8181L11.2428,22.5713C11.4023,22.8372 11.6898,23 12,23C12.3102,23 12.5977,22.8372 12.7572,22.5713L13.8091,20.8181Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M13.8091,19.8181C17.9126,18.9807 21,15.3509 21,11C21,6.0294 16.9706,2 12,2C7.0294,2 3,6.0294 3,11C3,15.3509 6.0874,18.9807 10.1908,19.8181L11.2427,21.5713C11.4023,21.8372 11.6898,22 12,22C12.3102,22 12.5976,21.8372 12.7572,21.5713L13.8091,19.8181Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M12,18C15.866,18 19,14.866 19,11C19,7.134 15.866,4 12,4C8.134,4 5,7.134 5,11C5,14.866 8.134,18 12,18ZM9.5,7C9.2238,7 9,7.2239 9,7.5V9.5C9,9.7761 9.2238,10 9.5,10C9.7761,10 10,9.7761 10,9.5V7.5C10,7.2239 9.7761,7 9.5,7ZM14.5,7C14.2238,7 14,7.2239 14,7.5V9.5C14,9.7761 14.2238,10 14.5,10C14.7761,10 15,9.7761 15,9.5V7.5C15,7.2239 14.7761,7 14.5,7ZM8.5,12C8.5,13.933 10.067,15.5 12,15.5C13.933,15.5 15.5,13.933 15.5,12H16.5C16.5,14.4853 14.4853,16.5 12,16.5C9.5147,16.5 7.5,14.4853 7.5,12H8.5Z"
+      android:fillColor="#FFC107"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_location_sharing_night.xml b/OsmAnd/res/drawable/widget_location_sharing_night.xml
new file mode 100644
index 0000000000..8a6f82c600
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_location_sharing_night.xml
@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M13.8091,20.8181C17.9126,19.9807 21,16.3509 21,12C21,7.0294 16.9706,3 12,3C7.0294,3 3,7.0294 3,12C3,16.3509 6.0874,19.9807 10.1909,20.8181L11.2428,22.5713C11.4023,22.8372 11.6898,23 12,23C12.3102,23 12.5977,22.8372 12.7572,22.5713L13.8091,20.8181Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M13.8091,19.8181C17.9126,18.9807 21,15.3509 21,11C21,6.0294 16.9706,2 12,2C7.0294,2 3,6.0294 3,11C3,15.3509 6.0874,18.9807 10.1908,19.8181L11.2427,21.5713C11.4023,21.8372 11.6898,22 12,22C12.3102,22 12.5976,21.8372 12.7572,21.5713L13.8091,19.8181Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M12,18C15.866,18 19,14.866 19,11C19,7.134 15.866,4 12,4C8.134,4 5,7.134 5,11C5,14.866 8.134,18 12,18ZM9.5,7C9.2238,7 9,7.2239 9,7.5V9.5C9,9.7761 9.2238,10 9.5,10C9.7761,10 10,9.7761 10,9.5V7.5C10,7.2239 9.7761,7 9.5,7ZM14.5,7C14.2238,7 14,7.2239 14,7.5V9.5C14,9.7761 14.2238,10 14.5,10C14.7761,10 15,9.7761 15,9.5V7.5C15,7.2239 14.7761,7 14.5,7ZM8.5,12C8.5,13.933 10.067,15.5 12,15.5C13.933,15.5 15.5,13.933 15.5,12H16.5C16.5,14.4853 14.4853,16.5 12,16.5C9.5147,16.5 7.5,14.4853 7.5,12H8.5Z"
+      android:fillColor="#59361B"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_location_sharing_off_day.xml b/OsmAnd/res/drawable/widget_location_sharing_off_day.xml
new file mode 100644
index 0000000000..973ba3e630
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_location_sharing_off_day.xml
@@ -0,0 +1,25 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M13.8091,21.8181C17.9126,20.9807 21,17.3509 21,13C21,8.0294 16.9706,4 12,4C7.0294,4 3,8.0294 3,13C3,17.3509 6.0874,20.9807 10.1909,21.8181L11.2428,23.5713C11.4023,23.8372 11.6898,24 12,24C12.3102,24 12.5977,23.8372 12.7572,23.5713L13.8091,21.8181Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M13.8091,20.8181C17.9126,19.9807 21,16.3509 21,12C21,7.0294 16.9706,3 12,3C7.0294,3 3,7.0294 3,12C3,16.3509 6.0874,19.9807 10.1908,20.8181L11.2427,22.5713C11.4023,22.8372 11.6898,23 12,23C12.3102,23 12.5976,22.8372 12.7572,22.5713L13.8091,20.8181Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M12,12m-7,0a7,7 0,1 1,14 0a7,7 0,1 1,-14 0"
+      android:fillColor="#B3B3B3"/>
+  <path
+      android:pathData="M9,8.5C9,8.2239 9.2238,8 9.5,8C9.7761,8 10,8.2239 10,8.5V10.5C10,10.7761 9.7761,11 9.5,11C9.2238,11 9,10.7761 9,10.5V8.5Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M14,8.5C14,8.2239 14.2238,8 14.5,8C14.7761,8 15,8.2239 15,8.5V10.5C15,10.7761 14.7761,11 14.5,11C14.2238,11 14,10.7761 14,10.5V8.5Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M12,16.5C10.067,16.5 8.5,14.933 8.5,13H7.5C7.5,15.4853 9.5147,17.5 12,17.5C14.4853,17.5 16.5,15.4853 16.5,13H15.5C15.5,14.933 13.933,16.5 12,16.5Z"
+      android:fillColor="#59361B"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_location_sharing_off_night.xml b/OsmAnd/res/drawable/widget_location_sharing_off_night.xml
new file mode 100644
index 0000000000..70b1ca4667
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_location_sharing_off_night.xml
@@ -0,0 +1,25 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M13.8091,21.8181C17.9126,20.9807 21,17.3509 21,13C21,8.0294 16.9706,4 12,4C7.0294,4 3,8.0294 3,13C3,17.3509 6.0874,20.9807 10.1909,21.8181L11.2428,23.5713C11.4023,23.8372 11.6898,24 12,24C12.3102,24 12.5977,23.8372 12.7572,23.5713L13.8091,21.8181Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M13.8091,20.8181C17.9126,19.9807 21,16.3509 21,12C21,7.0294 16.9706,3 12,3C7.0294,3 3,7.0294 3,12C3,16.3509 6.0874,19.9807 10.1908,20.8181L11.2427,22.5713C11.4023,22.8372 11.6898,23 12,23C12.3102,23 12.5976,22.8372 12.7572,22.5713L13.8091,20.8181Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M12,12m-7,0a7,7 0,1 1,14 0a7,7 0,1 1,-14 0"
+      android:fillColor="#4D4D4D"/>
+  <path
+      android:pathData="M9,8.5C9,8.2239 9.2238,8 9.5,8C9.7761,8 10,8.2239 10,8.5V10.5C10,10.7761 9.7761,11 9.5,11C9.2238,11 9,10.7761 9,10.5V8.5Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M14,8.5C14,8.2239 14.2238,8 14.5,8C14.7761,8 15,8.2239 15,8.5V10.5C15,10.7761 14.7761,11 14.5,11C14.2238,11 14,10.7761 14,10.5V8.5Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M12,16.5C10.067,16.5 8.5,14.933 8.5,13H7.5C7.5,15.4853 9.5147,17.5 12,17.5C14.4853,17.5 16.5,15.4853 16.5,13H15.5C15.5,14.933 13.933,16.5 12,16.5Z"
+      android:fillColor="#FFC107"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_location_sharing_on_day.xml b/OsmAnd/res/drawable/widget_location_sharing_on_day.xml
new file mode 100644
index 0000000000..c41ab305e9
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_location_sharing_on_day.xml
@@ -0,0 +1,25 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M13.8091,21.8181C17.9126,20.9807 21,17.3509 21,13C21,8.0294 16.9706,4 12,4C7.0294,4 3,8.0294 3,13C3,17.3509 6.0874,20.9807 10.1909,21.8181L11.2428,23.5713C11.4023,23.8372 11.6898,24 12,24C12.3102,24 12.5977,23.8372 12.7572,23.5713L13.8091,21.8181Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M13.8091,20.8181C17.9126,19.9807 21,16.3509 21,12C21,7.0294 16.9706,3 12,3C7.0294,3 3,7.0294 3,12C3,16.3509 6.0874,19.9807 10.1908,20.8181L11.2427,22.5713C11.4023,22.8372 11.6898,23 12,23C12.3102,23 12.5976,22.8372 12.7572,22.5713L13.8091,20.8181Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M12,12m-7,0a7,7 0,1 1,14 0a7,7 0,1 1,-14 0"
+      android:fillColor="#78CC5C"/>
+  <path
+      android:pathData="M9,8.5C9,8.2239 9.2238,8 9.5,8C9.7761,8 10,8.2239 10,8.5V10.5C10,10.7761 9.7761,11 9.5,11C9.2238,11 9,10.7761 9,10.5V8.5Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M14,8.5C14,8.2239 14.2238,8 14.5,8C14.7761,8 15,8.2239 15,8.5V10.5C15,10.7761 14.7761,11 14.5,11C14.2238,11 14,10.7761 14,10.5V8.5Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M12,16.5C10.067,16.5 8.5,14.933 8.5,13H7.5C7.5,15.4853 9.5147,17.5 12,17.5C14.4853,17.5 16.5,15.4853 16.5,13H15.5C15.5,14.933 13.933,16.5 12,16.5Z"
+      android:fillColor="#59361B"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_location_sharing_on_night.xml b/OsmAnd/res/drawable/widget_location_sharing_on_night.xml
new file mode 100644
index 0000000000..3b921d6233
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_location_sharing_on_night.xml
@@ -0,0 +1,25 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M13.8091,21.8181C17.9126,20.9807 21,17.3509 21,13C21,8.0294 16.9706,4 12,4C7.0294,4 3,8.0294 3,13C3,17.3509 6.0874,20.9807 10.1909,21.8181L11.2428,23.5713C11.4023,23.8372 11.6898,24 12,24C12.3102,24 12.5977,23.8372 12.7572,23.5713L13.8091,21.8181Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M13.8091,20.8181C17.9126,19.9807 21,16.3509 21,12C21,7.0294 16.9706,3 12,3C7.0294,3 3,7.0294 3,12C3,16.3509 6.0874,19.9807 10.1908,20.8181L11.2427,22.5713C11.4023,22.8372 11.6898,23 12,23C12.3102,23 12.5976,22.8372 12.7572,22.5713L13.8091,20.8181Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M12,12m-7,0a7,7 0,1 1,14 0a7,7 0,1 1,-14 0"
+      android:fillColor="#78CC5C"/>
+  <path
+      android:pathData="M9,8.5C9,8.2239 9.2238,8 9.5,8C9.7761,8 10,8.2239 10,8.5V10.5C10,10.7761 9.7761,11 9.5,11C9.2238,11 9,10.7761 9,10.5V8.5Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M14,8.5C14,8.2239 14.2238,8 14.5,8C14.7761,8 15,8.2239 15,8.5V10.5C15,10.7761 14.7761,11 14.5,11C14.2238,11 14,10.7761 14,10.5V8.5Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M12,16.5C10.067,16.5 8.5,14.933 8.5,13H7.5C7.5,15.4853 9.5147,17.5 12,17.5C14.4853,17.5 16.5,15.4853 16.5,13H15.5C15.5,14.933 13.933,16.5 12,16.5Z"
+      android:fillColor="#59361B"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_mapillary_dat.xml b/OsmAnd/res/drawable/widget_mapillary_dat.xml
new file mode 100644
index 0000000000..2e5c466792
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_mapillary_dat.xml
@@ -0,0 +1,20 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M8.2633,11.1091L8.5914,12.0538L8.2633,11.1091C7.6736,11.3139 7.299,11.8456 7.2192,12.389C7.1267,13.0184 7.4205,13.6735 8.0882,14.0082C8.0843,14.0062 8.0886,14.0086 8.1043,14.0172C8.1208,14.0262 8.15,14.0423 8.1956,14.0675C8.2726,14.1102 8.3776,14.1686 8.5024,14.2381C8.649,14.3199 8.8212,14.4161 9.0052,14.5189C9.1346,14.5911 9.2699,14.6667 9.4062,14.7428C9.7873,14.9555 10.1932,15.1818 10.4915,15.3462C10.4651,15.3917 10.4394,15.4359 10.4148,15.4779C9.8002,15.1366 8.515,14.4225 7.236,13.7117C6.3866,13.2397 5.5407,12.7695 4.8972,12.4116L4.6154,12.2549C5.9678,11.7914 8.461,10.9148 9.3391,10.6058C9.8526,10.425 10.2409,10.0139 10.4054,9.5079L11.9674,4.703C12.1054,4.9662 12.2678,5.276 12.4451,5.614C12.7297,6.1567 13.0525,6.7722 13.3734,7.3847C13.8251,8.247 14.2773,9.1113 14.624,9.7775C14.7975,10.1108 14.9439,10.3933 15.0505,10.6006C15.0602,10.6196 15.0695,10.6377 15.0783,10.6548C15.0479,10.6768 15.0185,10.6979 14.9885,10.7191C14.8045,10.3667 14.5495,9.8871 14.3045,9.4263C14.0564,8.9597 13.8186,8.5124 13.6755,8.2367C13.4238,7.7515 12.9116,7.3797 12.3128,7.358C11.9938,7.3465 11.6592,7.4377 11.3723,7.6583C11.0901,7.8752 10.9123,8.1714 10.8122,8.4795L11.7632,8.7886L10.8122,8.4795L10.1729,10.446L8.2633,11.1091ZM14.6371,10.9289C14.6372,10.9287 14.6407,10.9274 14.6474,10.9257C14.6404,10.9283 14.6371,10.9291 14.6371,10.9289ZM19.686,19.5894C19.9617,20.1212 20.2146,20.609 20.4254,21.0155C18.3509,19.8636 14.1851,17.5531 12.9467,16.8698C12.971,16.8277 12.9964,16.7838 13.0224,16.7391C13.3252,16.9083 13.737,17.1367 14.1314,17.3553L15.1174,17.9016C15.2556,17.9782 15.3738,18.0438 15.4626,18.0933L15.5715,18.154L15.6055,18.1731L15.616,18.1791L15.6191,18.1808L15.62,18.1813L15.6203,18.1815C16.3435,18.5991 17.0774,18.265 17.442,17.9073C17.8356,17.5213 18.1465,16.784 17.7253,16.0465C17.6259,15.8724 16.7655,14.2295 16.3118,13.3453C16.3449,13.3253 16.3784,13.3048 16.4121,13.2841C16.4225,13.3039 16.4332,13.3244 16.4443,13.3455C16.5828,13.6106 16.7729,13.9755 16.9975,14.4074C17.4465,15.2711 18.0326,16.4005 18.6186,17.5305C18.9851,18.2372 19.3523,18.9456 19.686,19.5894ZM16.1412,13.01C16.1413,13.01 16.1416,13.0106 16.1421,13.012C16.1415,13.0106 16.1412,13.01 16.1412,13.01Z"
+      android:strokeAlpha="0.3"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#ffffff"/>
+  <path
+      android:pathData="M8.2633,10.1091L8.5914,11.0538L8.2633,10.1091C7.6736,10.3139 7.299,10.8456 7.2192,11.389C7.1267,12.0184 7.4205,12.6735 8.0882,13.0082C8.0843,13.0062 8.0886,13.0086 8.1043,13.0172C8.1208,13.0262 8.15,13.0423 8.1956,13.0675C8.2726,13.1102 8.3776,13.1686 8.5024,13.2381C8.649,13.3199 8.8212,13.4161 9.0052,13.5189C9.1346,13.5911 9.2699,13.6667 9.4062,13.7428C9.7873,13.9555 10.1932,14.1818 10.4915,14.3462C10.4651,14.3917 10.4394,14.4359 10.4148,14.4779C9.8002,14.1366 8.515,13.4225 7.236,12.7117C6.3866,12.2397 5.5407,11.7695 4.8972,11.4116L4.6154,11.2549C5.9678,10.7914 8.461,9.9148 9.3391,9.6058C9.8526,9.425 10.2409,9.0139 10.4054,8.5079L11.9674,3.703C12.0775,3.913 12.2028,4.152 12.338,4.4097L12.4008,4.5295L12.4012,4.5302C12.9382,5.5542 13.6278,6.8691 14.1937,7.9523C14.4767,8.4942 14.7282,8.977 14.914,9.3361C14.9765,9.457 15.0313,9.5631 15.077,9.6524C15.0465,9.6737 15.0166,9.6945 14.9864,9.7151C14.8026,9.3631 14.5486,8.8853 14.3045,8.4263C14.0564,7.9597 13.8186,7.5124 13.6755,7.2367C13.4238,6.7515 12.9116,6.3797 12.3128,6.358C11.9938,6.3465 11.6592,6.4377 11.3723,6.6583C11.0901,6.8752 10.9123,7.1714 10.8122,7.4795L11.7632,7.7886L10.8122,7.4795L10.1729,9.4459L8.2633,10.1091ZM14.6383,9.9137C14.6384,9.9135 14.6417,9.9123 14.6479,9.9108C14.6413,9.9131 14.6382,9.9139 14.6383,9.9137ZM19.686,18.5894C19.9617,19.1212 20.2146,19.609 20.4254,20.0155C18.3509,18.8636 14.1851,16.5531 12.9467,15.8698C12.971,15.8277 12.9964,15.7838 13.0224,15.7391C13.3252,15.9083 13.737,16.1367 14.1314,16.3553L15.1174,16.9016C15.2556,16.9782 15.3738,17.0438 15.4626,17.0933L15.5715,17.154L15.6055,17.1731L15.616,17.1791L15.6191,17.1808L15.62,17.1813L15.6203,17.1815C16.3435,17.5991 17.0774,17.265 17.442,16.9073C17.8356,16.5213 18.1465,15.784 17.7253,15.0465C17.6259,14.8724 16.7655,13.2295 16.3118,12.3453C16.3449,12.3253 16.3784,12.3048 16.4121,12.2841C16.4225,12.3039 16.4332,12.3244 16.4443,12.3455C16.5828,12.6106 16.7729,12.9755 16.9975,13.4074C17.4465,14.2711 18.0326,15.4005 18.6186,16.5305C18.9851,17.2372 19.3523,17.9456 19.686,18.5894ZM16.1412,12.01C16.1413,12.01 16.1416,12.0106 16.1421,12.012C16.1415,12.0106 16.1412,12.01 16.1412,12.01Z"
+      android:strokeWidth="2"
+      android:fillColor="#FF8800"
+      android:strokeColor="#59361B"/>
+  <path
+      android:pathData="M17,15.5C15.4826,12.9845 14.1158,9.9058 12.7065,7.3347C12.4946,6.9481 11.8561,6.7997 11.6415,7.4246L10.9361,9.4786C10.8641,9.6884 10.6814,9.869 10.4681,9.9392L8.3451,10.6372C7.9259,10.775 7.7792,11.7316 8.3451,12C9.3575,12.6414 10.2308,13.0667 10.9361,13.5C11.6415,13.9333 14.2206,15.5025 15.7099,16.3166C16.6163,16.7601 17.2793,15.963 17,15.5Z"
+      android:fillColor="#FFC107"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_mapillary_night.xml b/OsmAnd/res/drawable/widget_mapillary_night.xml
new file mode 100644
index 0000000000..e89d51fa3f
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_mapillary_night.xml
@@ -0,0 +1,20 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M8.2633,11.1091L8.5914,12.0538L8.2633,11.1091C7.6736,11.3139 7.299,11.8456 7.2192,12.389C7.1267,13.0184 7.4205,13.6735 8.0882,14.0082C8.0843,14.0062 8.0886,14.0086 8.1043,14.0172C8.1208,14.0262 8.15,14.0423 8.1956,14.0675C8.2726,14.1102 8.3776,14.1686 8.5024,14.2381C8.649,14.3199 8.8212,14.4161 9.0052,14.5189C9.1346,14.5911 9.2699,14.6667 9.4062,14.7428C9.7873,14.9555 10.1932,15.1818 10.4915,15.3462C10.4651,15.3917 10.4394,15.4359 10.4148,15.4779C9.8002,15.1366 8.515,14.4225 7.236,13.7117C6.3866,13.2397 5.5407,12.7695 4.8972,12.4116L4.6154,12.2549C5.9678,11.7914 8.461,10.9148 9.3391,10.6058C9.8526,10.425 10.2409,10.0139 10.4054,9.5079L11.9674,4.703C12.1054,4.9662 12.2678,5.276 12.4451,5.614C12.7297,6.1567 13.0525,6.7722 13.3734,7.3847C13.8251,8.247 14.2773,9.1113 14.624,9.7775C14.7975,10.1108 14.9439,10.3933 15.0505,10.6006C15.0602,10.6196 15.0695,10.6377 15.0783,10.6548C15.0479,10.6768 15.0185,10.6979 14.9885,10.7191C14.8045,10.3667 14.5495,9.8871 14.3045,9.4263C14.0564,8.9597 13.8186,8.5124 13.6755,8.2367C13.4238,7.7515 12.9116,7.3797 12.3128,7.358C11.9938,7.3465 11.6592,7.4377 11.3723,7.6583C11.0901,7.8752 10.9123,8.1714 10.8122,8.4795L11.7632,8.7886L10.8122,8.4795L10.1729,10.446L8.2633,11.1091ZM14.6371,10.9289C14.6372,10.9287 14.6407,10.9274 14.6474,10.9257C14.6404,10.9283 14.6371,10.9291 14.6371,10.9289ZM19.686,19.5894C19.9617,20.1212 20.2146,20.609 20.4254,21.0155C18.3509,19.8636 14.1851,17.5531 12.9467,16.8698C12.971,16.8277 12.9964,16.7838 13.0224,16.7391C13.3252,16.9083 13.737,17.1367 14.1314,17.3553L15.1174,17.9016C15.2556,17.9782 15.3738,18.0438 15.4626,18.0933L15.5715,18.154L15.6055,18.1731L15.616,18.1791L15.6191,18.1808L15.62,18.1813L15.6203,18.1815C16.3435,18.5991 17.0774,18.265 17.442,17.9073C17.8356,17.5213 18.1465,16.784 17.7253,16.0465C17.6259,15.8724 16.7655,14.2295 16.3118,13.3453C16.3449,13.3253 16.3784,13.3048 16.4121,13.2841C16.4225,13.3039 16.4332,13.3244 16.4443,13.3455C16.5828,13.6106 16.7729,13.9755 16.9975,14.4074C17.4465,15.2711 18.0326,16.4005 18.6186,17.5305C18.9851,18.2372 19.3523,18.9456 19.686,19.5894ZM16.1412,13.01C16.1413,13.01 16.1416,13.0106 16.1421,13.012C16.1415,13.0106 16.1412,13.01 16.1412,13.01Z"
+      android:strokeAlpha="0.3"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"/>
+  <path
+      android:pathData="M8.2633,10.1091L8.5914,11.0538L8.2633,10.1091C7.6736,10.3139 7.299,10.8456 7.2192,11.389C7.1267,12.0184 7.4205,12.6735 8.0882,13.0082C8.0843,13.0062 8.0886,13.0086 8.1043,13.0172C8.1208,13.0262 8.15,13.0423 8.1956,13.0675C8.2726,13.1102 8.3776,13.1686 8.5024,13.2381C8.649,13.3199 8.8212,13.4161 9.0052,13.5189C9.1346,13.5911 9.2699,13.6667 9.4062,13.7428C9.7873,13.9555 10.1932,14.1818 10.4915,14.3462C10.4651,14.3917 10.4394,14.4359 10.4148,14.4779C9.8002,14.1366 8.515,13.4225 7.236,12.7117C6.3866,12.2397 5.5407,11.7695 4.8972,11.4116L4.6154,11.2549C5.9678,10.7914 8.461,9.9148 9.3391,9.6058C9.8526,9.425 10.2409,9.0139 10.4054,8.5079L11.9674,3.703C12.0775,3.913 12.2028,4.152 12.338,4.4097L12.4008,4.5295L12.4012,4.5302C12.9382,5.5542 13.6278,6.8691 14.1937,7.9523C14.4767,8.4942 14.7282,8.977 14.914,9.3361C14.9765,9.457 15.0313,9.5631 15.077,9.6524C15.0465,9.6737 15.0166,9.6945 14.9864,9.7151C14.8026,9.3631 14.5486,8.8853 14.3045,8.4263C14.0564,7.9597 13.8186,7.5124 13.6755,7.2367C13.4238,6.7515 12.9116,6.3797 12.3128,6.358C11.9938,6.3465 11.6592,6.4377 11.3723,6.6583C11.0901,6.8752 10.9123,7.1714 10.8122,7.4795L11.7632,7.7886L10.8122,7.4795L10.1729,9.4459L8.2633,10.1091ZM14.6383,9.9137C14.6384,9.9135 14.6417,9.9123 14.6479,9.9108C14.6413,9.9131 14.6382,9.9139 14.6383,9.9137ZM19.686,18.5894C19.9617,19.1212 20.2146,19.609 20.4254,20.0155C18.3509,18.8636 14.1851,16.5531 12.9467,15.8698C12.971,15.8277 12.9964,15.7838 13.0224,15.7391C13.3252,15.9083 13.737,16.1367 14.1314,16.3553L15.1174,16.9016C15.2556,16.9782 15.3738,17.0438 15.4626,17.0933L15.5715,17.154L15.6055,17.1731L15.616,17.1791L15.6191,17.1808L15.62,17.1813L15.6203,17.1815C16.3435,17.5991 17.0774,17.265 17.442,16.9073C17.8356,16.5213 18.1465,15.784 17.7253,15.0465C17.6259,14.8724 16.7655,13.2295 16.3118,12.3453C16.3449,12.3253 16.3784,12.3048 16.4121,12.2841C16.4225,12.3039 16.4332,12.3244 16.4443,12.3455C16.5828,12.6106 16.7729,12.9755 16.9975,13.4074C17.4465,14.2711 18.0326,15.4005 18.6186,16.5305C18.9851,17.2372 19.3523,17.9456 19.686,18.5894ZM16.1412,12.01C16.1413,12.01 16.1416,12.0106 16.1421,12.012C16.1415,12.0106 16.1412,12.01 16.1412,12.01Z"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#FFC107"/>
+  <path
+      android:pathData="M17,15.5C15.4826,12.9845 14.1158,9.9058 12.7065,7.3347C12.4946,6.9481 11.8561,6.7997 11.6415,7.4246L10.9361,9.4786C10.8641,9.6884 10.6814,9.869 10.4681,9.9392L8.3451,10.6372C7.9259,10.775 7.7792,11.7316 8.3451,12C9.3575,12.6414 10.2308,13.0667 10.9361,13.5C11.6415,13.9333 14.2206,15.5025 15.7099,16.3166C16.6163,16.7601 17.2793,15.963 17,15.5Z"
+      android:fillColor="#59361B"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_marker_day.xml b/OsmAnd/res/drawable/widget_marker_day.xml
new file mode 100644
index 0000000000..b02c42e183
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_marker_day.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M8,22V16L19,10.5L6,4V22H8Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M8,21V15L19,9.5L6,3V21H8Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M14.5279,9.5L8,12.7639V6.2361L14.5279,9.5Z"
+      android:fillColor="#FFC107"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M13.5279,10L14.5279,9.5L8,6.2361V7.2361L13.5279,10Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_marker_night.xml b/OsmAnd/res/drawable/widget_marker_night.xml
new file mode 100644
index 0000000000..48119cd88b
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_marker_night.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M8,22V16L19,10.5L6,4V22H8Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M8,21V15L19,9.5L6,3V21H8Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M14.5279,9.5L8,12.7639V6.2361L14.5279,9.5Z"
+      android:fillColor="#59361B"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M13.5279,10L14.5279,9.5L8,6.2361V7.2361L13.5279,10Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_marker_triangle.xml b/OsmAnd/res/drawable/widget_marker_triangle.xml
new file mode 100644
index 0000000000..5b396191a3
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_marker_triangle.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M14.5279,9.5L8,12.7639V6.2361L14.5279,9.5Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_max_speed_day.xml b/OsmAnd/res/drawable/widget_max_speed_day.xml
new file mode 100644
index 0000000000..c560eee924
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_max_speed_day.xml
@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,13m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12,12m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M12,12m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"
+      android:fillColor="#EE5622"/>
+  <path
+      android:pathData="M19.9846,12.5C19.9948,12.3346 20,12.1679 20,12C20,7.5817 16.4183,4 12,4C7.5817,4 4,7.5817 4,12C4,12.1679 4.0052,12.3346 4.0154,12.5C4.2735,8.3146 7.7497,5 12,5C16.2504,5 19.7265,8.3146 19.9846,12.5Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M15.7071,10.7071C16.0976,10.3166 16.0976,9.6834 15.7071,9.2929C15.3166,8.9024 14.6834,8.9024 14.2929,9.2929L12.518,11.0677C12.3528,11.0236 12.1792,11 12,11C10.8954,11 10,11.8954 10,13C10,14.1046 10.8954,15 12,15C13.1046,15 14,14.1046 14,13C14,12.8208 13.9764,12.6472 13.9323,12.482L15.7071,10.7071Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M15.7071,9.7071C16.0976,9.3166 16.0976,8.6834 15.7071,8.2929C15.3166,7.9024 14.6834,7.9024 14.2929,8.2929L12.518,10.0677C12.3528,10.0236 12.1792,10 12,10C10.8954,10 10,10.8954 10,12C10,13.1046 10.8954,14 12,14C13.1046,14 14,13.1046 14,12C14,11.8208 13.9764,11.6472 13.9323,11.482L15.7071,9.7071Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_max_speed_night.xml b/OsmAnd/res/drawable/widget_max_speed_night.xml
new file mode 100644
index 0000000000..49613643f0
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_max_speed_night.xml
@@ -0,0 +1,23 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,13m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12,12m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M12,12m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"
+      android:fillColor="#EE5622"/>
+  <path
+      android:pathData="M15.7071,10.7071C16.0976,10.3166 16.0976,9.6834 15.7071,9.2929C15.3166,8.9024 14.6834,8.9024 14.2929,9.2929L12.518,11.0677C12.3528,11.0236 12.1792,11 12,11C10.8954,11 10,11.8954 10,13C10,14.1046 10.8954,15 12,15C13.1046,15 14,14.1046 14,13C14,12.8208 13.9764,12.6472 13.9323,12.482L15.7071,10.7071Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M15.7071,9.7071C16.0976,9.3166 16.0976,8.6834 15.7071,8.2929C15.3166,7.9024 14.6834,7.9024 14.2929,8.2929L12.518,10.0677C12.3528,10.0236 12.1792,10 12,10C10.8954,10 10,10.8954 10,12C10,13.1046 10.8954,14 12,14C13.1046,14 14,13.1046 14,12C14,11.8208 13.9764,11.6472 13.9323,11.482L15.7071,9.7071Z"
+      android:fillColor="#F0F0F0"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_monitoring_rec_big_day-1.xml b/OsmAnd/res/drawable/widget_monitoring_rec_big_day-1.xml
new file mode 100644
index 0000000000..6d5a01dd76
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_monitoring_rec_big_day-1.xml
@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,21C16.9706,21 21,16.9706 21,12C21,7.0294 16.9706,3 12,3C7.0294,3 3,7.0294 3,12C3,16.9706 7.0294,21 12,21ZM12,23C18.0751,23 23,18.0751 23,12C23,5.9249 18.0751,1 12,1C5.9249,1 1,5.9249 1,12C1,18.0751 5.9249,23 12,23Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M12,13m-7,0a7,7 0,1 1,14 0a7,7 0,1 1,-14 0"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12,12m-7,0a7,7 0,1 1,14 0a7,7 0,1 1,-14 0"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M17,12C17,14.7614 14.7614,17 12,17C9.2386,17 7,14.7614 7,12C7,9.2386 9.2386,7 12,7C14.7614,7 17,9.2386 17,12Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M14,12C14,13.1046 13.1046,14 12,14C10.8954,14 10,13.1046 10,12C10,10.8954 10.8954,10 12,10C13.1046,10 14,10.8954 14,12Z"
+      android:fillColor="#727272"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_monitoring_rec_big_day.xml b/OsmAnd/res/drawable/widget_monitoring_rec_big_day.xml
new file mode 100644
index 0000000000..837efc613f
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_monitoring_rec_big_day.xml
@@ -0,0 +1,31 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,21C16.9706,21 21,16.9706 21,12C21,7.0294 16.9706,3 12,3C7.0294,3 3,7.0294 3,12C3,16.9706 7.0294,21 12,21ZM12,23C18.0751,23 23,18.0751 23,12C23,5.9249 18.0751,1 12,1C5.9249,1 1,5.9249 1,12C1,18.0751 5.9249,23 12,23Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M12,13m-7,0a7,7 0,1 1,14 0a7,7 0,1 1,-14 0"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12,12m-7,0a7,7 0,1 1,14 0a7,7 0,1 1,-14 0"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M17,12C17,14.7614 14.7614,17 12,17C9.2386,17 7,14.7614 7,12C7,9.2386 9.2386,7 12,7C14.7614,7 17,9.2386 17,12Z"
+      android:fillColor="#EE5622"/>
+  <path
+      android:pathData="M12,16C14.2091,16 16,14.2091 16,12C16,9.7909 14.2091,8 12,8C9.7909,8 8,9.7909 8,12C8,14.2091 9.7909,16 12,16ZM12,17C14.7614,17 17,14.7614 17,12C17,9.2386 14.7614,7 12,7C9.2386,7 7,9.2386 7,12C7,14.7614 9.2386,17 12,17Z"
+      android:strokeAlpha="0.4"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.120000005"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M16.9753,12.5C16.9916,12.3355 17,12.1687 17,12C17,9.2386 14.7614,7 12,7C9.2386,7 7,9.2386 7,12C7,12.1687 7.0084,12.3355 7.0247,12.5C7.2755,9.9733 9.4073,8 12,8C14.5927,8 16.7245,9.9733 16.9753,12.5Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_monitoring_rec_big_night.xml b/OsmAnd/res/drawable/widget_monitoring_rec_big_night.xml
new file mode 100644
index 0000000000..4ac0128afc
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_monitoring_rec_big_night.xml
@@ -0,0 +1,31 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,21C16.9706,21 21,16.9706 21,12C21,7.0294 16.9706,3 12,3C7.0294,3 3,7.0294 3,12C3,16.9706 7.0294,21 12,21ZM12,23C18.0751,23 23,18.0751 23,12C23,5.9249 18.0751,1 12,1C5.9249,1 1,5.9249 1,12C1,18.0751 5.9249,23 12,23Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M12,13m-7,0a7,7 0,1 1,14 0a7,7 0,1 1,-14 0"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12,12m-7,0a7,7 0,1 1,14 0a7,7 0,1 1,-14 0"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M17,12C17,14.7614 14.7614,17 12,17C9.2386,17 7,14.7614 7,12C7,9.2386 9.2386,7 12,7C14.7614,7 17,9.2386 17,12Z"
+      android:fillColor="#EE5622"/>
+  <path
+      android:pathData="M12,16C14.2091,16 16,14.2091 16,12C16,9.7909 14.2091,8 12,8C9.7909,8 8,9.7909 8,12C8,14.2091 9.7909,16 12,16ZM12,17C14.7614,17 17,14.7614 17,12C17,9.2386 14.7614,7 12,7C9.2386,7 7,9.2386 7,12C7,14.7614 9.2386,17 12,17Z"
+      android:strokeAlpha="0.4"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.120000005"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M16.9753,12.5C16.9916,12.3355 17,12.1687 17,12C17,9.2386 14.7614,7 12,7C9.2386,7 7,9.2386 7,12C7,12.1687 7.0084,12.3355 7.0247,12.5C7.2755,9.9733 9.4073,8 12,8C14.5927,8 16.7245,9.9733 16.9753,12.5Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_monitoring_rec_inactive_night.xml b/OsmAnd/res/drawable/widget_monitoring_rec_inactive_night.xml
new file mode 100644
index 0000000000..aa85936643
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_monitoring_rec_inactive_night.xml
@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,21C16.9706,21 21,16.9706 21,12C21,7.0294 16.9706,3 12,3C7.0294,3 3,7.0294 3,12C3,16.9706 7.0294,21 12,21ZM12,23C18.0751,23 23,18.0751 23,12C23,5.9249 18.0751,1 12,1C5.9249,1 1,5.9249 1,12C1,18.0751 5.9249,23 12,23Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M12,13m-7,0a7,7 0,1 1,14 0a7,7 0,1 1,-14 0"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12,12m-7,0a7,7 0,1 1,14 0a7,7 0,1 1,-14 0"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M17,12C17,14.7614 14.7614,17 12,17C9.2386,17 7,14.7614 7,12C7,9.2386 9.2386,7 12,7C14.7614,7 17,9.2386 17,12Z"
+      android:fillColor="#F0F0F0"/>
+  <path
+      android:pathData="M14,12C14,13.1046 13.1046,14 12,14C10.8954,14 10,13.1046 10,12C10,10.8954 10.8954,10 12,10C13.1046,10 14,10.8954 14,12Z"
+      android:fillColor="#727272"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_monitoring_rec_small_day.xml b/OsmAnd/res/drawable/widget_monitoring_rec_small_day.xml
new file mode 100644
index 0000000000..7e380b90f6
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_monitoring_rec_small_day.xml
@@ -0,0 +1,31 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,21C16.9706,21 21,16.9706 21,12C21,7.0294 16.9706,3 12,3C7.0294,3 3,7.0294 3,12C3,16.9706 7.0294,21 12,21ZM12,23C18.0751,23 23,18.0751 23,12C23,5.9249 18.0751,1 12,1C5.9249,1 1,5.9249 1,12C1,18.0751 5.9249,23 12,23Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M12,13m-5,0a5,5 0,1 1,10 0a5,5 0,1 1,-10 0"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12,12m-5,0a5,5 0,1 1,10 0a5,5 0,1 1,-10 0"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M12,12m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
+      android:fillColor="#EE5622"/>
+  <path
+      android:pathData="M12,14C13.1046,14 14,13.1046 14,12C14,10.8954 13.1046,10 12,10C10.8954,10 10,10.8954 10,12C10,13.1046 10.8954,14 12,14ZM12,15C13.6569,15 15,13.6569 15,12C15,10.3431 13.6569,9 12,9C10.3431,9 9,10.3431 9,12C9,13.6569 10.3431,15 12,15Z"
+      android:strokeAlpha="0.4"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.120000005"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M14.9585,12.5C14.9858,12.3374 15,12.1704 15,12C15,10.3431 13.6569,9 12,9C10.3431,9 9,10.3431 9,12C9,12.1704 9.0142,12.3374 9.0415,12.5C9.2795,11.0811 10.5135,10 12,10C13.4865,10 14.7205,11.0811 14.9585,12.5Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_monitoring_rec_small_night.xml b/OsmAnd/res/drawable/widget_monitoring_rec_small_night.xml
new file mode 100644
index 0000000000..4d7e9c20be
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_monitoring_rec_small_night.xml
@@ -0,0 +1,31 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,21C16.9706,21 21,16.9706 21,12C21,7.0294 16.9706,3 12,3C7.0294,3 3,7.0294 3,12C3,16.9706 7.0294,21 12,21ZM12,23C18.0751,23 23,18.0751 23,12C23,5.9249 18.0751,1 12,1C5.9249,1 1,5.9249 1,12C1,18.0751 5.9249,23 12,23Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M12,13m-5,0a5,5 0,1 1,10 0a5,5 0,1 1,-10 0"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12,12m-5,0a5,5 0,1 1,10 0a5,5 0,1 1,-10 0"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M12,12m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
+      android:fillColor="#EE5622"/>
+  <path
+      android:pathData="M12,14C13.1046,14 14,13.1046 14,12C14,10.8954 13.1046,10 12,10C10.8954,10 10,10.8954 10,12C10,13.1046 10.8954,14 12,14ZM12,15C13.6569,15 15,13.6569 15,12C15,10.3431 13.6569,9 12,9C10.3431,9 9,10.3431 9,12C9,13.6569 10.3431,15 12,15Z"
+      android:strokeAlpha="0.4"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.120000005"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M14.9585,12.5C14.9858,12.3374 15,12.1704 15,12C15,10.3431 13.6569,9 12,9C10.3431,9 9,10.3431 9,12C9,12.1704 9.0142,12.3374 9.0415,12.5C9.2795,11.0811 10.5135,10 12,10C13.4865,10 14.7205,11.0811 14.9585,12.5Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_relative_bearing_day.xml b/OsmAnd/res/drawable/widget_relative_bearing_day.xml
new file mode 100644
index 0000000000..d1b76e70f9
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_relative_bearing_day.xml
@@ -0,0 +1,36 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M22,13C22,18.5228 17.5228,23 12,23C6.4771,23 2,18.5228 2,13C2,7.4771 6.4771,3 12,3C17.5228,3 22,7.4771 22,13Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M22,12C22,17.5228 17.5228,22 12,22C6.4771,22 2,17.5228 2,12C2,6.4771 6.4771,2 12,2C17.5228,2 22,6.4771 22,12Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M20,12C20,16.4183 16.4183,20 12,20C7.5817,20 4,16.4183 4,12C4,7.5817 7.5817,4 12,4C16.4183,4 20,7.5817 20,12Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M9.4024,12.561L8.6063,18.1223L12,12L18.1223,15.3937L14.5977,11.439L15.3937,5.8777L12,12L5.8777,8.6063L9.4024,12.561Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#59361B"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M15.3937,5.8777L11.0992,9.4998L5.8777,8.6063L12,12L8.6063,18.1223L12.9008,14.5002L18.1223,15.3937L12,12L15.3937,5.8777Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M7.4369,14.044L5.2029,13.949L7.0471,12.6846L7.9217,13.1694L7.4369,14.044Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M9.9559,7.4369L10.8306,7.9217L11.3154,7.0471L10.051,5.2028L9.9559,7.4369Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M12.6846,16.9529L13.1694,16.0783L14.0441,16.5631L13.9491,18.7971L12.6846,16.9529Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M16.9529,11.3154L16.0783,10.8306L16.5631,9.9559L18.7971,10.0509L16.9529,11.3154Z"
+      android:fillColor="#59361B"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_relative_bearing_night.xml b/OsmAnd/res/drawable/widget_relative_bearing_night.xml
new file mode 100644
index 0000000000..a95c4883b1
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_relative_bearing_night.xml
@@ -0,0 +1,36 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M22,13C22,18.5228 17.5228,23 12,23C6.4771,23 2,18.5228 2,13C2,7.4771 6.4771,3 12,3C17.5228,3 22,7.4771 22,13Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M22,12C22,17.5228 17.5228,22 12,22C6.4771,22 2,17.5228 2,12C2,6.4771 6.4771,2 12,2C17.5228,2 22,6.4771 22,12Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M20,12C20,16.4183 16.4183,20 12,20C7.5817,20 4,16.4183 4,12C4,7.5817 7.5817,4 12,4C16.4183,4 20,7.5817 20,12Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M9.4023,12.561L8.6063,18.1223L12,12L18.1223,15.3937L14.5977,11.439L15.3937,5.8777L12,12L5.8777,8.6063L9.4023,12.561Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#FFC107"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M15.3937,5.8777L11.0992,9.4998L5.8777,8.6063L12,12L8.6063,18.1223L12.9008,14.5002L18.1223,15.3937L12,12L15.3937,5.8777Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M7.4369,14.044L5.2028,13.949L7.0471,12.6846L7.9217,13.1694L7.4369,14.044Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M9.9559,7.4369L10.8306,7.9217L11.3154,7.0471L10.0509,5.2028L9.9559,7.4369Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M12.6846,16.9529L13.1694,16.0783L14.044,16.5631L13.949,18.7971L12.6846,16.9529Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M16.9529,11.3154L16.0783,10.8306L16.5631,9.9559L18.7971,10.0509L16.9529,11.3154Z"
+      android:fillColor="#FFC107"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_ruler_circle_day.xml b/OsmAnd/res/drawable/widget_ruler_circle_day.xml
new file mode 100644
index 0000000000..6c2ce3c0ce
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_ruler_circle_day.xml
@@ -0,0 +1,28 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,13m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12,12m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M19.9846,12.5C19.9948,12.3346 20,12.1679 20,12C20,7.5817 16.4183,4 12,4C7.5817,4 4,7.5817 4,12C4,12.1679 4.0052,12.3346 4.0154,12.5C4.2735,8.3146 7.7497,5 12,5C16.2504,5 19.7265,8.3146 19.9846,12.5Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12,14C13.1046,14 14,13.1046 14,12C14,10.8954 13.1046,10 12,10C10.8954,10 10,10.8954 10,12C10,13.1046 10.8954,14 12,14Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M12,18C15.3137,18 18,15.3137 18,12C18,8.6863 15.3137,6 12,6C8.6863,6 6,8.6863 6,12C6,15.3137 8.6863,18 12,18ZM12,16C14.2091,16 16,14.2091 16,12C16,9.7909 14.2091,8 12,8C9.7909,8 8,9.7909 8,12C8,14.2091 9.7909,16 12,16Z"
+      android:fillColor="#59361B"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M12,22C17.5228,22 22,17.5228 22,12C22,6.4771 17.5228,2 12,2C6.4771,2 2,6.4771 2,12C2,17.5228 6.4771,22 12,22ZM12,20C16.4183,20 20,16.4183 20,12C20,7.5817 16.4183,4 12,4C7.5817,4 4,7.5817 4,12C4,16.4183 7.5817,20 12,20Z"
+      android:fillColor="#59361B"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_ruler_circle_night.xml b/OsmAnd/res/drawable/widget_ruler_circle_night.xml
new file mode 100644
index 0000000000..a3e561682f
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_ruler_circle_night.xml
@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,13m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12,12m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M12,14C13.1046,14 14,13.1046 14,12C14,10.8954 13.1046,10 12,10C10.8954,10 10,10.8954 10,12C10,13.1046 10.8954,14 12,14Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M12,18C15.3137,18 18,15.3137 18,12C18,8.6863 15.3137,6 12,6C8.6863,6 6,8.6863 6,12C6,15.3137 8.6863,18 12,18ZM12,16C14.2091,16 16,14.2091 16,12C16,9.7909 14.2091,8 12,8C9.7909,8 8,9.7909 8,12C8,14.2091 9.7909,16 12,16Z"
+      android:fillColor="#FFC107"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M12,22C17.5228,22 22,17.5228 22,12C22,6.4771 17.5228,2 12,2C6.4771,2 2,6.4771 2,12C2,17.5228 6.4771,22 12,22ZM12,20C16.4183,20 20,16.4183 20,12C20,7.5817 16.4183,4 12,4C7.5817,4 4,7.5817 4,12C4,16.4183 7.5817,20 12,20Z"
+      android:fillColor="#FFC107"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_speed_day.xml b/OsmAnd/res/drawable/widget_speed_day.xml
new file mode 100644
index 0000000000..ecbb6d7510
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_speed_day.xml
@@ -0,0 +1,23 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M22,14C22,15.8214 21.513,17.5291 20.6622,19H18.2454C16.7793,20.8289 14.5264,22 12,22C9.4736,22 7.2207,20.8289 5.7546,19H3.3378C2.487,17.5291 2,15.8214 2,14C2,8.4771 6.4771,4 12,4C17.5228,4 22,8.4771 22,14Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M22,13C22,14.8214 21.513,16.5291 20.6622,18H18.2454C16.7793,19.8289 14.5264,21 12,21C9.4736,21 7.2207,19.8289 5.7546,18H3.3378C2.487,16.5291 2,14.8214 2,13C2,7.4771 6.4771,3 12,3C17.5228,3 22,7.4771 22,13Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M19,15C18.4477,15 18,14.5523 18,14V13C18,9.6863 15.3137,7 12,7C8.6863,7 6,9.6863 6,13V14C6,14.5523 5.5523,15 5,15C4.4477,15 4,14.5523 4,14V13C4,8.5817 7.5817,5 12,5C16.4183,5 20,8.5817 20,13V14C20,14.5523 19.5523,15 19,15Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M15.7071,12.7071C16.0976,12.3166 16.0976,11.6834 15.7071,11.2929C15.3166,10.9024 14.6834,10.9024 14.2929,11.2929L12.518,13.0677C12.3528,13.0236 12.1792,13 12,13C10.8954,13 10,13.8954 10,15C10,16.1046 10.8954,17 12,17C13.1046,17 14,16.1046 14,15C14,14.8208 13.9764,14.6472 13.9323,14.482L15.7071,12.7071Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M15.7071,11.7071C16.0976,11.3166 16.0976,10.6834 15.7071,10.2929C15.3166,9.9024 14.6834,9.9024 14.2929,10.2929L12.518,12.0677C12.3528,12.0236 12.1792,12 12,12C10.8954,12 10,12.8954 10,14C10,15.1046 10.8954,16 12,16C13.1046,16 14,15.1046 14,14C14,13.8208 13.9764,13.6472 13.9323,13.482L15.7071,11.7071Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_speed_night.xml b/OsmAnd/res/drawable/widget_speed_night.xml
new file mode 100644
index 0000000000..c890f0d90b
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_speed_night.xml
@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M22,14C22,15.8214 21.513,17.5291 20.6622,19H18.2454C16.7793,20.8289 14.5264,22 12,22C9.4736,22 7.2207,20.8289 5.7546,19H3.3378C2.487,17.5291 2,15.8214 2,14C2,8.4771 6.4771,4 12,4C17.5228,4 22,8.4771 22,14Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M22,13C22,14.8214 21.513,16.5291 20.6622,18H18.2454C16.7793,19.8289 14.5264,21 12,21C9.4736,21 7.2207,19.8289 5.7546,18H3.3378C2.487,16.5291 2,14.8214 2,13C2,7.4771 6.4771,3 12,3C17.5228,3 22,7.4771 22,13Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M19,15C18.4477,15 18,14.5523 18,14V13C18,9.6863 15.3137,7 12,7C8.6863,7 6,9.6863 6,13V14C6,14.5523 5.5523,15 5,15C4.4477,15 4,14.5523 4,14V13C4,8.5817 7.5817,5 12,5C16.4183,5 20,8.5817 20,13V14C20,14.5523 19.5523,15 19,15Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M15.7071,11.7071C16.0976,11.3166 16.0976,10.6834 15.7071,10.2929C15.3166,9.9024 14.6834,9.9024 14.2929,10.2929L12.518,12.0677C12.3528,12.0236 12.1792,12 12,12C10.8954,12 10,12.8954 10,14C10,15.1046 10.8954,16 12,16C13.1046,16 14,15.1046 14,14C14,13.8208 13.9764,13.6472 13.9323,13.482L15.7071,11.7071Z"
+      android:fillColor="#59361B"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_target_day.xml b/OsmAnd/res/drawable/widget_target_day.xml
new file mode 100644
index 0000000000..f1905ad586
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_target_day.xml
@@ -0,0 +1,23 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20,3H6V23H8V15H20V3Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M20,2H6V22H8V14H20V2Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M8,12H18V4H8V12Z"
+      android:fillColor="#FFC107"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M10,4H8V6H10V8H8V10H10V12H12V10H14V12H16V10H18V8H16V6H18V4H16V6H14V4H12V6H10V4ZM12,8V6H14V8H12ZM12,8V10H10V8H12ZM14,8H16V10H14V8Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#59361B"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.7"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_target_night.xml b/OsmAnd/res/drawable/widget_target_night.xml
new file mode 100644
index 0000000000..7b4c53d0e0
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_target_night.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20,3H6V23H8V15H20V3Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M20,2H6V22H8V14H20V2Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M8,12H18V4H8V12Z"
+      android:fillColor="#59361B"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M10,4H8V6H10V8H8V10H10V12H12V10H14V12H16V10H18V8H16V6H18V4H16V6H14V4H12V6H10V4ZM12,8V6H14V8H12ZM12,8V10H10V8H12ZM14,8H16V10H14V8Z"
+      android:fillColor="#FFC107"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_time_day.xml b/OsmAnd/res/drawable/widget_time_day.xml
new file mode 100644
index 0000000000..695e26e9ba
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_time_day.xml
@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,13m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12,12m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M12,12m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M19.9846,12.5C19.9948,12.3346 20,12.1679 20,12C20,7.5817 16.4183,4 12,4C7.5817,4 4,7.5817 4,12C4,12.1679 4.0052,12.3346 4.0154,12.5C4.2735,8.3146 7.7497,5 12,5C16.2504,5 19.7265,8.3146 19.9846,12.5Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12,6C12.5523,6 13,6.4477 13,7V11.5858L15.7071,14.2929C16.0976,14.6834 16.0976,15.3166 15.7071,15.7071C15.3166,16.0976 14.6834,16.0976 14.2929,15.7071L11,12.4142V7C11,6.4477 11.4477,6 12,6Z"
+      android:fillColor="#59361B"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_time_night.xml b/OsmAnd/res/drawable/widget_time_night.xml
new file mode 100644
index 0000000000..d52749f466
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_time_night.xml
@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,13m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12,12m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M12,12m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M19.9846,12.5C19.9948,12.3346 20,12.1679 20,12C20,7.5817 16.4183,4 12,4C7.5817,4 4,7.5817 4,12C4,12.1679 4.0052,12.3346 4.0154,12.5C4.2735,8.3146 7.7497,5 12,5C16.2504,5 19.7265,8.3146 19.9846,12.5Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M12,6C12.5523,6 13,6.4477 13,7V11.5858L15.7071,14.2929C16.0976,14.6834 16.0976,15.3166 15.7071,15.7071C15.3166,16.0976 14.6834,16.0976 14.2929,15.7071L11,12.4142V7C11,6.4477 11.4477,6 12,6Z"
+      android:fillColor="#FFC107"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_time_to_distance_day.xml b/OsmAnd/res/drawable/widget_time_to_distance_day.xml
new file mode 100644
index 0000000000..c81360ebf5
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_time_to_distance_day.xml
@@ -0,0 +1,33 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M16.5556,18.2417C15.029,20.5087 12.4387,22 9.5,22C4.8056,22 1,18.1944 1,13.5C8.5,14 17.5,12 24,12C24,16.4444 19,21 19,21C19,21 17.7868,19.8946 16.5556,18.2417Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M16.4333,17.0757C14.8122,19.4451 12.0877,21 9,21C4.0294,21 0,16.9706 0,12C0,7.0294 4.0294,3 9,3C12.0077,3 14.6709,4.4754 16.3051,6.742C17.0828,6.2653 18.0077,6 19,6C21.7614,6 24,8.0545 24,11C24,15.4444 19,20 19,20C19,20 17.7051,18.8202 16.4333,17.0757Z"
+      android:fillColor="#59361B"/>
+  <path
+      android:pathData="M14,11C14,9.9039 14.31,8.9311 14.8416,8.1417C13.5887,6.2486 11.4402,5 9,5C5.134,5 2,8.134 2,12C2,15.866 5.134,19 9,19C11.7164,19 14.0715,17.4527 15.2318,15.1914C14.5236,13.888 14,12.4382 14,11ZM10,8C10,7.4477 9.5523,7 9,7C8.4477,7 8,7.4477 8,8V12.4142L10.2929,14.7071C10.6834,15.0976 11.3166,15.0976 11.7071,14.7071C12.0976,14.3166 12.0976,13.6834 11.7071,13.2929L10,11.5858V8Z"
+      android:fillColor="#FFC107"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M22,11C22,13.5 19,17 19,17C19,17 16,13.5 16,11C16,9.3432 17.3431,8 19,8C20.6569,8 22,9.3432 22,11ZM20,11C20,11.5523 19.5523,12 19,12C18.4477,12 18,11.5523 18,11C18,10.4477 18.4477,10 19,10C19.5523,10 20,10.4477 20,11Z"
+      android:fillColor="#FFC107"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M14.8416,8.1417C13.5887,6.2486 11.4402,5 9,5C5.134,5 2,8.134 2,12C2,12.1681 2.0059,12.3348 2.0176,12.5C2.274,8.8674 5.3021,6 9,6C11.2429,6 13.2394,7.0549 14.5205,8.6955C14.6159,8.5023 14.7233,8.3175 14.8416,8.1417Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M21.9612,11.5161C21.9865,11.3405 22,11.168 22,11C22,9.3432 20.6569,8 19,8C17.3431,8 16,9.3432 16,11C16,11.168 16.0135,11.3405 16.0388,11.5161C16.2702,10.0894 17.5079,9 19,9C20.4921,9 21.7298,10.0894 21.9612,11.5161Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M20,11C20,11.5523 19.5523,12 19,12C18.4477,12 18,11.5523 18,11V12C18,12.5523 18.4477,13 19,13C19.5523,13 20,12.5523 20,12V11Z"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+</vector>
diff --git a/OsmAnd/res/drawable/widget_time_to_distance_night.xml b/OsmAnd/res/drawable/widget_time_to_distance_night.xml
new file mode 100644
index 0000000000..26224a7e9f
--- /dev/null
+++ b/OsmAnd/res/drawable/widget_time_to_distance_night.xml
@@ -0,0 +1,33 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M16.5556,18.2417C15.029,20.5087 12.4387,22 9.5,22C4.8056,22 1,18.1944 1,13.5C8.5,14 17.5,12 24,12C24,16.4444 19,21 19,21C19,21 17.7868,19.8946 16.5556,18.2417Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M16.4333,17.0757C14.8122,19.4451 12.0877,21 9,21C4.0294,21 0,16.9706 0,12C0,7.0294 4.0294,3 9,3C12.0077,3 14.6709,4.4754 16.3051,6.742C17.0828,6.2653 18.0077,6 19,6C21.7614,6 24,8.0545 24,11C24,15.4444 19,20 19,20C19,20 17.7051,18.8202 16.4333,17.0757Z"
+      android:fillColor="#FFC107"/>
+  <path
+      android:pathData="M14,11C14,9.9039 14.31,8.9311 14.8416,8.1417C13.5887,6.2486 11.4402,5 9,5C5.134,5 2,8.134 2,12C2,15.866 5.134,19 9,19C11.7164,19 14.0715,17.4527 15.2318,15.1914C14.5236,13.888 14,12.4382 14,11ZM10,8C10,7.4477 9.5523,7 9,7C8.4477,7 8,7.4477 8,8V12.4142L10.2929,14.7071C10.6834,15.0976 11.3166,15.0976 11.7071,14.7071C12.0976,14.3166 12.0976,13.6834 11.7071,13.2929L10,11.5858V8Z"
+      android:fillColor="#59361B"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M22,11C22,13.5 19,17 19,17C19,17 16,13.5 16,11C16,9.3432 17.3431,8 19,8C20.6569,8 22,9.3432 22,11ZM20,11C20,11.5523 19.5523,12 19,12C18.4477,12 18,11.5523 18,11C18,10.4477 18.4477,10 19,10C19.5523,10 20,10.4477 20,11Z"
+      android:fillColor="#59361B"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M14.8416,8.1417C13.5887,6.2486 11.4402,5 9,5C5.134,5 2,8.134 2,12C2,12.1681 2.0059,12.3348 2.0176,12.5C2.274,8.8674 5.3021,6 9,6C11.2429,6 13.2394,7.0549 14.5205,8.6955C14.6159,8.5023 14.7233,8.3175 14.8416,8.1417Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M21.9612,11.5161C21.9865,11.3405 22,11.168 22,11C22,9.3432 20.6569,8 19,8C17.3431,8 16,9.3432 16,11C16,11.168 16.0135,11.3405 16.0388,11.5161C16.2702,10.0894 17.5079,9 19,9C20.4921,9 21.7298,10.0894 21.9612,11.5161Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M20,11C20,11.5523 19.5523,12 19,12C18.4477,12 18,11.5523 18,11V12C18,12.5523 18.4477,13 19,13C19.5523,13 20,12.5523 20,12V11Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+</vector>