Merge pull request #60 from XiDevelopment/icons

Icons
Merge pull request #61 from XiDevelopment/master

Merge pull request #60 from XiDevelopment/icons