better icons
Merge branch 'refs/heads/master' into new

* refs/heads/master:
  better icons