Fix toolbar for activities