From 3136eba7499019a9e0d8b62c33cce1aa4ff212a1 Mon Sep 17 00:00:00 2001
From: max-klaus <max.klaus@osmand.net>
Date: Fri, 15 May 2020 10:58:37 +0300
Subject: [PATCH] Change ImageView to AppCompatImageView

---
 .../add_gpx_point_bottom_sheet.xml            |  2 +-
 .../dest_reached_menu_fragment.xml            |  2 +-
 .../res/layout-land/empty_state_av_notes.xml  |  2 +-
 .../layout-land/empty_state_favourites.xml    |  2 +-
 .../empty_state_markers_active.xml            |  2 +-
 .../empty_state_markers_groups.xml            |  2 +-
 .../empty_state_markers_history.xml           |  2 +-
 .../res/layout-land/empty_state_my_tracks.xml |  2 +-
 .../res/layout-land/empty_state_osm_edits.xml |  2 +-
 .../fragment_coordinate_input_dialog.xml      |  4 ++--
 .../fragment_direction_indication_dialog.xml  |  6 +++---
 .../layout-land/fragment_measurement_tool.xml |  4 ++--
 OsmAnd/res/layout-land/map_hud_bottom.xml     |  4 ++--
 OsmAnd/res/layout-land/map_hud_top.xml        | 16 +++++++--------
 .../layout-land/move_marker_bottom_sheet.xml  |  2 +-
 .../res/layout-land/point_editor_fragment.xml |  6 +++---
 .../layout-land/recording_note_fragment.xml   |  6 +++---
 OsmAnd/res/layout-land/track_details.xml      |  8 ++++----
 .../first_usage_welcome_fragment.xml          |  4 ++--
 .../res/layout/add_gpx_point_bottom_sheet.xml |  2 +-
 .../layout/along_the_route_category_item.xml  |  2 +-
 .../res/layout/along_the_route_point_item.xml |  2 +-
 .../res/layout/ask_map_download_fragment.xml  |  2 +-
 .../res/layout/bottom_sheet_double_item.xml   |  4 ++--
 ...heet_item_in_frame_with_descr_and_icon.xml |  2 +-
 .../res/layout/bottom_sheet_item_simple.xml   |  2 +-
 .../layout/bottom_sheet_item_simple_56dp.xml  |  2 +-
 .../bottom_sheet_item_simple_right_icon.xml   |  2 +-
 .../bottom_sheet_item_with_descr_56dp.xml     |  2 +-
 ...heet_item_with_descr_and_checkbox_56dp.xml |  2 +-
 ...om_sheet_item_with_descr_and_radio_btn.xml |  2 +-
 ..._sheet_item_with_descr_and_switch_56dp.xml |  2 +-
 .../bottom_sheet_item_with_radio_btn.xml      |  2 +-
 .../bottom_sheet_item_with_right_descr.xml    |  2 +-
 .../layout/bottom_sheet_item_with_switch.xml  |  2 +-
 .../bottom_sheet_item_with_switch_56dp.xml    |  2 +-
 .../layout/button_with_icon_and_subtext.xml   |  2 +-
 OsmAnd/res/layout/card_bottom_divider.xml     |  2 +-
 OsmAnd/res/layout/card_top_divider.xml        |  2 +-
 OsmAnd/res/layout/change_fav_color.xml        |  2 +-
 .../res/layout/context_menu_action_item.xml   |  2 +-
 OsmAnd/res/layout/context_menu_card_image.xml |  4 ++--
 OsmAnd/res/layout/context_menu_top_shadow.xml |  2 +-
 .../res/layout/coordinate_input_data_area.xml | 14 ++++++-------
 .../layout/coordinate_input_keyboard_item.xml |  2 +-
 OsmAnd/res/layout/current_gpx_item.xml        |  6 +++---
 OsmAnd/res/layout/dash_error_fragment.xml     |  2 +-
 OsmAnd/res/layout/dash_gpx_track_item.xml     |  8 ++++----
 .../dash_item_with_description_72dp.xml       |  2 +-
 OsmAnd/res/layout/dash_navigation.xml         |  2 +-
 OsmAnd/res/layout/dash_parking_fragment.xml   |  2 +-
 OsmAnd/res/layout/dash_simulate_item.xml      |  2 +-
 .../res/layout/dash_storage_type_fragment.xml |  2 +-
 OsmAnd/res/layout/dashboard_toolbar.xml       | 14 ++++++-------
 .../res/layout/dest_reached_menu_fragment.xml |  2 +-
 .../layout/download_detailed_map_widget.xml   |  2 +-
 OsmAnd/res/layout/download_tiles.xml          |  2 +-
 OsmAnd/res/layout/drawer_list_radius.xml      |  2 +-
 .../layout/edit_arrangement_list_fragment.xml |  2 +-
 OsmAnd/res/layout/empty_state_av_notes.xml    |  2 +-
 OsmAnd/res/layout/empty_state_favourites.xml  |  2 +-
 .../res/layout/empty_state_markers_active.xml |  2 +-
 .../res/layout/empty_state_markers_groups.xml |  2 +-
 .../layout/empty_state_markers_history.xml    |  2 +-
 OsmAnd/res/layout/empty_state_my_tracks.xml   |  2 +-
 OsmAnd/res/layout/empty_state_osm_edits.xml   |  2 +-
 .../layout/expandable_list_item_category.xml  |  6 +++---
 OsmAnd/res/layout/favorites_list_item.xml     |  6 +++---
 OsmAnd/res/layout/favourite_list_item.xml     |  4 ++--
 .../layout/first_usage_welcome_fragment.xml   |  4 ++--
 .../fragment_data_storage_place_dialog.xml    |  8 ++++----
 .../fragment_direction_indication_dialog.xml  |  8 ++++----
 .../res/layout/fragment_edit_poi_normal.xml   | 12 +++++------
 .../res/layout/fragment_import_complete.xml   |  2 +-
 .../res/layout/fragment_mapillary_filters.xml |  4 ++--
 ...ent_marker_options_bottom_sheet_dialog.xml | 12 +++++------
 .../res/layout/fragment_measurement_tool.xml  |  6 +++---
 .../fragment_plan_route_half_screen.xml       |  2 +-
 OsmAnd/res/layout/fragment_reports.xml        | 18 ++++++++---------
 .../fragment_save_as_new_track_images_row.xml |  4 ++--
 .../res/layout/fragment_show_all_routes.xml   |  2 +-
 OsmAnd/res/layout/fragment_subcategories.xml  |  4 ++--
 OsmAnd/res/layout/fragment_terrain.xml        |  6 +++---
 .../fragment_wikivoyage_article_dialog.xml    |  2 +-
 ...ment_wikivoyage_show_images_first_time.xml |  2 +-
 OsmAnd/res/layout/go_to_map_fragment.xml      |  2 +-
 OsmAnd/res/layout/gpx_item_altitude.xml       |  8 ++++----
 OsmAnd/res/layout/gpx_item_general.xml        |  8 ++++----
 OsmAnd/res/layout/gpx_item_list_header.xml    |  8 ++++----
 OsmAnd/res/layout/gpx_item_speed.xml          |  8 ++++----
 OsmAnd/res/layout/gpx_route_card.xml          |  4 ++--
 .../res/layout/gpx_split_segment_fragment.xml | 20 +++++++++----------
 OsmAnd/res/layout/gpx_tab.xml                 |  2 +-
 OsmAnd/res/layout/gpx_track_item.xml          |  8 ++++----
 OsmAnd/res/layout/gpx_track_select_item.xml   |  8 ++++----
 OsmAnd/res/layout/grid_menu_item.xml          |  2 +-
 OsmAnd/res/layout/history_card_item.xml       |  2 +-
 OsmAnd/res/layout/home_work_card.xml          |  2 +-
 .../res/layout/layers_list_activity_item.xml  |  2 +-
 .../layout/list_item_icon_and_download.xml    |  4 ++--
 .../res/layout/list_item_icon_and_title.xml   |  2 +-
 OsmAnd/res/layout/list_item_import.xml        |  2 +-
 OsmAnd/res/layout/list_item_move_header.xml   |  4 ++--
 OsmAnd/res/layout/list_shadow_footer.xml      |  2 +-
 OsmAnd/res/layout/list_shadow_header.xml      |  2 +-
 OsmAnd/res/layout/live_updates_header.xml     |  4 ++--
 OsmAnd/res/layout/local_index_list_item.xml   |  2 +-
 .../local_index_live_updates_list_item.xml    |  2 +-
 ...main_menu_drawer_btn_configure_profile.xml |  2 +-
 .../main_menu_drawer_btn_switch_profile.xml   |  2 +-
 .../res/layout/map_context_menu_fragment.xml  | 14 ++++++-------
 OsmAnd/res/layout/map_hud_bottom.xml          |  4 ++--
 OsmAnd/res/layout/map_hud_top.xml             | 16 +++++++--------
 OsmAnd/res/layout/map_hud_widget.xml          |  4 ++--
 OsmAnd/res/layout/map_marker_item.xml         |  6 +++---
 OsmAnd/res/layout/map_marker_item_header.xml  |  2 +-
 OsmAnd/res/layout/map_marker_item_new.xml     |  4 ++--
 .../res/layout/mapillary_install_dialog.xml   |  2 +-
 OsmAnd/res/layout/mapillary_no_internet.xml   |  2 +-
 .../layout/mapillary_static_image_view.xml    |  2 +-
 .../res/layout/markers_group_view_holder.xml  |  2 +-
 OsmAnd/res/layout/menu_obj_list_item.xml      |  2 +-
 OsmAnd/res/layout/mode_view.xml               |  2 +-
 .../layout/mode_view_route_preparation.xml    |  4 ++--
 .../res/layout/move_marker_bottom_sheet.xml   |  2 +-
 OsmAnd/res/layout/note.xml                    |  2 +-
 OsmAnd/res/layout/note_list_item.xml          |  2 +-
 OsmAnd/res/layout/open_time_list_item.xml     |  2 +-
 OsmAnd/res/layout/order_poi_list_item.xml     |  6 +++---
 OsmAnd/res/layout/osm_edit_list_item.xml      |  2 +-
 .../osmlive_cancelled_dialog_fragment.xml     |  2 +-
 OsmAnd/res/layout/plan_route_gpx.xml          |  4 ++--
 OsmAnd/res/layout/plan_route_info.xml         | 20 +++++++++----------
 .../plan_route_toolbar_and_up_down_row.xml    |  2 +-
 OsmAnd/res/layout/plugin.xml                  |  6 +++---
 OsmAnd/res/layout/poi_filter_list_item.xml    |  4 ++--
 OsmAnd/res/layout/point_editor_button.xml     |  6 +++---
 OsmAnd/res/layout/point_editor_fragment.xml   |  6 +++---
 .../res/layout/point_editor_fragment_new.xml  | 10 +++++-----
 .../layout/point_editor_group_select_item.xml |  4 ++--
 OsmAnd/res/layout/preference_activity.xml     |  8 ++++----
 OsmAnd/res/layout/preference_button.xml       |  2 +-
 .../layout/preference_category_with_descr.xml |  2 +-
 OsmAnd/res/layout/preference_circle_item.xml  |  6 +++---
 .../layout/preference_dialog_and_switch.xml   |  2 +-
 .../res/layout/preference_dropdown_list.xml   |  2 +-
 OsmAnd/res/layout/preference_info.xml         |  2 +-
 OsmAnd/res/layout/preference_permission.xml   |  2 +-
 ...preference_profile_item_with_radio_btn.xml |  2 +-
 .../layout/preference_select_icon_button.xml  |  8 ++++----
 OsmAnd/res/layout/preference_switch.xml       |  2 +-
 .../layout/preference_switch_with_descr.xml   |  2 +-
 OsmAnd/res/layout/preference_with_descr.xml   |  2 +-
 ...reference_with_descr_dialog_and_switch.xml |  2 +-
 OsmAnd/res/layout/prev_route_card.xml         |  4 ++--
 OsmAnd/res/layout/profile_button_small.xml    |  2 +-
 .../layout/profile_data_list_item_child.xml   |  2 +-
 .../layout/profile_data_list_item_group.xml   |  2 +-
 OsmAnd/res/layout/profile_edit_list_item.xml  |  4 ++--
 OsmAnd/res/layout/profile_list_item.xml       |  2 +-
 .../layout/profile_preference_toolbar_big.xml |  4 ++--
 OsmAnd/res/layout/quick_action_add_bug.xml    |  6 +++---
 .../layout/quick_action_add_dialog_item.xml   |  2 +-
 .../res/layout/quick_action_add_favorite.xml  | 10 +++++-----
 OsmAnd/res/layout/quick_action_add_gpx.xml    | 10 +++++-----
 .../layout/quick_action_add_poi_layout.xml    | 10 +++++-----
 .../quick_action_create_edit_dialog.xml       |  4 ++--
 .../quick_action_deletable_list_item.xml      |  4 ++--
 OsmAnd/res/layout/quick_action_list.xml       |  2 +-
 .../res/layout/quick_action_show_hide_poi.xml |  2 +-
 .../quick_action_start_stop_navigation.xml    |  6 +++---
 .../layout/quick_action_switchable_action.xml |  6 +++---
 .../layout/quick_action_switchable_item.xml   |  6 +++---
 OsmAnd/res/layout/quick_action_widget_dot.xml |  2 +-
 .../res/layout/quick_action_widget_item.xml   |  4 ++--
 OsmAnd/res/layout/quick_action_with_text.xml  |  2 +-
 OsmAnd/res/layout/recording_note_fragment.xml |  6 +++---
 .../recording_note_fragment_fullscreen.xml    |  8 ++++----
 .../layout/restore_purchases_list_footer.xml  |  2 +-
 OsmAnd/res/layout/route_details_legend.xml    |  2 +-
 OsmAnd/res/layout/route_info_card.xml         |  2 +-
 OsmAnd/res/layout/route_info_header.xml       | 12 +++++------
 OsmAnd/res/layout/route_info_list_item.xml    |  4 ++--
 OsmAnd/res/layout/route_info_statistic.xml    |  4 ++--
 OsmAnd/res/layout/route_option_btn.xml        |  2 +-
 OsmAnd/res/layout/route_options_container.xml |  2 +-
 OsmAnd/res/layout/route_waypoint_item.xml     |  4 ++--
 .../res/layout/route_waypoints_fragment.xml   |  4 ++--
 OsmAnd/res/layout/search_advanced_coords.xml  |  8 ++++----
 OsmAnd/res/layout/search_custom_list_item.xml |  2 +-
 OsmAnd/res/layout/search_custom_poi.xml       |  6 +++---
 OsmAnd/res/layout/search_dialog_fragment.xml  |  4 ++--
 OsmAnd/res/layout/search_favs_list_item.xml   |  4 ++--
 .../res/layout/search_history_list_item.xml   |  6 +++---
 OsmAnd/res/layout/search_list_item.xml        |  8 ++++----
 OsmAnd/res/layout/search_more_list_item.xml   |  2 +-
 OsmAnd/res/layout/search_poi_filter.xml       |  2 +-
 OsmAnd/res/layout/searchpoi.xml               |  4 ++--
 OsmAnd/res/layout/searchpoi_list.xml          |  6 +++---
 OsmAnd/res/layout/searchpoifolder_list.xml    |  4 ++--
 OsmAnd/res/layout/select_voice_first.xml      |  4 ++--
 .../layout/settings_device_image_screen.xml   |  4 ++--
 OsmAnd/res/layout/split_segments_layout.xml   |  4 ++--
 OsmAnd/res/layout/subscription_fragment.xml   |  6 +++---
 OsmAnd/res/layout/switch_select_list_item.xml |  2 +-
 OsmAnd/res/layout/track_content.xml           |  2 +-
 OsmAnd/res/layout/track_details.xml           |  8 ++++----
 OsmAnd/res/layout/transport_route_card.xml    |  2 +-
 .../transport_stop_route_item_with_icon.xml   |  2 +-
 .../layout/travel_download_update_card.xml    |  4 ++--
 OsmAnd/res/layout/travel_needed_map_item.xml  |  4 ++--
 .../layout/two_line_with_images_list_item.xml |  4 ++--
 OsmAnd/res/layout/waypoint_reached.xml        |  4 ++--
 OsmAnd/res/layout/wikivoyage_article_card.xml |  2 +-
 .../layout/wikivoyage_contents_list_item.xml  |  2 +-
 OsmAnd/res/layout/wikivoyage_explore.xml      |  2 +-
 .../res/layout/wikivoyage_open_beta_card.xml  |  2 +-
 .../layout/wikivoyage_search_list_item.xml    |  2 +-
 .../layout/wikivoyage_start_editing_card.xml  |  2 +-
 .../res/layout/wikivoyage_welcome_screen.xml  |  4 ++--
 OsmAnd/res/layout/wpt_list_item.xml           |  4 ++--
 OsmAnd/res/layout/xmas_dialog.xml             |  2 +-
 222 files changed, 450 insertions(+), 450 deletions(-)

diff --git a/OsmAnd/res/layout-land/add_gpx_point_bottom_sheet.xml b/OsmAnd/res/layout-land/add_gpx_point_bottom_sheet.xml
index ce91127dc5..a6c60491b9 100644
--- a/OsmAnd/res/layout-land/add_gpx_point_bottom_sheet.xml
+++ b/OsmAnd/res/layout-land/add_gpx_point_bottom_sheet.xml
@@ -12,7 +12,7 @@
     android:visibility="gone"
     tools:visibility="visible">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout-land/dest_reached_menu_fragment.xml b/OsmAnd/res/layout-land/dest_reached_menu_fragment.xml
index bf4fcadbe5..6f9c6a71d8 100644
--- a/OsmAnd/res/layout-land/dest_reached_menu_fragment.xml
+++ b/OsmAnd/res/layout-land/dest_reached_menu_fragment.xml
@@ -31,7 +31,7 @@
                     android:layout_width="56dp"
                     android:layout_height="match_parent">
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/titleIconImageView"
                         android:layout_width="56dp"
                         android:layout_height="56dp"
diff --git a/OsmAnd/res/layout-land/empty_state_av_notes.xml b/OsmAnd/res/layout-land/empty_state_av_notes.xml
index 1ca2c39846..0898be2a2a 100644
--- a/OsmAnd/res/layout-land/empty_state_av_notes.xml
+++ b/OsmAnd/res/layout-land/empty_state_av_notes.xml
@@ -7,7 +7,7 @@
     android:layout_height="match_parent"
     android:orientation="horizontal">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/empty_state_image_view"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
diff --git a/OsmAnd/res/layout-land/empty_state_favourites.xml b/OsmAnd/res/layout-land/empty_state_favourites.xml
index 4f28f53214..ac24cbe221 100644
--- a/OsmAnd/res/layout-land/empty_state_favourites.xml
+++ b/OsmAnd/res/layout-land/empty_state_favourites.xml
@@ -7,7 +7,7 @@
               android:layout_height="match_parent"
               android:orientation="horizontal">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:layout_marginTop="@dimen/empty_state_image_margin_top"
         android:layout_marginBottom="@dimen/empty_state_image_margin_bottom"
         android:adjustViewBounds="true"
diff --git a/OsmAnd/res/layout-land/empty_state_markers_active.xml b/OsmAnd/res/layout-land/empty_state_markers_active.xml
index 6bd6230e40..ab6ae406ef 100644
--- a/OsmAnd/res/layout-land/empty_state_markers_active.xml
+++ b/OsmAnd/res/layout-land/empty_state_markers_active.xml
@@ -6,7 +6,7 @@
               android:layout_height="match_parent"
               android:orientation="horizontal">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:layout_marginTop="@dimen/empty_state_image_margin_top"
         android:layout_marginBottom="@dimen/empty_state_image_margin_bottom"
         android:adjustViewBounds="true"
diff --git a/OsmAnd/res/layout-land/empty_state_markers_groups.xml b/OsmAnd/res/layout-land/empty_state_markers_groups.xml
index d7e773cc43..e04837a93d 100644
--- a/OsmAnd/res/layout-land/empty_state_markers_groups.xml
+++ b/OsmAnd/res/layout-land/empty_state_markers_groups.xml
@@ -6,7 +6,7 @@
               android:layout_height="match_parent"
               android:orientation="horizontal">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:layout_marginTop="@dimen/empty_state_image_margin_top"
         android:layout_marginBottom="@dimen/empty_state_image_margin_bottom"
         android:adjustViewBounds="true"
diff --git a/OsmAnd/res/layout-land/empty_state_markers_history.xml b/OsmAnd/res/layout-land/empty_state_markers_history.xml
index 2c45d0d8a8..05c00e684b 100644
--- a/OsmAnd/res/layout-land/empty_state_markers_history.xml
+++ b/OsmAnd/res/layout-land/empty_state_markers_history.xml
@@ -6,7 +6,7 @@
               android:layout_height="match_parent"
               android:orientation="horizontal">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:layout_marginTop="@dimen/empty_state_image_margin_top"
         android:layout_marginBottom="@dimen/empty_state_image_margin_bottom"
         android:adjustViewBounds="true"
diff --git a/OsmAnd/res/layout-land/empty_state_my_tracks.xml b/OsmAnd/res/layout-land/empty_state_my_tracks.xml
index 15068df0a6..72ddd7e492 100644
--- a/OsmAnd/res/layout-land/empty_state_my_tracks.xml
+++ b/OsmAnd/res/layout-land/empty_state_my_tracks.xml
@@ -7,7 +7,7 @@
               android:layout_height="match_parent"
               android:orientation="horizontal">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:layout_marginTop="@dimen/empty_state_image_margin_top"
         android:layout_marginBottom="@dimen/empty_state_image_margin_bottom"
         android:adjustViewBounds="true"
diff --git a/OsmAnd/res/layout-land/empty_state_osm_edits.xml b/OsmAnd/res/layout-land/empty_state_osm_edits.xml
index cac933204f..918f761441 100644
--- a/OsmAnd/res/layout-land/empty_state_osm_edits.xml
+++ b/OsmAnd/res/layout-land/empty_state_osm_edits.xml
@@ -6,7 +6,7 @@
               android:layout_height="match_parent"
               android:orientation="horizontal">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:layout_marginTop="@dimen/empty_state_image_margin_top"
         android:layout_marginBottom="@dimen/empty_state_image_margin_bottom"
         android:adjustViewBounds="true"
