Upgrade to new icon names