diff --git a/feature/dashboard/src/main/res/layout/fragment_sync_info.xml b/feature/dashboard/src/main/res/layout/fragment_sync_info.xml
index 949b932a49..92dbd89cb8 100644
--- a/feature/dashboard/src/main/res/layout/fragment_sync_info.xml
+++ b/feature/dashboard/src/main/res/layout/fragment_sync_info.xml
@@ -143,209 +143,265 @@
                         android:textAllCaps="true"
                         android:textColor="@color/simprints_text_orange" />
 
-                    <LinearLayout
+                    <androidx.constraintlayout.widget.ConstraintLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal"
                         android:paddingVertical="8dp">
 
                         <ImageView
+                            android:id="@+id/iconRecordsOnDevice"
                             android:layout_width="32dp"
                             android:layout_height="32dp"
                             android:contentDescription="@string/sync_info_records_on_device"
                             android:padding="4dp"
                             android:src="@drawable/ic_records"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"
                             app:tint="@color/simprints_text_grey" />
 
-                        <TextView
-                            style="@style/Text.Body1"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="start"
-                            android:layout_weight="0.85"
-                            android:padding="4dp"
-                            android:text="@string/sync_info_records_on_device" />
-
                         <TextView
                             android:id="@+id/totalRecordsCount"
                             style="@style/Text.Body1.Secondary"
-                            android:layout_width="0dp"
+                            android:layout_width="wrap_content"
                             android:layout_height="32dp"
-                            android:layout_gravity="center"
                             android:layout_marginEnd="7dp"
-                            android:layout_weight="0.15"
                             android:gravity="end|center_vertical"
-                            tools:text="137"
-                            android:textSize="16sp" />
+                            android:textSize="16sp"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"
+                            tools:text="137" />
 
                         <ProgressBar
                             android:id="@+id/totalRecordsProgress"
                             style="@style/Text.Body1.Secondary"
+                            android:layout_width="wrap_content"
+                            android:layout_height="32dp"
                             android:indeterminate="true"
                             android:indeterminateTint="@color/simprints_grey_light"
-                            android:layout_width="0dp"
-                            android:layout_height="32dp"
-                            android:layout_gravity="center"
-                            android:layout_weight="0.15"
                             android:visibility="gone"
-                            android:gravity="end|center_vertical" />
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
 
-                    </LinearLayout>
+                        <androidx.constraintlayout.widget.Barrier
+                            android:id="@+id/barrier_records_on_device_end"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            app:barrierDirection="start"
+                            app:constraint_referenced_ids="totalRecordsCount,totalRecordsProgress" />
 
-                    <LinearLayout
+                        <TextView
+                            style="@style/Text.Body1"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:ellipsize="end"
+                            android:lines="1"
+                            android:padding="4dp"
+                            android:text="@string/sync_info_records_on_device"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toStartOf="@id/barrier_records_on_device_end"
+                            app:layout_constraintStart_toEndOf="@id/iconRecordsOnDevice"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
                         android:id="@+id/layoutRecordsToUpload"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal"
                         android:paddingVertical="8dp">
 
                         <ImageView
+                            android:id="@+id/iconRecordsToUpload"
                             android:layout_width="32dp"
                             android:layout_height="32dp"
                             android:contentDescription="@string/sync_info_records_to_up_sync"
                             android:padding="4dp"
                             android:src="@drawable/ic_up_sync"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"
                             app:tint="@color/simprints_text_grey" />
 
-                        <TextView
-                            style="@style/Text.Body1"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="start"
-                            android:layout_weight="0.85"
-                            android:padding="4dp"
-                            android:text="@string/sync_info_records_to_up_sync" />
-
                         <TextView
                             android:id="@+id/recordsToUploadCount"
                             style="@style/Text.Body1.Secondary"
-                            android:layout_width="0dp"
+                            android:layout_width="wrap_content"
                             android:layout_height="32dp"
-                            android:layout_gravity="center"
                             android:layout_marginEnd="7dp"
-                            android:layout_weight="0.15"
                             android:gravity="end|center_vertical"
-                            tools:text="41"
-                            android:textSize="16sp" />
+                            android:textSize="16sp"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"
+                            tools:text="41" />
 
                         <ProgressBar
                             android:id="@+id/recordsToUploadProgress"
                             style="@style/Text.Body1.Secondary"
+                            android:layout_width="wrap_content"
+                            android:layout_height="32dp"
                             android:indeterminate="true"
                             android:indeterminateTint="@color/simprints_grey_light"
-                            android:layout_width="0dp"
-                            android:layout_height="32dp"
-                            android:layout_gravity="center"
-                            android:layout_weight="0.15"
                             android:visibility="gone"
-                            android:gravity="end|center_vertical" />
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
 
-                    </LinearLayout>
+                        <androidx.constraintlayout.widget.Barrier
+                            android:id="@+id/barrier_records_upload_end"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            app:barrierDirection="start"
+                            app:constraint_referenced_ids="recordsToUploadCount,recordsToUploadProgress" />
 
