Icon Update
Merge branch 'art' into development