add icons
Merge remote-tracking branch 'origin/add-icons'