diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml
index 3cb91631ede00d9dba856438f410989a8eaf204d..d81ee61add434553c7cfebdae1c6263142269862 100644
--- a/app/views/settings/preferences/show.html.haml
+++ b/app/views/settings/preferences/show.html.haml
@@ -6,6 +6,7 @@
   %li= link_to t('preferences.publishing'), '#settings_publishing'
   %li= link_to t('preferences.other'), '#settings_other'
   %li= link_to t('preferences.web'), '#settings_web'
+  %li= link_to t('settings.notifications'), settings_notifications_path
 
 = simple_form_for current_user, url: settings_preferences_path, html: { method: :put } do |f|
   = render 'shared/error_messages', object: current_user
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index e0ccb63a947c6798872311971e257a5faac17d3e..fe49ac7f6bd1717a38946a24e8d922a94360bd6a 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -812,9 +812,7 @@ ar:
     migrate: تهجير الحساب
     notifications: الإخطارات
     preferences: التفضيلات
-    settings: الإعدادات
     two_factor_authentication: المُصادقة بخُطوَتَيْن
-    your_apps: تطبيقاتك
   statuses:
     attached:
       description: 'مُرفَق : %{attached}'
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index f6892923c18d0f5936da3d0fedecca2679947dfb..7a51be7cf4482f817a95f5beab397d10c601f117 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -300,7 +300,6 @@ ast:
     import: Importación
     notifications: Avisos
     preferences: Preferencies
-    settings: Axustes
     two_factor_authentication: Autenticación en dos pasos
   statuses:
     attached:
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 2424d93991fefef7915147af0301bc1b124e499b..57aa6f87e013e6b508afa037fb84c0eabf7e0167 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -122,7 +122,6 @@ bg:
     export: Експортиране на данни
     import: Импортиране
     preferences: Предпочитания
-    settings: Настройки
     two_factor_authentication: Двустепенно удостоверяване
   statuses:
     open_in_web: Отвори в уеб
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 5fd2ff8234e78116c393b39a4eef23af75b6d506..17a5d9d0ceff09279560e40266fe0f773cda904c 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -867,9 +867,7 @@ ca:
     notifications: Notificacions
     preferences: Preferències
     relationships: Seguits i seguidors
-    settings: Configuració
     two_factor_authentication: Autenticació de dos factors
-    your_apps: Les teves aplicacions
   statuses:
     attached:
       description: 'Adjunt: %{attached}'
diff --git a/config/locales/co.yml b/config/locales/co.yml
index c4122b6d94c1ec0071a66209460e400af0f641c6..311e3f1427c1a4210153735c23692a02254e17fa 100644
--- a/config/locales/co.yml
+++ b/config/locales/co.yml
@@ -873,9 +873,7 @@ co:
     notifications: Nutificazione
     preferences: Priferenze
     relationships: Abbunamenti è abbunati
-    settings: Parametri
     two_factor_authentication: Identificazione à dui fattori
-    your_apps: E vostre applicazione
   statuses:
     attached:
       description: 'Aghjuntu: %{attached}'
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 7917166de7bf9e369040e1e061447aa8de5d6ddf..fdb0252bd45061fb3a3b449de565bba1ea666631 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -883,9 +883,7 @@ cs:
     notifications: Oznámení
     preferences: Předvolby
     relationships: Sledovaní a sledující
-    settings: Nastavení
     two_factor_authentication: Dvoufázové ověřování
-    your_apps: Vaše aplikace
   statuses:
     attached:
       description: 'Přiloženo: %{attached}'
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 9ab4fc394e1f8f341f4e8cc4cf27b4d13c1cc549..f365f717336df2cbe651e363d0698135e604340d 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -812,9 +812,7 @@ cy:
     migrate: Mudo cyfrif
     notifications: Hysbysiadau
     preferences: Dewisiadau
-    settings: Gosodiadau
     two_factor_authentication: Awdurdodi dau-gam
-    your_apps: Eich rhaglenni
   statuses:
     attached:
       description: 'Ynghlwm: %{attached}'
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 2156acb44311a2391e9bf222744657d69f7af7d2..0787db621f1f7aae32418feb7e214842f94174bc 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -700,9 +700,7 @@ da:
     migrate: Konto migrering
     notifications: Notifikationer
     preferences: Præferencer
-    settings: Indstillinger
     two_factor_authentication: To-faktor godkendelse
-    your_apps: Dine applikationer
   statuses:
     attached:
       description: 'Vedhæftede: %{attached}'
