added icons
Merge branch 'icons'