Added Icons and Popup