Cleanup
Default fill color to white
Update
Add icons to the toolbar