diff --git a/cosmic-app-list/src/app.rs b/cosmic-app-list/src/app.rs
index 9f252a7d..cab8be2f 100755
--- a/cosmic-app-list/src/app.rs
+++ b/cosmic-app-list/src/app.rs
@@ -922,7 +922,7 @@ impl cosmic::Application for CosmicAppList {
                 Length::Fill,
                 dnd_listener(column(favorites)),
                 column(active).into(),
-                container(divider::horizontal::light())
+                container(divider::horizontal::default())
                     .width(self.core.applet.suggested_size().1)
                     .into(),
             )
@@ -1045,9 +1045,9 @@ impl cosmic::Application for CosmicAppList {
                             .on_press(Message::Activate(handle.clone())),
                     );
                 }
-                content = content.push(divider::horizontal::light());
+                content = content.push(divider::horizontal::default());
                 content = content.push(list_col);
-                content = content.push(divider::horizontal::light());
+                content = content.push(divider::horizontal::default());
             }
             content = content.push(if is_favorite {
                 cosmic::widget::button(iced::widget::text(fl!("unfavorite")))
diff --git a/cosmic-applet-audio/src/main.rs b/cosmic-applet-audio/src/main.rs
index 7cd51724..01941fd5 100644
--- a/cosmic-applet-audio/src/main.rs
+++ b/cosmic-applet-audio/src/main.rs
@@ -2,11 +2,12 @@ mod localize;
 
 use cosmic::app::Command;
 use cosmic::applet::menu_button;
+use cosmic::applet::padded_control;
 use cosmic::iced::widget;
 use cosmic::iced::Limits;
 use cosmic::iced_runtime::core::alignment::Horizontal;
 
-use cosmic::widget::{button, divider, icon};
+use cosmic::widget::{divider, icon};
 use cosmic::Renderer;
 
 use cosmic::iced::{
@@ -362,43 +363,45 @@ impl cosmic::Application for Audio {
         .0 * 100.0;
 
         let audio_content = if audio_disabled {
-            column![text(fl!("disconnected"))
-                .width(Length::Fill)
-                .horizontal_alignment(Horizontal::Center)
-                .size(24),]
+            column![padded_control(
+                text(fl!("disconnected"))
+                    .width(Length::Fill)
+                    .horizontal_alignment(Horizontal::Center)
+                    .size(24)
+            )]
         } else {
             column![
-                row![
-                    icon::from_name(self.icon_name.as_str())
-                        .size(24)
-                        .symbolic(true),
-                    slider(0.0..=100.0, out_f64, Message::SetOutputVolume)
-                        .width(Length::FillPortion(5)),
-                    text(format!("{}%", out_f64.round()))
-                        .size(16)
-                        .width(Length::FillPortion(1))
-                        .horizontal_alignment(Horizontal::Right)
-                ]
-                .spacing(12)
-                .align_items(Alignment::Center)
-                .padding([8, 24]),
-                row![
-                    icon::from_name(self.input_icon_name.as_str())
-                        .size(24)
-                        .symbolic(true),
-                    slider(0.0..=100.0, in_f64, Message::SetInputVolume)
-                        .width(Length::FillPortion(5)),
-                    text(format!("{}%", in_f64.round()))
-                        .size(16)
-                        .width(Length::FillPortion(1))
-                        .horizontal_alignment(Horizontal::Right)
-                ]
-                .spacing(12)
-                .align_items(Alignment::Center)
-                .padding([8, 24]),
-                container(divider::horizontal::light())
-                    .padding([12, 24])
-                    .width(Length::Fill),
+                padded_control(
+                    row![
+                        icon::from_name(self.icon_name.as_str())
+                            .size(24)
+                            .symbolic(true),
+                        slider(0.0..=100.0, out_f64, Message::SetOutputVolume)
+                            .width(Length::FillPortion(5)),
+                        text(format!("{}%", out_f64.round()))
+                            .size(16)
+                            .width(Length::FillPortion(1))
+                            .horizontal_alignment(Horizontal::Right)
+                    ]
+                    .spacing(12)
+                    .align_items(Alignment::Center)
+                ),
+                padded_control(
+                    row![
+                        icon::from_name(self.input_icon_name.as_str())
+                            .size(24)
+                            .symbolic(true),
+                        slider(0.0..=100.0, in_f64, Message::SetInputVolume)
+                            .width(Length::FillPortion(5)),
+                        text(format!("{}%", in_f64.round()))
+                            .size(16)
+                            .width(Length::FillPortion(1))
+                            .horizontal_alignment(Horizontal::Right)
+                    ]
+                    .spacing(12)
+                    .align_items(Alignment::Center)
+                ),
+                padded_control(divider::horizontal::default()),
                 revealer(
                     self.is_open == IsOpen::Output,
                     fl!("output"),
@@ -440,9 +443,7 @@ impl cosmic::Application for Audio {
         };
         let content = column![
             audio_content,
-            container(divider::horizontal::light())
-                .padding([12, 24])
-                .width(Length::Fill),
+            padded_control(divider::horizontal::default()),
             container(
                 anim!(
                     // toggler
@@ -455,9 +456,7 @@ impl cosmic::Application for Audio {
                 .text_size(14)
             )
             .padding([0, 24]),
-            container(divider::horizontal::light())
-                .padding([12, 24])
-                .width(Length::Fill),
+            padded_control(divider::horizontal::default()),
             menu_button(text(fl!("sound-settings")).size(14))
         ]
         .align_items(Alignment::Start)
diff --git a/cosmic-applet-battery/src/app.rs b/cosmic-applet-battery/src/app.rs
index 430ecb05..a9028f36 100644
--- a/cosmic-applet-battery/src/app.rs
+++ b/cosmic-applet-battery/src/app.rs
@@ -10,7 +10,7 @@ use crate::upower_device::{device_subscription, DeviceDbusEvent};
 use crate::upower_kbdbacklight::{
     kbd_backlight_subscription, KeyboardBacklightRequest, KeyboardBacklightUpdate,
 };
-use cosmic::applet::menu_button;
+use cosmic::applet::{menu_button, padded_control};
 use cosmic::iced::alignment::Horizontal;
 use cosmic::iced::wayland::popup::{destroy_popup, get_popup};
 use cosmic::iced::{
@@ -19,7 +19,7 @@ use cosmic::iced::{
 };
 use cosmic::iced_runtime::core::layout::Limits;
 use cosmic::iced_style::application;
-use cosmic::widget::{button, divider, horizontal_space, icon};
+use cosmic::widget::{divider, horizontal_space, icon};
 use cosmic::Command;
 use cosmic::{Element, Theme};
 use cosmic_time::{anim, chain, id, once_cell::sync::Lazy, Instant, Timeline};
@@ -317,16 +317,15 @@ impl cosmic::Application for CosmicBatteryApplet {
             .applet
             .popup_container(
                 column![
-                    row![
-                        icon::from_name(&*self.icon_name).size(24).symbolic(true),
-                        column![name, description]
-                    ]
-                    .padding([0, 24])
-                    .spacing(8)
-                    .align_items(Alignment::Center),
-                    container(divider::horizontal::light())
-                        .width(Length::Fill)
-                        .padding([0, 12]),
+                    padded_control(
+                        row![
+                            icon::from_name(&*self.icon_name).size(24).symbolic(true),
+                            column![name, description]
+                        ]
+                        .spacing(8)
+                        .align_items(Alignment::Center)
+                    ),
+                    padded_control(divider::horizontal::default()),
                     menu_button(
                         row![
                             column![
@@ -387,10 +386,8 @@ impl cosmic::Application for CosmicBatteryApplet {
                         .align_items(Alignment::Center)
                     )
                     .on_press(Message::SelectProfile(Power::Performance)),
-                    container(divider::horizontal::light())
-                        .width(Length::Fill)
-                        .padding([0, 12]),
-                    container(
+                    padded_control(divider::horizontal::default()),
+                    padded_control(
                         anim!(
                             //toggler
                             MAX_CHARGE,
@@ -401,47 +398,43 @@ impl cosmic::Application for CosmicBatteryApplet {
                         )
                         .text_size(14)
                         .width(Length::Fill)
-                    )
-                    .padding([0, 24])
-                    .width(Length::Fill),
-                    container(divider::horizontal::light())
-                        .width(Length::Fill)
-                        .padding([0, 12]),
-                    row![
-                        icon::from_name(self.display_icon_name.as_str())
-                            .size(24)
-                            .symbolic(true),
-                        slider(
-                            1..=100,
-                            (self.screen_brightness * 100.0) as i32,
-                            Message::SetScreenBrightness
-                        ),
-                        text(format!("{:.0}%", self.screen_brightness * 100.0))
-                            .size(16)
-                            .width(Length::Fixed(40.0))
-                            .horizontal_alignment(Horizontal::Right)
-                    ]
-                    .padding([0, 24])
-                    .spacing(12),
-                    row![
-                        icon::from_name("keyboard-brightness-symbolic")
-                            .size(24)
-                            .symbolic(true),
-                        slider(
-                            0..=100,
-                            (self.kbd_brightness * 100.0) as i32,
-                            Message::SetKbdBrightness
-                        ),
-                        text(format!("{:.0}%", self.kbd_brightness * 100.0))
-                            .size(16)
-                            .width(Length::Fixed(40.0))
-                            .horizontal_alignment(Horizontal::Right)
-                    ]
-                    .padding([0, 24])
-                    .spacing(12),
-                    container(divider::horizontal::light())
-                        .width(Length::Fill)
-                        .padding([0, 12]),
+                    ),
+                    padded_control(divider::horizontal::default()),
+                    padded_control(
+                        row![
+                            icon::from_name(self.display_icon_name.as_str())
+                                .size(24)
+                                .symbolic(true),
+                            slider(
+                                1..=100,
+                                (self.screen_brightness * 100.0) as i32,
+                                Message::SetScreenBrightness
+                            ),
+                            text(format!("{:.0}%", self.screen_brightness * 100.0))
+                                .size(16)
+                                .width(Length::Fixed(40.0))
+                                .horizontal_alignment(Horizontal::Right)
+                        ]
+                        .spacing(12)
+                    ),
+                    padded_control(
+                        row![
+                            icon::from_name("keyboard-brightness-symbolic")
+                                .size(24)
+                                .symbolic(true),
+                            slider(
+                                0..=100,
+                                (self.kbd_brightness * 100.0) as i32,
+                                Message::SetKbdBrightness
+                            ),
+                            text(format!("{:.0}%", self.kbd_brightness * 100.0))
+                                .size(16)
+                                .width(Length::Fixed(40.0))
+                                .horizontal_alignment(Horizontal::Right)
+                        ]
+                        .spacing(12)
+                    ),
+                    padded_control(divider::horizontal::default()),
                     menu_button(text(fl!("power-settings")).size(14).width(Length::Fill))
                         .on_press(Message::OpenBatterySettings)
                 ]
diff --git a/cosmic-applet-bluetooth/src/app.rs b/cosmic-applet-bluetooth/src/app.rs
index 1b2a1922..391f8639 100644
--- a/cosmic-applet-bluetooth/src/app.rs
+++ b/cosmic-applet-bluetooth/src/app.rs
@@ -1,6 +1,5 @@
 use crate::bluetooth::{BluerDeviceStatus, BluerRequest, BluerState};
-use cosmic::applet::menu_button;
-use cosmic::widget::button::StyleSheet;
+use cosmic::applet::{menu_button, padded_control};
 use cosmic::Command;
 use cosmic::{
     iced::{
@@ -15,7 +14,6 @@ use cosmic::{
         window,
     },
     iced_style::application,
-    theme::Button,
     widget::{button, divider, icon, toggler},
     Element, Theme,
 };
@@ -297,24 +295,6 @@ impl cosmic::Application for CosmicBluetoothApplet {
     }
 
     fn view_window(&self, _id: window::Id) -> Element<Message> {
-        let button_style = || Button::Custom {
-            active: Box::new(|active, t| button::Appearance {
-                border_radius: 0.0.into(),
-                ..t.active(active, &Button::Text)
-            }),
-            disabled: Box::new(|t| button::Appearance {
-                border_radius: 0.0.into(),
-                ..t.disabled(&Button::Text)
-            }),
-            hovered: Box::new(|hovered, t| button::Appearance {
-                border_radius: 0.0.into(),
-                ..t.hovered(hovered, &Button::Text)
-            }),
-            pressed: Box::new(|pressed, t| button::Appearance {
-                border_radius: 0.0.into(),
-                ..t.pressed(pressed, &Button::Text)
-            }),
-        };
         let mut known_bluetooth = column![];
         for dev in self.bluer_state.devices.iter().filter(|d| {
             !self
@@ -373,26 +353,30 @@ impl cosmic::Application for CosmicBluetoothApplet {
 
         let mut content = column![
             column![
-                toggler(fl!("bluetooth"), self.bluer_state.bluetooth_enabled, |m| {
-                    Message::Request(BluerRequest::SetBluetoothEnabled(m))
-                },)
-                .text_size(14)
-                .width(Length::Fill),
+                padded_control(
+                    toggler(fl!("bluetooth"), self.bluer_state.bluetooth_enabled, |m| {
+                        Message::Request(BluerRequest::SetBluetoothEnabled(m))
+                    },)
+                    .text_size(14)
+                    .width(Length::Fill)
+                ),
                 // these are not in the UX mockup, but they are useful imo
-                toggler(fl!("discoverable"), self.bluer_state.discoverable, |m| {
-                    Message::Request(BluerRequest::SetDiscoverable(m))
-                },)
-                .text_size(14)
-                .width(Length::Fill),
-                toggler(fl!("pairable"), self.bluer_state.pairable, |m| {
-                    Message::Request(BluerRequest::SetPairable(m))
-                },)
-                .text_size(14)
-                .width(Length::Fill)
-            ]
-            .spacing(8)
-            .padding([0, 12]),
-            divider::horizontal::light(),
+                padded_control(
+                    toggler(fl!("discoverable"), self.bluer_state.discoverable, |m| {
+                        Message::Request(BluerRequest::SetDiscoverable(m))
+                    },)
+                    .text_size(14)
+                    .width(Length::Fill)
+                ),
+                padded_control(
+                    toggler(fl!("pairable"), self.bluer_state.pairable, |m| {
+                        Message::Request(BluerRequest::SetPairable(m))
+                    },)
+                    .text_size(14)
+                    .width(Length::Fill)
+                )
+            ],
+            padded_control(divider::horizontal::default()),
             known_bluetooth,
         ]
         .align_items(Alignment::Center)
@@ -415,7 +399,6 @@ impl cosmic::Application for CosmicBluetoothApplet {
                 .width(Length::Fixed(24.0))
                 .height(Length::Fixed(24.0))
         ])
-        .padding([8, 24])
         .on_press(Message::ToggleVisibleDevices(!self.show_visible_devices));
         content = content.push(available_connections_btn);
         let mut list_column: Vec<Element<'_, Message>> =
@@ -423,54 +406,60 @@ impl cosmic::Application for CosmicBluetoothApplet {
 
         if let Some((device, pin, _)) = self.request_confirmation.as_ref() {
             let row = column![
-                icon::from_name(device.icon.as_str())
-                    .size(16)
-                    .symbolic(true),
-                text(&device.name)
-                    .size(14)
+                padded_control(row![
+                    icon::from_name(device.icon.as_str())
+                        .size(16)
+                        .symbolic(true),
+                    text(&device.name)
+                        .size(14)
+                        .horizontal_alignment(Horizontal::Left)
+                        .vertical_alignment(Vertical::Center)
+                        .width(Length::Fill)
+                ]),
+                padded_control(
+                    text(fl!(
+                        "confirm-pin",
+                        HashMap::from_iter(vec![("deviceName", device.name.clone())])
+                    ))
                     .horizontal_alignment(Horizontal::Left)
                     .vertical_alignment(Vertical::Center)
-                    .width(Length::Fill),
-                text(fl!(
-                    "confirm-pin",
-                    HashMap::from_iter(vec![("deviceName", device.name.clone())])
-                ))
-                .horizontal_alignment(Horizontal::Left)
-                .vertical_alignment(Vertical::Center)
-                .width(Length::Fill)
-                .size(14),
-                text(pin)
-                    .horizontal_alignment(Horizontal::Center)
-                    .vertical_alignment(Vertical::Center)
                     .width(Length::Fill)
-                    .size(22),
-                row![
-                    button(
-                        text(fl!("cancel"))
-                            .size(14)
-                            .width(Length::Fill)
-                            .height(Length::Fixed(24.0))
-                            .vertical_alignment(Vertical::Center)
-                    )
-                    .padding([8, 24])
-                    .style(button_style())
-                    .on_press(Message::Cancel)
-                    .width(Length::Fill),
-                    button(
-                        text(fl!("confirm"))
-                            .size(14)
-                            .width(Length::Fill)
-                            .height(Length::Fixed(24.0))
-                            .vertical_alignment(Vertical::Center)
-                    )
-                    .padding([8, 24])
-                    .style(button_style())
-                    .on_press(Message::Confirm)
-                    .width(Length::Fill),
-                ]
-            ]
-            .padding([0, 24])
-            .spacing(12);
+                    .size(14)
+                ),
+                padded_control(
+                    text(pin)
+                        .horizontal_alignment(Horizontal::Center)
+                        .vertical_alignment(Vertical::Center)
+                        .width(Length::Fixed(280.0))
+                        .size(22)
+                )
+                .align_x(Horizontal::Center),
+                padded_control(
+                    row![
+                        button(
+                            text(fl!("cancel"))
+                                .size(14)
+                                .width(Length::Fill)
+                                .height(Length::Fixed(24.0))
+                                .vertical_alignment(Vertical::Center)
+                        )
+                        .padding([8, 24])
+                        .on_press(Message::Cancel),
+                        button(
+                            text(fl!("confirm"))
+                                .size(14)
+                                .width(Length::Fill)
+                                .height(Length::Fixed(24.0))
+                                .vertical_alignment(Vertical::Center)
+                        )
+                        .padding([8, 24])
+                        .on_press(Message::Confirm),
+                    ]
+                    .align_items(Alignment::Center)
+                    .spacing(8)
+                )
+                .align_x(Horizontal::Center)
+            ];
             list_column.push(row.into());
         }
         let mut visible_devices_count = 0;
@@ -491,7 +480,6 @@ impl cosmic::Application for CosmicBluetoothApplet {
                         .horizontal_alignment(Horizontal::Left)
                         .size(14),
                 ]
-                .width(Length::Fill)
                 .align_items(Alignment::Center)
                 .spacing(12);
                 visible_devices =
diff --git a/cosmic-applet-graphics/src/window.rs b/cosmic-applet-graphics/src/window.rs
index e87747d1..cb326617 100644
--- a/cosmic-applet-graphics/src/window.rs
+++ b/cosmic-applet-graphics/src/window.rs
@@ -1,18 +1,15 @@
 use crate::dbus::{self, PowerDaemonProxy};
 use crate::fl;
 use crate::graphics::{get_current_graphics, set_graphics, Graphics};
-use cosmic::app::command::message::cosmic;
-use cosmic::applet::menu_button;
+use cosmic::applet::{menu_button, padded_control};
 use cosmic::iced::wayland::popup::{destroy_popup, get_popup};
 use cosmic::iced_runtime::core::alignment::Horizontal;
 use cosmic::iced_runtime::core::Alignment;
 use cosmic::iced_style::application;
-use cosmic::theme::Button;
-use cosmic::widget::divider::horizontal;
 use cosmic::widget::{horizontal_space, icon, Container, Icon};
 use cosmic::{applet::cosmic_panel_config::PanelAnchor, Command};
 use cosmic::{
-    iced::widget::{column, container, row, text},
+    iced::widget::{column, row, text},
     iced::{self, Length},
     iced_runtime::core::window,
     theme::Theme,
@@ -254,6 +251,7 @@ impl cosmic::Application for Window {
             .padding(8)
             .width(Length::Shrink)
             .height(Length::Shrink)
+            .style(cosmic::theme::Button::AppletIcon)
             .into(),
         }
     }
@@ -313,22 +311,17 @@ impl cosmic::Application for Window {
 
         self.core
             .applet
-            .popup_container(
-                column(vec![
+            .popup_container(column(vec![
+                padded_control(
                     text(fl!("graphics-mode"))
                         .width(Length::Fill)
                         .horizontal_alignment(Horizontal::Center)
-                        .size(14)
-                        .into(),
-                    container(divider::horizontal::light())
-                        .padding([0, 12])
-                        .width(Length::Fill)
-                        .into(),
-                    column(content_list).into(),
-                ])
-                .padding([8, 0])
-                .spacing(12),
-            )
+                        .size(14),
+                )
+                .into(),
+                padded_control(divider::horizontal::default()).into(),
+                column(content_list).padding([8, 0]).into(),
+            ]))
             .into()
     }
 
diff --git a/cosmic-applet-network/src/app.rs b/cosmic-applet-network/src/app.rs
index be5bf940..093e4924 100644
--- a/cosmic-applet-network/src/app.rs
+++ b/cosmic-applet-network/src/app.rs
@@ -1,6 +1,6 @@
 use cosmic::app::Command;
+use cosmic::applet::{menu_button, padded_control};
 use cosmic::iced_widget::Row;
-use cosmic::widget::button::StyleSheet;
 use cosmic::{
     iced::{
         wayland::popup::{destroy_popup, get_popup},
@@ -405,24 +405,6 @@ impl cosmic::Application for CosmicNetworkApplet {
     }
 
     fn view_window(&self, _id: window::Id) -> Element<Message> {
-        let button_style = || Button::Custom {
-            active: Box::new(|active, t| button::Appearance {
-                border_radius: 0.0.into(),
-                ..t.active(active, &Button::Text)
-            }),
-            disabled: Box::new(|t| button::Appearance {
-                border_radius: 0.0.into(),
-                ..t.disabled(&Button::Text)
-            }),
-            hovered: Box::new(|hovered, t| button::Appearance {
-                border_radius: 0.0.into(),
-                ..t.hovered(hovered, &Button::Text)
-            }),
-            pressed: Box::new(|pressed, t| button::Appearance {
-                border_radius: 0.0.into(),
-                ..t.pressed(pressed, &Button::Text)
-            }),
-        };
         let mut vpn_ethernet_col = column![];
         let mut known_wifi = column![];
         for conn in &self.nm_state.active_conns {
@@ -508,13 +490,11 @@ impl cosmic::Application for CosmicNetworkApplet {
                         _ => {}
                     };
                     known_wifi = known_wifi.push(
-                        column![button(
+                        column![menu_button(
                             Row::with_children(btn_content)
                                 .align_items(Alignment::Center)
                                 .spacing(8)
                         )
-                        .padding([8, 24])
-                        .style(button_style())
                         .on_press(Message::Disconnect(name.clone()))]
                         .align_items(Alignment::Center),
                     );
@@ -524,7 +504,7 @@ impl cosmic::Application for CosmicNetworkApplet {
 
         let mut content = column![
             vpn_ethernet_col,
-            container(
+            padded_control(
                 anim!(
                     //toggler
                     AIRPLANE_MODE,
@@ -535,10 +515,9 @@ impl cosmic::Application for CosmicNetworkApplet {
                 )
                 .text_size(14)
                 .width(Length::Fill)
-            )
-            .padding([0, 12]),
-            divider::horizontal::light(),
-            container(
+            ),
+            padded_control(divider::horizontal::default()),
+            padded_control(
                 anim!(
                     //toggler
                     WIFI,
@@ -549,12 +528,10 @@ impl cosmic::Application for CosmicNetworkApplet {
                 )
                 .text_size(14)
                 .width(Length::Fill)
-            )
-            .padding([0, 24]),
-            divider::horizontal::light(),
+            ),
+            padded_control(divider::horizontal::default()),
         ]
         .align_items(Alignment::Center)
-        .spacing(8)
         .padding([8, 0]);
         if self.nm_state.airplane_mode {
             content = content.push(
@@ -606,14 +583,11 @@ impl cosmic::Application for CosmicNetworkApplet {
                     btn_content.push(ssid.into());
                 }
 
-                let mut btn = button(
+                let mut btn = menu_button(
                     Row::with_children(btn_content)
                         .align_items(Alignment::Center)
                         .spacing(8),
-                )
-                .padding([8, 24])
-                .width(Length::Fill)
-                .style(button_style());
+                );
                 btn = match known.state {
                     DeviceState::Failed
                     | DeviceState::Unknown
@@ -633,7 +607,7 @@ impl cosmic::Application for CosmicNetworkApplet {
             } else {
                 "go-next-symbolic"
             };
-            let available_connections_btn = button(row![
+            let available_connections_btn = menu_button(row![
                 text(fl!("visible-wireless-networks"))
                     .size(14)
                     .width(Length::Fill)
@@ -645,8 +619,6 @@ impl cosmic::Application for CosmicNetworkApplet {
                     .width(Length::Fixed(24.0))
                     .height(Length::Fixed(24.0)),
             ])
-            .padding([8, 24])
-            .style(button_style())
             .on_press(Message::ToggleVisibleNetworks);
             content = content.push(available_connections_btn);
         }
@@ -657,38 +629,39 @@ impl cosmic::Application for CosmicNetworkApplet {
                         access_point,
                         password,
                     } => {
-                        let id = row![
-                            icon::from_name("network-wireless-acquiring-symbolic")
-                                .size(24)
-                                .symbolic(true),
-                            text(&access_point.ssid).size(14),
-                        ]
-                        .align_items(Alignment::Center)
-                        .width(Length::Fill)
-                        .padding([0, 24])
-                        .spacing(12);
-                        content = content.push(id);
-                        let col = column![
-                            text(fl!("enter-password")),
-                            text_input("", password)
-                                .on_input(Message::Password)
-                                .on_paste(Message::Password)
-                                .on_submit(Message::SubmitPassword)
-                                .password(),
-                            container(text(fl!("router-wps-button"))).padding(8),
+                        let id = padded_control(
                             row![
-                                button(container(text(fl!("cancel"))).padding([0, 24]))
-                                    .style(Button::Destructive)
-                                    .on_press(Message::CancelNewConnection),
-                                button(container(text(fl!("connect"))).padding([0, 24]))
-                                    .style(Button::Suggested)
-                                    .on_press(Message::SubmitPassword)
+                                icon::from_name("network-wireless-acquiring-symbolic")
+                                    .size(24)
+                                    .symbolic(true),
+                                text(&access_point.ssid).size(14),
                             ]
-                            .spacing(24)
-                        ]
-                        .spacing(8)
-                        .padding([0, 48])
-                        .align_items(Alignment::Center);
+                            .align_items(Alignment::Center)
+                            .spacing(12),
+                        );
+                        content = content.push(id);
+                        let col = padded_control(
+                            column![
+                                text(fl!("enter-password")),
+                                text_input("", password)
+                                    .on_input(Message::Password)
+                                    .on_paste(Message::Password)
+                                    .on_submit(Message::SubmitPassword)
+                                    .password(),
+                                container(text(fl!("router-wps-button"))).padding(8),
+                                row![
+                                    button(container(text(fl!("cancel"))).padding([0, 24]))
+                                        .on_press(Message::CancelNewConnection),
+                                    button(container(text(fl!("connect"))).padding([0, 24]))
+                                        .style(Button::Suggested)
+                                        .on_press(Message::SubmitPassword)
+                                ]
+                                .spacing(24)
+                            ]
+                            .spacing(8)
+                            .align_items(Alignment::Center),
+                        )
+                        .align_x(Horizontal::Center);
                         content = content.push(col);
                     }
                     NewConnectionState::Waiting(access_point) => {
@@ -701,46 +674,49 @@ impl cosmic::Application for CosmicNetworkApplet {
                         .align_items(Alignment::Center)
                         .width(Length::Fill)
                         .spacing(12);
-                        let connecting = row![
-                            id,
-                            icon::from_name("process-working-symbolic")
-                                .size(24)
-                                .symbolic(true),
-                        ]
-                        .spacing(8)
-                        .padding([0, 24]);
+                        let connecting = padded_control(
+                            row![
+                                id,
+                                icon::from_name("process-working-symbolic")
+                                    .size(24)
+                                    .symbolic(true),
+                            ]
+                            .spacing(8),
+                        );
                         content = content.push(connecting);
                     }
                     NewConnectionState::Failure(access_point) => {
-                        let id = row![
-                            icon::from_name("network-wireless-error-symbolic")
-                                .size(24)
-                                .symbolic(true),
-                            text(&access_point.ssid).size(14),
-                        ]
-                        .align_items(Alignment::Center)
-                        .width(Length::Fill)
-                        .padding([0, 24])
-                        .spacing(12);
-                        content = content.push(id);
-                        let col = column![
-                            text(fl!("unable-to-connect")),
-                            text(fl!("check-wifi-connection")),
+                        let id = padded_control(
                             row![
-                                button(container(text("Cancel")).padding([0, 24]))
-                                    .style(Button::Destructive)
-                                    .on_press(Message::CancelNewConnection),
-                                button(container(text("Connect")).padding([0, 24]))
-                                    .style(Button::Suggested)
-                                    .on_press(Message::SelectWirelessAccessPoint(
-                                        access_point.clone()
-                                    ))
+                                icon::from_name("network-wireless-error-symbolic")
+                                    .size(24)
+                                    .symbolic(true),
+                                text(&access_point.ssid).size(14),
                             ]
-                            .spacing(24)
-                        ]
-                        .spacing(16)
-                        .padding([0, 48])
-                        .align_items(Alignment::Center);
+                            .align_items(Alignment::Center)
+                            .spacing(12),
+                        )
+                        .align_x(Horizontal::Center);
+                        content = content.push(id);
+                        let col = padded_control(
+                            column![
+                                text(fl!("unable-to-connect")),
+                                text(fl!("check-wifi-connection")),
+                                row![
+                                    button(container(text("Cancel")).padding([0, 24]))
+                                        .on_press(Message::CancelNewConnection),
+                                    button(container(text("Connect")).padding([0, 24]))
+                                        .style(Button::Suggested)
+                                        .on_press(Message::SelectWirelessAccessPoint(
+                                            access_point.clone()
+                                        ))
+                                ]
+                                .spacing(24)
+                            ]
+                            .spacing(16)
+                            .align_items(Alignment::Center),
+                        )
+                        .align_x(Horizontal::Center);
                         content = content.push(col);
                     }
                 }
@@ -755,7 +731,7 @@ impl cosmic::Application for CosmicNetworkApplet {
                     {
                         continue;
                     }
-                    let button = button(
+                    let button = menu_button(
                         row![
                             icon::from_name(wifi_icon(ap.strength))
                                 .size(16)
@@ -768,10 +744,7 @@ impl cosmic::Application for CosmicNetworkApplet {
                         .align_items(Alignment::Center)
                         .spacing(12),
                     )
-                    .style(button_style())
-                    .on_press(Message::SelectWirelessAccessPoint(ap.clone()))
-                    .width(Length::Fill)
-                    .padding([8, 24]);
+                    .on_press(Message::SelectWirelessAccessPoint(ap.clone()));
                     list_col.push(button.into());
                 }
                 content = content
diff --git a/cosmic-applet-notifications/src/main.rs b/cosmic-applet-notifications/src/main.rs
index f431efa6..4b06ad24 100644
--- a/cosmic-applet-notifications/src/main.rs
+++ b/cosmic-applet-notifications/src/main.rs
@@ -1,12 +1,12 @@
 mod localize;
 mod subscriptions;
 
-use cosmic::applet::menu_button;
+use cosmic::applet::{menu_button, padded_control};
 use cosmic::cosmic_config::{config_subscription, Config, CosmicConfigEntry};
 use cosmic::iced::wayland::popup::{destroy_popup, get_popup};
 use cosmic::iced::Limits;
 use cosmic::iced::{
-    widget::{column, row, text, Row},
+    widget::{column, row, text},
     window, Alignment, Length, Subscription,
 };
 use cosmic::iced_core::alignment::Horizontal;
@@ -14,9 +14,8 @@ use cosmic::Command;
 
 use cosmic::iced_style::application;
 
-use cosmic::iced_widget::{horizontal_rule, scrollable, Column};
-use cosmic::widget::{button, container, icon};
-use cosmic::Renderer;
+use cosmic::iced_widget::{scrollable, Column};
+use cosmic::widget::{button, container, divider, icon};
 use cosmic::{Element, Theme};
 use cosmic_notifications_config::NotificationsConfig;
 use cosmic_notifications_util::{Image, Notification};
@@ -323,18 +322,16 @@ impl cosmic::Application for Notifications {
     }
 
     fn view_window(&self, _id: window::Id) -> Element<Message> {
-        let do_not_disturb = row![anim!(
+        let do_not_disturb = padded_control(row![anim!(
             DO_NOT_DISTURB,
             &self.timeline,
             String::from(fl!("do-not-disturb")),
             self.config.do_not_disturb,
             Message::DoNotDisturb
         )
-        .width(Length::Fill)]
-        .padding([0, 24]);
+        .width(Length::Fill)]);
 
-        let settings =
-            row_button(vec![text(fl!("notification-settings")).into()]).on_press(Message::Settings);
+        let settings = menu_button(text(fl!("notification-settings"))).on_press(Message::Settings);
 
         let notifications = if self.cards.is_empty() {
             row![container(
@@ -489,14 +486,17 @@ impl cosmic::Application for Notifications {
             .height(Length::Shrink))
         };
 
-        let main_content = column![horizontal_rule(4), notifications, horizontal_rule(4)]
-            .padding([0, 24])
-            .spacing(12);
+        let main_content = column![
+            padded_control(divider::horizontal::default()),
+            notifications,
+            padded_control(divider::horizontal::default())
+        ]
+        .spacing(12);
 
         let content = column![do_not_disturb, main_content, settings]
             .align_items(Alignment::Start)
             .spacing(12)
-            .padding([16, 0]);
+            .padding([8, 0]);
 
         self.core.applet.popup_container(content).into()
     }
@@ -506,15 +506,6 @@ impl cosmic::Application for Notifications {
     }
 }
 
-fn row_button(content: Vec<Element<Message>>) -> cosmic::widget::Button<Message, Renderer> {
-    menu_button(
-        Row::with_children(content)
-            .spacing(4)
-            .align_items(Alignment::Center),
-    )
-    .height(Length::Fixed(36.0))
-}
-
 fn text_icon(name: &str, size: u16) -> cosmic::widget::Icon {
     icon::from_name(name).size(size).symbolic(true).icon()
 }
diff --git a/cosmic-applet-power/src/main.rs b/cosmic-applet-power/src/main.rs
index 408094a3..e4bb0452 100644
--- a/cosmic-applet-power/src/main.rs
+++ b/cosmic-applet-power/src/main.rs
@@ -2,7 +2,7 @@ use std::collections::HashMap;
 use std::process;
 use std::time::Duration;
 
-use cosmic::applet::menu_button;
+use cosmic::applet::{menu_button, padded_control};
 use cosmic::iced;
 use cosmic::iced::alignment::{Horizontal, Vertical};
 use cosmic::iced::event::wayland::{self, LayerEvent};
@@ -20,7 +20,7 @@ use cosmic::Renderer;
 
 use cosmic::iced::Color;
 use cosmic::iced::{
-    widget::{self, column, container, row, space::Space, text, Row},
+    widget::{self, column, container, row, space::Space, text},
     window, Alignment, Length, Subscription,
 };
 use cosmic::iced_style::application;
@@ -233,23 +233,28 @@ impl cosmic::Application for Power {
 
     fn view_window(&self, id: window::Id) -> Element<Message> {
         if matches!(self.popup, Some(p) if p == id) {
-            let settings =
-                row_button(vec![text(fl!("settings")).size(14).into()]).on_press(Message::Settings);
+            let settings = menu_button(text(fl!("settings")).size(14)).on_press(Message::Settings);
 
             let session = column![
-                row_button(vec![
-                    text_icon("system-lock-screen-symbolic", 24).into(),
-                    text(fl!("lock-screen")).size(14).into(),
-                    Space::with_width(Length::Fill).into(),
-                    text(fl!("lock-screen-shortcut")).size(14).into(),
-                ])
+                menu_button(
+                    row![
+                        text_icon("system-lock-screen-symbolic", 24),
+                        text(fl!("lock-screen")).size(14),
+                        Space::with_width(Length::Fill),
+                        text(fl!("lock-screen-shortcut")).size(14),
+                    ]
+                    .spacing(8)
+                )
                 .on_press(Message::Action(PowerAction::Lock)),
-                row_button(vec![
-                    text_icon("system-log-out-symbolic", 24).into(),
-                    text(fl!("log-out")).size(14).into(),
-                    Space::with_width(Length::Fill).into(),
-                    text(fl!("log-out-shortcut")).size(14).into(),
-                ])
+                menu_button(
+                    row![
+                        text_icon("system-log-out-symbolic", 24),
+                        text(fl!("log-out")).size(14),
+                        Space::with_width(Length::Fill),
+                        text(fl!("log-out-shortcut")).size(14),
+                    ]
+                    .spacing(8)
+                )
                 .on_press(Message::Action(PowerAction::LogOut)),
             ];
 
@@ -266,13 +271,9 @@ impl cosmic::Application for Power {
 
             let content = column![
                 settings,
-                container(divider::horizontal::light())
-                    .padding([0, 12])
-                    .width(Length::Fill),
+                padded_control(divider::horizontal::default()),
                 session,
-                container(divider::horizontal::light())
-                    .padding([0, 12])
-                    .width(Length::Fill),
+                padded_control(divider::horizontal::default()),
                 power
             ]
             .align_items(Alignment::Start)
@@ -348,16 +349,6 @@ impl cosmic::Application for Power {
     }
 }
 
-// ### UI Helplers
-
-fn row_button(content: Vec<Element<Message>>) -> cosmic::widget::Button<Message, Renderer> {
-    menu_button(
-        Row::with_children(content)
-            .spacing(4)
-            .align_items(Alignment::Center),
-    )
-}
-
 fn power_buttons(name: &str, msg: String) -> cosmic::widget::Button<Message, Renderer> {
     cosmic::widget::button(
         column![text_icon(name, 40), text(msg).size(14)]
diff --git a/cosmic-applet-tiling/src/window.rs b/cosmic-applet-tiling/src/window.rs
index ef560140..48e6f8d3 100644
--- a/cosmic-applet-tiling/src/window.rs
+++ b/cosmic-applet-tiling/src/window.rs
@@ -1,15 +1,14 @@
 use crate::fl;
 use cosmic::app::Core;
-use cosmic::applet::menu_button;
-use cosmic::cosmic_config::{ConfigGet, ConfigSet, CosmicConfigEntry};
-use cosmic::cosmic_theme::ThemeBuilder;
+use cosmic::applet::{menu_button, padded_control};
+use cosmic::cosmic_config::{ConfigGet, ConfigSet};
 use cosmic::iced::wayland::popup::{destroy_popup, get_popup};
 use cosmic::iced::window::Id;
 use cosmic::iced::{Command, Length, Limits, Subscription};
 use cosmic::iced_core::Alignment;
 use cosmic::iced_style::application;
-use cosmic::iced_widget::row;
-use cosmic::widget::{button, container, spin_button, text};
+use cosmic::iced_widget::{column, row};
+use cosmic::widget::{container, divider, spin_button, text};
 use cosmic::{Element, Theme};
 use cosmic_time::{anim, chain, id, Timeline};
 use once_cell::sync::Lazy;
@@ -232,92 +231,62 @@ impl cosmic::Application for Window {
         let cosmic = self.core.system_theme().cosmic();
         let active_hint = cosmic.active_hint;
         let gaps = cosmic.gaps.1;
-        let content_list = cosmic::widget::column()
-            .padding([8, 0])
-            .spacing(4)
-            .push(
-                container(
-                    anim!(
-                        TILE_WINDOWS,
-                        &self.timeline,
-                        fl!("tile-windows"),
-                        self.tile_windows,
-                        |chain, enable| { Message::ToggleTileWindows(chain, enable) },
-                    )
-                    .text_size(14)
+        let content_list = column![
+            padded_control(container(
+                anim!(
+                    TILE_WINDOWS,
+                    &self.timeline,
+                    fl!("tile-windows"),
+                    self.tile_windows,
+                    |chain, enable| { Message::ToggleTileWindows(chain, enable) },
+                )
+                .text_size(14)
+                .width(Length::Fill),
+            )),
+            padded_control(row!(
+                text(fl!("navigate-windows")).size(14).width(Length::Fill),
+                text(format!("{} + {}", fl!("super"), fl!("arrow-keys"))).size(14),
+            )),
+            padded_control(row!(
+                text(fl!("move-window")).size(14).width(Length::Fill),
+                text(format!(
+                    "{} + {} + {}",
+                    fl!("shift"),
+                    fl!("super"),
+                    fl!("arrow-keys")
+                ))
+                .size(14),
+            )),
+            padded_control(row!(
+                text(fl!("toggle-floating-window"))
+                    .size(14)
                     .width(Length::Fill),
-                )
-                .padding([0, 16, 4, 16]),
-            )
-            .push(
-                row!(
-                    text(fl!("navigate-windows")).size(14).width(Length::Fill),
-                    text(format!("{} + {}", fl!("super"), fl!("arrow-keys"))).size(14),
-                )
-                .padding([4, 16, 4, 16]),
-            )
-            .push(
-                row!(
-                    text(fl!("move-window")).size(14).width(Length::Fill),
-                    text(format!(
-                        "{} + {} + {}",
-                        fl!("shift"),
-                        fl!("super"),
-                        fl!("arrow-keys")
-                    ))
-                    .size(14),
-                )
-                .padding([4, 16, 4, 16]),
-            )
-            .push(
-                row!(
-                    text(fl!("toggle-floating-window"))
-                        .size(14)
-                        .width(Length::Fill),
-                    text(format!("{} + G", fl!("super"))).size(14),
-                )
-                .padding([4, 16, 4, 16]),
-            )
-            .push(
-                container(
-                    menu_button(text(fl!("view-all-shortcuts")).size(14))
-                        .on_press(Message::ViewAllShortcuts),
-                )
-                .width(Length::Fill)
-                .padding(0),
-            )
-            .push(
+                text(format!("{} + G", fl!("super"))).size(14),
+            )),
+            padded_control(divider::horizontal::default()),
+            padded_control(
                 row!(
                     text(fl!("active-hint")).size(14).width(Length::Fill),
                     spin_button(active_hint.to_string(), Message::HandleActiveHint),
                 )
-                .padding([0, 16, 0, 16])
                 .align_items(Alignment::Center),
-            )
-            .push(
+            ),
+            padded_control(
                 row!(
                     text(fl!("gaps")).size(14).width(Length::Fill),
                     spin_button(gaps.to_string(), Message::HandleGaps),
                 )
-                .padding([0, 16, 0, 16])
                 .align_items(Alignment::Center),
-            )
-            .push(
-                container(
-                    menu_button(text(fl!("floating-window-exceptions")).size(14))
-                        .on_press(Message::OpenFloatingWindowExceptions),
-                )
-                .width(Length::Fill)
-                .padding(0),
-            )
-            .push(
-                container(
-                    menu_button(text(fl!("window-management-settings")).size(14))
-                        .on_press(Message::OpenWindowManagementSettings),
-                )
-                .width(Length::Fill)
-                .padding(0),
-            );
+            ),
+            padded_control(divider::horizontal::default()),
+            menu_button(text(fl!("view-all-shortcuts")).size(14))
+                .on_press(Message::ViewAllShortcuts),
+            menu_button(text(fl!("floating-window-exceptions")).size(14))
+                .on_press(Message::OpenFloatingWindowExceptions),
+            menu_button(text(fl!("window-management-settings")).size(14))
+                .on_press(Message::OpenWindowManagementSettings)
+        ]
+        .padding([8, 0]);
 
         self.core.applet.popup_container(content_list).into()
     }
diff --git a/cosmic-applet-time/src/main.rs b/cosmic-applet-time/src/main.rs
index 9f53c603..3657f186 100644
--- a/cosmic-applet-time/src/main.rs
+++ b/cosmic-applet-time/src/main.rs
@@ -5,7 +5,6 @@ use cosmic::iced::{
     window, Alignment, Length, Rectangle, Subscription,
 };
 use cosmic::iced_style::application;
-use cosmic::theme;
 use cosmic::{app, applet::cosmic_panel_config::PanelAnchor, Command};
 use cosmic::{
     widget::{icon, rectangle_tracker::*},
@@ -210,6 +209,7 @@ impl cosmic::Application for Time {
                 date_time_col
             },
         )
+        .style(cosmic::theme::Button::AppletIcon)
         .on_press(Message::TogglePopup);
 
         if let Some(tracker) = self.rectangle_tracker.as_ref() {