Improved icon support.