Reorganized the method of drawing icons, added a generic icon image.