diff --git a/app/build.gradle b/app/build.gradle
index 3649ec24b0..87bfe0696b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -300,18 +300,18 @@ android {
 dependencies {
     lintChecks project(':lintchecks')
 
-    implementation('androidx.appcompat:appcompat:1.1.0-beta01') {
+    implementation ('androidx.appcompat:appcompat:1.2.0') {
         force = true
     }
-    implementation 'androidx.recyclerview:recyclerview:1.0.0'
-    implementation 'com.google.android.material:material:1.1.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'com.google.android.material:material:1.2.1'
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.preference:preference:1.0.0'
     implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
     implementation 'androidx.exifinterface:exifinterface:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.navigation:navigation-fragment:2.1.0'
     implementation 'androidx.navigation:navigation-ui:2.1.0'
diff --git a/app/src/main/res/layout/activity_shared_contact_details.xml b/app/src/main/res/layout/activity_shared_contact_details.xml
index 04040fc0b3..85f00ea8aa 100644
--- a/app/src/main/res/layout/activity_shared_contact_details.xml
+++ b/app/src/main/res/layout/activity_shared_contact_details.xml
@@ -93,7 +93,7 @@
                             android:gravity="center"
                             android:padding="10dp">
 
-                            <ImageView
+                            <androidx.appcompat.widget.AppCompatImageView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginBottom="6dp"
@@ -117,7 +117,7 @@
                             android:gravity="center"
                             android:padding="10dp">
 
-                            <ImageView
+                            <androidx.appcompat.widget.AppCompatImageView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginBottom="6dp"
diff --git a/app/src/main/res/layout/alert_view.xml b/app/src/main/res/layout/alert_view.xml
index fe2ff895c3..a5f1092021 100644
--- a/app/src/main/res/layout/alert_view.xml
+++ b/app/src/main/res/layout/alert_view.xml
@@ -2,7 +2,7 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:tools="http://schemas.android.com/tools">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/sms_failed_indicator"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -12,7 +12,7 @@
         tools:visibility="visible"
         android:contentDescription="@string/conversation_item_sent__send_failed_indicator_description" />
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/pending_approval_indicator"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/attachment_keyboard_button_item.xml b/app/src/main/res/layout/attachment_keyboard_button_item.xml
index 85ffdee9e8..43eb317d1c 100644
--- a/app/src/main/res/layout/attachment_keyboard_button_item.xml
+++ b/app/src/main/res/layout/attachment_keyboard_button_item.xml
@@ -10,7 +10,7 @@
     android:padding="8dp"
     android:background="?attachment_keyboard_button_background">
 
-  <ImageView
+  <androidx.appcompat.widget.AppCompatImageView
       android:id="@+id/attachment_button_image"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/camera_contact_selection_fragment.xml b/app/src/main/res/layout/camera_contact_selection_fragment.xml
index 76f3800ab5..30ac52ac0a 100644
--- a/app/src/main/res/layout/camera_contact_selection_fragment.xml
+++ b/app/src/main/res/layout/camera_contact_selection_fragment.xml
@@ -104,7 +104,7 @@
         app:layout_constraintEnd_toStartOf="@id/camera_contacts_send_button"
         app:layout_constraintStart_toStartOf="parent"/>
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/camera_contacts_send_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/contact_filter_toolbar.xml b/app/src/main/res/layout/contact_filter_toolbar.xml
index 40aa3167cf..2254780a90 100644
--- a/app/src/main/res/layout/contact_filter_toolbar.xml
+++ b/app/src/main/res/layout/contact_filter_toolbar.xml
@@ -33,30 +33,32 @@
                 android:paddingEnd="10dp"
                 android:gravity="center">
 
-                <ImageView android:id="@+id/search_dialpad"
-                           android:contentDescription="@string/contact_filter_toolbar__show_dial_pad_description"
-                           android:layout_width="wrap_content"
-                           android:layout_height="wrap_content"
-                           android:layout_gravity="center_vertical"
-                           android:gravity="center_vertical"
-                           android:clickable="true"
-                           android:focusable="true"
-                           android:tint="?contact_filter_toolbar_icon_tint"
-                           android:background="?actionBarItemBackground"
-                           app:srcCompat="@drawable/ic_number_pad_conversation_filter_24" />
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/search_dialpad"
+                    android:contentDescription="@string/contact_filter_toolbar__show_dial_pad_description"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:gravity="center_vertical"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:tint="?contact_filter_toolbar_icon_tint"
+                    android:background="?actionBarItemBackground"
+                    app:srcCompat="@drawable/ic_number_pad_conversation_filter_24" />
 
-                <ImageView android:id="@+id/search_keyboard"
-                           android:contentDescription="@string/contact_filter_toolbar__show_keyboard_description"
-                           android:layout_width="wrap_content"
-                           android:layout_height="wrap_content"
-                           android:layout_gravity="center_vertical"
-                           android:gravity="center_vertical"
-                           android:clickable="true"
-                           android:visibility="gone"
-                           android:focusable="true"
-                           android:tint="?contact_filter_toolbar_icon_tint"
-                           android:background="?actionBarItemBackground"
-                           app:srcCompat="?conversation_keyboard_toggle" />
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/search_keyboard"
+                    android:contentDescription="@string/contact_filter_toolbar__show_keyboard_description"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:gravity="center_vertical"
+                    android:clickable="true"
+                    android:visibility="gone"
+                    android:focusable="true"
+                    android:tint="?contact_filter_toolbar_icon_tint"
+                    android:background="?actionBarItemBackground"
+                    app:srcCompat="?conversation_keyboard_toggle" />
 
                 <ImageView android:id="@+id/search_clear"
                            android:contentDescription="@string/contact_filter_toolbar__clear_entered_text_description"
diff --git a/app/src/main/res/layout/conversation_list_fragment.xml b/app/src/main/res/layout/conversation_list_fragment.xml
index dc57cb932e..8b050f0401 100644
--- a/app/src/main/res/layout/conversation_list_fragment.xml
+++ b/app/src/main/res/layout/conversation_list_fragment.xml
@@ -51,7 +51,7 @@
           app:layout_constraintStart_toEndOf="@id/toolbar_icon"
           app:layout_constraintTop_toTopOf="parent" />
 
-      <ImageView
+      <androidx.appcompat.widget.AppCompatImageView
           android:id="@+id/search_action"
           android:layout_width="48dp"
           android:layout_height="48dp"
diff --git a/app/src/main/res/layout/conversation_search_nav.xml b/app/src/main/res/layout/conversation_search_nav.xml
index 5ceab13471..ab756cde06 100644
--- a/app/src/main/res/layout/conversation_search_nav.xml
+++ b/app/src/main/res/layout/conversation_search_nav.xml
@@ -24,7 +24,7 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:text="37 of 73" />
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/conversation_search_up"
         android:layout_width="40dp"
         android:layout_height="40dp"
@@ -39,7 +39,7 @@
         app:layout_constraintEnd_toStartOf="@+id/conversation_search_down"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/conversation_search_down"
         android:layout_width="40dp"
         android:layout_height="40dp"
diff --git a/app/src/main/res/layout/conversation_title_view.xml b/app/src/main/res/layout/conversation_title_view.xml
index 2344a7c1fc..0952692306 100644
--- a/app/src/main/res/layout/conversation_title_view.xml
+++ b/app/src/main/res/layout/conversation_title_view.xml
@@ -56,7 +56,7 @@
 
             <include layout="@layout/expiration_timer_badge" />
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/verified_indicator"
                 android:layout_width="12dp"
                 android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/country_code_text.xml b/app/src/main/res/layout/country_code_text.xml
index 5590ff7b13..5d30afb109 100644
--- a/app/src/main/res/layout/country_code_text.xml
+++ b/app/src/main/res/layout/country_code_text.xml
@@ -10,7 +10,7 @@
     android:paddingStart="11dp"
     android:paddingEnd="11dp">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="3dp"
diff --git a/app/src/main/res/layout/device_add_fragment.xml b/app/src/main/res/layout/device_add_fragment.xml
index edf2857199..15900e0e07 100644
--- a/app/src/main/res/layout/device_add_fragment.xml
+++ b/app/src/main/res/layout/device_add_fragment.xml
@@ -33,13 +33,14 @@
             android:background="?android:windowBackground"
             android:gravity="center">
 
-            <ImageView android:id="@+id/devices"
-                       android:src="@drawable/ic_devices_white"
-                       android:layout_width="wrap_content"
-                       android:layout_height="wrap_content"
-                       android:tint="@color/core_grey_25"
-                       android:transitionName="devices"
-                       android:layout_marginBottom="16dp"/>
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/devices"
+                android:src="@drawable/ic_devices_white"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:tint="@color/core_grey_25"
+                android:transitionName="devices"
+                android:layout_marginBottom="16dp"/>
 
             <TextView android:text="@string/device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link"
                       android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/device_link_fragment.xml b/app/src/main/res/layout/device_link_fragment.xml
index 1ff895d8a0..a51c6ecfdc 100644
--- a/app/src/main/res/layout/device_link_fragment.xml
+++ b/app/src/main/res/layout/device_link_fragment.xml
@@ -5,7 +5,7 @@
               android:layout_height="match_parent"
               android:gravity="center">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:src="@drawable/ic_devices_white"
@@ -62,13 +62,14 @@
                           android:gravity="center_vertical"
                           android:clickable="true">
 
-                <ImageView android:id="@+id/check"
-                           android:layout_width="wrap_content"
-                           android:layout_height="wrap_content"
-                           android:layout_marginEnd="16dp"
-                           android:src="@drawable/ic_check_white_24dp"
-                           android:tint="@color/blue_400"
-                           android:clickable="false"/>
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/check"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="16dp"
+                    android:src="@drawable/ic_check_white_24dp"
+                    android:tint="@color/blue_400"
+                    android:clickable="false"/>
 
                 <TextView
                         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/emoji_display_item.xml b/app/src/main/res/layout/emoji_display_item.xml
index 92c766ac6a..9fca4fa7c5 100644
--- a/app/src/main/res/layout/emoji_display_item.xml
+++ b/app/src/main/res/layout/emoji_display_item.xml
@@ -27,7 +27,7 @@
         android:paddingStart="6dp"
         android:visibility="gone"/>
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/emoji_variation_hint"
         android:layout_width="7dp"
         android:layout_height="7dp"
diff --git a/app/src/main/res/layout/expiration_timer_badge.xml b/app/src/main/res/layout/expiration_timer_badge.xml
index 8402573c7a..6bf00abf07 100644
--- a/app/src/main/res/layout/expiration_timer_badge.xml
+++ b/app/src/main/res/layout/expiration_timer_badge.xml
@@ -10,7 +10,7 @@
     android:visibility="gone"
     android:orientation="horizontal">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/menu_badge_icon"
         android:layout_width="14dp"
         android:layout_height="14dp"
diff --git a/app/src/main/res/layout/giphy_activity_toolbar.xml b/app/src/main/res/layout/giphy_activity_toolbar.xml
index 9e5c983eac..b0d8997fd1 100644
--- a/app/src/main/res/layout/giphy_activity_toolbar.xml
+++ b/app/src/main/res/layout/giphy_activity_toolbar.xml
@@ -7,7 +7,7 @@
                   android:layout_height="match_parent"
                   android:orientation="horizontal">
 
-        <ImageView android:id="@+id/action_icon"
+        <androidx.appcompat.widget.AppCompatImageView android:id="@+id/action_icon"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_gravity="center_vertical"
@@ -39,17 +39,18 @@
                       android:layout_gravity="center_vertical"
                       android:gravity="center_vertical"/>
 
-            <ImageView android:id="@+id/search_clear"
-                       android:layout_width="wrap_content"
-                       android:layout_height="wrap_content"
-                       android:layout_gravity="center_vertical"
-                       android:gravity="center_vertical"
-                       android:clickable="true"
-                       android:focusable="true"
-                       android:visibility="invisible"
-                       android:background="@drawable/circle_touch_highlight_background"
-                       android:tint="?conversation_subtitle_color"
-                       app:srcCompat="@drawable/ic_x" />
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/search_clear"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:gravity="center_vertical"
+                android:clickable="true"
+                android:focusable="true"
+                android:visibility="invisible"
+                android:background="@drawable/circle_touch_highlight_background"
+                android:tint="?conversation_subtitle_color"
+                app:srcCompat="@drawable/ic_x" />
 
             <org.thoughtcrime.securesms.components.AnimatingToggle
                     android:id="@+id/button_toggle"
diff --git a/app/src/main/res/layout/insights_modal.xml b/app/src/main/res/layout/insights_modal.xml
index 4fcc4c72f5..a8d1186079 100644
--- a/app/src/main/res/layout/insights_modal.xml
+++ b/app/src/main/res/layout/insights_modal.xml
@@ -7,7 +7,7 @@
     android:background="?insight_modal_background"
     android:orientation="vertical">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/insights_modal_close"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_selectable_contact_field.xml b/app/src/main/res/layout/item_selectable_contact_field.xml
index 7161a100c2..e0d757a92d 100644
--- a/app/src/main/res/layout/item_selectable_contact_field.xml
+++ b/app/src/main/res/layout/item_selectable_contact_field.xml
@@ -9,7 +9,7 @@
     android:paddingBottom="5dp"
     android:gravity="center_vertical">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/contact_field_icon"
         android:layout_width="24dp"
         android:layout_height="24dp"
diff --git a/app/src/main/res/layout/link_preview.xml b/app/src/main/res/layout/link_preview.xml
index a1dc674714..69ebb9cb5d 100644
--- a/app/src/main/res/layout/link_preview.xml
+++ b/app/src/main/res/layout/link_preview.xml
@@ -86,7 +86,7 @@
             app:layout_constraintVertical_bias="0.0"
             tools:visibility="visible" />
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/linkpreview_close"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/media_keyboard.xml b/app/src/main/res/layout/media_keyboard.xml
index 24e33aef0b..3fc3f43b0b 100644
--- a/app/src/main/res/layout/media_keyboard.xml
+++ b/app/src/main/res/layout/media_keyboard.xml
@@ -11,7 +11,7 @@
         android:layout_height="match_parent"
         android:background="?emoji_drawer_background">
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/media_keyboard_search"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -102,7 +102,7 @@
             app:layout_constraintBottom_toBottomOf="@id/media_keyboard_tabs"
             tools:visibility="visible"/>
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/media_keyboard_add"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/media_overview_activity.xml b/app/src/main/res/layout/media_overview_activity.xml
index cc15d9893d..8ade9af2a9 100644
--- a/app/src/main/res/layout/media_overview_activity.xml
+++ b/app/src/main/res/layout/media_overview_activity.xml
@@ -53,7 +53,7 @@
         app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
         tools:text="@string/MediaOverviewActivity_Storage_used" />
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/sort_order_arrow"
         android:layout_width="wrap_content"
         android:layout_height="0dp"
@@ -77,7 +77,7 @@
         app:layout_constraintEnd_toEndOf="@+id/sorting"
         app:layout_constraintTop_toBottomOf="@+id/appBarLayout">
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/view_grid"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -91,7 +91,7 @@
             android:visibility="visible"
             app:srcCompat="?attr/media_overview_grid_view_icon" />
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/view_detail"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/mediapicker_media_item.xml b/app/src/main/res/layout/mediapicker_media_item.xml
index 4de995dcb8..a384c986cd 100644
--- a/app/src/main/res/layout/mediapicker_media_item.xml
+++ b/app/src/main/res/layout/mediapicker_media_item.xml
@@ -27,7 +27,7 @@
         android:visibility="gone"
         tools:visibility="gone">
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:layout_width="15dp"
             android:layout_height="18dp"
             android:layout_gravity="center"
diff --git a/app/src/main/res/layout/mediasend_count_button.xml b/app/src/main/res/layout/mediasend_count_button.xml
index acaa74f842..4abb47fb11 100644
--- a/app/src/main/res/layout/mediasend_count_button.xml
+++ b/app/src/main/res/layout/mediasend_count_button.xml
@@ -26,7 +26,7 @@
         tools:text="3" />
 
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="wrap_content"
         android:layout_height="20dp"
         android:layout_marginStart="2dp"
diff --git a/app/src/main/res/layout/message_details_recipient.xml b/app/src/main/res/layout/message_details_recipient.xml
index ee4828b85d..19e0b86025 100644
--- a/app/src/main/res/layout/message_details_recipient.xml
+++ b/app/src/main/res/layout/message_details_recipient.xml
@@ -81,7 +81,8 @@
             app:layout_constraintBottom_toBottomOf="parent"
             tools:visibility="gone" />
 
-        <ImageView android:id="@+id/message_details_recipient_ud_indicator"
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/message_details_recipient_ud_indicator"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
diff --git a/app/src/main/res/layout/microphone_recorder_view.xml b/app/src/main/res/layout/microphone_recorder_view.xml
index 96418af9e5..0b792e4b64 100644
--- a/app/src/main/res/layout/microphone_recorder_view.xml
+++ b/app/src/main/res/layout/microphone_recorder_view.xml
@@ -29,7 +29,7 @@
         tools:translationY="@dimen/recording_voice_lock_target"
         tools:visibility="visible">
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:layout_gravity="center_horizontal"
@@ -38,7 +38,7 @@
             android:tint="?attr/conversation_input_inline_attach_icon_tint"
             app:srcCompat="@drawable/ic_lock" />
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:layout_width="18dp"
             android:layout_height="18dp"
             android:layout_gravity="center_horizontal"
@@ -48,7 +48,7 @@
             app:srcCompat="@drawable/ic_chevron_up" />
     </LinearLayout>
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/quick_audio_fab"
         android:layout_width="74dp"
         android:layout_height="74dp"
diff --git a/app/src/main/res/layout/profile_create_fragment.xml b/app/src/main/res/layout/profile_create_fragment.xml
index 6619d483ae..9d35e665f8 100644
--- a/app/src/main/res/layout/profile_create_fragment.xml
+++ b/app/src/main/res/layout/profile_create_fragment.xml
@@ -50,7 +50,7 @@
                     app:layout_constraintVertical_bias="0.0"
                     app:layout_constraintVertical_chainStyle="spread_inside" />
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/avatar_background"
                     android:layout_width="96dp"
                     android:layout_height="96dp"
@@ -62,7 +62,7 @@
                     app:layout_constraintTop_toBottomOf="@+id/title"
                     app:layout_goneMarginTop="?attr/actionBarSize" />
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/avatar_placeholder"
                     android:layout_width="0dp"
                     android:layout_height="0dp"
@@ -186,7 +186,7 @@
                     app:layout_constraintTop_toBottomOf="@id/profile_overview_username_label"
                     tools:visibility="visible" />
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/profile_overview_username_edit_button"
                     android:layout_width="36dp"
                     android:layout_height="36dp"
diff --git a/app/src/main/res/layout/quote_view.xml b/app/src/main/res/layout/quote_view.xml
index 8e3438b1af..39272eebc1 100644
--- a/app/src/main/res/layout/quote_view.xml
+++ b/app/src/main/res/layout/quote_view.xml
@@ -126,7 +126,7 @@
                     android:visibility="gone"
                     tools:visibility="visible">
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:layout_width="13dp"
                         android:layout_height="16dp"
                         android:layout_marginStart="11dp"
@@ -150,7 +150,7 @@
             android:visibility="gone"
             tools:visibility="visible">
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
@@ -170,7 +170,7 @@
 
     </LinearLayout>
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/quote_dismiss"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/reactions_megaphone.xml b/app/src/main/res/layout/reactions_megaphone.xml
index 312ddd377a..1f109f83fb 100644
--- a/app/src/main/res/layout/reactions_megaphone.xml
+++ b/app/src/main/res/layout/reactions_megaphone.xml
@@ -44,7 +44,7 @@
           tools:layout_width="200dp"
           tools:layout_height="50dp"/>
 
-      <ImageView
+      <androidx.appcompat.widget.AppCompatImageView
           android:id="@+id/reactions_megaphone_x"
           android:layout_width="46dp"
           android:layout_height="46dp"
diff --git a/app/src/main/res/layout/recipient_manage_fragment.xml b/app/src/main/res/layout/recipient_manage_fragment.xml
index 860aa6fef6..9570bbd923 100644
--- a/app/src/main/res/layout/recipient_manage_fragment.xml
+++ b/app/src/main/res/layout/recipient_manage_fragment.xml
@@ -209,7 +209,7 @@
                         android:textAlignment="viewStart"
                         android:textAppearance="@style/Signal.Text.Body" />
 
-                    <ImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/recipient_contact_icon"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/recording_layout.xml b/app/src/main/res/layout/recording_layout.xml
index 71ecff121f..0c6f4fe241 100644
--- a/app/src/main/res/layout/recording_layout.xml
+++ b/app/src/main/res/layout/recording_layout.xml
@@ -11,7 +11,7 @@
     tools:visibility="visible"
     tools:showIn="@layout/conversation_input_panel">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/microphone"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/share_activity.xml b/app/src/main/res/layout/share_activity.xml
index 8dad942c7a..5bc0d373ac 100644
--- a/app/src/main/res/layout/share_activity.xml
+++ b/app/src/main/res/layout/share_activity.xml
@@ -28,13 +28,14 @@
                       android:layout_centerVertical="true"
                       android:layout_toStartOf="@+id/search_action"/>
 
-            <ImageView android:id="@+id/search_action"
-                       android:layout_width="wrap_content"
-                       android:layout_height="wrap_content"
-                       wheel:srcCompat="@drawable/ic_search_24"
-                       android:tint="?icon_tint"
-                       android:layout_alignParentEnd="true"
-                       android:layout_centerVertical="true"/>
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/search_action"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                wheel:srcCompat="@drawable/ic_search_24"
+                android:tint="?icon_tint"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"/>
 
         </RelativeLayout>
 
diff --git a/app/src/main/res/layout/sticker_management_empty_item.xml b/app/src/main/res/layout/sticker_management_empty_item.xml
index a9dc64d44e..9e166a26da 100644
--- a/app/src/main/res/layout/sticker_management_empty_item.xml
+++ b/app/src/main/res/layout/sticker_management_empty_item.xml
@@ -8,7 +8,7 @@
     android:layout_marginStart="@dimen/sticker_management_horizontal_margin"
     android:layout_marginEnd="@dimen/sticker_management_horizontal_margin">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:src="@drawable/sticker_management_empty_background"
diff --git a/app/src/main/res/layout/sticker_management_sticker_item.xml b/app/src/main/res/layout/sticker_management_sticker_item.xml
index 00d3d34ae9..4202c543cd 100644
--- a/app/src/main/res/layout/sticker_management_sticker_item.xml
+++ b/app/src/main/res/layout/sticker_management_sticker_item.xml
@@ -72,7 +72,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent" />
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/sticker_management_share_button_image"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -92,7 +92,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent" />
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/sticker_management_action_button_image"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/sticker_preview_activity.xml b/app/src/main/res/layout/sticker_preview_activity.xml
index 7c7f79b9af..cd3ea7bd45 100644
--- a/app/src/main/res/layout/sticker_preview_activity.xml
+++ b/app/src/main/res/layout/sticker_preview_activity.xml
@@ -65,7 +65,7 @@
         app:layout_constraintBottom_toBottomOf="@id/sticker_install_title"
         tools:visibility="visible"/>
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/sticker_install_share_button_image"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/thumbnail_view.xml b/app/src/main/res/layout/thumbnail_view.xml
index ae59b5d58a..9d3be4d75c 100644
--- a/app/src/main/res/layout/thumbnail_view.xml
+++ b/app/src/main/res/layout/thumbnail_view.xml
@@ -44,7 +44,7 @@
         android:visibility="gone"
         tools:visibility="visible">
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_margin="12dp"
diff --git a/app/src/main/res/layout/transfer_controls_view.xml b/app/src/main/res/layout/transfer_controls_view.xml
index f01d6ad5cc..e35de78c5a 100644
--- a/app/src/main/res/layout/transfer_controls_view.xml
+++ b/app/src/main/res/layout/transfer_controls_view.xml
@@ -32,7 +32,7 @@
         android:visibility="gone"
         tools:visibility="visible">
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:tint="@color/core_grey_60"
diff --git a/app/src/main/res/layout/transport_selection_list_item.xml b/app/src/main/res/layout/transport_selection_list_item.xml
index a2cd6fcf7b..ea5a25115d 100644
--- a/app/src/main/res/layout/transport_selection_list_item.xml
+++ b/app/src/main/res/layout/transport_selection_list_item.xml
@@ -9,16 +9,16 @@
               android:paddingStart="10dp"
               android:paddingEnd="10dp">
 
-    <ImageView android:id="@+id/icon"
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:padding="7dp"
-               android:background="@drawable/circle_tintable"
-               android:contentDescription="@string/transport_selection_list_item__transport_icon"
-               android:tint="@color/white"
-               tools:src="@drawable/ic_send_lock_24"
-               tools:tint="@color/white"
-               tools:backgroundTint="@color/textsecure_primary" />
+    <androidx.appcompat.widget.AppCompatImageView android:id="@+id/icon"
+                                                  android:layout_width="wrap_content"
+                                                  android:layout_height="wrap_content"
+                                                  android:padding="7dp"
+                                                  android:background="@drawable/circle_tintable"
+                                                  android:contentDescription="@string/transport_selection_list_item__transport_icon"
+                                                  android:tint="@color/white"
+                                                  tools:src="@drawable/ic_send_lock_24"
+                                                  tools:tint="@color/white"
+                                                  tools:backgroundTint="@color/core_ultramarine" />
 
     <LinearLayout android:orientation="vertical"
                   android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/unidentified_delivery_learn_more.xml b/app/src/main/res/layout/unidentified_delivery_learn_more.xml
index a8ea358aa0..e788d3a047 100644
--- a/app/src/main/res/layout/unidentified_delivery_learn_more.xml
+++ b/app/src/main/res/layout/unidentified_delivery_learn_more.xml
@@ -7,7 +7,7 @@
     android:gravity="center_vertical"
     android:padding="16dp">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
diff --git a/app/src/main/res/layout/unknown_sender_view.xml b/app/src/main/res/layout/unknown_sender_view.xml
index 27fb97aed1..2b498e26a3 100644
--- a/app/src/main/res/layout/unknown_sender_view.xml
+++ b/app/src/main/res/layout/unknown_sender_view.xml
@@ -25,10 +25,10 @@
                   android:clickable="true"
                   android:gravity="center_vertical">
 
-        <ImageView android:layout_width="wrap_content"
-                   android:layout_height="wrap_content"
-                   android:src="@drawable/ic_block_white_24dp"
-                   android:tint="@color/core_ultramarine"/>
+        <androidx.appcompat.widget.AppCompatImageView android:layout_width="wrap_content"
+                                                      android:layout_height="wrap_content"
+                                                      android:src="@drawable/ic_block_white_24dp"
+                                                      android:tint="@color/core_ultramarine"/>
 
         <TextView android:layout_marginStart="15dp"
                   android:layout_width="match_parent"
@@ -49,10 +49,10 @@
                   android:layout_marginBottom="25dp"
                   android:gravity="center_vertical">
 
-        <ImageView android:layout_width="wrap_content"
-                   android:layout_height="wrap_content"
-                   android:src="@drawable/ic_person_add_white_24dp"
-                   android:tint="@color/core_ultramarine"/>
+        <androidx.appcompat.widget.AppCompatImageView android:layout_width="wrap_content"
+                                                      android:layout_height="wrap_content"
+                                                      android:src="@drawable/ic_person_add_white_24dp"
+                                                      android:tint="@color/core_ultramarine"/>
 
         <TextView android:layout_marginStart="15dp"
                   android:layout_width="match_parent"
@@ -73,10 +73,10 @@
                   android:layout_marginBottom="25dp"
                   android:gravity="center_vertical">
 
-        <ImageView android:layout_width="wrap_content"
-                   android:layout_height="wrap_content"
-                   android:src="@drawable/ic_face_white_24dp"
-                   android:tint="@color/core_ultramarine"/>
+        <androidx.appcompat.widget.AppCompatImageView android:layout_width="wrap_content"
+                                                      android:layout_height="wrap_content"
+                                                      android:src="@drawable/ic_face_white_24dp"
+                                                      android:tint="@color/core_ultramarine"/>
 
         <TextView android:layout_marginStart="15dp"
                   android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/video_editor_hud.xml b/app/src/main/res/layout/video_editor_hud.xml
index 2a75da3715..4d4acf8b3c 100644
--- a/app/src/main/res/layout/video_editor_hud.xml
+++ b/app/src/main/res/layout/video_editor_hud.xml
@@ -46,7 +46,7 @@
             app:layout_constraintTop_toTopOf="parent"
             tools:alpha="1">
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:layout_width="19dp"
                 android:layout_height="24dp"
                 android:layout_marginStart="17dp"
diff --git a/app/src/main/res/layout/webrtc_answer_decline_button.xml b/app/src/main/res/layout/webrtc_answer_decline_button.xml
index abfe7cea5c..b9a7e83e17 100644
--- a/app/src/main/res/layout/webrtc_answer_decline_button.xml
+++ b/app/src/main/res/layout/webrtc_answer_decline_button.xml
@@ -8,7 +8,7 @@
     tools:orientation="vertical"
     tools:parentTag="android.widget.LinearLayout">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/arrow_one"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -20,7 +20,7 @@
         android:tint="@color/core_grey_20"
         tools:alpha="1" />
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/arrow_two"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -32,7 +32,7 @@
         android:tint="@color/core_grey_20"
         tools:alpha="1" />
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/arrow_three"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -44,7 +44,7 @@
         android:tint="@color/core_grey_20"
         tools:alpha="1" />
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/arrow_four"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -70,7 +70,7 @@
         android:textColor="@color/core_grey_20"
         android:textStyle="italic" />
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/answer"
         android:layout_width="56dp"
         android:layout_height="56dp"
diff --git a/app/witness-verifications.gradle b/app/witness-verifications.gradle
index 54f6a63fb9..7504c5d727 100644
--- a/app/witness-verifications.gradle
+++ b/app/witness-verifications.gradle
@@ -6,17 +6,17 @@ dependencyVerification {
         ['androidx.activity:activity:1.0.0',
          'd1bc9842455c2e534415d88c44df4d52413b478db9093a1ba36324f705f44c3d'],
 
-        ['androidx.annotation:annotation-experimental:1.0.0-rc01',
-         '2f113195f61ecd08ea46cef545f0ea338898391d95425cf4c8836ba2b701f5d6'],
+        ['androidx.annotation:annotation-experimental:1.0.0',
+         'b219d2b568e7e4ba534e09f8c2fd242343df6ccbdfbbe938846f5d740e6b0b11'],
 
         ['androidx.annotation:annotation:1.1.0',
          'd38d63edb30f1467818d50aaf05f8a692dea8b31392a049bfa991b159ad5b692'],
 
-        ['androidx.appcompat:appcompat-resources:1.1.0-beta01',
-         '53c0a33d07c4bab48d4c8169bf30053aa14965af4a775b56092a9fc7079802b1'],
+        ['androidx.appcompat:appcompat-resources:1.2.0',
+         'c470297c03ff3de1c3d15dacf0be0cae63abc10b52f021dd07ae28daa3100fe5'],
 
-        ['androidx.appcompat:appcompat:1.1.0-beta01',
-         '49ad229add44f822fcb3c8405c3fddbd72660da6a839ce29e13158f5980514fd'],
+        ['androidx.appcompat:appcompat:1.2.0',
+         '3d2131a55a61a777322e2126e0018011efa6339e53b44153eb651b16020cca70'],
 
         ['androidx.arch.core:core-common:2.1.0',
          'fe1237bf029d063e7f29fe39aeaf73ef74c8b0a3658486fc29d3c54326653889'],
@@ -51,17 +51,17 @@ dependencyVerification {
         ['androidx.concurrent:concurrent-futures:1.0.0',
          '5595a40e278a7b39fa78a09490e3d7f3faa95c7b01447148bd38b5ade0605c35'],
 
-        ['androidx.constraintlayout:constraintlayout-solver:1.1.3',
-         '965c177e64fbd81bd1d27b402b66ef9d7bc7b5cb5f718044bf7a453abc542045'],
+        ['androidx.constraintlayout:constraintlayout-solver:2.0.4',
+         '9ca19f5448709301c7563488ef941be9dfa55c83538ca7a059b2113e83527b46'],
 
-        ['androidx.constraintlayout:constraintlayout:1.1.3',
-         '5ff864def9d41cd04e08348d69591143bae3ceff4284cf8608bceb98c36ac830'],
+        ['androidx.constraintlayout:constraintlayout:2.0.4',
+         '307a79a4a1ccff44249c72a2bf7f47da09fa1b6b1fab2a25808ca889382b738e'],
 
         ['androidx.coordinatorlayout:coordinatorlayout:1.1.0',
          '44a9e30abf56af1025c52a0af506fee9c4131aa55efda52f9fd9451211c5e8cb'],
 
-        ['androidx.core:core:1.1.0',
-         '76c7cfbe596fe3c09a6983bf1c89e889299c08ac9a3b52ce5182a088d056647e'],
+        ['androidx.core:core:1.3.1',
+         'e92ea65a37d589943d405a6a54d1be9d12a225948f26c4e41e511dd55e81efb6'],
 
         ['androidx.cursoradapter:cursoradapter:1.0.0',
          'a81c8fe78815fa47df5b749deb52727ad11f9397da58b16017f4eb2c11e28564'],
@@ -183,8 +183,8 @@ dependencyVerification {
         ['androidx.transition:transition:1.2.0',
          'a1e059b3bc0b43a58dec0efecdcaa89c82d2bca552ea5bacf6656c46e853157e'],
 
-        ['androidx.vectordrawable:vectordrawable-animated:1.1.0-beta02',
-         'f1613c47f1e6d2cd02ec9a42925f1a964fa63d1d028d34d884364cc3b9ffcb8f'],
+        ['androidx.vectordrawable:vectordrawable-animated:1.1.0',
+         '76da2c502371d9c38054df5e2b248d00da87809ed058f3363eae87ce5e2403f8'],
 
         ['androidx.vectordrawable:vectordrawable:1.1.0',
          '46fd633ac01b49b7fcabc263bf098c5a8b9e9a69774d234edcca04fb02df8e26'],
@@ -306,8 +306,8 @@ dependencyVerification {
         ['com.google.android.gms:play-services-vision:20.0.0',
          '0386c1c32b06c3c771dd518220d47bb5828fa3d415863ecd6859909b52cc4f6f'],
 
-        ['com.google.android.material:material:1.1.0',
-         '58f4fb6e5986ec8e01a733ea85e9df83cf79060e0329fe18abc192d9eda97b26'],
+        ['com.google.android.material:material:1.2.1',
+         'd3d0cc776f2341da8e572586c7d390a5b356ce39a0deb2768071dc40b364ac80'],
 
         ['com.google.android:flexbox:0.3.0',
          'a9989fd13ae2ee42765dfc515fe362edf4f326e74925d02a10369df8092a4935'],
diff --git a/buildSrc/src/main/groovy/org/whispersystems/witness/WitnessPlugin.groovy b/buildSrc/src/main/groovy/org/whispersystems/witness/WitnessPlugin.groovy
index 6b9865020f..fcd8d43dce 100644
--- a/buildSrc/src/main/groovy/org/whispersystems/witness/WitnessPlugin.groovy
+++ b/buildSrc/src/main/groovy/org/whispersystems/witness/WitnessPlugin.groovy
@@ -36,20 +36,16 @@ class WitnessPlugin implements Plugin<Project> {
                         return it.name.equals(name) && it.moduleVersion.id.group.equals(group)
                     }
 
-                    if (artifacts.size() > 1) {
-                        throw new InvalidUserDataException("Multiple artifacts found for $group:$name, ${artifacts.size()} found")
-                    }
+                    artifacts.forEach { dependency ->
+                        println "Verifying " + group + ":" + name
 
-                    ResolvedArtifact dependency = artifacts.find()
+                        if (dependency == null) {
+                            throw new InvalidUserDataException("No dependency for integrity assertion found: " + group + ":" + name)
+                        }
 
-                    println "Verifying " + group + ":" + name
-
-                    if (dependency == null) {
-                        throw new InvalidUserDataException("No dependency for integrity assertion found: " + group + ":" + name)
-                    }
-
-                    if (!hash.equals(calculateSha256(dependency.file))) {
-                        throw new InvalidUserDataException("Checksum failed for " + assertion)
+                        if (!hash.equals(calculateSha256(dependency.file))) {
+                            throw new InvalidUserDataException("Checksum failed for " + assertion)
+                        }
                     }
             }
         }
@@ -66,6 +62,7 @@ class WitnessPlugin implements Plugin<Project> {
                     .findAll { dep -> !dep.id.componentIdentifier.displayName.startsWith('project :') }
                     .collect { dep -> "['$dep.moduleVersion.id.group:$dep.name:$dep.moduleVersion.id.version',\n         '${calculateSha256(dep.file)}']" }
                     .sort()
+                    .unique()
                     .each {
                         dep -> stringBuilder.append "\n        $dep,\n"
                     }