Fix toolbar classes