Icons working
Merge branch 'master' of https://github.com/sneeosh25/JSA247