Updating to add basic icon support