diff --git a/OsmAnd/res/layout-land/fragment_coordinate_input_dialog.xml b/OsmAnd/res/layout-land/fragment_coordinate_input_dialog.xml
index 3650661ac9..3a8d430f27 100644
--- a/OsmAnd/res/layout-land/fragment_coordinate_input_dialog.xml
+++ b/OsmAnd/res/layout-land/fragment_coordinate_input_dialog.xml
@@ -86,7 +86,7 @@
             android:layout_height="match_parent"
             android:layout_weight="1">
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/left_shadow"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
@@ -102,7 +102,7 @@
             android:layout_height="match_parent"
             android:layout_weight="1">
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/right_shadow"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
diff --git a/OsmAnd/res/layout-land/fragment_direction_indication_dialog.xml b/OsmAnd/res/layout-land/fragment_direction_indication_dialog.xml
index ab5e850dd8..4ada3b137b 100644
--- a/OsmAnd/res/layout-land/fragment_direction_indication_dialog.xml
+++ b/OsmAnd/res/layout-land/fragment_direction_indication_dialog.xml
@@ -74,7 +74,7 @@
             android:background="?attr/actionModeBackground"
             android:paddingTop="@dimen/action_bar_image_top_margin_land">
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/action_bar_image"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -229,7 +229,7 @@
                         android:paddingRight="@dimen/content_padding_small"
                         android:paddingStart="@dimen/content_padding">
 
-                        <ImageView
+                        <androidx.appcompat.widget.AppCompatImageView
                             android:id="@+id/top_bar_icon"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -269,7 +269,7 @@
                         android:paddingRight="@dimen/content_padding_small"
                         android:paddingStart="@dimen/content_padding">
 
-                        <ImageView
+                        <androidx.appcompat.widget.AppCompatImageView
                             android:id="@+id/widget_icon"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout-land/fragment_measurement_tool.xml b/OsmAnd/res/layout-land/fragment_measurement_tool.xml
index 4168c6ff7f..de02d4e67c 100644
--- a/OsmAnd/res/layout-land/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout-land/fragment_measurement_tool.xml
@@ -37,7 +37,7 @@
                 android:layout_weight="0.45"
                 android:background="?attr/selectableItemBackground">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/main_icon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -51,7 +51,7 @@
                     android:background="@null"
                     tools:src="@drawable/ic_action_ruler"/>
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/up_down_button"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout-land/map_hud_bottom.xml b/OsmAnd/res/layout-land/map_hud_bottom.xml
index 13e9699a17..e2c6d8556f 100644
--- a/OsmAnd/res/layout-land/map_hud_bottom.xml
+++ b/OsmAnd/res/layout-land/map_hud_bottom.xml
@@ -29,7 +29,7 @@
                 android:layout_marginLeft="@dimen/map_button_shadow_margin"
                 android:layout_marginStart="@dimen/map_button_shadow_margin">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/map_alarm_warning_icon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -165,7 +165,7 @@
                         tools:text="100 m"/>
                 </FrameLayout>
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/map_ruler_image"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout-land/map_hud_top.xml b/OsmAnd/res/layout-land/map_hud_top.xml
index 0002ab8498..bf63d6862c 100644
--- a/OsmAnd/res/layout-land/map_hud_top.xml
+++ b/OsmAnd/res/layout-land/map_hud_top.xml
@@ -36,7 +36,7 @@
 	            android:layout_marginStart="@dimen/content_padding_half"
 	            android:layout_marginEnd="@dimen/content_padding_half">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/lat_icon"
                     android:layout_width="@dimen/standard_icon_size"
                     android:layout_height="@dimen/standard_icon_size"
@@ -79,7 +79,7 @@
 	            android:layout_marginStart="@dimen/content_padding_half"
 	            android:layout_marginEnd="@dimen/content_padding_half">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/lon_icon"
                     android:layout_width="@dimen/standard_icon_size"
                     android:layout_height="@dimen/standard_icon_size"
@@ -142,7 +142,7 @@
                             android:gravity="center_vertical"
                             android:orientation="horizontal">
 
-                            <ImageView
+                            <androidx.appcompat.widget.AppCompatImageView
                                 android:id="@+id/map_marker_arrow"
                                 android:layout_width="60dp"
                                 android:layout_height="24dp"
@@ -219,7 +219,7 @@
                             android:gravity="center_vertical"
                             android:orientation="horizontal">
 
-                            <ImageView
+                            <androidx.appcompat.widget.AppCompatImageView
                                 android:id="@+id/map_marker_arrow_2nd"
                                 android:layout_width="60dp"
                                 android:layout_height="24dp"
@@ -363,14 +363,14 @@
                     tools:text="8"
                     tools:visibility="visible" />
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/map_turn_icon"
                     android:layout_width="@dimen/map_widget_height"
                     android:layout_height="@dimen/map_widget_height"
                     android:scaleType="fitCenter"
                     tools:src="@drawable/map_turn_right_small" />
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/map_shield_icon"
                     android:layout_width="60dp"
                     android:layout_height="match_parent"
@@ -416,7 +416,7 @@
                     android:layout_height="wrap_content"
                     android:orientation="horizontal">
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/waypoint_icon"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -719,7 +719,7 @@
                 android:orientation="vertical"
                 android:visibility="gone">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/map_lanes"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout-land/move_marker_bottom_sheet.xml b/OsmAnd/res/layout-land/move_marker_bottom_sheet.xml
index 371e6d85bf..b18b98d707 100644
--- a/OsmAnd/res/layout-land/move_marker_bottom_sheet.xml
+++ b/OsmAnd/res/layout-land/move_marker_bottom_sheet.xml
@@ -12,7 +12,7 @@
     android:visibility="gone"
     tools:visibility="visible">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout-land/point_editor_fragment.xml b/OsmAnd/res/layout-land/point_editor_fragment.xml
index 82dc51228b..ab35bb6bc6 100644
--- a/OsmAnd/res/layout-land/point_editor_fragment.xml
+++ b/OsmAnd/res/layout-land/point_editor_fragment.xml
@@ -60,7 +60,7 @@
                             android:layout_height="match_parent"
                             android:orientation="horizontal">
 
-                            <ImageView
+                            <androidx.appcompat.widget.AppCompatImageView
                                 android:id="@+id/name_image"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
@@ -122,7 +122,7 @@
                             android:layout_height="match_parent"
                             android:orientation="horizontal">
 
-                            <ImageView
+                            <androidx.appcompat.widget.AppCompatImageView
                                 android:id="@+id/category_image"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
@@ -188,7 +188,7 @@
                             android:layout_height="match_parent"
                             android:orientation="horizontal">
 
-                            <ImageView
+                            <androidx.appcompat.widget.AppCompatImageView
                                 android:id="@+id/description_image"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout-land/recording_note_fragment.xml b/OsmAnd/res/layout-land/recording_note_fragment.xml
index e31f30068f..0e34af0ce8 100644
--- a/OsmAnd/res/layout-land/recording_note_fragment.xml
+++ b/OsmAnd/res/layout-land/recording_note_fragment.xml
@@ -47,7 +47,7 @@
                     android:gravity="start|center_vertical"
 	                android:layout_marginStart="12dp">
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/leftButtonIcon"
                         android:layout_width="24dp"
                         android:layout_height="24dp"
@@ -85,7 +85,7 @@
                     android:layout_gravity="center_vertical"
                     android:gravity="center">
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/centerButtonIcon"
                         android:layout_width="24dp"
                         android:layout_height="24dp"
@@ -125,7 +125,7 @@
                     android:layout_gravity="center_vertical"
                     android:gravity="center">
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/rightButtonIcon"
                         android:layout_width="24dp"
                         android:layout_height="24dp"
diff --git a/OsmAnd/res/layout-land/track_details.xml b/OsmAnd/res/layout-land/track_details.xml
index ff8e6a48a2..5f10c6bcb8 100644
--- a/OsmAnd/res/layout-land/track_details.xml
+++ b/OsmAnd/res/layout-land/track_details.xml
@@ -109,7 +109,7 @@
                         android:background="?attr/selectableItemBackground"
                         android:gravity="center_vertical">
 
-                        <ImageView
+                        <androidx.appcompat.widget.AppCompatImageView
                             android:id="@+id/y_axis_icon"
                             android:layout_width="@dimen/standard_icon_size"
                             android:layout_height="wrap_content"
@@ -130,7 +130,7 @@
                             tools:text="@string/altitude"
 	                        android:layout_marginEnd="8dp" />
 
-                        <ImageView
+                        <androidx.appcompat.widget.AppCompatImageView
                             android:id="@+id/y_axis_arrow"
                             android:layout_width="wrap_content"
                             android:layout_height="match_parent"
@@ -157,7 +157,7 @@
                             android:background="?attr/dashboard_divider"
                             android:focusable="false"/>
 
-                        <ImageView
+                        <androidx.appcompat.widget.AppCompatImageView
                             android:id="@+id/x_axis_icon"
                             android:layout_width="@dimen/standard_icon_size"
                             android:layout_height="wrap_content"
@@ -178,7 +178,7 @@
                             tools:text="@string/map_widget_speed"
 	                        android:layout_marginEnd="8dp" />
 
-                        <ImageView
+                        <androidx.appcompat.widget.AppCompatImageView
                             android:id="@+id/x_axis_arrow"
                             android:layout_width="wrap_content"
                             android:layout_height="match_parent"
diff --git a/OsmAnd/res/layout-xlarge/first_usage_welcome_fragment.xml b/OsmAnd/res/layout-xlarge/first_usage_welcome_fragment.xml
index 26dbb00b99..9b17b520dd 100644
--- a/OsmAnd/res/layout-xlarge/first_usage_welcome_fragment.xml
+++ b/OsmAnd/res/layout-xlarge/first_usage_welcome_fragment.xml
@@ -7,7 +7,7 @@
     android:clickable="true"
     android:theme="@style/OsmandLightTheme">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/background_image"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -28,7 +28,7 @@
 	    android:paddingStart="40dp"
 	    android:paddingEnd="40dp">
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
diff --git a/OsmAnd/res/layout/add_gpx_point_bottom_sheet.xml b/OsmAnd/res/layout/add_gpx_point_bottom_sheet.xml
index 1b995263b4..1325fab41c 100644
--- a/OsmAnd/res/layout/add_gpx_point_bottom_sheet.xml
+++ b/OsmAnd/res/layout/add_gpx_point_bottom_sheet.xml
@@ -12,7 +12,7 @@
     android:visibility="gone"
     tools:visibility="visible">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/along_the_route_category_item.xml b/OsmAnd/res/layout/along_the_route_category_item.xml
index f98bc9369e..9c8a35808f 100644
--- a/OsmAnd/res/layout/along_the_route_category_item.xml
+++ b/OsmAnd/res/layout/along_the_route_category_item.xml
@@ -13,7 +13,7 @@
 		android:layout_height="@dimen/bottom_sheet_selected_item_title_height"
 		android:background="?attr/selectableItemBackground">
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/icon"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/along_the_route_point_item.xml b/OsmAnd/res/layout/along_the_route_point_item.xml
index bfb10baa66..c19f970704 100644
--- a/OsmAnd/res/layout/along_the_route_point_item.xml
+++ b/OsmAnd/res/layout/along_the_route_point_item.xml
@@ -15,7 +15,7 @@
 		android:descendantFocusability="blocksDescendants"
 		android:orientation="horizontal">
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/waypoint_icon"
 			android:layout_width="@dimen/standard_icon_size"
 			android:layout_height="@dimen/standard_icon_size"
diff --git a/OsmAnd/res/layout/ask_map_download_fragment.xml b/OsmAnd/res/layout/ask_map_download_fragment.xml
index 4d89639549..24ffc921f6 100644
--- a/OsmAnd/res/layout/ask_map_download_fragment.xml
+++ b/OsmAnd/res/layout/ask_map_download_fragment.xml
@@ -23,7 +23,7 @@
                 android:layout_width="@dimen/context_menu_action_buttons_height"
                 android:layout_height="match_parent">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/titleIconImageView"
                     android:layout_width="@dimen/context_menu_action_buttons_height"
                     android:layout_height="@dimen/context_menu_action_buttons_height"
diff --git a/OsmAnd/res/layout/bottom_sheet_double_item.xml b/OsmAnd/res/layout/bottom_sheet_double_item.xml
index 6fc30d0a85..b2da4b4783 100644
--- a/OsmAnd/res/layout/bottom_sheet_double_item.xml
+++ b/OsmAnd/res/layout/bottom_sheet_double_item.xml
@@ -20,7 +20,7 @@
 			android:background="?attr/selectableItemBackground"
 			android:orientation="horizontal">
 
-			<ImageView
+			<androidx.appcompat.widget.AppCompatImageView
 				android:id="@+id/first_icon"
 				android:layout_width="@dimen/standard_icon_size"
 				android:layout_height="@dimen/standard_icon_size"
@@ -72,7 +72,7 @@
 			android:background="?attr/selectableItemBackground"
 			android:orientation="horizontal">
 
-			<ImageView
+			<androidx.appcompat.widget.AppCompatImageView
 				android:id="@+id/second_icon"
 				android:layout_width="@dimen/standard_icon_size"
 				android:layout_height="@dimen/standard_icon_size"
diff --git a/OsmAnd/res/layout/bottom_sheet_item_in_frame_with_descr_and_icon.xml b/OsmAnd/res/layout/bottom_sheet_item_in_frame_with_descr_and_icon.xml
index 6e64f26691..42c06209c8 100644
--- a/OsmAnd/res/layout/bottom_sheet_item_in_frame_with_descr_and_icon.xml
+++ b/OsmAnd/res/layout/bottom_sheet_item_in_frame_with_descr_and_icon.xml
@@ -8,7 +8,7 @@
 	android:paddingEnd="@dimen/content_padding"
 	android:paddingRight="@dimen/content_padding">
 
-	<ImageView
+	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/icon"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/bottom_sheet_item_simple.xml b/OsmAnd/res/layout/bottom_sheet_item_simple.xml
index 152ab223db..25d8dd3c3e 100644
--- a/OsmAnd/res/layout/bottom_sheet_item_simple.xml
+++ b/OsmAnd/res/layout/bottom_sheet_item_simple.xml
@@ -14,7 +14,7 @@
 	android:paddingStart="@dimen/content_padding"
 	android:paddingEnd="@dimen/content_padding">
 
-	<ImageView
+	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/icon"
 		android:layout_width="@dimen/standard_icon_size"
 		android:layout_height="@dimen/standard_icon_size"
diff --git a/OsmAnd/res/layout/bottom_sheet_item_simple_56dp.xml b/OsmAnd/res/layout/bottom_sheet_item_simple_56dp.xml
index 695e835dd5..a55da452a9 100644
--- a/OsmAnd/res/layout/bottom_sheet_item_simple_56dp.xml
+++ b/OsmAnd/res/layout/bottom_sheet_item_simple_56dp.xml
@@ -14,7 +14,7 @@
 	android:paddingStart="@dimen/content_padding"
 	android:paddingEnd="@dimen/content_padding">
 
-	<ImageView
+	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/icon"
 		android:layout_width="@dimen/standard_icon_size"
 		android:layout_height="@dimen/standard_icon_size"
diff --git a/OsmAnd/res/layout/bottom_sheet_item_simple_right_icon.xml b/OsmAnd/res/layout/bottom_sheet_item_simple_right_icon.xml
index 81ddc0a086..2328972024 100644
--- a/OsmAnd/res/layout/bottom_sheet_item_simple_right_icon.xml
+++ b/OsmAnd/res/layout/bottom_sheet_item_simple_right_icon.xml
@@ -26,7 +26,7 @@
 		app:typeface="@string/font_roboto_medium"
 		tools:text="Title" />
 
-	<ImageView
+	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/icon"
 		android:layout_width="@dimen/standard_icon_size"
 		android:layout_height="@dimen/standard_icon_size"
diff --git a/OsmAnd/res/layout/bottom_sheet_item_with_descr_56dp.xml b/OsmAnd/res/layout/bottom_sheet_item_with_descr_56dp.xml
index b629029711..adb62373fa 100644
--- a/OsmAnd/res/layout/bottom_sheet_item_with_descr_56dp.xml
+++ b/OsmAnd/res/layout/bottom_sheet_item_with_descr_56dp.xml
@@ -11,7 +11,7 @@
 	android:paddingEnd="@dimen/content_padding"
 	android:paddingStart="@dimen/content_padding">
 
-	<ImageView
+	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/icon"
 		android:layout_width="@dimen/standard_icon_size"
 		android:layout_height="@dimen/standard_icon_size"
diff --git a/OsmAnd/res/layout/bottom_sheet_item_with_descr_and_checkbox_56dp.xml b/OsmAnd/res/layout/bottom_sheet_item_with_descr_and_checkbox_56dp.xml
index ca466192a4..ae1255e374 100644
--- a/OsmAnd/res/layout/bottom_sheet_item_with_descr_and_checkbox_56dp.xml
+++ b/OsmAnd/res/layout/bottom_sheet_item_with_descr_and_checkbox_56dp.xml
@@ -12,7 +12,7 @@
 	android:paddingEnd="@dimen/content_padding"
 	android:paddingStart="@dimen/content_padding">
 
-	<ImageView
+	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/icon"
 		android:layout_width="@dimen/standard_icon_size"
 		android:layout_height="@dimen/standard_icon_size"
diff --git a/OsmAnd/res/layout/bottom_sheet_item_with_descr_and_radio_btn.xml b/OsmAnd/res/layout/bottom_sheet_item_with_descr_and_radio_btn.xml
index af1386b6d9..4bace93e9f 100644
--- a/OsmAnd/res/layout/bottom_sheet_item_with_descr_and_radio_btn.xml
+++ b/OsmAnd/res/layout/bottom_sheet_item_with_descr_and_radio_btn.xml
@@ -17,7 +17,7 @@
 		android:paddingEnd="@dimen/list_content_padding"
 		android:paddingRight="@dimen/list_content_padding">
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/icon"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/bottom_sheet_item_with_descr_and_switch_56dp.xml b/OsmAnd/res/layout/bottom_sheet_item_with_descr_and_switch_56dp.xml
index e7cc1e83b3..7f54956e23 100644
--- a/OsmAnd/res/layout/bottom_sheet_item_with_descr_and_switch_56dp.xml
+++ b/OsmAnd/res/layout/bottom_sheet_item_with_descr_and_switch_56dp.xml
@@ -12,7 +12,7 @@
 	android:paddingStart="@dimen/content_padding"
 	android:paddingEnd="@dimen/content_padding">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/icon"
         android:layout_width="@dimen/standard_icon_size"
         android:layout_height="@dimen/standard_icon_size"
diff --git a/OsmAnd/res/layout/bottom_sheet_item_with_radio_btn.xml b/OsmAnd/res/layout/bottom_sheet_item_with_radio_btn.xml
index 0ea2b6c8de..941803fb78 100644
--- a/OsmAnd/res/layout/bottom_sheet_item_with_radio_btn.xml
+++ b/OsmAnd/res/layout/bottom_sheet_item_with_radio_btn.xml
@@ -12,7 +12,7 @@
 	android:paddingRight="@dimen/content_padding_small"
 	android:paddingStart="@dimen/content_padding">
 
-	<ImageView
+	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/icon"
 		android:layout_width="@dimen/standard_icon_size"
 		android:layout_height="@dimen/standard_icon_size"
diff --git a/OsmAnd/res/layout/bottom_sheet_item_with_right_descr.xml b/OsmAnd/res/layout/bottom_sheet_item_with_right_descr.xml
index 8e8bd042b7..143aa808c1 100644
--- a/OsmAnd/res/layout/bottom_sheet_item_with_right_descr.xml
+++ b/OsmAnd/res/layout/bottom_sheet_item_with_right_descr.xml
@@ -12,7 +12,7 @@
 	android:paddingEnd="@dimen/content_padding"
 	android:paddingStart="@dimen/content_padding">
 
-	<ImageView
+	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/icon"
 		android:layout_width="@dimen/standard_icon_size"
 		android:layout_height="@dimen/standard_icon_size"
diff --git a/OsmAnd/res/layout/bottom_sheet_item_with_switch.xml b/OsmAnd/res/layout/bottom_sheet_item_with_switch.xml
index 76b358c674..675c82e9a4 100644
--- a/OsmAnd/res/layout/bottom_sheet_item_with_switch.xml
+++ b/OsmAnd/res/layout/bottom_sheet_item_with_switch.xml
@@ -12,7 +12,7 @@
 	android:paddingStart="@dimen/content_padding"
 	android:paddingEnd="@dimen/content_padding">
 
-	<ImageView
+	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/icon"
 		android:layout_width="@dimen/standard_icon_size"
 		android:layout_height="@dimen/standard_icon_size"
diff --git a/OsmAnd/res/layout/bottom_sheet_item_with_switch_56dp.xml b/OsmAnd/res/layout/bottom_sheet_item_with_switch_56dp.xml
index 9382b26d9a..e94a8e0222 100644
--- a/OsmAnd/res/layout/bottom_sheet_item_with_switch_56dp.xml
+++ b/OsmAnd/res/layout/bottom_sheet_item_with_switch_56dp.xml
@@ -11,7 +11,7 @@
 	android:paddingStart="@dimen/content_padding"
 	android:paddingEnd="@dimen/content_padding">
 
-	<ImageView
+	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/icon"
 		android:layout_width="@dimen/standard_icon_size"
 		android:layout_height="@dimen/standard_icon_size"
diff --git a/OsmAnd/res/layout/button_with_icon_and_subtext.xml b/OsmAnd/res/layout/button_with_icon_and_subtext.xml
index f9de1da49a..db9264af15 100644
--- a/OsmAnd/res/layout/button_with_icon_and_subtext.xml
+++ b/OsmAnd/res/layout/button_with_icon_and_subtext.xml
@@ -14,7 +14,7 @@
 		android:gravity="center_vertical"
 		android:orientation="horizontal">
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/icon"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/card_bottom_divider.xml b/OsmAnd/res/layout/card_bottom_divider.xml
index ff9ffe9ff9..2be82d10dd 100644
--- a/OsmAnd/res/layout/card_bottom_divider.xml
+++ b/OsmAnd/res/layout/card_bottom_divider.xml
@@ -5,7 +5,7 @@
               android:orientation="vertical"
               android:layout_width="match_parent"
               android:layout_height="wrap_content">
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:scaleType="fitXY"
diff --git a/OsmAnd/res/layout/card_top_divider.xml b/OsmAnd/res/layout/card_top_divider.xml
index 3392af74fa..5a94e9ccbb 100644
--- a/OsmAnd/res/layout/card_top_divider.xml
+++ b/OsmAnd/res/layout/card_top_divider.xml
@@ -9,7 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="6dp"/>
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:scaleType="fitXY"
diff --git a/OsmAnd/res/layout/change_fav_color.xml b/OsmAnd/res/layout/change_fav_color.xml
index 5eb64adde7..63140e901f 100644
--- a/OsmAnd/res/layout/change_fav_color.xml
+++ b/OsmAnd/res/layout/change_fav_color.xml
@@ -13,7 +13,7 @@
 	android:paddingStart="@dimen/list_content_padding"
 	android:paddingEnd="@dimen/list_content_padding">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/change_color_icon"
         android:layout_width="@dimen/standard_icon_size"
         android:layout_height="@dimen/standard_icon_size"