diff --git a/config/locales/de.yml b/config/locales/de.yml
index cfe527b0a62352d4eee4b2f66f063c731e0c31c3..aaf1c30b2c4d6273469d63d489eb0861a4881fe7 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -868,9 +868,7 @@ de:
     notifications: Benachrichtigungen
     preferences: Einstellungen
     relationships: Folgende und Follower
-    settings: Einstellungen
     two_factor_authentication: Zwei-Faktor-Auth
-    your_apps: Deine Anwendungen
   statuses:
     attached:
       description: 'Angehängt: %{attached}'
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 8ff42acbfe94e8adc1c6950dce46dce6fb7555a3..f2b6751ff6f9eaa1efbff9623942417ae100ec5a 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -859,9 +859,7 @@ el:
     notifications: Ειδοποιήσεις
     preferences: Προτιμήσεις
     relationships: Ακολουθεί και ακολουθείται
-    settings: Ρυθμίσεις
     two_factor_authentication: Πιστοποίηση 2 παραγόντων (2FA)
-    your_apps: Οι εφαρμογές σου
   statuses:
     attached:
       description: 'Συνημμένα: %{attached}'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 60540ecdcec4b37eab76032edbdead90ecdd03b7..838d6adc325ab158cc0b529a7c9742b56407a322 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -860,6 +860,8 @@ en:
     revoke_success: Session successfully revoked
     title: Sessions
   settings:
+    account: Account
+    account_settings: Account settings
     authorized_apps: Authorized apps
     back: Back to Mastodon
     delete: Account deletion
@@ -869,13 +871,13 @@ en:
     featured_tags: Featured hashtags
     identity_proofs: Identity proofs
     import: Import
+    import_and_export: Import and export
     migrate: Account migration
     notifications: Notifications
     preferences: Preferences
+    profile: Profile
     relationships: Follows and followers
-    settings: Settings
     two_factor_authentication: Two-factor Auth
-    your_apps: Your applications
   statuses:
     attached:
       description: 'Attached: %{attached}'
diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml
index 743989879e4ef54e6e03c44ec3518014f67f2b71..d428a95c3f5f0488f8f7b7e4904627cd93ac1767 100644
--- a/config/locales/en_GB.yml
+++ b/config/locales/en_GB.yml
@@ -854,9 +854,7 @@ en_GB:
     notifications: Notifications
     preferences: Preferences
     relationships: Follows and followers
-    settings: Settings
     two_factor_authentication: Two-factor Auth
-    your_apps: Your applications
   statuses:
     attached:
       description: 'Attached: %{attached}'
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index cce32cc561b676aaac04634fb9d1ffd0d519f840..b85cb1a491223743c187722910824deea26812ae 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -869,9 +869,7 @@ eo:
     notifications: Sciigoj
     preferences: Preferoj
     relationships: Follows and followers
-    settings: Agordoj
     two_factor_authentication: Dufaktora aÅ­tentigo
-    your_apps: Viaj aplikaĵoj
   statuses:
     attached:
       description: 'Ligita: %{attached}'
diff --git a/config/locales/es.yml b/config/locales/es.yml
index c0b6cfb3b5864c87da039b71fae0bf1347d8a80e..3a8e8dc0b00001cfc85b4a96c1d60c288626080e 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -705,9 +705,7 @@ es:
     migrate: Migración de cuenta
     notifications: Notificaciones
     preferences: Preferencias
-    settings: Ajustes
     two_factor_authentication: Autenticación de dos factores
-    your_apps: Tus aplicaciones
   statuses:
     attached:
       description: 'Adjunto: %{attached}'
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 50e5b6639461ef33eadde1d4c8481fcc4d8778ee..5ae664cadde37831f0dc6054e4a108c65292dd7b 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -787,9 +787,7 @@ eu:
     migrate: Kontuaren migrazioa
     notifications: Jakinarazpenak
     preferences: Hobespenak
-    settings: Ezarpenak
     two_factor_authentication: Bi faktoreetako autentifikazioa
-    your_apps: Zure aplikazioak
   statuses:
     attached:
       description: 'Erantsita: %{attached}'
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 0cf380921807314653fa458cef5bba982bfdf40f..3a3455c6d1f917d6123e68ff909c43351ad3796f 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -860,9 +860,7 @@ fa:
     notifications: اعلان‌ها
     preferences: ترجیحات
     relationships: پیگیری‌ها و پیگیران
-    settings: تنظیمات
     two_factor_authentication: ورود دومرحله‌ای
