diff --git a/MyTracks/res/values-ca/strings.xml b/MyTracks/res/values-ca/strings.xml
index f3e64486f..7e4c9930d 100644
--- a/MyTracks/res/values-ca/strings.xml
+++ b/MyTracks/res/values-ca/strings.xml
@@ -183,17 +183,17 @@ limitations under the License.
   <string name="settings_min_required_accuracy">Precisió mínima</string>
   <string name="settings_min_required_accuracy_summary">S\'aturarà l\'enregistrament si la vostra posició no és així de precisa com a mínim</string>
 
-  <string name="settings_metric_units">Fes servir unitats mètriques</string>
-  <string name="settings_metric_units_summary_on">Totes les distàncies es mostraran en unitats mètriques</string>
-  <string name="settings_metric_units_summary_off">Totes les distàncies es mostraran en unitats imperials</string>
+  <string name="settings_display_metric">Fes servir unitats mètriques</string>
+  <string name="settings_display_metric_summary_on">Totes les distàncies es mostraran en unitats mètriques</string>
+  <string name="settings_display_metric_summary_off">Totes les distàncies es mostraran en unitats imperials</string>
 
   <string name="settings_map_public">Fes el mapa públic</string>
   <string name="settings_map_public_summary_on">Els mapes pujats seran visibles per tothom a maps.google.com</string>
   <string name="settings_map_public_summary_off">Els mapes pujats no es llistaran públicament a maps.google.com</string>
 
-  <string name="settings_report_speed_or_pace">Mostra la velocitat</string>
-  <string name="settings_report_speed_or_pace_summary_on">Es mostrarà la velocitat</string>
-  <string name="settings_report_speed_or_pace_summary_off">Es mostrarà el ritme de pas</string>
+  <string name="settings_display_speed">Mostra la velocitat</string>
+  <string name="settings_display_speed_summary_on">Es mostrarà la velocitat</string>
+  <string name="settings_display_speed_summary_off">Es mostrarà el ritme de pas</string>
 
   <string name="settings_share_url_only">Comparteix només l\'URL</string>
   <string name="settings_share_url_only_summary_on">Només s\'enviarà l\'URL del mapa quan es comparteixi</string>
diff --git a/MyTracks/res/values-de/strings.xml b/MyTracks/res/values-de/strings.xml
index 38d21777a..d40907deb 100644
--- a/MyTracks/res/values-de/strings.xml
+++ b/MyTracks/res/values-de/strings.xml
@@ -186,17 +186,17 @@ limitations under the License.
   <string name="settings_min_required_accuracy">Aufzeichnung pausieren, wenn Genauigkeit kleiner als</string>
   <string name="settings_min_required_accuracy_summary">Die Aufzeichnung wird kurzfristig angehalten, wenn Deine Position nicht genauer als hier angegeben ermittelt werden kann.</string>
 
-  <string name="settings_metric_units">Entfernungen in metrischen Einheiten anzeigen</string>
-  <string name="settings_metric_units_summary_on">Alle Entfernungen werden in metrischen Einheiten angezeigt.</string>
-  <string name="settings_metric_units_summary_off">Alle Entfernungen werden in imperialen Längeneinheiten angezeigt.</string>
+  <string name="settings_display_metric">Entfernungen in metrischen Einheiten anzeigen</string>
+  <string name="settings_display_metric_summary_on">Alle Entfernungen werden in metrischen Einheiten angezeigt.</string>
+  <string name="settings_display_metric_summary_off">Alle Entfernungen werden in imperialen Längeneinheiten angezeigt.</string>
 
   <string name="settings_map_public">Karten auf maps.google.com veröffentlichen</string>
   <string name="settings_map_public_summary_on">Hochgeladene Karten auf maps.google.com sind für alle sichtbar.</string>
   <string name="settings_map_public_summary_off">Hochgeladene Karten auf maps.google.com werden nicht öffentlich sichtbar aufgelistet.</string>
 
-  <string name="settings_report_speed_or_pace">Geschwindigkeitsanzeige</string>
-  <string name="settings_report_speed_or_pace_summary_on">Geschwindigkeit wird angezeigt.</string>
-  <string name="settings_report_speed_or_pace_summary_off">Pace wird angezeigt.</string>
+  <string name="settings_display_speed">Geschwindigkeitsanzeige</string>
+  <string name="settings_display_speed_summary_on">Geschwindigkeit wird angezeigt.</string>
+  <string name="settings_display_speed_summary_off">Pace wird angezeigt.</string>
 
   <string name="settings_share_url_only">Nur URL als Einladung zum Teilen senden</string>
   <string name="settings_share_url_only_summary_on">Beim Teilen mit Freunden wird nur die Karten-URL gesendet.</string>
diff --git a/MyTracks/res/values-es-rES/strings.xml b/MyTracks/res/values-es-rES/strings.xml
index 747d5f654..868e29b1c 100644
--- a/MyTracks/res/values-es-rES/strings.xml
+++ b/MyTracks/res/values-es-rES/strings.xml
@@ -58,7 +58,7 @@ limitations under the License.
   <string name="settings_announcement_frequency_not_available">No está disponible en su versión de Android</string>
 
 
-  <string name="settings_report_speed_or_pace">Mostrar velocidad</string>
+  <string name="settings_display_speed">Mostrar velocidad</string>
 
   <!-- Backups -->
 
diff --git a/MyTracks/res/values-es/strings.xml b/MyTracks/res/values-es/strings.xml
index 8fcd0c106..79106bc15 100644
--- a/MyTracks/res/values-es/strings.xml
+++ b/MyTracks/res/values-es/strings.xml
@@ -224,17 +224,17 @@ limitations under the License.
   <string name="settings_min_required_accuracy">Detener la grabación si la precisión es menor a</string>
   <string name="settings_min_required_accuracy_summary">Precisión mínima de ubicación necesaria para continuar grabando pista</string>
 