-                    <LinearLayout
+                        <TextView
+                            style="@style/Text.Body1"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:ellipsize="end"
+                            android:lines="1"
+                            android:padding="4dp"
+                            android:text="@string/sync_info_records_to_up_sync"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toStartOf="@id/barrier_records_upload_end"
+                            app:layout_constraintStart_toEndOf="@id/iconRecordsToUpload"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
                         android:id="@+id/layoutRecordsToDownload"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal"
                         android:paddingVertical="8dp">
 
                         <ImageView
+                            android:id="@+id/iconRecordsToDownload"
                             android:layout_width="32dp"
                             android:layout_height="32dp"
                             android:contentDescription="@string/sync_info_records_to_down_sync"
                             android:padding="4dp"
                             android:src="@drawable/ic_down_sync"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"
                             app:tint="@color/simprints_text_grey" />
 
-                        <TextView
-                            style="@style/Text.Body1"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="start"
-                            android:layout_weight="0.85"
-                            android:padding="4dp"
-                            android:text="@string/sync_info_records_to_down_sync" />
-
                         <TextView
                             android:id="@+id/recordsToDownloadCount"
                             style="@style/Text.Body1.Secondary"
-                            android:layout_width="0dp"
+                            android:layout_width="wrap_content"
                             android:layout_height="32dp"
-                            android:layout_gravity="center"
                             android:layout_marginEnd="7dp"
-                            android:layout_weight="0.15"
                             android:gravity="end|center_vertical"
-                            tools:text="16"
-                            android:textSize="16sp" />
+                            android:textSize="16sp"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"
+                            tools:text="16" />
 
                         <ProgressBar
                             android:id="@+id/recordsToDownloadProgress"
                             style="@style/Text.Body1.Secondary"
+                            android:layout_width="wrap_content"
+                            android:layout_height="32dp"
                             android:indeterminate="true"
                             android:indeterminateTint="@color/simprints_grey_light"
-                            android:layout_width="0dp"
-                            android:layout_height="32dp"
-                            android:layout_gravity="center"
-                            android:layout_weight="0.15"
                             android:visibility="gone"
-                            android:gravity="end|center_vertical" />
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
 
-                    </LinearLayout>
+                        <androidx.constraintlayout.widget.Barrier
+                            android:id="@+id/barrier_records_download_end"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            app:barrierDirection="start"
+                            app:constraint_referenced_ids="recordsToDownloadCount,recordsToDownloadProgress" />
 
-                    <LinearLayout
+                        <TextView
+                            style="@style/Text.Body1"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:ellipsize="end"
+                            android:lines="1"
+                            android:padding="4dp"
+                            android:text="@string/sync_info_records_to_down_sync"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toStartOf="@id/barrier_records_download_end"
+                            app:layout_constraintStart_toEndOf="@id/iconRecordsToDownload"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
                         android:id="@+id/layoutComboImageCounter"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal"
-                        android:visibility="gone"
-                        android:paddingVertical="8dp">
+                        android:paddingVertical="8dp"
+                        android:visibility="gone">
 
                         <ImageView
+                            android:id="@+id/iconComboImagesToUpload"
                             android:layout_width="32dp"
                             android:layout_height="32dp"
                             android:contentDescription="@string/sync_info_images_to_up_sync"
                             android:padding="4dp"
                             android:src="@drawable/ic_images"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"
                             app:tint="@color/simprints_text_grey" />
 
-                        <TextView
-                            style="@style/Text.Body1"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="start"
-                            android:layout_weight="0.85"
-                            android:padding="4dp"
-                            android:text="@string/sync_info_images_to_up_sync" />
-
                         <TextView
                             android:id="@+id/comboImagesToUploadCount"
                             style="@style/Text.Body1.Secondary"
-                            android:layout_width="0dp"
+                            android:layout_width="wrap_content"
                             android:layout_height="32dp"
-                            android:layout_gravity="center"
                             android:layout_marginEnd="7dp"
-                            android:layout_weight="0.15"
                             android:gravity="end|center_vertical"
-                            tools:text="30"
-                            android:textSize="16sp" />
+                            android:textSize="16sp"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"
+                            tools:text="30" />
 
                         <ProgressBar
                             android:id="@+id/comboImagesToUploadProgress"
                             style="@style/Text.Body1.Secondary"
+                            android:layout_width="wrap_content"
+                            android:layout_height="32dp"
                             android:indeterminate="true"
                             android:indeterminateTint="@color/simprints_grey_light"
-                            android:layout_width="0dp"
-                            android:layout_height="32dp"
-                            android:layout_gravity="center"
-                            android:layout_weight="0.15"
                             android:visibility="gone"
-                            android:gravity="end|center_vertical" />
-                    </LinearLayout>
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
 
