Add icon images. Minor cleanup.