Added some basic icons for a few of the buttons

Also optimized the shape highlights drawn when a shape is selected.