diff --git a/cosmic-settings/src/pages/accessibility/magnifier.rs b/cosmic-settings/src/pages/accessibility/magnifier.rs
index 33c32e6..b92f192 100644
--- a/cosmic-settings/src/pages/accessibility/magnifier.rs
+++ b/cosmic-settings/src/pages/accessibility/magnifier.rs
@@ -2,24 +2,23 @@ use std::collections::HashSet;
 use std::fmt::Write;
 
 use cosmic::{
+    Apply,
     iced::{Element, Length},
     iced_core::text::Wrapping,
     surface,
     widget::{self, icon, settings, svg, text},
-    Apply,
 };
 use cosmic_comp_config::{ZoomConfig, ZoomMovement};
 use cosmic_config::{ConfigGet, ConfigSet};
-use cosmic_settings_config::{shortcuts, Action, Binding};
+use cosmic_settings_config::{Action, Binding, shortcuts};
 use cosmic_settings_page::{
-    self as page,
+    self as page, Entity,
     section::{self, Section},
-    Entity,
 };
 use slotmap::SlotMap;
 use tracing::error;
 
-use super::{wayland, AccessibilityEvent, AccessibilityRequest};
+use super::{AccessibilityEvent, AccessibilityRequest, wayland};
 
 #[derive(Debug)]
 pub struct Page {
@@ -254,10 +253,12 @@ pub fn tip() -> section::Section<crate::pages::Message> {
         .view::<Page>(move |_binder, _page, section| {
             let descriptions = &section.descriptions;
 
-            let mut items = vec![text::body(&descriptions[applet])
-                .wrapping(Wrapping::Word)
-                .width(Length::Shrink)
-                .into()];
+            let mut items = vec![
+                text::body(&descriptions[applet])
+                    .wrapping(Wrapping::Word)
+                    .width(Length::Shrink)
+                    .into(),
+            ];
             if let Some(illustration) = applet_illustration.clone() {
                 items.push(svg(illustration).width(Length::Fill).into());
             }
@@ -283,30 +284,36 @@ pub fn view_movement() -> section::Section<crate::pages::Message> {
 
             settings::section()
                 .title(&section.title)
-                .add(widget::settings::item_row(vec![widget::radio(
-                    text::body(&descriptions[continuous]),
-                    ZoomMovement::Continuously,
-                    Some(page.zoom_config.view_moves),
-                    Message::SetMovement,
-                )
-                .width(Length::Fill)
-                .into()]))
-                .add(widget::settings::item_row(vec![widget::radio(
-                    text::body(&descriptions[onedge]),
-                    ZoomMovement::OnEdge,
-                    Some(page.zoom_config.view_moves),
-                    Message::SetMovement,
-                )
-                .width(Length::Fill)
-                .into()]))
-                .add(widget::settings::item_row(vec![widget::radio(
-                    text::body(&descriptions[centered]),
-                    ZoomMovement::Centered,
-                    Some(page.zoom_config.view_moves),
-                    Message::SetMovement,
-                )
-                .width(Length::Fill)
-                .into()]))
+                .add(widget::settings::item_row(vec![
+                    widget::radio(
+                        text::body(&descriptions[continuous]),
+                        ZoomMovement::Continuously,
+                        Some(page.zoom_config.view_moves),
+                        Message::SetMovement,
+                    )
+                    .width(Length::Fill)
+                    .into(),
+                ]))
+                .add(widget::settings::item_row(vec![
+                    widget::radio(
+                        text::body(&descriptions[onedge]),
+                        ZoomMovement::OnEdge,
+                        Some(page.zoom_config.view_moves),
+                        Message::SetMovement,
+                    )
+                    .width(Length::Fill)
+                    .into(),
+                ]))
+                .add(widget::settings::item_row(vec![
+                    widget::radio(
+                        text::body(&descriptions[centered]),
+                        ZoomMovement::Centered,
+                        Some(page.zoom_config.view_moves),
+                        Message::SetMovement,
+                    )
+                    .width(Length::Fill)
+                    .into(),
+                ]))
                 .apply(Element::from)
                 .map(crate::pages::Message::AccessibilityMagnifier)
         })
diff --git a/cosmic-settings/src/pages/accessibility/mod.rs b/cosmic-settings/src/pages/accessibility/mod.rs
index 42e10e0..3ab609d 100644
--- a/cosmic-settings/src/pages/accessibility/mod.rs
+++ b/cosmic-settings/src/pages/accessibility/mod.rs
@@ -1,9 +1,10 @@
 use cosmic::{
-    Apply, Task,
+    Task,
     cosmic_theme::{CosmicPalette, ThemeBuilder},
     iced_core::text::Wrapping,
-    theme::{self, CosmicTheme},
-    widget::{button, container, dropdown, horizontal_space, icon, settings, text, toggler},
+    surface,
+    theme::CosmicTheme,
+    widget::{dropdown, settings, text, toggler},
 };
 pub use cosmic_comp_config::ZoomMovement;
 use cosmic_config::CosmicConfigEntry;
@@ -68,6 +69,7 @@ pub enum Message {
     SetScreenInverted(bool),
     SetScreenFilterActive(bool),
     SetScreenFilterSelection(ColorFilter),
+    Surface(surface::Action),
 }
 
 impl page::Page<crate::pages::Message> for Page {
@@ -178,19 +180,9 @@ pub fn vision() -> section::Section<crate::pages::Message> {
                         &descriptions[unavailable]
                     };
 
-                    settings::item_row(vec![
-                        text::body(&descriptions[magnifier])
-                            .wrapping(Wrapping::Word)
-                            .into(),
-                        horizontal_space().into(),
-                        text::body(status_text).wrapping(Wrapping::Word).into(),
-                        icon::from_name("go-next-symbolic").size(16).into(),
-                    ])
-                    .apply(container)
-                    .class(cosmic::theme::Container::List)
-                    .apply(button::custom)
-                    .class(theme::Button::Transparent)
-                    .on_press_maybe(
+                    crate::widget::go_next_with_item(
+                        &descriptions[magnifier],
+                        text::body(status_text).wrapping(Wrapping::Word),
                         page.wayland_available
                             .is_some()
                             .then_some(crate::pages::Message::Page(magnifier_entity)),
@@ -235,13 +227,20 @@ pub fn vision() -> section::Section<crate::pages::Message> {
                     };
                     cosmic::Element::from(
                         settings::item::builder(&descriptions[color_filter_type]).control(
-                            dropdown(
+                            dropdown::popup_dropdown(
                                 selections,
                                 Some(page.screen_filter_selection as usize),
                                 move |idx| {
                                     let filter = ColorFilter::from_usize(idx).unwrap_or_default();
                                     Message::SetScreenFilterSelection(filter)
                                 },
+                                cosmic::iced::window::Id::RESERVED,
+                                Message::Surface,
+                                |a| {
+                                    crate::app::Message::PageMessage(
+                                        crate::pages::Message::Accessibility(a),
+                                    )
+                                },
                             ),
                         ),
                     )
@@ -361,6 +360,9 @@ impl Page {
                     self.screen_filter_selection = filter;
                 }
             }
+            Message::Surface(a) => {
+                return cosmic::task::message(crate::app::Message::Surface(a));
+            }
         }
 
         cosmic::iced::Task::none()
diff --git a/cosmic-settings/src/pages/applications/startup_apps.rs b/cosmic-settings/src/pages/applications/startup_apps.rs
index c12debf..912ae9b 100644
--- a/cosmic-settings/src/pages/applications/startup_apps.rs
+++ b/cosmic-settings/src/pages/applications/startup_apps.rs
@@ -1,6 +1,6 @@
 use cosmic::iced::{Alignment, Length};
 use cosmic::widget::{button, icon, settings, text};
-use cosmic::{widget, Apply, Element, Task};
+use cosmic::{Apply, Element, Task, widget};
 use cosmic_settings_page::section::Entity;
 use cosmic_settings_page::{self as page, Content, Info, Section};
 use freedesktop_desktop_entry::DesktopEntry;
@@ -66,9 +66,11 @@ enum Context {
 impl Into<Vec<PathBuf>> for DirectoryType {
     fn into(self) -> Vec<PathBuf> {
         match self {
-            DirectoryType::User => vec![dirs::config_dir()
-                .expect("config dir not found")
-                .join("autostart")],
+            DirectoryType::User => vec![
+                dirs::config_dir()
+                    .expect("config dir not found")
+                    .join("autostart"),
+            ],
         }
     }
 }
@@ -309,7 +311,7 @@ impl Page {
     ) -> Element<'_, crate::pages::Message> {
         let cosmic::cosmic_theme::Spacing {
             space_s, space_l, ..
-        } = cosmic::theme::active().cosmic().spacing;
+        } = cosmic::theme::spacing();
 
         let search = widget::search_input(fl!("type-to-search"), &self.application_search)
             .on_input(Message::ApplicationSearch)
@@ -328,12 +330,12 @@ impl Page {
                         {
                             let mut row = widget::row::with_capacity(2).spacing(space_s);
 
-                            row = row.push(icon::from_name(app.icon().unwrap_or("application-default")));
+                            row = row
+                                .push(icon::from_name(app.icon().unwrap_or("application-default")));
 
                             if let Some(name) = app.name(&startup_apps.locales) {
                                 row = row.push(text(name));
-                            }
-                            else {
+                            } else {
                                 row = row.push(text(&app.appid));
                             }
 
@@ -363,13 +365,14 @@ impl Page {
 }
 
 fn apps() -> Section<crate::pages::Message> {
-    let cosmic::cosmic_theme::Spacing { space_s, .. } = cosmic::theme::active().cosmic().spacing;
+    let cosmic::cosmic_theme::Spacing {
+        space_xxs, space_s, ..
+    } = cosmic::theme::spacing();
 
     Section::default()
         .title(fl!("startup-apps"))
         .view::<Page>(move |_binder, page, _section| {
-            let mut view = widget::column::with_capacity(4)
-                .spacing(cosmic::theme::active().cosmic().space_xxs());
+            let mut view = widget::column::with_capacity(4).spacing(space_xxs);
 
             if let Some(startup_apps) = &page.cached_startup_apps {
                 let order = vec![DirectoryType::User];
@@ -386,12 +389,12 @@ fn apps() -> Section<crate::pages::Message> {
                         for app in apps {
                             let mut row = widget::row::with_capacity(2).spacing(space_s);
 
-                            row = row.push(icon::from_name(app.icon().unwrap_or("application-default")));
+                            row = row
+                                .push(icon::from_name(app.icon().unwrap_or("application-default")));
 
                             if let Some(name) = app.name(&startup_apps.locales) {
                                 row = row.push(text(name));
-                            }
-                            else {
+                            } else {
                                 row = row.push(text(&app.appid));
                             }
 
diff --git a/cosmic-settings/src/widget/mod.rs b/cosmic-settings/src/widget/mod.rs
index b7d6101..2689918 100644
--- a/cosmic-settings/src/widget/mod.rs
+++ b/cosmic-settings/src/widget/mod.rs
@@ -8,10 +8,10 @@ use cosmic::iced::{Alignment, Length};
 use cosmic::iced_core::text::Wrapping;
 use cosmic::widget::color_picker::ColorPickerUpdate;
 use cosmic::widget::{
-    self, button, column, container, divider, horizontal_space, icon, row, settings, text,
-    vertical_space, ColorPickerModel,
+    self, ColorPickerModel, button, column, container, divider, horizontal_space, icon, row,
+    settings, text, vertical_space,
 };
-use cosmic::{theme, Apply, Element};
+use cosmic::{Apply, Element, theme};
 use cosmic_settings_page as page;
 
 pub fn color_picker_context_view<'a, Message: Clone + 'static>(
@@ -124,7 +124,7 @@ pub fn page_list_item<'a, Message: 'static + Clone>(
         space_s,
         space_m,
         ..
-    } = cosmic::theme::active().cosmic().spacing;
+    } = cosmic::theme::spacing();
 
     let mut builder = cosmic::widget::settings::item::builder(title);
 
@@ -181,7 +181,10 @@ pub fn sub_page_header<'a, Message: 'static + Clone>(
         .into()
 }
 
-pub fn go_next_item<Msg: Clone + 'static>(description: &str, msg: Msg) -> cosmic::Element<'_, Msg> {
+pub fn go_next_item<Msg: Clone + 'static>(
+    description: &str,
+    msg_opt: impl Into<Option<Msg>>,
+) -> cosmic::Element<'_, Msg> {
     settings::item_row(vec![
         text::body(description).wrapping(Wrapping::Word).into(),
         horizontal_space().into(),
@@ -190,15 +193,16 @@ pub fn go_next_item<Msg: Clone + 'static>(description: &str, msg: Msg) -> cosmic
     .apply(widget::container)
     .class(cosmic::theme::Container::List)
     .apply(button::custom)
+    .padding(0)
     .class(theme::Button::Transparent)
-    .on_press(msg)
+    .on_press_maybe(msg_opt.into())
     .into()
 }
 
 pub fn go_next_with_item<'a, Msg: Clone + 'static>(
     description: &'a str,
     item: impl Into<cosmic::Element<'a, Msg>>,
-    msg: Msg,
+    msg_opt: impl Into<Option<Msg>>,
 ) -> cosmic::Element<'a, Msg> {
     settings::item_row(vec![
         text::body(description).wrapping(Wrapping::Word).into(),
@@ -207,13 +211,14 @@ pub fn go_next_with_item<'a, Msg: Clone + 'static>(
             .push(item)
             .push(icon::from_name("go-next-symbolic").size(16).icon())
             .align_y(Alignment::Center)
-            .spacing(cosmic::theme::active().cosmic().spacing.space_s)
+            .spacing(cosmic::theme::spacing().space_s)
             .into(),
     ])
     .apply(widget::container)
     .class(cosmic::theme::Container::List)
     .apply(button::custom)
+    .padding(0)
     .class(theme::Button::Transparent)
-    .on_press(msg)
+    .on_press_maybe(msg_opt.into())
     .into()
 }
diff --git a/i18n/ar/cosmic_settings.ftl b/i18n/ar/cosmic_settings.ftl
index 6e03f2a..83b4ebe 100644
--- a/i18n/ar/cosmic_settings.ftl
+++ b/i18n/ar/cosmic_settings.ftl
@@ -416,7 +416,7 @@ dialog = الحواري
         }.
     .revert-settings = استرد الإعدادات
 
-legacy-applications = تحجيم تطبيقات نظام النوافذ إكس11
+legacy-app-scaling = تحجيم تطبيقات نظام النوافذ إكس11
     .scaled-by-system = حجِّم كل تطبيقات إكس11
     .system-description = ستظهر تطبيقات إكس11 بشكل ضبابي على شاشات HiDPI.
     .scaled-natively = صيِّر تطبيقات إكس11 بميزها الأصيل
diff --git a/i18n/be/cosmic_settings.ftl b/i18n/be/cosmic_settings.ftl
index bc736fd..0d8aaa9 100644
--- a/i18n/be/cosmic_settings.ftl
+++ b/i18n/be/cosmic_settings.ftl
@@ -361,7 +361,7 @@ dialog = Дыялог
     .change-prompt = Змены налад будуць аўтаматычна вернуты праз { $time } секунд.
     .revert-settings = Вярнуць налады
 
-legacy-applications = Маштабаванне праграм аконнай сістэмы X11
+legacy-app-scaling = Маштабаванне праграм аконнай сістэмы X11
     .scaled-by-system = Маштабаваць усе праграмы X11
     .system-description = Праграмы X11 будуць размытымі на экранах HiDPI.
     .scaled-natively = Рэндэрыць праграмы X11 у роднай раздзяляльнасці
diff --git a/i18n/da/cosmic_settings.ftl b/i18n/da/cosmic_settings.ftl
index 33bf91a..e9d575e 100644
--- a/i18n/da/cosmic_settings.ftl
+++ b/i18n/da/cosmic_settings.ftl
@@ -92,11 +92,11 @@ wired = Kablet
 wifi = Wi-Fi
     .adapter = Wi-Fi adapter { $id }
     .forget = Glem dette netværk
-    
+
 wireguard-dialog = Tilføj WireGuard enhed
     .description = Vælg et enhedsnavn til WireGuard konfigurationen.
 
-## Networking: Online konti 
+## Networking: Online konti
 
 online-accounts = Online konti
     .desc = Tilføj konti, IMAP og SMTP, enterprise logins
@@ -393,7 +393,7 @@ dialog = Dialog
     .change-prompt = Ændringer af indstillinger vil automatisk vende tilbage om { $time } sekunder.
     .revert-settings = Gendan indstillinger
 
-legacy-applications = X11 Vinduessystem Applikationsskalering
+legacy-app-scaling = X11 Vinduessystem Applikationsskalering
     .scaled-by-system = Skalér alle X11 applikationer
     .system-description = X11 applikationer vil fremstå slørede på HiDPI-skærme.
     .scaled-natively = Render X11 applikationer i naturlig opløsning
@@ -515,7 +515,7 @@ keyboard-special-char = Indtastning af specialtegn
 keyboard-typing-assist = Indtastning
     .repeat-rate = Gentagelseshastighed
     .repeat-delay = Gentagelsesforsinkelse
-    
+
 added = Tilføjet
 type-to-search = Skriv for at søge...
 show-extended-input-sources = Vis udvidede inputkilder
diff --git a/i18n/de/cosmic_settings.ftl b/i18n/de/cosmic_settings.ftl
index af5b44e..4e93209 100644
--- a/i18n/de/cosmic_settings.ftl
+++ b/i18n/de/cosmic_settings.ftl
@@ -401,7 +401,7 @@ dialog = Dialog
     .change-prompt = Änderungen an den Einstellungen werden in { $time } Sekunden automatisch rückgängig gemacht.
     .revert-settings = Einstellungen rückgängig machen
 
-legacy-applications = Anwendungsskalierung des X11-Fenstersystems
+legacy-app-scaling = Anwendungsskalierung des X11-Fenstersystems
     .scaled-by-system = Alle X11-Anwendungen skalieren
     .system-description = X11-Anwendungen werden auf HiDPI-Bildschirmen unscharf dargestellt.
     .scaled-natively = X11-Anwendungen in nativer Auflösung rendern
diff --git a/i18n/es-419/cosmic-settings.ftl b/i18n/es-419/cosmic-settings.ftl
index b2c1fe5..a364d90 100644
--- a/i18n/es-419/cosmic-settings.ftl
+++ b/i18n/es-419/cosmic-settings.ftl
@@ -392,7 +392,7 @@ dialog = Diálogo
     .change-prompt = Los cambios en la configuración se revertirán automáticamente en { $time } segundos.
     .revert-settings = Revertir configuraciones
 
-legacy-applications = Escalado de aplicaciones del sistema de ventanas X11
+legacy-app-scaling = Escalado de aplicaciones del sistema de ventanas X11
     .scaled-by-system = Escalar todas las aplicaciones X11
     .system-description = Las aplicaciones X11 aparecerán borrosas en pantallas HiDPI.
     .scaled-natively = Renderizar aplicaciones X11 a resolución nativa
diff --git a/i18n/fr/cosmic_settings.ftl b/i18n/fr/cosmic_settings.ftl
index c3ee9f4..1be2ef3 100644
--- a/i18n/fr/cosmic_settings.ftl
+++ b/i18n/fr/cosmic_settings.ftl
@@ -393,7 +393,7 @@ dialog = Dialogue
     .change-prompt = Les modifications des paramètres reviendront automatiquement dans { $time } secondes.
     .revert-settings = Revenir aux paramètres
 
-legacy-applications = Mise à l'échelle des applications X11
+legacy-app-scaling = Mise à l'échelle des applications X11
     .scaled-by-system = Mettre à l'échelle toutes les applications X11
     .system-description = Les applications X11 seront floues sur les écrans HiDPI.
     .scaled-natively = Afficher toutes les applications X11 à la résolution native
diff --git a/i18n/ga/cosmic_settings.ftl b/i18n/ga/cosmic_settings.ftl
index 8045265..11552d9 100644
--- a/i18n/ga/cosmic_settings.ftl
+++ b/i18n/ga/cosmic_settings.ftl
@@ -83,13 +83,13 @@ vpn-error = Earráid VPN
         [password-flags] pasfhocail-bratacha
     } le nmcli
 
-wired = Sreangaithe  
+wired = Sreangaithe
     .adapter = Adaptóir sreangaithe { $id }
     .connections = Ceangail Sreangaithe
     .devices = Gléasanna Sreangaithe
     .remove = Bain an próifíl ceangailte
 
-wifi = Wi-Fi  
+wifi = Wi-Fi
     .adapter = Adaptóir Wi-Fi { $id }
     .forget = Déan dearmad ar an líonra seo
 
@@ -398,7 +398,7 @@ dialog = Dialóg
     .change-prompt = Rachaidh athruithe socruithe ar ais go huathoibríoch i gceann { $time } soicind.
     .revert-settings = Cuir Socruithe ar ais
 
-legacy-applications = X11 Scálú Feidhmchlár an Chórais Fuinneog
+legacy-app-scaling = X11 Scálú Feidhmchlár an Chórais Fuinneog
     .scaled-by-system = Scála gach Feidhmchlár X11
     .system-description = Feicfear feidhmchláir X11 doiléir ar scáileáin HiDPI.
     .scaled-natively = Rindreáil X11 Feidhmchláir ag taifeach dúchais
@@ -653,7 +653,7 @@ replace-shortcut-dialog = Ionadaigh Aicearra?
 
 ## Input: Mouse
 
-mouse = Luch  
+mouse = Luch
     .desc = Luas luch, luasghéarú, scrollú nádúrtha.
     .speed = Luas luch
     .acceleration = Cum luasghéarú luch
@@ -765,7 +765,7 @@ about-related = Socruithe Gaolmhara
 
 ## System: Firmware
 
-firmware = Dochtearraí 
+firmware = Dochtearraí
     .desc = Sonraí maidir le dochtearraí.
 
 ## System: Users
diff --git a/i18n/hi/cosmic_settings.ftl b/i18n/hi/cosmic_settings.ftl
index 8bd13fb..7fee10d 100644
--- a/i18n/hi/cosmic_settings.ftl
+++ b/i18n/hi/cosmic_settings.ftl
@@ -392,7 +392,7 @@ dialog = संवाद
     .change-prompt = सेटिंग में परिवर्तन { $time } सेकंड में स्वचालित रूप से वापस आ जाएगा।
     .revert-settings = सेटिंग्स वापस करें
 
-legacy-applications = X11 विंडो सिस्टम एप्लिकेशन स्केलिंग
+legacy-app-scaling = X11 विंडो सिस्टम एप्लिकेशन स्केलिंग
     .scaled-by-system = सभी X11 एप्लिकेशनों को स्केल करें
     .system-description = X11 एप्लिकेशन HiDPI स्क्रीन पर धुंधले दिखते हैं।
     .scaled-natively = स्थानीय संकल्प पर X11 एप्लिकेशनों को स्केल करें
@@ -530,7 +530,7 @@ migrate-workspace = कार्यक्षेत्र को { $direction ->
     *[down] नीचे
     [left] बायां
     [right] दायां
-    [up] ऊपर 
+    [up] ऊपर
 }
 navigate = नेविगेट करें
 replace = बदलें
diff --git a/i18n/it/cosmic_settings.ftl b/i18n/it/cosmic_settings.ftl
index 6320fe5..13c40ab 100644
--- a/i18n/it/cosmic_settings.ftl
+++ b/i18n/it/cosmic_settings.ftl
@@ -402,7 +402,7 @@ dialog = Dialog
     .change-prompt = Le impostazioni verranno automaticamente ripristinate tra { $time } secondi.
     .revert-settings = Ripristina impostazioni
 
-legacy-applications = Scala delle applicazioni del sistema X11
+legacy-app-scaling = Scala delle applicazioni del sistema X11
     .scaled-by-system = Scala tutte le applicazioni X11
     .system-description = Le applicazioni X11 appariranno sfocate su schermi HiDPI.
     .scaled-natively = Renderizza le applicazioni X11 alla risoluzione nativa
diff --git a/i18n/ja/cosmic_settings.ftl b/i18n/ja/cosmic_settings.ftl
index 6499389..ca11f81 100644
--- a/i18n/ja/cosmic_settings.ftl
+++ b/i18n/ja/cosmic_settings.ftl
@@ -225,7 +225,7 @@ dialog = ダイヤログ
     .change-prompt = { $time }秒後に設定は自動的に元に戻ります。
     .revert-settings = 元に戻す
 
-legacy-applications = X11アプリケーションのスケーリング
+legacy-app-scaling = X11アプリケーションのスケーリング
     .scaled-by-system = X11アプリを全てスケーリングする
     .system-description = HiDPI画面はX11アプリケーションがボケに見えます。
     .scaled-natively = X11アプリをネーティブの解像度で表現する
@@ -550,7 +550,7 @@ battery = Battery
   .day = { $value }日
 
   .less-than-minute = 一分以下
-  
+
   .and =
 
   .remaining-time = { $action ->
diff --git a/i18n/kn/cosmic_settings.ftl b/i18n/kn/cosmic_settings.ftl
index 4b15c99..5c63643 100644
--- a/i18n/kn/cosmic_settings.ftl
+++ b/i18n/kn/cosmic_settings.ftl
@@ -392,7 +392,7 @@ dialog = ಡೈಲಾಗ್
     .change-prompt = ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ಬದಲಾವಣೆಗಳು { $time } ಸೆಕೆಂಡುಗಳಲ್ಲಿ ಸ್ವಾಯತ್ತವಾಗಿ ಹಿಂದಿರುಗುತ್ತವೆ.
     .revert-settings = ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಹಿಂದಿರುಗಿಸಿ
 
-legacy-applications = X11 ವಿಂಡೋ ಸಿಸ್ಟಮ್ ಅಪ್ಲಿಕೇಶನ್ ಸ್ಕೇಲಿಂಗ್
+legacy-app-scaling = X11 ವಿಂಡೋ ಸಿಸ್ಟಮ್ ಅಪ್ಲಿಕೇಶನ್ ಸ್ಕೇಲಿಂಗ್
     .scaled-by-system = ಎಲ್ಲಾ X11 ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಅಳೆಯಿರಿ
     .system-description = X11 ಅಪ್ಲಿಕೇಶನ್‌ಗಳು HiDPI ಪರದೆಗಳಲ್ಲಿ ಅಸ್ಪಷ್ಟವಾಗಿ ಗೋಚರಿಸುತ್ತವೆ.
     .scaled-natively = ಸ್ಥಳೀಯ ರೆಸಲ್ಯೂಶನ್‌ನಲ್ಲಿ X11 ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಸಲ್ಲಿಸಿ
@@ -530,7 +530,7 @@ migrate-workspace = ಕಾರ್ಯಸ್ಥಳವನ್ನು { $direction ->
     *[down] ಕೆಳಕ್ಕೆ
     [left] ಎಡಕ್ಕೆ
     [right] ಬಲಕ್ಕೆ
-    [up] ಮೇಲಕ್ಕೆ 
+    [up] ಮೇಲಕ್ಕೆ
 }
 navigate = ನಾವಿಗೇಟ್ ಮಾಡಿ
 replace = ಬದಲಾಯಿಸಿ
diff --git a/i18n/nl/cosmic_settings.ftl b/i18n/nl/cosmic_settings.ftl
index 2fe2f17..3358df1 100644
--- a/i18n/nl/cosmic_settings.ftl
+++ b/i18n/nl/cosmic_settings.ftl
@@ -142,7 +142,7 @@ magnifier = Vergrootglas
                 {$zoom_in} om in te zoomen,
         }{ $zoom_out ->
              [zero] {""}
-            *[other] {""} 
+            *[other] {""}
                 {$zoom_out} om uit te zoomen,
         }
         Super + scrollwiel om te zoomen met de muis
@@ -180,7 +180,7 @@ fit-to-screen = Aan het scherm passend maken
 open-new-folder = Nieuwe map openen
 recent-folders = Recente mappen
 
-x-minutes = { $number -> 
+x-minutes = { $number ->
         [1] 1 minuut
         *[other] { $number } minuten
     }
@@ -217,8 +217,8 @@ auto-switch = Automatisch wisselen tussen lichte en donkere modus
     .next-sunrise = Wissel naar lichte modus bij de volgende zonsopgang
     .next-sunset = Wissel naar donkere modus bij de volgende zonsondergang
 
-container-background = Containerachtergrond 
-    .desc-detail = De containerachtergrondskleur wordt gebruikt voor de navigatiebalk, het zijpaneel, dialoogvensters en soortgelijke widgets. Standaard wordt deze automatisch afgeleid van de applicatie- of vensterachtergrondkleur.      
+container-background = Containerachtergrond
+    .desc-detail = De containerachtergrondskleur wordt gebruikt voor de navigatiebalk, het zijpaneel, dialoogvensters en soortgelijke widgets. Standaard wordt deze automatisch afgeleid van de applicatie- of vensterachtergrondkleur.
     .reset = Naar automatisch terugzetten
     .desc = De primaire containerkleur wordt gebruikt voor de navigatiezijbalk, het zijpaneel, dialoogvensters en soortgelijke widgets.
 
@@ -430,7 +430,7 @@ dialog = Dialoog
     .change-prompt = Instellingen worden automatisch hersteld in { $time } seconden.
     .revert-settings = Instellingen herstellen
 
-legacy-applications = Schaling van applicaties die het X11-venstersysteem gebruiken
+legacy-app-scaling = Schaling van applicaties die het X11-venstersysteem gebruiken
     .scaled-by-system = Schaal alle X11-applicaties
     .system-description = X11-applicaties worden onscherp weergegeven op HiDPI-schermen.
     .scaled-natively = X11-applicaties in native resolutie weergeven
@@ -728,7 +728,7 @@ gestures = Veeggebaren
 
 switch-workspaces = Werkbladen wisselen
     .horizontal = Met vier vingers naar links/recht vegen
-    .vertical = Met vier vingers naar boven/beneden vegen 
+    .vertical = Met vier vingers naar boven/beneden vegen
 
 switch-between-windows = Tussen vensters wisselen
 open-application-library = appmenu openen
diff --git a/i18n/pl/cosmic_settings.ftl b/i18n/pl/cosmic_settings.ftl
index 38f9f13..e9c28c5 100644
--- a/i18n/pl/cosmic_settings.ftl
+++ b/i18n/pl/cosmic_settings.ftl
@@ -143,7 +143,7 @@ magnifier = Lupa
                 {$zoom_in} aby przybliżyć,
         }{ $zoom_out ->
              [zero] {""}
-            *[other] {""} 
+            *[other] {""}
                 {$zoom_out} aby oddalić,
         }
         Super + przewijanie rolką myszy
@@ -445,7 +445,7 @@ dialog = Dialog
     }
     .revert-settings = Powróć do poprzednich ustawień
 
-legacy-applications = Skalowanie aplikacji systemu okien X11
+legacy-app-scaling = Skalowanie aplikacji systemu okien X11
     .scaled-by-system = Skaluj wszystkie aplikacje X11
     .system-description = Aplikacje X11 będą rozmyte na wyświetlaczach z wysokim DPI.
     .scaled-natively = Renderuj aplikacje X11 w pierwotnej rozdzielczości.
diff --git a/i18n/sk/cosmic_settings.ftl b/i18n/sk/cosmic_settings.ftl
index 0b5ff28..70cc1be 100644
--- a/i18n/sk/cosmic_settings.ftl
+++ b/i18n/sk/cosmic_settings.ftl
@@ -410,7 +410,7 @@ dialog = Dialóg
     .change-prompt = Zmeny nastavení sa automaticky vrátia o { $time } sekúnd.
     .revert-settings = Vrátiť nastavenia
 
-legacy-applications = Škálovanie aplikácií systému okien X11
+legacy-app-scaling = Škálovanie aplikácií systému okien X11
     .scaled-by-system = Škálovať všetky aplikácie X11
     .system-description = Aplikácie X11 sa na obrazovkách HiDPI zobrazia rozmazane.
     .scaled-natively = Vykresľovať aplikácie X11 v natívnom rozlíšení
@@ -816,4 +816,4 @@ default-apps = Predvolené aplikácie
     .calendar = Kalendár
     .terminal = Terminál
     .other-associations = Ďalšie priradenia
-    .text-editor = Textový editor
\ No newline at end of file
+    .text-editor = Textový editor
diff --git a/i18n/sv/cosmic_settings.ftl b/i18n/sv/cosmic_settings.ftl
index 40009f9..ce3bca9 100644
--- a/i18n/sv/cosmic_settings.ftl
+++ b/i18n/sv/cosmic_settings.ftl
@@ -142,14 +142,14 @@ orientation = Orientering
 
 scheduling = Schemaläggning
     .manual = Manuellt schema
-    
+
 dialog = Dialogruta
     .title = Behåll dessa skärminställningar?
     .keep-changes = Behåll ändringar
     .change-prompt = Inställningsändringar återställs automatiskt om { $time } sekunder.
     .revert-settings = Återställ inställningar
-    
-legacy-applications = X11 fönstersystem applikationsskalning
+
+legacy-app-scaling = X11 fönstersystem applikationsskalning
     .scaled-by-system = Skala alla X11 applikationer
     .system-description = X11-applikationer kommer att se suddiga ut på HiDPI-skärmar.
     .scaled-natively = Rendera X11-applikationer med inbyggd upplösning
@@ -203,7 +203,7 @@ top-panel = Övre Panel
 window-controls = Fönsterkontroller
     .minimize = Visa minimera knapp
     .maximize = Visa maximera knapp
-    
+
 focus-navigation = Fokusnavigering
     .focus-follows-cursor = Fokus följer markören
     .focus-follows-cursor-delay = Fokus följer markörens fördröjning i ms
@@ -310,7 +310,7 @@ workspaces-overview-thumbnails = Arbetsyta Översikt Miniatyrer
 workspaces-orientation = Arbetsytor Orientering
     .vertical = Vertikal
     .horizontal = Horisontell
-    
+
 hot-corner = Heta hörn
     .top-left-corner = Aktivera det övre vänstra heta hörnet för arbetsytor
 
@@ -322,19 +322,19 @@ wired = Trådbunden anslutning
     .connections = Trådbundna anslutningar
     .devices = Trådbundna enheter
     .remove = Ta bort anslutningsprofil
-    
+
 ## Nätverk: WiFi
 
 wifi = Wi-Fi
     .adapter = WiFi adapter { $id }
     .forget = Glöm detta nätverket
-    
+
 ## Nätverk: Wireguard
 
 wireguard-dialog = Lägg till WireGuard enhet
     .description = Välj ett enhetsnamn för WireGuard-konfigurationen.
-    
-    
+
+
 
 ## Nätverksanslutningar
 
@@ -386,7 +386,7 @@ vpn = VPN
     .error = Misslyckades med att lägga till en VPN-konfiguration
     .remove = Ta bort ansluten profil
     .select-file = Välj en VPN-konfigurationsfil
-    
+
     vpn-error = VPN fel
     .config = Misslyckades med att lägga till en VPN-konfiguration
     .connect = Misslyckades att ansluta till VPN
@@ -422,14 +422,14 @@ bluetooth = Bluetooth
     .forget = Glöm bort
     .dbus-error = Ett fel har uppstått under interaktion med DBus: { $why }
     .show-device-without-name = Visa enheter utan namn
-    
+
 bluetooth-paired = Tidigare anslutna enheter
     .connect = Anslut
     .battery = { $percentage }% batteri
-    
+
 bluetooth-confirm-pin = Bekräfta Bluetooth PIN
     .description = Kontrollera att följande PIN-kod stämmer överens med den som visas på { $device }
-    
+
 bluetooth-available = Enheter i närheten
 
 bluetooth-adapters = Bluetooth Adapters
@@ -460,7 +460,7 @@ time-format = Datum & tidsformat
 
 time-region = Region & språk
     .desc = Formatera datum, tider och siffror baserat på din region
-    
+
     formatting = Formatering
     .dates = Datum
     .time = Tid
@@ -471,7 +471,7 @@ time-region = Region & språk
 
 preferred-languages = Föredragna språk
     .desc = Ordningen på språken avgör vilket språk som används för översättningen av skrivbordsmiljön. Ändringar träder i kraft vid nästa inloggning.
-    
+
 add-language = Lägg till språk
     .context = Lägg till språk
 install-additional-languages = Installera ytterligare språk
@@ -635,7 +635,7 @@ keyboard-sources = Inmatningskällor
     .view-layout = Visa tangentbordslayout
     .remove = Ta bort
     .add = Lägg till källa
-    
+
 keyboard-special-char = Specialkaraktärsinmatning
     .alternate = Knapp för alternativa tecken
     .compose = Compose knapp
@@ -653,7 +653,7 @@ show-extended-input-sources = Visa utökade ingångskällor
 
 keyboard-shortcuts = Tangentbordsgenvägar
     .desc = Visa och anpassa genvägar
-   
+
 add-keybinding = Lägg till tangentbindning
 cancel = Avbryt
 command = Kommando
@@ -667,7 +667,7 @@ migrate-workspace = Migrera arbetsytan till utdata { $direction ->
     [left] vänster
     [right] höger
     [up] upp
-    
+
 navigate = Navigera
 replace = Byt ut
 shortcut-name = Genvägsnamn
@@ -680,7 +680,7 @@ custom-shortcuts = Anpassade genvägar
     .add = Lägg till genväg
     .context = Lägg till anpassad genväg
     .none = Inga anpassade genvägar
-    
+
 modified = { $count } modiferad
 
 nav-shortcuts = Navigation
@@ -704,7 +704,7 @@ nav-shortcuts = Navigation
         [up] upp
     }
     .workspace = Ändra till arbetsyta { $num }
-    
+
 manage-windows = Hantera fönster
     .close = Stäng fönster
     .maximize = Maximera fönster
@@ -712,7 +712,7 @@ manage-windows = Hantera fönster
     .resize-inwards = Ändra storlek på fönstret inåt
     .resize-outwards = Ändra storlek på fönstret utåt
     .toggle-sticky = Växla klibbigt fönster
-    
+
 move-windows = Flytta fönster
     .direction = Flytta fönster { $direction ->
         *[down] ned
@@ -740,7 +740,7 @@ move-windows = Flytta fönster
     .prev-display = Flytta fönster till föregående skärm
     .send-to-prev-workspace = Flytta fönster till föregående arbetsyta
     .send-to-next-workspace = Flytta fönster till nästa arbetsyta
-    
+
 system-shortcut = System
     .app-library = Öppna app bibliotek
     .brightness-down = Minska skärmens ljusstyrka
@@ -762,7 +762,7 @@ system-shortcut = System
     .web-browser = Öppna en webbläsare
     .window-switcher = Växla mellan öppna fönster
     .workspace-overview = Öppna översikten över arbetsytor
-    
+
 window-tiling = Kakelsättning av fönster
     .horizontal = Ställ in horisontell orientering
     .vertical = Ställ in vertikal orientering
@@ -771,7 +771,7 @@ window-tiling = Kakelsättning av fönster
     .toggle-stacking = Växla fönsterstapling
     .toggle-floating = Växla flytande fönster
     .toggle-orientation = Växla orientering
-    
+
 replace-shortcut-dialog = Byt ut genväg?
     .desc = { $shortcut } används av { $name }. Om du byter ut den så kommer, { $name } att inaktiveras.
 
@@ -787,10 +787,10 @@ mouse = Mus
 click-behavior = Klickbeteende
     .click-finger = Sekundärklicka med två fingrar och mellanklicka med tre fingrar
     .button-areas = Sekundärklicka i det nedre högra hörnet och mittenklicka längst ner i mitten
-    
+
  pinch-to-zoom = Nyp för att zooma
     .desc = Använd två fingrar för att zooma in på innehåll, för applikationer som stöder zoom.
-    
+
 tap-to-click = Tryck för att klicka
     .desc = Aktiverar tryck med ett finger för primärt klick, tryck med två fingrar för sekundärt klick och tryck med tre fingrar för mittenklick.
 
@@ -811,7 +811,7 @@ gestures = Gester
 switch-workspaces = Ändra arbetsyta
     .horizontal = Fyra fingrar svep vänster/höger
     .vertical = Fyra fingrar svep upp/ned
-    
+
 switch-between-windows = Ändra mellan fönster
 open-application-library = Öppna Applikationsbibliotek
 open-workspaces-view = Öppna Översikt över arbetsytor
diff --git a/i18n/th/cosmic_settings.ftl b/i18n/th/cosmic_settings.ftl
index 55a8f66..f038ff5 100644
--- a/i18n/th/cosmic_settings.ftl
+++ b/i18n/th/cosmic_settings.ftl
@@ -392,7 +392,7 @@ dialog = ไดอะล็อก
     .change-prompt = การเปลี่ยนแปลงการตั้งค่าจะคืนค่าเดิมภายใน { $time } วินาที
     .revert-settings = คงค่าการตั้งค่าเดิม
 
-legacy-applications = การขยายแอพลิเคชั่นที่ใช้ระบบจัดการหน้าต่าง X11
+legacy-app-scaling = การขยายแอพลิเคชั่นที่ใช้ระบบจัดการหน้าต่าง X11
     .scaled-by-system = ขยายแอพลิเคชั่น X11 ทั้งหมด
     .system-description = แอพลิเคชั่น X11 จะเบลอบนหน้าจอ HiDPI
     .scaled-natively = แสดงแอพลิเคชั่น X11 ทั้งหมดที่ความละเอียดดั้งเดิม
diff --git a/i18n/tr/cosmic_settings.ftl b/i18n/tr/cosmic_settings.ftl
index 0ecf18b..83f3482 100644
--- a/i18n/tr/cosmic_settings.ftl
+++ b/i18n/tr/cosmic_settings.ftl
@@ -116,7 +116,7 @@ bluetooth = Bluetooth
     .forget = Unut
     .dbus-error = DBus ile etkileşirken bir hata meydana geldi: { $why }
 
-bluetooth-paired = Önceden Bağlanılan Aygıtlar 
+bluetooth-paired = Önceden Bağlanılan Aygıtlar
     .connect = Bağlan
     .battery = %{ $percentage } şarj
 
@@ -214,7 +214,7 @@ window-hint-accent-toggle = Etkin pencereyi belirtmek için tema vurgu rengini k
 auto-switch = Otomatik olarak Açık ve Koyu modlar arasında geçiş yap
     .sunrise = Gün doğumunda Açık moda geçer
     .sunset = Gün batımında Koyu moda geçer
-    .next-sunrise = Bir dahaki gün doğumunda Açık moda geçer 
+    .next-sunrise = Bir dahaki gün doğumunda Açık moda geçer
     .next-sunset = Bir dahaki gün doğumunda Koyu moda geçer
 
 container-background = Konteyner arka planı
@@ -235,7 +235,7 @@ icon-theme = Simge Teması
     .desc = Uygulamalara farklı birtakım simgeler uygular.
 
 text-tint = Arayüz metin tonlaması
-    .desc = Çeşitli yüzeylerde yeterli kontrasta sahip metinlerin rengini belirlemekte kullanılan renk 
+    .desc = Çeşitli yüzeylerde yeterli kontrasta sahip metinlerin rengini belirlemekte kullanılan renk
 
 style = Stil
     .round = Yuvarlak
@@ -292,7 +292,7 @@ panel-appearance = Görünüm
 
 panel-behavior-and-position = Davranış ve Konumlar
     .autohide = Paneli otomatik gizle
-    .dock-autohide = Docku otomatik gizle 
+    .dock-autohide = Docku otomatik gizle
     .position = Ekrandaki konum
     .display = Ekranda göster
 
@@ -428,10 +428,10 @@ dialog = Diyalog
     .change-prompt = { $time } saniye içinde önceki görüntü ayarlarına dönülecek.
     .revert-settings = Ayarları Geri Al
 
-legacy-applications = X11 Pencere Sistemi Uygulama Ölçeği
+legacy-app-scaling = X11 Pencere Sistemi Uygulama Ölçeği
     .scaled-by-system = Tüm X11 Uygulamalarını ölçekle
     .system-description = X11 Uygulamaları HiDPI ekranlarda bulanık gözükecek.
-    .scaled-natively = X11 Uygulamalarını kendi çözünürlüğünde renderla 
+    .scaled-natively = X11 Uygulamalarını kendi çözünürlüğünde renderla
     .native-description = Ölçekleme desteklemeyen X11 uygulamaları HiDPI ekran kullanıldığında küçük gözükecek. Oyunların ekran çözünürlüğünün tamamından faydalanması için etkinleştirin.
 
 ## Sound
@@ -483,7 +483,7 @@ battery = Pil
   .remaining-time = { $action ->
         [full] Dolmasına
        *[other] Bitmesine
-   } { $time } 
+   } { $time }
 
 connected-devices = Bağlı Aygıtlar
   .unknown = Bilinmeyen aygıt
@@ -601,7 +601,7 @@ nav-shortcuts = Gezinim
     .prev-output = Önceki çıktıya odaklan
     .next-output = Sonraki çıktıya odaklan
     .last-workspace = Son çalışma alanına odaklan
-    .prev-workspace = Önceki çalışma alanına odaklan 
+    .prev-workspace = Önceki çalışma alanına odaklan
     .next-workspace = Sonraki çalışma alanına odaklan
     .focus = { $direction ->
         *[down] Aşağıdaki
@@ -705,9 +705,9 @@ mouse = Fare
 
 click-behavior = Tıklama davranışı
     .click-finger = İki parmak ile ikincil tıklama ve üç parmak ile orta tıklama
-    .button-areas = Sağ alt köşede ikincil tıklama ve orta alt kenarında orta tıklama 
+    .button-areas = Sağ alt köşede ikincil tıklama ve orta alt kenarında orta tıklama
 
-pinch-to-zoom = İki parmakla yakınlaştırma 
+pinch-to-zoom = İki parmakla yakınlaştırma
     .desc = Yakınlaştırma destekleyen uygulamalar için iki parmağınıla sıkıştırarak ve genişleterek yaklaştırın ve uzaklaştırın.
 
 tap-to-click = Tıklamak için dokun
@@ -771,7 +771,7 @@ formatting = Biçimlendirme
     .paper = Kağıt
 
 preferred-languages = Tercih Edilen Diller
-    .desc = Dillerin sırası masaüstünün çevirisinde hangi dilin kullanılacağını belirler. Değişiklikler bir dahaki girişinizde geçerli olur. 
+    .desc = Dillerin sırası masaüstünün çevirisinde hangi dilin kullanılacağını belirler. Değişiklikler bir dahaki girişinizde geçerli olur.
 
 add-language = Dil ekle
     .context = Dil Ekle
@@ -840,4 +840,3 @@ default-apps = Varsayılan Uygulamalar
     .terminal = Uçbirim
     .other-associations = Diğer ilişkiler
     .text-editor = Metin Düzenleyici
-