Various cleanup related to the shape settings popup and how the menu
icons are highlighted with an image instead of a more efficient border.