Fix toggling of exclusive formats in the toolbar
Merge branch 'headers'