Made the icons match the shapes.