diff --git a/Corona-Warn-App/build.gradle b/Corona-Warn-App/build.gradle
index 25be009f467df291bb66c886d5c653ec3b92bff2..338f6bcecb65f8da9a4a404026964624ee57b44d 100644
--- a/Corona-Warn-App/build.gradle
+++ b/Corona-Warn-App/build.gradle
@@ -68,6 +68,8 @@ android {
         buildConfigField "int", "VERSION_MAJOR", VERSION_MAJOR
         buildConfigField "int", "VERSION_MINOR", VERSION_MINOR
         buildConfigField "int", "VERSION_PATCH", VERSION_PATCH
+
+        vectorDrawables.useSupportLibrary = true
     }
 
     def signingPropFile = file("../keystore.properties")
diff --git a/Corona-Warn-App/src/main/res/drawable-hdpi/ic_splash_logo_round.png b/Corona-Warn-App/src/main/res/drawable-hdpi/ic_splash_logo_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..98fb80f06506fc7aad0a1191ef4b22f6fef1e40d
Binary files /dev/null and b/Corona-Warn-App/src/main/res/drawable-hdpi/ic_splash_logo_round.png differ
diff --git a/Corona-Warn-App/src/main/res/drawable-ldpi/ic_splash_logo_round.png b/Corona-Warn-App/src/main/res/drawable-ldpi/ic_splash_logo_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a6ce4d2a116010ba5dcf91bc01dee2be58d7abc
Binary files /dev/null and b/Corona-Warn-App/src/main/res/drawable-ldpi/ic_splash_logo_round.png differ
diff --git a/Corona-Warn-App/src/main/res/drawable-mdpi/ic_splash_logo_round.png b/Corona-Warn-App/src/main/res/drawable-mdpi/ic_splash_logo_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..3afd257ea151f25b3f6c7aa20e105ff502787042
Binary files /dev/null and b/Corona-Warn-App/src/main/res/drawable-mdpi/ic_splash_logo_round.png differ
diff --git a/Corona-Warn-App/src/main/res/drawable-xhdpi/ic_splash_logo_round.png b/Corona-Warn-App/src/main/res/drawable-xhdpi/ic_splash_logo_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..29cd5074fc4ef500f69160a91d4d0dace6fa9db5
Binary files /dev/null and b/Corona-Warn-App/src/main/res/drawable-xhdpi/ic_splash_logo_round.png differ
diff --git a/Corona-Warn-App/src/main/res/drawable-xxhdpi/ic_splash_logo_round.png b/Corona-Warn-App/src/main/res/drawable-xxhdpi/ic_splash_logo_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d7cde1f43ec085d9b295b405b9f6f06a431cd61
Binary files /dev/null and b/Corona-Warn-App/src/main/res/drawable-xxhdpi/ic_splash_logo_round.png differ
diff --git a/Corona-Warn-App/src/main/res/drawable-xxxhdpi/ic_splash_logo_round.png b/Corona-Warn-App/src/main/res/drawable-xxxhdpi/ic_splash_logo_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..17eb8e49327a109b903a0f4f5061fdf3c0b403e1
Binary files /dev/null and b/Corona-Warn-App/src/main/res/drawable-xxxhdpi/ic_splash_logo_round.png differ
diff --git a/Corona-Warn-App/src/main/res/layout/bugreporting_debuglog_fragment.xml b/Corona-Warn-App/src/main/res/layout/bugreporting_debuglog_fragment.xml
index 6cddd5383ec531388ccad2d578fd3428c1cafeae..2277fe672d8fe4b98a599c31289f0bed4ad0c11e 100644
--- a/Corona-Warn-App/src/main/res/layout/bugreporting_debuglog_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/bugreporting_debuglog_fragment.xml
@@ -127,7 +127,7 @@
                 android:layout_marginVertical="8dp"
                 android:layout_marginStart="16dp"
                 android:importantForAccessibility="no"
-                android:src="@drawable/ic_debug_log_indicator_deactivated"
+                app:srcCompat="@drawable/ic_debug_log_indicator_deactivated"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_add_location_fragment.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_add_location_fragment.xml
index 36df6ecdea2e1afe02d3c5a25cf6558a85fd2bef..efca1f88d350e7d38ed0d7e08f356eee58941548 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_add_location_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_add_location_fragment.xml
@@ -20,7 +20,7 @@
             android:layout_marginTop="@dimen/spacing_tiny"
             android:contentDescription="@string/accessibility_close"
             android:padding="@dimen/spacing_mega_tiny"
-            android:src="@drawable/ic_close"
+            app:srcCompat="@drawable/ic_close"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -45,7 +45,7 @@
             android:layout_marginEnd="@dimen/spacing_tiny"
             android:contentDescription="@string/contact_diary_delete_icon_content_description"
             android:padding="@dimen/button_icon_padding"
-            android:src="@drawable/ic_baseline_delete"
+            app:srcCompat="@drawable/ic_baseline_delete"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_add_person_fragment.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_add_person_fragment.xml
index 254bed1eeb31ff2c3bbbb31ab9f8b7a69b60ef4f..c77fce4cadefa04a6f52993edc5a02541b5ee0e0 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_add_person_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_add_person_fragment.xml
@@ -20,7 +20,7 @@
             android:layout_marginTop="@dimen/spacing_tiny"
             android:contentDescription="@string/accessibility_close"
             android:padding="@dimen/spacing_mega_tiny"
-            android:src="@drawable/ic_close"
+            app:srcCompat="@drawable/ic_close"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -44,7 +44,7 @@
             android:layout_marginEnd="@dimen/spacing_tiny"
             android:contentDescription="@string/contact_diary_delete_icon_content_description"
             android:padding="@dimen/button_icon_padding"
