Move transition to ToolbarBase class