diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 5c39189a7..c8d84eea9 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -50,10 +50,11 @@ limitations under the License.
     <application
         android:name=".Startup"
         android:allowBackup="false"
-        android:hasFragileUserData="true"
         android:hardwareAccelerated="true"
+        android:hasFragileUserData="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:supportsRtl="true"
         android:theme="@style/ThemeCustom">
 
         <activity android:name=".AboutActivity" />
@@ -71,14 +72,14 @@ limitations under the License.
         <activity android:name=".io.file.importer.ImportActivity">
 
             <intent-filter>
-                <action android:name="android.intent.action.SEND"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <data android:mimeType="application/gpx+xml"/>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="application/gpx+xml" />
             </intent-filter>
             <intent-filter>
-                <action android:name="android.intent.action.SEND"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <data android:mimeType="application/gpx"/>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="application/gpx" />
             </intent-filter>
 
             <intent-filter
@@ -86,13 +87,15 @@ limitations under the License.
                 android:priority="50">
                 <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.intent.action.SEND" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="file"/>
-                <data android:scheme="content"/>
-                <data android:scheme="data"/>
-                <data android:host="*"/>
-                <data android:mimeType="*/*"/>
+
+                <data android:scheme="file" />
+                <data android:scheme="content" />
+                <data android:scheme="data" />
+                <data android:host="*" />
+                <data android:mimeType="*/*" />
                 <data android:pathPattern=".*\\.gpx" />
                 <data android:pathPattern=".*\\..*\\.gpx" />
                 <data android:pathPattern=".*\\..*\\..*\\.gpx" />
@@ -110,12 +113,14 @@ limitations under the License.
                 android:priority="50">
                 <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.intent.action.SEND" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="file"/>
-                <data android:scheme="content"/>
-                <data android:scheme="data"/>
-                <data android:host="*"/>
+
+                <data android:scheme="file" />
+                <data android:scheme="content" />
+                <data android:scheme="data" />
+                <data android:host="*" />
                 <data android:pathPattern=".*\\.gpx" />
                 <data android:pathPattern=".*\\..*\\.gpx" />
                 <data android:pathPattern=".*\\..*\\..*\\.gpx" />
@@ -129,9 +134,9 @@ limitations under the License.
             </intent-filter>
 
             <intent-filter>
-                <action android:name="android.intent.action.SEND"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <data android:mimeType="application/vnd.google-earth.kmz"/>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="application/vnd.google-earth.kmz" />
             </intent-filter>
 
             <intent-filter
@@ -139,13 +144,15 @@ limitations under the License.
                 android:priority="50">
                 <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.intent.action.SEND" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="file"/>
-                <data android:scheme="content"/>
-                <data android:scheme="data"/>
-                <data android:host="*"/>
-                <data android:mimeType="*/*"/>
+
+                <data android:scheme="file" />
+                <data android:scheme="content" />
+                <data android:scheme="data" />
+                <data android:host="*" />
+                <data android:mimeType="*/*" />
                 <data android:pathPattern=".*\\.kmz" />
                 <data android:pathPattern=".*\\..*\\.kmz" />
                 <data android:pathPattern=".*\\..*\\..*\\.kmz" />
@@ -163,12 +170,14 @@ limitations under the License.
                 android:priority="50">
                 <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.intent.action.SEND" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="file"/>
-                <data android:scheme="content"/>
-                <data android:scheme="data"/>
-                <data android:host="*"/>
+
+                <data android:scheme="file" />
+                <data android:scheme="content" />
+                <data android:scheme="data" />
+                <data android:host="*" />
                 <data android:pathPattern=".*\\.kmz" />
                 <data android:pathPattern=".*\\..*\\.kmz" />
                 <data android:pathPattern=".*\\..*\\..*\\.kmz" />
@@ -182,9 +191,9 @@ limitations under the License.
             </intent-filter>
 
             <intent-filter>
-                <action android:name="android.intent.action.SEND"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <data android:mimeType="application/vnd.google-earth.kml+xml"/>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="application/vnd.google-earth.kml+xml" />
             </intent-filter>
 
             <intent-filter
@@ -192,13 +201,15 @@ limitations under the License.
                 android:priority="50">
                 <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.intent.action.SEND" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="file"/>
-                <data android:scheme="content"/>
-                <data android:scheme="data"/>
-                <data android:host="*"/>
-                <data android:mimeType="*/*"/>
+
+                <data android:scheme="file" />
+                <data android:scheme="content" />
+                <data android:scheme="data" />
+                <data android:host="*" />
+                <data android:mimeType="*/*" />
                 <data android:pathPattern=".*\\.kml" />
                 <data android:pathPattern=".*\\..*\\.kml" />
                 <data android:pathPattern=".*\\..*\\..*\\.kml" />
@@ -216,12 +227,14 @@ limitations under the License.
                 android:priority="50">
                 <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.intent.action.SEND" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="file"/>
-                <data android:scheme="content"/>
-                <data android:scheme="data"/>
-                <data android:host="*"/>
+
+                <data android:scheme="file" />
+                <data android:scheme="content" />
+                <data android:scheme="data" />
+                <data android:host="*" />
                 <data android:pathPattern=".*\\.kml" />
                 <data android:pathPattern=".*\\..*\\.kml" />
                 <data android:pathPattern=".*\\..*\\..*\\.kml" />
@@ -237,7 +250,7 @@ limitations under the License.
 
         <activity android:name=".MarkerDetailActivity">
             <intent-filter>
-                <action android:name="de.dennisguse.opentracks.MarkerDetails"/>
+                <action android:name="de.dennisguse.opentracks.MarkerDetails" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -258,8 +271,8 @@ limitations under the License.
 
         <activity
             android:name=".TrackListActivity"
-            android:theme="@style/SplashTheme"
-            android:launchMode="singleTop">
+            android:launchMode="singleTop"
+            android:theme="@style/SplashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/src/main/res/layout-land/track_controller.xml b/src/main/res/layout-land/track_controller.xml
index 3a3f0e9f0..74f5ec79b 100644
--- a/src/main/res/layout-land/track_controller.xml
+++ b/src/main/res/layout-land/track_controller.xml
@@ -21,8 +21,8 @@ limitations under the License.
         android:layout_height="match_parent"
         android:background="@drawable/track_controller_background"
         android:orientation="vertical"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp">
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp">
 
         <ImageButton
             android:id="@+id/track_controller_record"
diff --git a/src/main/res/layout-land/track_list.xml b/src/main/res/layout-land/track_list.xml
index 116dff3b0..ea5d84572 100644
--- a/src/main/res/layout-land/track_list.xml
+++ b/src/main/res/layout-land/track_list.xml
@@ -47,10 +47,10 @@ limitations under the License.
                 android:id="@+id/track_list_arrow_long"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
                 android:orientation="vertical"
-                android:paddingLeft="12dp"
-                android:paddingRight="16dp">
+                android:paddingStart="12dp"
+                android:paddingEnd="16dp">
 
                 <View
                     android:layout_width="match_parent"
