Fixed toolbar margins bug