Merge pull request #349 from rdymac/icons