Merge pull request #470 from clcrutch/SystemIcons