add icons
conflict resolved