AddShape point icons
Generalized Popups
Restyled settings popup