@@ -73,7 +73,7 @@ limitations under the License.
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_toRightOf="@id/track_list_arrow_long"
+                android:layout_toEndOf="@id/track_list_arrow_long"
                 android:orientation="vertical">
 
                 <View
diff --git a/src/main/res/layout/aggregated_stats_list_item.xml b/src/main/res/layout/aggregated_stats_list_item.xml
index 52eb7815e..e034e92b3 100644
--- a/src/main/res/layout/aggregated_stats_list_item.xml
+++ b/src/main/res/layout/aggregated_stats_list_item.xml
@@ -33,9 +33,9 @@
         android:id="@+id/aggregated_stats_sport_icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="16dp"
+        android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
-        app:layout_constraintLeft_toLeftOf="@id/guideline1"
+        app:layout_constraintStart_toStartOf="@id/guideline1"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/ic_activity_bike_24dp" />
 
@@ -45,10 +45,10 @@
         android:layout_marginTop="0dp"
         android:layout_marginBottom="0dp"
         app:layout_constraintBottom_toBottomOf="@+id/aggregated_stats_sport_icon"
-        app:layout_constraintLeft_toRightOf="@+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_marginLeft="16dp" />
+        android:layout_marginStart="16dp" />
 
     <TextView
         android:id="@+id/aggregated_stats_num_tracks"
@@ -56,36 +56,36 @@
         android:layout_marginTop="0dp"
         android:layout_marginBottom="0dp"
         app:layout_constraintBottom_toBottomOf="@+id/aggregated_stats_type_label"
-        app:layout_constraintLeft_toRightOf="@+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_marginLeft="4dp" />
+        android:layout_marginStart="4dp" />
 
     <!-- Distance -->
     <TextView
         android:id="@+id/aggregated_stats_distance"
         style="@style/StatsLargeValue"
-        app:layout_constraintLeft_toLeftOf="@id/guideline1"
+        app:layout_constraintStart_toStartOf="@id/guideline1"
         app:layout_constraintTop_toBottomOf="@+id/aggregated_stats_sport_icon"
         tools:text="100000"
-        android:layout_marginLeft="16dp"
+        android:layout_marginStart="16dp"
         android:layout_marginTop="16dp" />
 
     <TextView
         android:id="@+id/aggregated_stats_distance_unit"
         style="@style/StatsUnit"
         app:layout_constraintBottom_toBottomOf="@+id/aggregated_stats_distance"
-        app:layout_constraintLeft_toRightOf="@+id/aggregated_stats_distance"
+        app:layout_constraintStart_toEndOf="@+id/aggregated_stats_distance"
         tools:text="km" />
 
     <!-- Time -->
     <TextView
         android:id="@+id/aggregated_stats_time"
         style="@style/StatsLargeValue"
-        app:layout_constraintRight_toRightOf="@id/guideline3"
+        app:layout_constraintEnd_toEndOf="@id/guideline3"
         app:layout_constraintTop_toBottomOf="@+id/aggregated_stats_sport_icon"
         tools:text="00:00:00"
-        android:layout_marginRight="16dp"
+        android:layout_marginEnd="16dp"
         android:layout_marginTop="16dp" />
 
     <!-- Avg. rate -->
@@ -94,8 +94,8 @@
         style="@style/StatsSmallValue"
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintTop_toBottomOf="@id/aggregated_stats_distance"
-        app:layout_constraintLeft_toRightOf="@id/guideline1"
-        app:layout_constraintRight_toLeftOf="@+id/aggregated_stats_avg_rate_unit"
+        app:layout_constraintStart_toEndOf="@id/guideline1"
+        app:layout_constraintEnd_toStartOf="@+id/aggregated_stats_avg_rate_unit"
         android:layout_marginTop="24dp"
         tools:text="30" />
 
@@ -103,8 +103,8 @@
         android:id="@+id/aggregated_stats_avg_rate_unit"
         style="@style/StatsUnit"
         app:layout_constraintBottom_toBottomOf="@+id/aggregated_stats_avg_rate"
-        app:layout_constraintLeft_toRightOf="@+id/aggregated_stats_avg_rate"
-        app:layout_constraintRight_toRightOf="@id/guideline2"
+        app:layout_constraintStart_toEndOf="@+id/aggregated_stats_avg_rate"
+        app:layout_constraintEnd_toEndOf="@id/guideline2"
         tools:text="km/h" />
 
     <TextView
@@ -112,8 +112,8 @@
         style="@style/StatsTinyLabel"
         app:layout_constrainedWidth="true"
         app:layout_constraintTop_toBottomOf="@+id/aggregated_stats_avg_rate"
-        app:layout_constraintLeft_toRightOf="@id/guideline1"
-        app:layout_constraintRight_toRightOf="@id/guideline2"
+        app:layout_constraintStart_toEndOf="@id/guideline1"
+        app:layout_constraintEnd_toEndOf="@id/guideline2"
         tools:text="@string/stats_average_moving_speed" />
 
     <!-- Max. rate -->
@@ -122,8 +122,8 @@
         style="@style/StatsSmallValue"
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintTop_toBottomOf="@id/aggregated_stats_time"
-        app:layout_constraintLeft_toRightOf="@id/guideline2"
-        app:layout_constraintRight_toLeftOf="@+id/aggregated_stats_max_rate_unit"
+        app:layout_constraintStart_toEndOf="@id/guideline2"
+        app:layout_constraintEnd_toStartOf="@+id/aggregated_stats_max_rate_unit"
         android:layout_marginTop="24dp"
         tools:text="70" />
 
@@ -131,8 +131,8 @@
         android:id="@+id/aggregated_stats_max_rate_unit"
         style="@style/StatsUnit"
         app:layout_constraintBottom_toBottomOf="@+id/aggregated_stats_max_rate"
-        app:layout_constraintLeft_toRightOf="@+id/aggregated_stats_max_rate"
-        app:layout_constraintRight_toLeftOf="@id/guideline3"
+        app:layout_constraintStart_toEndOf="@+id/aggregated_stats_max_rate"
+        app:layout_constraintEnd_toStartOf="@id/guideline3"
         tools:text="km/h" />
 
     <TextView
@@ -140,8 +140,8 @@
         style="@style/StatsTinyLabel"
         app:layout_constrainedWidth="true"
         app:layout_constraintTop_toBottomOf="@+id/aggregated_stats_max_rate"
-        app:layout_constraintLeft_toRightOf="@id/guideline2"
-        app:layout_constraintRight_toLeftOf="@id/guideline3"
+        app:layout_constraintStart_toEndOf="@id/guideline2"
+        app:layout_constraintEnd_toStartOf="@id/guideline3"
         tools:text="@string/stats_max_speed" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/export_activity.xml b/src/main/res/layout/export_activity.xml
index 9043b21a6..2a1029017 100644
--- a/src/main/res/layout/export_activity.xml
+++ b/src/main/res/layout/export_activity.xml
@@ -62,9 +62,9 @@
                 style="@style/ProgressBar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="24dp"