diff --git a/OsmAnd/res/layout/context_menu_action_item.xml b/OsmAnd/res/layout/context_menu_action_item.xml
index 6eb801d41a..95acd0b064 100644
--- a/OsmAnd/res/layout/context_menu_action_item.xml
+++ b/OsmAnd/res/layout/context_menu_action_item.xml
@@ -10,7 +10,7 @@
 	android:paddingTop="@dimen/context_menu_main_actions_padding_top"
 	android:paddingBottom="@dimen/context_menu_main_actions_padding_bottom">
 
-	<ImageView
+	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/icon"
 		android:layout_width="@dimen/standard_icon_size"
 		android:layout_height="@dimen/standard_icon_size"
diff --git a/OsmAnd/res/layout/context_menu_card_image.xml b/OsmAnd/res/layout/context_menu_card_image.xml
index 0245d86c46..465744ebb0 100644
--- a/OsmAnd/res/layout/context_menu_card_image.xml
+++ b/OsmAnd/res/layout/context_menu_card_image.xml
@@ -12,7 +12,7 @@
         android:layout_height="match_parent"
         android:background="?attr/selectableItemBackground">
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/image"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -31,7 +31,7 @@
             tools:text="https://osmand.net/images/123456789012.jpg"
             tools:visibility="visible"/>
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/context_menu_top_shadow.xml b/OsmAnd/res/layout/context_menu_top_shadow.xml
index b0879cb66a..f01b7547d1 100644
--- a/OsmAnd/res/layout/context_menu_top_shadow.xml
+++ b/OsmAnd/res/layout/context_menu_top_shadow.xml
@@ -6,7 +6,7 @@
 	android:layout_height="@dimen/contex_menu_top_shadow_height"
 	android:orientation="vertical">
 
-	<ImageView
+	<androidx.appcompat.widget.AppCompatImageView
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_gravity="bottom"
diff --git a/OsmAnd/res/layout/coordinate_input_data_area.xml b/OsmAnd/res/layout/coordinate_input_data_area.xml
index b5fbca3c83..880863fbf7 100644
--- a/OsmAnd/res/layout/coordinate_input_data_area.xml
+++ b/OsmAnd/res/layout/coordinate_input_data_area.xml
@@ -33,7 +33,7 @@
 			android:layout_marginEnd="@dimen/content_padding"
 			android:layout_marginStart="@dimen/content_padding">
 
-			<ImageView
+			<androidx.appcompat.widget.AppCompatImageView
 				android:id="@+id/south_side_iv"
 				android:layout_width="24dp"
 				android:layout_height="24dp"
@@ -54,7 +54,7 @@
 				tools:text="N"
 				tools:textColor="@color/active_color_primary_light"/>
 
-			<ImageView
+			<androidx.appcompat.widget.AppCompatImageView
 				android:id="@+id/north_side_iv"
 				android:layout_width="24dp"
 				android:layout_height="24dp"
@@ -143,7 +143,7 @@
 
 		</LinearLayout>
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/lat_backspace_btn"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
@@ -182,7 +182,7 @@
 			android:layout_marginEnd="@dimen/content_padding"
 			android:layout_marginStart="@dimen/content_padding">
 
-			<ImageView
+			<androidx.appcompat.widget.AppCompatImageView
 				android:id="@+id/east_side_iv"
 				android:layout_width="24dp"
 				android:layout_height="24dp"
@@ -204,7 +204,7 @@
 				tools:text="W"
 				tools:textColor="@color/active_color_primary_light"/>
 
-			<ImageView
+			<androidx.appcompat.widget.AppCompatImageView
 				android:id="@+id/west_side_iv"
 				android:layout_width="24dp"
 				android:layout_height="24dp"
@@ -294,7 +294,7 @@
 
 		</LinearLayout>
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/lon_backspace_btn"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
@@ -349,7 +349,7 @@
 			android:inputType="text"
 			android:textSize="@dimen/default_list_text_size"/>
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/point_name_keyboard_btn"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/coordinate_input_keyboard_item.xml b/OsmAnd/res/layout/coordinate_input_keyboard_item.xml
index bc8fbc460a..f076e6da11 100644
--- a/OsmAnd/res/layout/coordinate_input_keyboard_item.xml
+++ b/OsmAnd/res/layout/coordinate_input_keyboard_item.xml
@@ -28,7 +28,7 @@
         android:layout_height="0dp"
         android:layout_weight="0.25"/>
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/keyboard_item_image"
         android:layout_width="match_parent"
         android:layout_height="0dp"
diff --git a/OsmAnd/res/layout/current_gpx_item.xml b/OsmAnd/res/layout/current_gpx_item.xml
index 841120bf53..499ae77b85 100644
--- a/OsmAnd/res/layout/current_gpx_item.xml
+++ b/OsmAnd/res/layout/current_gpx_item.xml
@@ -31,7 +31,7 @@
                 android:visibility="gone"
 	            android:layout_marginStart="@dimen/list_content_padding" />
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/icon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -93,7 +93,7 @@
                     android:visibility="visible"
                     android:gravity="center_vertical">
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/distance_icon"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -110,7 +110,7 @@
                         android:textSize="@dimen/default_sub_text_size"
 	                    android:layout_marginEnd="@dimen/gpx_small_text_margin" />
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/points_icon"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/dash_error_fragment.xml b/OsmAnd/res/layout/dash_error_fragment.xml
index d36eebe377..6ed0d4626c 100644
--- a/OsmAnd/res/layout/dash_error_fragment.xml
+++ b/OsmAnd/res/layout/dash_error_fragment.xml
@@ -21,7 +21,7 @@
 		android:layout_marginTop="10dp"
 		android:orientation="horizontal">
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_gravity="center"
diff --git a/OsmAnd/res/layout/dash_gpx_track_item.xml b/OsmAnd/res/layout/dash_gpx_track_item.xml
index 83ba2f23c6..ab368868fb 100644
--- a/OsmAnd/res/layout/dash_gpx_track_item.xml
+++ b/OsmAnd/res/layout/dash_gpx_track_item.xml
@@ -38,7 +38,7 @@
 			android:visibility="gone"
 			android:layout_marginStart="@dimen/list_content_padding" />
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/icon"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
@@ -76,7 +76,7 @@
 				android:visibility="visible"
                 android:gravity="center_vertical">
 
-				<ImageView
+				<androidx.appcompat.widget.AppCompatImageView
 					android:id="@+id/distance_icon"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
@@ -94,7 +94,7 @@
 					android:textSize="@dimen/default_sub_text_size"
 					android:layout_marginEnd="@dimen/gpx_small_text_margin" />
 
-				<ImageView
+				<androidx.appcompat.widget.AppCompatImageView
 					android:id="@+id/points_icon"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
@@ -112,7 +112,7 @@
 					android:textSize="@dimen/default_sub_text_size"
 					android:layout_marginEnd="@dimen/gpx_small_text_margin" />
 
-				<ImageView
+				<androidx.appcompat.widget.AppCompatImageView
 					android:id="@+id/time_icon"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/dash_item_with_description_72dp.xml b/OsmAnd/res/layout/dash_item_with_description_72dp.xml
index cf4bdf9f36..7596948d65 100644
--- a/OsmAnd/res/layout/dash_item_with_description_72dp.xml
+++ b/OsmAnd/res/layout/dash_item_with_description_72dp.xml
@@ -14,7 +14,7 @@
         android:minHeight="@dimen/setting_list_item_large_height"
         android:orientation="horizontal">
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/icon"
             android:layout_width="@dimen/standard_icon_size"
             android:layout_height="@dimen/standard_icon_size"
diff --git a/OsmAnd/res/layout/dash_navigation.xml b/OsmAnd/res/layout/dash_navigation.xml
index 3762a8bbc5..6807233b7b 100644
--- a/OsmAnd/res/layout/dash_navigation.xml
+++ b/OsmAnd/res/layout/dash_navigation.xml
@@ -20,7 +20,7 @@
         android:layout_height="wrap_content"
         android:minHeight="@dimen/list_item_height">
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/icon"
             android:layout_width="@dimen/list_item_height"
             android:layout_height="@dimen/list_item_height"
diff --git a/OsmAnd/res/layout/dash_parking_fragment.xml b/OsmAnd/res/layout/dash_parking_fragment.xml
index 71ee96dd92..a4b07bff09 100644
--- a/OsmAnd/res/layout/dash_parking_fragment.xml
+++ b/OsmAnd/res/layout/dash_parking_fragment.xml
@@ -20,7 +20,7 @@
 		android:background="?attr/dash_parking_bg"
 		android:orientation="horizontal">
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/direction_icon"
 			android:layout_width="@dimen/dashboard_parking_icon_size"
 			android:layout_height="@dimen/dashboard_parking_icon_size"
diff --git a/OsmAnd/res/layout/dash_simulate_item.xml b/OsmAnd/res/layout/dash_simulate_item.xml
index cc4a0759dd..5c9ff3ebe3 100644
--- a/OsmAnd/res/layout/dash_simulate_item.xml
+++ b/OsmAnd/res/layout/dash_simulate_item.xml
@@ -29,7 +29,7 @@
             android:visibility="gone"
 	        android:layout_marginStart="@dimen/local_index_check_right_margin" />
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/dash_storage_type_fragment.xml b/OsmAnd/res/layout/dash_storage_type_fragment.xml
index 6e55a07031..bcbb559e1b 100644
--- a/OsmAnd/res/layout/dash_storage_type_fragment.xml
+++ b/OsmAnd/res/layout/dash_storage_type_fragment.xml
@@ -61,7 +61,7 @@
                     tools:text="Location path  \u2022 300 MB"/>
             </LinearLayout>
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/edit_icon"
                 android:contentDescription="@string/shared_string_edit"
                 android:layout_width="@dimen/list_item_height"
diff --git a/OsmAnd/res/layout/dashboard_toolbar.xml b/OsmAnd/res/layout/dashboard_toolbar.xml
index 36bab84985..24cff7957f 100644
--- a/OsmAnd/res/layout/dashboard_toolbar.xml
+++ b/OsmAnd/res/layout/dashboard_toolbar.xml
@@ -25,7 +25,7 @@
             android:gravity="start"
             android:orientation="horizontal">
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/toolbar_back"
                 android:contentDescription="@string/back_to_map"
                 android:layout_marginLeft="@dimen/multi_selection_menu_padding_top"
@@ -37,7 +37,7 @@
                 app:srcCompat="@drawable/ic_arrow_back"
                 tools:visibility="visible"/>
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/toolbar_list"
                 android:contentDescription="@string/backToMenu"
                 android:layout_marginLeft="@dimen/multi_selection_menu_padding_top"
@@ -67,7 +67,7 @@
             android:gravity="end"
             android:orientation="horizontal">
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/toolbar_settings"
                 android:contentDescription="@string/shared_string_settings"
                 android:layout_marginLeft="@dimen/multi_selection_menu_padding_top"
@@ -79,7 +79,7 @@
                 android:scaleType="fitCenter"
                 app:srcCompat="@drawable/ic_configure_screen_dark"/>
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/toolbar_ok"
                 android:contentDescription="@string/shared_string_ok"
                 android:layout_marginLeft="@dimen/multi_selection_menu_padding_top"
@@ -90,7 +90,7 @@
                 android:scaleType="fitCenter"
                 app:srcCompat="@drawable/ic_action_done"/>
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/toolbar_sort"
                 android:contentDescription="@string/intermediate_points_change_order"
                 android:layout_marginLeft="@dimen/multi_selection_menu_padding_top"
@@ -101,7 +101,7 @@
                 android:scaleType="fitCenter"
                 app:srcCompat="@drawable/ic_sort_waypoint_dark"/>
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/toolbar_flat"
                 android:contentDescription="@string/drawer"
                 android:layout_marginLeft="@dimen/multi_selection_menu_padding_top"
@@ -113,7 +113,7 @@
                 app:srcCompat="@drawable/ic_flat_list_dark"
                 android:visibility="gone"/>
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/toolbar_edit"
                 android:contentDescription="@string/shared_string_edit"
                 android:layout_marginLeft="@dimen/multi_selection_menu_padding_top"
diff --git a/OsmAnd/res/layout/dest_reached_menu_fragment.xml b/OsmAnd/res/layout/dest_reached_menu_fragment.xml
index b6e23e0d3f..09bd0681ca 100644
--- a/OsmAnd/res/layout/dest_reached_menu_fragment.xml
+++ b/OsmAnd/res/layout/dest_reached_menu_fragment.xml
@@ -31,7 +31,7 @@
                     android:layout_width="56dp"
                     android:layout_height="match_parent">
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/titleIconImageView"
                         android:layout_width="56dp"
                         android:layout_height="56dp"
diff --git a/OsmAnd/res/layout/download_detailed_map_widget.xml b/OsmAnd/res/layout/download_detailed_map_widget.xml
index 339d378193..ab2d9354db 100644
--- a/OsmAnd/res/layout/download_detailed_map_widget.xml
+++ b/OsmAnd/res/layout/download_detailed_map_widget.xml
@@ -51,7 +51,7 @@
 
 			</LinearLayout>
 
-			<ImageView
+			<androidx.appcompat.widget.AppCompatImageView
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_marginLeft="@dimen/card_content_padding_large"
diff --git a/OsmAnd/res/layout/download_tiles.xml b/OsmAnd/res/layout/download_tiles.xml
index b466cf6254..371f92e6e8 100644
--- a/OsmAnd/res/layout/download_tiles.xml
+++ b/OsmAnd/res/layout/download_tiles.xml
@@ -72,7 +72,7 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content" />
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:layout_marginLeft="10dp"
diff --git a/OsmAnd/res/layout/drawer_list_radius.xml b/OsmAnd/res/layout/drawer_list_radius.xml
index d816ccbe32..9a8151e04c 100644
--- a/OsmAnd/res/layout/drawer_list_radius.xml
+++ b/OsmAnd/res/layout/drawer_list_radius.xml
@@ -8,7 +8,7 @@
     android:minHeight="48dp"
     android:layout_marginBottom="5dp">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/waypoint_icon"
         android:layout_marginLeft="8dp"
         android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/edit_arrangement_list_fragment.xml b/OsmAnd/res/layout/edit_arrangement_list_fragment.xml
index ee9654d322..f0003875a2 100644
--- a/OsmAnd/res/layout/edit_arrangement_list_fragment.xml
+++ b/OsmAnd/res/layout/edit_arrangement_list_fragment.xml
@@ -29,7 +29,7 @@
 			android:layout_gravity="bottom"
 			android:orientation="vertical">
 
-			<ImageView
+			<androidx.appcompat.widget.AppCompatImageView
 				android:id="@+id/buttons_shadow"
 				android:layout_width="match_parent"
 				android:layout_height="10dp"
diff --git a/OsmAnd/res/layout/empty_state_av_notes.xml b/OsmAnd/res/layout/empty_state_av_notes.xml
index b7d0f2124a..608c022930 100644
--- a/OsmAnd/res/layout/empty_state_av_notes.xml
+++ b/OsmAnd/res/layout/empty_state_av_notes.xml
@@ -8,7 +8,7 @@
     android:gravity="center_horizontal"
     android:orientation="vertical">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/empty_state_image_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/empty_state_favourites.xml b/OsmAnd/res/layout/empty_state_favourites.xml
index 42a738b19d..19a36578da 100644
--- a/OsmAnd/res/layout/empty_state_favourites.xml
+++ b/OsmAnd/res/layout/empty_state_favourites.xml
@@ -8,7 +8,7 @@
               android:gravity="center_horizontal"
               android:orientation="vertical">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/empty_state_image_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/empty_state_markers_active.xml b/OsmAnd/res/layout/empty_state_markers_active.xml
index 30167a3fad..2b13e5345d 100644
--- a/OsmAnd/res/layout/empty_state_markers_active.xml
+++ b/OsmAnd/res/layout/empty_state_markers_active.xml
@@ -7,7 +7,7 @@
               android:gravity="center_horizontal"
               android:orientation="vertical">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/empty_state_image_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/empty_state_markers_groups.xml b/OsmAnd/res/layout/empty_state_markers_groups.xml
index 7c3e79f1d1..567499ee93 100644
--- a/OsmAnd/res/layout/empty_state_markers_groups.xml
+++ b/OsmAnd/res/layout/empty_state_markers_groups.xml
@@ -7,7 +7,7 @@
               android:gravity="center_horizontal"
               android:orientation="vertical">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/empty_state_image_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/empty_state_markers_history.xml b/OsmAnd/res/layout/empty_state_markers_history.xml
index 1ff4783daa..5b74162444 100644
--- a/OsmAnd/res/layout/empty_state_markers_history.xml
+++ b/OsmAnd/res/layout/empty_state_markers_history.xml
@@ -7,7 +7,7 @@
               android:gravity="center_horizontal"
               android:orientation="vertical">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/empty_state_image_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/empty_state_my_tracks.xml b/OsmAnd/res/layout/empty_state_my_tracks.xml
index 42b3ca328c..dbbc0cdfb0 100644
--- a/OsmAnd/res/layout/empty_state_my_tracks.xml
+++ b/OsmAnd/res/layout/empty_state_my_tracks.xml
@@ -8,7 +8,7 @@
               android:gravity="center_horizontal"
               android:orientation="vertical">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/empty_state_image_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/empty_state_osm_edits.xml b/OsmAnd/res/layout/empty_state_osm_edits.xml
index 64db890b1d..86bee901f0 100644
--- a/OsmAnd/res/layout/empty_state_osm_edits.xml
+++ b/OsmAnd/res/layout/empty_state_osm_edits.xml
@@ -7,7 +7,7 @@
               android:gravity="center_horizontal"
               android:orientation="vertical">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/empty_state_image_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/expandable_list_item_category.xml b/OsmAnd/res/layout/expandable_list_item_category.xml
index b1f99b3a95..8285b143d0 100644
--- a/OsmAnd/res/layout/expandable_list_item_category.xml
+++ b/OsmAnd/res/layout/expandable_list_item_category.xml
@@ -36,7 +36,7 @@
             android:visibility="gone"
             tools:visiblity="visible"/>
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/category_icon"
             android:layout_width="@dimen/standard_icon_size"
             android:layout_height="@dimen/standard_icon_size"
@@ -55,7 +55,7 @@
             tools:text="Category name"
             android:layout_marginStart="@dimen/card_content_padding_large" />
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/options"
             android:contentDescription="@string/shared_string_more"
             android:layout_width="46dp"
@@ -70,7 +70,7 @@
             tools:visiblity="visible"
             android:layout_marginEnd="4dp" />
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/explist_indicator"
             android:layout_width="@dimen/context_menu_padding_margin_large"
             android:layout_height="match_parent"
diff --git a/OsmAnd/res/layout/favorites_list_item.xml b/OsmAnd/res/layout/favorites_list_item.xml
index 0c713b9974..7366134f3c 100644
--- a/OsmAnd/res/layout/favorites_list_item.xml
+++ b/OsmAnd/res/layout/favorites_list_item.xml
@@ -52,7 +52,7 @@
                 android:visibility="gone"
                 tools:visibility="visible" />
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/favourite_icon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -90,7 +90,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/direction"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -110,7 +110,7 @@
                     android:textSize="@dimen/default_desc_text_size"
                     tools:text="100500 km" />
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/group_image"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/favourite_list_item.xml b/OsmAnd/res/layout/favourite_list_item.xml
index 30b66aae0c..d073dc0bfe 100644
--- a/OsmAnd/res/layout/favourite_list_item.xml
+++ b/OsmAnd/res/layout/favourite_list_item.xml
@@ -13,7 +13,7 @@
 	android:paddingStart="@dimen/list_content_padding"
 	android:paddingEnd="@dimen/list_content_padding">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/favourite_icon"
         android:layout_width="@dimen/standard_icon_size"
         android:layout_height="@dimen/standard_icon_size"
@@ -48,7 +48,7 @@
             android:layout_height="wrap_content"
             android:gravity="center_vertical">
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/favourite_direction_icon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/first_usage_welcome_fragment.xml b/OsmAnd/res/layout/first_usage_welcome_fragment.xml
index 9386072048..6ea7a84fdf 100644
--- a/OsmAnd/res/layout/first_usage_welcome_fragment.xml
+++ b/OsmAnd/res/layout/first_usage_welcome_fragment.xml
@@ -7,7 +7,7 @@
     android:clickable="true"
     android:theme="@style/OsmandLightTheme">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/background_image"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -28,7 +28,7 @@
 	    android:paddingStart="40dp"
 	    android:paddingEnd="40dp">
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
diff --git a/OsmAnd/res/layout/fragment_data_storage_place_dialog.xml b/OsmAnd/res/layout/fragment_data_storage_place_dialog.xml
index a15bd4b214..76ed491f6c 100644
--- a/OsmAnd/res/layout/fragment_data_storage_place_dialog.xml
+++ b/OsmAnd/res/layout/fragment_data_storage_place_dialog.xml
@@ -12,7 +12,7 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent">
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/folderIconImageView"
             android:layout_width="56dp"
             android:layout_height="56dp"
@@ -86,7 +86,7 @@
                     android:background="?attr/selectableItemBackground"
                     android:orientation="horizontal">
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/deviceMemoryImageView"
                         android:layout_width="wrap_content"
                         android:layout_height="56dp"
@@ -138,7 +138,7 @@
                     android:background="?attr/selectableItemBackground"
                     android:orientation="horizontal">
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/sharedMemoryImageView"
                         android:layout_width="wrap_content"
                         android:layout_height="56dp"
@@ -187,7 +187,7 @@
                     android:background="?attr/selectableItemBackground"
                     android:orientation="horizontal">
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/memoryStickImageView"
                         android:layout_width="wrap_content"
                         android:layout_height="56dp"
diff --git a/OsmAnd/res/layout/fragment_direction_indication_dialog.xml b/OsmAnd/res/layout/fragment_direction_indication_dialog.xml
index 44500852c6..98c2b331fc 100644
--- a/OsmAnd/res/layout/fragment_direction_indication_dialog.xml
+++ b/OsmAnd/res/layout/fragment_direction_indication_dialog.xml
@@ -77,7 +77,7 @@
                     android:layout_height="@dimen/action_bar_image_height"
                     android:background="?attr/actionModeBackground">
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/action_bar_image"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
@@ -218,7 +218,7 @@
                         android:paddingRight="@dimen/content_padding_small"
                         android:paddingStart="@dimen/content_padding">
 
-                        <ImageView
+                        <androidx.appcompat.widget.AppCompatImageView
                             android:id="@+id/top_bar_icon"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -258,7 +258,7 @@
                         android:paddingRight="@dimen/content_padding_small"
                         android:paddingStart="@dimen/content_padding">
 