-            android:src="@drawable/ic_baseline_delete"
+            app:srcCompat="@drawable/ic_baseline_delete"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_edit_list_item.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_edit_list_item.xml
index 172335e1c41f698ca0d0ef66628dfec44aecc814..e14e44081fe32f09bf569aa9a878bea1abe06f1c 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_edit_list_item.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_edit_list_item.xml
@@ -29,7 +29,7 @@
         android:layout_height="wrap_content"
         android:contentDescription="@string/contact_diary_edit_icon_content_description"
         android:padding="@dimen/spacing_small"
-        android:src="@drawable/ic_baseline_edit_24"
+        app:srcCompat="@drawable/ic_baseline_edit_24"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_onboarding_fragment.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_onboarding_fragment.xml
index 18a6ca07ae46636da2f3faf085f0cdfe88394ae6..e726b8d0cc6036164b243272ae9d2242f4d81892 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_onboarding_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_onboarding_fragment.xml
@@ -40,7 +40,7 @@
                     android:layout_height="wrap_content"
                     android:contentDescription="@string/contact_diary_onboarding_image_content_description"
                     android:focusable="true"
-                    android:src="@drawable/ic_contact_diary_illustration_onboarding"
+                    app:srcCompat="@drawable/ic_contact_diary_illustration_onboarding"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_overview_nested_list_item.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_overview_nested_list_item.xml
index 3378d49878f8e3dcd0f2bd47405f85c0d3635192..ae153228eedec1a0163d72c7bc918aa09314f894 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_overview_nested_list_item.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_overview_nested_list_item.xml
@@ -19,7 +19,7 @@
         android:layout_marginStart="@dimen/spacing_small"
         android:importantForAccessibility="no"
         android:scaleType="centerInside"
-        android:src="@drawable/ic_contact_diary_person_item"
+        app:srcCompat="@drawable/ic_contact_diary_person_item"
         app:layout_constraintBaseline_toBaselineOf="@id/contact_diary_overview_element_name"
         app:layout_constraintEnd_toStartOf="@id/contact_diary_overview_element_name"
         app:layout_constraintStart_toStartOf="parent" />
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_interoperability_configuration.xml b/Corona-Warn-App/src/main/res/layout/fragment_interoperability_configuration.xml
index 1aeb9f6e56af982cfbb97f9baea1e5918d6bcef2..be2c804d65a220a405505ab73be2466327cf7dc4 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_interoperability_configuration.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_interoperability_configuration.xml
@@ -48,7 +48,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:contentDescription="@{@string/interoperability_eu_illustration_description}"
-                    android:src="@drawable/ic_illustration_interoperability"
+                    app:srcCompat="@drawable/ic_illustration_interoperability"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_submission_consent.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_consent.xml
index 5ea4a2968ef5df16c6c964c020a64a3e34bc3b7e..e176c094ac61800d6f5df5ae9bd68ea5f377a666 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_submission_consent.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_submission_consent.xml
@@ -46,7 +46,7 @@
                     android:id="@+id/submission_consent_illustration"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/ic_submission_consent"
+                    app:srcCompat="@drawable/ic_submission_consent"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_submission_dispatcher.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_dispatcher.xml
index f769e6fe74599e776179e946c7da286a1299f129..c7f1068de61ae287278824a91ba383edf3604e82 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_submission_dispatcher.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_submission_dispatcher.xml
@@ -43,7 +43,7 @@
                     android:contentDescription="@string/submission_intro_illustration_description"
                     android:focusable="true"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/ic_illustration_test"
+                    app:srcCompat="@drawable/ic_illustration_test"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_submission_no_consent_positive_other_warning.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_no_consent_positive_other_warning.xml
index e011e4b3ed20d4560b530fe257b61a1142707ea0..080cab6b67d87c6305648406bb8aaad6cffd7a75 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_submission_no_consent_positive_other_warning.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_submission_no_consent_positive_other_warning.xml
@@ -46,7 +46,7 @@
                     android:id="@+id/submission_positive_other_warning_hero_illustration"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/ic_submission_illustration_other_warning"
+                    app:srcCompat="@drawable/ic_submission_illustration_other_warning"
                     android:contentDescription="@string/submission_positive_other_illustration_description"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_submission_result_ready.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_result_ready.xml
index 7ef34d33e1ad6d7a77fe5d928d417c12675d3828..19af93c4224f7a2ae6ab6c335c12a2fb7921bede 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_submission_result_ready.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_submission_result_ready.xml
@@ -45,7 +45,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:focusable="true"
-                    android:src="@drawable/ic_illustration_together"
+                    app:srcCompat="@drawable/ic_illustration_together"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result_available.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result_available.xml
index 494201687e24ae17343f7fbfe52b09a59c38dedd..f99c53fd0e19a574434d0d59aaaff60ff5e476b4 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result_available.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result_available.xml
@@ -43,7 +43,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:focusable="true"
-                    android:src="@drawable/ic_test_result_illustration_result_available"
+                    app:srcCompat="@drawable/ic_test_result_illustration_result_available"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result_positive_no_consent.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result_positive_no_consent.xml
index d320ca471a02a0d43ce56a4e6af72d956acdfcef..22c8a25e0c3c164f43102b69b0f7481dc9ba3dcf 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result_positive_no_consent.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result_positive_no_consent.xml
@@ -71,7 +71,7 @@
                     android:backgroundTint="@color/button_red"
                     android:importantForAccessibility="no"
                     android:padding="@dimen/circle_icon_padding"
-                    android:src="@drawable/ic_submission_share"
+                    app:srcCompat="@drawable/ic_submission_share"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/submission_test_result_positive_no_consent_subtitle"
                     app:tint="@color/colorStableLight" />
@@ -96,7 +96,7 @@
                     android:layout_marginTop="@dimen/spacing_normal"
                     android:background="@drawable/circle"
                     android:backgroundTint="@color/button_red"
