diff --git a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/contactdiary/ContactDiaryOverviewFragmentTest.kt b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/contactdiary/ContactDiaryOverviewFragmentTest.kt
index eb3cd813f32f4267586caf4b9b89056393aff024..2b0e52b5537814e61fd0aa6aede53ebf9a38ffc7 100644
--- a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/contactdiary/ContactDiaryOverviewFragmentTest.kt
+++ b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/contactdiary/ContactDiaryOverviewFragmentTest.kt
@@ -5,13 +5,16 @@ import androidx.lifecycle.MutableLiveData
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
+import de.rki.coronawarnapp.R
 import de.rki.coronawarnapp.contactdiary.storage.repo.ContactDiaryRepository
 import de.rki.coronawarnapp.contactdiary.ui.overview.ContactDiaryOverviewFragment
 import de.rki.coronawarnapp.contactdiary.ui.overview.ContactDiaryOverviewViewModel
 import de.rki.coronawarnapp.contactdiary.ui.overview.adapter.ListItem
 import de.rki.coronawarnapp.risk.storage.RiskLevelStorage
 import de.rki.coronawarnapp.task.TaskController
-import de.rki.coronawarnapp.ui.contactdiary.DiaryData.LIST_ITEMS
+import de.rki.coronawarnapp.ui.contactdiary.DiaryData.DATA_ITEMS
+import de.rki.coronawarnapp.ui.contactdiary.DiaryData.HIGH_RISK
+import de.rki.coronawarnapp.ui.contactdiary.DiaryData.LOW_RISK
 import io.mockk.MockKAnnotations
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
@@ -91,7 +94,8 @@ class ContactDiaryOverviewFragmentTest : BaseUITest() {
                 .map { LocalDate.now().minusDays(it) }
                 .map {
                     ListItem(it).apply {
-                        data.apply { addAll(LIST_ITEMS) }
+                        data.addAll(DATA_ITEMS)
+                        risk = if (it.dayOfYear % 2 == 0) HIGH_RISK else LOW_RISK
                     }
                 }
         )
diff --git a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/contactdiary/DiaryData.kt b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/contactdiary/DiaryData.kt
index 910abff2693ecc7e8a709d9b9d2fe60101b09484..c6b8e97ffd73055f414903dfca305524848b04c4 100644
--- a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/contactdiary/DiaryData.kt
+++ b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/contactdiary/DiaryData.kt
@@ -11,7 +11,7 @@ import de.rki.coronawarnapp.util.ui.toLazyString
 
 object DiaryData {
 
-    val LIST_ITEMS = listOf(
+    val DATA_ITEMS = listOf(
         ListItem.Data(
             R.drawable.ic_contact_diary_person_item,
             "Max Mustermann",
@@ -37,6 +37,18 @@ object DiaryData {
         )
     )
 
+    val HIGH_RISK = ListItem.Risk(
+        R.string.contact_diary_risk_body,
+        R.string.contact_diary_high_risk_title,
+        R.drawable.ic_high_risk_alert
+    )
+
+    val LOW_RISK = ListItem.Risk(
+        R.string.contact_diary_risk_body,
+        R.string.contact_diary_low_risk_title,
+        R.drawable.ic_low_risk_alert
+    )
+
     val LOCATIONS: List<SelectableItem<ContactDiaryLocation>> = listOf(
         SelectableItem(
             selected = true,
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/ContactDiaryPreferences.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/storage/ContactDiaryPreferences.kt
similarity index 86%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/ContactDiaryPreferences.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/storage/ContactDiaryPreferences.kt
index 431a2cdc57f61d2126e0c726fae977903e669c9c..a54333b6846b5da78a0e26a85883788cd0843c76 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/ContactDiaryPreferences.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/storage/ContactDiaryPreferences.kt
@@ -1,6 +1,7 @@
-package de.rki.coronawarnapp.contactdiary.ui
+package de.rki.coronawarnapp.contactdiary.storage
 
 import android.content.Context
+import de.rki.coronawarnapp.contactdiary.ui.ContactDiarySettings
 import de.rki.coronawarnapp.util.di.AppContext
 import de.rki.coronawarnapp.util.preferences.clearAndNotify
 import de.rki.coronawarnapp.util.preferences.createFlowPreference
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/ContactDiarySettings.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/ContactDiarySettings.kt
index 6649f1b589a7fccb6915f0cb0b542cb3cf86be5f..060f31727d356c5b69c4f561ecc37b3894f62713 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/ContactDiarySettings.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/ContactDiarySettings.kt
@@ -1,5 +1,6 @@
 package de.rki.coronawarnapp.contactdiary.ui
 
+import de.rki.coronawarnapp.contactdiary.storage.ContactDiaryPreferences
 import javax.inject.Inject
 import javax.inject.Singleton
 
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataReset.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataReset.kt
index 2c63dab77b6b1bcd59e5795615b44b7faf4b85dd..7bafedc84dc7597b0b5d06bebe9f1da504072641 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataReset.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataReset.kt
@@ -4,7 +4,7 @@ import android.annotation.SuppressLint
 import android.content.Context
 import de.rki.coronawarnapp.appconfig.AppConfigProvider
 import de.rki.coronawarnapp.contactdiary.storage.repo.ContactDiaryRepository
-import de.rki.coronawarnapp.contactdiary.ui.ContactDiaryPreferences
+import de.rki.coronawarnapp.contactdiary.storage.ContactDiaryPreferences
 import de.rki.coronawarnapp.diagnosiskeys.download.DownloadDiagnosisKeysSettings
 import de.rki.coronawarnapp.diagnosiskeys.storage.KeyCacheRepository
 import de.rki.coronawarnapp.main.CWASettings
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/contactdiary/ui/ContactDiarySettingsTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/contactdiary/ui/ContactDiarySettingsTest.kt
index 576ed764c9a677419dec6414eb61ab725ebe69db..f2827a44b88b15776010dc7cb49964edb6520d6d 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/contactdiary/ui/ContactDiarySettingsTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/contactdiary/ui/ContactDiarySettingsTest.kt
@@ -1,5 +1,6 @@
 package de.rki.coronawarnapp.contactdiary.ui
 
+import de.rki.coronawarnapp.contactdiary.storage.ContactDiaryPreferences
 import de.rki.coronawarnapp.util.preferences.FlowPreference
 import io.kotest.matchers.shouldBe
 import io.mockk.MockKAnnotations