-                        <ImageView
+                        <androidx.appcompat.widget.AppCompatImageView
                             android:id="@+id/widget_icon"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -547,7 +547,7 @@
 
         </com.github.ksoichiro.android.observablescrollview.ObservableScrollView>
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/app_bar_shadow"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/fragment_edit_poi_normal.xml b/OsmAnd/res/layout/fragment_edit_poi_normal.xml
index a0df9c280d..53d1e96b5e 100644
--- a/OsmAnd/res/layout/fragment_edit_poi_normal.xml
+++ b/OsmAnd/res/layout/fragment_edit_poi_normal.xml
@@ -22,7 +22,7 @@
             osmand:typeface="@string/font_roboto_medium"
 	        android:layout_marginStart="@dimen/content_padding" />
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/streetImageView"
             style="@style/edit_poi_imageview_style"
             android:layout_below="@id/contactInfoTextView"
@@ -36,7 +36,7 @@
             android:inputType="textMultiLine"
             tools:text="testText"/>
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/houseNumberImageView"
             style="@style/edit_poi_imageview_style"
             android:layout_below="@id/streetEditText"
@@ -49,7 +49,7 @@
             android:hint="@string/building_number"
             android:inputType="text"/>
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/phoneImageView"
             style="@style/edit_poi_imageview_style"
             android:layout_below="@id/houseNumberEditText"
@@ -62,7 +62,7 @@
             android:hint="@string/phone"
             android:inputType="phone"/>
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/webSiteImageView"
             style="@style/edit_poi_imageview_style"
             android:layout_below="@id/phoneEditText"
@@ -75,7 +75,7 @@
             android:hint="@string/website"
             android:inputType="textUri"/>
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/descriptionImageView"
             style="@style/edit_poi_imageview_style"
             android:layout_below="@id/webSiteEditText"
@@ -110,7 +110,7 @@
             android:orientation="vertical"
             android:layout_marginBottom="4dp"/>
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/openingHoursImageView"
             style="@style/edit_poi_imageview_style"
             android:layout_below="@id/openHoursContainer"
diff --git a/OsmAnd/res/layout/fragment_import_complete.xml b/OsmAnd/res/layout/fragment_import_complete.xml
index 84ce23e040..6e9a5fa22b 100644
--- a/OsmAnd/res/layout/fragment_import_complete.xml
+++ b/OsmAnd/res/layout/fragment_import_complete.xml
@@ -123,7 +123,7 @@
 
 		</com.google.android.material.appbar.CollapsingToolbarLayout>
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/shadowView"
 			android:layout_width="match_parent"
 			android:layout_height="@dimen/abp__shadow_height"
diff --git a/OsmAnd/res/layout/fragment_mapillary_filters.xml b/OsmAnd/res/layout/fragment_mapillary_filters.xml
index 185109e39d..47afdad11a 100644
--- a/OsmAnd/res/layout/fragment_mapillary_filters.xml
+++ b/OsmAnd/res/layout/fragment_mapillary_filters.xml
@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <ImageView 
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/shadow_on_map"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -255,7 +255,7 @@
                 android:orientation="horizontal"
                 android:visibility="gone">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/warning_image_view"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content" />
diff --git a/OsmAnd/res/layout/fragment_marker_options_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_marker_options_bottom_sheet_dialog.xml
index 3c8090cf5f..cbb7d74d2f 100644
--- a/OsmAnd/res/layout/fragment_marker_options_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_marker_options_bottom_sheet_dialog.xml
@@ -49,7 +49,7 @@
 	                android:paddingStart="@dimen/content_padding"
 	                android:paddingEnd="@dimen/content_padding">
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/sort_by_icon"
                         android:layout_width="@dimen/standard_icon_size"
                         android:layout_height="@dimen/standard_icon_size"
@@ -87,7 +87,7 @@
 	                android:paddingStart="@dimen/content_padding"
 	                android:paddingEnd="@dimen/content_padding">
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/show_direction_icon"
                         android:layout_width="@dimen/standard_icon_size"
                         android:layout_height="@dimen/standard_icon_size"
@@ -118,7 +118,7 @@
 	                android:paddingEnd="@dimen/content_padding"
 	                android:paddingStart="@dimen/content_padding">
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/coordinate_input_icon"
                         android:layout_width="@dimen/standard_icon_size"
                         android:layout_height="@dimen/standard_icon_size"
@@ -147,7 +147,7 @@
 	                android:paddingEnd="@dimen/content_padding"
 	                android:paddingStart="@dimen/content_padding">
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/build_route_icon"
                         android:layout_width="@dimen/standard_icon_size"
                         android:layout_height="@dimen/standard_icon_size"
@@ -185,7 +185,7 @@
 	                android:paddingEnd="@dimen/content_padding"
 	                android:paddingStart="@dimen/content_padding">
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/save_as_new_track_icon"
                         android:layout_width="@dimen/standard_icon_size"
                         android:layout_height="@dimen/standard_icon_size"
@@ -214,7 +214,7 @@
 	                android:paddingStart="@dimen/content_padding"
 	                android:paddingEnd="@dimen/content_padding">
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/move_all_to_history_icon"
                         android:layout_width="@dimen/standard_icon_size"
                         android:layout_height="@dimen/standard_icon_size"
diff --git a/OsmAnd/res/layout/fragment_measurement_tool.xml b/OsmAnd/res/layout/fragment_measurement_tool.xml
index 52767c848d..d6f1470ba0 100644
--- a/OsmAnd/res/layout/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout/fragment_measurement_tool.xml
@@ -32,7 +32,7 @@
             android:layout_height="@dimen/measurement_tool_up_down_row_height"
             android:background="?attr/selectableItemBackground">
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/main_icon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -46,7 +46,7 @@
                 android:background="@null"
                 tools:src="@drawable/ic_action_ruler"/>
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/up_down_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -149,7 +149,7 @@
 
             <include layout="@layout/card_bottom_divider"/>
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:layout_width="match_parent"
                 android:layout_height="5dp"
                 android:layout_gravity="bottom"
diff --git a/OsmAnd/res/layout/fragment_plan_route_half_screen.xml b/OsmAnd/res/layout/fragment_plan_route_half_screen.xml
index c7c7c169aa..03918d3b69 100644
--- a/OsmAnd/res/layout/fragment_plan_route_half_screen.xml
+++ b/OsmAnd/res/layout/fragment_plan_route_half_screen.xml
@@ -15,7 +15,7 @@
         android:layout_gravity="bottom"
         android:orientation="vertical">
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:scaleType="fitXY"
diff --git a/OsmAnd/res/layout/fragment_reports.xml b/OsmAnd/res/layout/fragment_reports.xml
index da5e342cef..2d40c7fd54 100644
--- a/OsmAnd/res/layout/fragment_reports.xml
+++ b/OsmAnd/res/layout/fragment_reports.xml
@@ -27,7 +27,7 @@
                 android:minHeight="60dp"
                 android:orientation="horizontal">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/calendarImageView"
                     android:layout_width="56dp"
                     android:layout_height="56dp"
@@ -46,7 +46,7 @@
 	                android:layout_marginStart="-8dp"
 	                android:layout_marginEnd="16dp" />
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/monthDropDownIcon"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
@@ -73,7 +73,7 @@
                 android:minHeight="60dp"
                 android:orientation="horizontal">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/regionIconImageView"
                     android:layout_width="56dp"
                     android:layout_height="56dp"
@@ -105,7 +105,7 @@
                         tools:text="Worldwide"/>
                 </LinearLayout>
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/countryDropDownIcon"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
@@ -147,7 +147,7 @@
                     android:minHeight="60dp"
                     android:orientation="horizontal">
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/numberOfContributorsIcon"
                         android:layout_width="56dp"
                         android:layout_height="56dp"
@@ -198,7 +198,7 @@
                 android:minHeight="60dp"
                 android:orientation="horizontal">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/numberOfEditsIcon"
                     android:layout_width="56dp"
                     android:layout_height="56dp"
@@ -245,7 +245,7 @@
                 android:minHeight="60dp"
                 android:orientation="horizontal">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/donationsIcon"
                     android:layout_width="56dp"
                     android:layout_height="56dp"
@@ -301,7 +301,7 @@
                     android:minHeight="60dp"
                     android:orientation="horizontal">
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/donationsTotalIcon"
                         android:layout_width="56dp"
                         android:layout_height="56dp"
@@ -353,7 +353,7 @@
                 android:minHeight="60dp"
                 android:orientation="horizontal">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/numberOfRecipientsIcon"
                     android:layout_width="56dp"
                     android:layout_height="60dp"
diff --git a/OsmAnd/res/layout/fragment_save_as_new_track_images_row.xml b/OsmAnd/res/layout/fragment_save_as_new_track_images_row.xml
index ebdea2f235..942f7df6f4 100644
--- a/OsmAnd/res/layout/fragment_save_as_new_track_images_row.xml
+++ b/OsmAnd/res/layout/fragment_save_as_new_track_images_row.xml
@@ -21,7 +21,7 @@
 			android:layout_marginStart="@dimen/bottom_sheet_content_margin"
 			android:layout_weight="1">
 
-			<ImageView
+			<androidx.appcompat.widget.AppCompatImageView
 				android:id="@+id/route_point_image"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
@@ -53,7 +53,7 @@
 			android:layout_marginStart="@dimen/bottom_sheet_content_margin_small"
 			android:layout_weight="1">
 
-			<ImageView
+			<androidx.appcompat.widget.AppCompatImageView
 				android:id="@+id/line_image"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/fragment_show_all_routes.xml b/OsmAnd/res/layout/fragment_show_all_routes.xml
index dc4dd9742a..86ac60d4c5 100644
--- a/OsmAnd/res/layout/fragment_show_all_routes.xml
+++ b/OsmAnd/res/layout/fragment_show_all_routes.xml
@@ -210,7 +210,7 @@
 
 		</LinearLayout>
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_gravity="top"
diff --git a/OsmAnd/res/layout/fragment_subcategories.xml b/OsmAnd/res/layout/fragment_subcategories.xml
index 2cb328051b..9b8a7bc600 100644
--- a/OsmAnd/res/layout/fragment_subcategories.xml
+++ b/OsmAnd/res/layout/fragment_subcategories.xml
@@ -70,7 +70,7 @@
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/search_icon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -90,7 +90,7 @@
                 android:textColor="?android:attr/textColorPrimary"
                 android:textSize="@dimen/default_list_text_size" />
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/search_close"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/fragment_terrain.xml b/OsmAnd/res/layout/fragment_terrain.xml
index 928e0fc7ba..c077d1a765 100644
--- a/OsmAnd/res/layout/fragment_terrain.xml
+++ b/OsmAnd/res/layout/fragment_terrain.xml
@@ -12,7 +12,7 @@
 		android:layout_height="match_parent"
 		android:orientation="vertical">
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/shadow_on_map"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
@@ -32,7 +32,7 @@
 				android:gravity="center_vertical"
 				android:orientation="horizontal">
 
-				<ImageView
+				<androidx.appcompat.widget.AppCompatImageView
 					android:id="@+id/icon_iv"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
@@ -336,7 +336,7 @@
 						android:textSize="@dimen/default_desc_text_size"
 						osmand:typeface="@string/font_roboto_medium" />
 
-					<ImageView
+					<androidx.appcompat.widget.AppCompatImageView
 						android:layout_width="wrap_content"
 						android:layout_height="match_parent"
 						android:layout_gravity="center_horizontal"
diff --git a/OsmAnd/res/layout/fragment_wikivoyage_article_dialog.xml b/OsmAnd/res/layout/fragment_wikivoyage_article_dialog.xml
index 9c63ade0bb..a582b8b94c 100644
--- a/OsmAnd/res/layout/fragment_wikivoyage_article_dialog.xml
+++ b/OsmAnd/res/layout/fragment_wikivoyage_article_dialog.xml
@@ -72,7 +72,7 @@
 				android:layout_width="match_parent"
 				android:layout_height="match_parent"/>
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:layout_width="match_parent"
 			android:layout_gravity="bottom"
 			android:layout_height="10dp"
diff --git a/OsmAnd/res/layout/fragment_wikivoyage_show_images_first_time.xml b/OsmAnd/res/layout/fragment_wikivoyage_show_images_first_time.xml
index d4d121b978..883eda231a 100644
--- a/OsmAnd/res/layout/fragment_wikivoyage_show_images_first_time.xml
+++ b/OsmAnd/res/layout/fragment_wikivoyage_show_images_first_time.xml
@@ -17,7 +17,7 @@
 			android:layout_height="wrap_content"
 			android:orientation="vertical">
 
-	<ImageView
+	<androidx.appcompat.widget.AppCompatImageView
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_marginTop="@dimen/list_content_padding"
diff --git a/OsmAnd/res/layout/go_to_map_fragment.xml b/OsmAnd/res/layout/go_to_map_fragment.xml
index 941f627997..e392065b54 100644
--- a/OsmAnd/res/layout/go_to_map_fragment.xml
+++ b/OsmAnd/res/layout/go_to_map_fragment.xml
@@ -23,7 +23,7 @@
                 android:layout_width="56dp"
                 android:layout_height="match_parent">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/titleIconImageView"
                     android:layout_width="56dp"
                     android:layout_height="56dp"
diff --git a/OsmAnd/res/layout/gpx_item_altitude.xml b/OsmAnd/res/layout/gpx_item_altitude.xml
index 5c8204a1b3..af46a440a4 100644
--- a/OsmAnd/res/layout/gpx_item_altitude.xml
+++ b/OsmAnd/res/layout/gpx_item_altitude.xml
@@ -72,7 +72,7 @@
                 android:paddingLeft="16dp"
 	            android:paddingStart="16dp">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/average_icon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -118,7 +118,7 @@
                 android:paddingLeft="16dp"
 	            android:paddingStart="16dp">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/range_icon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -216,7 +216,7 @@
                 android:paddingLeft="16dp"
 	            android:paddingStart="16dp">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/ascent_icon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -262,7 +262,7 @@
                 android:paddingLeft="16dp"
 	            android:paddingStart="16dp">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/descent_icon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/gpx_item_general.xml b/OsmAnd/res/layout/gpx_item_general.xml
index c3469f74ee..d0f23f6a38 100644
--- a/OsmAnd/res/layout/gpx_item_general.xml
+++ b/OsmAnd/res/layout/gpx_item_general.xml
@@ -72,7 +72,7 @@
                 android:paddingLeft="16dp"
 	            android:paddingStart="16dp">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/distance_icon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -118,7 +118,7 @@
                 android:paddingLeft="16dp"
 	            android:paddingStart="16dp">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/duration_icon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -216,7 +216,7 @@
                 android:paddingLeft="@dimen/content_padding"
 	            android:paddingStart="@dimen/content_padding">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/start_time_icon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -271,7 +271,7 @@
                 android:paddingLeft="@dimen/content_padding"
 	            android:paddingStart="@dimen/content_padding">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/end_time_icon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/gpx_item_list_header.xml b/OsmAnd/res/layout/gpx_item_list_header.xml
index 4d1b8f4f54..43ceaf7e3f 100644
--- a/OsmAnd/res/layout/gpx_item_list_header.xml
+++ b/OsmAnd/res/layout/gpx_item_list_header.xml
@@ -11,7 +11,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom">
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/imageView"
             android:layout_width="match_parent"
             android:layout_height="152dp"
@@ -35,7 +35,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/content_padding"/>
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:scaleType="fitXY"
@@ -150,7 +150,7 @@
 	                android:paddingEnd="@dimen/content_padding_half"
 	                android:paddingStart="@dimen/content_padding_half" />
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/split_interval_arrow"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -182,7 +182,7 @@
                     android:textSize="@dimen/default_list_text_size"
                     android:text="@string/shared_string_color"/>
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/colorImage"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/gpx_item_speed.xml b/OsmAnd/res/layout/gpx_item_speed.xml
index 031b6e2de9..0c98402703 100644
--- a/OsmAnd/res/layout/gpx_item_speed.xml
+++ b/OsmAnd/res/layout/gpx_item_speed.xml
@@ -72,7 +72,7 @@
                 android:paddingLeft="@dimen/content_padding"
 	            android:paddingStart="@dimen/content_padding">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/average_icon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -118,7 +118,7 @@
                 android:paddingLeft="@dimen/content_padding"
 	            android:paddingStart="@dimen/content_padding">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/max_icon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -216,7 +216,7 @@
                 android:paddingLeft="@dimen/content_padding"
 	            android:paddingStart="@dimen/content_padding">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/time_moving_icon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -262,7 +262,7 @@
                 android:paddingLeft="@dimen/content_padding"
 	            android:paddingStart="@dimen/content_padding">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/distance_icon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/gpx_route_card.xml b/OsmAnd/res/layout/gpx_route_card.xml
index 19bb70fe9a..fa3275886c 100644
--- a/OsmAnd/res/layout/gpx_route_card.xml
+++ b/OsmAnd/res/layout/gpx_route_card.xml
@@ -12,7 +12,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content">
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:scaleType="fitXY"
@@ -97,7 +97,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="14dp">
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/bottom_shadow"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/gpx_split_segment_fragment.xml b/OsmAnd/res/layout/gpx_split_segment_fragment.xml
index 095db1124e..f250397baf 100644
--- a/OsmAnd/res/layout/gpx_split_segment_fragment.xml
+++ b/OsmAnd/res/layout/gpx_split_segment_fragment.xml
@@ -23,7 +23,7 @@
             android:layout_height="40dp"
             android:orientation="horizontal">
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/overview_image"
                 android:layout_width="16dp"
                 android:layout_height="16dp"
@@ -78,7 +78,7 @@
                 android:orientation="horizontal"
 	            android:layout_marginEnd="3dp">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:layout_marginTop="2dp"
                     android:id="@+id/distance_or_timespan_image"
                     android:layout_width="16dp"
@@ -124,7 +124,7 @@
                 android:orientation="horizontal"
 	            android:layout_marginEnd="3dp">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:layout_marginTop="2dp"
                     android:id="@+id/start_time_image"
                     android:layout_width="16dp"
@@ -168,7 +168,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:layout_marginTop="2dp"
                     android:id="@+id/end_time_image"
                     android:layout_width="16dp"
@@ -232,7 +232,7 @@
                 android:orientation="horizontal"
 	            android:layout_marginEnd="3dp">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:layout_marginTop="2dp"
                     android:id="@+id/average_altitude_image"
                     android:layout_width="16dp"
@@ -277,7 +277,7 @@
                 android:orientation="horizontal"
 	            android:layout_marginEnd="3dp">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:layout_marginTop="2dp"
                     android:id="@+id/altitude_range_image"
                     android:layout_width="16dp"
@@ -341,7 +341,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:layout_marginTop="2dp"
                     android:id="@+id/ascent_descent_image"
                     android:layout_width="16dp"
@@ -424,7 +424,7 @@
                 android:orientation="horizontal"
 	            android:layout_marginEnd="3dp">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:layout_marginTop="2dp"
                     android:id="@+id/moving_time_image"
                     android:layout_width="16dp"
@@ -469,7 +469,7 @@
                 android:orientation="horizontal"
 	            android:layout_marginEnd="3dp">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:layout_marginTop="2dp"
                     android:id="@+id/average_speed_image"
                     android:layout_width="16dp"
@@ -512,7 +512,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:layout_marginTop="2dp"
                     android:id="@+id/max_speed_image"
                     android:layout_width="16dp"
diff --git a/OsmAnd/res/layout/gpx_tab.xml b/OsmAnd/res/layout/gpx_tab.xml
index c4bfefe354..a2ac4f728a 100644
--- a/OsmAnd/res/layout/gpx_tab.xml
+++ b/OsmAnd/res/layout/gpx_tab.xml
@@ -5,7 +5,7 @@
               android:layout_height="match_parent"
               android:gravity="center">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/tab_image"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
diff --git a/OsmAnd/res/layout/gpx_track_item.xml b/OsmAnd/res/layout/gpx_track_item.xml
index c7825f8083..d4007b5693 100644
--- a/OsmAnd/res/layout/gpx_track_item.xml
+++ b/OsmAnd/res/layout/gpx_track_item.xml
@@ -41,7 +41,7 @@
             android:clickable="false"
             android:focusableInTouchMode="false" />
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -79,7 +79,7 @@
                 android:visibility="visible"
                 android:gravity="center_vertical">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/distance_icon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -98,7 +98,7 @@
                     android:textSize="@dimen/default_sub_text_size"
 	                android:layout_marginEnd="@dimen/gpx_small_text_margin" />
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/points_icon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -117,7 +117,7 @@
                     android:textSize="@dimen/default_sub_text_size"
 	                android:layout_marginEnd="@dimen/gpx_small_text_margin" />
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/time_icon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/gpx_track_select_item.xml b/OsmAnd/res/layout/gpx_track_select_item.xml
index 763c1aacbd..1a530a7aab 100644
--- a/OsmAnd/res/layout/gpx_track_select_item.xml
+++ b/OsmAnd/res/layout/gpx_track_select_item.xml
@@ -8,7 +8,7 @@
 	android:background="?attr/selectableItemBackground"
 	android:orientation="horizontal">
 
-	<ImageView
+	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/icon"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
@@ -52,7 +52,7 @@
 			android:orientation="horizontal"
 			android:visibility="visible">
 
-			<ImageView
+			<androidx.appcompat.widget.AppCompatImageView
 				android:id="@+id/distance_icon"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
@@ -70,7 +70,7 @@
 				android:textColor="?android:textColorSecondary"
 				android:textSize="@dimen/default_desc_text_size" />
 
-			<ImageView
+			<androidx.appcompat.widget.AppCompatImageView
 				android:id="@+id/points_icon"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
@@ -89,7 +89,7 @@
 				android:textSize="@dimen/default_desc_text_size"
 				tools:text="0" />
 
-			<ImageView
+			<androidx.appcompat.widget.AppCompatImageView
 				android:id="@+id/time_icon"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/grid_menu_item.xml b/OsmAnd/res/layout/grid_menu_item.xml
index b915a10411..2e5b714bde 100644
--- a/OsmAnd/res/layout/grid_menu_item.xml
+++ b/OsmAnd/res/layout/grid_menu_item.xml
@@ -13,7 +13,7 @@
 	android:paddingEnd="@dimen/bottom_sheet_content_padding_small"
 	android:paddingStart="@dimen/bottom_sheet_content_padding_small">
 
-	<ImageView
+	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/icon"
 		android:layout_width="@dimen/standard_icon_size"
 		android:layout_height="@dimen/standard_icon_size"
diff --git a/OsmAnd/res/layout/history_card_item.xml b/OsmAnd/res/layout/history_card_item.xml
index e24ae0bd0e..702d6d07b7 100644
--- a/OsmAnd/res/layout/history_card_item.xml
+++ b/OsmAnd/res/layout/history_card_item.xml
@@ -59,7 +59,7 @@
 				android:layout_height="wrap_content"
 				android:orientation="horizontal">
 