+                android:layout_marginStart="24dp"
                 android:layout_marginTop="8dp"
-                android:layout_marginRight="24dp"
+                android:layout_marginEnd="24dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/export_progress_done"
@@ -113,8 +113,8 @@
                 android:id="@+id/export_progress_apply_to_all"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="24dp"
-                android:layout_marginRight="24dp"
+                android:layout_marginStart="24dp"
+                android:layout_marginEnd="24dp"
                 android:layout_marginBottom="24dp"
                 android:checked="false"
                 android:text="@string/export_all_do_it_for_all"
@@ -144,7 +144,7 @@
         <Button
             android:id="@+id/export_progress_right_button"
             style="@style/BottomButton"
-            android:layout_gravity="right"
+            android:layout_gravity="end"
             android:text="@string/generic_overwrite"
             android:visibility="gone"
             tools:visibility="visible"/>
diff --git a/src/main/res/layout/import_activity.xml b/src/main/res/layout/import_activity.xml
index e0acf821b..4b9d8510a 100644
--- a/src/main/res/layout/import_activity.xml
+++ b/src/main/res/layout/import_activity.xml
@@ -60,9 +60,9 @@
                 style="@style/ProgressBar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="24dp"
+                android:layout_marginStart="24dp"
                 android:layout_marginTop="8dp"
-                android:layout_marginRight="24dp"
+                android:layout_marginEnd="24dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/import_progress_done"
@@ -126,7 +126,7 @@
         <Button
             android:id="@+id/import_progress_right_button"
             style="@style/BottomButton"
-            android:layout_gravity="right"
+            android:layout_gravity="end"
             android:text="@string/generic_ok"
             android:visibility="gone"
             tools:visibility="visible"/>
diff --git a/src/main/res/layout/interval_list_view.xml b/src/main/res/layout/interval_list_view.xml
index 3a8fe1828..4b63d6c8a 100644
--- a/src/main/res/layout/interval_list_view.xml
+++ b/src/main/res/layout/interval_list_view.xml
@@ -69,9 +69,9 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
-        android:background="@color/stats_separator"/>
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
+        android:background="@color/stats_separator" />
 
     <ListView
         android:id="@+id/interval_list"
diff --git a/src/main/res/layout/list_item.xml b/src/main/res/layout/list_item.xml
index 05f9ccb13..c0028cb64 100644
--- a/src/main/res/layout/list_item.xml
+++ b/src/main/res/layout/list_item.xml
@@ -44,7 +44,8 @@ limitations under the License.
             android:layout_height="wrap_content"
             android:minHeight="?android:attr/listPreferredItemHeight"
             android:paddingTop="8dp"
-            android:paddingRight="12dp"
+            android:paddingStart="4dp"
+            android:paddingEnd="12dp"
             android:paddingBottom="12dp"
             android:shrinkColumns="1"
             android:stretchColumns="1">
@@ -56,8 +57,8 @@ limitations under the License.
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:layout_marginLeft="8dp"
-                    android:layout_marginRight="8dp"
+                    android:layout_marginStart="4dp"
+                    android:layout_marginEnd="8dp"
                     android:contentDescription="@string/image_track"
                     app:tint="?android:textColorPrimary" />
                 <!-- Table 1: Row 1: Column 2: (Table 2) -->
@@ -105,8 +106,8 @@ limitations under the License.
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="bottom"
-                                android:layout_marginLeft="2dp"
-                                android:layout_marginRight="2dp"
+                                android:layout_marginStart="2dp"
+                                android:layout_marginEnd="2dp"
                                 android:layout_marginBottom="1dp"
                                 android:contentDescription="@string/image_marker_count"
                                 android:scaleType="centerInside"
diff --git a/src/main/res/layout/marker_edit.xml b/src/main/res/layout/marker_edit.xml
index c19271d5a..5becbdddc 100644
--- a/src/main/res/layout/marker_edit.xml
+++ b/src/main/res/layout/marker_edit.xml
@@ -116,12 +116,12 @@ limitations under the License.
         <Button
             android:id="@+id/marker_edit_cancel"
             style="@style/BottomButton"
-            android:layout_gravity="left"
+            android:layout_gravity="start"
             android:text="@string/generic_cancel" />
 
         <Button
             android:id="@+id/marker_edit_done"
             style="@style/BottomButton"
-            android:layout_gravity="right" />
+            android:layout_gravity="end" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/preference_activity_type.xml b/src/main/res/layout/preference_activity_type.xml
index b7f6ee30e..c507d7768 100644
--- a/src/main/res/layout/preference_activity_type.xml
+++ b/src/main/res/layout/preference_activity_type.xml
@@ -19,9 +19,9 @@ limitations under the License.
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingLeft="8dp"
+        android:paddingStart="8dp"
         android:paddingTop="16dp"
-        android:paddingRight="8dp">
+        android:paddingEnd="8dp">
 
         <AutoCompleteTextView
             android:id="@+id/activity_type_preference_text_view"
diff --git a/src/main/res/layout/statistics_recorded.xml b/src/main/res/layout/statistics_recorded.xml
index 5767507eb..faa5e3f09 100644
--- a/src/main/res/layout/statistics_recorded.xml
+++ b/src/main/res/layout/statistics_recorded.xml
@@ -36,8 +36,8 @@
             style="@style/StatsLargeLabel"
             android:text="@string/stats_distance"
             app:layout_constrainedWidth="true"
-            app:layout_constraintLeft_toRightOf="@+id/guideline"
-            app:layout_constraintRight_toLeftOf="@+id/guideline2"
+            app:layout_constraintStart_toEndOf="@+id/guideline"
+            app:layout_constraintEnd_toStartOf="@+id/guideline2"
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
@@ -45,8 +45,8 @@
             style="@style/StatsLargeValue"
             android:value="@string/value_unknown"
             app:layout_constraintHorizontal_chainStyle="packed"
-            app:layout_constraintLeft_toRightOf="@+id/guideline"
-            app:layout_constraintRight_toLeftOf="@+id/stats_distance_unit"
+            app:layout_constraintStart_toEndOf="@+id/guideline"
+            app:layout_constraintEnd_toStartOf="@+id/stats_distance_unit"
             app:layout_constraintTop_toBottomOf="@+id/stats_distance_label"
             tools:text="100" />
 
@@ -54,8 +54,8 @@
             android:id="@+id/stats_distance_unit"
             style="@style/StatsUnit"
             app:layout_constraintBottom_toBottomOf="@+id/stats_distance_value"
-            app:layout_constraintLeft_toRightOf="@+id/stats_distance_value"
-            app:layout_constraintRight_toLeftOf="@+id/guideline2"
+            app:layout_constraintStart_toEndOf="@+id/stats_distance_value"
+            app:layout_constraintEnd_toStartOf="@+id/guideline2"
             tools:text="km" />
 
         <!-- Activity Type -->
