diff --git a/Modules/Bar/Widgets/Bluetooth.qml b/Modules/Bar/Widgets/Bluetooth.qml
index 21fe96c7..520455e4 100644
--- a/Modules/Bar/Widgets/Bluetooth.qml
+++ b/Modules/Bar/Widgets/Bluetooth.qml
@@ -10,7 +10,8 @@ import qs.Widgets
 NIconButton {
   id: root
 
-  property real scaling: 1.0
+  // NIconButton must only define screen, not scaling
+  property ShellScreen screen
 
   baseSize: Style.capsuleHeight
   compact: (Settings.data.bar.density === "compact")
diff --git a/Modules/Bar/Widgets/ControlCenter.qml b/Modules/Bar/Widgets/ControlCenter.qml
index 5fbe7282..993e2f0b 100644
--- a/Modules/Bar/Widgets/ControlCenter.qml
+++ b/Modules/Bar/Widgets/ControlCenter.qml
@@ -9,7 +9,8 @@ import qs.Services
 NIconButton {
   id: root
 
-  property real scaling: 1.0
+  // NIconButton must only define screen, not scaling
+  property ShellScreen screen
 
   // Widget properties passed from Bar.qml for per-instance settings
   property string widgetId: ""
diff --git a/Modules/Bar/Widgets/CustomButton.qml b/Modules/Bar/Widgets/CustomButton.qml
index 3973b4cd..11a1b7d6 100644
--- a/Modules/Bar/Widgets/CustomButton.qml
+++ b/Modules/Bar/Widgets/CustomButton.qml
@@ -12,7 +12,7 @@ Item {
   id: root
 
   // Widget properties passed from Bar.qml
-  property var screen
+  property ShellScreen screen
   property real scaling: 1.0
 
   // Widget properties passed from Bar.qml for per-instance settings
diff --git a/Modules/Bar/Widgets/DarkMode.qml b/Modules/Bar/Widgets/DarkMode.qml
index 1333da05..13998414 100644
--- a/Modules/Bar/Widgets/DarkMode.qml
+++ b/Modules/Bar/Widgets/DarkMode.qml
@@ -6,7 +6,8 @@ import qs.Services
 NIconButton {
   id: root
 
-  property real scaling: 1.0
+  // NIconButton must only define screen, not scaling
+  property ShellScreen screen
 
   icon: "dark-mode"
   tooltipText: Settings.data.colorSchemes.darkMode ? I18n.tr("tooltips.switch-to-light-mode") : I18n.tr("tooltips.switch-to-dark-mode")
diff --git a/Modules/Bar/Widgets/KeepAwake.qml b/Modules/Bar/Widgets/KeepAwake.qml
index 692466a4..058a512d 100644
--- a/Modules/Bar/Widgets/KeepAwake.qml
+++ b/Modules/Bar/Widgets/KeepAwake.qml
@@ -8,7 +8,8 @@ import qs.Widgets
 NIconButton {
   id: root
 
-  property real scaling: 1.0
+  // NIconButton must only define screen, not scaling
+  property ShellScreen screen
 
   baseSize: Style.capsuleHeight
   compact: (Settings.data.bar.density === "compact")
diff --git a/Modules/Bar/Widgets/NightLight.qml b/Modules/Bar/Widgets/NightLight.qml
index f5ac5770..065f6799 100644
--- a/Modules/Bar/Widgets/NightLight.qml
+++ b/Modules/Bar/Widgets/NightLight.qml
@@ -11,7 +11,8 @@ import qs.Widgets
 NIconButton {
   id: root
 
-  property real scaling: 1.0
+  // NIconButton must only define screen, not scaling
+  property ShellScreen screen
 
   compact: (Settings.data.bar.density === "compact")
   baseSize: Style.capsuleHeight
diff --git a/Modules/Bar/Widgets/NotificationHistory.qml b/Modules/Bar/Widgets/NotificationHistory.qml
index ad9bb86b..a5448ae1 100644
--- a/Modules/Bar/Widgets/NotificationHistory.qml
+++ b/Modules/Bar/Widgets/NotificationHistory.qml
@@ -10,7 +10,8 @@ import qs.Widgets
 NIconButton {
   id: root
 
-  property real scaling: 1.0
+  // NIconButton must only define screen, not scaling
+  property ShellScreen screen
 
   // Widget properties passed from Bar.qml for per-instance settings
   property string widgetId: ""
diff --git a/Modules/Bar/Widgets/PowerProfile.qml b/Modules/Bar/Widgets/PowerProfile.qml
index a89c4e7a..ad1dc21d 100644
--- a/Modules/Bar/Widgets/PowerProfile.qml
+++ b/Modules/Bar/Widgets/PowerProfile.qml
@@ -9,7 +9,8 @@ import qs.Widgets
 NIconButton {
   id: root
 
-  property real scaling: 1.0
+  // NIconButton must only define screen, not scaling
+  property ShellScreen screen
 
   baseSize: Style.capsuleHeight
   visible: PowerProfileService.available
diff --git a/Modules/Bar/Widgets/ScreenRecorder.qml b/Modules/Bar/Widgets/ScreenRecorder.qml
index 0f2dd5fa..06869689 100644
--- a/Modules/Bar/Widgets/ScreenRecorder.qml
+++ b/Modules/Bar/Widgets/ScreenRecorder.qml
@@ -7,7 +7,8 @@ import qs.Widgets
 NIconButton {
   id: root
 
-  property real scaling: 1.0
+  // NIconButton must only define screen, not scaling
+  property ShellScreen screen
 
   icon: "camera-video"
   tooltipText: ScreenRecorderService.isRecording ? I18n.tr("tooltips.click-to-stop-recording") : I18n.tr("tooltips.click-to-start-recording")
diff --git a/Modules/Bar/Widgets/SessionMenu.qml b/Modules/Bar/Widgets/SessionMenu.qml
index cb506ad3..f8f09929 100644
--- a/Modules/Bar/Widgets/SessionMenu.qml
+++ b/Modules/Bar/Widgets/SessionMenu.qml
@@ -8,6 +8,7 @@ import qs.Widgets
 NIconButton {
   id: root
 
+  property ShellScreen screen
   property real scaling: 1.0
 
   compact: (Settings.data.bar.density === "compact")
diff --git a/Modules/Bar/Widgets/Spacer.qml b/Modules/Bar/Widgets/Spacer.qml
index 8f1378e3..811bcb53 100644
--- a/Modules/Bar/Widgets/Spacer.qml
+++ b/Modules/Bar/Widgets/Spacer.qml
@@ -9,7 +9,7 @@ Item {
   id: root
 
   // Widget properties passed from Bar.qml
-  property var screen
+  property ShellScreen screen
   property real scaling: 1.0
 
   // Widget properties passed from Bar.qml for per-instance settings
diff --git a/Modules/Bar/Widgets/WallpaperSelector.qml b/Modules/Bar/Widgets/WallpaperSelector.qml
index 51188450..cbed457f 100644
--- a/Modules/Bar/Widgets/WallpaperSelector.qml
+++ b/Modules/Bar/Widgets/WallpaperSelector.qml
@@ -8,7 +8,8 @@ import qs.Widgets
 NIconButton {
   id: root
 
-  property real scaling: 1.0
+  // NIconButton must only define screen, not scaling
+  property ShellScreen screen
 
   baseSize: Style.capsuleHeight
   compact: (Settings.data.bar.density === "compact")
diff --git a/Modules/Bar/Widgets/WiFi.qml b/Modules/Bar/Widgets/WiFi.qml
index 58a0e885..55b2ebb8 100644
--- a/Modules/Bar/Widgets/WiFi.qml
+++ b/Modules/Bar/Widgets/WiFi.qml
@@ -10,7 +10,8 @@ import qs.Widgets
 NIconButton {
   id: root
 
-  property real scaling: 1.0
+  // NIconButton must only define screen, not scaling
+  property ShellScreen screen
 
   compact: (Settings.data.bar.density === "compact")
   baseSize: Style.capsuleHeight
diff --git a/Widgets/NIconButton.qml b/Widgets/NIconButton.qml
index e2d0d0fa..57df95a2 100644
--- a/Widgets/NIconButton.qml
+++ b/Widgets/NIconButton.qml
@@ -8,6 +8,7 @@ Rectangle {
   id: root
 
   property real baseSize: Style.baseWidgetSize
+  property real scaling: 1.0
 
   property string icon
   property string tooltipText