Add icons.
Merge branch 'ui' into develop