@@ -64,16 +64,16 @@
             style="@style/StatsLargeLabel"
             android:text="@string/track_edit_activity_type_hint"
             app:layout_constrainedWidth="true"
-            app:layout_constraintLeft_toRightOf="@+id/guideline2"
-            app:layout_constraintRight_toLeftOf="@+id/guideline3"
+            app:layout_constraintStart_toEndOf="@+id/guideline2"
+            app:layout_constraintEnd_toStartOf="@+id/guideline3"
             app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
             android:id="@+id/stats_activity_type_icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:layout_constraintLeft_toRightOf="@+id/guideline2"
-            app:layout_constraintRight_toLeftOf="@+id/guideline3"
+            app:layout_constraintStart_toEndOf="@+id/guideline2"
+            app:layout_constraintEnd_toStartOf="@+id/guideline3"
             app:layout_constraintBottom_toBottomOf="@+id/stats_distance_value"
             app:layout_constraintTop_toTopOf="@+id/stats_distance_value"
             app:tint="?android:attr/textColorPrimary"
@@ -85,15 +85,15 @@
             style="@style/StatsLargeLabel"
             android:text="@string/stats_total_time"
             app:layout_constrainedWidth="true"
-            app:layout_constraintLeft_toRightOf="@+id/guideline"
-            app:layout_constraintRight_toLeftOf="@+id/guideline2"
+            app:layout_constraintStart_toEndOf="@+id/guideline"
+            app:layout_constraintEnd_toStartOf="@+id/guideline2"
             app:layout_constraintTop_toBottomOf="@+id/stats_distance_value" />
 
         <TextView
             android:id="@+id/stats_total_time_value"
             style="@style/StatsLargeValue"
-            app:layout_constraintLeft_toRightOf="@+id/guideline"
-            app:layout_constraintRight_toLeftOf="@+id/guideline2"
+            app:layout_constraintStart_toEndOf="@+id/guideline"
+            app:layout_constraintEnd_toStartOf="@+id/guideline2"
             app:layout_constraintTop_toBottomOf="@+id/stats_total_time_label"
             tools:text="00:00:00" />
 
@@ -103,8 +103,8 @@
             style="@style/StatsLargeLabel"
             android:text="@string/stats_moving_time"
             app:layout_constrainedWidth="true"
-            app:layout_constraintLeft_toRightOf="@+id/guideline2"
-            app:layout_constraintRight_toLeftOf="@+id/guideline3"
+            app:layout_constraintStart_toEndOf="@+id/guideline2"
+            app:layout_constraintEnd_toStartOf="@+id/guideline3"
             app:layout_constraintTop_toTopOf="@+id/stats_total_time_label"
             app:layout_constraintBottom_toBottomOf="@+id/stats_total_time_label" />
 
@@ -112,8 +112,8 @@
             android:id="@+id/stats_moving_time_value"
             style="@style/StatsLargeValue"
             android:value="@string/value_unknown"
-            app:layout_constraintLeft_toRightOf="@+id/guideline2"
-            app:layout_constraintRight_toLeftOf="@+id/guideline3"
+            app:layout_constraintStart_toEndOf="@+id/guideline2"
+            app:layout_constraintEnd_toStartOf="@+id/guideline3"
             app:layout_constraintTop_toBottomOf="@+id/stats_moving_time_label"
             tools:text="00:00:00" />
 
@@ -130,8 +130,8 @@
             android:id="@+id/stats_speed_horizontal_line"
             style="@style/StatsHorizontalLine"
             android:layout_marginBottom="8dp"
-            app:layout_constraintLeft_toRightOf="@+id/guideline"
-            app:layout_constraintRight_toLeftOf="@+id/guideline3"
+            app:layout_constraintStart_toEndOf="@+id/guideline"
+            app:layout_constraintEnd_toStartOf="@+id/guideline3"
             app:layout_constraintTop_toBottomOf="@+id/stats_time_barrier" />
 
         <!-- Average speed/pace -->
@@ -139,8 +139,8 @@
             android:id="@+id/stats_average_speed_label"
             style="@style/StatsSmallLabel"
             app:layout_constrainedWidth="true"
-            app:layout_constraintLeft_toRightOf="@+id/guideline2"
-            app:layout_constraintRight_toLeftOf="@+id/guideline3"
+            app:layout_constraintStart_toEndOf="@+id/guideline2"
+            app:layout_constraintEnd_toStartOf="@+id/guideline3"
             app:layout_constraintTop_toBottomOf="@id/stats_speed_horizontal_line"
             tools:text="Avg. Speed" />
 
@@ -149,8 +149,8 @@
             style="@style/StatsSmallValue"
             android:value="@string/value_unknown"
             app:layout_constraintHorizontal_chainStyle="packed"
-            app:layout_constraintLeft_toRightOf="@+id/guideline2"
-            app:layout_constraintRight_toLeftOf="@+id/stats_average_speed_unit"
+            app:layout_constraintStart_toEndOf="@+id/guideline2"
+            app:layout_constraintEnd_toStartOf="@+id/stats_average_speed_unit"
             app:layout_constraintTop_toBottomOf="@+id/stats_average_speed_label"
             tools:text="30.00" />
 
@@ -158,8 +158,8 @@
             android:id="@+id/stats_average_speed_unit"
             style="@style/StatsUnit"
             app:layout_constraintBottom_toBottomOf="@+id/stats_average_speed_value"
-            app:layout_constraintLeft_toRightOf="@+id/stats_average_speed_value"
-            app:layout_constraintRight_toLeftOf="@+id/guideline3"
+            app:layout_constraintStart_toEndOf="@+id/stats_average_speed_value"
+            app:layout_constraintEnd_toStartOf="@+id/guideline3"
             tools:text="km/h" />
 
         <!-- Speed max -->
@@ -167,8 +167,8 @@
             android:id="@+id/stats_max_speed_label"
             style="@style/StatsSmallLabel"
             app:layout_constrainedWidth="true"
-            app:layout_constraintLeft_toRightOf="@+id/guideline"
-            app:layout_constraintRight_toLeftOf="@+id/guideline2"
+            app:layout_constraintStart_toEndOf="@+id/guideline"
+            app:layout_constraintEnd_toStartOf="@+id/guideline2"
             app:layout_constraintTop_toBottomOf="@id/stats_average_speed_value"
             tools:text="Max. Speed" />
 
@@ -177,8 +177,8 @@
             style="@style/StatsSmallValue"
             android:value="@string/value_unknown"
             app:layout_constraintHorizontal_chainStyle="packed"
-            app:layout_constraintLeft_toRightOf="@+id/guideline"
-            app:layout_constraintRight_toLeftOf="@+id/stats_max_speed_unit"
+            app:layout_constraintStart_toEndOf="@+id/guideline"
+            app:layout_constraintEnd_toStartOf="@+id/stats_max_speed_unit"
             app:layout_constraintTop_toBottomOf="@+id/stats_max_speed_label"
             tools:text="30.00" />
 
