Fix loading of images. Updated some icons.