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 e09401533bd6e6b6cccfecb8fc1c1a831a3143b0..172335e1c41f698ca0d0ef66628dfec44aecc814 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
@@ -21,7 +21,7 @@
         app:layout_constraintEnd_toStartOf="@id/edit_icon"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="Julia Maria" />
+        tools:text="@tools:sample/full_names" />
 
     <ImageView
         android:id="@+id/edit_icon"
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 f30bf67dbf408028f65ae4929504e6f25c5b9da5..e4916ab148d90a9681dc8426b003c152d4cbc508 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
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/content_container"
@@ -62,6 +63,7 @@
             app:layout_constraintBottom_toTopOf="@id/delete_button"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
+            tools:listitem="@layout/contact_diary_edit_list_item"
             app:layout_constraintTop_toBottomOf="@id/toolbar" />
 
         <android.widget.Button
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_location_list_fragment.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_location_list_fragment.xml
index f1030bc19bdf1cf00aeebfe29608478bfdc190f1..2569f3976c8ee4fb2b4467970c6884e6c47842f2 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_location_list_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_location_list_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -16,7 +17,8 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            tools:listitem="@layout/contact_diary_location_list_item" />
 
         <androidx.constraintlayout.widget.Group
             android:id="@+id/contact_diary_location_list_no_items_group"
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_location_list_item.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_location_list_item.xml
index 7ba3076e4a29661eb1a38a2b0a7a0dec74a8062b..4a07d8eb7bfea1df946364dab5ace744ed508b88 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_location_list_item.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_location_list_item.xml
@@ -30,7 +30,8 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/contact_diary_location_list_item_icon"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="@tools:sample/cities" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </layout>
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_person_list_fragment.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_person_list_fragment.xml
index 761caef6d9622af80b25c6ab571832e84c83beea..7410f4f7a9ba01310a12e5b5922c067a221f6acc 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_person_list_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_person_list_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -16,7 +17,8 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            tools:listitem="@layout/contact_diary_person_list_item" />
 
         <androidx.constraintlayout.widget.Group
             android:id="@+id/contact_diary_person_list_no_items_group"
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_person_list_item.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_person_list_item.xml
index d81299dac4415f12f7f8c7f43b9de8ca41e02e16..1b4da486f70f01340c52b402921f1ec591b890ff 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_person_list_item.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_person_list_item.xml
@@ -4,8 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        style="@style/contactDiaryCardRipple"
         android:id="@+id/contact_diary_person_list_item"
+        style="@style/contactDiaryCardRipple"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="@dimen/spacing_huge">
@@ -30,7 +30,8 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/contact_diary_person_list_item_icon"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="@tools:sample/full_names" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </layout>
diff --git a/Corona-Warn-App/src/main/res/layout/include_information_details.xml b/Corona-Warn-App/src/main/res/layout/include_information_details.xml
index bb0bba0bee41a905f4b5357a66d53bbe6038d125..a0b0a3084fd8a0383183a3aab6d98f9bf793f6cc 100644
--- a/Corona-Warn-App/src/main/res/layout/include_information_details.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_information_details.xml
@@ -34,9 +34,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:focusable="true"
-            android:scaleType="centerCrop"
             android:paddingTop="@dimen/spacing_small"
             android:paddingBottom="@dimen/spacing_small"
+            android:scaleType="centerCrop"
             android:src="@{illustration}"
             bind:cwaContentDescription="@{illustrationDescription}"
             tools:ignore="ContentDescription"
@@ -47,8 +47,8 @@
             style="@style/headline6"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/spacing_small"
             android:layout_marginStart="@dimen/spacing_normal"
+            android:layout_marginTop="@dimen/spacing_small"
             android:layout_marginEnd="@dimen/spacing_normal"
             android:accessibilityHeading="true"
             android:focusable="true"
@@ -69,7 +69,7 @@
             android:text="@{body}"
             android:textColorLink="@color/colorTextTint"
             android:visibility="@{FormatterHelper.formatVisibilityText(body)}"
-            tools:text="@string/settings_title" />
+            tools:text="@tools:sample/lorem/random" />
 
     </LinearLayout>
 
