removed role
added icons and shapes