-                    android:src="@drawable/ic_lock"
+                    app:srcCompat="@drawable/ic_lock"
                     android:importantForAccessibility="no"
                     android:padding="@dimen/circle_icon_big_padding"
                     app:layout_constraintTop_toBottomOf="@+id/submission_test_result_positive_no_consent_text_1"
@@ -121,7 +121,7 @@
                     android:layout_marginTop="@dimen/spacing_normal"
                     android:background="@drawable/circle"
                     android:backgroundTint="@color/button_red"
-                    android:src="@drawable/ic_risk_details_home"
+                    app:srcCompat="@drawable/ic_risk_details_home"
                     android:importantForAccessibility="no"
                     android:padding="@dimen/circle_icon_big_padding"
                     app:layout_constraintTop_toBottomOf="@+id/submission_test_result_positive_no_consent_text_2"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_trace_location_onboarding.xml b/Corona-Warn-App/src/main/res/layout/fragment_trace_location_onboarding.xml
index 3d8399ed798a5a067a043be3e65539c5df86eccb..fd7e77dd2b97a4de774bf6831549a61990609b76 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_trace_location_onboarding.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_trace_location_onboarding.xml
@@ -46,7 +46,7 @@
                 android:layout_marginHorizontal="24dp"
                 android:layout_marginTop="4dp"
                 android:contentDescription="@string/trace_location_onboarding_content_description"
-                android:src="@drawable/trace_location_onboarding"
+                app:srcCompat="@drawable/trace_location_onboarding"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -83,7 +83,7 @@
                 android:layout_marginStart="@dimen/spacing_normal"
                 android:layout_marginTop="@dimen/spacing_large"
                 android:importantForAccessibility="no"
-                android:src="@drawable/ic_qr_tracing_static"
+                app:srcCompat="@drawable/ic_qr_tracing_static"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/check_in_onboarding_subtitle" />
 
@@ -105,7 +105,7 @@
                 android:layout_marginStart="@dimen/spacing_normal"
                 android:layout_marginTop="@dimen/spacing_medium"
                 android:importantForAccessibility="no"
-                android:src="@drawable/ic_qr_time"
+                app:srcCompat="@drawable/ic_qr_time"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/check_in_onboarding_warning" />
 
@@ -158,7 +158,7 @@
                     android:layout_width="8dp"
                     android:layout_height="8dp"
                     android:layout_marginTop="24dp"
-                    android:src="@drawable/bullet_point"
+                    app:srcCompat="@drawable/bullet_point"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/check_in_onboarding_card_subtitle" />
 
@@ -194,7 +194,7 @@
                     android:layout_width="8dp"
                     android:layout_height="8dp"
                     android:layout_marginTop="22dp"
-                    android:src="@drawable/bullet_point"
+                    app:srcCompat="@drawable/bullet_point"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/check_in_onboarding_body3" />
 
@@ -217,7 +217,7 @@
                     android:layout_width="8dp"
                     android:layout_height="8dp"
                     android:layout_marginTop="22dp"
-                    android:src="@drawable/bullet_point"
+                    app:srcCompat="@drawable/bullet_point"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/check_in_onboarding_body4" />
 
@@ -261,4 +261,4 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.core.widget.NestedScrollView>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Corona-Warn-App/src/main/res/layout/home_create_trace_location_card.xml b/Corona-Warn-App/src/main/res/layout/home_create_trace_location_card.xml
index bd13f263097bac37c72691edcc6641fd6e7054f5..e63bb3580bb19b981148fbe005306bdb3dc81cde 100644
--- a/Corona-Warn-App/src/main/res/layout/home_create_trace_location_card.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_create_trace_location_card.xml
@@ -36,7 +36,7 @@
         android:id="@+id/create_trace_location_card_icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/ic_event_organizer"
+        app:srcCompat="@drawable/ic_event_organizer"
         android:importantForAccessibility="no"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/create_trace_location_card_subtitle" />
diff --git a/Corona-Warn-App/src/main/res/layout/home_faq_card_layout.xml b/Corona-Warn-App/src/main/res/layout/home_faq_card_layout.xml
index 55e41cb3cfde7f09bd5169f55931a5be4028b1d2..aeb33f5ad66e44f8153b2b01d6859aca5c03bd68 100644
--- a/Corona-Warn-App/src/main/res/layout/home_faq_card_layout.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_faq_card_layout.xml
@@ -15,7 +15,7 @@
             android:layout_width="@dimen/icon_size_button"
             android:layout_height="@dimen/icon_size_button"
             android:importantForAccessibility="no"
-            android:src="@drawable/ic_main_about"
+            app:srcCompat="@drawable/ic_main_about"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/main_card_header_headline"
             app:layout_constraintStart_toStartOf="parent"
@@ -42,7 +42,7 @@
             android:layout_width="@dimen/icon_size_external_link"
             android:layout_height="@dimen/icon_size_external_link"
             android:importantForAccessibility="no"
-            android:src="@drawable/ic_link"
+            app:srcCompat="@drawable/ic_link"
             app:layout_constraintBottom_toBottomOf="@+id/main_card_header_headline"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@+id/main_card_header_headline" />
diff --git a/Corona-Warn-App/src/main/res/layout/home_fragment_layout.xml b/Corona-Warn-App/src/main/res/layout/home_fragment_layout.xml
index 03465872a364efac9d328977fc27308d20df4190..683de0e8d2f457d3cfe850a568d1d6439032a072 100644
--- a/Corona-Warn-App/src/main/res/layout/home_fragment_layout.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_fragment_layout.xml
@@ -31,7 +31,7 @@
                 android:layout_gravity="start|center_vertical"
                 android:focusable="true"
                 android:scaleType="fitStart"
