Toolbar api

is based on the 3.0 merge PR