added fallbacks for null values and updated icon
removed pound sign in test which caused a utf-8 test error
Merge pull request #3 from estatio/develop

Fixes to icons, fix UTF error in tests