added icon support