@@ -186,8 +186,8 @@
             android:id="@+id/stats_max_speed_unit"
             style="@style/StatsUnit"
             app:layout_constraintBottom_toBottomOf="@+id/stats_max_speed_value"
-            app:layout_constraintLeft_toRightOf="@+id/stats_max_speed_value"
-            app:layout_constraintRight_toLeftOf="@+id/guideline2"
+            app:layout_constraintStart_toEndOf="@+id/stats_max_speed_value"
+            app:layout_constraintEnd_toStartOf="@+id/guideline2"
             tools:text="km/h" />
 
         <!-- Moving speed max -->
@@ -195,8 +195,8 @@
             android:id="@+id/stats_moving_speed_label"
             style="@style/StatsSmallLabel"
             app:layout_constrainedWidth="true"
-            app:layout_constraintLeft_toRightOf="@+id/guideline2"
-            app:layout_constraintRight_toLeftOf="@+id/guideline3"
+            app:layout_constraintStart_toEndOf="@+id/guideline2"
+            app:layout_constraintEnd_toStartOf="@+id/guideline3"
             app:layout_constraintTop_toBottomOf="@id/stats_average_speed_value"
             tools:text="Max. Moving Speed" />
 
@@ -205,8 +205,8 @@
             style="@style/StatsSmallValue"
             android:value="@string/value_unknown"
             app:layout_constraintHorizontal_chainStyle="packed"
-            app:layout_constraintLeft_toRightOf="@+id/guideline2"
-            app:layout_constraintRight_toLeftOf="@+id/stats_moving_speed_unit"
+            app:layout_constraintStart_toEndOf="@+id/guideline2"
+            app:layout_constraintEnd_toStartOf="@+id/stats_moving_speed_unit"
             app:layout_constraintTop_toBottomOf="@+id/stats_moving_speed_label"
             tools:text="30.00" />
 
@@ -214,8 +214,8 @@
             android:id="@+id/stats_moving_speed_unit"
             style="@style/StatsUnit"
             app:layout_constraintBottom_toBottomOf="@+id/stats_moving_speed_value"
-            app:layout_constraintLeft_toRightOf="@+id/stats_moving_speed_value"
-            app:layout_constraintRight_toLeftOf="@+id/guideline3"
+            app:layout_constraintStart_toEndOf="@+id/stats_moving_speed_value"
+            app:layout_constraintEnd_toStartOf="@+id/guideline3"
             tools:text="km/h" />
 
         <!-- Barrier -->
@@ -231,8 +231,8 @@
             android:id="@+id/stats_elevation_horizontal_line"
             style="@style/StatsHorizontalLine"
             android:layout_marginBottom="8dp"
-            app:layout_constraintLeft_toRightOf="@+id/guideline"
-            app:layout_constraintRight_toLeftOf="@+id/guideline3"
+            app:layout_constraintStart_toEndOf="@+id/guideline"
+            app:layout_constraintEnd_toStartOf="@+id/guideline3"
             app:layout_constraintTop_toBottomOf="@+id/stats_speed_barrier" />
 
         <!-- Elevation gain -->
@@ -247,8 +247,8 @@
             style="@style/StatsSmallLabel"
             android:text="@string/stats_gain"
             app:layout_constrainedWidth="true"
-            app:layout_constraintLeft_toRightOf="@+id/guideline2"
-            app:layout_constraintRight_toLeftOf="@+id/guideline3"
+            app:layout_constraintStart_toEndOf="@+id/guideline2"
+            app:layout_constraintEnd_toStartOf="@+id/guideline3"
             app:layout_constraintTop_toBottomOf="@id/stats_elevation_horizontal_line" />
 
         <TextView
@@ -256,8 +256,8 @@
             style="@style/StatsSmallValue"
             android:value="@string/value_unknown"
             app:layout_constraintHorizontal_chainStyle="packed"
-            app:layout_constraintLeft_toRightOf="@+id/guideline2"
-            app:layout_constraintRight_toLeftOf="@+id/stats_elevation_gain_unit"
+            app:layout_constraintStart_toEndOf="@+id/guideline2"
+            app:layout_constraintEnd_toStartOf="@+id/stats_elevation_gain_unit"
             app:layout_constraintTop_toBottomOf="@+id/stats_elevation_gain_label"
             tools:text="100" />
 
@@ -265,8 +265,8 @@
             android:id="@+id/stats_elevation_gain_unit"
             style="@style/StatsUnit"
             app:layout_constraintBottom_toBottomOf="@+id/stats_elevation_gain_value"
-            app:layout_constraintLeft_toRightOf="@+id/stats_elevation_gain_value"
-            app:layout_constraintRight_toLeftOf="@+id/guideline3"
+            app:layout_constraintStart_toEndOf="@+id/stats_elevation_gain_value"
+            app:layout_constraintEnd_toStartOf="@+id/guideline3"
             tools:text="m" />
 
         <!-- Barrier -->
@@ -282,8 +282,8 @@
             android:id="@+id/stats_end_horizontal_line"
             style="@style/StatsHorizontalLine"
             android:layout_marginBottom="8dp"
-            app:layout_constraintLeft_toRightOf="@+id/guideline"
-            app:layout_constraintRight_toLeftOf="@+id/guideline3"
+            app:layout_constraintStart_toEndOf="@+id/guideline"
+            app:layout_constraintEnd_toStartOf="@+id/guideline3"
             app:layout_constraintTop_toBottomOf="@+id/stats_elevation_barrier" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/src/main/res/layout/statistics_recording.xml b/src/main/res/layout/statistics_recording.xml
index c244c7f6c..cbcad8f79 100644
--- a/src/main/res/layout/statistics_recording.xml
+++ b/src/main/res/layout/statistics_recording.xml
@@ -36,8 +36,8 @@
             style="@style/StatsLargeLabel"
             android:text="@string/stats_distance"
             app:layout_constrainedWidth="true"
-            app:layout_constraintLeft_toRightOf="@+id/guideline"
-            app:layout_constraintRight_toLeftOf="@+id/guideline2"
+            app:layout_constraintStart_toEndOf="@+id/guideline"
+            app:layout_constraintEnd_toStartOf="@+id/guideline2"
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
@@ -45,8 +45,8 @@
             style="@style/StatsLargeValue"
             android:value="@string/value_unknown"
             app:layout_constraintHorizontal_chainStyle="packed"
-            app:layout_constraintLeft_toRightOf="@+id/guideline"
-            app:layout_constraintRight_toLeftOf="@+id/stats_distance_unit"
+            app:layout_constraintStart_toEndOf="@+id/guideline"
+            app:layout_constraintEnd_toStartOf="@+id/stats_distance_unit"
             app:layout_constraintTop_toBottomOf="@+id/stats_distance_label"
             tools:text="100" />
 
@@ -54,8 +54,8 @@
             android:id="@+id/stats_distance_unit"
             style="@style/StatsUnit"
             app:layout_constraintBottom_toBottomOf="@+id/stats_distance_value"
