Merge pull request #3 from estatio/develop

Fixes to icons, fix UTF error in tests
Merge pull request #4 from estatio/develop

Develop