re-add icons.
Merge branch 'master' into server