-    your_apps: برنامهٔ شما
   statuses:
     attached:
       description: 'پیوست‌شده: %{attached}'
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 47ff00434e7e776fab0ca87862afc7fd93f6d385..e4a0ed22cb90ccc3555d51a59540301604745fd0 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -613,9 +613,7 @@ fi:
     migrate: Tilin muutto muualle
     notifications: Ilmoitukset
     preferences: Ominaisuudet
-    settings: Asetukset
     two_factor_authentication: Kaksivaiheinen todentaminen
-    your_apps: Omat sovellukset
   statuses:
     attached:
       description: 'Liitetty: %{attached}'
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index f1d81acf02c2304483c71bc61b13aa404a3f374f..a6c806de39a766977c5054f1601326d959ed5d32 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -798,9 +798,7 @@ fr:
     migrate: Migration de compte
     notifications: Notifications
     preferences: Préférences
-    settings: Réglages
     two_factor_authentication: Identification à deux facteurs
-    your_apps: Vos applications
   statuses:
     attached:
       description: 'Attaché : %{attached}'
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 0ee3a329ca9908e3c80f45daebbb3aefc4a3584a..9c4673186b5054f18669f1015ec062970701e9d1 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -855,9 +855,7 @@ gl:
     notifications: Notificacións
     preferences: Preferencias
     relationships: Seguindo e seguidoras
-    settings: Axustes
     two_factor_authentication: Validar Doble Factor
-    your_apps: As súas aplicacións
   statuses:
     attached:
       description: 'Axenado: %{attached}'
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 089af2bebdef4ca87158a55e216769565a4bf57e..e471c4d02520128283cc40b0c02f9f49f2aa5d58 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -310,7 +310,6 @@ he:
     export: יצוא מידע
     import: יבוא
     preferences: העדפות
-    settings: הגדרות
     two_factor_authentication: אימות דו-שלבי
   statuses:
     open_in_web: פתח ברשת
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index f53515d7aff798dcb13528319b7bcb5834543eda..f9c552bce1419b18d65051e70d84b6d3746acb5e 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -115,7 +115,6 @@ hr:
     export: Izvoz podataka
     import: Uvezi
     preferences: Postavke
-    settings: Podešenja
     two_factor_authentication: Dvo-faktorska Autentifikacija
   statuses:
     open_in_web: Otvori na webu
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index f32f6f40790b8bfb87a83affdec277ee894cd9da..b6029eecab77e74959fac0ddf031b3ee56834344 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -533,9 +533,7 @@ hu:
     migrate: Fiók átirányítása
     notifications: Értesítések
     preferences: Általános beállítások
-    settings: Beállítások
     two_factor_authentication: Kétlépcsős azonosítás
-    your_apps: Alkalmazásaid
   statuses:
     open_in_web: Megnyitás a weben
     over_character_limit: Túllépted a maximális %{max} karakteres keretet
diff --git a/config/locales/id.yml b/config/locales/id.yml
index a27f1f00886bc6bbc1aaa1eaf0f115a3b396d4bf..4323c145fc5006e8c05aa46aeeadf57b94a6174f 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -334,7 +334,6 @@ id:
     export: Expor data
     import: Impor
     preferences: Pilihan
-    settings: Pengaturan
     two_factor_authentication: Autentikasi Two-factor
   statuses:
     open_in_web: Buka di web
diff --git a/config/locales/io.yml b/config/locales/io.yml
index b926fe641502f4a24fa51b41b6d07db28fa0411f..b5edb2aa32420d0691380590a8ffc84f7b98445b 100644
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -235,7 +235,6 @@ io:
     export: Exportacar datumi
     import: Importacar
     preferences: Preferi
-    settings: Settings
     two_factor_authentication: Dufaktora autentikigo
   statuses:
     open_in_web: Apertar retnavigile
diff --git a/config/locales/it.yml b/config/locales/it.yml
index bb170bc4a2fff570ce0a8d2e1c023e2d02647cfd..508b8a0dc99d2d9bf6c07a8e500220f3825ce061 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -762,9 +762,7 @@ it:
     migrate: Migrazione dell'account
     notifications: Notifiche
     preferences: Preferenze
-    settings: Impostazioni
     two_factor_authentication: Autenticazione a due fattori
-    your_apps: Le tue applicazioni
   statuses:
     attached:
       description: 'Allegato: %{attached}'
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 85e97580e8c296806032c4cb3866f2b95db4138c..a4026fcfc03c6eebae8a131833c32182dae8ed67 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -871,9 +871,7 @@ ja:
     notifications: 通知
     preferences: ユーザー設定
     relationships: フォロー・フォロワー
