Merge pull request #515 from b4n/symbol-icons-fixes