Add system icon support