Update for custom icon support