icons changes
mergeMerge branch 'master' of https://github.com/xmf-xmodeler/Mosaic
Not sure why git is making me do this.