Add menu icon and remove menu link. Add icon object for icons. Clean up.