Adding different shapes to the toolbar.
Part of Jira:http://tintin.cs.indiana.edu:8091/browse/PSU-20