Re-add the icon content node and handle empty icons better.