-  <string name="settings_metric_units">Usar unidades métricas</string>
-  <string name="settings_metric_units_summary_on">Todas las distancias serán mostradas en unidades métricas</string>
-  <string name="settings_metric_units_summary_off">Todas las distancias serán mostradas en unidades británicas</string>
+  <string name="settings_display_metric">Usar unidades métricas</string>
+  <string name="settings_display_metric_summary_on">Todas las distancias serán mostradas en unidades métricas</string>
+  <string name="settings_display_metric_summary_off">Todas las distancias serán mostradas en unidades británicas</string>
 
   <string name="settings_map_public">Hacer mapas en maps.google.com públicos</string>
   <string name="settings_map_public_summary_on">Mapas subidos serán visibles a cualquier persona en maps.google.com</string>
   <string name="settings_map_public_summary_off">Mapas subidos no serán públicos en maps.google.com</string>
 
-  <string name="settings_report_speed_or_pace">Mostrar</string>
-  <string name="settings_report_speed_or_pace_summary_on">La velocidad será mostrada</string>
-  <string name="settings_report_speed_or_pace_summary_off">El paso será mostrado</string>
+  <string name="settings_display_speed">Mostrar</string>
+  <string name="settings_display_speed_summary_on">La velocidad será mostrada</string>
+  <string name="settings_display_speed_summary_off">El paso será mostrado</string>
 
   <string name="settings_share_url_only">Mandar sólo URL como mensaje al compartir</string>
   <string name="settings_share_url_only_summary_on">Sólo el URL del mapa será enviado al compartir</string>
@@ -269,16 +269,16 @@ limitations under the License.
   <string name="bluetooth_sensor_summary">Sensor Bluetooth al que conectar</string>
   <string name="settings_modular_stats_display_title">Pantalla de estadísticas modular</string>
 
-  <string name="settings_track_color_mode">Modo de Recorrido Coloreado</string>
-  <string name="settings_track_color_mode_summary">La forma de colorear el recorrido</string>
+  <string name="settings_display_track_color">Modo de Recorrido Coloreado</string>
+  <string name="settings_display_track_color_summary">La forma de colorear el recorrido</string>
   <string name="settings_track_color_mode_fixed">Fija</string>
   <string name="settings_track_color_mode_dynamic">Dinámica</string>
-  <string name="settings_track_color_mode_fixed_speed_slow">Velocidad Fija Lenta</string>
-  <string name="settings_track_color_mode_fixed_speed_slow_summary">Velocidad máxima considerada lenta</string>
-  <string name="settings_track_color_mode_fixed_speed_medium">Velocidad Fija Media</string>
-  <string name="settings_track_color_mode_fixed_speed_medium_summary">Velocidad máxima considerada media</string>
-  <string name="settings_track_color_mode_dynamic_speed_variation">Variación de velocidad dinámica</string>
-  <string name="settings_track_color_mode_dynamic_speed_variation_summary">% de margen a partir de la velocidad media de movimiento que se considera velocidad media</string>
+  <string name="settings_display_track_color_fixed_slow">Velocidad Fija Lenta</string>
+  <string name="settings_display_track_color_fixed_slow_summary">Velocidad máxima considerada lenta</string>
+  <string name="settings_display_track_color_fixed_medium">Velocidad Fija Media</string>
+  <string name="settings_display_track_color_fixed_medium_summary">Velocidad máxima considerada media</string>
+  <string name="settings_display_track_color_dynamic_medium">Variación de velocidad dinámica</string>
+  <string name="settings_display_track_color_dynamic_medium_summary">% de margen a partir de la velocidad media de movimiento que se considera velocidad media</string>
   
   <!-- Backups -->
   <string name="settings_backup">Copia seguridad (BETA)</string>
@@ -516,7 +516,7 @@ limitations under the License.
   <string name="sensor_type_option_zephyr">Bluetooth Zephyr</string>
 
   <!-- Track Color Modes -->
-  <string name="track_color_mode_option_none">Ninguno</string>
-  <string name="track_color_mode_option_fixed">Fijo (BETA)</string>
-  <string name="track_color_mode_option_dynamic">Dinámico (BETA)</string>
+  <string name="settings_display_track_color_single">Ninguno</string>
+  <string name="settings_display_track_color_fixed">Fijo (BETA)</string>
+  <string name="settings_display_track_color_dynamic">Dinámico (BETA)</string>
 </resources>
diff --git a/MyTracks/res/values-fi/strings.xml b/MyTracks/res/values-fi/strings.xml
index a9ac09efd..e663cf9d5 100644
--- a/MyTracks/res/values-fi/strings.xml
+++ b/MyTracks/res/values-fi/strings.xml
@@ -216,17 +216,17 @@ limitations under the License.
   <string name="settings_min_required_accuracy">Sallittu tarkkuus</string>
   <string name="settings_min_required_accuracy_summary">Reitin tallennus pysäytetään, jos tarkkuus on tätä pienempi</string>
 
-  <string name="settings_metric_units">Käytä metrijärjestelmää</string>
-  <string name="settings_metric_units_summary_on">Kaikki etäisyydet näytetään metrijärjestelmässä</string>
-  <string name="settings_metric_units_summary_off">Kaikki etäisyydet näytetään U.S yksiköitä käyttäen</string>
+  <string name="settings_display_metric">Käytä metrijärjestelmää</string>
+  <string name="settings_display_metric_summary_on">Kaikki etäisyydet näytetään metrijärjestelmässä</string>
+  <string name="settings_display_metric_summary_off">Kaikki etäisyydet näytetään U.S yksiköitä käyttäen</string>
 
   <string name="settings_map_public">Aseta kartat julkisiksi</string>
   <string name="settings_map_public_summary_on">Lähetetyt kartat näkyvät kaikille osoitteessa maps.google.com</string>
   <string name="settings_map_public_summary_off">Lähetettyjä karttoja ei näytetä julkisesti osoitteessa maps.google.com</string>
 
