Draw the Shapes menu with the shapes icon, not a lone square

Shapes menu button showed a rectangle icon (the first shape) instead of the category icon.