Icons & fixes
Merge pull request #1 from Keraxel/master

Fixes