--- a/DragAndDropManager.st	Mon Aug 08 14:06:04 2016 +0200
+++ b/DragAndDropManager.st	Mon Aug 08 17:06:34 2016 +0200
@@ -1162,9 +1162,7 @@
             obj := obj onDevice:aDevice
         ].
 
-    obj class == LabelAndIcon ifTrue:[
-        obj image notNil ifTrue:[obj image clearMaskedPixels].
-        obj icon  notNil ifTrue:[obj icon clearMaskedPixels].
+    obj isLabelAndIcon ifTrue:[
         ^ obj
     ].
 
@@ -1175,12 +1173,12 @@
         s1 isImage ifTrue:[
             s2 isImage  ifTrue:[ ^ self displayObjectFor:(LabelAndIcon form:s1  image:s2) on:aDevice ].
             s2 isString ifTrue:[ ^ self displayObjectFor:(LabelAndIcon icon:s1 string:s2) on:aDevice ].
-            ^ (s1 on:aDevice) clearMaskedPixels
+            ^ s1 onDevice:aDevice.
         ].
 
         s2 isImage ifTrue:[
             s1 isString ifTrue:[ ^ self displayObjectFor:(LabelAndIcon icon:s2 string:s1) on:aDevice ].
-            ^ (s2 on:aDevice) clearMaskedPixels
+            ^ s2 onDevice:aDevice.
         ].
 
         s1 isString ifTrue:[^ s1].