Fix and add icons