Fix toolbar height inconsistency