Some slight icon-link icon output refactoring