-                android:src="@drawable/ic_main_header"
+                app:srcCompat="@drawable/ic_main_header"
                 bind:cwaContentDescription="@{@string/accessibility_logo}"
                 tools:ignore="ContentDescription" />
         </Toolbar>
diff --git a/Corona-Warn-App/src/main/res/layout/home_statistics_cards_incidence_layout.xml b/Corona-Warn-App/src/main/res/layout/home_statistics_cards_incidence_layout.xml
index a2bd07c8f2264973bfb2a1e84db6985393cc5e08..7eee9560c166dc4b7e507df6d0fd25f7b1a25c92 100644
--- a/Corona-Warn-App/src/main/res/layout/home_statistics_cards_incidence_layout.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_statistics_cards_incidence_layout.xml
@@ -18,7 +18,7 @@
             android:layout_height="wrap_content"
             android:importantForAccessibility="no"
             android:contentDescription="@null"
-            android:src="@drawable/ic_statistics_incidence"
+            app:srcCompat="@drawable/ic_statistics_incidence"
             android:paddingStart="0dp"
             android:paddingEnd="@dimen/spacing_small"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/home_statistics_cards_infections_layout.xml b/Corona-Warn-App/src/main/res/layout/home_statistics_cards_infections_layout.xml
index f44904922ab4c86fe30b4e7141d40e5deb3897c9..1d54ca078e19c2008ac9b13851aaa11bb7d8fe20 100644
--- a/Corona-Warn-App/src/main/res/layout/home_statistics_cards_infections_layout.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_statistics_cards_infections_layout.xml
@@ -18,7 +18,7 @@
             android:layout_height="wrap_content"
             android:importantForAccessibility="no"
             android:contentDescription="@null"
-            android:src="@drawable/ic_main_illustration_infection"
+            app:srcCompat="@drawable/ic_main_illustration_infection"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/flow_layout" />
 
diff --git a/Corona-Warn-App/src/main/res/layout/home_statistics_cards_keysubmissions_layout.xml b/Corona-Warn-App/src/main/res/layout/home_statistics_cards_keysubmissions_layout.xml
index 781e99cdf4a48cc807509c0b6f227212d8d5a91d..1d486842a6fee8dbac82c1637f95608e5b6e3114 100644
--- a/Corona-Warn-App/src/main/res/layout/home_statistics_cards_keysubmissions_layout.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_statistics_cards_keysubmissions_layout.xml
@@ -18,7 +18,7 @@
             android:layout_height="wrap_content"
             android:importantForAccessibility="no"
             android:contentDescription="@null"
-            android:src="@drawable/ic_main_illustration_warnende_personen"
+            app:srcCompat="@drawable/ic_main_illustration_warnende_personen"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/flow_layout" />
 
diff --git a/Corona-Warn-App/src/main/res/layout/home_statistics_cards_sevendayrvalue_layout.xml b/Corona-Warn-App/src/main/res/layout/home_statistics_cards_sevendayrvalue_layout.xml
index feca8a674d5c9f9583b3c1bd2a67794507d57128..57f7e82475116fe8e63ca7d7a8eab9beb0c464b0 100644
--- a/Corona-Warn-App/src/main/res/layout/home_statistics_cards_sevendayrvalue_layout.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_statistics_cards_sevendayrvalue_layout.xml
@@ -17,7 +17,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:importantForAccessibility="no"
-            android:src="@drawable/ic_7_day_r_value"
+            app:srcCompat="@drawable/ic_7_day_r_value"
             android:paddingStart="@dimen/spacing_normal"
             android:paddingEnd="@dimen/spacing_normal"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/home_submission_status_card_done.xml b/Corona-Warn-App/src/main/res/layout/home_submission_status_card_done.xml
index 7d43888b64c917b0c02fa946b95a41ec52ba7034..0e7f27076e6d6dd165c763adeba1d2769e9ab5e0 100644
--- a/Corona-Warn-App/src/main/res/layout/home_submission_status_card_done.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_submission_status_card_done.xml
@@ -29,7 +29,7 @@
             android:layout_marginTop="@dimen/spacing_tiny"
             android:contentDescription="@string/submission_done_illustration_description"
             android:importantForAccessibility="no"
-            android:src="@drawable/ic_illustration_together"
+            app:srcCompat="@drawable/ic_illustration_together"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/submission_done_card_title" />
diff --git a/Corona-Warn-App/src/main/res/layout/include_bullet_point.xml b/Corona-Warn-App/src/main/res/layout/include_bullet_point.xml
index 099185c7ef900b417cb1b5382f195da98da6e0dc..38b441f371c276918ee45353ed30c9538eae575d 100644
--- a/Corona-Warn-App/src/main/res/layout/include_bullet_point.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_bullet_point.xml
@@ -7,7 +7,7 @@
         android:layout_width="@dimen/bullet_point_size"
         android:layout_height="@dimen/bullet_point_size"
         android:baseline="@dimen/bullet_point_baseline_offset"
-        android:src="@drawable/bullet_point"
+        app:srcCompat="@drawable/bullet_point"
         android:importantForAccessibility="no"
         app:layout_constraintStart_toStartOf="parent"
         tools:showIn="@layout/include_submission_consent_body" />
diff --git a/Corona-Warn-App/src/main/res/layout/include_dispatcher_card.xml b/Corona-Warn-App/src/main/res/layout/include_dispatcher_card.xml
index 968a7b08957fc02c7274e65190138e541dcad47a..d2a3907c5506158b2d26d2d037fe2d87be67dbe1 100644
--- a/Corona-Warn-App/src/main/res/layout/include_dispatcher_card.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_dispatcher_card.xml
@@ -50,7 +50,7 @@
             android:layout_marginTop="@dimen/spacing_small"
             android:layout_marginEnd="@dimen/spacing_normal"
             android:importantForAccessibility="no"
