Update with new icon API