Fixes icon, added @grant & clean up code