diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 3fbed1d1..b5676ff1 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -218,7 +218,6 @@
     <string name="run_conditions_title">Условия на работа</string>
     <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">За да изберете мрежа, моля включете WiFi</string>
 
-    <!-- Preferences - Behaviour -->
     <string name="use_root_title">Стартира Syncthing с права на Superuser</string>
 
     <string name="use_root_summary">Може да предизвика разнообразни проблеми със Syncthing и като цяло с устройството. При възникване на проблем може да се наложи преинсталиране на Syncthing.</string>
diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml
index c87a7010..014421e9 100644
--- a/app/src/main/res/values-ca-rES/strings.xml
+++ b/app/src/main/res/values-ca-rES/strings.xml
@@ -248,7 +248,6 @@ Ens podeu informar dels problemes que trobeu a través de Github.</string>
     <string name="sync_only_wifi_ssids_location_permission_rejected_dialog_content">A partir de l\'Android 8.1, cal tenir accés a la ubicació per poder llegir el nom de la WiFi. Només ho podreu fer si concediu aquest permís.</string>
 
     <string name="respect_battery_saving_title">Respecta la configuració d\'estalvi de bateria de l\'Android</string>
-    <!-- Preferences - Behaviour -->
     <string name="use_root_title">Executa el Syncthing com a Superusuari</string>
 
     <string name="use_root_summary">Aquesta característica és inestable i podria causar problemes amb el Syncthing i amb el vostre dispositiu. Si us trobeu amb problemes, potser haureu de reinstal·lar el Syncthing.</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index ef3f4d88..ac0525b5 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -232,7 +232,6 @@ Všechny zaznamenané chyby prosím hlašte přes Github.</string>
     <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Pro výběr sítí prosím zapněte WiFi.</string>
 
     <string name="respect_battery_saving_title">Dodržovat nastavení úspory baterie z Androidu</string>
-    <!-- Preferences - Behaviour -->
     <string name="use_root_title">Spustit syncthing jako superuživatel</string>
 
     <string name="use_root_summary">Toto je nestabilní funkce, které může způsobit problémy se Syncthing a s vaším zařízením. Pokud narazíte na problémy, může být třeba přeinstalovat Syncthing.</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 8e08d263..2ec6c635 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -228,7 +228,6 @@ Vær venlig at rapportere ethvert problem, du støder på, via Github. </string>
     <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Vær venlig at slukke WiFi for at vælge netværk.</string>
 
     <string name="respect_battery_saving_title">Respekter Android battery saving indstillinger</string>
-    <!-- Preferences - Behaviour -->
     <string name="use_root_title">Kør Syncthing som Superuser</string>
 
     <string name="use_root_summary">Dette er en ustabil feature som kan forudsage problemer med Syncthing og din enhed. Hvis du støder på problemer, kan det være du er nødt til at geninstallere Syncthing.</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 075f597b..f58d0931 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -374,15 +374,13 @@ Bitte melden Sie auftretende Probleme via GitHub.</string>
     <string name="respect_master_sync_title">Berücksichtige \"Autom. Datensynchronisierung\"</string>
     <string name="respect_master_sync_summary">Stoppt Syncthing sobald die \"Automatische Datensynchronisierung\" in Android ausgeschaltet wird.</string>
 
-    <string name="run_in_flight_mode_title">Starte im Flugzeugmodus</string>
-    <string name="run_in_flight_mode_summary">Aktiviere dies, wenn dein Telefon Probleme beim Erkennen von manuell hergestellten WLAN-Verbindungen im Flugmodus hat.</string>
-
-    <string name="service_settings_title">Diensteinstellung</string>
-    <string name="service_settings_summary">Führt Syncthing als Dienst aus. Fügt eine permanente Benachrichtigung hinzu, um das Beenden des Diensts durch Android zu verhindern. Wenn Du diese Option aktivierst, wird Syncthing beim Hochfahren gestartet.</string>
-
-    <string name="run_as_background_service">Starte den Dienst automatisch beim Hochfahren</string>
+    <string name="run_in_flight_mode_title">Starte ohne Netzwerkverbindung</string>
+    <string name="run_in_flight_mode_summary">Durch Aktivieren der Option wird Syncthing auch dann laufen, wenn Du offline bist. Aktiviere dies, wenn dein Telefon Probleme beim Erkennen von manuell hergestellten WLAN-Verbindungen im Flugmodus hat.</string>
 
     <!-- Preferences - Behaviour -->
