Include only referenced properties in icon links.

Also, restore the <scale> element that was lost during previous
refactoring.