Use internal visual selector in the Pop-up palette.
This means you finally can have your shape of choice inside the pop-up palette!
Needs testing, obviously.
Ref T2438