+    <string name="behaviour_autostart_title">Autostart</string>
+    <string name="behaviour_autostart_summary">Starte die App automatisch beim Hochfahren.</string>
+
     <string name="use_root_title">Syncthing mit Superuser Rechten ausführen</string>
 
     <string name="use_root_summary">Wenn Syncthing unter dem Root-Benutzer ausgeführt wird, hat es Schreibzugriff auf Ordner, die Android normalerweise auf schreibgeschützten Zugriff beschränkt. Verwende diese Funktion mit Bedacht.</string>
@@ -391,7 +389,7 @@ Bitte melden Sie auftretende Probleme via GitHub.</string>
 
     <string name="preference_language_summary">Anwendungssprache ändern</string>
 
-    <string name="start_into_web_gui_title">Beim Start direkt die Weboberfläche öffnen</string>
+    <string name="start_into_web_gui_title">Starte direkt in die Weboberfläche</string>
 
     <string name="start_into_web_gui_summary">Beim Start der App die Weboberfläche anstelle des Hauptfensters öffnen</string>
 
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 1e2ffca5..7541d83f 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -228,7 +228,6 @@
     <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Παρακαλώ ενεργοποιήστε το WiFi για να επιλέξετε δίκτυα.</string>
 
     <string name="respect_battery_saving_title">Υπακοή στη ρύθμιση εξοικονόμησης ενέργειας του Android</string>
-    <!-- Preferences - Behaviour -->
     <string name="use_root_title">Εκτέλεση του Syncthing ως υπερχρήστης</string>
 
     <string name="use_root_summary">Πρόκειται για μια πειραματική λειτουργία η οποία ενδέχεται να προκαλέσει προβλήματα στο Syncthing και τη συσκευή σας. Σε αυτή την περίπτωση, ίσως χρειαστεί να επανεγκαταστήσετε το Syncthing.</string>
diff --git a/app/src/main/res/values-es-rMX/strings.xml b/app/src/main/res/values-es-rMX/strings.xml
index aae5a152..2e3bea80 100644
--- a/app/src/main/res/values-es-rMX/strings.xml
+++ b/app/src/main/res/values-es-rMX/strings.xml
@@ -200,7 +200,6 @@
 
     <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Por favor encienda el WiFi para seleccionar redes.</string>
 
-    <!-- Preferences - Behaviour -->
     <string name="use_root_title">Ejecutar Syncthing como Superusuario</string>
 
     <string name="device_name">Nombre del dispositivo</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index fe8afe55..81419de6 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -217,7 +217,6 @@
     <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Por favor enciende el wifi para seleccionar redes.</string>
 
     <string name="respect_battery_saving_title">Respeta la configuración de ahorro de batería de Android</string>
-    <!-- Preferences - Behaviour -->
     <string name="use_root_title">Ejecutar Syncthing como superusuario</string>
 
     <string name="use_root_summary">Esta es una característica inestable que podría causar problemas con Syncthing y con tu dispositivo. Si aparecieran problemas podrías tener que reinstalar Syncthing.</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 2e463129..efba74f9 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -232,7 +232,6 @@ Ilmoitathan ystävällisesti kaikista havaitsemistasi ongelmista Githubin kautta
     <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Laita Wifi päälle valitaksesi verkkoja.</string>
 
     <string name="respect_battery_saving_title">Noudata Androidin virransäästöasetusta</string>