-				<ImageView
+				<androidx.appcompat.widget.AppCompatImageView
 					android:id="@+id/type_name_icon"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/home_work_card.xml b/OsmAnd/res/layout/home_work_card.xml
index a2703cd3c0..9ad483084a 100644
--- a/OsmAnd/res/layout/home_work_card.xml
+++ b/OsmAnd/res/layout/home_work_card.xml
@@ -161,7 +161,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="14dp">
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/bottom_shadow"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/layers_list_activity_item.xml b/OsmAnd/res/layout/layers_list_activity_item.xml
index c389243b60..3db47bcd7b 100644
--- a/OsmAnd/res/layout/layers_list_activity_item.xml
+++ b/OsmAnd/res/layout/layers_list_activity_item.xml
@@ -11,7 +11,7 @@
 	android:paddingEnd="@dimen/list_content_padding"
 	android:paddingStart="@dimen/list_content_padding">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/icon"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/list_item_height"
diff --git a/OsmAnd/res/layout/list_item_icon_and_download.xml b/OsmAnd/res/layout/list_item_icon_and_download.xml
index 7290321289..9fc9516a00 100644
--- a/OsmAnd/res/layout/list_item_icon_and_download.xml
+++ b/OsmAnd/res/layout/list_item_icon_and_download.xml
@@ -13,7 +13,7 @@
         android:gravity="center_vertical"
         android:minHeight="@dimen/setting_list_item_large_height">
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -79,7 +79,7 @@
 
                 </LinearLayout>
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/secondary_icon"
                     android:layout_width="@dimen/list_item_height"
                     android:layout_height="@dimen/list_item_height"
diff --git a/OsmAnd/res/layout/list_item_icon_and_title.xml b/OsmAnd/res/layout/list_item_icon_and_title.xml
index ee7652a09c..00bb61f113 100644
--- a/OsmAnd/res/layout/list_item_icon_and_title.xml
+++ b/OsmAnd/res/layout/list_item_icon_and_title.xml
@@ -11,7 +11,7 @@
     android:paddingRight="@dimen/content_padding"
     android:paddingStart="@dimen/content_padding">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/list_item_import.xml b/OsmAnd/res/layout/list_item_import.xml
index 862178e640..3ec1c65d55 100644
--- a/OsmAnd/res/layout/list_item_import.xml
+++ b/OsmAnd/res/layout/list_item_import.xml
@@ -19,7 +19,7 @@
 			android:gravity="center_vertical"
 			android:orientation="horizontal">
 
-			<ImageView
+			<androidx.appcompat.widget.AppCompatImageView
 				android:id="@+id/icon"
 				android:layout_width="@dimen/standard_icon_size"
 				android:layout_height="@dimen/standard_icon_size"
diff --git a/OsmAnd/res/layout/list_item_move_header.xml b/OsmAnd/res/layout/list_item_move_header.xml
index d977c6ed1e..8c672e6f93 100644
--- a/OsmAnd/res/layout/list_item_move_header.xml
+++ b/OsmAnd/res/layout/list_item_move_header.xml
@@ -19,7 +19,7 @@
 		android:layout_height="match_parent"
 		android:orientation="horizontal">
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/icon"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
@@ -72,7 +72,7 @@
 
 		</LinearLayout>
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/move_icon"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/list_shadow_footer.xml b/OsmAnd/res/layout/list_shadow_footer.xml
index 0a9f9c620b..f4142be798 100644
--- a/OsmAnd/res/layout/list_shadow_footer.xml
+++ b/OsmAnd/res/layout/list_shadow_footer.xml
@@ -7,7 +7,7 @@
               android:background="?attr/activity_background_color"
               android:orientation="vertical">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:scaleType="fitXY"
diff --git a/OsmAnd/res/layout/list_shadow_header.xml b/OsmAnd/res/layout/list_shadow_header.xml
index 3037482c65..2f2b040298 100644
--- a/OsmAnd/res/layout/list_shadow_header.xml
+++ b/OsmAnd/res/layout/list_shadow_header.xml
@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="16dp"/>
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:scaleType="fitXY"
diff --git a/OsmAnd/res/layout/live_updates_header.xml b/OsmAnd/res/layout/live_updates_header.xml
index 4866fa54f7..7c4a50fde5 100644
--- a/OsmAnd/res/layout/live_updates_header.xml
+++ b/OsmAnd/res/layout/live_updates_header.xml
@@ -29,7 +29,7 @@
             android:layout_height="wrap_content"
             android:orientation="horizontal">
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 app:srcCompat="@drawable/ic_action_osm_live"/>
@@ -147,7 +147,7 @@
                 android:layout_marginRight="16dp"
 	            android:layout_marginEnd="16dp">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/statusIcon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/local_index_list_item.xml b/OsmAnd/res/layout/local_index_list_item.xml
index 420e6da6c4..c95e0e9aa5 100644
--- a/OsmAnd/res/layout/local_index_list_item.xml
+++ b/OsmAnd/res/layout/local_index_list_item.xml
@@ -23,7 +23,7 @@
         android:focusable="false"
         android:visibility="gone" />
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/local_index_live_updates_list_item.xml b/OsmAnd/res/layout/local_index_live_updates_list_item.xml
index 1bb1c9f4fd..210b592b57 100644
--- a/OsmAnd/res/layout/local_index_live_updates_list_item.xml
+++ b/OsmAnd/res/layout/local_index_live_updates_list_item.xml
@@ -9,7 +9,7 @@
     android:minHeight="@dimen/list_item_height"
     android:orientation="horizontal">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/main_menu_drawer_btn_configure_profile.xml b/OsmAnd/res/layout/main_menu_drawer_btn_configure_profile.xml
index 89face3c23..d947926cb7 100644
--- a/OsmAnd/res/layout/main_menu_drawer_btn_configure_profile.xml
+++ b/OsmAnd/res/layout/main_menu_drawer_btn_configure_profile.xml
@@ -24,7 +24,7 @@
 			android:layout_marginStart="@dimen/content_padding_half"
 			android:layout_marginEnd="@dimen/favorites_icon_right_margin">
 
-			<ImageView
+			<androidx.appcompat.widget.AppCompatImageView
 				android:id="@+id/icon"
 				android:layout_width="@dimen/standard_icon_size"
 				android:layout_height="@dimen/standard_icon_size"
diff --git a/OsmAnd/res/layout/main_menu_drawer_btn_switch_profile.xml b/OsmAnd/res/layout/main_menu_drawer_btn_switch_profile.xml
index cadb783a59..0d0c4fb8ce 100644
--- a/OsmAnd/res/layout/main_menu_drawer_btn_switch_profile.xml
+++ b/OsmAnd/res/layout/main_menu_drawer_btn_switch_profile.xml
@@ -19,7 +19,7 @@
 		android:layout_marginEnd="@dimen/favorites_icon_right_margin"
 		android:background="?attr/bg_circle">
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/icon"
 			android:layout_width="@dimen/standard_icon_size"
 			android:layout_height="@dimen/standard_icon_size"
diff --git a/OsmAnd/res/layout/map_context_menu_fragment.xml b/OsmAnd/res/layout/map_context_menu_fragment.xml
index f668875db6..56aba8b1b7 100644
--- a/OsmAnd/res/layout/map_context_menu_fragment.xml
+++ b/OsmAnd/res/layout/map_context_menu_fragment.xml
@@ -65,7 +65,7 @@
 
                 </LinearLayout>
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/context_menu_icon_view"
                     android:layout_width="@dimen/map_widget_icon"
                     android:layout_height="@dimen/map_widget_icon"
@@ -192,7 +192,7 @@
                             osmand:typeface="@string/font_roboto_medium"
                             tools:text="Some really long string"/>
 
-                        <ImageView
+                        <androidx.appcompat.widget.AppCompatImageView
                             android:id="@+id/additional_info_image_view"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -228,7 +228,7 @@
                             android:layout_height="wrap_content"
                             android:orientation="horizontal">
 
-                            <ImageView
+                            <androidx.appcompat.widget.AppCompatImageView
                                 android:id="@+id/direction"
                                 android:layout_width="@dimen/directionIconSize"
                                 android:layout_height="@dimen/directionIconSize"
@@ -390,7 +390,7 @@
 
                     </LinearLayout>
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/progressButton"
                         android:layout_width="@dimen/context_menu_progress_cancel_button_size"
                         android:layout_height="@dimen/context_menu_progress_cancel_button_size"
@@ -514,14 +514,14 @@
             android:layout_height="match_parent"
             android:gravity="center">
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:layout_width="30dp"
                 android:layout_height="30dp"
                 android:background="@drawable/btn_circle_trans_flat"/>
 
         </LinearLayout>
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/context_menu_top_back"
             android:layout_width="@dimen/list_item_height"
             android:layout_height="match_parent"
@@ -559,7 +559,7 @@
                 android:gravity="center_vertical|start"
                 android:orientation="horizontal">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/context_menu_toolbar_back"
                     android:layout_width="@dimen/list_item_height"
                     android:layout_height="match_parent"
diff --git a/OsmAnd/res/layout/map_hud_bottom.xml b/OsmAnd/res/layout/map_hud_bottom.xml
index 0591484ada..68e7c9d52f 100644
--- a/OsmAnd/res/layout/map_hud_bottom.xml
+++ b/OsmAnd/res/layout/map_hud_bottom.xml
@@ -49,7 +49,7 @@
             android:layout_marginLeft="@dimen/map_button_shadow_margin"
 	        android:layout_marginStart="@dimen/map_button_shadow_margin">
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/map_alarm_warning_icon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -180,7 +180,7 @@
 
                 </FrameLayout>
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/map_ruler_image"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/map_hud_top.xml b/OsmAnd/res/layout/map_hud_top.xml
index 8f05635a5a..c691190ed3 100644
--- a/OsmAnd/res/layout/map_hud_top.xml
+++ b/OsmAnd/res/layout/map_hud_top.xml
@@ -38,7 +38,7 @@
 				android:layout_marginEnd="@dimen/content_padding_half"
 				android:layout_marginStart="@dimen/content_padding_half">
 
-				<ImageView
+				<androidx.appcompat.widget.AppCompatImageView
 					android:id="@+id/lat_icon"
 					android:layout_width="@dimen/standard_icon_size"
 					android:layout_height="@dimen/standard_icon_size"
@@ -81,7 +81,7 @@
 				android:layout_marginEnd="@dimen/content_padding_half"
 				android:layout_marginStart="@dimen/content_padding_half">
 
-				<ImageView
+				<androidx.appcompat.widget.AppCompatImageView
 					android:id="@+id/lon_icon"
 					android:layout_width="@dimen/standard_icon_size"
 					android:layout_height="@dimen/standard_icon_size"
@@ -147,7 +147,7 @@
 				android:paddingStart="@dimen/text_margin_small"
 				android:paddingEnd="@dimen/text_margin_small" />
 
-			<ImageView
+			<androidx.appcompat.widget.AppCompatImageView
 				android:id="@+id/map_turn_icon"
 				android:layout_width="@dimen/map_widget_height"
 				android:layout_height="@dimen/map_widget_height"
@@ -155,7 +155,7 @@
 				android:visibility="gone"
 				tools:src="@drawable/map_turn_right_small" />
 
-			<ImageView
+			<androidx.appcompat.widget.AppCompatImageView
 				android:id="@+id/map_shield_icon"
 				android:layout_width="@dimen/map_widget_height"
 				android:layout_height="@dimen/map_widget_height"
@@ -203,7 +203,7 @@
                 android:orientation="horizontal"
                 android:visibility="gone">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/waypoint_icon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -481,7 +481,7 @@
                         android:layout_marginBottom="5dp"
                         android:orientation="horizontal">
 
-                        <ImageView
+                        <androidx.appcompat.widget.AppCompatImageView
                             android:id="@+id/map_marker_arrow"
                             android:layout_width="66dp"
                             android:layout_height="36dp"
@@ -559,7 +559,7 @@
                         android:gravity="center_vertical"
                         android:orientation="horizontal">
 
-                        <ImageView
+                        <androidx.appcompat.widget.AppCompatImageView
                             android:id="@+id/map_marker_arrow_2nd"
                             android:layout_width="66dp"
                             android:layout_height="24dp"
@@ -774,7 +774,7 @@
             android:orientation="vertical"
             android:visibility="gone">
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/map_lanes"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/map_hud_widget.xml b/OsmAnd/res/layout/map_hud_widget.xml
index 670891cf21..4570ead926 100644
--- a/OsmAnd/res/layout/map_hud_widget.xml
+++ b/OsmAnd/res/layout/map_hud_widget.xml
@@ -26,7 +26,7 @@
             android:textSize="@dimen/map_widget_text_size"
             android:visibility="gone"/>
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/widget_top_icon"
             android:layout_width="@dimen/map_widget_image"
             android:layout_height="@dimen/map_widget_image"
@@ -44,7 +44,7 @@
         android:minHeight="@dimen/map_widget_height"
         android:orientation="horizontal">
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/widget_icon"
             android:layout_width="@dimen/map_widget_icon"
             android:layout_height="@dimen/map_widget_icon"
diff --git a/OsmAnd/res/layout/map_marker_item.xml b/OsmAnd/res/layout/map_marker_item.xml
index 4ec0d07e83..c555b0122d 100644
--- a/OsmAnd/res/layout/map_marker_item.xml
+++ b/OsmAnd/res/layout/map_marker_item.xml
@@ -20,7 +20,7 @@
         android:visibility="gone"
 	    android:layout_marginStart="@dimen/content_padding" />
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/waypoint_icon"
         android:layout_width="56dp"
         android:layout_height="25dp"
@@ -50,7 +50,7 @@
             android:layout_marginTop="2dp"
             android:orientation="horizontal">
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/direction"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -137,7 +137,7 @@
         osmand:srcCompat="@drawable/ic_action_remove_dark"
 	    android:layout_marginEnd="2dp" />
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/info_move"
         android:layout_width="48dp"
         android:layout_height="48dp"
diff --git a/OsmAnd/res/layout/map_marker_item_header.xml b/OsmAnd/res/layout/map_marker_item_header.xml
index 361683626b..ab0a14e08b 100644
--- a/OsmAnd/res/layout/map_marker_item_header.xml
+++ b/OsmAnd/res/layout/map_marker_item_header.xml
@@ -15,7 +15,7 @@
         android:orientation="horizontal"
         android:background="?attr/bg_color">
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/icon"
             android:scaleType="centerInside"
             android:layout_width="@dimen/map_markers_recycler_view_item_height"
diff --git a/OsmAnd/res/layout/map_marker_item_new.xml b/OsmAnd/res/layout/map_marker_item_new.xml
index 30a48d18db..04ec35ab6b 100644
--- a/OsmAnd/res/layout/map_marker_item_new.xml
+++ b/OsmAnd/res/layout/map_marker_item_new.xml
@@ -8,7 +8,7 @@
     android:descendantFocusability="blocksDescendants"
     android:orientation="vertical">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/top_divider"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -104,7 +104,7 @@
                         tools:text="Start • "
                         tools:visibility="visible"/>
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/map_marker_direction_icon"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/mapillary_install_dialog.xml b/OsmAnd/res/layout/mapillary_install_dialog.xml
index 480e287002..b0360327e6 100644
--- a/OsmAnd/res/layout/mapillary_install_dialog.xml
+++ b/OsmAnd/res/layout/mapillary_install_dialog.xml
@@ -15,7 +15,7 @@
             android:orientation="vertical"
             android:padding="24dp">
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
diff --git a/OsmAnd/res/layout/mapillary_no_internet.xml b/OsmAnd/res/layout/mapillary_no_internet.xml
index 5758539b9c..c34edcb1ed 100644
--- a/OsmAnd/res/layout/mapillary_no_internet.xml
+++ b/OsmAnd/res/layout/mapillary_no_internet.xml
@@ -8,7 +8,7 @@
               android:gravity="center"
               android:orientation="vertical">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/wifiOff"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/mapillary_static_image_view.xml b/OsmAnd/res/layout/mapillary_static_image_view.xml
index 93128ddd98..780d58326a 100644
--- a/OsmAnd/res/layout/mapillary_static_image_view.xml
+++ b/OsmAnd/res/layout/mapillary_static_image_view.xml
@@ -9,7 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/imageView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/OsmAnd/res/layout/markers_group_view_holder.xml b/OsmAnd/res/layout/markers_group_view_holder.xml
index 93fbcf8615..800dc74bc0 100644
--- a/OsmAnd/res/layout/markers_group_view_holder.xml
+++ b/OsmAnd/res/layout/markers_group_view_holder.xml
@@ -13,7 +13,7 @@
 	android:paddingEnd="@dimen/content_padding"
 	android:paddingStart="@dimen/content_padding">
 
-	<ImageView
+	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/icon"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/menu_obj_list_item.xml b/OsmAnd/res/layout/menu_obj_list_item.xml
index 16ac2b095c..0379fa55bd 100644
--- a/OsmAnd/res/layout/menu_obj_list_item.xml
+++ b/OsmAnd/res/layout/menu_obj_list_item.xml
@@ -52,7 +52,7 @@
             android:layout_height="match_parent"
             android:orientation="horizontal">
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/context_menu_icon_view"
                 android:layout_width="@dimen/standard_icon_size"
                 android:layout_height="@dimen/standard_icon_size"
diff --git a/OsmAnd/res/layout/mode_view.xml b/OsmAnd/res/layout/mode_view.xml
index 990ba068cd..689d3db45a 100644
--- a/OsmAnd/res/layout/mode_view.xml
+++ b/OsmAnd/res/layout/mode_view.xml
@@ -4,7 +4,7 @@
              android:layout_height="@dimen/route_info_modes_height"
              xmlns:tools="http://schemas.android.com/tools">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/app_mode_icon"
         android:layout_width="@dimen/standard_icon_size"
         android:layout_height="@dimen/standard_icon_size"
diff --git a/OsmAnd/res/layout/mode_view_route_preparation.xml b/OsmAnd/res/layout/mode_view_route_preparation.xml
index 3961cf0201..9b5883b264 100644
--- a/OsmAnd/res/layout/mode_view_route_preparation.xml
+++ b/OsmAnd/res/layout/mode_view_route_preparation.xml
@@ -4,14 +4,14 @@
 	android:layout_width="@dimen/route_info_modes_height"
 	android:layout_height="@dimen/route_info_modes_height">
 
-	<ImageView
+	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/app_mode_icon"
 		android:layout_width="@dimen/standard_icon_size"
 		android:layout_height="@dimen/standard_icon_size"
 		android:layout_gravity="center"
 		tools:src="@drawable/ic_dashboard_dark" />
 
-	<ImageView
+	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/selection"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
diff --git a/OsmAnd/res/layout/move_marker_bottom_sheet.xml b/OsmAnd/res/layout/move_marker_bottom_sheet.xml
index 22ad09231e..97940c1f6c 100644
--- a/OsmAnd/res/layout/move_marker_bottom_sheet.xml
+++ b/OsmAnd/res/layout/move_marker_bottom_sheet.xml
@@ -12,7 +12,7 @@
     android:visibility="gone"
     tools:visibility="visible">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/note.xml b/OsmAnd/res/layout/note.xml
index dfd6fd517c..56af293cb0 100644
--- a/OsmAnd/res/layout/note.xml
+++ b/OsmAnd/res/layout/note.xml
@@ -35,7 +35,7 @@
 			android:visibility="gone"
 			android:layout_marginEnd="@dimen/local_index_check_right_margin" />
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/icon"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/note_list_item.xml b/OsmAnd/res/layout/note_list_item.xml
index ba748ff94f..120c972f38 100644
--- a/OsmAnd/res/layout/note_list_item.xml
+++ b/OsmAnd/res/layout/note_list_item.xml
@@ -27,7 +27,7 @@
 	        android:layout_marginEnd="@dimen/content_padding"
 	        android:layout_marginStart="@dimen/content_padding" />
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/open_time_list_item.xml b/OsmAnd/res/layout/open_time_list_item.xml
index d6386d0272..da09d01714 100644
--- a/OsmAnd/res/layout/open_time_list_item.xml
+++ b/OsmAnd/res/layout/open_time_list_item.xml
@@ -12,7 +12,7 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal">
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/clockIconImageView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/order_poi_list_item.xml b/OsmAnd/res/layout/order_poi_list_item.xml
index 2b9fc09e03..a7e396c634 100644
--- a/OsmAnd/res/layout/order_poi_list_item.xml
+++ b/OsmAnd/res/layout/order_poi_list_item.xml
@@ -15,7 +15,7 @@
 		android:orientation="horizontal"
 		tools:background="?android:attr/selectableItemBackground">
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/action_icon"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
@@ -28,7 +28,7 @@
 			android:paddingEnd="@dimen/content_padding"
 			android:paddingStart="@dimen/content_padding" />
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/icon"
 			android:layout_width="@dimen/standard_icon_size"
 			android:layout_height="@dimen/standard_icon_size"
@@ -58,7 +58,7 @@
 			android:paddingEnd="@dimen/content_padding"
 			android:paddingStart="0dp" />
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/move_icon"
 			android:layout_width="wrap_content"
 			android:layout_height="match_parent"
diff --git a/OsmAnd/res/layout/osm_edit_list_item.xml b/OsmAnd/res/layout/osm_edit_list_item.xml
index 60cea386aa..82095833cc 100644
--- a/OsmAnd/res/layout/osm_edit_list_item.xml
+++ b/OsmAnd/res/layout/osm_edit_list_item.xml
@@ -21,7 +21,7 @@
 	    android:layout_marginEnd="@dimen/dialog_elements_vertical_margin"
 	    android:layout_marginStart="@dimen/dialog_elements_vertical_margin" />
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/iconImageView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/osmlive_cancelled_dialog_fragment.xml b/OsmAnd/res/layout/osmlive_cancelled_dialog_fragment.xml
index e65aa1ce39..a936b85350 100644
--- a/OsmAnd/res/layout/osmlive_cancelled_dialog_fragment.xml
+++ b/OsmAnd/res/layout/osmlive_cancelled_dialog_fragment.xml
@@ -35,7 +35,7 @@
 
             </FrameLayout>
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
diff --git a/OsmAnd/res/layout/plan_route_gpx.xml b/OsmAnd/res/layout/plan_route_gpx.xml
index 5405068566..5e68cdfa44 100644
--- a/OsmAnd/res/layout/plan_route_gpx.xml
+++ b/OsmAnd/res/layout/plan_route_gpx.xml
@@ -13,7 +13,7 @@
 	android:paddingEnd="@dimen/content_padding"
 	android:paddingStart="@dimen/content_padding">
 
