diff --git a/panels/dock/package/main.qml b/panels/dock/package/main.qml
index cdcb86809..708e85dec 100644
--- a/panels/dock/package/main.qml
+++ b/panels/dock/package/main.qml
@@ -138,13 +138,13 @@ Window {
         
         function onWidthChanged() {
             if (dock.useColumnLayout) {
-                Panel.notifyDockPositionChanged()
+                Panel.notifyDockPositionChanged(dock.width, 0)
             }
         }
         
         function onHeightChanged() {
             if (!dock.useColumnLayout) {
-                Panel.notifyDockPositionChanged()
+                Panel.notifyDockPositionChanged(0, dock.height)
             }
         }
     }
diff --git a/panels/dock/tray/package/ActionLegacyTrayPluginDelegate.qml b/panels/dock/tray/package/ActionLegacyTrayPluginDelegate.qml
index 5c0a01482..33562d855 100644
--- a/panels/dock/tray/package/ActionLegacyTrayPluginDelegate.qml
+++ b/panels/dock/tray/package/ActionLegacyTrayPluginDelegate.qml
@@ -159,7 +159,7 @@ AppletItemButton {
 
     Drag.dragType: Drag.Automatic
     DQuickDrag.overlay: overlayWindow
-    DQuickDrag.active: Drag.active
+    DQuickDrag.active: Drag.active && Qt.platform.pluginName === "xcb"
     DQuickDrag.hotSpotScale: Qt.size(0.5, 1)
     Drag.mimeData: {
         "text/x-dde-shell-tray-dnd-surfaceId": model.surfaceId,
@@ -172,6 +172,12 @@ AppletItemButton {
             DDT.TraySortOrderModel.actionsAlwaysVisible = Drag.active
         }
 
+        if (Qt.platform.pluginName !== "xcb") {
+            root.grabToImage(function(result) {
+                root.Drag.imageSource = result.url;
+            })
+        }
+
         if (!Drag.active) {
             Panel.contextDragging = false
             // reset position on drop
@@ -181,6 +187,14 @@ AppletItemButton {
         Panel.contextDragging = true
     }
 
+    onWidthChanged: {
+        if (Qt.platform.pluginName !== "xcb") {
+            root.grabToImage(function(result) {
+                root.Drag.imageSource = result.url;
+            })
+        }
+    }
+
     DragHandler {
         id: dragHandler
         enabled: dragable