-    <!-- Preferences - Behaviour -->
     <string name="use_root_title">Käynnistä Syncthing pääkäyttäjän oikeuksin.</string>
 
     <string name="use_root_summary">Tämä on epävakaa ominaisuus joka voi aiheuttaa ongelmia Synthingin ja laitteesi kanssa. Jos sinulle tulee vastaan ongelmia, voit joutua asentamaan Syncthingin uudelleen.</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 1aef0b3d..47650f5f 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -250,7 +250,6 @@ S\'il vous plaît, soumettez les problèmes que vous rencontrez via Github.</str
     <string name="sync_only_wifi_ssids_location_permission_rejected_dialog_content">À partir d\'Android 8.1, l\'accès à la localisation est nécessaire pour pouvoir lire le nom du WiFi. Vous pouvez utiliser cette fonctionnalité uniquement si vous accordez cette autorisation.</string>
 
     <string name="respect_battery_saving_title">Sauvegarde batterie selon les réglages Android</string>
-    <!-- Preferences - Behaviour -->
     <string name="use_root_title">Faire fonctionner syncthing en super-utilisateur</string>
 
     <string name="use_root_summary">Ceci est une fonction instable qui peut causer des problèmes entre Syncthing et votre appareil. Si vous rencontrez des problèmes, vous devrez réinstaller Syncthing.</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index dcf1f841..c1fbf62d 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -254,7 +254,6 @@ Néhány eszközön extra alkalmazás-leállító alkalmazást telepített fel a
     <string name="sync_only_wifi_ssids_location_permission_rejected_dialog_content">Az Android 8.1-el kezdve helyzeti hozzáférés szükséges a WiFi hálózat nevének olvasásához. Ezt a funkciót csak akkor használhatod, ha megadod ezt a hozzáférést.</string>
 
     <string name="respect_battery_saving_title">Az Android akkumulátor-optimalizáció beállításainak tiszteletben tartása</string>
-    <!-- Preferences - Behaviour -->
     <string name="use_root_title">Syncthing futtatása Superuser-ként</string>
 
     <string name="use_root_summary">Ez egy kísérleti funkció, amely problémákat okozhat mind a Syncthing, mind az eszközöd számára. Ha ilyenbe ütközöl, előfordulhat, hogy újra kell telepítened az alkalmazást.</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 1464e15d..7465e8ff 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -222,7 +222,6 @@ Jika ada masalah silakan laporkan lewat Github.</string>
     <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Mohon aktifkan WiFi untuk memilih jaringan.</string>
 
     <string name="respect_battery_saving_title">Ikuti pengaturan penghematan baterai Android</string>
-    <!-- Preferences - Behaviour -->
     <string name="use_root_title">Jalankan Syncthing sebagai Superuser</string>
 
     <string name="use_root_summary">Ini merupakan fitur belum stabik yang mungkin menyebabkan masalah pada Syncthing dan perangkat anda. Jika menemui masalah, anda mungkin harus memasang ulang Syncthing.</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 0f1091a9..5f655f24 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -250,7 +250,6 @@ Si prega di segnalare eventuali problemi che si incontrano via Github.</string>
     <string name="sync_only_wifi_ssids_location_permission_rejected_dialog_content">A partire da Android 8.1, è necessario l\'accesso alla posizione per poter leggere il nome del WiFi. È possibile utilizzare questa funzionalità solo se si concede questa autorizzazione.</string>
 
     <string name="respect_battery_saving_title">Rispetta l\'impostazione di risparmio batteria di Android</string>
-    <!-- Preferences - Behaviour -->
     <string name="use_root_title">Esegui Syncthing come Superutente</string>
 
     <string name="use_root_summary">Questa è una caratteristica instabile che può causare problemi con Syncthing e con il dispositivo. In caso di problemi, potrebbe essere necessario reinstallare Syncthing.</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 112a2d08..d7c07470 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -229,7 +229,6 @@
     <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">ネットワークを選択するために Wi-Fi をオンにしてください。</string>
 
     <string name="respect_battery_saving_title">Android の節電設定に従う</string>
-    <!-- Preferences - Behaviour -->
     <string name="use_root_title">スーパーユーザーとして実行</string>
 
     <string name="use_root_summary">これは Syncthing とお使いのデバイスに問題が生じる可能性のある、安定していない機能です。問題が発生した場合は、Syncthing の再インストールが必要な場合があります。</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 52009eea..6711307e 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -227,7 +227,6 @@
     <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">WI-FI를 활성화하고 네트워크를 선택해주세요.</string>
 
     <string name="respect_battery_saving_title">안드로이드 배터리 절약 설정 우선</string>
