fixed toolbar
Merge commit '9b32d26a8926c9ac6bf7eac7f7f5b96f4ab8b627'
merged in header changes