-  <string name="settings_report_speed_or_pace">Näytä nopeus</string>
-  <string name="settings_report_speed_or_pace_summary_on">Nopeus näytetään</string>
-  <string name="settings_report_speed_or_pace_summary_off">Tahti näytetään</string>
+  <string name="settings_display_speed">Näytä nopeus</string>
+  <string name="settings_display_speed_summary_on">Nopeus näytetään</string>
+  <string name="settings_display_speed_summary_off">Tahti näytetään</string>
 
   <string name="settings_share_url_only">Jaa vain URL</string>
   <string name="settings_share_url_only_summary_on">Ainoastaan kartan URL jaetaan</string>
diff --git a/MyTracks/res/values-fr/strings.xml b/MyTracks/res/values-fr/strings.xml
index 908ebc33b..8a96d0407 100644
--- a/MyTracks/res/values-fr/strings.xml
+++ b/MyTracks/res/values-fr/strings.xml
@@ -174,17 +174,17 @@ limitations under the License.
   <string name="settings_min_required_accuracy">Précision minimum</string>
   <string name="settings_min_required_accuracy_summary">L\'enregistrement sera suspendu si la géolocalisation est moins précise</string>
 
-  <string name="settings_metric_units">Système métrique</string>
-  <string name="settings_metric_units_summary_on">Le système métrique sera utilisé pour l\'affichage des distances</string>
-  <string name="settings_metric_units_summary_off">Le système impérial sera utilisé pour l\'affichage des distances</string>
+  <string name="settings_display_metric">Système métrique</string>
+  <string name="settings_display_metric_summary_on">Le système métrique sera utilisé pour l\'affichage des distances</string>
+  <string name="settings_display_metric_summary_off">Le système impérial sera utilisé pour l\'affichage des distances</string>
 
   <string name="settings_map_public">Cartes publiques</string>
   <string name="settings_map_public_summary_on">Les cartes partagées seront visibles par tout le monde sur maps.google.com</string>
   <string name="settings_map_public_summary_off">Les cartes ne seront pas partagées publiquement sur maps.google.com</string>
 
-  <string name="settings_report_speed_or_pace">Afficher vitesse/rythme</string>
-  <string name="settings_report_speed_or_pace_summary_on">Afficher la vitesse</string>
-  <string name="settings_report_speed_or_pace_summary_off">Afficher le rythme</string>
+  <string name="settings_display_speed">Afficher vitesse/rythme</string>
+  <string name="settings_display_speed_summary_on">Afficher la vitesse</string>
+  <string name="settings_display_speed_summary_off">Afficher le rythme</string>
 
   <string name="settings_share_url_only">Partager URL/parcours</string>
   <string name="settings_share_url_only_summary_on">Seule l\'adresse URL de la carte sera envoyée lors du partage</string>
diff --git a/MyTracks/res/values-it/strings.xml b/MyTracks/res/values-it/strings.xml
index d712abfc2..2f885be88 100644
--- a/MyTracks/res/values-it/strings.xml
+++ b/MyTracks/res/values-it/strings.xml
@@ -177,17 +177,17 @@ limitations under the License.
   <string name="settings_min_required_accuracy">Fai una pausa nella registrazione se l\'accuratezza scende al disotto di:</string>
   <string name="settings_min_required_accuracy_summary">La registrazione verrà temporaneamente interrotta se l\'accuratezza della posizione è meno di questo valore</string>
 
-  <string name="settings_metric_units">Mostra le distanze nel sistema metrico decimale</string>
-  <string name="settings_metric_units_summary_on">Tutte le distanze verranno mostrate nel sistema metrico decimale</string>
-  <string name="settings_metric_units_summary_off">Tutte le distanze saranno mostrate nel sistema imperiale</string>
+  <string name="settings_display_metric">Mostra le distanze nel sistema metrico decimale</string>
+  <string name="settings_display_metric_summary_on">Tutte le distanze verranno mostrate nel sistema metrico decimale</string>
+  <string name="settings_display_metric_summary_off">Tutte le distanze saranno mostrate nel sistema imperiale</string>
 
   <string name="settings_map_public">Rendi pubbliche le mappe su maps.google.com</string>
   <string name="settings_map_public_summary_on">Le mappe inviate a maps.google.com saranno visibili a chiunque</string>
   <string name="settings_map_public_summary_off">Le mappe inviate a maps.google.com non saranno rese pubbliche</string>
 
-  <string name="settings_report_speed_or_pace">Mostra:</string>
-  <string name="settings_report_speed_or_pace_summary_on">Mostrerà la velocità</string>
-  <string name="settings_report_speed_or_pace_summary_off">Mostrerà l\'andatura</string>
+  <string name="settings_display_speed">Mostra:</string>
+  <string name="settings_display_speed_summary_on">Mostrerà la velocità</string>
+  <string name="settings_display_speed_summary_off">Mostrerà l\'andatura</string>
 
   <string name="settings_share_url_only">Invia solo l\'URL nei messaggi di condivisione</string>
   <string name="settings_share_url_only_summary_on">Solo l\'URL della mappa sarà inviata quando condividi un percorso</string>
diff --git a/MyTracks/res/values-ja/strings.xml b/MyTracks/res/values-ja/strings.xml
index a84ee5355..7661b87fc 100644
--- a/MyTracks/res/values-ja/strings.xml
+++ b/MyTracks/res/values-ja/strings.xml
@@ -208,17 +208,17 @@ limitations under the License.
   <string name="settings_min_required_accuracy">最低精度</string>
   <string name="settings_min_required_accuracy_summary">この精度以上でないと記録を休止します</string>
 
-  <string name="settings_metric_units">メートル法を使用</string>
-  <string name="settings_metric_units_summary_on">全ての距離をメートル法で表示します</string>
-  <string name="settings_metric_units_summary_off">全ての距離をヤード・ポンド法で表示します</string>
+  <string name="settings_display_metric">メートル法を使用</string>
+  <string name="settings_display_metric_summary_on">全ての距離をメートル法で表示します</string>
+  <string name="settings_display_metric_summary_off">全ての距離をヤード・ポンド法で表示します</string>
 
   <string name="settings_map_public">マップの公開</string>
   <string name="settings_map_public_summary_on">アップロードされたマップはmaps.google.comで誰でも閲覧できます</string>
   <string name="settings_map_public_summary_off">アップロードされたマップはmaps.google.comのリストに公開されません</string>
 