-    <!-- Preferences - Behaviour -->
     <string name="use_root_title">Syncthing을 Superuser로 실행</string>
 
     <string name="use_root_summary">이 기능은 불안정하며 Syncthing과 기기에 문제를 일으킬 수 있습니다. 문제가 발생한 경우 Syncthing을 재설치 해야 할 수도 있습니다.</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 2b4f5783..b1d44e30 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -203,7 +203,6 @@
 
     <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Vennligst skru på WiFi for å velge nettverk.</string>
 
-    <!-- Preferences - Behaviour -->
     <string name="use_root_title">Kjør Syncthing som superbruker</string>
 
     <string name="use_root_summary">Dette er en ustabil funksjon som kan forårsake problemer med Syncthing og med din enhet. Hvis det oppstår problemer kan du bli nødt til å reinstallere Syncthing.</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index d553a621..825a625d 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -250,7 +250,6 @@ Als je problemen tegenkomt, meld ze dan via GitHub.</string>
     <string name="sync_only_wifi_ssids_location_permission_rejected_dialog_content">Vanaf Android 8.1 wordt toegang tot de locatie vereist om de naam van het wifinetwerk te kunnen lezen. Deze functie kan enkel gebruikt worden als je deze toestemming geeft.</string>
 
     <string name="respect_battery_saving_title">Eerbiedig de batterijbesparingsinstellingen van Android</string>
-    <!-- Preferences - Behaviour -->
     <string name="use_root_title">Syncthing uitvoeren als superuser</string>
 
     <string name="use_root_summary">Dit is een onstabiele functie die problemen kan veroorzaken met Syncthing en je apparaat. Als je problemen zou tegenkomen is het mogelijk dat je Syncthing opnieuw moet installeren.</string>
diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml
index 1a90ab5e..8f5d2283 100644
--- a/app/src/main/res/values-nn/strings.xml
+++ b/app/src/main/res/values-nn/strings.xml
@@ -203,7 +203,6 @@
 
     <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Skru på WiFi for å velje nettverk.</string>
 
-    <!-- Preferences - Behaviour -->
     <string name="use_root_title">Køyr Syncthing som superbrukar</string>
 
     <string name="use_root_summary">Dette er ein ustabil funksjon som kan forårsake problem med Syncthing og med din eining. Hvis det oppstår problem kan du bli nøydd til å installere Syncthing på nytt.</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index ff1dc75a..420475d0 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -232,7 +232,6 @@ Proszę zgłaszać napotkane błędy programu za pośrednictwem serwisu Github.<
     <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Proszę włącz WiFi dla wybranych sieci</string>
 
     <string name="respect_battery_saving_title">Respektuj ustawienia oszczędzania energii Androida</string>
-    <!-- Preferences - Behaviour -->
     <string name="use_root_title">Synchronizuje zawartość z uprawnieniami użytkownika Superuser</string>
 
     <string name="use_root_summary">To jest niestabilna funkcja, która może sprawiać problemy z Syncthing i urządzeniami. W przypadku napotkania błędów możliwe, że niezbędne będzie przeinstalowanie programu. </string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index c8f22d3b..077b444f 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -250,7 +250,6 @@ Por favor, nos avise sobre quaisquer problemas que você encontrar via Github.</
     <string name="sync_only_wifi_ssids_location_permission_rejected_dialog_content">Iniciando com o Android 8.1, acesso a localização é necessário para ler o nome do WIFI. Você pode usar esse recurso se conceder essa permissão.</string>
 
     <string name="respect_battery_saving_title">Honrar a configuração de economia de bateria do Android</string>
-    <!-- Preferences - Behaviour -->
     <string name="use_root_title">Executar como Superusuário</string>
 
     <string name="use_root_summary">Este é um recurso instável que pode causar problemas com o Syncthing e seu dispositivo. Caso você encontre problemas, pode ser necessária a reinstalação do Syncthing.</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index eadb3ee4..df248b0d 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -221,7 +221,6 @@ Reporte, através do Github, quaisquer problemas que encontre, por favor.</strin
     <string name="run_conditions_title">Condições de execução</string>
     <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Ligue o WiFi para seleccionar redes.</string>
 
