Refactored color and tool chooser workflows.  Added new icons