diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceRecordingTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceRecordingTest.java
index 1b82e80fd..95e35f88e 100644
--- a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceRecordingTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceRecordingTest.java
@@ -88,7 +88,7 @@ public class TrackRecordingServiceRecordingTest {
         contentProviderUtils = new ContentProviderUtils(context);
 
         PreferencesUtils.setString(R.string.recording_distance_interval_key, R.string.recording_distance_interval_default);
-        PreferencesUtils.setString(R.string.idle_speed_key, R.string.idle_speed_default);
+        PreferencesUtils.setString(R.string.idle_duration_key, R.string.idle_duration_default);
 
         service = startService();
     }
diff --git a/src/main/java/de/dennisguse/opentracks/data/models/Speed.java b/src/main/java/de/dennisguse/opentracks/data/models/Speed.java
index 7714b678a..60bd1e84b 100644
--- a/src/main/java/de/dennisguse/opentracks/data/models/Speed.java
+++ b/src/main/java/de/dennisguse/opentracks/data/models/Speed.java
@@ -2,7 +2,6 @@ package de.dennisguse.opentracks.data.models;
 
 import java.time.Duration;
 
-import de.dennisguse.opentracks.settings.PreferencesUtils;
 import de.dennisguse.opentracks.settings.UnitSystem;
 
 public record Speed(double speed_mps) {
@@ -56,10 +55,6 @@ public record Speed(double speed_mps) {
         return Double.isNaN(speed_mps) || Double.isInfinite(speed_mps);
     }
 
-    public boolean isMoving() {
-        return !isInvalid() && greaterThan(PreferencesUtils.getIdleSpeed());
-    }
-
     public boolean lessThan(Speed speed) {
         return !greaterThan(speed);
     }
diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java
index fe4bbbd8a..50e8eb363 100644
--- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java
+++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java
@@ -34,8 +34,6 @@ public class TrackRecordingManager implements SharedPreferences.OnSharedPreferen
 
     private static final String TAG = TrackRecordingManager.class.getSimpleName();
 
-    private static final Duration IDLE_TIMEOUT = Duration.ofSeconds(30);
-
     private static final AltitudeCorrectionManager ALTITUDE_CORRECTION_MANAGER = new AltitudeCorrectionManager();
 
     private final Runnable ON_IDLE = this::onIdle;
@@ -49,6 +47,7 @@ public class TrackRecordingManager implements SharedPreferences.OnSharedPreferen
 
     private Distance recordingDistanceInterval;
     private Distance maxRecordingDistance;
+    private Duration idleDuration;
 
     private Track.Id trackId;
     private TrackStatisticsUpdater trackStatisticsUpdater;
@@ -69,7 +68,7 @@ public class TrackRecordingManager implements SharedPreferences.OnSharedPreferen
 
     Track.Id startNewTrack() {
         TrackPoint segmentStartTrackPoint = trackPointCreator.createSegmentStartManual();
-        // Create new track
+
         ZoneOffset zoneOffset = ZoneOffset.systemDefault().getRules().getOffset(segmentStartTrackPoint.getTime());
         Track track = new Track(zoneOffset);
         trackId = contentProviderUtils.insertTrack(track);
@@ -83,7 +82,6 @@ public class TrackRecordingManager implements SharedPreferences.OnSharedPreferen
         track.setActivityTypeLocalized(activityTypeLocalized);
         track.setActivityType(ActivityType.findByLocalizedString(context, activityTypeLocalized));
         track.setTrackStatistics(trackStatisticsUpdater.getTrackStatistics());
-        //TODO Pass TrackPoint
         track.setName(TrackNameUtils.getTrackName(context, trackId, track.getStartTime()));
         contentProviderUtils.updateTrack(track);
 
@@ -109,7 +107,7 @@ public class TrackRecordingManager implements SharedPreferences.OnSharedPreferen
         return true;
     }
 
-    void end() {
+    void endCurrentTrack() {
         TrackPoint segmentEnd = trackPointCreator.createSegmentEnd();
         insertTrackPoint(segmentEnd, true);
 
@@ -223,7 +221,7 @@ public class TrackRecordingManager implements SharedPreferences.OnSharedPreferen
             insertTrackPoint(trackPoint, true);
 
             handler.removeCallbacks(ON_IDLE);
-            handler.postDelayed(ON_IDLE, IDLE_TIMEOUT.toMillis());
+            handler.postDelayed(ON_IDLE, idleDuration.toMillis());
             return true;
         }
 
@@ -231,7 +229,7 @@ public class TrackRecordingManager implements SharedPreferences.OnSharedPreferen
             insertTrackPoint(trackPoint, false);
 
             handler.removeCallbacks(ON_IDLE);
-            handler.postDelayed(ON_IDLE, IDLE_TIMEOUT.toMillis());
+            handler.postDelayed(ON_IDLE, idleDuration.toMillis());
             return true;
         }
 
@@ -297,5 +295,8 @@ public class TrackRecordingManager implements SharedPreferences.OnSharedPreferen
         if (PreferencesUtils.isKey(R.string.max_recording_distance_key, key)) {
             maxRecordingDistance = PreferencesUtils.getMaxRecordingDistance();
         }
+        if (PreferencesUtils.isKey(R.string.idle_duration_key, key)) {
+            idleDuration = PreferencesUtils.getIdleDurationTimeout();
+        }
     }
 }
diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
index 1255a489c..2ef10e720 100644
--- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
+++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
@@ -214,7 +214,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
         // Set recording status
         updateRecordingStatus(STATUS_DEFAULT);
 
-        trackRecordingManager.end();
+        trackRecordingManager.endCurrentTrack();
 
         stopUpdateRecordingData();
 
diff --git a/src/main/java/de/dennisguse/opentracks/settings/GpsSettingsFragment.java b/src/main/java/de/dennisguse/opentracks/settings/GpsSettingsFragment.java
index eff92ab98..44b087d07 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/GpsSettingsFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/GpsSettingsFragment.java
@@ -79,7 +79,7 @@ public class GpsSettingsFragment extends PreferenceFragmentCompat {
         ListPreference recordingGpsAccuracy = findPreference(getString(R.string.recording_gps_accuracy_key));
         recordingGpsAccuracy.setEntries(PreferencesUtils.getThresholdHorizontalAccuracyEntries());
 
-        ListPreference idleSpeed = findPreference(getString(R.string.idle_speed_key));
-        idleSpeed.setEntries(PreferencesUtils.getIdleSpeedEntries());
+        ListPreference idleDuration = findPreference(getString(R.string.idle_duration_key));
+        idleDuration.setEntries(PreferencesUtils.getIdleDurationEntries());
     }
 }
diff --git a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
index e0303a261..5a1af8bc9 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
@@ -45,7 +45,6 @@ import de.dennisguse.opentracks.data.models.Distance;
 import de.dennisguse.opentracks.data.models.DistanceFormatter;
 import de.dennisguse.opentracks.data.models.HeartRate;
 import de.dennisguse.opentracks.data.models.HeartRateZones;
-import de.dennisguse.opentracks.data.models.Speed;
 import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;
 import de.dennisguse.opentracks.io.file.TrackFilenameGenerator;
