pretty icons
Merge branch 'feature/icons'