-    <!-- Preferences - Behaviour -->
     <string name="use_root_title">Correr o Syncthing como superutilizador</string>
 
     <string name="use_root_summary">Esta é uma funcionalidade instável que pode causar problemas com o Syncthing e com o seu dispositivo. Se encontrar problemas, pode ter de reinstalar o Syncthing.</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index e3332423..339035df 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -268,7 +268,6 @@ Vă rugăm să raportați orice problemă întâlniți, prin intermediul GitHub.
     <string name="sync_only_wifi_ssids_location_permission_rejected_dialog_content">Începând cu Android 8.1, este necesar accesul la locație pentru a putea citii numele rețelei Wi-Fi. Această caracteristică poate fi folosită doar dacă acordați această permisiune.</string>
 
     <string name="respect_battery_saving_title">Se va respecta setarea de economisire a bateriei din Android</string>
-    <!-- Preferences - Behaviour -->
     <string name="use_root_title">Rulează ca root</string>
 
     <string name="use_root_summary">Aceasta este o funcție instabilă care ar putea cauza probleme atăt Syncthing cât și dispozitivului dumneavoastră. Dacă vă confruntați cu probleme, v-a trebui să reinstalați Syncthing.</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index ca0b7e84..03b653b7 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -256,7 +256,6 @@
     <string name="sync_only_wifi_ssids_location_permission_rejected_dialog_content">Начиная с Android 8.1, для чтения имени сети WiFi требуется разрешение позиционирования. Вы можете пользоваться данной функцией только если разрешите позиционирование. </string>
 
     <string name="respect_battery_saving_title">Учитывать настройки энергосбережения Android</string>
-    <!-- Preferences - Behaviour -->
     <string name="use_root_title">Запуск Syncthing с рут-правами</string>
 
     <string name="use_root_summary">Это нестабильная опция, которая может вызвать проблемы как с Syncthing так и с вашим устройством. Если вы столкнетесь с проблемами, переустановите Syncthing.</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 162a205e..07ae3acb 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -183,7 +183,6 @@
     <string name="settings_title">Nastavenia</string>
 
     <string name="category_syncthing_options">Nastavenia Syncthing</string>
-    <!-- Preferences - Behaviour -->
     <string name="use_root_title">Spúšťať Syncthing s root oprávneniami</string>
 
     <string name="device_name">Názov Zariadenia</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 9f7ef822..d85bfdfb 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -267,7 +267,6 @@ Vänligen rapportera eventuella problem du stöter på via Github.</string>
     <string name="sync_only_wifi_ssids_location_permission_rejected_dialog_content">Från och med Android 8.1 krävs platsåtkomst för att kunna läsa WiFi-namnet. Du kan bara använda den här funktionen om du beviljar denna behörighet.</string>
 
     <string name="respect_battery_saving_title">Respektera Android-batterisparinställning</string>
-    <!-- Preferences - Behaviour -->
     <string name="use_root_title">Kör som superanvändare</string>
 
     <string name="use_root_summary">Detta är en instabil funktion som kan orsaka problem med Syncthing och med din enhet enhet. Om du stöter på problem, kan du behöva installera om Syncthing.</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 61eb8872..cf8a57e9 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -218,7 +218,6 @@ Eğer herhangi bir sorunla karşılaşırsan Github aracılığıyla bildir.</st
     <string name="run_conditions_title">Çalışma Koşulları</string>
     <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Ağ seçmek için lütfen kablosuz bağlantınızı açın.</string>
 
-    <!-- Preferences - Behaviour -->
     <string name="use_root_title">Syncthing\'i Superuser/Ayrıcalıklı Kullanıcı olarak Çalıştır</string>
 
     <string name="use_root_summary">Bu, Syncting ve aygıtınız ile sorunlara neden olabilecek kararsız bir özelliktir. Eğer sorun yaşarsanız, Syncthing\'i yeniden yüklemeniz gerekebilir.</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index f3dea0a1..1d0bd0f1 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -200,7 +200,6 @@
 
     <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Hãy bật WiFi để lựa chọn mạng.</string>
 