-            app:layout_constraintLeft_toRightOf="@+id/stats_distance_value"
-            app:layout_constraintRight_toLeftOf="@+id/guideline2"
+            app:layout_constraintStart_toEndOf="@+id/stats_distance_value"
+            app:layout_constraintEnd_toStartOf="@+id/guideline2"
             tools:text="km" />
 
         <!-- Activity Type -->
@@ -64,8 +64,8 @@
             style="@style/StatsLargeLabel"
             android:text="@string/track_edit_activity_type_hint"
             app:layout_constrainedWidth="true"
-            app:layout_constraintLeft_toRightOf="@+id/guideline2"
-            app:layout_constraintRight_toLeftOf="@+id/guideline3"
+            app:layout_constraintStart_toEndOf="@+id/guideline2"
+            app:layout_constraintEnd_toStartOf="@+id/guideline3"
             app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
@@ -73,8 +73,8 @@
             style="@style/StatsLargeValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:layout_constraintLeft_toRightOf="@+id/guideline2"
-            app:layout_constraintRight_toLeftOf="@+id/guideline3"
+            app:layout_constraintStart_toEndOf="@+id/guideline2"
+            app:layout_constraintEnd_toStartOf="@+id/guideline3"
             app:layout_constraintBottom_toBottomOf="@+id/stats_distance_value"
             app:layout_constraintTop_toTopOf="@+id/stats_distance_value" />
 
@@ -84,15 +84,15 @@
             style="@style/StatsLargeLabel"
             android:text="@string/stats_total_time"
             app:layout_constrainedWidth="true"
-            app:layout_constraintLeft_toRightOf="@+id/guideline"
-            app:layout_constraintRight_toLeftOf="@+id/guideline2"
+            app:layout_constraintStart_toEndOf="@+id/guideline"
+            app:layout_constraintEnd_toStartOf="@+id/guideline2"
             app:layout_constraintTop_toBottomOf="@+id/stats_distance_value" />
 
         <TextView
             android:id="@+id/stats_total_time_value"
             style="@style/StatsLargeValue"
-            app:layout_constraintLeft_toRightOf="@+id/guideline"
-            app:layout_constraintRight_toLeftOf="@+id/guideline2"
+            app:layout_constraintStart_toEndOf="@+id/guideline"
+            app:layout_constraintEnd_toStartOf="@+id/guideline2"
             app:layout_constraintTop_toBottomOf="@+id/stats_total_time_label"
             tools:text="00:00:00" />
 
@@ -102,8 +102,8 @@
             style="@style/StatsLargeLabel"
             android:text="@string/stats_moving_time"
             app:layout_constrainedWidth="true"
-            app:layout_constraintLeft_toRightOf="@+id/guideline2"
-            app:layout_constraintRight_toLeftOf="@+id/guideline3"
+            app:layout_constraintStart_toEndOf="@+id/guideline2"
+            app:layout_constraintEnd_toStartOf="@+id/guideline3"
             app:layout_constraintTop_toTopOf="@+id/stats_total_time_label"
             app:layout_constraintBottom_toBottomOf="@+id/stats_total_time_label" />
 
@@ -111,8 +111,8 @@
             android:id="@+id/stats_moving_time_value"
             style="@style/StatsLargeValue"
             android:value="@string/value_unknown"
-            app:layout_constraintLeft_toRightOf="@+id/guideline2"
-            app:layout_constraintRight_toLeftOf="@+id/guideline3"
+            app:layout_constraintStart_toEndOf="@+id/guideline2"
+            app:layout_constraintEnd_toStartOf="@+id/guideline3"
             app:layout_constraintTop_toBottomOf="@+id/stats_moving_time_label"
             tools:text="00:00:00" />
 
@@ -129,8 +129,8 @@
             android:id="@+id/stats_speed_horizontal_line"
             style="@style/StatsHorizontalLine"
             android:layout_marginBottom="8dp"
-            app:layout_constraintLeft_toRightOf="@+id/guideline"
-            app:layout_constraintRight_toLeftOf="@+id/guideline3"
+            app:layout_constraintStart_toEndOf="@+id/guideline"
+            app:layout_constraintEnd_toStartOf="@+id/guideline3"
             app:layout_constraintTop_toBottomOf="@+id/stats_time_barrier" />
 
         <!-- Speed/pace -->
@@ -138,8 +138,8 @@
             android:id="@+id/stats_speed_label"
             style="@style/StatsSmallLabel"
             app:layout_constrainedWidth="true"
-            app:layout_constraintLeft_toRightOf="@+id/guideline"
-            app:layout_constraintRight_toLeftOf="@+id/guideline2"
+            app:layout_constraintStart_toEndOf="@+id/guideline"
+            app:layout_constraintEnd_toStartOf="@+id/guideline2"
             app:layout_constraintTop_toBottomOf="@id/stats_speed_horizontal_line"
             tools:text="Speed" />
 
@@ -148,8 +148,8 @@
             style="@style/StatsSmallValue"
             android:value="@string/value_unknown"
             app:layout_constraintHorizontal_chainStyle="packed"
-            app:layout_constraintLeft_toRightOf="@+id/guideline"
-            app:layout_constraintRight_toLeftOf="@+id/stats_speed_unit"
+            app:layout_constraintStart_toEndOf="@+id/guideline"
+            app:layout_constraintEnd_toStartOf="@+id/stats_speed_unit"
             app:layout_constraintTop_toBottomOf="@+id/stats_speed_label"
             tools:text="30.00" />
 
@@ -157,8 +157,8 @@
             android:id="@+id/stats_speed_unit"
             style="@style/StatsUnit"
             app:layout_constraintBottom_toBottomOf="@+id/stats_speed_value"
-            app:layout_constraintLeft_toRightOf="@+id/stats_speed_value"
-            app:layout_constraintRight_toLeftOf="@+id/guideline2"
+            app:layout_constraintStart_toEndOf="@+id/stats_speed_value"
+            app:layout_constraintEnd_toStartOf="@+id/guideline2"
             tools:text="km/h" />
 
         <!-- Average speed/pace -->
@@ -166,8 +166,8 @@
             android:id="@+id/stats_average_speed_label"
             style="@style/StatsSmallLabel"
             app:layout_constrainedWidth="true"
-            app:layout_constraintLeft_toRightOf="@+id/guideline2"
-            app:layout_constraintRight_toLeftOf="@+id/guideline3"
+            app:layout_constraintStart_toEndOf="@+id/guideline2"
+            app:layout_constraintEnd_toStartOf="@+id/guideline3"
             app:layout_constraintTop_toBottomOf="@id/stats_speed_horizontal_line"
             tools:text="Avg. Speed" />
 
@@ -176,8 +176,8 @@
             style="@style/StatsSmallValue"
             android:value="@string/value_unknown"
             app:layout_constraintHorizontal_chainStyle="packed"