-    settings: 設定
     two_factor_authentication: 二段階認証
-    your_apps: アプリ
   statuses:
     attached:
       description: '添付: %{attached}'
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index 758a0429e3370e0335e5cb6412e1acf9376be517..9781fc5be90947398df73f38f1b910c122f13bc7 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -668,9 +668,7 @@ ka:
     migrate: ანგარიშის მიგრაცია
     notifications: შეტყობინებები
     preferences: პრეფერენციები
-    settings: პარამეტრები
     two_factor_authentication: მეორე-ფაქტორის აუტენტიფიკაცია
-    your_apps: თქვენი აპლიკაციები
   statuses:
     attached:
       description: 'თან დართული: %{attached}'
diff --git a/config/locales/kk.yml b/config/locales/kk.yml
index da91ca9c4731dd5debbd769300f48dca97fb4d75..84bd710818d0f8a55db397b8bc63f96e72ce218f 100644
--- a/config/locales/kk.yml
+++ b/config/locales/kk.yml
@@ -797,9 +797,7 @@ kk:
     migrate: Аккаунт көшіру
     notifications: Ескертпелер
     preferences: Таңдаулар
-    settings: Баптаулар
     two_factor_authentication: Екі-факторлы авторизация
-    your_apps: Қосымшалар
   statuses:
     attached:
       description: 'Жүктелді: %{attached}'
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index c97fd82092db0a42263f5aaa307e5858264da25e..cf0a993849ab0125658183905379124ca6e16751 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -874,9 +874,7 @@ ko:
     notifications: 알림
     preferences: 사용자 설정
     relationships: 팔로잉과 팔로워
-    settings: 설정
     two_factor_authentication: 2단계 인증
-    your_apps: 애플리케이션
   statuses:
     attached:
       description: '첨부: %{attached}'
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 97994c36278ab6f72a36482f554fba1cd9dd376c..7ea8dc76b2f8d427dd792bb1e1e0be33d179b46d 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -800,9 +800,7 @@ lt:
     migrate: Paskyros migracija
     notifications: Pranešimai
     preferences: Preferencijos
-    settings: Nustatymai
     two_factor_authentication: Dviejų veiksnių autentikacija
-    your_apps: Jūsų aplikacijos
   statuses:
     attached:
       description: 'PridÄ—ta: %{attached}'
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index ca0f57ae0bc64ba75618fbdb011f2b9e4f64fe65..ae274ad702afbaf94c855ca013a39c0f6068e671 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -856,9 +856,7 @@ nl:
     notifications: Meldingen
     preferences: Voorkeuren
     relationships: Volgers en gevolgden
-    settings: Instellingen
     two_factor_authentication: Tweestapsverificatie
-    your_apps: Jouw toepassingen
   statuses:
     attached:
       description: 'Bijlagen: %{attached}'
diff --git a/config/locales/no.yml b/config/locales/no.yml
index d6475afd6a77703957ff15c2ff9b809e963bddc7..f16b314cb6370bac90e39247a0ee264fbba1deca 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -533,9 +533,7 @@
     migrate: Kontomigrering
     notifications: Varslinger
     preferences: Preferanser
-    settings: Innstillinger
     two_factor_authentication: Tofaktorautentisering
-    your_apps: Dine applikasjoner
   statuses:
     open_in_web: Ã…pne i nettleser
     over_character_limit: grense på %{max} tegn overskredet
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index d1c6d11d9f867480cbb4df371bea68dd02e46e32..81f17cd3dc9ccecbcd0661fb69c1328e6dda7d9a 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -890,9 +890,7 @@ oc:
     notifications: Notificacions
     preferences: Preferéncias
     relationships: Abonaments e seguidors
-    settings: Paramètres
     two_factor_authentication: Autentificacion en dos temps
-    your_apps: Vòstras aplicacions
   statuses:
     attached:
       description: 'Ajustat : %{attached}'
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 192a56dcf6956573d470b5484a7adff71e5e1987..1b9bb614c3a83e9a4b4d46277955fce5ecd1f33f 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -889,9 +889,7 @@ pl:
     notifications: Powiadomienia
     preferences: Preferencje
     relationships: Śledzeni i śledzący
-    settings: Ustawienia
     two_factor_authentication: Uwierzytelnianie dwuetapowe
-    your_apps: Twoje aplikacje
   statuses:
     attached:
       description: 'Załączono: %{attached}'
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 4fdacf51d4701ff5b1f258f8de104fb60f34ec9c..2d117128877ecf43a6372dc05e96368263097b29 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -867,9 +867,7 @@ pt-BR:
     notifications: Notificações
     preferences: Preferências
     relationships: Seguindo e seguidores