-    <!-- Preferences - Behaviour -->
     <string name="use_root_title">Chạy Syncthing với quyền Superuser</string>
 
     <string name="device_name">Tên thiết bị</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 4d3cbf53..2c1a34fe 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -231,7 +231,6 @@
     <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">请打开无线网络连接并选择网络</string>
 
     <string name="respect_battery_saving_title">遵循 Android 电池省电模式设置</string>
-    <!-- Preferences - Behaviour -->
     <string name="use_root_title">Syncthing 运行于超级用户</string>
 
     <string name="use_root_summary">该项功能不稳定，可能导致您的设备和 Syncthing 出问题。如果遇到了问题，您可能要重新安装 Syncthing。</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 9e23da47..e601000e 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -227,7 +227,6 @@
     <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">請開啟 Wi-Fi 來選擇網路</string>
 
     <string name="respect_battery_saving_title">遵守 Android 節省電池設定</string>
-    <!-- Preferences - Behaviour -->
     <string name="use_root_title">以超級使用者執行 Syncthing</string>
 
     <string name="use_root_summary">這是不穩定的功能，可能會對 Syncthing 與你的裝置造成問題。如果你遇到問題，你也許需要重新安裝 Syncthing。</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b986fe50..4e22e88d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -374,15 +374,13 @@ Please report any problems you encounter via Github.</string>
     <string name="respect_master_sync_title">Respect Android \'Auto-sync data\' setting</string>
     <string name="respect_master_sync_summary">Disable Syncthing when the quick settings tile \'Auto-sync data\' is toggled off.</string>
 
-    <string name="run_in_flight_mode_title">Run when device is in flight mode</string>
-    <string name="run_in_flight_mode_summary">Enable if your device has problems detecting manual Wi-Fi connections during flight mode.</string>
-
-    <string name="service_settings_title">Service setting</string>
-    <string name="service_settings_summary">Run Syncthing as a service. Adds a persistent notification to prevent it from being terminated by Android. Checking this option starts Syncthing on operating system startup.</string>
-
-    <string name="run_as_background_service">Start service automatically on boot</string>
+    <string name="run_in_flight_mode_title">Run without network connection</string>
+    <string name="run_in_flight_mode_summary">Enabling this option will cause Syncthing to run even when you\'re offline. Enable if your device has problems detecting manual Wi-Fi connections during flight mode.</string>
 
     <!-- Preferences - Behaviour -->
+    <string name="behaviour_autostart_title">Autostart</string>
+    <string name="behaviour_autostart_summary">Start app automatically on operating system startup.</string>
+
     <string name="use_root_title">Run Syncthing as Superuser</string>
 
     <string name="use_root_summary">Running Syncthing as root allows it to write to folders Android normally restricts to be readonly accessed. Use this feature cautious.</string>
diff --git a/app/src/main/res/xml/app_settings.xml b/app/src/main/res/xml/app_settings.xml
index 979472d1..d2ba6269 100644
--- a/app/src/main/res/xml/app_settings.xml
+++ b/app/src/main/res/xml/app_settings.xml
@@ -78,6 +78,12 @@
         android:key="category_behaviour"
         android:title="@string/category_behaviour">
 
+        <CheckBoxPreference
+            android:key="always_run_in_background"
+            android:title="@string/behaviour_autostart_title"
+            android:summary="@string/behaviour_autostart_summary"
+            android:defaultValue="false" />
+
         <CheckBoxPreference
             android:key="use_root"
             android:title="@string/use_root_title"
@@ -95,18 +101,6 @@
             android:summary="@string/start_into_web_gui_summary"
             android:defaultValue="false"/>
 
-        <Preference
-            android:key="static_service_settings"
-            android:persistent="false"
-            android:selectable="false"
-            android:title="@string/service_settings_title"
-            android:summary="@string/service_settings_summary"/>
-
-        <CheckBoxPreference
-            android:key="always_run_in_background"
-            android:title="@string/run_as_background_service"
-            android:defaultValue="false" />
-
     </PreferenceScreen>
 
     <PreferenceScreen