diff --git a/OsmAnd/res/layout/gpx_item_altitude.xml b/OsmAnd/res/layout/gpx_item_altitude.xml
index 6563cb8c31..2deccbca65 100644
--- a/OsmAnd/res/layout/gpx_item_altitude.xml
+++ b/OsmAnd/res/layout/gpx_item_altitude.xml
@@ -158,6 +158,12 @@
 
         </LinearLayout>
 
+        <LinearLayout
+            android:id="@+id/list_divider"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
         <View
             android:layout_width="match_parent"
             android:layout_height="1dp"
@@ -167,6 +173,8 @@
             android:layout_marginRight="@dimen/content_padding_small"
             android:background="?attr/dashboard_divider" />
 
+        </LinearLayout>
+
         <LinearLayout
             android:id="@+id/ascent_descent"
             android:layout_width="match_parent"
diff --git a/OsmAnd/res/layout/gpx_item_general.xml b/OsmAnd/res/layout/gpx_item_general.xml
index b24f63be69..cbdb7553a9 100644
--- a/OsmAnd/res/layout/gpx_item_general.xml
+++ b/OsmAnd/res/layout/gpx_item_general.xml
@@ -145,7 +145,6 @@
                         osmand:typeface="@string/font_roboto_medium"
                         tools:text="3:32:44" />
 
-
                 </LinearLayout>
 
                 <androidx.appcompat.widget.AppCompatImageView
@@ -159,6 +158,12 @@
 
         </LinearLayout>
 
+        <LinearLayout
+            android:id="@+id/list_divider"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
         <View
             android:layout_width="match_parent"
             android:layout_height="1dp"
@@ -168,13 +173,15 @@
             android:layout_marginRight="@dimen/content_padding_small"
             android:background="?attr/dashboard_divider" />
 
+        </LinearLayout>
+
         <LinearLayout
             android:id="@+id/start_end_time"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:paddingTop="13dp"
-            android:paddingBottom="11dp">
+            android:paddingTop="@dimen/context_menu_first_line_top_margin"
+            android:paddingBottom="@dimen/content_padding_small">
 
             <LinearLayout
                 android:layout_width="0dp"
diff --git a/OsmAnd/res/layout/gpx_item_speed.xml b/OsmAnd/res/layout/gpx_item_speed.xml
index d2cbbff4f2..48154d9ee9 100644
--- a/OsmAnd/res/layout/gpx_item_speed.xml
+++ b/OsmAnd/res/layout/gpx_item_speed.xml
@@ -158,6 +158,12 @@
 
         </LinearLayout>
 
+        <LinearLayout
+            android:id="@+id/list_divider"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
         <View
             android:layout_width="match_parent"
             android:layout_height="1dp"
@@ -167,6 +173,9 @@
             android:layout_marginRight="@dimen/content_padding_small"
             android:background="?attr/dashboard_divider" />
 
+        </LinearLayout>
+
+
         <LinearLayout
             android:id="@+id/time_distance"
             android:layout_width="match_parent"