-  <string name="settings_report_speed_or_pace">速度表示</string>
-  <string name="settings_report_speed_or_pace_summary_on">速度が表示されます</string>
-  <string name="settings_report_speed_or_pace_summary_off">ペースが表示されます</string>
+  <string name="settings_display_speed">速度表示</string>
+  <string name="settings_display_speed_summary_on">速度が表示されます</string>
+  <string name="settings_display_speed_summary_off">ペースが表示されます</string>
 
   <string name="settings_share_url_only">URLのみ共有</string>
   <string name="settings_share_url_only_summary_on">共有時にマップのURLのみ送信します</string>
diff --git a/MyTracks/res/values-pl/strings.xml b/MyTracks/res/values-pl/strings.xml
index 9430a30c1..876a3539d 100644
--- a/MyTracks/res/values-pl/strings.xml
+++ b/MyTracks/res/values-pl/strings.xml
@@ -180,17 +180,17 @@ limitations under the License.
   <string name="settings_min_required_accuracy">Minimalna dokładność</string>
   <string name="settings_min_required_accuracy_summary">Zapis zostanie zatrzymany jeśli twoja pozycja jest mniej dokładana niż ta wartość</string>
 
-  <string name="settings_metric_units">Używaj jednostek metrycznych</string>
-  <string name="settings_metric_units_summary_on">Wszystkie odległości będą wyświetlane w jednostkach metrycznych</string>
-  <string name="settings_metric_units_summary_off">Wszystkie odległości będą wyświetlane w jednostkach imperialnych</string>
+  <string name="settings_display_metric">Używaj jednostek metrycznych</string>
+  <string name="settings_display_metric_summary_on">Wszystkie odległości będą wyświetlane w jednostkach metrycznych</string>
+  <string name="settings_display_metric_summary_off">Wszystkie odległości będą wyświetlane w jednostkach imperialnych</string>
 
   <string name="settings_map_public">Ustaw mapy jako publiczne</string>
   <string name="settings_map_public_summary_on">Przesłane mapy będą dostępne dla wszystkich na maps.google.com</string>
   <string name="settings_map_public_summary_off">Przesłane mapy nie będą dostępne publicznie na maps.google.com</string>
 
-  <string name="settings_report_speed_or_pace">Wyświetlanie prędkości</string>
-  <string name="settings_report_speed_or_pace_summary_on">Prędkość będzie wyświetlana</string>
-  <string name="settings_report_speed_or_pace_summary_off">Tempo będzie wyświetlane</string>
+  <string name="settings_display_speed">Wyświetlanie prędkości</string>
+  <string name="settings_display_speed_summary_on">Prędkość będzie wyświetlana</string>
+  <string name="settings_display_speed_summary_off">Tempo będzie wyświetlane</string>
 
   <string name="settings_share_url_only">Dziel się tylko odnośnikiem</string>
   <string name="settings_share_url_only_summary_on">Tylko odnośnik do mapy będzie wysyłany podczas dzielenia się</string>
diff --git a/MyTracks/res/values-pt-rBR/strings.xml b/MyTracks/res/values-pt-rBR/strings.xml
index c5b49f029..7a538732c 100644
--- a/MyTracks/res/values-pt-rBR/strings.xml
+++ b/MyTracks/res/values-pt-rBR/strings.xml
@@ -170,15 +170,15 @@ limitations under the License.
   <string name="settings_min_recording_interval_summary">Menor intervalo de tempo entre a gravação de dois pontos</string>
   <string name="settings_min_required_accuracy">Precisão mínima</string>
   <string name="settings_min_required_accuracy_summary">A gravação será interrompida enquanto a precisão da sua posição for menor que esta</string>
-  <string name="settings_metric_units">Unidades métricas</string>
-  <string name="settings_metric_units_summary_on">Todas as distâncias serão exibidas em unidades métricas</string>
-  <string name="settings_metric_units_summary_off">Todas as distâncias serão exibidas em unidades imperiais</string>
+  <string name="settings_display_metric">Unidades métricas</string>
+  <string name="settings_display_metric_summary_on">Todas as distâncias serão exibidas em unidades métricas</string>
+  <string name="settings_display_metric_summary_off">Todas as distâncias serão exibidas em unidades imperiais</string>
   <string name="settings_map_public">Tornar mapas públicos</string>
   <string name="settings_map_public_summary_on">Os mapas enviados ao maps.google.com serão visíveis por qualquer pessoa</string>
   <string name="settings_map_public_summary_off">Os mapas enviados ao maps.google.com não serão listados publicamente</string>
-  <string name="settings_report_speed_or_pace">Exibir velocidade</string>
-  <string name="settings_report_speed_or_pace_summary_on">A velocidade será exibida</string>
-  <string name="settings_report_speed_or_pace_summary_off">O passo será exibido</string>
+  <string name="settings_display_speed">Exibir velocidade</string>
+  <string name="settings_display_speed_summary_on">A velocidade será exibida</string>
+  <string name="settings_display_speed_summary_off">O passo será exibido</string>
   <string name="settings_share_url_only">Compartilhar apenas URL</string>
   <string name="settings_share_url_only_summary_on">Apenas a URL do mapa será enviada ao compartilhar</string>
   <string name="settings_share_url_only_summary_off">O conteúdo do mapa também será incluído ao compartilhar</string>
diff --git a/MyTracks/res/values-ru/strings.xml b/MyTracks/res/values-ru/strings.xml
index e9d354eae..3bbf874ea 100644
--- a/MyTracks/res/values-ru/strings.xml
+++ b/MyTracks/res/values-ru/strings.xml
@@ -212,17 +212,17 @@ limitations under the License.
   <string name="settings_min_required_accuracy">Минимальная точность</string>
   <string name="settings_min_required_accuracy_summary">Запись будет приостановлена, если ваша позиция не является достаточно точной</string>
 
