Valama: Fixed and simplified symbol icon handling
Merge branch 'master' of https://github.com/Valama/valama