Add icons to toolbar buttons
Lots of nice changes