Fix images and bug in Settings