add icons & simplified