Update IMAGES_AND_ICONS
Merge remote-tracking branch 'origin/experimental' into experimental