upgraded with new icon set