Fixed icon scaling, Implemented DnD