diff --git a/Corona-Warn-App/src/main/res/layout/tracing_card_info_row_layout.xml b/Corona-Warn-App/src/main/res/layout/tracing_card_info_row_layout.xml
index 76e12886a8f945ad64ba3bbdf9e23b18343988b5..9b121ddcd90898949d1e87129c3a2596524add6b 100644
--- a/Corona-Warn-App/src/main/res/layout/tracing_card_info_row_layout.xml
+++ b/Corona-Warn-App/src/main/res/layout/tracing_card_info_row_layout.xml
@@ -11,8 +11,9 @@
         android:layout_width="@dimen/icon_size_risk_card"
         android:layout_height="@dimen/icon_size_risk_card"
         android:importantForAccessibility="no"
+        app:layout_constraintBottom_toBottomOf="@+id/body"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/body"
         tools:src="@drawable/ic_risk_details_home"
         tools:tint="@color/colorTextPrimary1" />
 
@@ -22,10 +23,12 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/spacing_small"
-        app:layout_constraintBottom_toBottomOf="@id/icon"
+        android:layout_marginTop="@dimen/spacing_tiny"
+        android:layout_marginBottom="@dimen/spacing_tiny"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/icon"
-        app:layout_constraintTop_toTopOf="@id/icon"
+        app:layout_constraintTop_toTopOf="parent"
         tools:text="@string/lorem_ipsum"
         tools:textColor="@color/colorTextPrimary1" />
 </merge>
\ No newline at end of file
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 87b941475fbf36d990ada2d392204b78f162b00f..4c9a1b726547800f03f7e955025fbe99a7b5e96e 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
@@ -44,7 +44,7 @@
             style="@style/subtitle"
             android:layout_width="@dimen/match_constraint"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/spacing_normal"
+            android:layout_marginTop="@dimen/spacing_small"
             android:text="@string/risk_card_body_tracing_off"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -68,7 +68,6 @@
             android:id="@+id/row_time_fetched"
             android:layout_width="@dimen/match_constraint"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/spacing_tiny"
             android:icon="@drawable/ic_risk_card_time_fetched"
             android:text="@{state.getTimeFetched(context)}"
             android:textColor="@color/colorTextPrimary1"
@@ -84,7 +83,7 @@
             gone="@{!state.showEnableTracingButton}"
             android:layout_width="@dimen/match_constraint"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/spacing_normal"
+            android:layout_marginTop="@dimen/spacing_small"
             android:text="@string/risk_details_button_enable_tracing"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="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 e543f34104ca0c6c72cf2eda93302f20a9622cb5..de68265db2dba3c5b4eb9eec0ee681c2582b3c67 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
@@ -42,7 +42,7 @@
             style="@style/subtitle"
             android:layout_width="@dimen/match_constraint"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/spacing_normal"
+            android:layout_marginTop="16dp"
             android:text="@string/risk_card_check_failed_no_internet_body"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -66,7 +66,6 @@
             android:id="@+id/risk_card_row_time_fetched"
             android:layout_width="@dimen/match_constraint"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/spacing_tiny"
             android:icon="@drawable/ic_risk_card_time_fetched"
             android:text="@{state.getTimeFetched(context)}"
             android:textColor="@color/colorTextPrimary1Stable"
@@ -82,7 +81,7 @@
             gone="@{state.showRestartButton}"
             android:layout_width="@dimen/match_constraint"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/spacing_normal"
+            android:layout_marginTop="@dimen/spacing_small"
             android:text="@string/risk_card_check_failed_no_internet_restart_button"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="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 f8fb38b7d95bfa4fbb33b312db1684c657cedc84..331d117d1336acbe9ff3dcc4e6e95925191b79f5 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
@@ -44,7 +44,7 @@
             android:id="@+id/row_contact"
             android:layout_width="@dimen/match_constraint"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/spacing_normal"
