diff --git a/compositor/contents/Compositor.qml b/compositor/contents/Compositor.qml
index 6a90aa65..b44f8f0e 100644
--- a/compositor/contents/Compositor.qml
+++ b/compositor/contents/Compositor.qml
@@ -155,7 +155,7 @@ Rectangle {
         anchors.right: parent.right
         anchors.bottom: parent.bottom
         height: bottomBarHeight
-        color: Qt.rgba(0, 0, 0, 0.7)
+        color: Qt.rgba(0, 0, 0, 0.9)
 
         Behavior on height {
             NumberAnimation {
@@ -172,8 +172,8 @@ Rectangle {
                 width: units.iconSizes.smallMedium
                 height: width
                 source: "distribute-horizontal-x"
-                enabled: compositorRoot.state != "switcher";
-                opacity: enabled ? 1 : 0.6
+                enabled: compositorRoot.state != "switcher" && windowsLayout.children.length > 0
+                opacity: enabled ? 1 : 0.2
 
                 Layout.alignment: Qt.AlignHCenter
                 Layout.preferredWidth: units.iconSizes.medium
@@ -192,7 +192,7 @@ Rectangle {
                 height: width
                 source: "go-home"
                 enabled: compositorRoot.state != "homeScreen";
-                opacity: enabled ? 1 : 0.6
+                opacity: enabled ? 1 : 0.2
 
                 Layout.alignment: Qt.AlignHCenter
                 Layout.preferredWidth: units.iconSizes.medium
@@ -211,7 +211,7 @@ Rectangle {
                 height: width
                 source: "window-close"
                 enabled: compositorRoot.currentWindow
-                opacity: enabled ? 1 : 0.6
+                opacity: enabled ? 1 : 0.2
 
                 Layout.alignment: Qt.AlignHCenter
                 Layout.preferredWidth: units.iconSizes.medium
diff --git a/shell/contents/views/Desktop.qml b/shell/contents/views/Desktop.qml
index 0cbebb1c..b6e914e4 100644
--- a/shell/contents/views/Desktop.qml
+++ b/shell/contents/views/Desktop.qml
@@ -209,7 +209,7 @@ Item {
 
     Rectangle {
         z: 1
-        color: Qt.rgba(0, 0, 0, 0.7 * (Math.min(applications.contentY + homescreen.height, homescreen.height) / homescreen.height))
+        color: Qt.rgba(0, 0, 0, 0.9 * (Math.min(applications.contentY + homescreen.height, homescreen.height) / homescreen.height))
         anchors.fill: parent
     }
 
@@ -317,7 +317,7 @@ Item {
 
         Rectangle {
             anchors.fill: parent
-            color: Qt.rgba(0, 0, 0, 0.7)
+            color: Qt.rgba(0, 0, 0, 0.9)
 
             PlasmaCore.IconItem {
                 id: strengthIcon
@@ -398,6 +398,7 @@ Item {
         height: homescreen.height
     }
 
+
     PlasmaCore.ColorScope {
         z: 1
         anchors {
@@ -458,7 +459,7 @@ Item {
                         right: parent.right
                         bottomMargin: stripe.height * 2
                     }
-                    height: contentHeight
+                    height: parent.height / 3
                     interactive: false
 
                     z: 1
@@ -474,17 +475,17 @@ Item {
                         }
 
                     remove: Transition {
-                            NumberAnimation {
-                                properties: "x"
-                                to: notificationView.width
-                                duration: 500
-                            }
-                            NumberAnimation {
-                                properties: "opacity"
-                                to: 0
-                                duration: 500
-                            }
+                        NumberAnimation {
+                            properties: "x"
+                            to: notificationView.width
+                            duration: 500
                         }
+                        NumberAnimation {
+                            properties: "opacity"
+                            to: 0
+                            duration: 500
+                        }
+                    }
 
                     removeDisplaced: Transition {
                         SequentialAnimation {