-    settings: Configurações
     two_factor_authentication: Autenticação em dois passos
-    your_apps: Seus aplicativos
   statuses:
     attached:
       description: 'Anexado: %{attached}'
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 92c8ab42f7bdddfad3c65e8a15d8ebca63ce0c98..b827184e90b5f7eb63e6ef5de57c71343c481a1b 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -800,9 +800,7 @@ pt:
     migrate: Migração de conta
     notifications: Notificações
     preferences: Preferências
-    settings: Configurações
     two_factor_authentication: Autenticação em dois passos
-    your_apps: As tuas aplicações
   statuses:
     attached:
       description: 'Anexadas: %{attached}'
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index e821502583f6060565c075b0a12e41afcb42da69..0d912d3523ca8972849cc81876b17eb64bdc0b0f 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -698,9 +698,7 @@ ru:
     migrate: Перенос аккаунта
     notifications: Уведомления
     preferences: Настройки
-    settings: Опции
     two_factor_authentication: Двухфакторная аутентификация
-    your_apps: Ваши приложения
   statuses:
     attached:
       description: 'Вложение: %{attached}'
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 9dcb3f4701f9aefd3b1ec5a3f80231366c3d63f0..bf7898ed74bd423d8e296545b9c9f96d694b74c0 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -831,9 +831,7 @@ sk:
     migrate: Presunutie účtu
     notifications: Oznámenia
     preferences: Voľby
-    settings: Nastavenia
     two_factor_authentication: Dvoj-faktorové overenie
-    your_apps: Tvoje aplikácie
   statuses:
     attached:
       description: 'Priložené: %{attached}'
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 8303abea8078add23c8e64bd25107df572c1a837..ea36a2189f042f6adaeda4ca4c746e14975b2a12 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -784,9 +784,7 @@ sq:
     migrate: Migrim llogarie
     notifications: Njoftime
     preferences: Parapëlqime
-    settings: Rregullime
     two_factor_authentication: Mirëfilltësim Dyfaktorësh
-    your_apps: Aplikacionet tuaja
   statuses:
     attached:
       description: 'Bashkëngjitur: %{attached}'
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 468867e6795d6275521ad981042372d4899a7874..2292b6a7f818cff50b4a46f8a5790c971cb47b12 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -523,9 +523,7 @@ sr-Latn:
     migrate: Prebacivanje naloga
     notifications: Obaveštenja
     preferences: Podešavanja
-    settings: Postavke
     two_factor_authentication: Dvofaktorska identifikacija
-    your_apps: Vaše aplikacije
   statuses:
     open_in_web: Otvori u vebu
     over_character_limit: ograničenje od %{max} karaktera prekoračeno
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 49252b50002953f0eef113e7a201a519bf2512e7..2bf9001ce5a6127beb207ccaf6978f99085c7e5d 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -792,9 +792,7 @@ sr:
     migrate: Пребацивање налога
     notifications: Обавештења
     preferences: Подешавања
-    settings: Поставке
     two_factor_authentication: Двофакторска идентификација
-    your_apps: Ваше апликације
   statuses:
     attached:
       description: 'У прилогу: %{attached}'
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index ef208aceae32ec881a18dd093cf2ff70c85535e7..91d4c2496d5f8030db2bbce61e4399d9182c0b83 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -600,9 +600,7 @@ sv:
     migrate: Kontoflytt
     notifications: Meddelanden
     preferences: Inställningar
-    settings: Inställningar
     two_factor_authentication: Tvåstegsautentisering
-    your_apps: Dina applikationer
   statuses:
     attached:
       description: 'Bifogad: %{attached}'
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 729865c83c1301e7cbafc01ae861eaff015e072f..2ebd6c7f1c010c66b31e3548b0c84add17ec1bc4 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -590,9 +590,7 @@ th:
     notifications: การแจ้งเตือน
     preferences: การกำหนดลักษณะ
     relationships: การติดตามและผู้ติดตาม
-    settings: การตั้งค่า
     two_factor_authentication: การรับรองความถูกต้องด้วยสองปัจจัย
-    your_apps: แอปพลิเคชันของคุณ
   statuses:
     attached:
       description: 'แนบ: %{attached}'
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 14e7f34df52619474e377943b45740f9d42d2b17..e3e27e3ef3a0803db8508d8bc27f0b30eefb89da 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -347,7 +347,6 @@ tr:
     export: Dışa aktar
     import: İçe aktar
     preferences: Tercihler
