Enhancement: Adds Icons as per mockups.