Merge of the icon rewrite.