diff --git a/src/main/res/layout/aggregated_stats_list_item.xml b/src/main/res/layout/aggregated_stats_list_item.xml
index e034e92b3..1975cb0fd 100644
--- a/src/main/res/layout/aggregated_stats_list_item.xml
+++ b/src/main/res/layout/aggregated_stats_list_item.xml
@@ -37,111 +37,121 @@
         android:layout_marginTop="16dp"
         app:layout_constraintStart_toStartOf="@id/guideline1"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_activity_bike_24dp" />
+        app:tint="?android:textColorPrimary"
+        tools:srcCompat="@drawable/ic_activity_bike_24dp" />
 
     <TextView
         android:id="@+id/aggregated_stats_type_label"
         style="@style/StatsLargeLabel"
+        android:layout_marginStart="16dp"
         android:layout_marginTop="0dp"
         android:layout_marginBottom="0dp"
         app:layout_constraintBottom_toBottomOf="@+id/aggregated_stats_sport_icon"
         app:layout_constraintStart_toEndOf="@+id/aggregated_stats_sport_icon"
         app:layout_constraintTop_toTopOf="@+id/aggregated_stats_sport_icon"
-        tools:text="@string/activity_type_cycling"
-        android:layout_marginStart="16dp" />
+        tools:text="@string/activity_type_cycling" />
 
     <TextView
         android:id="@+id/aggregated_stats_num_tracks"
         style="@style/StatsLargeLabel"
+        android:layout_marginStart="4dp"
         android:layout_marginTop="0dp"
         android:layout_marginBottom="0dp"
         app:layout_constraintBottom_toBottomOf="@+id/aggregated_stats_type_label"
         app:layout_constraintStart_toEndOf="@+id/aggregated_stats_type_label"
         app:layout_constraintTop_toTopOf="@+id/aggregated_stats_type_label"
-        tools:text="(1)"
-        android:layout_marginStart="4dp" />
+        tools:text="(1)" />
 
     <!-- Distance -->
+
+    <!-- Time -->
+
     <TextView
         android:id="@+id/aggregated_stats_distance"
         style="@style/StatsLargeValue"
-        app:layout_constraintStart_toStartOf="@id/guideline1"
+        android:layout_marginTop="16dp"
+        app:layout_constraintEnd_toStartOf="@id/aggregated_stats_distance_unit"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintStart_toEndOf="@id/guideline1"
         app:layout_constraintTop_toBottomOf="@+id/aggregated_stats_sport_icon"
-        tools:text="100000"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp" />
+        tools:layout_editor_absoluteX="52dp"
+        tools:text="100000" />
 
     <TextView
         android:id="@+id/aggregated_stats_distance_unit"
         style="@style/StatsUnit"
+        android:singleLine="true"
         app:layout_constraintBottom_toBottomOf="@+id/aggregated_stats_distance"
+        app:layout_constraintEnd_toEndOf="@id/guideline2"
         app:layout_constraintStart_toEndOf="@+id/aggregated_stats_distance"
         tools:text="km" />
 
-    <!-- Time -->
     <TextView
         android:id="@+id/aggregated_stats_time"
         style="@style/StatsLargeValue"
-        app:layout_constraintEnd_toEndOf="@id/guideline3"
-        app:layout_constraintTop_toBottomOf="@+id/aggregated_stats_sport_icon"
-        tools:text="00:00:00"
+        android:layout_marginTop="16dp"
         android:layout_marginEnd="16dp"
-        android:layout_marginTop="16dp" />
+        app:layout_constraintEnd_toEndOf="@id/guideline3"
+        app:layout_constraintStart_toStartOf="@+id/guideline2"
+        app:layout_constraintTop_toBottomOf="@+id/aggregated_stats_sport_icon"
+        tools:text="00:00:00" />
 
     <!-- Avg. rate -->
     <TextView
         android:id="@+id/aggregated_stats_avg_rate"
         style="@style/StatsSmallValue"
-        app:layout_constraintHorizontal_chainStyle="packed"
-        app:layout_constraintTop_toBottomOf="@id/aggregated_stats_distance"
-        app:layout_constraintStart_toEndOf="@id/guideline1"
-        app:layout_constraintEnd_toStartOf="@+id/aggregated_stats_avg_rate_unit"
         android:layout_marginTop="24dp"
+        app:layout_constraintEnd_toStartOf="@+id/aggregated_stats_avg_rate_unit"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintStart_toEndOf="@id/guideline1"
+        app:layout_constraintTop_toBottomOf="@id/aggregated_stats_distance"
         tools:text="30" />
 
     <TextView
         android:id="@+id/aggregated_stats_avg_rate_unit"
         style="@style/StatsUnit"
         app:layout_constraintBottom_toBottomOf="@+id/aggregated_stats_avg_rate"
-        app:layout_constraintStart_toEndOf="@+id/aggregated_stats_avg_rate"
         app:layout_constraintEnd_toEndOf="@id/guideline2"
+        app:layout_constraintStart_toEndOf="@+id/aggregated_stats_avg_rate"
         tools:text="km/h" />
 
     <TextView
         android:id="@+id/aggregated_stats_avg_rate_label"
         style="@style/StatsTinyLabel"
+        android:singleLine="true"
         app:layout_constrainedWidth="true"
-        app:layout_constraintTop_toBottomOf="@+id/aggregated_stats_avg_rate"
-        app:layout_constraintStart_toEndOf="@id/guideline1"
         app:layout_constraintEnd_toEndOf="@id/guideline2"
+        app:layout_constraintStart_toEndOf="@id/guideline1"
+        app:layout_constraintTop_toBottomOf="@+id/aggregated_stats_avg_rate"
         tools:text="@string/stats_average_moving_speed" />
 
     <!-- Max. rate -->
     <TextView
         android:id="@+id/aggregated_stats_max_rate"
         style="@style/StatsSmallValue"
-        app:layout_constraintHorizontal_chainStyle="packed"
-        app:layout_constraintTop_toBottomOf="@id/aggregated_stats_time"
-        app:layout_constraintStart_toEndOf="@id/guideline2"
-        app:layout_constraintEnd_toStartOf="@+id/aggregated_stats_max_rate_unit"
         android:layout_marginTop="24dp"
+        app:layout_constraintEnd_toStartOf="@+id/aggregated_stats_max_rate_unit"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintStart_toEndOf="@id/guideline2"
+        app:layout_constraintTop_toBottomOf="@id/aggregated_stats_time"
         tools:text="70" />
 
     <TextView
         android:id="@+id/aggregated_stats_max_rate_unit"
         style="@style/StatsUnit"
         app:layout_constraintBottom_toBottomOf="@+id/aggregated_stats_max_rate"
-        app:layout_constraintStart_toEndOf="@+id/aggregated_stats_max_rate"
         app:layout_constraintEnd_toStartOf="@id/guideline3"
+        app:layout_constraintStart_toEndOf="@+id/aggregated_stats_max_rate"
         tools:text="km/h" />
 
     <TextView
         android:id="@+id/aggregated_stats_max_rate_label"
         style="@style/StatsTinyLabel"
+        android:singleLine="true"
         app:layout_constrainedWidth="true"
-        app:layout_constraintTop_toBottomOf="@+id/aggregated_stats_max_rate"
-        app:layout_constraintStart_toEndOf="@id/guideline2"
         app:layout_constraintEnd_toStartOf="@id/guideline3"
+        app:layout_constraintStart_toEndOf="@id/guideline2"
+        app:layout_constraintTop_toBottomOf="@+id/aggregated_stats_max_rate"
         tools:text="@string/stats_max_speed" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file