diff --git a/FlatCAMApp.py b/FlatCAMApp.py
index 3069eaf3..f6f74d47 100644
--- a/FlatCAMApp.py
+++ b/FlatCAMApp.py
@@ -1714,11 +1714,15 @@ class App(QtCore.QObject):
         except:
             return "Could not retrieve object: %s" % obj_name
 
-        # TODO needs size of board / dpi information
+        # TODO needs size of board determining
+        # TODO needs seperate colours for CNCPath Export
 
         with self.proc_container.new("Exporting SVG") as proc:
-            svg_elem = obj.export_svg()
-            svg_elem = "<svg>" + svg_elem + "</svg>"
+            svg_header = '<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" '
+            svg_header += 'width="50mm" height="50mm" viewBox="0 -50 50 50">'
+            svg_header += '<g transform="scale(1,-1)">'
+            svg_footer = '</g> </svg>'
+            svg_elem = svg_header + obj.export_svg() + svg_footer
             doc = parse_xml_string(svg_elem)
             with open(filename, 'w') as fp:
                 fp.write(doc.toprettyxml())
diff --git a/camlib.py b/camlib.py
index 8bbd49ca..c9f2f7ff 100644
--- a/camlib.py
+++ b/camlib.py
@@ -875,7 +875,7 @@ class Geometry(object):
 
         :return: SVG Element
         """
-        svg_elem = self.solid_geometry.svg()
+        svg_elem = self.solid_geometry.svg(scale_factor=0.05)
         return svg_elem
 
 class ApertureMacro:
@@ -3328,7 +3328,7 @@ class CNCjob(Geometry):
         :return: SVG Element
         """
         self.solid_geometry = cascaded_union([geo['geom'] for geo in self.gcode_parsed])
-        svg_elem = self.solid_geometry.svg()
+        svg_elem = self.solid_geometry.svg(scale_factor=0.05)
         return svg_elem
 
 # def get_bounds(geometry_set):