+                        <androidx.constraintlayout.widget.Barrier
+                            android:id="@+id/barrier_combo_images_upload_end"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            app:barrierDirection="start"
+                            app:constraint_referenced_ids="comboImagesToUploadCount,comboImagesToUploadProgress" />
+
+                        <TextView
+                            style="@style/Text.Body1"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:ellipsize="end"
+                            android:lines="1"
+                            android:padding="4dp"
+                            android:text="@string/sync_info_images_to_up_sync"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toStartOf="@id/barrier_combo_images_upload_end"
+                            app:layout_constraintStart_toEndOf="@id/iconComboImagesToUpload"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
 
 
                     <LinearLayout
@@ -538,54 +594,69 @@
                         android:textAllCaps="true"
                         android:textColor="@color/simprints_text_orange" />
 
-                    <LinearLayout
+                    <androidx.constraintlayout.widget.ConstraintLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal"
                         android:paddingVertical="8dp">
 
                         <ImageView
+                            android:id="@+id/iconImagesToUpload"
                             android:layout_width="32dp"
                             android:layout_height="32dp"
                             android:contentDescription="@string/sync_info_images_to_up_sync"
                             android:padding="4dp"
                             android:src="@drawable/ic_images"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"
                             app:tint="@color/simprints_text_grey" />
 
-                        <TextView
-                            style="@style/Text.Body1"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="start"
-                            android:layout_weight="0.85"
-                            android:padding="4dp"
-                            android:text="@string/sync_info_images_to_up_sync" />
-
                         <TextView
                             android:id="@+id/imagesToUploadCount"
                             style="@style/Text.Body1.Secondary"
-                            android:layout_width="0dp"
+                            android:layout_width="wrap_content"
                             android:layout_height="32dp"
-                            android:layout_gravity="center"
                             android:layout_marginEnd="7dp"
-                            android:layout_weight="0.15"
                             android:gravity="end|center_vertical"
-                            tools:text="30"
-                            android:textSize="16sp" />
+                            android:textSize="16sp"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"
+                            tools:text="30" />
 
                         <ProgressBar
                             android:id="@+id/imagesToUploadProgress"
                             style="@style/Text.Body1.Secondary"
+                            android:layout_width="wrap_content"
+                            android:layout_height="32dp"
                             android:indeterminate="true"
                             android:indeterminateTint="@color/simprints_grey_light"
-                            android:layout_width="0dp"
-                            android:layout_height="32dp"
-                            android:layout_gravity="center"
-                            android:layout_weight="0.15"
                             android:visibility="gone"
-                            android:gravity="end|center_vertical" />
-                    </LinearLayout>
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                        <androidx.constraintlayout.widget.Barrier
+                            android:id="@+id/barrier_images_upload_end"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            app:barrierDirection="start"
+                            app:constraint_referenced_ids="imagesToUploadCount,imagesToUploadProgress" />
+
+                        <TextView
+                            style="@style/Text.Body1"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:ellipsize="end"
+                            android:lines="1"
+                            android:padding="4dp"
+                            android:text="@string/sync_info_images_to_up_sync"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toStartOf="@id/barrier_images_upload_end"
+                            app:layout_constraintStart_toEndOf="@id/iconImagesToUpload"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
 
                     <FrameLayout
                         android:layout_width="match_parent"
diff --git a/feature/dashboard/src/main/res/layout/item_module_count.xml b/feature/dashboard/src/main/res/layout/item_module_count.xml
index d2ad51ea2b..3b5ff7e1d5 100644
--- a/feature/dashboard/src/main/res/layout/item_module_count.xml
+++ b/feature/dashboard/src/main/res/layout/item_module_count.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="horizontal"
     android:paddingVertical="8dp">
 
     <ImageView
@@ -14,29 +13,36 @@
         android:contentDescription="@string/sync_info_item_default"
         android:padding="4dp"
         android:src="@drawable/ic_module"
-        app:tint="@color/simprints_text_grey" />
-
-    <TextView
-        android:id="@+id/moduleNameText"
-        style="@style/Text.Body1"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="start"
-        android:layout_weight="0.85"
-        android:padding="4dp"
-        tools:text="Module1" />
+        app:tint="@color/simprints_text_grey"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent" />
 
     <TextView
         android:id="@+id/moduleCountText"
         style="@style/Text.Body1.Secondary"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="32dp"
-        android:layout_gravity="center"
         android:layout_marginEnd="7dp"
-        android:layout_weight="0.15"
         android:gravity="end|center_vertical"
+        android:textSize="16sp"
         tools:text="42"
-        android:textSize="16sp" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent" />
 
+    <TextView
+        android:id="@+id/moduleNameText"
+        style="@style/Text.Body1"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:padding="4dp"
+        android:lines="1"
+        android:ellipsize="end"
+        app:layout_constraintStart_toEndOf="@id/moduleItemIcon"
+        app:layout_constraintEnd_toStartOf="@id/moduleCountText"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        tools:text="Module1" />
 
-</LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>