Now supports icon ID