Finishing touches for #78731: improvements to tool behaviour, toolbar ordered as per the mockup, etc.