ToolItem & ToolBar refactoring (fixes #717)