re #6682 icon for macs
Merge branch 'feature/6682_new_icons' into develop