adding icons
Merge branch 'icon' into stage