re-do icons as some formats were busted!
Merge branch 'core-plugins' of github.com:amahi/platform into core-plugins