diff --git a/Common/SettingsData.qml b/Common/SettingsData.qml
index 1046cbab..57b46e74 100644
--- a/Common/SettingsData.qml
+++ b/Common/SettingsData.qml
@@ -469,8 +469,7 @@ Singleton {
         if (typeof NiriService === "undefined" || !CompositorService.isNiri)
             return namedWorkspaces
 
-        for (var i = 0; i < NiriService.allWorkspaces.length; i++) {
-            var ws = NiriService.allWorkspaces[i]
+        for (const ws of NiriService.allWorkspaces) {
             if (ws.name && ws.name.trim() !== "") {
                 namedWorkspaces.push(ws.name)
             }
diff --git a/Modules/TopBar/WorkspaceSwitcher.qml b/Modules/TopBar/WorkspaceSwitcher.qml
index 23245690..9ee72845 100644
--- a/Modules/TopBar/WorkspaceSwitcher.qml
+++ b/Modules/TopBar/WorkspaceSwitcher.qml
@@ -311,7 +311,7 @@ Rectangle {
                     if (CompositorService.isNiri) {
                         for (var i = 0; i < NiriService.allWorkspaces.length; i++) {
                             var ws = NiriService.allWorkspaces[i]
-                            if (ws.idx + 1 === modelData)
+                            if (ws.idx + 1 === modelData && ws.output === root.screenName)
                                 return ws
                         }
                     } else if (CompositorService.isHyprland) {
diff --git a/Widgets/DankIconPicker.qml b/Widgets/DankIconPicker.qml
index fc26cd8c..8327ece7 100644
--- a/Widgets/DankIconPicker.qml
+++ b/Widgets/DankIconPicker.qml
@@ -160,7 +160,7 @@ Rectangle {
                 layer.enabled: true
                 layer.effect: MultiEffect {
                     shadowEnabled: true
-                    shadowColor: Theme.shadowDark
+                    shadowColor: Theme.shadowStrong
                     shadowBlur: 0.8
                     shadowHorizontalOffset: 0
                     shadowVerticalOffset: 4