Merge pull request #4599 from Ansuel/move-svg