-            app:layout_constraintLeft_toRightOf="@+id/guideline2"
-            app:layout_constraintRight_toLeftOf="@+id/stats_average_speed_unit"
+            app:layout_constraintStart_toEndOf="@+id/guideline2"
+            app:layout_constraintEnd_toStartOf="@+id/stats_average_speed_unit"
             app:layout_constraintTop_toBottomOf="@+id/stats_average_speed_label"
             tools:text="30.00" />
 
@@ -185,8 +185,8 @@
             android:id="@+id/stats_average_speed_unit"
             style="@style/StatsUnit"
             app:layout_constraintBottom_toBottomOf="@+id/stats_average_speed_value"
-            app:layout_constraintLeft_toRightOf="@+id/stats_average_speed_value"
-            app:layout_constraintRight_toLeftOf="@+id/guideline3"
+            app:layout_constraintStart_toEndOf="@+id/stats_average_speed_value"
+            app:layout_constraintEnd_toStartOf="@+id/guideline3"
             tools:text="km/h" />
 
         <!-- Speed max -->
@@ -194,8 +194,8 @@
             android:id="@+id/stats_max_speed_label"
             style="@style/StatsSmallLabel"
             app:layout_constrainedWidth="true"
-            app:layout_constraintLeft_toRightOf="@+id/guideline"
-            app:layout_constraintRight_toLeftOf="@+id/guideline2"
+            app:layout_constraintStart_toEndOf="@+id/guideline"
+            app:layout_constraintEnd_toStartOf="@+id/guideline2"
             app:layout_constraintTop_toBottomOf="@id/stats_average_speed_value"
             tools:text="Max. Speed" />
 
@@ -204,8 +204,8 @@
             style="@style/StatsSmallValue"
             android:value="@string/value_unknown"
             app:layout_constraintHorizontal_chainStyle="packed"
-            app:layout_constraintLeft_toRightOf="@+id/guideline"
-            app:layout_constraintRight_toLeftOf="@+id/stats_max_speed_unit"
+            app:layout_constraintStart_toEndOf="@+id/guideline"
+            app:layout_constraintEnd_toStartOf="@+id/stats_max_speed_unit"
             app:layout_constraintTop_toBottomOf="@+id/stats_max_speed_label"
             tools:text="30.00" />
 
@@ -213,8 +213,8 @@
             android:id="@+id/stats_max_speed_unit"
             style="@style/StatsUnit"
             app:layout_constraintBottom_toBottomOf="@+id/stats_max_speed_value"
-            app:layout_constraintLeft_toRightOf="@+id/stats_max_speed_value"
-            app:layout_constraintRight_toLeftOf="@+id/guideline2"
+            app:layout_constraintStart_toEndOf="@+id/stats_max_speed_value"
+            app:layout_constraintEnd_toStartOf="@+id/guideline2"
             tools:text="km/h" />
 
         <!-- Moving speed max -->
@@ -222,8 +222,8 @@
             android:id="@+id/stats_moving_speed_label"
             style="@style/StatsSmallLabel"
             app:layout_constrainedWidth="true"
-            app:layout_constraintLeft_toRightOf="@+id/guideline2"
-            app:layout_constraintRight_toLeftOf="@+id/guideline3"
+            app:layout_constraintStart_toEndOf="@+id/guideline2"
+            app:layout_constraintEnd_toStartOf="@+id/guideline3"
             app:layout_constraintTop_toBottomOf="@id/stats_average_speed_value"
             tools:text="Max. Moving Speed" />
 
@@ -232,8 +232,8 @@
             style="@style/StatsSmallValue"
             android:value="@string/value_unknown"
             app:layout_constraintHorizontal_chainStyle="packed"
-            app:layout_constraintLeft_toRightOf="@+id/guideline2"
-            app:layout_constraintRight_toLeftOf="@+id/stats_moving_speed_unit"
+            app:layout_constraintStart_toEndOf="@+id/guideline2"
+            app:layout_constraintEnd_toStartOf="@+id/stats_moving_speed_unit"
             app:layout_constraintTop_toBottomOf="@+id/stats_moving_speed_label"
             tools:text="30.00" />
 
@@ -241,8 +241,8 @@
             android:id="@+id/stats_moving_speed_unit"
             style="@style/StatsUnit"
             app:layout_constraintBottom_toBottomOf="@+id/stats_moving_speed_value"
-            app:layout_constraintLeft_toRightOf="@+id/stats_moving_speed_value"
-            app:layout_constraintRight_toLeftOf="@+id/guideline3"
+            app:layout_constraintStart_toEndOf="@+id/stats_moving_speed_value"
+            app:layout_constraintEnd_toStartOf="@+id/guideline3"
             tools:text="km/h" />
 
         <!-- Barrier -->
@@ -258,8 +258,8 @@
             android:id="@+id/stats_elevation_horizontal_line"
             style="@style/StatsHorizontalLine"
             android:layout_marginBottom="8dp"
-            app:layout_constraintLeft_toRightOf="@+id/guideline"
-            app:layout_constraintRight_toLeftOf="@+id/guideline3"
+            app:layout_constraintStart_toEndOf="@+id/guideline"
+            app:layout_constraintEnd_toStartOf="@+id/guideline3"
             app:layout_constraintTop_toBottomOf="@+id/stats_speed_barrier" />
 
         <!-- Elevation -->
@@ -275,8 +275,8 @@
             style="@style/StatsSmallLabel"
             android:text="@string/stats_elevation"
             app:layout_constrainedWidth="true"
-            app:layout_constraintLeft_toRightOf="@+id/guideline"
-            app:layout_constraintRight_toLeftOf="@+id/guideline2"
+            app:layout_constraintStart_toEndOf="@+id/guideline"
+            app:layout_constraintEnd_toStartOf="@+id/guideline2"
             app:layout_constraintTop_toBottomOf="@id/stats_elevation_horizontal_line" />
 
         <TextView
@@ -284,8 +284,8 @@
             style="@style/StatsSmallValue"
             android:value="@string/value_unknown"
             app:layout_constraintHorizontal_chainStyle="packed"
-            app:layout_constraintLeft_toRightOf="@+id/guideline"
-            app:layout_constraintRight_toLeftOf="@+id/stats_elevation_current_unit"
+            app:layout_constraintStart_toEndOf="@+id/guideline"
+            app:layout_constraintEnd_toStartOf="@+id/stats_elevation_current_unit"
             app:layout_constraintTop_toBottomOf="@+id/stats_elevation_current_label"
             tools:text="100" />
 
@@ -293,8 +293,8 @@
             android:id="@+id/stats_elevation_current_unit"
             style="@style/StatsUnit"
             app:layout_constraintBottom_toBottomOf="@+id/stats_elevation_current_value"
-            app:layout_constraintLeft_toRightOf="@+id/stats_elevation_current_value"
-            app:layout_constraintRight_toLeftOf="@+id/guideline2"
+            app:layout_constraintStart_toEndOf="@+id/stats_elevation_current_value"
+            app:layout_constraintEnd_toStartOf="@+id/guideline2"
             tools:text="m" />
 
         <!-- Current elevation -->