@@ -530,11 +529,12 @@ public class PreferencesUtils {
 
     static String[] getMinRecordingIntervalEntries() {
         String[] entryValues = resources.getStringArray(R.array.min_recording_interval_values);
+        long recommended = PreferencesUtils.getMinRecordingIntervalDefault().getSeconds();
         String[] entries = new String[entryValues.length];
         for (int i = 0; i < entryValues.length; i++) {
             int value = Integer.parseInt(entryValues[i]);
 
-            if (value == PreferencesUtils.getMinRecordingIntervalDefault().getSeconds()) {
+            if (value == recommended) {
                 entries[i] = resources.getString(R.string.value_smallest_recommended);
             } else {
                 entries[i] = value < 60 ? resources.getString(R.string.value_integer_second, value) : resources.getString(R.string.value_integer_minute, value / 60);
@@ -598,49 +598,25 @@ public class PreferencesUtils {
         return entries;
     }
 
-
-    public static Speed getIdleSpeed() {
-        final float DEFAULT = Float.parseFloat(resources.getString(R.string.idle_speed_default));
-        float value = getFloat(R.string.idle_speed_key, DEFAULT);
-        return Speed.ofKMH(value);
+    public static Duration getIdleDurationTimeout() {
+        final int DEFAULT = Integer.parseInt(resources.getString(R.string.idle_duration_default));
+        int value = getInt(R.string.idle_duration_key, DEFAULT);
+        return Duration.ofSeconds(value);
     }
 
-    static String[] getIdleSpeedEntries() {
-        String[] entryValues = resources.getStringArray(R.array.idle_speed_values);
+    static String[] getIdleDurationEntries() {
+        String[] entryValues = resources.getStringArray(R.array.idle_duration_values);
         String[] entries = new String[entryValues.length];
 
-        final float idleSpeedDefault = Float.parseFloat(resources.getString(R.string.idle_speed_default));
-
-        UnitSystem unitSystem = getUnitSystem();
+        final int idleDurationDefault = Integer.parseInt(resources.getString(R.string.idle_duration_default));
 
         for (int i = 0; i < entryValues.length; i++) {
-            float value = Float.parseFloat(entryValues[i]);
+            int value = Integer.parseInt(entryValues[i]);
 
-            switch (unitSystem) {
-                case METRIC -> {
-                    if (value == idleSpeedDefault) {
-                        entries[i] = resources.getString(R.string.value_float_kilometer_hour_recommended, value);
-                    } else {
-                        entries[i] = resources.getString(R.string.value_float_kilometer_hour, value);
-                    }
-                }
-                case IMPERIAL_FEET, IMPERIAL_METER -> {
-                    double valueMPH = Speed.ofKMH(value).toMPH();
-                    if (value == idleSpeedDefault) {
-                        entries[i] = resources.getString(R.string.value_float_mile_hour_recommended, valueMPH);
-                    } else {
-                        entries[i] = resources.getString(R.string.value_float_mile_hour, valueMPH);
-                    }
-                }
-                case NAUTICAL_IMPERIAL -> {
-                    double valueKnots = Speed.ofKMH(value).toKnots();
-                    if (value == idleSpeedDefault) {
-                        entries[i] = resources.getString(R.string.value_float_knots_recommended, valueKnots);
-                    } else {
-                        entries[i] = resources.getString(R.string.value_float_knots, valueKnots);
-                    }
-                }
-                default -> throw new RuntimeException("Not implemented");
+            if (value == idleDurationDefault) {
+                entries[i] = resources.getString(R.string.value_int_seconds, value);
+            } else {
+                entries[i] = value < 60 ? resources.getString(R.string.value_integer_second, value) : resources.getString(R.string.value_integer_minute, value / 60);
             }
         }
 
diff --git a/src/main/res/values-b+es+419/strings.xml b/src/main/res/values-b+es+419/strings.xml
index 36c1b363a..9d16d1ac2 100644
--- a/src/main/res/values-b+es+419/strings.xml
+++ b/src/main/res/values-b+es+419/strings.xml
@@ -429,7 +429,6 @@
     <string name="settings_announcements_summary">Tiempo, Distancia, Velocidad de la voz</string>
     <string name="settings_import_export_summary">Importar, Exportar, Autoexportar</string>
     <string name="settings_units_category">Unidades</string>
-    <string name="settings_recording_idle_speed_title">Umbral de velocidad de ralentí</string>
     <string name="custom_layout_select_layout">Seleccionar diseño</string>
     <string name="stats_custom_layout_default_layout">Diseño predeterminado</string>
     <string name="settings_generic_sensor">Genérico</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 56796930e..00f2a9a34 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -477,7 +477,6 @@ limitations under the License.
     <string name="permission_bluetooth_failed_rejected">V nastavení systému je třeba ručně povolit aplikaci OpenTracks přístup k blízkým zařízením.</string>
     <string name="value_float_mile_hour">%1$.1f mi/h</string>
     <string name="value_float_mile_hour_recommended">%1$.1f mil/h (doporučeno)</string>
-    <string name="settings_recording_idle_speed_title">Rychlost pro autopausu</string>
     <string name="value_float_kilometer_hour">%1$.1f km/h</string>
     <string name="value_float_kilometer_hour_recommended">%1$.1f km/h (doporučeno)</string>
     <string name="stats_clock">Hodiny</string>
diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml
index eab08bb9e..aefa73f9d 100644
--- a/src/main/res/values-da/strings.xml
+++ b/src/main/res/values-da/strings.xml
@@ -487,7 +487,6 @@ Hvis GPS-enheden rapporterer unøjagtige data (f.eks. Placering, hastighed, høj
     <string name="settings_import_section">Importere</string>
     <string name="settings_export_section">Eksport</string>
     <string name="stats_clock">Klokken</string>
-    <string name="settings_recording_idle_speed_title">Tærskel for tomgangshastighed</string>
     <string name="value_float_mile_hour_recommended">%1$.1f mi/h (anbefalet)</string>
     <string name="value_float_mile_hour">%1$.1f mi/h</string>
     <string name="generic_to">Til</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index d69ead9f6..f05d0d4f6 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -496,7 +496,6 @@ Meldet das GPS-Gerät ungenaue Daten (z.B. Standort, Geschwindigkeit, Höhe), ka
     <string name="description_speed_source_gps">GPS</string>
     <string name="menu_select_layout">Wähle Layout</string>
     <string name="generic_choose_an_option">Wähle eine Option</string>
-    <string name="settings_recording_idle_speed_title">Inaktivitätsgeschwindigkeit</string>
     <string name="settings_gps_title">GPS</string>
     <string name="settings_import_export_title">Import/Export</string>
     <string name="settings_sensors_title">Bluetooth Sensoren</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 63bf77aef..5a717228f 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -507,7 +507,6 @@ limitations under the License.
     <string name="value_float_kilometer_hour">%1$.1f km/h</string>
     <string name="value_float_mile_hour">%1$.1f mi/h</string>
     <string name="value_float_mile_hour_recommended">%1$.1f mi/h (recomendado)</string>
-    <string name="settings_recording_idle_speed_title">Umbral de velocidad de ralentí</string>
     <string name="stats_clock">Reloj</string>
     <string name="value_float_kilometer_hour_recommended">%1$.1f km/h (recomendado)</string>
     <string name="settings_generic_sensor">Genérico</string>
diff --git a/src/main/res/values-et/strings.xml b/src/main/res/values-et/strings.xml
index d3c61babd..b85dd0d9f 100644
--- a/src/main/res/values-et/strings.xml
+++ b/src/main/res/values-et/strings.xml
@@ -450,7 +450,6 @@ limitations under the License.
     <string name="stats_clock">Kell</string>
     <string name="value_float_kilometer_hour_recommended">%1$.1f km/h (soovitatav)</string>
     <string name="value_float_kilometer_hour">%1$.1f km/h</string>
-    <string name="settings_recording_idle_speed_title">Tühikäigu kiiruse lävi</string>
     <string name="settings_announcements_distance_frequency">Vahemaa intervall</string>
     <string name="description_speed_source_gps">GPS</string>
     <string name="settings_cycling_sensor">Jalgrattasõit</string>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index c7631a89f..b41b5efde 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -485,7 +485,6 @@ GPS gailuak datu okerrak salatzen baditu (adibidez, kokapena, abiadura, kota), O
     <string name="settings_sensors_summary">Txirrindularitza Sentsoreak, Gurpila Zirkunferentzia, Sentsore Exekutatzen</string>
     <string name="settings_recording_customize_layout_select_columns">Datu-eremuak errenkadako</string>
     <string name="settings_recording_customize_layout_title">Pertsonalizatu zure grabazioaren diseinua</string>
-    <string name="settings_recording_idle_speed_title">Inaktibitatearen abiaduraren muga</string>
     <string name="settings_announcements_totaltime_frequency">Denbora-tartea</string>
     <string name="settings_announcements_distance_frequency">Distantzia tartea</string>
     <string name="settings_running_sensor">Exekutatzen</string>
diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml
index 7c39998c3..f7df29ec0 100644
--- a/src/main/res/values-fi/strings.xml
+++ b/src/main/res/values-fi/strings.xml
@@ -521,7 +521,6 @@ limitations under the License.
     <string name="settings_public_api_dashboard_enabled_title">Automaattinen tiedonsiirto</string>
     <string name="settings_public_api_dashboard_enabled_summary_on">Tallennuksen aloittanut sovellus voi myös käyttää tallennettuja tietoja.</string>
     <string name="menu_filter">Suodatin</string>
-    <string name="settings_recording_idle_speed_title">Joutokäyntinopeuden kynnysarvo</string>
     <string name="stats_sensors_cadence">Kadenssi</string>
     <string name="stats_clock">Kello</string>
     <string name="current_heart_rate">Nykyinen syke</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 5a434d745..54d27ff42 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -511,7 +511,6 @@ Si le dispositif GPS signale des données inexactes (par exemple, la localisatio
     <string name="value_float_kilometer_hour_recommended">%1$.1f km/h (recommandé)</string>
     <string name="value_float_mile_hour">%1$.1f mi/h</string>
     <string name="value_float_mile_hour_recommended">%1$.1f mi/h (recommandé)</string>
-    <string name="settings_recording_idle_speed_title">Seuil de vitesse au ralenti</string>
     <string name="stats_clock">Horloge</string>
     <string name="value_float_kilometer_hour">%1$.1f km/h</string>
     <string name="settings_generic_sensor">Générique</string>
diff --git a/src/main/res/values-ga/strings.xml b/src/main/res/values-ga/strings.xml
index fac3a0382..4a9fdbd67 100644
--- a/src/main/res/values-ga/strings.xml
+++ b/src/main/res/values-ga/strings.xml
@@ -238,7 +238,6 @@
     <string name="settings_recording_track_name_date_local_option">Dáta (áitiúil)</string>
     <string name="settings_recording_track_name_number_option">Uimhir</string>
     <string name="settings_recording_track_name_title">Ainm rian réamhshocraithe</string>
-    <string name="settings_recording_idle_speed_title">Tairseach luais díomhaoin</string>
     <string name="settings_night_mode_title">Téama Chomhéadain</string>
     <string name="settings_night_mode_option_system">Córas</string>
     <string name="settings_night_mode_option_day">Lá</string>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index d7798ad76..79d9da8af 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -477,7 +477,6 @@ Se o GPS informa sobre datos pouco precisos (ex.: localización, velocidade, ele
     <string name="settings_announcements_distance_frequency">Intervalo de distancia</string>
     <string name="permission_bluetooth_failed">OpenTracks require permiso para usar o Bluetooth.</string>
     <string name="permission_bluetooth_failed_rejected">Tes que permitirlle a OpenTracks nos axustes do sistema que acceda a Dispositivos Próximos.</string>
-    <string name="settings_recording_idle_speed_title">Limiar detección movemento</string>
     <string name="value_float_kilometer_hour">%1$.1f km/h</string>
     <string name="value_float_mile_hour">%1$.1f km/h</string>
     <string name="value_float_mile_hour_recommended">%1$.1f km/h (recomendado)</string>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index cd3bb8d5d..be72cd72c 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -474,7 +474,6 @@ limitations under the License.
     <string name="stats_sensors_cadence">Ütem</string>
     <string name="settings_all_reset">Visszaállítás</string>
     <string name="settings_layout_reset_confirm_message">Minden elrendezési beállítás visszaáll az alapértelmezett értékekre. Ez nem törli az eszközön lévő zeneszámokat.</string>
-    <string name="settings_recording_idle_speed_title">Alapjárati fordulatszám-küszöbérték</string>
     <string name="custom_layout_list_title">Elrendezések</string>
     <string name="custom_layout_list_edit_name">Írja be az elrendezés nevét a hozzáadáshoz</string>
     <string name="aggregated_stats_filter_no_results">A megadott szűrőhöz nincsenek tevékenységek</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 336218b5f..1096fb8d4 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -456,7 +456,6 @@ Infatti, un\'applicazione deve supportare <i>ACTION_VIEW</i> con MIME <i>applica
     <string name="settings_sensor_running_speed_and_cadence">Distanza, Velocità e Cadenza</string>
     <string name="stats_clock">Orologio</string>
     <string name="settings_announcements_totaltime_frequency">Intervallo di tempo</string>
-    <string name="settings_recording_idle_speed_title">Soglia velocità di movimento</string>
     <string name="settings_announcements_distance_frequency">Intervallo di distanza</string>
     <string name="location_latitude_longitude">%1$s, %2$s</string>
     <string name="location_coordinate">%1$s°</string>
diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml
index 2610e89eb..cd2911194 100644
--- a/src/main/res/values-nb/strings.xml
+++ b/src/main/res/values-nb/strings.xml
@@ -472,7 +472,6 @@ limitations under the License.
     <string name="settings_export_section">Eksport</string>
     <string name="value_float_kilometer_hour">%1$.1f km/t</string>
     <string name="value_float_kilometer_hour_recommended">%1$.1f km/t (anbefales)</string>
-    <string name="settings_recording_idle_speed_title">Terskel for tomgangshastighet</string>
     <string name="value_float_mile_hour">%1$.1f mi/h</string>
     <string name="value_float_mile_hour_recommended">%1$.1f mi/h (anbefales)</string>
     <string name="stats_clock">Klokke</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 98ce295d2..63761ff6f 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -458,7 +458,6 @@ Als het GPS-apparaat onnauwkeurige gegevens rapporteert (bijv. locatie, snelheid
     <string name="settings_ui_title">User Interface</string>
     <string name="stats_coordinates">Coördinaten</string>
     <string name="settings_announcements_distance_frequency">Afstandsinterval</string>
-    <string name="settings_recording_idle_speed_title">Drempelwaarde stationair</string>
     <string name="value_float_kilometer_hour">%1$.1f km/u</string>
     <string name="settings_api_title">Publieke API</string>
     <string name="settings_public_api_enabled_title">Public API</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index fd575851e..c819c075c 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -456,7 +456,6 @@ limitations under the License.
     <string name="stats_sensors_heart_rate">Częstość akcji serca</string>
     <string name="stats_clock">Zegar</string>
     <string name="settings_announcements_distance_frequency">Przedział dystansu</string>
-    <string name="settings_recording_idle_speed_title">Próg prędkości bezobciążeń</string>
     <string name="settings_layout_reset_confirm_title">Zresetować twoje układy\?</string>
     <string name="settings_cycling_sensor">Kolarstwo</string>
     <string name="settings_running_sensor">Bieganie</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 59a91040f..558c4a1f8 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -427,7 +427,6 @@
     <string name="settings_export_section">Exportar</string>
     <string name="value_float_kilometer_hour">%1$.1f km/h</string>
     <string name="value_float_kilometer_hour_recommended">%1$.1f km/h (Recomendado)</string>
-    <string name="settings_recording_idle_speed_title">Limite de velocidade de marcha lenta</string>
     <string name="stats_clock">Relógio</string>
     <string name="settings_announcements_title">Anúncios de voz</string>
     <string name="settings_sensors_summary">Voice announcements</string>
diff --git a/src/main/res/values-pt-rPT/strings.xml b/src/main/res/values-pt-rPT/strings.xml
index 212096358..61f51c279 100644
--- a/src/main/res/values-pt-rPT/strings.xml
+++ b/src/main/res/values-pt-rPT/strings.xml
@@ -438,7 +438,6 @@
     <string name="settings_recording_keep_screen_on_while_recording_title">Mantenha o ecrã ligada</string>
     <string name="settings_recording_fullscreen_on_while_recording_summary">Durante a gravação, apresente em ecrã inteiro.</string>
     <string name="settings_recording_keep_screen_on_while_recording_summary">Durante a gravação, mantenha o ecrã ligado.</string>
-    <string name="settings_recording_idle_speed_title">Limite de velocidade de marcha lenta</string>
     <string name="settings_night_mode_title">Tema UI</string>
     <string name="settings_night_mode_option_system">Sistema</string>
     <string name="settings_night_mode_option_night">Noite</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 7376ab8b3..a0152c730 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -465,7 +465,6 @@ limitations under the License.
     <string name="settings_import_export_title">Importar/Exportar</string>
     <string name="settings_import_export_summary">Importar, Exportar, Auto Export</string>
     <string name="settings_units_category">Unidades</string>
-    <string name="settings_recording_idle_speed_title">Limite de velocidade de marcha lenta</string>
     <string name="settings_night_mode_title">Tema UI</string>
     <string name="settings_layout_reset_confirm_message">Todas as configurações de layout serão revertidas para os valores padrão. Isso não excluirá nenhuma trilha do aparelho.</string>
     <string name="settings_all_reset">Redefinir</string>
diff --git a/src/main/res/values-ro/strings.xml b/src/main/res/values-ro/strings.xml
index df1647863..8bc11f8b4 100644
--- a/src/main/res/values-ro/strings.xml
+++ b/src/main/res/values-ro/strings.xml
@@ -457,7 +457,6 @@ limitations under the License.
     <string name="custom_layout_list_edit_already_exists">Numele Layout-ului există deja</string>
     <string name="custom_layout_list_title">Machete</string>
     <string name="custom_layout_list_edit_name">Tastați numele layout pentru a adăuga</string>
-    <string name="settings_recording_idle_speed_title">Pragul de viteză la ralanti</string>
     <string name="generic_filter">Filtru</string>
     <string name="menu_select_layout">Selectați Layout</string>
     <string name="settings_import_export_title">Importație/Export</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 7e444affb..5d255f783 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -490,7 +490,6 @@ limitations under the License.
     <string name="stats_clock">Часы</string>
     <string name="settings_activity_defaults_category">Настройки активности</string>
     <string name="settings_reset_summary">Сбросить настройки</string>
-    <string name="settings_recording_idle_speed_title">Порог скорости холостого хода</string>
     <string name="settings_generic_sensor">Обычные</string>
     <string name="custom_layout_select_layout">Выбрать раскладку</string>
     <string name="stats_custom_layout_default_layout">Раскладка по умолчанию</string>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index c58e86550..8ca052929 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -427,7 +427,6 @@ limitations under the License.
     <string name="settings_recording_show_on_lockscreen_while_recording_summary">Počas nahrávania zobrazte štatistiky bez odomknutia zariadenia.</string>
     <string name="settings_recording_show_on_lockscreen_while_recording_title">Zobrazenie štatistík na uzamknutej obrazovke</string>
     <string name="settings_generic_sensor">Všeobecné</string>
-    <string name="settings_recording_idle_speed_title">Prahová hodnota voľnobehu</string>
     <string name="value_float_mile_hour">%1$.1f mi/h</string>
     <string name="settings_default_export_uri_title">Adresár pre export stôp</string>
     <string name="instant_export_enabled_title">Okamžitý export po tréningu</string>
diff --git a/src/main/res/values-sl/strings.xml b/src/main/res/values-sl/strings.xml
index e57db822b..79d357167 100644
--- a/src/main/res/values-sl/strings.xml
+++ b/src/main/res/values-sl/strings.xml
@@ -448,7 +448,6 @@ limitations under the License.
     <string name="settings_all_reset">Ponastavitev</string>
     <string name="settings_sensor_running_speed_and_cadence">Razdalja, hitrost in kadenca</string>
     <string name="settings_sensor_wheel_circumference">Obod kolesa (mm)</string>
-    <string name="settings_recording_idle_speed_title">Prag prostega teka</string>
     <string name="settings_night_mode_option_system">Sistem</string>
     <string name="settings_public_api_disabled_toast">OpenTracks Public API je onemogočen: omogočite ga lahko v nastavitvah.</string>
     <string name="current_heart_rate">Trenutni srčni utrip</string>
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index a6f2fad9c..330d82566 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -453,7 +453,6 @@ limitations under the License.
     <string name="settings_recording_show_on_lockscreen_while_recording_title">Kilit ekranında istatistikleri göster</string>
     <string name="settings_recording_keep_screen_on_while_recording_summary">Kayıt esnasında ekranı açık tutar.</string>
     <string name="settings_recording_fullscreen_on_while_recording_summary">Kayıt esnasında tam ekranda sunar.</string>
-    <string name="settings_recording_idle_speed_title">Boşta hız eşiği</string>
     <string name="settings_night_mode_title">Kullanıcı arayüzü teması</string>
     <string name="settings_night_mode_option_system">Sistem</string>
     <string name="settings_night_mode_option_night">Gece</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index d144648e0..8e3c1c8a4 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -475,7 +475,6 @@ limitations under the License.
     <string name="custom_layout_list_edit_name">Введіть ім\'я макета для додавання</string>
     <string name="settings_announcements_distance_frequency">Інтервал відстаней</string>
     <string name="settings_announcements_totaltime_frequency">Часовий інтервал</string>
-    <string name="settings_recording_idle_speed_title">Поріг холостого ходу</string>
     <string name="settings_running_sensor">Рухомий</string>
     <string name="settings_generic_sensor">Загальний</string>
     <string name="settings_layout_reset_confirm_title">Скинути ваші макети\?</string>
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
index 3a02460c0..0368129a2 100644
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@@ -469,7 +469,6 @@ limitations under the License.
     <string name="settings_import_section">Nhập</string>
     <string name="settings_export_section">Xuất</string>
     <string name="settings_generic_sensor">Chung chung</string>
-    <string name="settings_recording_idle_speed_title">Tốc độ ngưỡng</string>
     <string name="value_float_mile_hour">%1$.1f mi/h</string>
     <string name="value_float_mile_hour_recommended">%1$.1f mi/h (khuyến khích)</string>
     <string name="value_float_kilometer_hour">%1$.1f km/h</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 465ab77a5..6d4f84db4 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -366,7 +366,6 @@ limitations under the License.
     <string name="settings_recording_track_name_date_local_option">日期 (當地)</string>
     <string name="settings_recording_track_name_number_option">數字</string>
     <string name="settings_recording_track_name_title">預設蹤跡名稱</string>
-    <string name="settings_recording_idle_speed_title">怠速閾值</string>
     <string name="settings_night_mode_title">界面主題</string>
     <string name="settings_night_mode_option_system">系統</string>
     <string name="settings_night_mode_option_day">日</string>
diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index 6d5a1a870..e89b5cc8b 100644
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -430,7 +430,6 @@ limitations under the License.
 \n 方法二：通过一个正常的地图应用（例如 <a href="http://osmand.net/">OsmAnd</a> 和 <a href="https://maps.me/">MAPS.ME</a>）。这些应用需要支持 KMZ 文件格式（只包含位置和时间戳）。事实上，应用需要支持 <i>application/vnd.google-earth.kmz</i> MIME 类型的 <i>ACTION_VIEW</i> 操作。 </string>
     <string name="export_progress_summary_errors_msg">错误</string>
     <string name="permission_gps_failed">OpenTracks 需要使用 GPS 的权限。</string>
-    <string name="settings_recording_idle_speed_title">静止速度阈值</string>
     <string name="custom_layout_list_title">布局</string>
     <string name="image_discard">丢弃</string>
     <string name="import_thread_interrupted">线程被中断</string>
diff --git a/src/main/res/values/settings.xml b/src/main/res/values/settings.xml
index 95ea4ecc1..f35f4499e 100644
--- a/src/main/res/values/settings.xml
+++ b/src/main/res/values/settings.xml
@@ -123,19 +123,16 @@
         <item>@string/recording_gps_accuracy_poor</item>
     </string-array>
 
-    <string name="idle_speed_key" translatable="false">idleSpeed</string>
-    <string name="idle_speed_default" translatable="false">0.5</string>
-    <string-array name="idle_speed_values">
-        <item>0.3</item>
-        <item>@string/idle_speed_default</item>
-        <item>1</item>
-        <item>1.5</item>
-        <item>2</item>
-        <item>2.5</item>
-        <item>3</item>
-        <item>3.5</item>
-        <item>4</item>
+    <string name="idle_duration_key" translatable="false">idleSpeedDuration</string>
+    <string name="idle_duration_default" translatable="false">10</string>
+    <string-array name="idle_duration_values">
         <item>5</item>
+        <item>@string/idle_duration_default</item>
+        <item>15</item>
+        <item>30</item>
+        <item>45</item>
+        <item>60</item>
+        <item>120</item>
     </string-array>
 
     <string name="stats_rate_key" translatable="false">statsRate</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 15c7eade2..7cfc91654 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -395,7 +395,7 @@ limitations under the License.
     <string name="settings_recording_track_name_date_local_option">Date (local)</string>
     <string name="settings_recording_track_name_number_option">Number</string>
     <string name="settings_recording_track_name_title">Default track name</string>
-    <string name="settings_recording_idle_speed_title">Idle speed threshold</string>
+    <string name="settings_recording_idle_timeout_title">Idle threshold</string>
     <string name="settings_night_mode_title">UI Theme</string>
     <string name="settings_night_mode_option_system">System</string>
     <string name="settings_night_mode_option_day">Day</string>
@@ -557,6 +557,7 @@ limitations under the License.
     <string name="value_none">None</string>
     <string name="value_off">Off</string>
     <string name="value_smallest_recommended">Smallest (recommended)</string>
+    <string name="value_int_seconds">%1$d s (recommended)</string>
     <string name="voiceHoursPlural">
         {n, plural,
         =1 {1 hour}
diff --git a/src/main/res/xml/settings_gps.xml b/src/main/res/xml/settings_gps.xml
index 979d0ac24..6e4bba356 100644
--- a/src/main/res/xml/settings_gps.xml
+++ b/src/main/res/xml/settings_gps.xml
@@ -29,10 +29,10 @@
         android:title="@string/settings_recording_min_required_accuracy_title" />
 
     <ListPreference
-        android:defaultValue="@string/idle_speed_default"
-        android:entryValues="@array/idle_speed_values"
-        android:key="@string/idle_speed_key"
-        android:title="@string/settings_recording_idle_speed_title"
+        android:defaultValue="@string/idle_duration_default"
+        android:entryValues="@array/idle_duration_values"
+        android:key="@string/idle_duration_key"
+        android:title="@string/settings_recording_idle_timeout_title"
         app:useSimpleSummaryProvider="true" />
 
 </PreferenceScreen>
\ No newline at end of file