diff --git a/OsmAnd/res/drawable-hdpi/a_10_device_access_volume_muted_dark.png b/OsmAnd/res/drawable-hdpi/a_10_device_access_volume_muted_dark.png
index c9b731c53a..73d8dfdb97 100644
Binary files a/OsmAnd/res/drawable-hdpi/a_10_device_access_volume_muted_dark.png and b/OsmAnd/res/drawable-hdpi/a_10_device_access_volume_muted_dark.png differ
diff --git a/OsmAnd/res/drawable-hdpi/a_10_device_access_volume_muted_light.png b/OsmAnd/res/drawable-hdpi/a_10_device_access_volume_muted_light.png
index 0414971729..ce715f2a83 100644
Binary files a/OsmAnd/res/drawable-hdpi/a_10_device_access_volume_muted_light.png and b/OsmAnd/res/drawable-hdpi/a_10_device_access_volume_muted_light.png differ
diff --git a/OsmAnd/res/drawable-hdpi/a_10_device_access_volume_on_dark.png b/OsmAnd/res/drawable-hdpi/a_10_device_access_volume_on_dark.png
index 7b69ea56b5..bd4051327b 100644
Binary files a/OsmAnd/res/drawable-hdpi/a_10_device_access_volume_on_dark.png and b/OsmAnd/res/drawable-hdpi/a_10_device_access_volume_on_dark.png differ
diff --git a/OsmAnd/res/drawable-hdpi/a_10_device_access_volume_on_light.png b/OsmAnd/res/drawable-hdpi/a_10_device_access_volume_on_light.png
index d43e8a33ca..6dfcb2e3f2 100644
Binary files a/OsmAnd/res/drawable-hdpi/a_10_device_access_volume_on_light.png and b/OsmAnd/res/drawable-hdpi/a_10_device_access_volume_on_light.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_fav_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_fav_dark.png
index f57ad41889..a45d12b2f9 100644
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_fav_dark.png and b/OsmAnd/res/drawable-hdpi/ic_action_fav_dark.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_fav_light.png b/OsmAnd/res/drawable-hdpi/ic_action_fav_light.png
index 991168b4aa..e2f3993b15 100644
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_fav_light.png and b/OsmAnd/res/drawable-hdpi/ic_action_fav_light.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_flag_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_flag_dark.png
index 2a0e0933d6..5bc3ca2e17 100644
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_flag_dark.png and b/OsmAnd/res/drawable-hdpi/ic_action_flag_dark.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_flag_light.png b/OsmAnd/res/drawable-hdpi/ic_action_flag_light.png
index a896105b16..a0dcd52862 100644
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_flag_light.png and b/OsmAnd/res/drawable-hdpi/ic_action_flag_light.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_flage_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_flage_dark.png
index ca2653c09e..47f31c73e9 100644
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_flage_dark.png and b/OsmAnd/res/drawable-hdpi/ic_action_flage_dark.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_flage_light.png b/OsmAnd/res/drawable-hdpi/ic_action_flage_light.png
index c1cef0cf93..7f8b531ab0 100644
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_flage_light.png and b/OsmAnd/res/drawable-hdpi/ic_action_flage_light.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gabout_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_gabout_dark.png
index f71913df70..9691410269 100644
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gabout_dark.png and b/OsmAnd/res/drawable-hdpi/ic_action_gabout_dark.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gabout_light.png b/OsmAnd/res/drawable-hdpi/ic_action_gabout_light.png
index 7270d6e622..7c8bf76b29 100644
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gabout_light.png and b/OsmAnd/res/drawable-hdpi/ic_action_gabout_light.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gloc_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_gloc_dark.png
index 17e9931396..0bd6c32d20 100644
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gloc_dark.png and b/OsmAnd/res/drawable-hdpi/ic_action_gloc_dark.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gloc_light.png b/OsmAnd/res/drawable-hdpi/ic_action_gloc_light.png
index deb633018f..54599c70d4 100644
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gloc_light.png and b/OsmAnd/res/drawable-hdpi/ic_action_gloc_light.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gshare_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_gshare_dark.png
index 93852802bd..f4df454272 100644
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gshare_dark.png and b/OsmAnd/res/drawable-hdpi/ic_action_gshare_dark.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gshare_light.png b/OsmAnd/res/drawable-hdpi/ic_action_gshare_light.png
index 3b61bff2e4..7da4056ec9 100644
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gshare_light.png and b/OsmAnd/res/drawable-hdpi/ic_action_gshare_light.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_layers_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_layers_dark.png
index e087d79845..a8ccd251cd 100644
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_layers_dark.png and b/OsmAnd/res/drawable-hdpi/ic_action_layers_dark.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_layers_light.png b/OsmAnd/res/drawable-hdpi/ic_action_layers_light.png
index 412e73cb6a..924521867e 100644
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_layers_light.png and b/OsmAnd/res/drawable-hdpi/ic_action_layers_light.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_marker_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_marker_dark.png
index 93b17dd935..988e4cf571 100644
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_marker_dark.png and b/OsmAnd/res/drawable-hdpi/ic_action_marker_dark.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_marker_light.png b/OsmAnd/res/drawable-hdpi/ic_action_marker_light.png
index 915f685a2c..fd2340024d 100644
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_marker_light.png and b/OsmAnd/res/drawable-hdpi/ic_action_marker_light.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_parking_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_parking_dark.png
index 04adc1e9a4..f0914e4aa9 100644
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_parking_dark.png and b/OsmAnd/res/drawable-hdpi/ic_action_parking_dark.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_parking_light.png b/OsmAnd/res/drawable-hdpi/ic_action_parking_light.png
index 2162239d32..10d21780da 100644
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_parking_light.png and b/OsmAnd/res/drawable-hdpi/ic_action_parking_light.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_quit_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_quit_dark.png
index 7a1bad11df..fcfff30a2a 100644
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_quit_dark.png and b/OsmAnd/res/drawable-hdpi/ic_action_quit_dark.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_quit_light.png b/OsmAnd/res/drawable-hdpi/ic_action_quit_light.png
index 7696065045..b71b512a04 100644
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_quit_light.png and b/OsmAnd/res/drawable-hdpi/ic_action_quit_light.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_search_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_search_dark.png
index dd6e9bcc68..3e131808a8 100644
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_search_dark.png and b/OsmAnd/res/drawable-hdpi/ic_action_search_dark.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_search_light.png b/OsmAnd/res/drawable-hdpi/ic_action_search_light.png
index c0baf49bbf..5adc2459f7 100644
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_search_light.png and b/OsmAnd/res/drawable-hdpi/ic_action_search_light.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_settings_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_settings_dark.png
index ae71e92046..e88421234b 100644
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_settings_dark.png and b/OsmAnd/res/drawable-hdpi/ic_action_settings_dark.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_settings_light.png b/OsmAnd/res/drawable-hdpi/ic_action_settings_light.png
index 7a4414b21d..9f462386e1 100644
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_settings_light.png and b/OsmAnd/res/drawable-hdpi/ic_action_settings_light.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_configure_screen_dark.png b/OsmAnd/res/drawable-hdpi/ic_configure_screen_dark.png
new file mode 100644
index 0000000000..330da77fbd
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_configure_screen_dark.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_configure_screen_light.png b/OsmAnd/res/drawable-hdpi/ic_configure_screen_light.png
new file mode 100644
index 0000000000..9efca901c5
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_configure_screen_light.png differ
diff --git a/OsmAnd/res/drawable-mdpi/a_10_device_access_volume_muted_dark.png b/OsmAnd/res/drawable-mdpi/a_10_device_access_volume_muted_dark.png
new file mode 100644
index 0000000000..7f53eb4590
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/a_10_device_access_volume_muted_dark.png differ
diff --git a/OsmAnd/res/drawable-mdpi/a_10_device_access_volume_muted_light.png b/OsmAnd/res/drawable-mdpi/a_10_device_access_volume_muted_light.png
new file mode 100644
index 0000000000..47474d26f1
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/a_10_device_access_volume_muted_light.png differ
diff --git a/OsmAnd/res/drawable-mdpi/a_10_device_access_volume_on_dark.png b/OsmAnd/res/drawable-mdpi/a_10_device_access_volume_on_dark.png
new file mode 100644
index 0000000000..10ca590a47
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/a_10_device_access_volume_on_dark.png differ
diff --git a/OsmAnd/res/drawable-mdpi/a_10_device_access_volume_on_light.png b/OsmAnd/res/drawable-mdpi/a_10_device_access_volume_on_light.png
new file mode 100644
index 0000000000..713d712c0f
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/a_10_device_access_volume_on_light.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_fav_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_fav_dark.png
index e7ec273fe0..e5d4c84990 100644
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_fav_dark.png and b/OsmAnd/res/drawable-mdpi/ic_action_fav_dark.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_fav_light.png b/OsmAnd/res/drawable-mdpi/ic_action_fav_light.png
index 61b1eebb7d..415944db6d 100644
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_fav_light.png and b/OsmAnd/res/drawable-mdpi/ic_action_fav_light.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_flag_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_flag_dark.png
index 5d52e60e77..8e75e65563 100644
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_flag_dark.png and b/OsmAnd/res/drawable-mdpi/ic_action_flag_dark.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_flag_light.png b/OsmAnd/res/drawable-mdpi/ic_action_flag_light.png
index bc8e1d2bba..c65c7389e3 100644
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_flag_light.png and b/OsmAnd/res/drawable-mdpi/ic_action_flag_light.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_flage_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_flage_dark.png
index a28cf64e3d..fb49c2f491 100644
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_flage_dark.png and b/OsmAnd/res/drawable-mdpi/ic_action_flage_dark.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_flage_light.png b/OsmAnd/res/drawable-mdpi/ic_action_flage_light.png
index ed0717d8c0..78c855f4de 100644
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_flage_light.png and b/OsmAnd/res/drawable-mdpi/ic_action_flage_light.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gabout_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_gabout_dark.png
index e82fe928f0..25ad8f109d 100644
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gabout_dark.png and b/OsmAnd/res/drawable-mdpi/ic_action_gabout_dark.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gabout_light.png b/OsmAnd/res/drawable-mdpi/ic_action_gabout_light.png
index bfd6398d4f..19c9245f5a 100644
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gabout_light.png and b/OsmAnd/res/drawable-mdpi/ic_action_gabout_light.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gloc_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_gloc_dark.png
index dd4412206a..473c31a4d3 100644
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gloc_dark.png and b/OsmAnd/res/drawable-mdpi/ic_action_gloc_dark.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gloc_light.png b/OsmAnd/res/drawable-mdpi/ic_action_gloc_light.png
index d59bcb3f68..45f62e9ab7 100644
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gloc_light.png and b/OsmAnd/res/drawable-mdpi/ic_action_gloc_light.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gshare_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_gshare_dark.png
index e370e515bc..fe0882eec6 100644
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gshare_dark.png and b/OsmAnd/res/drawable-mdpi/ic_action_gshare_dark.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gshare_light.png b/OsmAnd/res/drawable-mdpi/ic_action_gshare_light.png
index 3e411f5339..06070f59cd 100644
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gshare_light.png and b/OsmAnd/res/drawable-mdpi/ic_action_gshare_light.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_layers_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_layers_dark.png
index b34e2ffb24..39ef27bd81 100644
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_layers_dark.png and b/OsmAnd/res/drawable-mdpi/ic_action_layers_dark.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_layers_light.png b/OsmAnd/res/drawable-mdpi/ic_action_layers_light.png
index 3a96ce40f6..59f2630d1c 100644
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_layers_light.png and b/OsmAnd/res/drawable-mdpi/ic_action_layers_light.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_marker_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_marker_dark.png
index 4e2cc46cfd..2dab1265c0 100644
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_marker_dark.png and b/OsmAnd/res/drawable-mdpi/ic_action_marker_dark.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_marker_light.png b/OsmAnd/res/drawable-mdpi/ic_action_marker_light.png
index 598a12857d..f0c27ba829 100644
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_marker_light.png and b/OsmAnd/res/drawable-mdpi/ic_action_marker_light.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_parking_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_parking_dark.png
index 8777b837a5..890646f66f 100644
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_parking_dark.png and b/OsmAnd/res/drawable-mdpi/ic_action_parking_dark.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_parking_light.png b/OsmAnd/res/drawable-mdpi/ic_action_parking_light.png
index 281ebbf0b8..0454b22fca 100644
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_parking_light.png and b/OsmAnd/res/drawable-mdpi/ic_action_parking_light.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_quit_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_quit_dark.png
index d1f92e59a3..ba753f34e7 100644
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_quit_dark.png and b/OsmAnd/res/drawable-mdpi/ic_action_quit_dark.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_quit_light.png b/OsmAnd/res/drawable-mdpi/ic_action_quit_light.png
index 0604002ed9..d73d8be392 100644
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_quit_light.png and b/OsmAnd/res/drawable-mdpi/ic_action_quit_light.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_search_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_search_dark.png
index 729a89924e..6d37f2ca3a 100644
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_search_dark.png and b/OsmAnd/res/drawable-mdpi/ic_action_search_dark.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_search_light.png b/OsmAnd/res/drawable-mdpi/ic_action_search_light.png
index 7e6c0a5998..adab48c9c5 100644
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_search_light.png and b/OsmAnd/res/drawable-mdpi/ic_action_search_light.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_settings_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_settings_dark.png
index f0243fe824..c2f68e9e4d 100644
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_settings_dark.png and b/OsmAnd/res/drawable-mdpi/ic_action_settings_dark.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_settings_light.png b/OsmAnd/res/drawable-mdpi/ic_action_settings_light.png
index 2a9fdc4009..bb2cc22048 100644
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_settings_light.png and b/OsmAnd/res/drawable-mdpi/ic_action_settings_light.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_configure_screen_dark.png b/OsmAnd/res/drawable-mdpi/ic_configure_screen_dark.png
new file mode 100644
index 0000000000..ec2dac1101
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_configure_screen_dark.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_configure_screen_light.png b/OsmAnd/res/drawable-mdpi/ic_configure_screen_light.png
new file mode 100644
index 0000000000..3bede31974
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_configure_screen_light.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/a_10_device_access_volume_muted_dark.png b/OsmAnd/res/drawable-xhdpi/a_10_device_access_volume_muted_dark.png
index 67bc82038e..9115faef0a 100644
Binary files a/OsmAnd/res/drawable-xhdpi/a_10_device_access_volume_muted_dark.png and b/OsmAnd/res/drawable-xhdpi/a_10_device_access_volume_muted_dark.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/a_10_device_access_volume_muted_light.png b/OsmAnd/res/drawable-xhdpi/a_10_device_access_volume_muted_light.png
index 512ac30859..a2fae32297 100644
Binary files a/OsmAnd/res/drawable-xhdpi/a_10_device_access_volume_muted_light.png and b/OsmAnd/res/drawable-xhdpi/a_10_device_access_volume_muted_light.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/a_10_device_access_volume_on_dark.png b/OsmAnd/res/drawable-xhdpi/a_10_device_access_volume_on_dark.png
index dfd2b33c73..0291c036b4 100644
Binary files a/OsmAnd/res/drawable-xhdpi/a_10_device_access_volume_on_dark.png and b/OsmAnd/res/drawable-xhdpi/a_10_device_access_volume_on_dark.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/a_10_device_access_volume_on_light.png b/OsmAnd/res/drawable-xhdpi/a_10_device_access_volume_on_light.png
index 777fab84ea..c7a8a021c0 100644
Binary files a/OsmAnd/res/drawable-xhdpi/a_10_device_access_volume_on_light.png and b/OsmAnd/res/drawable-xhdpi/a_10_device_access_volume_on_light.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_fav_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_fav_dark.png
index 8534bfa5ed..f2c24e3a72 100644
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_fav_dark.png and b/OsmAnd/res/drawable-xhdpi/ic_action_fav_dark.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_fav_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_fav_light.png
index 04620d3914..25fed0d632 100644
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_fav_light.png and b/OsmAnd/res/drawable-xhdpi/ic_action_fav_light.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_flag_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_flag_dark.png
index 3fe6a0ce7f..e61d74d4e9 100644
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_flag_dark.png and b/OsmAnd/res/drawable-xhdpi/ic_action_flag_dark.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_flag_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_flag_light.png
index f3de6c3361..f773f91a6d 100644
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_flag_light.png and b/OsmAnd/res/drawable-xhdpi/ic_action_flag_light.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_flage_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_flage_dark.png
index 5370bad811..ca9aaab90c 100644
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_flage_dark.png and b/OsmAnd/res/drawable-xhdpi/ic_action_flage_dark.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_flage_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_flage_light.png
index de9624fd10..2522d6ea5d 100644
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_flage_light.png and b/OsmAnd/res/drawable-xhdpi/ic_action_flage_light.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gabout_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_gabout_dark.png
index fab36c0a4b..c66a736022 100644
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gabout_dark.png and b/OsmAnd/res/drawable-xhdpi/ic_action_gabout_dark.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gabout_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_gabout_light.png
index 1b11804252..076a6c4504 100644
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gabout_light.png and b/OsmAnd/res/drawable-xhdpi/ic_action_gabout_light.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gloc_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_gloc_dark.png
index 057d938338..c80e45a635 100644
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gloc_dark.png and b/OsmAnd/res/drawable-xhdpi/ic_action_gloc_dark.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gloc_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_gloc_light.png
index 86fcc632d5..e8aedbc9a7 100644
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gloc_light.png and b/OsmAnd/res/drawable-xhdpi/ic_action_gloc_light.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gshare_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_gshare_dark.png
index b91f70360f..c49eca17c4 100644
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gshare_dark.png and b/OsmAnd/res/drawable-xhdpi/ic_action_gshare_dark.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gshare_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_gshare_light.png
index 9e33166d43..12e7f5a986 100644
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gshare_light.png and b/OsmAnd/res/drawable-xhdpi/ic_action_gshare_light.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_layers_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_layers_dark.png
index 61fee724aa..071e60ec38 100644
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_layers_dark.png and b/OsmAnd/res/drawable-xhdpi/ic_action_layers_dark.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_layers_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_layers_light.png
index 8661e58751..719dbc9dc1 100644
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_layers_light.png and b/OsmAnd/res/drawable-xhdpi/ic_action_layers_light.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_marker_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_marker_dark.png
index 008d21eff2..731ac33b2b 100644
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_marker_dark.png and b/OsmAnd/res/drawable-xhdpi/ic_action_marker_dark.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_marker_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_marker_light.png
index 7f54f19f91..d71bddfbcb 100644
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_marker_light.png and b/OsmAnd/res/drawable-xhdpi/ic_action_marker_light.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_parking_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_parking_dark.png
index 6b0cab75c1..92c3f3358e 100644
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_parking_dark.png and b/OsmAnd/res/drawable-xhdpi/ic_action_parking_dark.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_parking_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_parking_light.png
index 4f8097d7e7..ff6e6bc3c0 100644
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_parking_light.png and b/OsmAnd/res/drawable-xhdpi/ic_action_parking_light.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_quit_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_quit_dark.png
index 4a8d4a2211..d845182832 100644
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_quit_dark.png and b/OsmAnd/res/drawable-xhdpi/ic_action_quit_dark.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_quit_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_quit_light.png
index 925c8cf7af..df3fc2fcb8 100644
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_quit_light.png and b/OsmAnd/res/drawable-xhdpi/ic_action_quit_light.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_search_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_search_dark.png
index eac90e1439..60536de3bb 100644
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_search_dark.png and b/OsmAnd/res/drawable-xhdpi/ic_action_search_dark.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_search_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_search_light.png
index f5299242ea..8a45553de0 100644
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_search_light.png and b/OsmAnd/res/drawable-xhdpi/ic_action_search_light.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_settings_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_settings_dark.png
index a4d0626516..af6861b125 100644
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_settings_dark.png and b/OsmAnd/res/drawable-xhdpi/ic_action_settings_dark.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_settings_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_settings_light.png
index ebfdea5063..3972159d46 100644
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_settings_light.png and b/OsmAnd/res/drawable-xhdpi/ic_action_settings_light.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_configure_screen_dark.png b/OsmAnd/res/drawable-xhdpi/ic_configure_screen_dark.png
new file mode 100644
index 0000000000..7699bc55fb
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_configure_screen_dark.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_configure_screen_light.png b/OsmAnd/res/drawable-xhdpi/ic_configure_screen_light.png
new file mode 100644
index 0000000000..876c375fb0
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_configure_screen_light.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/a_10_device_access_volume_muted_dark.png b/OsmAnd/res/drawable-xxhdpi/a_10_device_access_volume_muted_dark.png
new file mode 100644
index 0000000000..ffcafb10a7
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/a_10_device_access_volume_muted_dark.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/a_10_device_access_volume_muted_light.png b/OsmAnd/res/drawable-xxhdpi/a_10_device_access_volume_muted_light.png
new file mode 100644
index 0000000000..8d8f95e41d
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/a_10_device_access_volume_muted_light.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/a_10_device_access_volume_on_dark.png b/OsmAnd/res/drawable-xxhdpi/a_10_device_access_volume_on_dark.png
new file mode 100644
index 0000000000..10b165ca80
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/a_10_device_access_volume_on_dark.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/a_10_device_access_volume_on_light.png b/OsmAnd/res/drawable-xxhdpi/a_10_device_access_volume_on_light.png
new file mode 100644
index 0000000000..46069b8c9c
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/a_10_device_access_volume_on_light.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_fav_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_fav_dark.png
new file mode 100644
index 0000000000..9db70d9f1f
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_fav_dark.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_fav_light.png b/OsmAnd/res/drawable-xxhdpi/ic_action_fav_light.png
new file mode 100644
index 0000000000..612b4fe2c3
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_fav_light.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_flag_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_flag_dark.png
new file mode 100644
index 0000000000..7b41a25dfb
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_flag_dark.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_flag_light.png b/OsmAnd/res/drawable-xxhdpi/ic_action_flag_light.png
new file mode 100644
index 0000000000..922411d0e8
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_flag_light.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_flage_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_flage_dark.png
new file mode 100644
index 0000000000..0ba0241b02
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_flage_dark.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_flage_light.png b/OsmAnd/res/drawable-xxhdpi/ic_action_flage_light.png
new file mode 100644
index 0000000000..7e5cb5122b
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_flage_light.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_gabout_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_gabout_dark.png
new file mode 100644
index 0000000000..d251ab86be
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_gabout_dark.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_gabout_light.png b/OsmAnd/res/drawable-xxhdpi/ic_action_gabout_light.png
new file mode 100644
index 0000000000..3487a8c704
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_gabout_light.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_gloc_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_gloc_dark.png
new file mode 100644
index 0000000000..abc4c88578
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_gloc_dark.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_gloc_light.png b/OsmAnd/res/drawable-xxhdpi/ic_action_gloc_light.png
new file mode 100644
index 0000000000..453f9a2346
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_gloc_light.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_gshare_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_gshare_dark.png
new file mode 100644
index 0000000000..f862a3f3f5
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_gshare_dark.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_gshare_light.png b/OsmAnd/res/drawable-xxhdpi/ic_action_gshare_light.png
new file mode 100644
index 0000000000..206d31e926
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_gshare_light.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_layers_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_layers_dark.png
new file mode 100644
index 0000000000..76900094c1
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_layers_dark.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_layers_light.png b/OsmAnd/res/drawable-xxhdpi/ic_action_layers_light.png
new file mode 100644
index 0000000000..33c4c98593
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_layers_light.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_marker_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_marker_dark.png
new file mode 100644
index 0000000000..2244702813
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_marker_dark.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_marker_light.png b/OsmAnd/res/drawable-xxhdpi/ic_action_marker_light.png
new file mode 100644
index 0000000000..51185ffd91
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_marker_light.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_parking_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_parking_dark.png
new file mode 100644
index 0000000000..53b09f0cb7
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_parking_dark.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_parking_light.png b/OsmAnd/res/drawable-xxhdpi/ic_action_parking_light.png
new file mode 100644
index 0000000000..c06e8fed0c
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_parking_light.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_quit_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_quit_dark.png
new file mode 100644
index 0000000000..a2bfa51cf3
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_quit_dark.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_quit_light.png b/OsmAnd/res/drawable-xxhdpi/ic_action_quit_light.png
new file mode 100644
index 0000000000..cdea64439f
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_quit_light.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_search_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_search_dark.png
new file mode 100644
index 0000000000..8fca8a0679
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_search_dark.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_search_light.png b/OsmAnd/res/drawable-xxhdpi/ic_action_search_light.png
new file mode 100644
index 0000000000..50870e6ade
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_search_light.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_settings_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_settings_dark.png
new file mode 100644
index 0000000000..0fac002ad8
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_settings_dark.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_settings_light.png b/OsmAnd/res/drawable-xxhdpi/ic_action_settings_light.png
new file mode 100644
index 0000000000..f92cf0ad3c
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_settings_light.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_configure_screen_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_configure_screen_dark.png
new file mode 100644
index 0000000000..b6a40f9d15
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_configure_screen_dark.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_configure_screen_light.png b/OsmAnd/res/drawable-xxhdpi/ic_configure_screen_light.png
new file mode 100644
index 0000000000..8e5253514b
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_configure_screen_light.png differ