-            android:src="@drawable/ic_forward"
+            app:srcCompat="@drawable/ic_forward"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:tint="@color/colorTextPrimary1" />
diff --git a/Corona-Warn-App/src/main/res/layout/include_interop_riskdetails_no_countries_infoview.xml b/Corona-Warn-App/src/main/res/layout/include_interop_riskdetails_no_countries_infoview.xml
index 5038e7ba3ced6952a41d33f711c8e59c3992452c..1ade9dc9d3b8c8a400d2b80d7c1760582af92cd0 100644
--- a/Corona-Warn-App/src/main/res/layout/include_interop_riskdetails_no_countries_infoview.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_interop_riskdetails_no_countries_infoview.xml
@@ -17,7 +17,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:importantForAccessibility="no"
-            android:src="@drawable/ic_interop_no_network"
+            app:srcCompat="@drawable/ic_interop_no_network"
             android:visibility="visible"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
diff --git a/Corona-Warn-App/src/main/res/layout/include_interoperability.xml b/Corona-Warn-App/src/main/res/layout/include_interoperability.xml
index 092efae0ac1754aeb5b7901f6372ee8fd26081a8..9a9dac88001cac1b8d79bc51eecd80df9bb26c3d 100644
--- a/Corona-Warn-App/src/main/res/layout/include_interoperability.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_interoperability.xml
@@ -86,7 +86,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:contentDescription="@{@string/interoperability_eu_illustration_description}"
-                    android:src="@drawable/ic_illustration_interoperability"
+                    app:srcCompat="@drawable/ic_illustration_interoperability"
                     android:visibility="@{FormatterHelper.formatVisibility(!isOnboarding)}"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/include_submission_consent_intro.xml b/Corona-Warn-App/src/main/res/layout/include_submission_consent_intro.xml
index 26d2702fea7740b3b8aa6a6a5554e93a9119984a..4bd8c6d0bb6afbbebfa7a735be2f716da5dd4def 100644
--- a/Corona-Warn-App/src/main/res/layout/include_submission_consent_intro.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_submission_consent_intro.xml
@@ -33,7 +33,7 @@
             android:layout_width="@dimen/circle_icon"
             android:layout_height="@dimen/circle_icon"
             android:layout_marginTop="@dimen/spacing_normal"
-            android:src="@drawable/ic_qr_code"
+            app:srcCompat="@drawable/ic_qr_code"
             android:background="@drawable/circle"
             android:backgroundTint="@color/card_dark"
             android:padding="@dimen/circle_icon_padding"
@@ -60,7 +60,7 @@
             android:layout_marginTop="@dimen/spacing_normal"
             android:background="@drawable/circle"
             android:backgroundTint="@color/card_dark"
-            android:src="@drawable/ic_qr_1x_test"
+            app:srcCompat="@drawable/ic_qr_1x_test"
             android:importantForAccessibility="no"
             android:padding="8dp"
             app:layout_constraintTop_toBottomOf="@+id/submission_consent_call_test_result_scan_your_test_only"
diff --git a/Corona-Warn-App/src/main/res/layout/include_submission_contact.xml b/Corona-Warn-App/src/main/res/layout/include_submission_contact.xml
index 358342e652f1a24f57eca36cfee87021eb6c33ed..fa7bc987503ed860b8f32ca10412e8ebce046b66 100644
--- a/Corona-Warn-App/src/main/res/layout/include_submission_contact.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_submission_contact.xml
@@ -17,7 +17,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:focusable="true"
-                android:src="@drawable/ic_submission_illustration_hotline"
+                app:srcCompat="@drawable/ic_submission_illustration_hotline"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/include_submission_done.xml b/Corona-Warn-App/src/main/res/layout/include_submission_done.xml
index b199de4cec6a04d42d224a849c4b02a8664c3850..3e6226cf040a033607934d78954bfe81eae9b50f 100644
--- a/Corona-Warn-App/src/main/res/layout/include_submission_done.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_submission_done.xml
@@ -18,7 +18,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:focusable="true"
-                android:src="@drawable/ic_illustration_together"
+                app:srcCompat="@drawable/ic_illustration_together"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/include_submission_positive_other_warning.xml b/Corona-Warn-App/src/main/res/layout/include_submission_positive_other_warning.xml
index 688adae687beb54590ddaf5bf1186b08d013c7d2..f8b15560263ab87d295a4164ecc0ff76bfc2fb0a 100644
--- a/Corona-Warn-App/src/main/res/layout/include_submission_positive_other_warning.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_submission_positive_other_warning.xml
@@ -25,7 +25,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 bind:cwaContentDescription="@{@string/submission_positive_other_illustration_description}"
-                android:src="@drawable/ic_submission_illustration_other_warning"
+                app:srcCompat="@drawable/ic_submission_illustration_other_warning"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/new_release_info_item.xml b/Corona-Warn-App/src/main/res/layout/new_release_info_item.xml
index c5a0c49a6aac2f350c82a45119862e36e49c3e0a..a1b010aae990ccdc95a6fba9af35dc10f6f69244 100644
--- a/Corona-Warn-App/src/main/res/layout/new_release_info_item.xml
+++ b/Corona-Warn-App/src/main/res/layout/new_release_info_item.xml
@@ -25,7 +25,7 @@
             android:layout_marginStart="@dimen/spacing_normal"
             android:layout_marginTop="@dimen/spacing_tiny"
             android:importantForAccessibility="no"
-            android:src="@drawable/bullet_point"
+            app:srcCompat="@drawable/bullet_point"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/title" />
 
