Refactor to move some more code into the toolbar provider.
Make the toolbar close button use the same mechanism as the other buttons. This stops a warning message when the toolbar closes.