-  <string name="settings_metric_units">Использовать метрические единицы</string>
-  <string name="settings_metric_units_summary_on">Все расстояния будут отображаться в метрических единицах</string>
-  <string name="settings_metric_units_summary_off">Все расстояния будут отображаться в имперских единицах</string>
+  <string name="settings_display_metric">Использовать метрические единицы</string>
+  <string name="settings_display_metric_summary_on">Все расстояния будут отображаться в метрических единицах</string>
+  <string name="settings_display_metric_summary_off">Все расстояния будут отображаться в имперских единицах</string>
 
   <string name="settings_map_public">Обнародовать карты</string>
   <string name="settings_map_public_summary_on">Загруженные карты будут общедоступны на maps.google.com</string>
   <string name="settings_map_public_summary_off">Загруженные карты не будут перечислены публично на maps.google.com</string>
 
-  <string name="settings_report_speed_or_pace">Отображать скорость</string>
-  <string name="settings_report_speed_or_pace_summary_on">Скорость будет отображаться</string>
-  <string name="settings_report_speed_or_pace_summary_off">Темп будет отображаться</string>
+  <string name="settings_display_speed">Отображать скорость</string>
+  <string name="settings_display_speed_summary_on">Скорость будет отображаться</string>
+  <string name="settings_display_speed_summary_off">Темп будет отображаться</string>
 
   <string name="settings_share_url_only">Поделиться только URL</string>
   <string name="settings_share_url_only_summary_on">При обмене будет отправлен только URL-адрес</string>
diff --git a/MyTracks/res/values-sv/strings.xml b/MyTracks/res/values-sv/strings.xml
index efff5b519..aac8938e9 100644
--- a/MyTracks/res/values-sv/strings.xml
+++ b/MyTracks/res/values-sv/strings.xml
@@ -180,17 +180,17 @@ limitations under the License.
   <string name="settings_min_required_accuracy">Minsta precision</string>
   <string name="settings_min_required_accuracy_summary">Inspelningen kommer att pausas om din position inte är minst så här precis</string>
 
-  <string name="settings_metric_units">Använd metersystemet</string>
-  <string name="settings_metric_units_summary_on">Alla distanser kommer att visas i metriska enheter</string>
-  <string name="settings_metric_units_summary_off">Alla distanser kommer att visas i brittiska enheter</string>
+  <string name="settings_display_metric">Använd metersystemet</string>
+  <string name="settings_display_metric_summary_on">Alla distanser kommer att visas i metriska enheter</string>
+  <string name="settings_display_metric_summary_off">Alla distanser kommer att visas i brittiska enheter</string>
 
   <string name="settings_map_public">Gör kartor offentliga</string>
   <string name="settings_map_public_summary_on">Uppladdade kartor kommer att vara synliga för alla på maps.google.com</string>
   <string name="settings_map_public_summary_off">Uppladdade kartor kommer inte att visas offentligt på maps.google.com</string>
 
-  <string name="settings_report_speed_or_pace">Visa hastighet</string>
-  <string name="settings_report_speed_or_pace_summary_on">Hastighet kommer att visas</string>
-  <string name="settings_report_speed_or_pace_summary_off">Tempo kommer att visas</string>
+  <string name="settings_display_speed">Visa hastighet</string>
+  <string name="settings_display_speed_summary_on">Hastighet kommer att visas</string>
+  <string name="settings_display_speed_summary_off">Tempo kommer att visas</string>
 
   <string name="settings_share_url_only">Dela bara länk</string>
   <string name="settings_share_url_only_summary_on">Bara länken till kartan kommer att skickas vid delning</string>
diff --git a/MyTracks/res/values-zh-rCN/strings.xml b/MyTracks/res/values-zh-rCN/strings.xml
index 283514e69..99e204a45 100644
--- a/MyTracks/res/values-zh-rCN/strings.xml
+++ b/MyTracks/res/values-zh-rCN/strings.xml
@@ -213,17 +213,17 @@ limitations under the License.
   <string name="settings_min_required_accuracy">最小精度</string>
   <string name="settings_min_required_accuracy_summary">如果位置信息达不到此精度, 记录将被暂停</string>
 
-  <string name="settings_metric_units">使用公制单位</string>
-  <string name="settings_metric_units_summary_on">所有的距离都将以公制单位显示</string>
-  <string name="settings_metric_units_summary_off">所有的距离都将以英制单位显示</string>
+  <string name="settings_display_metric">使用公制单位</string>
+  <string name="settings_display_metric_summary_on">所有的距离都将以公制单位显示</string>
+  <string name="settings_display_metric_summary_off">所有的距离都将以英制单位显示</string>
 
   <string name="settings_map_public">公开地图</string>
   <string name="settings_map_public_summary_on">上传的地图将对所有 maps.google.com 访问者可见</string>
   <string name="settings_map_public_summary_off">上传的地图不会在 maps.google.com 上公开</string>
 
-  <string name="settings_report_speed_or_pace">显示速度</string>
-  <string name="settings_report_speed_or_pace_summary_on">显示速度信息</string>
-  <string name="settings_report_speed_or_pace_summary_off">显示步速</string>
+  <string name="settings_display_speed">显示速度</string>
+  <string name="settings_display_speed_summary_on">显示速度信息</string>
+  <string name="settings_display_speed_summary_off">显示步速</string>
 
   <string name="settings_share_url_only">只分享 URL</string>
   <string name="settings_share_url_only_summary_on">在分享时只发送地图的 URL</string>
diff --git a/MyTracks/res/values/arrays_do_not_translate.xml b/MyTracks/res/values/arrays_do_not_translate.xml
index 3a5f7c9c9..94adbbdbb 100644
--- a/MyTracks/res/values/arrays_do_not_translate.xml
+++ b/MyTracks/res/values/arrays_do_not_translate.xml
@@ -19,9 +19,9 @@ limitations under the License.
   
   <!-- Display settings -->
   <string-array name="track_color_mode_options">
