Implement hlint suggested fixes
Move svg transform code from Gui to XML source file