-    settings: Ayarlar
     two_factor_authentication: İki-faktörlü doğrulama
   statuses:
     open_in_web: Web sayfasında aç
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 12f2d13a1fb62bd6020ac9bffda81b5f2ba76f12..a582b238535128ea24085d705ea0faacc919f918 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -648,9 +648,7 @@ uk:
     migrate: Міграція акаунту
     notifications: Сповіщення
     preferences: Налаштування
-    settings: Опції
     two_factor_authentication: Двофакторна авторизація
-    your_apps: Ваші затосунки
   statuses:
     attached:
       description: 'Прикріплено: %{attached}'
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 4eafa70f4c05712b03ccb478225ba4ce83377045..ae49c053712d9058c7626d8cc61d3a03135ffcd7 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -670,9 +670,7 @@ zh-CN:
     migrate: 帐户迁移
     notifications: 通知
     preferences: 首选项
-    settings: 设置
     two_factor_authentication: 双重认证
-    your_apps: 你的应用
   statuses:
     attached:
       description: 附加媒体：%{attached}
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 9ff97805d6b9857a2b10f7158b05e9653750d68d..aade1debb4560f8dd74ba351b12a43b5a32f7962 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -597,9 +597,7 @@ zh-HK:
     migrate: 帳戶遷移
     notifications: 通知
     preferences: 偏好設定
-    settings: 設定
     two_factor_authentication: 雙重認證
-    your_apps: 你的應用程式
   statuses:
     attached:
       description: 附件： %{attached}
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 9a13a602f33f0ab9055a3d2dbf5ed96c417428f1..988357e1b1e7a4457082c3c48f9f07c211018bb5 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -666,9 +666,7 @@ zh-TW:
     migrate: 帳戶搬遷
     notifications: 通知
     preferences: 偏好設定
-    settings: 設定
     two_factor_authentication: 兩階段認證
-    your_apps: 你的應用程式
   statuses:
     attached:
       description: 附件： %{attached}
diff --git a/config/navigation.rb b/config/navigation.rb
index dd5825867bec7e512aaf4d99cb34eb38cd0ebb75..c2a8e45cea0a672ae38e5ae6ee26c09720a0f20f 100644
--- a/config/navigation.rb
+++ b/config/navigation.rb
@@ -1,50 +1,53 @@
 # frozen_string_literal: true
 
 SimpleNavigation::Configuration.run do |navigation|
-  navigation.items do |primary|
-    primary.item :web, safe_join([fa_icon('chevron-left fw'), t('settings.back')]), root_url
-
-    primary.item :settings, safe_join([fa_icon('cog fw'), t('settings.settings')]), settings_profile_url do |settings|
-      settings.item :profile, safe_join([fa_icon('user fw'), t('settings.edit_profile')]), settings_profile_url, highlights_on: %r{/settings/profile|/settings/migration}
-      settings.item :featured_tags, safe_join([fa_icon('hashtag fw'), t('settings.featured_tags')]), settings_featured_tags_url
-      settings.item :preferences, safe_join([fa_icon('sliders fw'), t('settings.preferences')]), settings_preferences_url
-      settings.item :notifications, safe_join([fa_icon('bell fw'), t('settings.notifications')]), settings_notifications_url
-      settings.item :password, safe_join([fa_icon('lock fw'), t('auth.security')]), edit_user_registration_url, highlights_on: %r{/auth/edit|/settings/delete}
-      settings.item :two_factor_authentication, safe_join([fa_icon('mobile fw'), t('settings.two_factor_authentication')]), settings_two_factor_authentication_url, highlights_on: %r{/settings/two_factor_authentication}
-      settings.item :import, safe_join([fa_icon('cloud-upload fw'), t('settings.import')]), settings_import_url
-      settings.item :export, safe_join([fa_icon('cloud-download fw'), t('settings.export')]), settings_export_url
-      settings.item :authorized_apps, safe_join([fa_icon('list fw'), t('settings.authorized_apps')]), oauth_authorized_applications_url
-      settings.item :identity_proofs, safe_join([fa_icon('key fw'), t('settings.identity_proofs')]), settings_identity_proofs_path, highlights_on: %r{/settings/identity_proofs*}, if: proc { current_account.identity_proofs.exists? }
+  navigation.items do |n|
+    n.item :web, safe_join([fa_icon('chevron-left fw'), t('settings.back')]), root_url
+
+    n.item :profile, safe_join([fa_icon('user fw'), t('settings.profile')]), settings_profile_url do |s|
+      s.item :profile, safe_join([fa_icon('pencil fw'), t('settings.appearance')]), settings_profile_url, highlights_on: %r{/settings/profile|/settings/migration}
+      s.item :featured_tags, safe_join([fa_icon('hashtag fw'), t('settings.featured_tags')]), settings_featured_tags_url
+      s.item :identity_proofs, safe_join([fa_icon('key fw'), t('settings.identity_proofs')]), settings_identity_proofs_path, highlights_on: %r{/settings/identity_proofs*}, if: proc { current_account.identity_proofs.exists? }
     end
 