-    <item>@string/track_color_mode_option_none</item>
-    <item>@string/track_color_mode_option_fixed</item>
-    <item>@string/track_color_mode_option_dynamic</item>
+    <item>@string/settings_display_track_color_single</item>
+    <item>@string/settings_display_track_color_fixed</item>
+    <item>@string/settings_display_track_color_dynamic</item>
   </string-array>
 
   <string-array name="track_color_mode_values">
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index e2b6a0e3b..1c4a8b43a 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -284,6 +284,145 @@ limitations under the License.
     (Part %d)
   </string>
   
+  <!-- Settings -->
+  <string name="settings_backup"
+    translation_description="In the Settings page, the option to change the data backup related
+      settings."> 
+    Backup
+  </string>
+  <string name="settings_display"
+    translation_description="In the Settings page, the option to change the display related
+      settings.">  
+    Display
+  </string> 
+  <string name="settings_display_metric"
+    translation_description="In the Display settings, the checkbox option to use the metric units.">
+    Use metric units
+  </string>
+  <string name="settings_display_metric_summary_off"
+    translation_description="In the Display settings, the summary for the 'Use metric units'
+      checkbox when it is unchecked explaining using the imperial units to display distances.">
+    Use imperial units to display distances
+  </string>
+  <string name="settings_display_metric_summary_on"
+    translation_description="In the Display settings, the summary for the 'Use metric units'
+      checkbox when it is checked explaining using the metric units to display distances.">
+    Use metric units to display distances
+  </string>
+  <string name="settings_display_speed"
+    translation_description="In the Display settings, the checkbox option to display speed (e.g., 5
+      miles per hour) instead of pace (e.g., 0.2 hours per mile).">  
+    Display speed
+  </string>
+  <string name="settings_display_speed_summary_off"
+    translation_description="In the Display settings, the summary for the 'Display speed' checkbox
+      when it is unchecked explaining that pace (e.g., 0.2 hours per mile) will be used instead of
+      speed (e.g., 5 miles per hour).">  
+    Display pace (e.g., hours/mile)
+  </string>
+  <string name="settings_display_speed_summary_on"
+    translation_description="In the Display settings, the summary for the 'Display speed' checkbox
+      when it is checked explaining that speed (e.g., 5 miles per hour) will be used instead of pace
+      (e.g., 0.2 hours per mile).">  
+    Display speed (e.g., miles/hour)
+  </string>
+  <string name="settings_display_track_color"
+    translation_description="In the Display settings, the dropdown option to choose a track color
+      mode for how to use different colors to color a track based on speed.">
+    Track color mode
+  </string>  
+  <string name="settings_display_track_color_dynamic"
+    translation_description="In the Display settings, for the 'Track color mode' dropdown, the
+      option to use different colors to color a track based on dynamically determined speed 
+      thresholds. E.g., use one color for segments where the speed is below the average speed of the
+      track.">
+    Dynamic Thresholds
+  </string>
+  <string name="settings_display_track_color_dynamic_medium"
+    translation_description="In the Display settings, under the 'Dynamic Thresholds' configurations,
+      the option for configuring the medium speed range. The track color mode will use different
+      colors to color a track depending on whether the speed is above, in, or below the medium speed
+      range.">
+    Medium speed range
+  </string>
+  <string name="settings_display_track_color_dynamic_medium_summary"
+    translation_description="In the Display settings, under the 'Dynamic Thresholds' configurations,
+      the summary for the 'Medium speed range' option explaining that it sets a percentage from the
+      average speed to determine the medium speed range. The track color mode will use different
+      colors to color a track depending on whether the speed is above, in, or below the medium speed
+      range.">
+    Percentage from the average speed for the medium speed range
+  </string>   
+  <string name="settings_display_track_color_fixed"
+    translation_description="In the Display settings, for the 'Track color mode' dropdown, the
+      option to use different colors to color a track based on fixed speed thresholds. E.g., use
+      one color for segments where the speed is below a fixed speed threshold.">
+    Fixed Thresholds
+  </string>
+  <string name="settings_display_track_color_fixed_medium"
+    translation_description="In the Display settings, under the 'Fixed Thresholds' configurations,
+      the option for configuring the medium speed threshold. Thus any speed lower than the
+      threshold but greater than the slow speed threshold will be colored by the medium speed
+      color.">
+    Medium speed threshold
+  </string>
+  <string name="settings_display_track_color_fixed_medium_summary"
+    translation_description="In the Display settings, under the 'Fixed Thresholds' configurations,
+      the summary for the 'Medium speed threshold' option explaining that it sets a cutoff speed
+      for the medium speed color.">
+    Medium speed top value
+  </string> 
+  <string name="settings_display_track_color_fixed_slow"
+    translation_description="In the Display settings, under the 'Fixed Thresholds' configurations,
+      the option for configuring the slow speed threshold. Thus any speed lower than the threshold
+      will be colored by the slow speed color.">
+    Slow speed threshold
+  </string>
+  <string name="settings_display_track_color_fixed_slow_summary"
+    translation_description="In the Display settings, under the 'Fixed Thresholds' configurations,
+      the summary for the 'Slow speed threshold' option explaining that it sets a cutoff speed for
+      the slow speed color.">
+    Slow speed top value
+  </string>      
+  <string name="settings_display_track_color_single"
+    translation_description="In the Display settings, for the 'Track color mode' dropdown, the
+      option to only use a single color to color a track.">
+    Single Color
+  </string>
+  <string name="settings_display_track_color_summary"
+    translation_description="In the Display settings, the summary for the 'Track color mode'
+      dropdown explaining that it configures how colors are used to color a track based on speed.">
+    The way to color a track based on speed
+  </string>
+  <string name="settings_recording"
+    translation_description="In the Settings page, the option to change the track recording related
+      settings.">  
+    Recording
+  </string>
+  <string name="settings_reset"
+    translation_description="In the Settings page, the option to reset everything to the defaults."> 
+    Reset to defaults
+  </string>
+  <string name="settings_reset_summary"
+    translation_description="In the Settings page, the summary for the 'Reset to defaults'
+      option explaining reverting all the settings to the default values."> 
+    Revert all your settings to the default values
+  </string>
+  <string name="settings_sensor"
+    translation_description="In the Settings page, the option to change the sensor related
+      settings.">
+    Sensor
+  </string>
+  <string name="settings_sharing"
+    translation_description="In the Settings page, the option to change the track sharing related
+      settings.">   
+    Sharing
+  </string>
+  <string name="settings_title"
+    translation_description="The title of the Settings page.">  
+    My Tracks Settings
+  </string>
+       
   <!-- Track -->
   <string name="track_detail_activity_type"
     translation_description="In the detail page for a track, the text field for the activity type,
@@ -751,123 +890,7 @@ limitations under the License.
     Import error for file %s
   </string>
 
-  <!-- Settings page -->
-  <string name="settings_title"
-    translation_description="The title of the Settings page.">  
-    My Tracks Settings
-  </string>
-  <string name="settings_display"
-    translation_description="In the Settings page, the option to change the display related
-      settings.">  
-    Display
-  </string>
-  <string name="settings_recording"
-    translation_description="In the Settings page, the option to change the track recording related
-      settings.">  
-    Recording
-  </string>
-  <string name="settings_sensor"
-    translation_description="In the Settings page, the option to change the sensor related
-      settings.">
-    Sensor
-  </string>
-  <string name="settings_sharing"
-    translation_description="In the Settings page, the option to change the track sharing related
-      settings.">   
-    Sharing
-  </string>
-  <string name="settings_backup"
-    translation_description="In the Settings page, the option to change the data backup related
-      settings."> 
-    Backup
-  </string>
-  <string name="settings_reset"
-    translation_description="In the Settings page, the option to reset everything to defaults."> 
-    Reset to defaults
-  </string>
-  <string name="settings_reset_summary"
-    translation_description="In the Settings page, the summary for the 'Reset to defaults'
-      option explaining reverting all the settings to the default values."> 
-    Revert all your settings to the default values
-  </string>
-  
-  <!--  Display settings -->
-  <string name="settings_metric_units"
-    translation_description="In the Display settings, the checkbox option to use the metrics units."
-      >
-    Use metric units
-  </string>
-  <string name="settings_metric_units_summary_on"
-    translation_description="In the Display settings, the summary for the 'Use metric units'
-      checkbox when it is checked explaining using the metrics units to display distances.">
-    Use metrics units to display distances
-  </string>
-  <string name="settings_metric_units_summary_off"
-    translation_description="In the Display settings, the summary for the 'Use metrics units'
-      checkbox when it is unchecked explaining using the imperial units to display distances.">
-    Use imperial units to display distances
-  </string>
-  <string name="settings_report_speed_or_pace"
-    translation_description="In the Display settings, the checkbox option to display speed (e.g., 5
-      miles per hour) instead of pace (e.g., 0.2 hours per mile).">  
-    Display speed
-  </string>
-  <string name="settings_report_speed_or_pace_summary_on"
-    translation_description="In the Display settings, the summary for the 'Display speed' checkbox
-      when it is checked explaining that speed (e.g., 5 miles per hour) will be used instead of pace
-      (e.g., 0.2 hours per mile).">  
-    Display speed (e.g., miles/hour)
-  </string>
-  <string name="settings_report_speed_or_pace_summary_off"
-    translation_description="In the Display settings, the summary for the 'Display speed' checkbox
-      when it is unchecked explaining that pace (e.g., 0.2 hours per mile) will be used instead of
-      speed (e.g., 5 miles per hour).">  
-    Display pace (e.g., hours/mile)
-  </string>
-  <string name="settings_track_color_mode"
-    translation_description="In the Display settings, the dropdown option to choose a track color
-      mode for how to use different colors to color a track based on speed.">
-    Track color mode
-  </string>
-  <string name="settings_track_color_mode_summary"
-    translation_description="In the Display settings, the summary for the 'Track color mode'
-      dropdown option explaining that it configures how colors are used to color a track based on
-      speed."
-      >
-    The way to color a track based on speed
-  </string>    
-  <string name="settings_track_color_mode_fixed_speed_slow"
-    translation_description="In the Display settings, the option for configuring the slow speed
-      threshold. Thus any speed lower than the threshold will be colored by the slow speed color.">
-    Slow speed threshold
-  </string>
-  <string name="settings_track_color_mode_fixed_speed_slow_summary"
-    translation_description="In the Display settings, the summary for the 'Slow speed threshold'
-      option explaining that it sets a cutoff speed for the slow speed color.">
-    Slow speed top value
-  </string>
-  <string name="settings_track_color_mode_fixed_speed_medium"
-    translation_description="In the Display settings, the option for configuring the medium speed
-      threshold. Thus any speed lower than the threshold but greater than the slow speed threshold
-      will be colored by the medium speed color.">
-    Medium speed threshold
-  </string>
-  <string name="settings_track_color_mode_fixed_speed_medium_summary"
-    translation_description="In the Display settings, the summary for the 'Medium speed threshold'
-      option explaining that it sets a cutoff speed for the medium speed color.">
-    Medium speed top value
-  </string> 
-  <string name="settings_track_color_mode_dynamic_speed_variation"
-    translation_description="In the Display settings, the option for configuring the dynamic
-      speed threshold for using colors to color a track based on speed.">
-    Medium speed range
-  </string>
-  <string name="settings_track_color_mode_dynamic_speed_variation_summary"
-    translation_description="In the Display settings, the summary for the 'Medium speed range'
-      option explaining that it sets a percentage from the average speed to determine the
-      medium speed range for using colors to color a track based on speed.">
-    Percentage from the average speed for the medium speed
-  </string>
+ 
   
   <!-- Recording settings -->
   <!-- TODO decide if voice frequency should be under the Recording settings. -->
