Update toolbar semantics to combat twbs >= 3.0