Revert "Fixes icon, added @grant & clean up code"

This reverts commit c3605a73f8edc186b70ccff4e9656db09472a1a5.