@@ -303,8 +303,8 @@
             style="@style/StatsSmallLabel"
             android:text="@string/stats_gain"
             app:layout_constrainedWidth="true"
-            app:layout_constraintLeft_toRightOf="@+id/guideline2"
-            app:layout_constraintRight_toLeftOf="@+id/guideline3"
+            app:layout_constraintStart_toEndOf="@+id/guideline2"
+            app:layout_constraintEnd_toStartOf="@+id/guideline3"
             app:layout_constraintTop_toBottomOf="@id/stats_elevation_horizontal_line" />
 
         <TextView
@@ -312,8 +312,8 @@
             style="@style/StatsSmallValue"
             android:value="@string/value_unknown"
             app:layout_constraintHorizontal_chainStyle="packed"
-            app:layout_constraintLeft_toRightOf="@+id/guideline2"
-            app:layout_constraintRight_toLeftOf="@+id/stats_elevation_gain_unit"
+            app:layout_constraintStart_toEndOf="@+id/guideline2"
+            app:layout_constraintEnd_toStartOf="@+id/stats_elevation_gain_unit"
             app:layout_constraintTop_toBottomOf="@+id/stats_elevation_gain_label"
             tools:text="100" />
 
@@ -321,8 +321,8 @@
             android:id="@+id/stats_elevation_gain_unit"
             style="@style/StatsUnit"
             app:layout_constraintBottom_toBottomOf="@+id/stats_elevation_gain_value"
-            app:layout_constraintLeft_toRightOf="@+id/stats_elevation_gain_value"
-            app:layout_constraintRight_toLeftOf="@+id/guideline3"
+            app:layout_constraintStart_toEndOf="@+id/stats_elevation_gain_value"
+            app:layout_constraintEnd_toStartOf="@+id/guideline3"
             tools:text="m" />
 
         <!-- Coordinate group -->
@@ -345,8 +345,8 @@
             android:id="@+id/stats_coordinate_horizontal_line"
             style="@style/StatsHorizontalLine"
             android:layout_marginBottom="8dp"
-            app:layout_constraintLeft_toRightOf="@+id/guideline"
-            app:layout_constraintRight_toLeftOf="@+id/guideline3"
+            app:layout_constraintStart_toEndOf="@+id/guideline"
+            app:layout_constraintEnd_toStartOf="@+id/guideline3"
             app:layout_constraintTop_toBottomOf="@+id/stats_elevation_barrier" />
 
         <!-- Latitude -->
@@ -355,15 +355,15 @@
             style="@style/StatsSmallLabel"
             android:text="@string/stats_latitude"
             app:layout_constrainedWidth="true"
-            app:layout_constraintLeft_toRightOf="@+id/guideline"
-            app:layout_constraintRight_toLeftOf="@+id/guideline2"
+            app:layout_constraintStart_toEndOf="@+id/guideline"
+            app:layout_constraintEnd_toStartOf="@+id/guideline2"
             app:layout_constraintTop_toBottomOf="@id/stats_coordinate_horizontal_line" />
 
         <TextView
             android:id="@+id/stats_latitude_value"
             style="@style/StatsSmallValue"
-            app:layout_constraintLeft_toRightOf="@+id/guideline"
-            app:layout_constraintRight_toLeftOf="@+id/guideline2"
+            app:layout_constraintStart_toEndOf="@+id/guideline"
+            app:layout_constraintEnd_toStartOf="@+id/guideline2"
             app:layout_constraintTop_toBottomOf="@+id/stats_latitude_label"
             tools:text="0.834937848" />
 
@@ -373,16 +373,16 @@
             style="@style/StatsSmallLabel"
             android:text="@string/stats_longitude"
             app:layout_constrainedWidth="true"
-            app:layout_constraintLeft_toRightOf="@+id/guideline2"
-            app:layout_constraintRight_toLeftOf="@+id/guideline3"
+            app:layout_constraintStart_toEndOf="@+id/guideline2"
+            app:layout_constraintEnd_toStartOf="@+id/guideline3"
             app:layout_constraintTop_toBottomOf="@id/stats_coordinate_horizontal_line" />
 
         <TextView
             android:id="@+id/stats_longitude_value"
             style="@style/StatsSmallValue"
             android:value="@string/value_unknown"
-            app:layout_constraintLeft_toRightOf="@+id/guideline2"
-            app:layout_constraintRight_toLeftOf="@+id/guideline3"
+            app:layout_constraintStart_toEndOf="@+id/guideline2"
+            app:layout_constraintEnd_toStartOf="@+id/guideline3"
             app:layout_constraintTop_toBottomOf="@+id/stats_longitude_label"
             tools:text="0.834937848" />
 
@@ -399,8 +399,8 @@
             android:id="@+id/stats_sensor_horizontal_line"
             style="@style/StatsHorizontalLine"
             android:layout_marginBottom="8dp"
-            app:layout_constraintLeft_toRightOf="@+id/guideline"
-            app:layout_constraintRight_toLeftOf="@+id/guideline3"
+            app:layout_constraintStart_toEndOf="@+id/guideline"
+            app:layout_constraintEnd_toStartOf="@+id/guideline3"
             app:layout_constraintTop_toBottomOf="@+id/stats_location_barrier" />
 
         <!-- Sensors data -->
@@ -408,8 +408,8 @@
             android:id="@+id/stats_sensors_recycler_view"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            app:layout_constraintLeft_toRightOf="@+id/guideline"
-            app:layout_constraintRight_toLeftOf="@+id/guideline3"
+            app:layout_constraintStart_toEndOf="@+id/guideline"
+            app:layout_constraintEnd_toStartOf="@+id/guideline3"
             app:layout_constraintTop_toBottomOf="@id/stats_sensor_horizontal_line" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/src/main/res/layout/track_edit.xml b/src/main/res/layout/track_edit.xml
index 88f659bb8..1f9017ac7 100644
--- a/src/main/res/layout/track_edit.xml
+++ b/src/main/res/layout/track_edit.xml
@@ -95,13 +95,13 @@ limitations under the License.
         <Button
             android:id="@+id/track_edit_cancel"
             style="@style/BottomButton"
-            android:layout_gravity="left"
+            android:layout_gravity="start"
             android:text="@string/generic_cancel" />
 
         <Button
             android:id="@+id/track_edit_save"
             style="@style/BottomButton"
-            android:layout_gravity="right"
+            android:layout_gravity="end"
             android:text="@string/generic_save" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/track_list.xml b/src/main/res/layout/track_list.xml
index 07af1a49d..faeac71d9 100644
--- a/src/main/res/layout/track_list.xml
+++ b/src/main/res/layout/track_list.xml
@@ -73,7 +73,7 @@ limitations under the License.
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="22"
-                android:gravity="left"
+                android:gravity="start"
                 android:text="@string/track_list_empty_message" />
 
             <View