diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/onboarding/ContactDiaryOnboardingFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/onboarding/ContactDiaryOnboardingFragment.kt
index 1dd44a3ee3e010f20ff45f4732fed13fe48f226e..bea75430536746de5c7fd78a8ecf8b32d46fa1fa 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/onboarding/ContactDiaryOnboardingFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/onboarding/ContactDiaryOnboardingFragment.kt
@@ -4,7 +4,6 @@ import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.Fragment
 import de.rki.coronawarnapp.R
-import de.rki.coronawarnapp.contactdiary.ui.ContactDiaryActivity
 import de.rki.coronawarnapp.contactdiary.ui.ContactDiarySettings
 import de.rki.coronawarnapp.databinding.ContactDiaryOnboardingFragmentBinding
 import de.rki.coronawarnapp.util.di.AutoInject
@@ -45,7 +44,7 @@ class ContactDiaryOnboardingFragment : Fragment(R.layout.contact_diary_onboardin
             when (it) {
 
                 ContactDiaryOnboardingNavigationEvents.NavigateToMainActivity -> {
-                    (requireActivity() as ContactDiaryActivity).finish()
+                    requireActivity().onBackPressed()
                 }
 
                 ContactDiaryOnboardingNavigationEvents.NavigateToPrivacyFragment -> {
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 adc913469827105ff694c19c1dfbd907e09b2c23..66b5e927c6a49ee99c17dfa80d6bde4a47becf2a 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
@@ -6,7 +6,8 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:background="@drawable/card">
 
         <include
             android:id="@+id/contact_diary_onboarding_header"