Added Icons and changed naming