diff --git a/containments/taskpanel/package/contents/ui/Task.qml b/containments/taskpanel/package/contents/ui/Task.qml
index 6cdf149d..c80a9823 100644
--- a/containments/taskpanel/package/contents/ui/Task.qml
+++ b/containments/taskpanel/package/contents/ui/Task.qml
@@ -22,7 +22,7 @@ import QtQuick.Layouts 1.1
 import QtQuick.Window 2.2
 import org.kde.taskmanager 0.1 as TaskManager
 import org.kde.plasma.core 2.0 as PlasmaCore
-import org.kde.plasma.components 2.0 as PlasmaComponents
+import org.kde.plasma.components 3.0 as PlasmaComponents
 
 Item {
     id: delegate
@@ -49,7 +49,7 @@ Item {
     Item {
         anchors {
             fill: parent
-            margins: units.gridUnit
+            margins: units.smallSpacing
         }
 
         SequentialAnimation {
@@ -75,12 +75,12 @@ Item {
 
             PlasmaComponents.ToolButton {
                 z: 99
-                iconSource: "window-close"
-                flat: false
+                icon.name: "window-close"
+                icon.width: units.iconSizes.medium
+                icon.height: units.iconSizes.medium
                 anchors {
                     top: parent.top
                     right: parent.right
-                    margins: -units.gridUnit/2
                 }
                 onClicked: {
                     slideAnim.to = -background.width*2;