Extend the Toolbar example (see also issue 6215)