diff --git a/Corona-Warn-App/src/main/res/navigation/contact_diary_nav_graph.xml b/Corona-Warn-App/src/main/res/navigation/contact_diary_nav_graph.xml
index bbb93fbb3773dde89720ad52bc8205360a16a3be..4cbc14018db60eceeb7dccc85f946bd59a705f13 100644
--- a/Corona-Warn-App/src/main/res/navigation/contact_diary_nav_graph.xml
+++ b/Corona-Warn-App/src/main/res/navigation/contact_diary_nav_graph.xml
@@ -22,7 +22,8 @@
     <fragment
         android:id="@+id/contactDiaryPersonListFragment"
         android:name="de.rki.coronawarnapp.contactdiary.ui.day.tabs.person.ContactDiaryPersonListFragment"
-        android:label="ContactDiaryPersonListFragment">
+        android:label="ContactDiaryPersonListFragment"
+        tools:layout="@layout/contact_diary_person_list_fragment">
         <argument
             android:name="selectedDay"
             app:argType="string" />
@@ -30,7 +31,8 @@
     <fragment
         android:id="@+id/contactDiaryPlaceListFragment"
         android:name="de.rki.coronawarnapp.contactdiary.ui.day.tabs.location.ContactDiaryLocationListFragment"
-        android:label="ContactDiaryPlaceListFragment">
+        android:label="ContactDiaryPlaceListFragment"
+        tools:layout="@layout/contact_diary_location_list_fragment">
         <argument
             android:name="selectedDay"
             app:argType="string" />
@@ -41,9 +43,9 @@
         android:label="ContactDiaryPersonBottomSheetDialogFragment">
         <argument
             android:name="selectedPerson"
-            app:nullable="true"
             android:defaultValue="@null"
-            app:argType="de.rki.coronawarnapp.contactdiary.storage.entity.ContactDiaryPersonEntity" />
+            app:argType="de.rki.coronawarnapp.contactdiary.storage.entity.ContactDiaryPersonEntity"
+            app:nullable="true" />
         <argument
             android:name="addedAt"
             android:defaultValue="@null"
@@ -56,9 +58,9 @@
         android:label="ContactDiaryLocationBottomSheetDialogFragment">
         <argument
             android:name="selectedLocation"
-            app:nullable="true"
             android:defaultValue="@null"
-            app:argType="de.rki.coronawarnapp.contactdiary.storage.entity.ContactDiaryLocationEntity" />
+            app:argType="de.rki.coronawarnapp.contactdiary.storage.entity.ContactDiaryLocationEntity"
+            app:nullable="true" />
         <argument
             android:name="addedAt"
             android:defaultValue="@null"
@@ -68,7 +70,8 @@
     <fragment
         android:id="@+id/contactDiaryOnboardingFragment"
         android:name="de.rki.coronawarnapp.contactdiary.ui.onboarding.ContactDiaryOnboardingFragment"
-        android:label="ContactDiaryOnboardingFragment">
+        android:label="ContactDiaryOnboardingFragment"
+        tools:layout="@layout/contact_diary_onboarding_fragment">
         <action
             android:id="@+id/action_contactDiaryOnboardingFragment_to_contactDiaryInformationPrivacyFragment"
             app:destination="@id/contactDiaryInformationPrivacyFragment" />
@@ -76,12 +79,13 @@
             android:id="@+id/action_contactDiaryOnboardingFragment_to_contactDiaryOverviewFragment"
             app:destination="@id/contactDiaryOverviewFragment"
             app:popUpTo="@id/contact_diary_nav_graph"
-            app:popUpToInclusive="true"/>
+            app:popUpToInclusive="true" />
     </fragment>
     <fragment
         android:id="@+id/contactDiaryInformationPrivacyFragment"
         android:name="de.rki.coronawarnapp.ui.information.InformationPrivacyFragment"
-        android:label="InformationPrivacyFragment" />
+        android:label="InformationPrivacyFragment"
+        tools:layout="@layout/fragment_information_privacy" />
     <fragment
         android:id="@+id/contactDiaryOverviewFragment"
         android:name="de.rki.coronawarnapp.contactdiary.ui.overview.ContactDiaryOverviewFragment"
@@ -111,7 +115,8 @@
     <fragment
         android:id="@+id/contactDiaryEditPersonsFragment"
         android:name="de.rki.coronawarnapp.contactdiary.ui.edit.ContactDiaryEditPersonsFragment"
-        android:label="ContactDiaryEditPersonsFragment" >
+        android:label="ContactDiaryEditPersonsFragment"
+        tools:layout="@layout/contact_diary_edit_persons_fragment">
         <action
             android:id="@+id/action_contactDiaryEditPersonsFragment_to_contactDiaryPersonBottomSheetDialogFragment"
             app:destination="@id/contactDiaryPersonBottomSheetDialogFragment" />