+            android:layout_marginTop="@dimen/spacing_small"
             android:icon="@drawable/ic_risk_card_contact_increased"
             android:text="@{state.getRiskContactBody(context)}"
             android:textColor="@color/colorTextPrimary1InvertedStable"
@@ -59,7 +59,6 @@
             gone="@{state.getRiskContactLast(context) == null}"
             android:layout_width="@dimen/match_constraint"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/spacing_tiny"
             android:icon="@drawable/ic_risk_card_calendar"
             android:text="@{state.getRiskContactLast(context)}"
             android:textColor="@color/colorTextPrimary1InvertedStable"
@@ -74,7 +73,6 @@
             gone="@{!state.inDetailsMode}"
             android:layout_width="@dimen/match_constraint"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/spacing_tiny"
             android:icon="@drawable/ic_risk_card_calendar"
             android:text="@{state.getRiskActiveTracingDaysInRetentionPeriod(context)}"
             android:textColor="@color/colorTextPrimary1InvertedStable"
@@ -88,7 +86,6 @@
             android:id="@+id/row_time_fetched"
             android:layout_width="@dimen/match_constraint"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/spacing_tiny"
             android:icon="@drawable/ic_risk_card_time_fetched"
             android:text="@{state.getTimeFetched(context)}"
             android:textColor="@color/colorTextPrimary1InvertedStable"
@@ -104,7 +101,7 @@
             gone="@{!state.showUpdateButton}"
             android:layout_width="@dimen/match_constraint"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/spacing_normal"
+            android:layout_marginTop="@dimen/spacing_small"
             android:text="@string/risk_card_button_update"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="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 c298e19c330d2b2ac0799aaceafd60a5d5c632a6..2ede6f41def34ccfba6f2c6e0da353fab27e44da 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
@@ -47,7 +47,7 @@
             android:id="@+id/row_contact"
             android:layout_width="@dimen/match_constraint"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/spacing_normal"
+            android:layout_marginTop="16dp"
             android:icon="@drawable/ic_risk_card_contact"
             android:text="@{state.getRiskContactBody(context)}"
             android:textColor="@color/colorTextPrimary1InvertedStable"
@@ -61,7 +61,6 @@
             android:id="@+id/row_saved_days"
             android:layout_width="@dimen/match_constraint"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/spacing_tiny"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/row_contact">
@@ -85,6 +84,8 @@
                 style="@style/subtitle"
                 android:layout_width="@dimen/match_constraint"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/spacing_tiny"
+                android:layout_marginBottom="@dimen/spacing_tiny"
                 android:layout_marginStart="24dp"
                 android:text="@{state.getRiskActiveTracingDaysInRetentionPeriod(context)}"
                 android:textColor="@color/colorTextPrimary1InvertedStable"
@@ -100,7 +101,6 @@
             android:id="@+id/row_time_fetched"
             android:layout_width="@dimen/match_constraint"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/spacing_tiny"
             android:icon="@drawable/ic_risk_card_time_fetched"
             android:text="@{state.getTimeFetched(context)}"
             android:textColor="@color/colorTextPrimary1InvertedStable"
@@ -116,7 +116,7 @@
             gone="@{!state.showUpdateButton}"
             android:layout_width="@dimen/match_constraint"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/spacing_normal"
+            android:layout_marginTop="@dimen/spacing_small"
             android:text="@string/risk_card_button_update"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
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 9c3e62b4de8d911d3f128e0976eb35bfcd6ed390..0d46ba20fa451923563825949498e2de2e39521f 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
@@ -57,7 +57,7 @@
             android:layout_width="@dimen/match_constraint"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/spacing_small"
-            android:layout_marginTop="24dp"
+            android:layout_marginTop="@dimen/spacing_small"
             android:text="@{state.getProgressCardBody(context)}"
             android:textColor="@{state.getStableTextColor(context)}"
             app:layout_constraintBottom_toBottomOf="parent"