Change icon and fix dragdrop