Updated to use new icon names