re #6682 Updates for new logos
Merge branch 'feature/6682_new_icons' into develop