diff --git a/Corona-Warn-App/src/main/res/layout/new_release_info_screen_fragment.xml b/Corona-Warn-App/src/main/res/layout/new_release_info_screen_fragment.xml
index 78182d1514903c3832529ac05a92e3234d932629..9761fcdcf4c4c0ac5dc8596a25ea536ce56538fc 100644
--- a/Corona-Warn-App/src/main/res/layout/new_release_info_screen_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/new_release_info_screen_fragment.xml
@@ -40,7 +40,7 @@
                     android:contentDescription="@string/release_info_header"
                     android:focusable="true"
                     android:layout_marginTop="@dimen/spacing_normal"
-                    android:src="@drawable/ic_new_release_info"
+                    app:srcCompat="@drawable/ic_new_release_info"
                     android:importantForAccessibility="no"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/statistics_trend_view.xml b/Corona-Warn-App/src/main/res/layout/statistics_trend_view.xml
index d9c7fca9a466a4cd532a5facac95eb95f768c1e2..28b4dfaa304ef0674d6a93f56d7db2397ab3d0ac 100644
--- a/Corona-Warn-App/src/main/res/layout/statistics_trend_view.xml
+++ b/Corona-Warn-App/src/main/res/layout/statistics_trend_view.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 
     <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/trend"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="1dp"
         android:background="@drawable/bg_statistics_trend_neutral"
         android:scaleType="center"
-        android:src="@drawable/ic_trend_stable" />
+        app:srcCompat="@drawable/ic_trend_stable" />
 
diff --git a/Corona-Warn-App/src/main/res/layout/survey_consent_fragment.xml b/Corona-Warn-App/src/main/res/layout/survey_consent_fragment.xml
index 114e09de6df2f0c9a191818f4a189186033db836..fe1c3c7ef61715c5c5e095444fe87ac18213bc71 100644
--- a/Corona-Warn-App/src/main/res/layout/survey_consent_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/survey_consent_fragment.xml
@@ -39,7 +39,7 @@
                     android:layout_height="wrap_content"
                     android:contentDescription="@string/contact_diary_onboarding_image_content_description"
                     android:focusable="true"
-                    android:src="@drawable/ic_illustration_datenspende"
+                    app:srcCompat="@drawable/ic_illustration_datenspende"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/trace_location_attendee_checkins_fragment.xml b/Corona-Warn-App/src/main/res/layout/trace_location_attendee_checkins_fragment.xml
index 1e665b70bab77733c13522cf12757475f33c3306..b2934dbf99a1385ba0ce5a991093769fe4e9b70a 100644
--- a/Corona-Warn-App/src/main/res/layout/trace_location_attendee_checkins_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/trace_location_attendee_checkins_fragment.xml
@@ -49,7 +49,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:contentDescription="@string/trace_location_checkins_empty_illustration_accessibility"
-            android:src="@drawable/trace_location_my_check_ins_empty_illustration" />
+            app:srcCompat="@drawable/trace_location_my_check_ins_empty_illustration" />
 
         <TextView
             style="@style/subtitleMedium"
diff --git a/Corona-Warn-App/src/main/res/layout/trace_location_attendee_checkins_item_past.xml b/Corona-Warn-App/src/main/res/layout/trace_location_attendee_checkins_item_past.xml
index 8a08c8cae5c1d37737e064dc3d05774e3fca87bd..3ead1f5c9f3a44c01dab82dc8354845bf80d0520 100644
--- a/Corona-Warn-App/src/main/res/layout/trace_location_attendee_checkins_item_past.xml
+++ b/Corona-Warn-App/src/main/res/layout/trace_location_attendee_checkins_item_past.xml
@@ -17,7 +17,7 @@
         android:layout_marginTop="16dp"
         android:layout_marginBottom="16dp"
         android:orientation="vertical"
-        android:src="@drawable/ic_old_checkin"
+        app:srcCompat="@drawable/ic_old_checkin"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/trace_location_organizer_qr_code_detail_fragment.xml b/Corona-Warn-App/src/main/res/layout/trace_location_organizer_qr_code_detail_fragment.xml
index 9396dc1576dfc32de53f628d19d795c828a87d19..36589681fc501f9e38582a7790969b2071e1dab8 100644
--- a/Corona-Warn-App/src/main/res/layout/trace_location_organizer_qr_code_detail_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/trace_location_organizer_qr_code_detail_fragment.xml
@@ -36,7 +36,7 @@
                     android:id="@+id/expandedImage"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:src="@drawable/trace_location_view_cardhighlight_gradient"
+                    app:srcCompat="@drawable/trace_location_view_cardhighlight_gradient"
                     app:layout_collapseMode="parallax" />
 
                 <LinearLayout
@@ -95,7 +95,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_marginEnd="72dp"
-                            android:src="@drawable/ic_cwa_logo_white" />
+                            app:srcCompat="@drawable/ic_cwa_logo_white" />
 
                     </LinearLayout>
 
diff --git a/Corona-Warn-App/src/main/res/layout/trace_location_organizer_qr_code_info_fragment.xml b/Corona-Warn-App/src/main/res/layout/trace_location_organizer_qr_code_info_fragment.xml
index c106bb4ddcea1a87288b686c7b5d3415f985b7df..e9ae2372e5965292a6bf276466a3f03031fda6b7 100644
--- a/Corona-Warn-App/src/main/res/layout/trace_location_organizer_qr_code_info_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/trace_location_organizer_qr_code_info_fragment.xml
@@ -39,7 +39,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/spacing_huge"
                 android:contentDescription="@string/trace_location_qr_info_content_description"
-                android:src="@drawable/ic_qr_info"
+                app:srcCompat="@drawable/ic_qr_info"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -76,7 +76,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/spacing_large"
                 android:importantForAccessibility="no"
