diff --git a/Corona-Warn-App/src/main/res/color/button_red.xml b/Corona-Warn-App/src/main/res/color/button_red.xml
index 4d42fdd5d8682606ac8bee5815c604ea53cb5446..e51bf598bf6c61b974cc79e4aff35464867acac0 100644
--- a/Corona-Warn-App/src/main/res/color/button_red.xml
+++ b/Corona-Warn-App/src/main/res/color/button_red.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="@color/colorSemanticHighRiskPressed" android:state_pressed="true" /> <!-- pressed -->
+    <item android:color="@color/colorSurface2" android:state_enabled="false" /> <!-- disabled -->
     <item android:color="@color/colorSemanticHighRisk" /> <!-- default -->
-</selector>
\ No newline at end of file
+</selector>
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_edit_locations_fragment.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_edit_locations_fragment.xml
index 745b56b84784a3c9349d6cdf841694b1c39e35c9..231206caabfb652cbceaae176716c2f3fa694f6d 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_edit_locations_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_edit_locations_fragment.xml
@@ -75,7 +75,7 @@
             app:layout_constraintTop_toBottomOf="@id/toolbar"
             app:layout_constraintBottom_toTopOf="@id/delete_button"/>
 
-        <Button
+        <android.widget.Button
             android:id="@+id/delete_button"
             style="@style/buttonReset"
             android:layout_width="@dimen/match_constraint"
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_edit_persons_fragment.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_edit_persons_fragment.xml
index 3b284bff7d85c8b5532283b81ea0f26f525cac51..a1b93237ed42e5da0ab43fe211e9915a17f2ccb8 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_edit_persons_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_edit_persons_fragment.xml
@@ -75,7 +75,7 @@
             app:layout_constraintTop_toBottomOf="@id/toolbar"
             app:layout_constraintBottom_toTopOf="@id/delete_button"/>
 
-        <Button
+        <android.widget.Button
             android:id="@+id/delete_button"
             style="@style/buttonReset"
             android:layout_width="@dimen/match_constraint"