diff --git a/CHANGELOG.md b/CHANGELOG.md
index d603b7cc..2c12c471 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+- Fixed overlap/truncation in stopwatch lap times ([#346])
 
 ## [1.5.0] - 2025-12-16
 ### Changed
@@ -100,6 +102,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [#207]: https://github.com/FossifyOrg/Clock/issues/207
 [#247]: https://github.com/FossifyOrg/Clock/issues/247
 [#335]: https://github.com/FossifyOrg/Clock/issues/335
+[#346]: https://github.com/FossifyOrg/Clock/issues/346
 
 [Unreleased]: https://github.com/FossifyOrg/Clock/compare/1.5.0...HEAD
 [1.5.0]: https://github.com/FossifyOrg/Clock/compare/1.4.0...1.5.0
diff --git a/app/src/main/res/layout-land/fragment_stopwatch.xml b/app/src/main/res/layout-land/fragment_stopwatch.xml
index 772c0202..629de966 100644
--- a/app/src/main/res/layout-land/fragment_stopwatch.xml
+++ b/app/src/main/res/layout-land/fragment_stopwatch.xml
@@ -31,9 +31,10 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/stopwatch_sorting_indicators_holder"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/small_margin"
+        android:paddingHorizontal="@dimen/big_margin"
         android:visibility="invisible"
         app:layout_constraintBottom_toTopOf="@id/stopwatch_list"
         app:layout_constraintEnd_toEndOf="@id/stopwatch_list"
@@ -43,28 +44,34 @@
 
         <ImageView
             android:id="@+id/stopwatch_sorting_indicator_1"
-            android:layout_width="@dimen/lap_time_size"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/medium_margin"
             android:visibility="invisible"
             app:layout_constraintEnd_toStartOf="@+id/stopwatch_sorting_indicator_2"
             app:layout_constraintHorizontal_chainStyle="packed"
-            app:layout_constraintStart_toStartOf="parent" />
+            app:layout_constraintHorizontal_weight="0.8"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
             android:id="@+id/stopwatch_sorting_indicator_2"
-            android:layout_width="@dimen/lap_time_size"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/medium_margin"
             android:visibility="invisible"
             app:layout_constraintEnd_toStartOf="@+id/stopwatch_sorting_indicator_3"
+            app:layout_constraintHorizontal_weight="2.1"
             app:layout_constraintStart_toEndOf="@+id/stopwatch_sorting_indicator_1"
             app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
             android:id="@+id/stopwatch_sorting_indicator_3"
-            android:layout_width="@dimen/lap_time_size"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:visibility="invisible"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_weight="2.1"
             app:layout_constraintStart_toEndOf="@+id/stopwatch_sorting_indicator_2"
             app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/app/src/main/res/layout/fragment_stopwatch.xml b/app/src/main/res/layout/fragment_stopwatch.xml
index 2ffca417..3f0b1420 100644
--- a/app/src/main/res/layout/fragment_stopwatch.xml
+++ b/app/src/main/res/layout/fragment_stopwatch.xml
@@ -35,6 +35,7 @@
         android:id="@+id/stopwatch_sorting_indicators_holder"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:paddingHorizontal="@dimen/big_margin"
         android:visibility="invisible"
         app:layout_constraintBottom_toTopOf="@id/stopwatch_list"
         app:layout_constraintTop_toBottomOf="@+id/stopwatch_time"
@@ -42,28 +43,34 @@
 
         <ImageView
             android:id="@+id/stopwatch_sorting_indicator_1"
-            android:layout_width="@dimen/lap_time_size"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/medium_margin"
             android:visibility="invisible"
             app:layout_constraintEnd_toStartOf="@+id/stopwatch_sorting_indicator_2"
             app:layout_constraintHorizontal_chainStyle="packed"
-            app:layout_constraintStart_toStartOf="parent" />
+            app:layout_constraintHorizontal_weight="0.8"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
             android:id="@+id/stopwatch_sorting_indicator_2"
-            android:layout_width="@dimen/lap_time_size"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/medium_margin"
             android:visibility="invisible"
             app:layout_constraintEnd_toStartOf="@+id/stopwatch_sorting_indicator_3"
+            app:layout_constraintHorizontal_weight="2.2"
             app:layout_constraintStart_toEndOf="@+id/stopwatch_sorting_indicator_1"
             app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
             android:id="@+id/stopwatch_sorting_indicator_3"
-            android:layout_width="@dimen/lap_time_size"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:visibility="invisible"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_weight="2.2"
             app:layout_constraintStart_toEndOf="@+id/stopwatch_sorting_indicator_2"
             app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/app/src/main/res/layout/item_lap.xml b/app/src/main/res/layout/item_lap.xml
index 0a34352d..e4868ba3 100644
--- a/app/src/main/res/layout/item_lap.xml
+++ b/app/src/main/res/layout/item_lap.xml
@@ -6,50 +6,54 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_horizontal"
-    android:paddingVertical="@dimen/small_margin"
-    android:paddingLeft="@dimen/activity_margin">
+    android:paddingHorizontal="@dimen/big_margin"
+    android:paddingVertical="@dimen/small_margin">
 
     <org.fossify.commons.views.MyTextView
         android:id="@+id/lap_order"
-        android:layout_width="@dimen/lap_time_size"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/medium_margin"
         android:fontFeatureSettings="tnum"
-        android:gravity="end"
+        android:gravity="center"
         android:includeFontPadding="false"
         android:maxLines="1"
         android:textSize="@dimen/bigger_text_size"
         app:layout_constraintEnd_toStartOf="@+id/lap_lap_time"
-        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintHorizontal_weight="0.8"
         app:layout_constraintStart_toStartOf="parent"
-        tools:text="1" />
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="12" />
 
     <org.fossify.commons.views.MyTextView
         android:id="@+id/lap_lap_time"
-        android:layout_width="@dimen/lap_time_size"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/medium_margin"
         android:fontFeatureSettings="tnum"
         android:gravity="end"
         android:includeFontPadding="false"
         android:maxLines="1"
         android:textSize="@dimen/bigger_text_size"
         app:layout_constraintEnd_toStartOf="@+id/lap_total_time"
+        app:layout_constraintHorizontal_weight="2.1"
         app:layout_constraintStart_toEndOf="@+id/lap_order"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="0.00" />
+        tools:text="24:43:00" />
 
     <org.fossify.commons.views.MyTextView
         android:id="@+id/lap_total_time"
-        android:layout_width="@dimen/lap_time_size"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="48dp"
         android:fontFeatureSettings="tnum"
         android:gravity="end"
         android:includeFontPadding="false"
         android:maxLines="1"
         android:textSize="@dimen/bigger_text_size"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_weight="2.1"
         app:layout_constraintStart_toEndOf="@+id/lap_lap_time"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="0.00.00" />
+        tools:text="42:26:43:00" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index e347031e..59c03091 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -3,7 +3,6 @@
     <dimen name="stopwatch_button_small_size">60dp</dimen>
     <dimen name="stopwatch_button_size">64dp</dimen>
     <dimen name="reminder_background_min_size">70dp</dimen>
-    <dimen name="lap_time_size">80dp</dimen>
     <dimen name="widget_alarm_icon_size">18dp</dimen>
     <dimen name="widget_digital_time_height">48dp</dimen>
     <dimen name="widget_analogue_time_height">96dp</dimen>