-                android:src="@drawable/ic_qr_tracing_static"
+                app:srcCompat="@drawable/ic_qr_tracing_static"
                 app:layout_constraintStart_toStartOf="@id/trace_location_qr_info_subtitle"
                 app:layout_constraintTop_toBottomOf="@id/trace_location_qr_info_subtitle" />
 
@@ -98,7 +98,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/spacing_medium"
                 android:importantForAccessibility="no"
-                android:src="@drawable/ic_qr_code_illustration"
+                app:srcCompat="@drawable/ic_qr_code_illustration"
                 app:layout_constraintStart_toStartOf="@id/trace_location_tracing_icon"
                 app:layout_constraintTop_toBottomOf="@id/trace_location_qr_info_tracing" />
 
@@ -120,7 +120,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/spacing_medium"
                 android:importantForAccessibility="no"
-                android:src="@drawable/ic_qr_time"
+                app:srcCompat="@drawable/ic_qr_time"
                 app:layout_constraintTop_toBottomOf="@id/trace_location_qr_code_illustration_text"
                 app:layout_constraintStart_toStartOf="@id/trace_location_qr_code_icon" />
 
diff --git a/Corona-Warn-App/src/main/res/layout/trace_location_organizer_trace_locations_item.xml b/Corona-Warn-App/src/main/res/layout/trace_location_organizer_trace_locations_item.xml
index 3b0d989a634d8d026167b26298a3e64c6c9bb7f7..89a547a8123b56d1b249532b67451b21a864dbdd 100644
--- a/Corona-Warn-App/src/main/res/layout/trace_location_organizer_trace_locations_item.xml
+++ b/Corona-Warn-App/src/main/res/layout/trace_location_organizer_trace_locations_item.xml
@@ -23,7 +23,7 @@
             android:layout_width="42dp"
             android:layout_height="42dp"
             android:importantForAccessibility="no"
-            android:src="@drawable/ic_qr_code_list_item_icon"
+            app:srcCompat="@drawable/ic_qr_code_list_item_icon"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/tracing_content_disabled_view.xml b/Corona-Warn-App/src/main/res/layout/tracing_content_disabled_view.xml
index 827d81c0156ad03c52f36737ba861c7949a6938c..b5ab40269e5bcc93d7b540ce596642d053fd03b1 100644
--- a/Corona-Warn-App/src/main/res/layout/tracing_content_disabled_view.xml
+++ b/Corona-Warn-App/src/main/res/layout/tracing_content_disabled_view.xml
@@ -34,7 +34,7 @@
             android:layout_width="@dimen/icon_size_risk_card"
             android:layout_height="@dimen/icon_size_risk_card"
             android:importantForAccessibility="no"
-            android:src="@drawable/ic_forward"
+            app:srcCompat="@drawable/ic_forward"
             app:tint="@color/colorTextPrimary1"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
diff --git a/Corona-Warn-App/src/main/res/layout/tracing_content_failed_view.xml b/Corona-Warn-App/src/main/res/layout/tracing_content_failed_view.xml
index 101480a1308bbae54cce8732059f937b7f994380..31da8067055d0218e12fe0675f01f10b53026c44 100644
--- a/Corona-Warn-App/src/main/res/layout/tracing_content_failed_view.xml
+++ b/Corona-Warn-App/src/main/res/layout/tracing_content_failed_view.xml
@@ -33,7 +33,7 @@
             android:layout_width="@dimen/icon_size_risk_card"
             android:layout_height="@dimen/icon_size_risk_card"
             android:importantForAccessibility="no"
-            android:src="@drawable/ic_forward"
+            app:srcCompat="@drawable/ic_forward"
             app:tint="@color/colorTextPrimary1"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
diff --git a/Corona-Warn-App/src/main/res/layout/tracing_content_increased_view.xml b/Corona-Warn-App/src/main/res/layout/tracing_content_increased_view.xml
index 12af62996f2fc7360995f144a1f974461e5fe820..79688669a658d2ce286d953b6c04897b3dc5cc3c 100644
--- a/Corona-Warn-App/src/main/res/layout/tracing_content_increased_view.xml
+++ b/Corona-Warn-App/src/main/res/layout/tracing_content_increased_view.xml
@@ -35,7 +35,7 @@
             android:layout_width="@dimen/icon_size_risk_card"
             android:layout_height="@dimen/icon_size_risk_card"
             android:importantForAccessibility="no"
-            android:src="@drawable/ic_forward"
+            app:srcCompat="@drawable/ic_forward"
             app:tint="@color/colorStableLight"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
diff --git a/Corona-Warn-App/src/main/res/layout/tracing_content_low_view.xml b/Corona-Warn-App/src/main/res/layout/tracing_content_low_view.xml
index 1fbb229efc0de19a2b00f8c9ebd378da8cffd902..0c569562d3d1fe3ad86431eb15aa91f29f59327d 100644
--- a/Corona-Warn-App/src/main/res/layout/tracing_content_low_view.xml
+++ b/Corona-Warn-App/src/main/res/layout/tracing_content_low_view.xml
@@ -37,7 +37,7 @@
             android:layout_width="@dimen/icon_size_risk_card"
             android:layout_height="@dimen/icon_size_risk_card"
             android:importantForAccessibility="no"
-            android:src="@drawable/ic_forward"
+            app:srcCompat="@drawable/ic_forward"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:tint="@color/colorStableLight"
diff --git a/Corona-Warn-App/src/main/res/layout/tracing_content_progress_view.xml b/Corona-Warn-App/src/main/res/layout/tracing_content_progress_view.xml
index b425d258b53994166fe68cea2109ff11a51aedcf..10154cbf3cecfb6b580dac8e08dc49c4b288f87d 100644
--- a/Corona-Warn-App/src/main/res/layout/tracing_content_progress_view.xml
+++ b/Corona-Warn-App/src/main/res/layout/tracing_content_progress_view.xml
@@ -35,7 +35,7 @@
             android:layout_width="@dimen/icon_size_risk_card"
             android:layout_height="@dimen/icon_size_risk_card"
             android:importantForAccessibility="no"