-	<ImageView
+	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/icon"
 		android:layout_width="@dimen/standard_icon_size"
 		android:layout_height="@dimen/standard_icon_size"
@@ -50,7 +50,7 @@
 
 	</LinearLayout>
 
-	<ImageView
+	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/dropDownIcon"
 		android:layout_width="wrap_content"
 		android:layout_height="match_parent"
diff --git a/OsmAnd/res/layout/plan_route_info.xml b/OsmAnd/res/layout/plan_route_info.xml
index bc54e24f9a..7e0644c2e6 100644
--- a/OsmAnd/res/layout/plan_route_info.xml
+++ b/OsmAnd/res/layout/plan_route_info.xml
@@ -76,7 +76,7 @@
 						android:background="@color/color_transparent"
 						android:layout_gravity="end">
 
-						<ImageView
+						<androidx.appcompat.widget.AppCompatImageView
 							android:id="@+id/app_modes_options"
 							android:layout_width="wrap_content"
 							android:layout_height="match_parent"
@@ -106,7 +106,7 @@
 					android:minHeight="@dimen/route_info_list_item_height"
 					android:orientation="horizontal">
 
-					<ImageView
+					<androidx.appcompat.widget.AppCompatImageView
 						android:id="@+id/fromIcon"
 						android:layout_width="@dimen/standard_icon_size"
 						android:layout_height="@dimen/standard_icon_size"
@@ -189,7 +189,7 @@
 								android:visibility="gone"
 								tools:ignore="UnusedAttribute" />
 
-							<ImageView
+							<androidx.appcompat.widget.AppCompatImageView
 								android:id="@+id/from_button_image_view"
 								android:layout_width="@dimen/standard_icon_size"
 								android:layout_height="@dimen/standard_icon_size"
@@ -226,7 +226,7 @@
 					android:minHeight="@dimen/route_info_list_item_height"
 					android:orientation="horizontal">
 
-					<ImageView
+					<androidx.appcompat.widget.AppCompatImageView
 						android:id="@+id/viaIcon"
 						android:layout_width="@dimen/standard_icon_size"
 						android:layout_height="@dimen/standard_icon_size"
@@ -309,7 +309,7 @@
 								osmand:typeface="@string/font_roboto_medium"
 								tools:ignore="UnusedAttribute" />
 
-							<ImageView
+							<androidx.appcompat.widget.AppCompatImageView
 								android:id="@+id/via_button_image_view"
 								android:layout_width="@dimen/standard_icon_size"
 								android:layout_height="@dimen/standard_icon_size"
@@ -346,7 +346,7 @@
 					android:minHeight="@dimen/route_info_list_item_height"
 					android:orientation="horizontal">
 
-					<ImageView
+					<androidx.appcompat.widget.AppCompatImageView
 						android:id="@+id/toIcon"
 						android:layout_width="@dimen/standard_icon_size"
 						android:layout_height="@dimen/standard_icon_size"
@@ -426,7 +426,7 @@
 								osmand:typeface="@string/font_roboto_medium"
 								tools:ignore="UnusedAttribute" />
 
-							<ImageView
+							<androidx.appcompat.widget.AppCompatImageView
 								android:id="@+id/to_button_image_view"
 								android:layout_width="@dimen/standard_icon_size"
 								android:layout_height="@dimen/standard_icon_size"
@@ -501,7 +501,7 @@
 						osmand:typeface="@string/font_roboto_medium"
 						tools:ignore="UnusedAttribute" />
 
-					<ImageView
+					<androidx.appcompat.widget.AppCompatImageView
 						android:id="@+id/map_options_route_button_icon"
 						android:layout_width="@dimen/standard_icon_size"
 						android:layout_height="@dimen/standard_icon_size"
@@ -572,7 +572,7 @@
 			android:layout_width="match_parent"
 			android:layout_height="@dimen/route_info_modes_height" />
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_gravity="top"
@@ -588,7 +588,7 @@
 		android:layout_gravity="bottom"
 		android:orientation="vertical">
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/buttons_shadow"
 			android:layout_width="match_parent"
 			android:layout_height="10dp"
diff --git a/OsmAnd/res/layout/plan_route_toolbar_and_up_down_row.xml b/OsmAnd/res/layout/plan_route_toolbar_and_up_down_row.xml
index 61c9f833c7..25e86566bc 100644
--- a/OsmAnd/res/layout/plan_route_toolbar_and_up_down_row.xml
+++ b/OsmAnd/res/layout/plan_route_toolbar_and_up_down_row.xml
@@ -84,7 +84,7 @@
         android:layout_height="@dimen/measurement_tool_up_down_row_height"
         android:background="?attr/selectableItemBackground">
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/up_down_icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/plugin.xml b/OsmAnd/res/layout/plugin.xml
index 7fe01e1dd5..b0436d95e5 100644
--- a/OsmAnd/res/layout/plugin.xml
+++ b/OsmAnd/res/layout/plugin.xml
@@ -17,7 +17,7 @@
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content">
 
-			<ImageView
+			<androidx.appcompat.widget.AppCompatImageView
 				android:id="@+id/plugin_image_placeholder"
 				android:layout_width="360dp"
 				android:layout_height="144dp"
@@ -27,7 +27,7 @@
 				osmand:srcCompat="@drawable/ic_extension_dark"
 				android:visibility="gone"/>
 
-			<ImageView
+			<androidx.appcompat.widget.AppCompatImageView
 				android:id="@+id/plugin_image"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
@@ -136,7 +136,7 @@
 	        android:paddingEnd="@dimen/content_padding"
 	        android:paddingStart="@dimen/content_padding">
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/ic_world_globe"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/poi_filter_list_item.xml b/OsmAnd/res/layout/poi_filter_list_item.xml
index 5bf47b67c8..20d4a93bb2 100644
--- a/OsmAnd/res/layout/poi_filter_list_item.xml
+++ b/OsmAnd/res/layout/poi_filter_list_item.xml
@@ -23,7 +23,7 @@
             android:layout_height="match_parent"
             android:gravity="center">
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/icon"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
@@ -91,7 +91,7 @@
             android:focusable="false"
             android:visibility="gone"/>
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/expandItem"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/point_editor_button.xml b/OsmAnd/res/layout/point_editor_button.xml
index 9f8148d70e..a5677280e9 100644
--- a/OsmAnd/res/layout/point_editor_button.xml
+++ b/OsmAnd/res/layout/point_editor_button.xml
@@ -13,14 +13,14 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content">
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/outline"
 			android:layout_width="@dimen/favorites_icon_outline_size"
 			android:layout_height="@dimen/favorites_icon_outline_size"
 			android:visibility="invisible"
 			app:srcCompat="@drawable/bg_point_circle_contour" />
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/background"
 			android:layout_width="@dimen/favorites_icon_size"
 			android:layout_height="@dimen/favorites_icon_size"
@@ -28,7 +28,7 @@
 			android:layout_gravity="center"
 			app:srcCompat="@drawable/bg_point_circle" />
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/icon"
 			android:layout_width="@dimen/standard_icon_size"
 			android:layout_height="@dimen/standard_icon_size"
diff --git a/OsmAnd/res/layout/point_editor_fragment.xml b/OsmAnd/res/layout/point_editor_fragment.xml
index 21bcb3ff57..561043aba0 100644
--- a/OsmAnd/res/layout/point_editor_fragment.xml
+++ b/OsmAnd/res/layout/point_editor_fragment.xml
@@ -68,7 +68,7 @@
                                 android:layout_height="match_parent"
                                 android:orientation="horizontal">
 
-                                <ImageView
+                                <androidx.appcompat.widget.AppCompatImageView
                                     android:id="@+id/name_image"
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
@@ -131,7 +131,7 @@
                                 android:layout_height="match_parent"
                                 android:orientation="horizontal">
 
-                                <ImageView
+                                <androidx.appcompat.widget.AppCompatImageView
                                     android:id="@+id/category_image"
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
@@ -199,7 +199,7 @@
                                 android:layout_height="match_parent"
                                 android:orientation="horizontal">
 
-                                <ImageView
+                                <androidx.appcompat.widget.AppCompatImageView
                                     android:id="@+id/description_image"
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/point_editor_fragment_new.xml b/OsmAnd/res/layout/point_editor_fragment_new.xml
index 55a5211821..53b1578816 100644
--- a/OsmAnd/res/layout/point_editor_fragment_new.xml
+++ b/OsmAnd/res/layout/point_editor_fragment_new.xml
@@ -28,7 +28,7 @@
 			osmand:theme="@style/ThemeOverlay.AppCompat.ActionBar"
 			osmand:titleTextColor="?android:textColorPrimary">
 
-			<ImageView
+			<androidx.appcompat.widget.AppCompatImageView
 				android:id="@+id/toolbar_action"
 				android:layout_width="@dimen/standard_icon_size"
 				android:layout_height="match_parent"
@@ -100,7 +100,7 @@
 
 					</LinearLayout>
 
-					<ImageView
+					<androidx.appcompat.widget.AppCompatImageView
 						android:id="@+id/name_icon"
 						android:layout_width="@dimen/favorites_icon_size"
 						android:layout_height="@dimen/favorites_icon_size"
@@ -218,7 +218,7 @@
 								osmand:typeface="@string/font_roboto_medium"
 								tools:ignore="UnusedAttribute" />
 
-							<ImageView
+							<androidx.appcompat.widget.AppCompatImageView
 								android:id="@+id/group_list_button_icon"
 								android:layout_width="@dimen/standard_icon_size"
 								android:layout_height="@dimen/standard_icon_size"
@@ -410,7 +410,7 @@
 					android:layout_gravity="center"
 					android:orientation="horizontal">
 
-					<ImageView
+					<androidx.appcompat.widget.AppCompatImageView
 						android:id="@+id/replace_action_icon"
 						android:layout_width="@dimen/standard_icon_size"
 						android:layout_height="@dimen/standard_icon_size"
@@ -462,7 +462,7 @@
 					android:gravity="center_vertical"
 					android:orientation="horizontal">
 
-					<ImageView
+					<androidx.appcompat.widget.AppCompatImageView
 						android:id="@+id/delete_action_icon"
 						android:layout_width="@dimen/standard_icon_size"
 						android:layout_height="@dimen/standard_icon_size"
diff --git a/OsmAnd/res/layout/point_editor_group_select_item.xml b/OsmAnd/res/layout/point_editor_group_select_item.xml
index 97da470972..ec78c54e75 100644
--- a/OsmAnd/res/layout/point_editor_group_select_item.xml
+++ b/OsmAnd/res/layout/point_editor_group_select_item.xml
@@ -7,7 +7,7 @@
 	android:layout_marginLeft="@dimen/content_padding_half"
 	android:layout_marginStart="@dimen/content_padding_half">
 
-	<ImageView
+	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/outlineRect"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
@@ -17,7 +17,7 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content">
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/groupIcon"
 			android:layout_width="@dimen/standard_icon_size"
 			android:layout_height="@dimen/standard_icon_size"
diff --git a/OsmAnd/res/layout/preference_activity.xml b/OsmAnd/res/layout/preference_activity.xml
index 829af19eda..3fecba1078 100644
--- a/OsmAnd/res/layout/preference_activity.xml
+++ b/OsmAnd/res/layout/preference_activity.xml
@@ -53,7 +53,7 @@
 			android:paddingRight="@dimen/content_padding_small"
 			android:orientation="horizontal">
 
-			<ImageView
+			<androidx.appcompat.widget.AppCompatImageView
 				android:id="@+id/mode_icon"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
@@ -93,7 +93,7 @@
 
 			</LinearLayout>
 
-			<ImageView
+			<androidx.appcompat.widget.AppCompatImageView
 				android:id="@+id/type_down_arrow"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
@@ -114,7 +114,7 @@
 				android:layout_width="match_parent"
 				android:layout_height="match_parent" />
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/selector_shadow"
 			android:layout_width="match_parent"
 			android:layout_height="@dimen/abp__shadow_height"
@@ -122,7 +122,7 @@
 			android:visibility="gone"
 			tools:ignore="ContentDescription"/>
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 				android:id="@+id/shadowView"
 				android:layout_width="match_parent"
 				android:layout_height="@dimen/abp__shadow_height"
diff --git a/OsmAnd/res/layout/preference_button.xml b/OsmAnd/res/layout/preference_button.xml
index c17a530db7..66d59b377b 100644
--- a/OsmAnd/res/layout/preference_button.xml
+++ b/OsmAnd/res/layout/preference_button.xml
@@ -14,7 +14,7 @@
 		android:minHeight="@dimen/bottom_sheet_list_item_height"
 		tools:background="?android:attr/selectableItemBackground">
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@android:id/icon"
 			android:layout_width="@dimen/standard_icon_size"
 			android:layout_height="@dimen/standard_icon_size"
diff --git a/OsmAnd/res/layout/preference_category_with_descr.xml b/OsmAnd/res/layout/preference_category_with_descr.xml
index cf69a46963..8d316d54a5 100644
--- a/OsmAnd/res/layout/preference_category_with_descr.xml
+++ b/OsmAnd/res/layout/preference_category_with_descr.xml
@@ -9,7 +9,7 @@
 	android:minHeight="@dimen/bottom_sheet_cancel_button_height_small"
 	android:orientation="horizontal">
 
-	<ImageView
+	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@android:id/icon"
 		android:layout_width="@dimen/standard_icon_size"
 		android:layout_height="@dimen/standard_icon_size"
diff --git a/OsmAnd/res/layout/preference_circle_item.xml b/OsmAnd/res/layout/preference_circle_item.xml
index 778ad00de8..662b848f29 100644
--- a/OsmAnd/res/layout/preference_circle_item.xml
+++ b/OsmAnd/res/layout/preference_circle_item.xml
@@ -5,20 +5,20 @@
 	android:layout_height="wrap_content"
 	android:padding="7dp">
 
-	<ImageView
+	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/outline"
 		android:layout_width="56dp"
 		android:layout_height="56dp"
 		app:srcCompat="@drawable/circle_contour_bg_light" />
 
-	<ImageView
+	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/background"
 		android:layout_width="48dp"
 		android:layout_height="48dp"
 		android:layout_margin="4dp"
 		android:background="@drawable/circle_background_light" />
 
-	<ImageView
+	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/checkMark"
 		android:layout_width="24dp"
 		android:layout_height="24dp"
diff --git a/OsmAnd/res/layout/preference_dialog_and_switch.xml b/OsmAnd/res/layout/preference_dialog_and_switch.xml
index 71c34bfe01..a17c655d87 100644
--- a/OsmAnd/res/layout/preference_dialog_and_switch.xml
+++ b/OsmAnd/res/layout/preference_dialog_and_switch.xml
@@ -13,7 +13,7 @@
 		android:layout_height="wrap_content"
 		tools:background="?android:attr/selectableItemBackground">
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@android:id/icon"
 			android:layout_width="@dimen/standard_icon_size"
 			android:layout_height="@dimen/standard_icon_size"
diff --git a/OsmAnd/res/layout/preference_dropdown_list.xml b/OsmAnd/res/layout/preference_dropdown_list.xml
index cbcdf340e9..ec62e1232d 100644
--- a/OsmAnd/res/layout/preference_dropdown_list.xml
+++ b/OsmAnd/res/layout/preference_dropdown_list.xml
@@ -16,7 +16,7 @@
 		android:layout_marginRight="@dimen/list_content_padding"
 		android:layout_marginBottom="@dimen/content_padding_half">
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/type_down_arrow"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/preference_info.xml b/OsmAnd/res/layout/preference_info.xml
index 28847c6f7a..8bf9644a72 100644
--- a/OsmAnd/res/layout/preference_info.xml
+++ b/OsmAnd/res/layout/preference_info.xml
@@ -7,7 +7,7 @@
 	android:background="?attr/list_background_color"
 	android:minHeight="@dimen/bottom_sheet_list_item_height">
 
-	<ImageView
+	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@android:id/icon"
 		android:layout_width="@dimen/standard_icon_size"
 		android:layout_height="@dimen/standard_icon_size"
diff --git a/OsmAnd/res/layout/preference_permission.xml b/OsmAnd/res/layout/preference_permission.xml
index 595084411f..745d6c3fa1 100644
--- a/OsmAnd/res/layout/preference_permission.xml
+++ b/OsmAnd/res/layout/preference_permission.xml
@@ -17,7 +17,7 @@
 		android:layout_marginEnd="@dimen/content_padding_half"
 		android:layout_marginStart="@dimen/content_padding_half">
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@android:id/icon"
 			android:layout_width="@dimen/standard_icon_size"
 			android:layout_height="@dimen/standard_icon_size"
diff --git a/OsmAnd/res/layout/preference_profile_item_with_radio_btn.xml b/OsmAnd/res/layout/preference_profile_item_with_radio_btn.xml
index d96b20c3b8..f5197f89af 100644
--- a/OsmAnd/res/layout/preference_profile_item_with_radio_btn.xml
+++ b/OsmAnd/res/layout/preference_profile_item_with_radio_btn.xml
@@ -7,7 +7,7 @@
 	android:minHeight="@dimen/bottom_sheet_large_list_item_height"
 	android:orientation="horizontal">
 
-	<ImageView
+	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/icon"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/preference_select_icon_button.xml b/OsmAnd/res/layout/preference_select_icon_button.xml
index d92a103c86..3d4566a41f 100644
--- a/OsmAnd/res/layout/preference_select_icon_button.xml
+++ b/OsmAnd/res/layout/preference_select_icon_button.xml
@@ -9,26 +9,26 @@
 		android:layout_width="@dimen/setting_select_icon_button_width"
 		android:layout_height="@dimen/setting_select_icon_button_height">
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/outlineRect"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
 			app:srcCompat="@drawable/bg_select_icon_button_outline" />
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/backgroundRect"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
 			android:layout_margin="@dimen/list_item_button_padding"
 			android:background="@drawable/bg_select_icon_button" />
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/headingIcon"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_gravity="center" />
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/icon"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/preference_switch.xml b/OsmAnd/res/layout/preference_switch.xml
index b9c8d1d77f..592e3486c2 100644
--- a/OsmAnd/res/layout/preference_switch.xml
+++ b/OsmAnd/res/layout/preference_switch.xml
@@ -14,7 +14,7 @@
 		android:minHeight="@dimen/bottom_sheet_list_item_height"
 		tools:background="?android:attr/selectableItemBackground">
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@android:id/icon"
 			android:layout_width="@dimen/standard_icon_size"
 			android:layout_height="@dimen/standard_icon_size"
diff --git a/OsmAnd/res/layout/preference_switch_with_descr.xml b/OsmAnd/res/layout/preference_switch_with_descr.xml
index 3b6abafaff..96127aab99 100644
--- a/OsmAnd/res/layout/preference_switch_with_descr.xml
+++ b/OsmAnd/res/layout/preference_switch_with_descr.xml
@@ -14,7 +14,7 @@
 		android:minHeight="@dimen/bottom_sheet_list_item_height"
 		tools:background="?android:attr/selectableItemBackground">
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@android:id/icon"
 			android:layout_width="@dimen/standard_icon_size"
 			android:layout_height="@dimen/standard_icon_size"
diff --git a/OsmAnd/res/layout/preference_with_descr.xml b/OsmAnd/res/layout/preference_with_descr.xml
index 180c0974ec..1cbe632f2c 100644
--- a/OsmAnd/res/layout/preference_with_descr.xml
+++ b/OsmAnd/res/layout/preference_with_descr.xml
@@ -14,7 +14,7 @@
 		android:minHeight="@dimen/setting_list_item_large_height"
 		tools:background="?android:attr/selectableItemBackground">
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@android:id/icon"
 			android:layout_width="@dimen/standard_icon_size"
 			android:layout_height="@dimen/standard_icon_size"
diff --git a/OsmAnd/res/layout/preference_with_descr_dialog_and_switch.xml b/OsmAnd/res/layout/preference_with_descr_dialog_and_switch.xml
index 17234fe1c6..365a21278f 100644
--- a/OsmAnd/res/layout/preference_with_descr_dialog_and_switch.xml
+++ b/OsmAnd/res/layout/preference_with_descr_dialog_and_switch.xml
@@ -14,7 +14,7 @@
 		android:minHeight="@dimen/setting_list_item_large_height"
 		tools:background="?android:attr/selectableItemBackground">
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@android:id/icon"
 			android:layout_width="@dimen/standard_icon_size"
 			android:layout_height="@dimen/standard_icon_size"
diff --git a/OsmAnd/res/layout/prev_route_card.xml b/OsmAnd/res/layout/prev_route_card.xml
index 695c9429a4..8b58f769e1 100644
--- a/OsmAnd/res/layout/prev_route_card.xml
+++ b/OsmAnd/res/layout/prev_route_card.xml
@@ -12,7 +12,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content">
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:scaleType="fitXY"
@@ -114,7 +114,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="14dp">
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/bottom_shadow"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/profile_button_small.xml b/OsmAnd/res/layout/profile_button_small.xml
index 3264451f40..187e35dec0 100644
--- a/OsmAnd/res/layout/profile_button_small.xml
+++ b/OsmAnd/res/layout/profile_button_small.xml
@@ -7,7 +7,7 @@
 	tools:background="?attr/bg_circle"
 	tools:backgroundTint="@color/active_buttons_and_links_trans_light">
 
-	<ImageView
+	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/profile_icon"
 		android:layout_width="@dimen/standard_icon_size"
 		android:layout_height="@dimen/standard_icon_size"
diff --git a/OsmAnd/res/layout/profile_data_list_item_child.xml b/OsmAnd/res/layout/profile_data_list_item_child.xml
index 2fbfc333e3..798520a161 100644
--- a/OsmAnd/res/layout/profile_data_list_item_child.xml
+++ b/OsmAnd/res/layout/profile_data_list_item_child.xml
@@ -18,7 +18,7 @@
 			android:background="?attr/selectableItemBackground"
 			android:gravity="center_vertical">
 
-			<ImageView
+			<androidx.appcompat.widget.AppCompatImageView
 				android:id="@+id/icon"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/profile_data_list_item_group.xml b/OsmAnd/res/layout/profile_data_list_item_group.xml
index bd07f7b54c..e10b9eecd0 100644
--- a/OsmAnd/res/layout/profile_data_list_item_group.xml
+++ b/OsmAnd/res/layout/profile_data_list_item_group.xml
@@ -25,7 +25,7 @@
 			android:minHeight="66dp"
 			android:orientation="horizontal">
 
-			<ImageView
+			<androidx.appcompat.widget.AppCompatImageView
 				android:id="@+id/explist_indicator"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/profile_edit_list_item.xml b/OsmAnd/res/layout/profile_edit_list_item.xml
