Merge icons to images to prevent web conflicts
Authored by: peterdell 2014-11-09
Parent: [r119]
Child: [r121]