Improve collection view icons
This refs affinitic #5964