Custom toolbars are still a mess

Despite the fact that fixes were checked in on 17 June, here it’s still completely dysfunctional… :confounded: