Change shape of choice.icon to image, and fix a bug.