diff --git a/app/src/app.rs b/app/src/app.rs
index ab05626..03f742e 100644
--- a/app/src/app.rs
+++ b/app/src/app.rs
@@ -149,7 +149,7 @@ impl cosmic::Application for SettingsApp {
         } else {
             icon::from_name("system-search-symbolic")
                 .apply(button::icon)
-                .padding([0, 16])
+                .padding([0, cosmic::theme::active().cosmic().space_s()])
                 .on_press(Message::SearchActivate)
                 .into()
         });
@@ -420,6 +420,8 @@ impl cosmic::Application for SettingsApp {
     }
 
     fn view(&self) -> Element<Message> {
+        let theme = cosmic::theme::active();
+
         let page_view = if self.search_active {
             self.search_view()
         } else if let Some(content) = self.pages.content(self.active_page) {
@@ -430,14 +432,18 @@ impl cosmic::Application for SettingsApp {
             panic!("page without sub-pages or content");
         };
 
-        let padding = if self.core.is_condensed() { 0 } else { 64 };
+        let padding = if self.core.is_condensed() {
+            0
+        } else {
+            theme.cosmic().space_l()
+        };
 
         container(page_view)
             .max_width(800)
             .width(Length::Fill)
             .apply(container)
             .center_x()
-            .padding([0, padding])
+            .padding([theme.cosmic().space_xxs(), padding])
             .width(Length::Fill)
             .apply(scrollable)
             .into()
@@ -601,9 +607,10 @@ impl SettingsApp {
                 Message::Page(parent),
             );
 
-            let mut page_header_content = row::with_capacity(2)
-                .align_items(iced::Alignment::End)
-                .push(page_header);
+            let mut page_header_content: cosmic::iced_widget::Row<'_, Message, Theme> =
+                row::with_capacity(2)
+                    .align_items(iced::Alignment::End)
+                    .push(page_header);
 
             if let Some(element) = page.header_view() {
                 page_header_content = page_header_content.push(element.map(Message::from));
@@ -622,7 +629,7 @@ impl SettingsApp {
             );
         }
 
-        settings::view_column(column_widgets).padding(0).into()
+        settings::view_column(column_widgets).into()
     }
 
     fn search_changed(&mut self, phrase: String) {
@@ -676,7 +683,7 @@ impl SettingsApp {
             let section = (section.view_fn)(&self.pages, model.as_ref(), section)
                 .map(Message::PageMessage)
                 .apply(iced::widget::container)
-                .padding([0, 0, 0, 48]);
+                .padding([0, 0, 0, cosmic::theme::active().cosmic().space_xl()]);
 
             sections.push(section.into());
         }
@@ -686,7 +693,9 @@ impl SettingsApp {
 
     /// Displays the sub-pages view of a page.
     fn sub_page_view(&self, sub_pages: &[page::Entity]) -> cosmic::Element<Message> {
-        let mut page_list = column::with_capacity(sub_pages.len()).spacing(18);
+        let theme = cosmic::theme::active();
+        let mut page_list =
+            column::with_capacity(sub_pages.len()).spacing(theme.cosmic().space_s());
 
         for entity in sub_pages.iter().copied() {
             let sub_page = &self.pages.info[entity];
@@ -701,7 +710,8 @@ impl SettingsApp {
         column::with_capacity(2)
             .push(page_title(&self.pages.info[self.active_page]))
             .push(Element::from(page_list).map(Message::Page))
-            .spacing(24)
+            .spacing(theme.cosmic().space_m())
+            .padding(0)
             .into()
     }
 }
diff --git a/app/src/pages/display/mod.rs b/app/src/pages/display/mod.rs
index b693a57..ca8825b 100644
--- a/app/src/pages/display/mod.rs
+++ b/app/src/pages/display/mod.rs
@@ -362,9 +362,14 @@ impl Page {
 
     /// View for the display arrangement section.
     pub fn display_arrangement_view(&self) -> Element<pages::Message> {
+        let theme = cosmic::theme::active();
+
         column()
-            .padding(cosmic::iced::Padding::from([16, 24]))
-            .spacing(10)
+            .padding(cosmic::iced::Padding::from([
+                theme.cosmic().space_s(),
+                theme.cosmic().space_m(),
+            ]))
+            .spacing(theme.cosmic().space_xs())
             .push(cosmic::widget::text::body(&*text::DISPLAY_ARRANGEMENT_DESC))
             .push({
                 Arrangement::new(&self.list, &self.display_tabs)
@@ -383,6 +388,8 @@ impl Page {
 
     /// View for the display configuration section.
     pub fn display_view(&self) -> Element<pages::Message> {
+        let theme = cosmic::theme::active();
+
         let Some(&active_id) = self.display_tabs.active_data::<OutputKey>() else {
             return column().into();
         };
@@ -436,7 +443,7 @@ impl Page {
             ));
 
         column()
-            .spacing(24)
+            .spacing(theme.cosmic().space_m())
             .push(view_switcher::horizontal(&self.display_tabs).on_activate(Message::Display))
             .push(display_meta)
             .push(cosmic::widget::text::heading(&*text::DISPLAY_OPTIONS))
@@ -541,7 +548,7 @@ impl Page {
                 .iter()
                 .filter_map(|&id| self.list.modes.get(id).map(|m| (id, m)))
             {
-                let refresh_rates = self.cache.modes.entry(mode.size).or_insert_with(Vec::new);
+                let refresh_rates = self.cache.modes.entry(mode.size).or_default();
 
                 refresh_rates.push(mode.refresh_rate);