I would avoid leaving in any drag & drop, since it isn't smooth enough. Clicking the icon and having a "drop" button appear next to the mouse cursor would be preferable in my opinion.