Update ImageButtons to use new shapes.