diff --git a/components/mobileshell/qml/components/PanelBackground.qml b/components/mobileshell/qml/components/PanelBackground.qml
index 6e9d9ca3..d6110ea8 100644
--- a/components/mobileshell/qml/components/PanelBackground.qml
+++ b/components/mobileshell/qml/components/PanelBackground.qml
@@ -37,7 +37,8 @@ Item {
                                             panelType === PanelBackground.PanelType.Wallpaper)
     // whether the panel should have a border when using a dark theme
     readonly property bool border:          panelType === PanelBackground.PanelType.Base ||
-                                            panelType === PanelBackground.PanelType.Stacked
+                                            panelType === PanelBackground.PanelType.Stacked ||
+                                            panelType === PanelBackground.PanelType.Popup
     // whether to force the panel to have a border even when using a light theme
     readonly property bool forceBorder:     border &&
                                             (panelType === PanelBackground.PanelType.Stacked)
@@ -70,7 +71,7 @@ Item {
     // corner radius of the panel
     property int radius: Kirigami.Units.cornerRadius
 
-    Kirigami.Theme.colorSet: Kirigami.Theme.View
+    Kirigami.Theme.colorSet: panelType === PanelBackground.PanelType.Popup ? Kirigami.Theme.Window : Kirigami.Theme.View
     Kirigami.Theme.inherit: false
 
     // very simple shadow for performance
diff --git a/components/mobileshell/qml/popups/notifications/NotificationPopupManager.qml b/components/mobileshell/qml/popups/notifications/NotificationPopupManager.qml
index 184ee2b2..52f25524 100644
--- a/components/mobileshell/qml/popups/notifications/NotificationPopupManager.qml
+++ b/components/mobileshell/qml/popups/notifications/NotificationPopupManager.qml
@@ -49,7 +49,7 @@ Window {
     property QtObject timeSource
     property bool inhibited
 
-    Kirigami.Theme.colorSet: Kirigami.Theme.View
+    Kirigami.Theme.colorSet: Kirigami.Theme.Complementary
     Kirigami.Theme.inherit: false
 
     readonly property color backgroundColor: Qt.darker(Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 0.95), 1.05)
diff --git a/components/mobileshell/qml/popups/volumeosd/PopupCard.qml b/components/mobileshell/qml/popups/volumeosd/PopupCard.qml
index fe997707..10448f19 100644
--- a/components/mobileshell/qml/popups/volumeosd/PopupCard.qml
+++ b/components/mobileshell/qml/popups/volumeosd/PopupCard.qml
@@ -21,7 +21,6 @@ import org.kde.plasma.private.mobileshell as MobileShell
 Controls.Control {
     id: content
 
-    property bool popupBackground: false
     property real scaleFactor: 1.0
 
     implicitWidth: Math.min(Kirigami.Units.gridUnit * 20, Screen.width - Kirigami.Units.gridUnit * 2)
@@ -39,8 +38,6 @@ Controls.Control {
 
     MobileShell.PanelBackground {
         anchors.fill: parent
-        panelType: content.popupBackground ?
-            MobileShell.PanelBackground.PanelType.Popup :
-            MobileShell.PanelBackground.PanelType.Drawer
+        panelType: MobileShell.PanelBackground.PanelType.Popup
     }
 }
diff --git a/components/mobileshell/qml/popups/volumeosd/VolumeChangedPopup.qml b/components/mobileshell/qml/popups/volumeosd/VolumeChangedPopup.qml
index 8285856e..931693b1 100644
--- a/components/mobileshell/qml/popups/volumeosd/VolumeChangedPopup.qml
+++ b/components/mobileshell/qml/popups/volumeosd/VolumeChangedPopup.qml
@@ -140,7 +140,6 @@ Window {
             id: osd
             Layout.alignment: Qt.AlignHCenter
             implicitWidth: Math.min(Kirigami.Units.gridUnit * 15, Screen.width - Kirigami.Units.gridUnit * 2)
-            popupBackground: true
 
             transform: [
                 Translate {
diff --git a/components/mobileshell/qml/popups/volumeosd/VolumeOSD.qml b/components/mobileshell/qml/popups/volumeosd/VolumeOSD.qml
index c7b119c8..ac503ef8 100644
--- a/components/mobileshell/qml/popups/volumeosd/VolumeOSD.qml
+++ b/components/mobileshell/qml/popups/volumeosd/VolumeOSD.qml
@@ -36,7 +36,7 @@ Window {
 
     readonly property color backgroundColor: Qt.darker(Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 0.95), 1.05)
 
-    Kirigami.Theme.colorSet: Kirigami.Theme.View
+    Kirigami.Theme.colorSet: Kirigami.Theme.Complementary
     Kirigami.Theme.inherit: false
 
     color: backgroundColor