Close #4956 – Fix update SVG elements