@@ -1567,22 +1590,5 @@ limitations under the License.
     Zephyr Bluetooth
   </string>
 
-  <!-- Track Color Mode Options -->
-  <string name="track_color_mode_option_none"
-    translation_description="In the Display settings page, for the Track Color Mode picker, the
-        dropdown option to only use one color to color a track.">
-    One Color
-  </string>
-  <string name="track_color_mode_option_fixed"
-    translation_description="In the Display settings page, for the Track Color Mode picker, the 
-        dropdown option to use different colors to color a track based on fixed speed thresholds.">
-    Fixed Thresholds
-  </string>
-  <string name="track_color_mode_option_dynamic"
-    translation_description="In the Display settings page, for the Track Color Mode picker, the
-        dropdown option to use different colors to color a track based on dynamically determined
-        speed thresholds. E.g., use one color for segments where the speed is below the average
-        speed of the track.">
-    Dynamic Thresholds
-  </string>
+
 </resources>
diff --git a/MyTracks/res/xml/preferences.xml b/MyTracks/res/xml/preferences.xml
index 64ef8640f..830e557a1 100644
--- a/MyTracks/res/xml/preferences.xml
+++ b/MyTracks/res/xml/preferences.xml
@@ -21,64 +21,64 @@ limitations under the License.
   <PreferenceScreen android:title="@string/settings_display">
     <CheckBoxPreference
         android:key="@string/metric_units_key"
-        android:title="@string/settings_metric_units"
-        android:summaryOn="@string/settings_metric_units_summary_on"
-        android:summaryOff="@string/settings_metric_units_summary_off"
+        android:title="@string/settings_display_metric"
+        android:summaryOn="@string/settings_display_metric_summary_on"
+        android:summaryOff="@string/settings_display_metric_summary_off"
         android:defaultValue="true" />
 
     <CheckBoxPreference
         android:key="@string/report_speed_key"
-        android:title="@string/settings_report_speed_or_pace"
-        android:summaryOn="@string/settings_report_speed_or_pace_summary_on"
-        android:summaryOff="@string/settings_report_speed_or_pace_summary_off"
+        android:title="@string/settings_display_speed"
+        android:summaryOn="@string/settings_display_speed_summary_on"
+        android:summaryOff="@string/settings_display_speed_summary_off"
         android:defaultValue="true" />
         
     <ListPreference android:key="@string/track_color_mode_key"
-        android:title="@string/settings_track_color_mode"
-        android:summary="@string/settings_track_color_mode_summary"
+        android:title="@string/settings_display_track_color"
+        android:summary="@string/settings_display_track_color_summary"
         android:entries="@array/track_color_mode_options"
         android:entryValues="@array/track_color_mode_values"
         android:defaultValue="@string/track_color_mode_value_none"/>
 
-    <PreferenceCategory android:title="@string/track_color_mode_option_fixed" 
+    <PreferenceCategory android:title="@string/settings_display_track_color_fixed" 
         android:key="@string/track_color_mode_fixed_speed_options_key">
         <EditTextPreference android:key="@string/track_color_mode_fixed_speed_slow_key" 
-            android:title="@string/settings_track_color_mode_fixed_speed_slow" 
-            android:summary="@string/settings_track_color_mode_fixed_speed_slow_summary" 
+            android:title="@string/settings_display_track_color_fixed_slow" 
+            android:summary="@string/settings_display_track_color_fixed_slow_summary" 
             android:defaultValue="9" 
             android:inputType="number"
             android:maxLength="3">
         </EditTextPreference>
         
         <EditTextPreference android:key="@string/track_color_mode_fixed_speed_slow_display_key" 
-            android:title="@string/settings_track_color_mode_fixed_speed_slow" 
-            android:summary="@string/settings_track_color_mode_fixed_speed_slow_summary" 
+            android:title="@string/settings_display_track_color_fixed_slow" 
+            android:summary="@string/settings_display_track_color_fixed_slow_summary" 
             android:defaultValue="9" 
             android:inputType="number"
             android:maxLength="3">
         </EditTextPreference>
         
         <EditTextPreference android:key="@string/track_color_mode_fixed_speed_medium_key" 
-            android:title="@string/settings_track_color_mode_fixed_speed_medium" 
-            android:summary="@string/settings_track_color_mode_fixed_speed_medium_summary" 
+            android:title="@string/settings_display_track_color_fixed_medium" 
+            android:summary="@string/settings_display_track_color_fixed_medium_summary" 
             android:defaultValue="15"
             android:inputType="number"
             android:maxLength="3">
         </EditTextPreference>
         
         <EditTextPreference android:key="@string/track_color_mode_fixed_speed_medium_display_key" 
-            android:title="@string/settings_track_color_mode_fixed_speed_medium" 
-            android:summary="@string/settings_track_color_mode_fixed_speed_medium_summary" 
+            android:title="@string/settings_display_track_color_fixed_medium" 
+            android:summary="@string/settings_display_track_color_fixed_medium_summary" 
             android:defaultValue="15"
             android:inputType="number"
             android:maxLength="3">
         </EditTextPreference>
     </PreferenceCategory>
 
-    <PreferenceCategory android:title="@string/track_color_mode_option_dynamic">
+    <PreferenceCategory android:title="@string/settings_display_track_color_dynamic">
         <EditTextPreference android:key="@string/track_color_mode_dynamic_speed_variation_key" 
-            android:title="@string/settings_track_color_mode_dynamic_speed_variation" 
-            android:summary="@string/settings_track_color_mode_dynamic_speed_variation_summary" 
+            android:title="@string/settings_display_track_color_dynamic_medium" 
+            android:summary="@string/settings_display_track_color_dynamic_medium_summary" 
             android:defaultValue="25" 
             android:inputType="number"
             android:maxLength="2">