Button Icon dragable even though it should not

Hello,

I have a CssLayout with a few DragAndDropWrapper-components, which in turn contain layouts and buttons.

Now while I can fully control the drag and drop of such a component itself (DragStartMode), it seems, that the button-icons (inside each of the DnDWrapper-components) is dragable while neither the caption nor the button is. I’d like the icon to not be dragable either, but it seems I cannot figure out how to prevent this.

I have found a ticket ( http://dev.vaadin.com/ticket/10058 ), which describes my problem pretty well. Is it possible, that this issue exists in Vaadin 7(.2.1), too? Is there some workaround?