diff --git a/containments/homescreen/package/contents/ui/main.qml b/containments/homescreen/package/contents/ui/main.qml
index fa3a0a35..e8d62210 100644
--- a/containments/homescreen/package/contents/ui/main.qml
+++ b/containments/homescreen/package/contents/ui/main.qml
@@ -172,7 +172,7 @@ Item {
         Column {
             id: flickableContents
             width: mainFlickable.width
-            spacing: Math.max(0, favoriteStrip.frame.height - mainFlickable.contentY)
+            spacing: Math.max(0, favoriteStrip.frame.height + favoriteStrip.anchors.bottomMargin - mainFlickable.contentY)
 
             DragDrop.DropArea {
                 anchors {
diff --git a/containments/taskpanel/package/contents/ui/main.qml b/containments/taskpanel/package/contents/ui/main.qml
index d2fcb0eb..d11bec6e 100644
--- a/containments/taskpanel/package/contents/ui/main.qml
+++ b/containments/taskpanel/package/contents/ui/main.qml
@@ -32,7 +32,9 @@ PlasmaCore.ColorScope {
     height: 480
     //colorGroup: PlasmaCore.Theme.ComplementaryColorGroup
 
-    Plasmoid.backgroundHints: plasmoid.configuration.PanelButtonsVisible ? PlasmaCore.Types.StandardBackground : PlasmaCore.Types.NoBackground
+    Plasmoid.backgroundHints: PlasmaCore.Types.NoBackground
+
+    readonly property bool showingApp: tasksModel.activeTask && tasksModel.activeTask.valid && !tasksModel.data(tasksModel.activeTask, TaskManager.AbstractTasksModel.IsFullScreen)
 
     property QtObject taskSwitcher: taskSwitcherLoader.item ? taskSwitcherLoader.item : null
     Loader {
@@ -45,6 +47,16 @@ PlasmaCore.ColorScope {
         onTriggered: taskSwitcherLoader.source = Qt.resolvedUrl("TaskSwitcher.qml")
     }
 
+    TaskManager.TasksModel {
+        id: tasksModel
+        sortMode: TaskManager.TasksModel.SortVirtualDesktop
+        groupMode: TaskManager.TasksModel.GroupDisabled
+
+        screenGeometry: plasmoid.screenGeometry
+        filterByScreen: plasmoid.configuration.showForCurrentScreenOnly
+
+    }
+
     MouseArea {
         id: mainMouseArea
         anchors.fill: parent
@@ -88,12 +100,26 @@ PlasmaCore.ColorScope {
             }
         }
 
-        Rectangle {
+        Item {
             anchors.fill: parent
-            color: root.backgroundColor
 
             visible: plasmoid.configuration.PanelButtonsVisible
-            property Item toolBox
+
+            Rectangle {
+                anchors.fill: parent
+                color: root.backgroundColor
+                opacity: showingApp ? 1 : 0.9
+                Rectangle {
+                    anchors {
+                        left: parent.left
+                        right: parent.right
+                        top: parent.top
+                    }
+                    height: 1
+                    color: PlasmaCore.ColorScope.textColor
+                    opacity: 0.2
+                }
+            }
 
             Button {
                 anchors.left: parent.left