added icons
Merge branch 'initial-config'