add icons
WIP
merging
merging