diff --git a/containments/panel/package/contents/ui/DrawerBackground.qml b/containments/panel/package/contents/ui/DrawerBackground.qml
index 09dcfcee..233b88fc 100644
--- a/containments/panel/package/contents/ui/DrawerBackground.qml
+++ b/containments/panel/package/contents/ui/DrawerBackground.qml
@@ -19,9 +19,7 @@
 import QtQuick 2.6
 import QtQuick.Layouts 1.4
 import QtQuick.Controls 2.4 as QQC2
-import QtGraphicalEffects 1.0
 
-import org.kde.plasma.plasmoid 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.kirigami 2.12 as Kirigami
 
@@ -41,12 +39,12 @@ QQC2.Control {
             color: Kirigami.ColorUtils.adjustColor(PlasmaCore.ColorScope.backgroundColor, {"alpha": 0.85*255})
             anchors {
                 fill: parent
-                leftMargin: units.smallSpacing
-                rightMargin: units.smallSpacing
-                topMargin: units.smallSpacing
-                bottomMargin: units.smallSpacing
+                leftMargin: PlasmaCore.Units.smallSpacing
+                rightMargin: PlasmaCore.Units.smallSpacing
+                topMargin: PlasmaCore.Units.smallSpacing
+                bottomMargin: PlasmaCore.Units.smallSpacing
             }
-            radius: units.smallSpacing
+            radius: PlasmaCore.Units.smallSpacing
         }
     }
 }
diff --git a/containments/panel/package/contents/ui/SlidingPanel.qml b/containments/panel/package/contents/ui/SlidingPanel.qml
index 0e2acb7b..1ad1575a 100644
--- a/containments/panel/package/contents/ui/SlidingPanel.qml
+++ b/containments/panel/package/contents/ui/SlidingPanel.qml
@@ -126,7 +126,7 @@ NanoShell.FullScreenOverlay {
             right: parent.right
             bottom: parent.bottom
         }
-        height: parent.height - headerHeight
+        height: parent.height - headerHeight // don't layer on top panel indicators (area is darkened separately)
         color: "black"
         opacity: 0.6 * Math.min(1, offset/contentArea.height)