Improve icon-image-link building