fixing toolbar
Merge remote-tracking branch 'upstream/master' into configurable_error_highlight
Merge pull request #1056 from diegosarmentero/configurable_error_highlight

Configurable error highlight