-            android:src="@drawable/ic_forward"
+            app:srcCompat="@drawable/ic_forward"
             app:tint="@{state.getStableIconColor(context)}"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
diff --git a/Corona-Warn-App/src/main/res/layout/tracing_details_item_behavior_increased_view.xml b/Corona-Warn-App/src/main/res/layout/tracing_details_item_behavior_increased_view.xml
index 62b3800457ba532756f6d8dc31ea351e0c0bc290..2d200a6d28b5737e5e0a71e59e46440234a5b20b 100644
--- a/Corona-Warn-App/src/main/res/layout/tracing_details_item_behavior_increased_view.xml
+++ b/Corona-Warn-App/src/main/res/layout/tracing_details_item_behavior_increased_view.xml
@@ -71,7 +71,7 @@
                 android:layout_marginStart="@dimen/spacing_small"
                 android:layout_marginTop="@dimen/spacing_mega_tiny"
                 android:importantForAccessibility="no"
-                android:src="@drawable/bullet_point"
+                app:srcCompat="@drawable/bullet_point"
                 app:tint="@color/colorSemanticHighRisk"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="@id/risk_details_behavior_bullet_point_1" />
@@ -97,7 +97,7 @@
                 android:layout_marginStart="@dimen/spacing_small"
                 android:layout_marginTop="@dimen/spacing_mega_tiny"
                 android:importantForAccessibility="no"
-                android:src="@drawable/bullet_point"
+                app:srcCompat="@drawable/bullet_point"
                 app:tint="@color/colorSemanticHighRisk"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="@id/risk_details_behavior_bullet_point_2" />
@@ -124,7 +124,7 @@
                 android:layout_marginStart="@dimen/spacing_small"
                 android:layout_marginTop="@dimen/spacing_mega_tiny"
                 android:importantForAccessibility="no"
-                android:src="@drawable/bullet_point"
+                app:srcCompat="@drawable/bullet_point"
                 app:tint="@color/colorSemanticHighRisk"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="@id/risk_details_behavior_bullet_point_3" />
diff --git a/Corona-Warn-App/src/main/res/layout/view_bullet_point_entry.xml b/Corona-Warn-App/src/main/res/layout/view_bullet_point_entry.xml
index dd70a00c8d45f6a7ab3a04aa457f28a7949e7afc..8be17fc926adfb4d93b3a0e321929d6d4fa05a1d 100644
--- a/Corona-Warn-App/src/main/res/layout/view_bullet_point_entry.xml
+++ b/Corona-Warn-App/src/main/res/layout/view_bullet_point_entry.xml
@@ -12,7 +12,7 @@
         android:layout_height="@dimen/bullet_point_size"
         android:layout_marginStart="@dimen/bullet_point_spacing_before"
         android:baseline="@dimen/bullet_point_baseline_offset"
-        android:src="@drawable/bullet_point"
+        app:srcCompat="@drawable/bullet_point"
         android:importantForAccessibility="no"
         app:layout_constraintBaseline_toBaselineOf="@+id/bullet_point_content"
         app:layout_constraintStart_toStartOf="parent" />
diff --git a/Corona-Warn-App/src/main/res/layout/view_bullet_point_text.xml b/Corona-Warn-App/src/main/res/layout/view_bullet_point_text.xml
index 776045ec7dc7532c1e64e97f1a32fff1581a66b0..65bf6f10070a81e8d9d15f30f9fa3026b28bf4cd 100644
--- a/Corona-Warn-App/src/main/res/layout/view_bullet_point_text.xml
+++ b/Corona-Warn-App/src/main/res/layout/view_bullet_point_text.xml
@@ -19,7 +19,7 @@
             android:layout_width="@dimen/bullet_point_size"
             android:layout_height="@dimen/bullet_point_size"
             android:baseline="@dimen/bullet_point_baseline_offset"
-            android:src="@drawable/bullet_point"
+            app:srcCompat="@drawable/bullet_point"
             android:importantForAccessibility="no"
             app:layout_constraintBaseline_toBaselineOf="@+id/bullet_point_content"
             app:layout_constraintStart_toStartOf="parent" />
diff --git a/Corona-Warn-App/src/main/res/layout/view_circle_progress.xml b/Corona-Warn-App/src/main/res/layout/view_circle_progress.xml
index 209542e7621e609b83451ce49d1c0ab4b3d1f4cf..f5b023d5db5e8290d642dc22dd86a725d7f37484 100644
--- a/Corona-Warn-App/src/main/res/layout/view_circle_progress.xml
+++ b/Corona-Warn-App/src/main/res/layout/view_circle_progress.xml
@@ -22,7 +22,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:importantForAccessibility="no"
-            android:src="@drawable/ic_risk_card_saved_days"
+            app:srcCompat="@drawable/ic_risk_card_saved_days"
             app:tint="@color/colorAccentTintIcon"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/view_consent_status.xml b/Corona-Warn-App/src/main/res/layout/view_consent_status.xml
index 8f533776c8ebf58cdd2888e1df32d25814fa8671..4bbcf160f22e3e82960aae722126b940c4f915ac 100644
--- a/Corona-Warn-App/src/main/res/layout/view_consent_status.xml
+++ b/Corona-Warn-App/src/main/res/layout/view_consent_status.xml
@@ -27,7 +27,7 @@
         android:focusable="false"
         android:importantForAccessibility="no"
         android:paddingTop="4dp"
-        android:src="@drawable/ic_consent_status_view_icon"
+        app:srcCompat="@drawable/ic_consent_status_view_icon"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.0" />