Restoring some image based icons.
Merge pull request #1010 from cohitre/icons_fix

Restoring some image based icons.