UI code updated; icons updated