colored icons
Merge branch 'nick'