Merge pull request #51 from Bkahler/master

Icon changes