Fixed toolbar buttons, and some icons