index 4ba371355d..eeaff2aed8 100644
--- a/OsmAnd/res/layout/profile_edit_list_item.xml
+++ b/OsmAnd/res/layout/profile_edit_list_item.xml
@@ -37,7 +37,7 @@
 			android:layout_marginEnd="@dimen/content_padding_half"
 			android:layout_marginRight="@dimen/content_padding_half" />
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/icon"
 			android:layout_width="@dimen/standard_icon_size"
 			android:layout_height="@dimen/standard_icon_size"
@@ -94,7 +94,7 @@
 			android:layout_marginRight="@dimen/content_padding_half"
 			android:padding="@dimen/content_padding_small">
 
-			<ImageView
+			<androidx.appcompat.widget.AppCompatImageView
 				android:id="@+id/move_icon"
 				android:layout_width="@dimen/standard_icon_size"
 				android:layout_height="@dimen/standard_icon_size"
diff --git a/OsmAnd/res/layout/profile_list_item.xml b/OsmAnd/res/layout/profile_list_item.xml
index f9935e795a..259320eb14 100644
--- a/OsmAnd/res/layout/profile_list_item.xml
+++ b/OsmAnd/res/layout/profile_list_item.xml
@@ -10,7 +10,7 @@
 	android:gravity="center"
 	android:orientation="horizontal">
 
-	<ImageView
+	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/icon"
 		android:layout_width="@dimen/standard_icon_size"
 		android:layout_height="@dimen/standard_icon_size"
diff --git a/OsmAnd/res/layout/profile_preference_toolbar_big.xml b/OsmAnd/res/layout/profile_preference_toolbar_big.xml
index bae4062460..6ee4c0d2a0 100644
--- a/OsmAnd/res/layout/profile_preference_toolbar_big.xml
+++ b/OsmAnd/res/layout/profile_preference_toolbar_big.xml
@@ -64,7 +64,7 @@
 			android:layout_marginEnd="@dimen/context_menu_padding_margin_tiny"
 			android:layout_marginStart="@dimen/context_menu_padding_margin_tiny">
 
-			<ImageView
+			<androidx.appcompat.widget.AppCompatImageView
 				android:id="@+id/profile_icon"
 				android:layout_width="@dimen/standard_icon_size"
 				android:layout_height="@dimen/standard_icon_size"
@@ -117,7 +117,7 @@
 
 			</LinearLayout>
 
-			<ImageView
+			<androidx.appcompat.widget.AppCompatImageView
 				android:layout_width="@dimen/standard_icon_size"
 				android:layout_height="@dimen/standard_icon_size"
 				android:layout_gravity="center_vertical"
diff --git a/OsmAnd/res/layout/quick_action_add_bug.xml b/OsmAnd/res/layout/quick_action_add_bug.xml
index 7effbd7311..9f50b7ede7 100644
--- a/OsmAnd/res/layout/quick_action_add_bug.xml
+++ b/OsmAnd/res/layout/quick_action_add_bug.xml
@@ -35,14 +35,14 @@
 
     </LinearLayout>
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
         android:scaleType="fitXY"
         osmand:srcCompat="@drawable/bg_shadow_list_bottom" />
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
@@ -114,7 +114,7 @@
 
     </LinearLayout>
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
diff --git a/OsmAnd/res/layout/quick_action_add_dialog_item.xml b/OsmAnd/res/layout/quick_action_add_dialog_item.xml
index 8514443f58..ca125ba6ad 100644
--- a/OsmAnd/res/layout/quick_action_add_dialog_item.xml
+++ b/OsmAnd/res/layout/quick_action_add_dialog_item.xml
@@ -15,7 +15,7 @@
     android:orientation="horizontal">
 
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/image"
         android:layout_width="24dp"
         android:layout_height="24dp"
diff --git a/OsmAnd/res/layout/quick_action_add_favorite.xml b/OsmAnd/res/layout/quick_action_add_favorite.xml
index 98a388d8b9..0fdcad888f 100644
--- a/OsmAnd/res/layout/quick_action_add_favorite.xml
+++ b/OsmAnd/res/layout/quick_action_add_favorite.xml
@@ -36,14 +36,14 @@
 
     </LinearLayout>
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
         android:scaleType="fitXY"
         osmand:srcCompat="@drawable/bg_shadow_list_bottom" />
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:scaleType="fitXY"
@@ -70,7 +70,7 @@
                 android:layout_height="match_parent"
                 android:orientation="horizontal">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/name_image"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -153,7 +153,7 @@
                 android:layout_height="match_parent"
                 android:orientation="horizontal">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/category_image"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -219,7 +219,7 @@
 
     </LinearLayout>
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
diff --git a/OsmAnd/res/layout/quick_action_add_gpx.xml b/OsmAnd/res/layout/quick_action_add_gpx.xml
index f9b3afec34..3ecb76c9be 100644
--- a/OsmAnd/res/layout/quick_action_add_gpx.xml
+++ b/OsmAnd/res/layout/quick_action_add_gpx.xml
@@ -36,14 +36,14 @@
 
     </LinearLayout>
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
         android:scaleType="fitXY"
         osmand:srcCompat="@drawable/bg_shadow_list_bottom" />
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:scaleType="fitXY"
@@ -70,7 +70,7 @@
                 android:layout_height="match_parent"
                 android:orientation="horizontal">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/name_image"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -153,7 +153,7 @@
                 android:layout_height="match_parent"
                 android:orientation="horizontal">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/category_image"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -219,7 +219,7 @@
 
     </LinearLayout>
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
diff --git a/OsmAnd/res/layout/quick_action_add_poi_layout.xml b/OsmAnd/res/layout/quick_action_add_poi_layout.xml
index 4a3a9d9be7..a5731f30d6 100644
--- a/OsmAnd/res/layout/quick_action_add_poi_layout.xml
+++ b/OsmAnd/res/layout/quick_action_add_poi_layout.xml
@@ -43,14 +43,14 @@
 
         </LinearLayout>
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="top"
             android:scaleType="fitXY"
             osmand:srcCompat="@drawable/bg_shadow_list_bottom"/>
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="top"
@@ -111,14 +111,14 @@
                 osmand:srcCompat="@drawable/ic_action_help"/>
         </LinearLayout>
 
-        <!--<ImageView-->
+        <!--<androidx.appcompat.widget.AppCompatImageView-->
             <!--android:layout_width="match_parent"-->
             <!--android:layout_height="wrap_content"-->
             <!--android:layout_gravity="top"-->
             <!--android:scaleType="fitXY"-->
             <!--osmand:srcCompat="@drawable/bg_shadow_list_bottom"/>-->
 
-        <!--<ImageView-->
+        <!--<androidx.appcompat.widget.AppCompatImageView-->
             <!--android:layout_width="match_parent"-->
             <!--android:layout_height="wrap_content"-->
             <!--android:layout_gravity="top"-->
@@ -172,7 +172,7 @@
                 <!--osmand:typeface="@string/font_roboto_medium"/>-->
         </LinearLayout>
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="top"
diff --git a/OsmAnd/res/layout/quick_action_create_edit_dialog.xml b/OsmAnd/res/layout/quick_action_create_edit_dialog.xml
index 2cf6b1e43c..50e95318fb 100644
--- a/OsmAnd/res/layout/quick_action_create_edit_dialog.xml
+++ b/OsmAnd/res/layout/quick_action_create_edit_dialog.xml
@@ -107,14 +107,14 @@
                 android:id="@+id/container"/>
         </ScrollView>
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:scaleType="fitXY"
             android:layout_gravity="top"
             app:srcCompat="@drawable/bg_shadow_list_bottom"/>
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:scaleType="fitXY"
diff --git a/OsmAnd/res/layout/quick_action_deletable_list_item.xml b/OsmAnd/res/layout/quick_action_deletable_list_item.xml
index 59c19ef849..0b4abd141a 100644
--- a/OsmAnd/res/layout/quick_action_deletable_list_item.xml
+++ b/OsmAnd/res/layout/quick_action_deletable_list_item.xml
@@ -16,7 +16,7 @@
         android:minHeight="60dp"
         android:orientation="horizontal">
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/icon"
             android:layout_width="56dp"
             android:layout_height="match_parent"
@@ -41,7 +41,7 @@
             android:textSize="@dimen/default_list_text_size"
             tools:text="Add marker" />
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/delete"
             android:layout_width="56dp"
             android:layout_height="match_parent"
diff --git a/OsmAnd/res/layout/quick_action_list.xml b/OsmAnd/res/layout/quick_action_list.xml
index ce07586e54..7c6f0b8c12 100644
--- a/OsmAnd/res/layout/quick_action_list.xml
+++ b/OsmAnd/res/layout/quick_action_list.xml
@@ -49,7 +49,7 @@
         android:background="?attr/activity_background_color"
         android:orientation="vertical">
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:scaleType="fitXY"
diff --git a/OsmAnd/res/layout/quick_action_show_hide_poi.xml b/OsmAnd/res/layout/quick_action_show_hide_poi.xml
index 1944d0d1a7..aa3d08678e 100644
--- a/OsmAnd/res/layout/quick_action_show_hide_poi.xml
+++ b/OsmAnd/res/layout/quick_action_show_hide_poi.xml
@@ -61,7 +61,7 @@
 
     </LinearLayout>
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
diff --git a/OsmAnd/res/layout/quick_action_start_stop_navigation.xml b/OsmAnd/res/layout/quick_action_start_stop_navigation.xml
index 52fc067d48..f92136ebf4 100644
--- a/OsmAnd/res/layout/quick_action_start_stop_navigation.xml
+++ b/OsmAnd/res/layout/quick_action_start_stop_navigation.xml
@@ -15,14 +15,14 @@
         android:textColor="?android:textColorPrimary"
         android:textSize="@dimen/default_list_text_size"/>
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
         android:scaleType="fitXY"
         osmand:srcCompat="@drawable/bg_shadow_list_bottom"/>
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
@@ -58,7 +58,7 @@
 	        android:layout_marginStart="@dimen/content_padding" />
     </LinearLayout>
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
diff --git a/OsmAnd/res/layout/quick_action_switchable_action.xml b/OsmAnd/res/layout/quick_action_switchable_action.xml
index 9e387eb049..91cf91516f 100644
--- a/OsmAnd/res/layout/quick_action_switchable_action.xml
+++ b/OsmAnd/res/layout/quick_action_switchable_action.xml
@@ -44,14 +44,14 @@
 
     </FrameLayout>
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
         android:scaleType="fitXY"
         app:srcCompat="@drawable/bg_shadow_list_bottom" />
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
@@ -116,7 +116,7 @@
 
     </LinearLayout>
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
diff --git a/OsmAnd/res/layout/quick_action_switchable_item.xml b/OsmAnd/res/layout/quick_action_switchable_item.xml
index d78a0dc45d..00c93eb205 100644
--- a/OsmAnd/res/layout/quick_action_switchable_item.xml
+++ b/OsmAnd/res/layout/quick_action_switchable_item.xml
@@ -16,7 +16,7 @@
         android:minHeight="60dp"
         android:orientation="horizontal">
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/handle_view"
             android:layout_width="56dp"
             android:layout_height="match_parent"
@@ -28,7 +28,7 @@
             android:tint="?attr/secondary_icon_color"
 	        android:layout_marginEnd="4dp" />
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/imageView"
             android:layout_width="24dp"
             android:layout_height="24dp"
@@ -52,7 +52,7 @@
             tools:text="Add marker"
 	        android:paddingEnd="16dp" />
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/closeImageButton"
             android:layout_width="56dp"
             android:layout_height="match_parent"
diff --git a/OsmAnd/res/layout/quick_action_widget_dot.xml b/OsmAnd/res/layout/quick_action_widget_dot.xml
index 500bff82dd..8459d4deeb 100644
--- a/OsmAnd/res/layout/quick_action_widget_dot.xml
+++ b/OsmAnd/res/layout/quick_action_widget_dot.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.appcompat.widget.AppCompatImageView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="4dp"
     android:layout_width="4dp"
     android:layout_marginRight="2dp"
diff --git a/OsmAnd/res/layout/quick_action_widget_item.xml b/OsmAnd/res/layout/quick_action_widget_item.xml
index 0fbf17b6a5..6c589c67b8 100644
--- a/OsmAnd/res/layout/quick_action_widget_item.xml
+++ b/OsmAnd/res/layout/quick_action_widget_item.xml
@@ -20,7 +20,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="24dp">
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/imageView"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
@@ -28,7 +28,7 @@
                 android:tint="?attr/default_icon_color"
                 android:scaleType="centerInside"/>
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/imageSlash"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
diff --git a/OsmAnd/res/layout/quick_action_with_text.xml b/OsmAnd/res/layout/quick_action_with_text.xml
index b7ec4f122a..a8fb9e7baa 100644
--- a/OsmAnd/res/layout/quick_action_with_text.xml
+++ b/OsmAnd/res/layout/quick_action_with_text.xml
@@ -16,7 +16,7 @@
         android:textColor="?android:textColorPrimary"
         android:textSize="@dimen/default_list_text_size" />
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
diff --git a/OsmAnd/res/layout/recording_note_fragment.xml b/OsmAnd/res/layout/recording_note_fragment.xml
index 63d2def48f..aaafd99a98 100644
--- a/OsmAnd/res/layout/recording_note_fragment.xml
+++ b/OsmAnd/res/layout/recording_note_fragment.xml
@@ -56,7 +56,7 @@
                     android:gravity="start|center_vertical"
 	                android:layout_marginStart="12dp">
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/leftButtonIcon"
                         android:layout_width="24dp"
                         android:layout_height="24dp"
@@ -94,7 +94,7 @@
                     android:layout_gravity="center_vertical"
                     android:gravity="center">
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/centerButtonIcon"
                         android:layout_width="24dp"
                         android:layout_height="24dp"
@@ -134,7 +134,7 @@
                     android:layout_gravity="center_vertical"
                     android:gravity="center">
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/rightButtonIcon"
                         android:layout_width="24dp"
                         android:layout_height="24dp"
diff --git a/OsmAnd/res/layout/recording_note_fragment_fullscreen.xml b/OsmAnd/res/layout/recording_note_fragment_fullscreen.xml
index d53e5c2fcc..cc3a6f4e97 100644
--- a/OsmAnd/res/layout/recording_note_fragment_fullscreen.xml
+++ b/OsmAnd/res/layout/recording_note_fragment_fullscreen.xml
@@ -22,7 +22,7 @@
 
         </LinearLayout>
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/imageview"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -51,7 +51,7 @@
                 android:layout_gravity="center_vertical"
                 android:gravity="end|center_vertical">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/leftButtonIcon"
                     android:layout_width="42dp"
                     android:layout_height="42dp"
@@ -95,7 +95,7 @@
                     android:layout_height="48dp"
                     android:layout_gravity="center_vertical">
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/centerButtonIcon"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
@@ -144,7 +144,7 @@
                 android:layout_gravity="center_vertical"
                 android:gravity="start|center_vertical">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/rightButtonIcon"
                     android:layout_width="42dp"
                     android:layout_height="42dp"
diff --git a/OsmAnd/res/layout/restore_purchases_list_footer.xml b/OsmAnd/res/layout/restore_purchases_list_footer.xml
index 5e641e229f..c77d5b665d 100644
--- a/OsmAnd/res/layout/restore_purchases_list_footer.xml
+++ b/OsmAnd/res/layout/restore_purchases_list_footer.xml
@@ -32,7 +32,7 @@
             android:background="@android:drawable/list_selector_background"
 	        android:paddingStart="@dimen/list_content_padding">
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/icon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/route_details_legend.xml b/OsmAnd/res/layout/route_details_legend.xml
index b6ebb8c18d..af441f9a1a 100644
--- a/OsmAnd/res/layout/route_details_legend.xml
+++ b/OsmAnd/res/layout/route_details_legend.xml
@@ -12,7 +12,7 @@
 	android:paddingStart="@dimen/content_padding"
 	android:paddingEnd="@dimen/content_padding">
 
-	<ImageView
+	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/legend_icon_color"
 		android:layout_width="@dimen/standard_icon_size"
 		android:layout_height="@dimen/standard_icon_size"
diff --git a/OsmAnd/res/layout/route_info_card.xml b/OsmAnd/res/layout/route_info_card.xml
index 5eda222d7c..36008a7e68 100644
--- a/OsmAnd/res/layout/route_info_card.xml
+++ b/OsmAnd/res/layout/route_info_card.xml
@@ -63,7 +63,7 @@
 				android:paddingStart="@dimen/bottom_sheet_content_margin_small"
 				android:paddingEnd="@dimen/bottom_sheet_content_margin_small" />
 
-			<ImageView
+			<androidx.appcompat.widget.AppCompatImageView
 				android:id="@+id/up_down_icon"
 				android:layout_width="@dimen/standard_icon_size"
 				android:layout_height="@dimen/standard_icon_size"
diff --git a/OsmAnd/res/layout/route_info_header.xml b/OsmAnd/res/layout/route_info_header.xml
index 6b88e6bced..256cfb683e 100644
--- a/OsmAnd/res/layout/route_info_header.xml
+++ b/OsmAnd/res/layout/route_info_header.xml
@@ -23,7 +23,7 @@
 			android:paddingStart="16dp"
 			android:paddingLeft="16dp">
 
-			<ImageView
+			<androidx.appcompat.widget.AppCompatImageView
 				android:id="@+id/distance_icon"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
@@ -68,7 +68,7 @@
 			android:paddingStart="16dp"
 			android:paddingLeft="16dp">
 
-			<ImageView
+			<androidx.appcompat.widget.AppCompatImageView
 				android:id="@+id/time_icon"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
@@ -204,7 +204,7 @@
 			android:paddingStart="16dp"
 			android:paddingLeft="16dp">
 
-			<ImageView
+			<androidx.appcompat.widget.AppCompatImageView
 				android:id="@+id/average_icon"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
@@ -249,7 +249,7 @@
 			android:paddingStart="16dp"
 			android:paddingLeft="16dp">
 
-			<ImageView
+			<androidx.appcompat.widget.AppCompatImageView
 				android:id="@+id/range_icon"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
@@ -350,7 +350,7 @@
 			android:paddingStart="16dp"
 			android:paddingLeft="16dp">
 
-			<ImageView
+			<androidx.appcompat.widget.AppCompatImageView
 				android:id="@+id/ascent_icon"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
@@ -395,7 +395,7 @@
 			android:paddingStart="16dp"
 			android:paddingLeft="16dp">
 
-			<ImageView
+			<androidx.appcompat.widget.AppCompatImageView
 				android:id="@+id/descent_icon"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/route_info_list_item.xml b/OsmAnd/res/layout/route_info_list_item.xml
index 80122cbd2f..c1c231b0ca 100644
--- a/OsmAnd/res/layout/route_info_list_item.xml
+++ b/OsmAnd/res/layout/route_info_list_item.xml
@@ -42,7 +42,7 @@
                 tools:text="0:50"/>
         </LinearLayout>
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/direction"
             android:layout_marginLeft="@dimen/list_header_padding"
             android:layout_marginRight="@dimen/list_header_padding"
@@ -103,7 +103,7 @@
                 android:textSize="@dimen/default_desc_text_size"
                 tools:text="Head Dmytrivska Street" />
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/lanes"
                 android:layout_width="match_parent"
                 android:layout_height="18dp"
diff --git a/OsmAnd/res/layout/route_info_statistic.xml b/OsmAnd/res/layout/route_info_statistic.xml
index 6d373ecbd9..b937e347ca 100644
--- a/OsmAnd/res/layout/route_info_statistic.xml
+++ b/OsmAnd/res/layout/route_info_statistic.xml
@@ -45,7 +45,7 @@
 					android:paddingEnd="@dimen/route_info_buttons_padding_top_bottom"
 					android:paddingRight="@dimen/route_info_buttons_padding_top_bottom">
 
-					<ImageView
+					<androidx.appcompat.widget.AppCompatImageView
 						android:id="@+id/InfoIcon"
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
@@ -101,7 +101,7 @@
 					android:paddingEnd="@dimen/route_info_buttons_padding_top_bottom"
 					android:paddingRight="@dimen/route_info_buttons_padding_top_bottom">
 
-					<ImageView
+					<androidx.appcompat.widget.AppCompatImageView
 						android:id="@+id/DurationIcon"
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/route_option_btn.xml b/OsmAnd/res/layout/route_option_btn.xml
index b5b83c4bc1..b6adea5f6b 100644
--- a/OsmAnd/res/layout/route_option_btn.xml
+++ b/OsmAnd/res/layout/route_option_btn.xml
@@ -15,7 +15,7 @@
 		android:visibility="visible"
 		tools:background="@drawable/btn_border_dark">
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/route_option_image_view"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/route_options_container.xml b/OsmAnd/res/layout/route_options_container.xml
index 99f1ed7e1a..4a56f12f52 100644
--- a/OsmAnd/res/layout/route_options_container.xml
+++ b/OsmAnd/res/layout/route_options_container.xml
@@ -49,7 +49,7 @@
 		android:layout_marginStart="8dp"
 		android:layout_marginEnd="8dp" />
 
-	<ImageView
+	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/removable_option_icon"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/route_waypoint_item.xml b/OsmAnd/res/layout/route_waypoint_item.xml
index 19ef0fb5b1..c1cf98b023 100644
--- a/OsmAnd/res/layout/route_waypoint_item.xml
+++ b/OsmAnd/res/layout/route_waypoint_item.xml
@@ -28,7 +28,7 @@
 		android:orientation="horizontal">
 
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/info_move"
 			android:layout_width="wrap_content"
 			android:layout_height="match_parent"
@@ -46,7 +46,7 @@
 			osmand:srcCompat="@drawable/ic_action_item_move"
 			android:visibility="visible" />
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/waypoint_icon"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/route_waypoints_fragment.xml b/OsmAnd/res/layout/route_waypoints_fragment.xml
index d4f4a0b0f0..fc53646c17 100644
--- a/OsmAnd/res/layout/route_waypoints_fragment.xml
+++ b/OsmAnd/res/layout/route_waypoints_fragment.xml
@@ -26,7 +26,7 @@
 				android:layout_height="match_parent"
 				android:orientation="horizontal">
 
-				<ImageView
+				<androidx.appcompat.widget.AppCompatImageView
 					android:id="@+id/back_button"
 					android:layout_width="wrap_content"
 					android:layout_height="match_parent"
@@ -191,7 +191,7 @@
 		android:layout_gravity="bottom"
 		android:orientation="vertical">
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:layout_width="match_parent"
 			android:layout_height="10dp"
 			android:layout_gravity="bottom"
diff --git a/OsmAnd/res/layout/search_advanced_coords.xml b/OsmAnd/res/layout/search_advanced_coords.xml
index 12c9e4d042..04f7aaa16e 100644
--- a/OsmAnd/res/layout/search_advanced_coords.xml
+++ b/OsmAnd/res/layout/search_advanced_coords.xml
@@ -84,7 +84,7 @@
                     android:orientation="horizontal"
                     android:paddingTop="16dp">
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/latitudeImage"
                         android:layout_width="54dp"
                         android:layout_height="wrap_content"