-    primary.item :relationships, safe_join([fa_icon('users fw'), t('settings.relationships')]), relationships_url
-    primary.item :filters, safe_join([fa_icon('filter fw'), t('filters.index.title')]), filters_path, highlights_on: %r{/filters}
-    primary.item :invites, safe_join([fa_icon('user-plus fw'), t('invites.title')]), invites_path, if: proc { Setting.min_invite_role == 'user' }
+    n.item :preferences, safe_join([fa_icon('cog fw'), t('settings.preferences')]), settings_preferences_url, highlights_on: %r{/settings/preferences|/settings/notifications}
+    n.item :relationships, safe_join([fa_icon('users fw'), t('settings.relationships')]), relationships_url
+    n.item :filters, safe_join([fa_icon('filter fw'), t('filters.index.title')]), filters_path, highlights_on: %r{/filters}
+
+    n.item :security, safe_join([fa_icon('lock fw'), t('settings.account')]), edit_user_registration_url do |s|
+      s.item :password, safe_join([fa_icon('lock fw'), t('settings.account_settings')]), edit_user_registration_url, highlights_on: %r{/auth/edit|/settings/delete}
+      s.item :two_factor_authentication, safe_join([fa_icon('mobile fw'), t('settings.two_factor_authentication')]), settings_two_factor_authentication_url, highlights_on: %r{/settings/two_factor_authentication}
+      s.item :authorized_apps, safe_join([fa_icon('list fw'), t('settings.authorized_apps')]), oauth_authorized_applications_url
+    end
 
-    primary.item :development, safe_join([fa_icon('code fw'), t('settings.development')]), settings_applications_url do |development|
-      development.item :your_apps, safe_join([fa_icon('list fw'), t('settings.your_apps')]), settings_applications_url, highlights_on: %r{/settings/applications}
+    n.item :data, safe_join([fa_icon('cloud-download fw'), t('settings.import_and_export')]), settings_export_url do |s|
+      s.item :import, safe_join([fa_icon('cloud-upload fw'), t('settings.import')]), settings_import_url
+      s.item :export, safe_join([fa_icon('cloud-download fw'), t('settings.export')]), settings_export_url
     end
 
-    primary.item :moderation, safe_join([fa_icon('gavel fw'), t('moderation.title')]), admin_reports_url, if: proc { current_user.staff? } do |admin|
-      admin.item :action_logs, safe_join([fa_icon('bars fw'), t('admin.action_logs.title')]), admin_action_logs_url
-      admin.item :reports, safe_join([fa_icon('flag fw'), t('admin.reports.title')]), admin_reports_url, highlights_on: %r{/admin/reports}
-      admin.item :accounts, safe_join([fa_icon('users fw'), t('admin.accounts.title')]), admin_accounts_url, highlights_on: %r{/admin/accounts|/admin/pending_accounts}
-      admin.item :invites, safe_join([fa_icon('user-plus fw'), t('admin.invites.title')]), admin_invites_path
-      admin.item :tags, safe_join([fa_icon('tag fw'), t('admin.tags.title')]), admin_tags_path
-      admin.item :instances, safe_join([fa_icon('cloud fw'), t('admin.instances.title')]), admin_instances_url(limited: '1'), highlights_on: %r{/admin/instances|/admin/domain_blocks}, if: -> { current_user.admin? }
-      admin.item :email_domain_blocks, safe_join([fa_icon('envelope fw'), t('admin.email_domain_blocks.title')]), admin_email_domain_blocks_url, highlights_on: %r{/admin/email_domain_blocks}, if: -> { current_user.admin? }
+    n.item :invites, safe_join([fa_icon('user-plus fw'), t('invites.title')]), invites_path, if: proc { Setting.min_invite_role == 'user' }
+    n.item :development, safe_join([fa_icon('code fw'), t('settings.development')]), settings_applications_url
+
+    n.item :moderation, safe_join([fa_icon('gavel fw'), t('moderation.title')]), admin_reports_url, if: proc { current_user.staff? } do |s|
+      s.item :action_logs, safe_join([fa_icon('bars fw'), t('admin.action_logs.title')]), admin_action_logs_url
+      s.item :reports, safe_join([fa_icon('flag fw'), t('admin.reports.title')]), admin_reports_url, highlights_on: %r{/admin/reports}
+      s.item :accounts, safe_join([fa_icon('users fw'), t('admin.accounts.title')]), admin_accounts_url, highlights_on: %r{/admin/accounts|/admin/pending_accounts}
+      s.item :invites, safe_join([fa_icon('user-plus fw'), t('admin.invites.title')]), admin_invites_path
+      s.item :tags, safe_join([fa_icon('tag fw'), t('admin.tags.title')]), admin_tags_path
+      s.item :instances, safe_join([fa_icon('cloud fw'), t('admin.instances.title')]), admin_instances_url(limited: '1'), highlights_on: %r{/admin/instances|/admin/domain_blocks}, if: -> { current_user.admin? }
+      s.item :email_domain_blocks, safe_join([fa_icon('envelope fw'), t('admin.email_domain_blocks.title')]), admin_email_domain_blocks_url, highlights_on: %r{/admin/email_domain_blocks}, if: -> { current_user.admin? }
     end
 
