Added SVG icon support