@@ -132,7 +132,7 @@
                     android:orientation="horizontal"
                     android:paddingTop="16dp">
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/longitudeImage"
                         android:layout_width="54dp"
                         android:layout_height="wrap_content"
@@ -181,7 +181,7 @@
                     android:paddingTop="16dp"
                     android:visibility="gone">
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/northingImage"
                         android:layout_width="54dp"
                         android:layout_height="wrap_content"
@@ -231,7 +231,7 @@
                     android:paddingTop="16dp"
                     android:visibility="gone">
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/eastingImage"
                         android:layout_width="54dp"
                         android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/search_custom_list_item.xml b/OsmAnd/res/layout/search_custom_list_item.xml
index ee3ad0d3c4..fbe183dce0 100644
--- a/OsmAnd/res/layout/search_custom_list_item.xml
+++ b/OsmAnd/res/layout/search_custom_list_item.xml
@@ -17,7 +17,7 @@
 	    android:paddingStart="16dp"
 	    android:paddingEnd="16dp">
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/imageView"
             android:layout_width="24dp"
             android:layout_height="24dp"
diff --git a/OsmAnd/res/layout/search_custom_poi.xml b/OsmAnd/res/layout/search_custom_poi.xml
index b9e427ab7c..467d353d64 100644
--- a/OsmAnd/res/layout/search_custom_poi.xml
+++ b/OsmAnd/res/layout/search_custom_poi.xml
@@ -71,7 +71,7 @@
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/search_icon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -91,7 +91,7 @@
                 android:textColor="?android:attr/textColorPrimary"
                 android:textSize="@dimen/default_list_text_size" />
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/search_close"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -120,7 +120,7 @@
             android:dividerHeight="0dp"
             android:drawSelectorOnTop="true"/>
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/bottomBarShadow"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/search_dialog_fragment.xml b/OsmAnd/res/layout/search_dialog_fragment.xml
index 5f2e12f643..9d57a5f09b 100644
--- a/OsmAnd/res/layout/search_dialog_fragment.xml
+++ b/OsmAnd/res/layout/search_dialog_fragment.xml
@@ -132,7 +132,7 @@
                     android:minHeight="48dp"
                     android:orientation="horizontal">
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/buttonToolbarImage"
                         android:layout_width="54dp"
                         android:layout_height="wrap_content"
@@ -274,7 +274,7 @@
 
 	</LinearLayout>
 
-	<ImageView
+	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/fab"
 		android:layout_width="@dimen/fab_size_with_shadow"
 		android:layout_height="@dimen/fab_size_with_shadow"
diff --git a/OsmAnd/res/layout/search_favs_list_item.xml b/OsmAnd/res/layout/search_favs_list_item.xml
index 90c2aae4af..4b52ceba22 100644
--- a/OsmAnd/res/layout/search_favs_list_item.xml
+++ b/OsmAnd/res/layout/search_favs_list_item.xml
@@ -19,7 +19,7 @@
 	    android:paddingStart="16dp"
 	    android:paddingEnd="16dp">
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/imageView"
             android:layout_width="24dp"
             android:layout_height="24dp"
@@ -58,7 +58,7 @@
                     android:layout_height="wrap_content"
                     android:orientation="horizontal">
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/direction"
                         android:layout_width="@dimen/directionIconSize"
                         android:layout_height="@dimen/directionIconSize"
diff --git a/OsmAnd/res/layout/search_history_list_item.xml b/OsmAnd/res/layout/search_history_list_item.xml
index adaf8a5218..87569d393f 100644
--- a/OsmAnd/res/layout/search_history_list_item.xml
+++ b/OsmAnd/res/layout/search_history_list_item.xml
@@ -26,7 +26,7 @@
         android:paddingRight="0dp"
         android:paddingEnd="0dp">
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -55,7 +55,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal" >
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/direction"
                     android:layout_width="@dimen/directionIconSize"
                     android:layout_height="@dimen/directionIconSize"
@@ -73,7 +73,7 @@
                     tools:text="100500 km"
 	                android:layout_marginStart="2dp" />
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/type_name_icon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/search_list_item.xml b/OsmAnd/res/layout/search_list_item.xml
index 6f8cc3732f..87214d4488 100644
--- a/OsmAnd/res/layout/search_list_item.xml
+++ b/OsmAnd/res/layout/search_list_item.xml
@@ -30,7 +30,7 @@
             tools:visibility="visible"
 	        android:layout_marginEnd="20dp" />
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/imageView"
             android:layout_width="24dp"
             android:layout_height="24dp"
@@ -71,7 +71,7 @@
                     android:layout_height="match_parent"
                     android:orientation="horizontal">
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/direction"
                         android:layout_width="@dimen/directionIconSize"
                         android:layout_height="@dimen/directionIconSize"
@@ -106,7 +106,7 @@
                     android:gravity="start"
                     android:orientation="horizontal">
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/type_name_icon"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -132,7 +132,7 @@
                     android:gravity="end"
                     android:orientation="horizontal">
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/time_icon"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/search_more_list_item.xml b/OsmAnd/res/layout/search_more_list_item.xml
index 4bbccf294d..41b15480b4 100644
--- a/OsmAnd/res/layout/search_more_list_item.xml
+++ b/OsmAnd/res/layout/search_more_list_item.xml
@@ -120,7 +120,7 @@
             android:layout_weight="1"
             android:gravity="center">
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/online_search_icon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/search_poi_filter.xml b/OsmAnd/res/layout/search_poi_filter.xml
index 945bae3c19..569a8286e6 100644
--- a/OsmAnd/res/layout/search_poi_filter.xml
+++ b/OsmAnd/res/layout/search_poi_filter.xml
@@ -88,7 +88,7 @@
             android:dividerHeight="0dp"
             android:drawSelectorOnTop="true"/>
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/bottomButtonShadow"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/searchpoi.xml b/OsmAnd/res/layout/searchpoi.xml
index 37172548d8..41265f8e34 100644
--- a/OsmAnd/res/layout/searchpoi.xml
+++ b/OsmAnd/res/layout/searchpoi.xml
@@ -16,7 +16,7 @@
         android:orientation="horizontal"
 	    android:layout_marginStart="5dp">
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/search_icon"
             android:layout_width="@dimen/standard_icon_size"
             android:layout_height="@dimen/standard_icon_size"
@@ -50,7 +50,7 @@
 	        android:layout_marginEnd="@dimen/list_content_padding">
         </EditText>
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/options"
             android:contentDescription="@string/shared_string_more"
             android:layout_width="@dimen/list_item_height"
diff --git a/OsmAnd/res/layout/searchpoi_list.xml b/OsmAnd/res/layout/searchpoi_list.xml
index 2fcf5f5638..5ab9f6d596 100644
--- a/OsmAnd/res/layout/searchpoi_list.xml
+++ b/OsmAnd/res/layout/searchpoi_list.xml
@@ -13,7 +13,7 @@
 	android:paddingEnd="@dimen/list_content_padding"
 	android:paddingStart="@dimen/list_content_padding">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/poi_icon"
         android:layout_width="@dimen/standard_icon_size"
         android:layout_height="@dimen/standard_icon_size"
@@ -48,7 +48,7 @@
             android:layout_marginBottom="4dp"
             android:orientation="horizontal" >
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/poi_direction"
                 android:layout_width="@dimen/directionIconSize"
                 android:layout_height="@dimen/directionIconSize"
@@ -68,7 +68,7 @@
                 tools:text="300 km"
 	            android:layout_marginEnd="@dimen/gpx_small_text_margin" />
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/time_icon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/searchpoifolder_list.xml b/OsmAnd/res/layout/searchpoifolder_list.xml
index c5f309ce5b..7e4ce9c558 100644
--- a/OsmAnd/res/layout/searchpoifolder_list.xml
+++ b/OsmAnd/res/layout/searchpoifolder_list.xml
@@ -10,7 +10,7 @@
     android:paddingLeft="@dimen/list_content_padding"
 	android:paddingStart="@dimen/list_content_padding">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/folder_icon"
         android:layout_width="@dimen/standard_icon_size"
 		android:layout_gravity="center_vertical"
@@ -32,7 +32,7 @@
     	android:layout_marginRight="@dimen/list_content_padding"
 	    android:layout_marginEnd="@dimen/list_content_padding" />
          
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/options"
         android:contentDescription="@string/search_poi_filter"
         android:layout_width="@dimen/list_item_height"
diff --git a/OsmAnd/res/layout/select_voice_first.xml b/OsmAnd/res/layout/select_voice_first.xml
index 39c54ec11a..94bdbe816b 100644
--- a/OsmAnd/res/layout/select_voice_first.xml
+++ b/OsmAnd/res/layout/select_voice_first.xml
@@ -29,7 +29,7 @@
         android:paddingTop="@dimen/list_content_padding"
         android:orientation="horizontal">
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/icon"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
@@ -61,7 +61,7 @@
                     android:textSize="@dimen/default_list_text_size"
                     android:text="@string/select_voice_provider"/>
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/dropDownIcon"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
diff --git a/OsmAnd/res/layout/settings_device_image_screen.xml b/OsmAnd/res/layout/settings_device_image_screen.xml
index 0be70aa300..98cbe872f6 100644
--- a/OsmAnd/res/layout/settings_device_image_screen.xml
+++ b/OsmAnd/res/layout/settings_device_image_screen.xml
@@ -6,7 +6,7 @@
 	android:background="?attr/activity_background_color"
 	android:orientation="vertical">
 
-	<ImageView
+	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/device_image"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
@@ -14,7 +14,7 @@
 		tools:background="@drawable/img_settings_device_bottom_light"
 		tools:src="@drawable/img_settings_sreen_route_parameters" />
 
-	<ImageView
+	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/warning_icon"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/split_segments_layout.xml b/OsmAnd/res/layout/split_segments_layout.xml
index 5703c4c875..c4a5d809d9 100644
--- a/OsmAnd/res/layout/split_segments_layout.xml
+++ b/OsmAnd/res/layout/split_segments_layout.xml
@@ -71,7 +71,7 @@
 	            android:paddingStart="16dp"
 	            android:paddingEnd="16dp">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/header_split_image"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -112,7 +112,7 @@
                         osmand:typeface="@string/font_roboto_medium"
                         tools:text="10 km" />
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/split_interval_arrow"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/subscription_fragment.xml b/OsmAnd/res/layout/subscription_fragment.xml
index 553ba43045..040c9fcb2c 100644
--- a/OsmAnd/res/layout/subscription_fragment.xml
+++ b/OsmAnd/res/layout/subscription_fragment.xml
@@ -150,7 +150,7 @@
                             android:minHeight="56dp"
                             android:orientation="horizontal">
 
-                            <ImageView
+                            <androidx.appcompat.widget.AppCompatImageView
                                 android:id="@+id/countryIcon"
                                 android:layout_width="56dp"
                                 android:layout_height="48dp"
@@ -208,7 +208,7 @@
                             android:minHeight="56dp"
                             android:orientation="horizontal">
 
-                            <ImageView
+                            <androidx.appcompat.widget.AppCompatImageView
                                 android:id="@+id/emailIcon"
                                 android:layout_width="56dp"
                                 android:layout_height="48dp"
@@ -256,7 +256,7 @@
                                 android:minHeight="56dp"
                                 android:orientation="horizontal">
 
-                                <ImageView
+                                <androidx.appcompat.widget.AppCompatImageView
                                     android:id="@+id/userNameIcon"
                                     android:layout_width="56dp"
                                     android:layout_height="48dp"
diff --git a/OsmAnd/res/layout/switch_select_list_item.xml b/OsmAnd/res/layout/switch_select_list_item.xml
index 262237f6b7..d362ff05f2 100644
--- a/OsmAnd/res/layout/switch_select_list_item.xml
+++ b/OsmAnd/res/layout/switch_select_list_item.xml
@@ -12,7 +12,7 @@
 	android:paddingEnd="@dimen/list_content_padding"
 	android:paddingStart="@dimen/list_content_padding">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/track_content.xml b/OsmAnd/res/layout/track_content.xml
index 33fad5b8a8..50e728fe6f 100644
--- a/OsmAnd/res/layout/track_content.xml
+++ b/OsmAnd/res/layout/track_content.xml
@@ -22,7 +22,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"/>
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"
diff --git a/OsmAnd/res/layout/track_details.xml b/OsmAnd/res/layout/track_details.xml
index 24903081af..3e88ad10f9 100644
--- a/OsmAnd/res/layout/track_details.xml
+++ b/OsmAnd/res/layout/track_details.xml
@@ -38,7 +38,7 @@
                     android:background="?attr/selectableItemBackground"
                     android:gravity="center_vertical">
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/y_axis_icon"
                         android:layout_width="@dimen/standard_icon_size"
                         android:layout_height="wrap_content"
@@ -59,7 +59,7 @@
                         tools:text="@string/altitude"
 	                    android:layout_marginEnd="8dp" />
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/y_axis_arrow"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
@@ -86,7 +86,7 @@
                         android:background="?attr/dashboard_divider"
                         android:focusable="false"/>
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/x_axis_icon"
                         android:layout_width="@dimen/standard_icon_size"
                         android:layout_height="wrap_content"
@@ -107,7 +107,7 @@
                         tools:text="@string/distance"
 	                    android:layout_marginEnd="8dp" />
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/x_axis_arrow"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
diff --git a/OsmAnd/res/layout/transport_route_card.xml b/OsmAnd/res/layout/transport_route_card.xml
index 8551cfb914..7a6043ea41 100644
--- a/OsmAnd/res/layout/transport_route_card.xml
+++ b/OsmAnd/res/layout/transport_route_card.xml
@@ -139,7 +139,7 @@
 
 	</LinearLayout>
 
-	<ImageView
+	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/bottom_shadow"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/transport_stop_route_item_with_icon.xml b/OsmAnd/res/layout/transport_stop_route_item_with_icon.xml
index 0b7d95226a..fa033e55ed 100644
--- a/OsmAnd/res/layout/transport_stop_route_item_with_icon.xml
+++ b/OsmAnd/res/layout/transport_stop_route_item_with_icon.xml
@@ -14,7 +14,7 @@
 		android:gravity="center_vertical"
 		android:background="?attr/selectableItemBackgroundBorderless">
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/transport_stop_route_icon"
 			android:layout_width="20dp"
 			android:layout_height="20dp"
diff --git a/OsmAnd/res/layout/travel_download_update_card.xml b/OsmAnd/res/layout/travel_download_update_card.xml
index 84986f8c8b..8ad3bb7779 100644
--- a/OsmAnd/res/layout/travel_download_update_card.xml
+++ b/OsmAnd/res/layout/travel_download_update_card.xml
@@ -38,7 +38,7 @@
 				osmand:typeface="@string/font_roboto_medium"
 				tools:text="Download file"/>
 
-			<ImageView
+			<androidx.appcompat.widget.AppCompatImageView
 				android:id="@+id/icon"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
@@ -75,7 +75,7 @@
 		android:paddingStart="@dimen/content_padding"
 		android:layout_marginEnd="@dimen/bottom_sheet_content_margin_small">
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/file_icon"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/travel_needed_map_item.xml b/OsmAnd/res/layout/travel_needed_map_item.xml
index ed1ac398b6..23099784fe 100644
--- a/OsmAnd/res/layout/travel_needed_map_item.xml
+++ b/OsmAnd/res/layout/travel_needed_map_item.xml
@@ -16,7 +16,7 @@
 		android:paddingStart="@dimen/content_padding"
 		android:paddingEnd="@dimen/content_padding">
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/icon"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
@@ -66,7 +66,7 @@
 
 		</LinearLayout>
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/icon_action"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/two_line_with_images_list_item.xml b/OsmAnd/res/layout/two_line_with_images_list_item.xml
index 5312bfe883..66b2777765 100644
--- a/OsmAnd/res/layout/two_line_with_images_list_item.xml
+++ b/OsmAnd/res/layout/two_line_with_images_list_item.xml
@@ -17,7 +17,7 @@
         android:paddingRight="0dp"
         android:paddingEnd="0dp">
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -70,7 +70,7 @@
 
         </LinearLayout>
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/secondaryIcon"
             android:layout_width="@dimen/list_item_height"
             android:layout_height="@dimen/list_item_height"
diff --git a/OsmAnd/res/layout/waypoint_reached.xml b/OsmAnd/res/layout/waypoint_reached.xml
index e85c6a021b..607a4fdb4b 100644
--- a/OsmAnd/res/layout/waypoint_reached.xml
+++ b/OsmAnd/res/layout/waypoint_reached.xml
@@ -10,7 +10,7 @@
     android:descendantFocusability="blocksDescendants"
     android:minHeight="50dp">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/info_move"
         android:layout_width="wrap_content"
         android:layout_height="48dp"
@@ -27,7 +27,7 @@
         android:visibility="gone"
         tools:visibility="visible"/>
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/waypoint_icon"
         android:layout_width="56dp"
         android:layout_height="25dp"
diff --git a/OsmAnd/res/layout/wikivoyage_article_card.xml b/OsmAnd/res/layout/wikivoyage_article_card.xml
index 5f1d7f01e5..b7b266f138 100644
--- a/OsmAnd/res/layout/wikivoyage_article_card.xml
+++ b/OsmAnd/res/layout/wikivoyage_article_card.xml
@@ -58,7 +58,7 @@
 
 				</LinearLayout>
 
-				<ImageView
+				<androidx.appcompat.widget.AppCompatImageView
 					android:id="@+id/icon"
 					android:layout_width="@dimen/wikivoyage_article_card_icon_size"
 					android:layout_height="@dimen/wikivoyage_article_card_icon_size"
diff --git a/OsmAnd/res/layout/wikivoyage_contents_list_item.xml b/OsmAnd/res/layout/wikivoyage_contents_list_item.xml
index 17e356522f..523cb716e5 100644
--- a/OsmAnd/res/layout/wikivoyage_contents_list_item.xml
+++ b/OsmAnd/res/layout/wikivoyage_contents_list_item.xml
@@ -33,7 +33,7 @@
 			tools:drawableStart="@drawable/ic_action_list_header"
 			tools:text="@string/shared_string_contents" />
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/explist_indicator"
 			android:layout_width="wrap_content"
 			android:layout_height="match_parent"
diff --git a/OsmAnd/res/layout/wikivoyage_explore.xml b/OsmAnd/res/layout/wikivoyage_explore.xml
index fe9c9e720d..0fecdb2d61 100644
--- a/OsmAnd/res/layout/wikivoyage_explore.xml
+++ b/OsmAnd/res/layout/wikivoyage_explore.xml
@@ -113,7 +113,7 @@
                     android:textSize="@dimen/default_list_text_size"
                     tools:textColor="?attr/searchbar_text_hint"/>
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/search_icon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/wikivoyage_open_beta_card.xml b/OsmAnd/res/layout/wikivoyage_open_beta_card.xml
index def4a4ac95..608f4dd063 100644
--- a/OsmAnd/res/layout/wikivoyage_open_beta_card.xml
+++ b/OsmAnd/res/layout/wikivoyage_open_beta_card.xml
@@ -20,7 +20,7 @@
 		android:orientation="vertical"
 		android:background="@drawable/travel_card_open_beta_image_bg">
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/background_image"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
diff --git a/OsmAnd/res/layout/wikivoyage_search_list_item.xml b/OsmAnd/res/layout/wikivoyage_search_list_item.xml
index 53c3c2d842..1f78ca6221 100644
--- a/OsmAnd/res/layout/wikivoyage_search_list_item.xml
+++ b/OsmAnd/res/layout/wikivoyage_search_list_item.xml
@@ -22,7 +22,7 @@
 			android:paddingStart="@dimen/wikivoyage_search_icon_margin_left"
 			android:paddingEnd="@dimen/wikivoyage_search_icon_margin_left">
 
-			<ImageView
+			<androidx.appcompat.widget.AppCompatImageView
 				android:id="@+id/icon"
 				android:layout_width="28dp"
 				android:layout_height="28dp"
diff --git a/OsmAnd/res/layout/wikivoyage_start_editing_card.xml b/OsmAnd/res/layout/wikivoyage_start_editing_card.xml
index 75be02aebc..56282db4a5 100644
--- a/OsmAnd/res/layout/wikivoyage_start_editing_card.xml
+++ b/OsmAnd/res/layout/wikivoyage_start_editing_card.xml
@@ -39,7 +39,7 @@
 				android:textSize="@dimen/default_list_text_size"
 				tools:text="@string/start_editing_card_image_text" />
 
-			<ImageView
+			<androidx.appcompat.widget.AppCompatImageView
 				android:id="@+id/background_image"
 				android:layout_width="wrap_content"
 				android:layout_height="@dimen/wikivoyage_explore_card_image_height"
diff --git a/OsmAnd/res/layout/wikivoyage_welcome_screen.xml b/OsmAnd/res/layout/wikivoyage_welcome_screen.xml
index 2c79ef9560..e1924dec49 100644
--- a/OsmAnd/res/layout/wikivoyage_welcome_screen.xml
+++ b/OsmAnd/res/layout/wikivoyage_welcome_screen.xml
@@ -11,7 +11,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content">
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/main_image"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
@@ -21,7 +21,7 @@
 			tools:scaleType="centerCrop"
 			tools:src="@drawable/img_start_screen_travel_night"/>
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/back_button"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/wpt_list_item.xml b/OsmAnd/res/layout/wpt_list_item.xml
index 7c02620483..2524a7d393 100644
--- a/OsmAnd/res/layout/wpt_list_item.xml
+++ b/OsmAnd/res/layout/wpt_list_item.xml
@@ -60,7 +60,7 @@
                 tools:visibility="visible"
 	            android:layout_marginEnd="@dimen/favorites_icon_right_margin" />
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/icon"
                 android:layout_width="@dimen/standard_icon_size"
                 android:layout_height="@dimen/standard_icon_size"
@@ -129,7 +129,7 @@
                 android:layout_marginRight="@dimen/list_item_button_padding"
                 android:orientation="horizontal">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/expand_image"
                     android:layout_width="@dimen/acceptable_touch_radius"
                     android:layout_height="@dimen/acceptable_touch_radius"
diff --git a/OsmAnd/res/layout/xmas_dialog.xml b/OsmAnd/res/layout/xmas_dialog.xml
index 90d9f16fbd..a835db4e5c 100644
--- a/OsmAnd/res/layout/xmas_dialog.xml
+++ b/OsmAnd/res/layout/xmas_dialog.xml
@@ -15,7 +15,7 @@
             android:orientation="vertical"
             android:padding="24dp">
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 osmand:srcCompat="@drawable/ic_christmas_illustration"/>