-    primary.item :admin, safe_join([fa_icon('cogs fw'), t('admin.title')]), admin_dashboard_url, if: proc { current_user.staff? } do |admin|
-      admin.item :dashboard, safe_join([fa_icon('tachometer fw'), t('admin.dashboard.title')]), admin_dashboard_url
-      admin.item :settings, safe_join([fa_icon('cogs fw'), t('admin.settings.title')]), edit_admin_settings_url, if: -> { current_user.admin? }, highlights_on: %r{/admin/settings}
-      admin.item :custom_emojis, safe_join([fa_icon('smile-o fw'), t('admin.custom_emojis.title')]), admin_custom_emojis_url, highlights_on: %r{/admin/custom_emojis}
-      admin.item :relays, safe_join([fa_icon('exchange fw'), t('admin.relays.title')]), admin_relays_url, if: -> { current_user.admin? }, highlights_on: %r{/admin/relays}
-      admin.item :subscriptions, safe_join([fa_icon('paper-plane-o fw'), t('admin.subscriptions.title')]), admin_subscriptions_url, if: -> { current_user.admin? }
-      admin.item :sidekiq, safe_join([fa_icon('diamond fw'), 'Sidekiq']), sidekiq_url, link_html: { target: 'sidekiq' }, if: -> { current_user.admin? }
-      admin.item :pghero, safe_join([fa_icon('database fw'), 'PgHero']), pghero_url, link_html: { target: 'pghero' }, if: -> { current_user.admin? }
+    n.item :admin, safe_join([fa_icon('cogs fw'), t('admin.title')]), admin_dashboard_url, if: proc { current_user.staff? } do |s|
+      s.item :dashboard, safe_join([fa_icon('tachometer fw'), t('admin.dashboard.title')]), admin_dashboard_url
+      s.item :settings, safe_join([fa_icon('cogs fw'), t('admin.settings.title')]), edit_admin_settings_url, if: -> { current_user.admin? }, highlights_on: %r{/admin/settings}
+      s.item :custom_emojis, safe_join([fa_icon('smile-o fw'), t('admin.custom_emojis.title')]), admin_custom_emojis_url, highlights_on: %r{/admin/custom_emojis}
+      s.item :relays, safe_join([fa_icon('exchange fw'), t('admin.relays.title')]), admin_relays_url, if: -> { current_user.admin? }, highlights_on: %r{/admin/relays}
+      s.item :subscriptions, safe_join([fa_icon('paper-plane-o fw'), t('admin.subscriptions.title')]), admin_subscriptions_url, if: -> { current_user.admin? }
+      s.item :sidekiq, safe_join([fa_icon('diamond fw'), 'Sidekiq']), sidekiq_url, link_html: { target: 'sidekiq' }, if: -> { current_user.admin? }
+      s.item :pghero, safe_join([fa_icon('database fw'), 'PgHero']), pghero_url, link_html: { target: 'pghero' }, if: -> { current_user.admin? }
     end
 
-    primary.item :logout, safe_join([fa_icon('sign-out fw'), t('auth.logout')]), destroy_user_session_url, link_html: { 'data-method' => 'delete' }
+    n.item :logout, safe_join([fa_icon('sign-out fw'), t('auth.logout')]), destroy_user_session_url, link_html: { 'data-method' => 'delete' }
   end
 end