diff --git a/src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_advanced.svg b/src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_advanced.svg
index 4305e72151..6f7f3be78d 100644
--- a/src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_advanced.svg
+++ b/src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_advanced.svg
@@ -198,69 +198,68 @@
     <path id="Bottom right" d="m 1189,841 h -10 v -5 h 5 v -5 h 5 z" />
     <path id="Bottom left" d="m 0,841 h 10 v -5 h -5 v -5 h -5 z" />
   </g>
-  <g id="Title block">
-    <g id="Borders" style="fill:none;stroke:#000000;stroke-width:0.35;stroke-linecap:round;stroke-linejoin:round">
-      <rect id="Frame" x="999" y="783" width="180" height="48" style="stroke-width:0.7"/>
-      <rect id="Owner border" x="1139" y="783" width="40" height="24"/>
-      <rect id="Identification number border" x="1079" y="807" width="60" height="12"/>
-      <rect id="Revision index border" x="1139" y="819" width="20" height="12"/>
-      <rect id="Date of issue border" x="1099" y="819" width="40" height="12"/>
-      <rect id="Sheet number border" x="1159" y="819" width="20" height="12"/>
-      <rect id="Title border" x="999" y="783" width="80" height="24"/>
-      <rect id="Responsible department border" x="1139" y="807" width="40" height="12"/>
-      <rect id="Approval person border" x="1079" y="795" width="60" height="12"/>
-      <rect id="Document type border" x="999" y="807" width="80" height="12"/>
-      <rect id="Creator border" x="1079" y="783" width="60" height="12"/>
-      <rect id="Document status border" x="999" y="819" width="80" height="12"/>
-      <rect id="Paper size border" x="1079" y="819" width="20" height="12"/>
-    </g>
-    <g id="Labels" style="font-size:3.5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
-      <text id="Owner label" x="1139.5" y="786.6">Owner:</text>
-      <text id="Identification number label" x="1079.5" y="810.6">Drawing number:</text>
-      <text id="Revision index label" x="1139.5" y="822.6">Revision:</text>
-      <text id="Date of issue label" x="1099.5" y="822.6">Issue date:</text>
-      <text id="Sheet number label" x="1159.5" y="822.6">Sheet:</text>
-      <text id="Title label" x="999.5" y="786.6">Title, supplementary title:</text>
-      <text id="Responsible department label" x="1139.5" y="810.6">Responsible department:</text>
-      <text id="Approval person label" x="1079.5" y="798.6">Approved by:</text>
-      <text id="Document type label" x="999.5" y="810.6">Document type:</text>
-      <text id="Creator label" x="1079.5" y="786.6">Created by:</text>
-      <text id="Document status label" x="999.5" y="822.6">Document status:</text>
-      <text id="Paper size label" x="1079.5" y="822.6">Paper size:</text>
-      <text id="Sheet scale label" x="1119.5" y="774.6">Scale:</text>
-      <text id="General tolerances label" x="1079.5" y="774.6">General tolerances:</text>
-      <text id="Part material label" x="999.5" y="774.6">Part Material:</text>
-    </g>
-    <g id="Data fields" style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
+<!-- Title block -->
+  <g id="Borders" style="fill:none;stroke:#000000;stroke-width:0.35;stroke-linecap:round;stroke-linejoin:round">
+    <rect id="Frame" x="999" y="783" width="180" height="48" style="stroke-width:0.7"/>
+    <rect id="Owner border" x="1139" y="783" width="40" height="24"/>
+    <rect id="Identification number border" x="1079" y="807" width="60" height="12"/>
+    <rect id="Revision index border" x="1139" y="819" width="20" height="12"/>
+    <rect id="Date of issue border" x="1099" y="819" width="40" height="12"/>
+    <rect id="Sheet number border" x="1159" y="819" width="20" height="12"/>
+    <rect id="Title border" x="999" y="783" width="80" height="24"/>
+    <rect id="Responsible department border" x="1139" y="807" width="40" height="12"/>
+    <rect id="Approval person border" x="1079" y="795" width="60" height="12"/>
+    <rect id="Document type border" x="999" y="807" width="80" height="12"/>
+    <rect id="Creator border" x="1079" y="783" width="60" height="12"/>
+    <rect id="Document status border" x="999" y="819" width="80" height="12"/>
+    <rect id="Paper size border" x="1079" y="819" width="20" height="12"/>
+  </g>
+  <g id="Labels" style="font-size:3.5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
+    <text id="Owner label" x="1139.5" y="786.6">Owner:</text>
+    <text id="Identification number label" x="1079.5" y="810.6">Drawing number:</text>
+    <text id="Revision index label" x="1139.5" y="822.6">Revision:</text>
+    <text id="Date of issue label" x="1099.5" y="822.6">Issue date:</text>
+    <text id="Sheet number label" x="1159.5" y="822.6">Sheet:</text>
+    <text id="Title label" x="999.5" y="786.6">Title, supplementary title:</text>
+    <text id="Responsible department label" x="1139.5" y="810.6">Responsible department:</text>
+    <text id="Approval person label" x="1079.5" y="798.6">Approved by:</text>
+    <text id="Document type label" x="999.5" y="810.6">Document type:</text>
+    <text id="Creator label" x="1079.5" y="786.6">Created by:</text>
+    <text id="Document status label" x="999.5" y="822.6">Document status:</text>
+    <text id="Paper size label" x="1079.5" y="822.6">Paper size:</text>
+    <text id="Sheet scale label" x="1119.5" y="774.6">Scale:</text>
+    <text id="General tolerances label" x="1079.5" y="774.6">General tolerances:</text>
+    <text id="Part material label" x="999.5" y="774.6">Part Material:</text>
+  </g>
+  <g id="Data fields" style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
     <text id="owner_1_data_field" x="1159" y="792.1" freecad:editable="owner_1" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="owner_2_data_field" x="1159" y="796.1" freecad:editable="owner_2" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="owner_3_data_field" x="1159" y="800.1" freecad:editable="owner_3" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="owner_4_data_field" x="1159" y="804.1" freecad:editable="owner_4" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
-      <text id="Identification number data field" x="1080" y="816.2" freecad:editable="drawing_number"><tspan>DN</tspan></text>
-      <text id="Revision index data field" x="1149" y="828.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
-      <text id="Date of issue data field" x="1100" y="828.2" freecad:editable="issue_date"><tspan>YYYY-MM-DD</tspan></text>
-      <text id="Sheet number data field" x="1169" y="828.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
-      <text id="Title data field" x="1000" y="792.2" freecad:editable="title"><tspan>ISO 7200 titleblock</tspan></text>
-      <text id="Supplementary title 1 data field" x="1000" y="798.2" freecad:editable="supplementary_title_1"><tspan>ST1</tspan></text>
-      <text id="Supplementary title 2 data field" x="1000" y="804.2" freecad:editable="supplementary_title_2"><tspan>ST2</tspan></text>
-      <text id="Responsible department data field" x="1140" y="816.2" freecad:editable="responsible_department"><tspan>RD</tspan></text>
-      <text id="Approval person data field" x="1080" y="804.2" freecad:editable="approved_by"><tspan>B. Hecate</tspan></text>
-      <text id="Document type data field" x="1000" y="816.2" freecad:editable="document_type"><tspan>Assembly Drawing</tspan></text>
-      <text id="Creator data field" x="1080" y="792.2" freecad:editable="created_by"><tspan>A. Nemesis</tspan></text>
-      <text id="Document status data field" x="1000" y="828.2" freecad:editable="document_status"><tspan>In preparation</tspan></text>
-      <text id="Paper size data field" x="1089" y="828.2" style="text-align:center;text-anchor:middle">A0</text>
-      <text id="Sheet scale data field" x="1129" y="780.2" style="text-align:center;text-anchor:middle" freecad:editable="page_scale"><tspan>1 : 1</tspan></text>
-      <text id="General tolerances data field" x="1080" y="780.2" freecad:editable="general_tolerances"><tspan>ISO 2768-m</tspan></text>
-      <text id="Part material data field" x="1000" y="780.2" freecad:editable="general_notes"><tspan>Stainless steel Mat.No. 1.4301</tspan></text>
-    </g>
-    <g id="Outlines" style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round">
-      <path id="Trapezoid" d="m 1158,766 -10,2.5 v 5 l 10,2.5 z"/>
-      <circle id="Inner circle" cx="1165" r="2.5" cy="771"/>
-      <circle id="Outer circle" cx="1165" r="5" cy="771"/>
-    </g>
-    <g id="Centre lines" style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:6, 0.75, 0.125, 0.75">
-        <path id="Horizontal" d="m 1147,771 h 24" style="stroke-dashoffset:0.25"/>
-        <path id="Vertical" d="m 1165,777 v -12" style="stroke-dashoffset:4.625"/>
-    </g>
+    <text id="Identification number data field" x="1080" y="816.2" freecad:editable="drawing_number"><tspan>DN</tspan></text>
+    <text id="Revision index data field" x="1149" y="828.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
+    <text id="Date of issue data field" x="1100" y="828.2" freecad:editable="issue_date"><tspan>YYYY-MM-DD</tspan></text>
+    <text id="Sheet number data field" x="1169" y="828.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
+    <text id="Title data field" x="1000" y="792.2" freecad:editable="title"><tspan>ISO 7200 titleblock</tspan></text>
+    <text id="Supplementary title 1 data field" x="1000" y="798.2" freecad:editable="supplementary_title_1"><tspan>ST1</tspan></text>
+    <text id="Supplementary title 2 data field" x="1000" y="804.2" freecad:editable="supplementary_title_2"><tspan>ST2</tspan></text>
+    <text id="Responsible department data field" x="1140" y="816.2" freecad:editable="responsible_department"><tspan>RD</tspan></text>
+    <text id="Approval person data field" x="1080" y="804.2" freecad:editable="approved_by"><tspan>B. Hecate</tspan></text>
+    <text id="Document type data field" x="1000" y="816.2" freecad:editable="document_type"><tspan>Assembly Drawing</tspan></text>
+    <text id="Creator data field" x="1080" y="792.2" freecad:editable="created_by"><tspan>A. Nemesis</tspan></text>
+    <text id="Document status data field" x="1000" y="828.2" freecad:editable="document_status"><tspan>In preparation</tspan></text>
+    <text id="Paper size data field" x="1089" y="828.2" style="text-align:center;text-anchor:middle">A0</text>
+    <text id="Sheet scale data field" x="1129" y="780.2" style="text-align:center;text-anchor:middle" freecad:editable="page_scale"><tspan>1 : 1</tspan></text>
+    <text id="General tolerances data field" x="1080" y="780.2" freecad:editable="general_tolerances"><tspan>ISO 2768-m</tspan></text>
+    <text id="Part material data field" x="1000" y="780.2" freecad:editable="general_notes"><tspan>Stainless steel Mat.No. 1.4301</tspan></text>
+  </g>
+  <g id="Outlines" style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round">
+    <path id="Trapezoid" d="m 1158,766 -10,2.5 v 5 l 10,2.5 z"/>
+    <circle id="Inner circle" cx="1165" r="2.5" cy="771"/>
+    <circle id="Outer circle" cx="1165" r="5" cy="771"/>
+  </g>
+  <g id="Centre lines" style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:6, 0.75, 0.125, 0.75">
+      <path id="Horizontal" d="m 1147,771 h 24" style="stroke-dashoffset:0.25"/>
+      <path id="Vertical" d="m 1165,777 v -12" style="stroke-dashoffset:4.625"/>
   </g>
 </svg>
diff --git a/src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_advanced.svg b/src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_advanced.svg
index bb7c64c8a6..619ee279a6 100644
--- a/src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_advanced.svg
+++ b/src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_advanced.svg
@@ -150,69 +150,68 @@
     <path id="Bottom right" d="m 841,594 h -10 v -5 h 5 v -5 h 5 z" />
     <path id="Bottom left"  d="m 0,594 h 10 v -5 h -5 v -5 h -5 z" />
   </g>
-  <g id="Title block">
-    <g id="Borders" style="fill:none;stroke:#000000;stroke-width:0.35;stroke-linecap:round;stroke-linejoin:round">
-      <rect id="Frame" x="651" y="536" width="180" height="48" style="stroke-width:0.7"/>
-      <rect id="Owner border" x="791" y="536" width="40" height="24"/>
-      <rect id="Identification number border" x="731" y="560" width="60" height="12"/>
-      <rect id="Revision index border" x="791" y="572" width="20" height="12"/>
-      <rect id="Date of issue border" x="751" y="572" width="40" height="12"/>
-      <rect id="Sheet number border" x="811" y="572" width="20" height="12"/>
-      <rect id="Title border" x="651" y="536" width="80" height="24"/>
-      <rect id="Responsible department border" x="791" y="560" width="40" height="12"/>
-      <rect id="Approval person border" x="731" y="548" width="60" height="12"/>
-      <rect id="Document type border" x="651" y="560" width="80" height="12"/>
-      <rect id="Creator border" x="731" y="536" width="60" height="12"/>
-      <rect id="Document status border" x="651" y="572" width="80" height="12"/>
-      <rect id="Paper size border" x="731" y="572" width="20" height="12"/>
-    </g>
-    <g id="Labels" style="font-size:3.5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
-      <text id="Owner label" x="791.5" y="539.6">Owner:</text>
-      <text id="Identification number label" x="731.5" y="563.6">Drawing number:</text>
-      <text id="Revision index label" x="791.5" y="575.6">Revision:</text>
-      <text id="Date of issue label" x="751.5" y="575.6">Issue date:</text>
-      <text id="Sheet number label" x="811.5" y="575.6">Sheet:</text>
-      <text id="Title label" x="651.5" y="539.6">Title, supplementary title:</text>
-      <text id="Responsible department label" x="791.5" y="563.6">Responsible department:</text>
-      <text id="Approval person label" x="731.5" y="551.6">Approved by:</text>
-      <text id="Document type label" x="651.5" y="563.6">Document type:</text>
-      <text id="Creator label" x="731.5" y="539.6">Created by:</text>
-      <text id="Document status label" x="651.5" y="575.6">Document status:</text>
-      <text id="Paper size label" x="731.5" y="575.6">Paper size:</text>
-      <text id="Sheet scale label" x="771.5" y="527.6">Scale:</text>
-      <text id="General tolerances label" x="731.5" y="527.6">General tolerances:</text>
-      <text id="Part material label" x="651.5" y="527.6">Part Material:</text>
-    </g>
-    <g id="Data fields" style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
+<!-- Title block -->
+  <g id="Borders" style="fill:none;stroke:#000000;stroke-width:0.35;stroke-linecap:round;stroke-linejoin:round">
+    <rect id="Frame" x="651" y="536" width="180" height="48" style="stroke-width:0.7"/>
+    <rect id="Owner border" x="791" y="536" width="40" height="24"/>
+    <rect id="Identification number border" x="731" y="560" width="60" height="12"/>
+    <rect id="Revision index border" x="791" y="572" width="20" height="12"/>
+    <rect id="Date of issue border" x="751" y="572" width="40" height="12"/>
+    <rect id="Sheet number border" x="811" y="572" width="20" height="12"/>
+    <rect id="Title border" x="651" y="536" width="80" height="24"/>
+    <rect id="Responsible department border" x="791" y="560" width="40" height="12"/>
+    <rect id="Approval person border" x="731" y="548" width="60" height="12"/>
+    <rect id="Document type border" x="651" y="560" width="80" height="12"/>
+    <rect id="Creator border" x="731" y="536" width="60" height="12"/>
+    <rect id="Document status border" x="651" y="572" width="80" height="12"/>
+    <rect id="Paper size border" x="731" y="572" width="20" height="12"/>
+  </g>
+  <g id="Labels" style="font-size:3.5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
+    <text id="Owner label" x="791.5" y="539.6">Owner:</text>
+    <text id="Identification number label" x="731.5" y="563.6">Drawing number:</text>
+    <text id="Revision index label" x="791.5" y="575.6">Revision:</text>
+    <text id="Date of issue label" x="751.5" y="575.6">Issue date:</text>
+    <text id="Sheet number label" x="811.5" y="575.6">Sheet:</text>
+    <text id="Title label" x="651.5" y="539.6">Title, supplementary title:</text>
+    <text id="Responsible department label" x="791.5" y="563.6">Responsible department:</text>
+    <text id="Approval person label" x="731.5" y="551.6">Approved by:</text>
+    <text id="Document type label" x="651.5" y="563.6">Document type:</text>
+    <text id="Creator label" x="731.5" y="539.6">Created by:</text>
+    <text id="Document status label" x="651.5" y="575.6">Document status:</text>
+    <text id="Paper size label" x="731.5" y="575.6">Paper size:</text>
+    <text id="Sheet scale label" x="771.5" y="527.6">Scale:</text>
+    <text id="General tolerances label" x="731.5" y="527.6">General tolerances:</text>
+    <text id="Part material label" x="651.5" y="527.6">Part Material:</text>
+  </g>
+  <g id="Data fields" style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
     <text id="owner_1_data_field" x="811" y="545.1" freecad:editable="owner_1" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="owner_2_data_field" x="811" y="549.1" freecad:editable="owner_2" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="owner_3_data_field" x="811" y="553.1" freecad:editable="owner_3" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="owner_4_data_field" x="811" y="557.1" freecad:editable="owner_4" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
-      <text id="Identification number data field" x="732" y="569.2" freecad:editable="drawing_number"><tspan>DN</tspan></text>
-      <text id="Revision index data field" x="801" y="581.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
-      <text id="Date of issue data field" x="752" y="581.2" freecad:editable="issue_date"><tspan>YYYY-MM-DD</tspan></text>
-      <text id="Sheet number data field" x="821" y="581.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
-      <text id="Title data field" x="652" y="545.2" freecad:editable="title"><tspan>ISO 7200 titleblock</tspan></text>
-      <text id="Supplementary title 1 data field" x="652" y="551.2" freecad:editable="supplementary_title_1"><tspan>ST1</tspan></text>
-      <text id="Supplementary title 2 data field" x="652" y="557.2" freecad:editable="supplementary_title_2"><tspan>ST2</tspan></text>
-      <text id="Responsible department data field" x="792" y="569.2" freecad:editable="responsible_department"><tspan>RD</tspan></text>
-      <text id="Approval person data field" x="732" y="557.2" freecad:editable="approved_by"><tspan>B. Hecate</tspan></text>
-      <text id="Document type data field" x="652" y="569.2" freecad:editable="document_type"><tspan>Assembly Drawing</tspan></text>
-      <text id="Creator data field" x="732" y="545.2" freecad:editable="created_by"><tspan>A. Nemesis</tspan></text>
-      <text id="Document status data field" x="652" y="581.2" freecad:editable="document_status"><tspan>In preparation</tspan></text>
-      <text id="Paper size data field" x="741" y="581.2" style="text-align:center;text-anchor:middle">A1</text>
-      <text id="Sheet scale data field" x="781" y="533.2" style="text-align:center;text-anchor:middle" freecad:editable="page_scale"><tspan>1 : 1</tspan></text>
-      <text id="General tolerances data field" x="732" y="533.2" freecad:editable="general_tolerances"><tspan>ISO 2768-m</tspan></text>
-      <text id="Part material data field" x="652" y="533.2" freecad:editable="general_notes"><tspan>Stainless steel Mat.No. 1.4301</tspan></text>
-    </g>
-    <g id="Outlines" style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round">
-      <path id="Trapezoid" d="m 810,519 -10,2.5 v 5 l 10,2.5 z"/>
-      <circle id="Inner circle" cx="817" r="2.5" cy="524"/>
-      <circle id="Outer circle" cx="817" r="5" cy="524"/>
-    </g>
-    <g id="Centre lines" style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:6, 0.75, 0.125, 0.75">
-        <path id="Horizontal" d="m 799,524 h 24" style="stroke-dashoffset:0.25"/>
-        <path id="Vertical" d="m 817,530 v -12" style="stroke-dashoffset:4.625"/>
-    </g>
+    <text id="Identification number data field" x="732" y="569.2" freecad:editable="drawing_number"><tspan>DN</tspan></text>
+    <text id="Revision index data field" x="801" y="581.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
+    <text id="Date of issue data field" x="752" y="581.2" freecad:editable="issue_date"><tspan>YYYY-MM-DD</tspan></text>
+    <text id="Sheet number data field" x="821" y="581.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
+    <text id="Title data field" x="652" y="545.2" freecad:editable="title"><tspan>ISO 7200 titleblock</tspan></text>
+    <text id="Supplementary title 1 data field" x="652" y="551.2" freecad:editable="supplementary_title_1"><tspan>ST1</tspan></text>
+    <text id="Supplementary title 2 data field" x="652" y="557.2" freecad:editable="supplementary_title_2"><tspan>ST2</tspan></text>
+    <text id="Responsible department data field" x="792" y="569.2" freecad:editable="responsible_department"><tspan>RD</tspan></text>
+    <text id="Approval person data field" x="732" y="557.2" freecad:editable="approved_by"><tspan>B. Hecate</tspan></text>
+    <text id="Document type data field" x="652" y="569.2" freecad:editable="document_type"><tspan>Assembly Drawing</tspan></text>
+    <text id="Creator data field" x="732" y="545.2" freecad:editable="created_by"><tspan>A. Nemesis</tspan></text>
+    <text id="Document status data field" x="652" y="581.2" freecad:editable="document_status"><tspan>In preparation</tspan></text>
+    <text id="Paper size data field" x="741" y="581.2" style="text-align:center;text-anchor:middle">A1</text>
+    <text id="Sheet scale data field" x="781" y="533.2" style="text-align:center;text-anchor:middle" freecad:editable="page_scale"><tspan>1 : 1</tspan></text>
+    <text id="General tolerances data field" x="732" y="533.2" freecad:editable="general_tolerances"><tspan>ISO 2768-m</tspan></text>
+    <text id="Part material data field" x="652" y="533.2" freecad:editable="general_notes"><tspan>Stainless steel Mat.No. 1.4301</tspan></text>
+  </g>
+  <g id="Outlines" style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round">
+    <path id="Trapezoid" d="m 810,519 -10,2.5 v 5 l 10,2.5 z"/>
+    <circle id="Inner circle" cx="817" r="2.5" cy="524"/>
+    <circle id="Outer circle" cx="817" r="5" cy="524"/>
+  </g>
+  <g id="Centre lines" style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:6, 0.75, 0.125, 0.75">
+      <path id="Horizontal" d="m 799,524 h 24" style="stroke-dashoffset:0.25"/>
+      <path id="Vertical" d="m 817,530 v -12" style="stroke-dashoffset:4.625"/>
   </g>
 </svg>
diff --git a/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_advanced.svg b/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_advanced.svg
index e4c1d3f3dc..562e769469 100644
--- a/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_advanced.svg
+++ b/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_advanced.svg
@@ -117,69 +117,68 @@
     <path id="Bottom right" d="m 594,420 h -10 v -5 h 5 v -5 h 5 z" />
     <path id="Bottom left"  d="m 0,420 h 10 v -5 h -5 v -5 h -5 z" />
   </g>
-  <g id="Title block">
-    <g id="Borders" style="fill:none;stroke:#000000;stroke-width:0.35;stroke-linecap:round;stroke-linejoin:round">
-      <rect id="Frame" x="404" y="362" width="180" height="48" style="stroke-width:0.7"/>
-      <rect id="Owner border" x="544" y="362" width="40" height="24"/>
-      <rect id="Identification number border" x="484" y="386" width="60" height="12"/>
-      <rect id="Revision index border" x="544" y="398" width="20" height="12"/>
-      <rect id="Date of issue border" x="504" y="398" width="40" height="12"/>
-      <rect id="Sheet number border" x="564" y="398" width="20" height="12"/>
-      <rect id="Title border" x="404" y="362" width="80" height="24"/>
-      <rect id="Responsible department border" x="544" y="386" width="40" height="12"/>
-      <rect id="Approval person border" x="484" y="374" width="60" height="12"/>
-      <rect id="Document type border" x="404" y="386" width="80" height="12"/>
-      <rect id="Creator border" x="484" y="362" width="60" height="12"/>
-      <rect id="Document status border" x="404" y="398" width="80" height="12"/>
-      <rect id="Paper size border" x="484" y="398" width="20" height="12"/>
-    </g>
-    <g id="Labels" style="font-size:3.5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
-      <text id="Owner label" x="544.5" y="365.6">Owner:</text>
-      <text id="Identification number label" x="484.5" y="389.6">Drawing number:</text>
-      <text id="Revision index label" x="544.5" y="401.6">Revision:</text>
-      <text id="Date of issue label" x="504.5" y="401.6">Issue date:</text>
-      <text id="Sheet number label" x="564.5" y="401.6">Sheet:</text>
-      <text id="Title label" x="404.5" y="365.6">Title, supplementary title:</text>
-      <text id="Responsible department label" x="544.5" y="389.6">Responsible department:</text>
-      <text id="Approval person label" x="484.5" y="377.6">Approved by:</text>
-      <text id="Document type label" x="404.5" y="389.6">Document type:</text>
-      <text id="Creator label" x="484.5" y="365.6">Created by:</text>
-      <text id="Document status label" x="404.5" y="401.6">Document status:</text>
-      <text id="Paper size label" x="484.5" y="401.6">Paper size:</text>
-      <text id="Sheet scale label" x="524.5" y="353.6">Scale:</text>
-      <text id="General tolerances label" x="484.5" y="353.6">General tolerances:</text>
-      <text id="Part material label" x="404.5" y="353.6">Part Material:</text>
-    </g>
-    <g id="Data fields" style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
+<!-- Title block -->
+  <g id="Borders" style="fill:none;stroke:#000000;stroke-width:0.35;stroke-linecap:round;stroke-linejoin:round">
+    <rect id="Frame" x="404" y="362" width="180" height="48" style="stroke-width:0.7"/>
+    <rect id="Owner border" x="544" y="362" width="40" height="24"/>
+    <rect id="Identification number border" x="484" y="386" width="60" height="12"/>
+    <rect id="Revision index border" x="544" y="398" width="20" height="12"/>
+    <rect id="Date of issue border" x="504" y="398" width="40" height="12"/>
+    <rect id="Sheet number border" x="564" y="398" width="20" height="12"/>
+    <rect id="Title border" x="404" y="362" width="80" height="24"/>
+    <rect id="Responsible department border" x="544" y="386" width="40" height="12"/>
+    <rect id="Approval person border" x="484" y="374" width="60" height="12"/>
+    <rect id="Document type border" x="404" y="386" width="80" height="12"/>
+    <rect id="Creator border" x="484" y="362" width="60" height="12"/>
+    <rect id="Document status border" x="404" y="398" width="80" height="12"/>
+    <rect id="Paper size border" x="484" y="398" width="20" height="12"/>
+  </g>
+  <g id="Labels" style="font-size:3.5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
+    <text id="Owner label" x="544.5" y="365.6">Owner:</text>
+    <text id="Identification number label" x="484.5" y="389.6">Drawing number:</text>
+    <text id="Revision index label" x="544.5" y="401.6">Revision:</text>
+    <text id="Date of issue label" x="504.5" y="401.6">Issue date:</text>
+    <text id="Sheet number label" x="564.5" y="401.6">Sheet:</text>
+    <text id="Title label" x="404.5" y="365.6">Title, supplementary title:</text>
+    <text id="Responsible department label" x="544.5" y="389.6">Responsible department:</text>
+    <text id="Approval person label" x="484.5" y="377.6">Approved by:</text>
+    <text id="Document type label" x="404.5" y="389.6">Document type:</text>
+    <text id="Creator label" x="484.5" y="365.6">Created by:</text>
+    <text id="Document status label" x="404.5" y="401.6">Document status:</text>
+    <text id="Paper size label" x="484.5" y="401.6">Paper size:</text>
+    <text id="Sheet scale label" x="524.5" y="353.6">Scale:</text>
+    <text id="General tolerances label" x="484.5" y="353.6">General tolerances:</text>
+    <text id="Part material label" x="404.5" y="353.6">Part Material:</text>
+  </g>
+  <g id="Data fields" style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
     <text id="owner_1_data_field" x="564" y="371.1" freecad:editable="owner_1" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="owner_2_data_field" x="564" y="375.1" freecad:editable="owner_2" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="owner_3_data_field" x="564" y="379.1" freecad:editable="owner_3" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="owner_4_data_field" x="564" y="383.1" freecad:editable="owner_4" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
-      <text id="Identification number data field" x="485" y="395.2" freecad:editable="drawing_number"><tspan>DN</tspan></text>
-      <text id="Revision index data field" x="554" y="407.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
-      <text id="Date of issue data field" x="505" y="407.2" freecad:editable="issue_date"><tspan>YYYY-MM-DD</tspan></text>
-      <text id="Sheet number data field" x="574" y="407.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
-      <text id="Title data field" x="405" y="371.2" freecad:editable="title"><tspan>ISO 7200 titleblock</tspan></text>
-      <text id="Supplementary title 1 data field" x="405" y="377.2" freecad:editable="supplementary_title_1"><tspan>ST1</tspan></text>
-      <text id="Supplementary title 2 data field" x="405" y="383.2" freecad:editable="supplementary_title_2"><tspan>ST2</tspan></text>
-      <text id="Responsible department data field" x="545" y="395.2" freecad:editable="responsible_department"><tspan>RD</tspan></text>
-      <text id="Approval person data field" x="485" y="383.2" freecad:editable="approved_by"><tspan>B. Hecate</tspan></text>
-      <text id="Document type data field" x="405" y="395.2" freecad:editable="document_type"><tspan>Assembly Drawing</tspan></text>
-      <text id="Creator data field" x="485" y="371.2" freecad:editable="created_by"><tspan>A. Nemesis</tspan></text>
-      <text id="Document status data field" x="405" y="407.2" freecad:editable="document_status"><tspan>In preparation</tspan></text>
-      <text id="Paper size data field" x="494" y="407.2" style="text-align:center;text-anchor:middle">A2</text>
-      <text id="Sheet scale data field" x="534" y="359.2" style="text-align:center;text-anchor:middle" freecad:editable="page_scale"><tspan>1 : 1</tspan></text>
-      <text id="General tolerances data field" x="485" y="359.2" freecad:editable="general_tolerances"><tspan>ISO 2768-m</tspan></text>
-      <text id="Part material data field" x="405" y="359.2" freecad:editable="general_notes"><tspan>Stainless steel Mat.No. 1.4301</tspan></text>
-    </g>
-    <g id="Outlines" style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round">
-      <path id="Trapezoid" d="m 563,345 -10,2.5 v 5 l 10,2.5 z"/>
-      <circle id="Inner circle" cx="570" r="2.5" cy="350"/>
-      <circle id="Outer circle" cx="570" r="5" cy="350"/>
-    </g>
-    <g id="Centre lines" style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:6, 0.75, 0.125, 0.75">
-        <path id="Horizontal" d="m 552,350 h 24" style="stroke-dashoffset:0.25"/>
-        <path id="Vertical" d="m 570,356 v -12" style="stroke-dashoffset:4.625"/>
-    </g>
+    <text id="Identification number data field" x="485" y="395.2" freecad:editable="drawing_number"><tspan>DN</tspan></text>
+    <text id="Revision index data field" x="554" y="407.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
+    <text id="Date of issue data field" x="505" y="407.2" freecad:editable="issue_date"><tspan>YYYY-MM-DD</tspan></text>
+    <text id="Sheet number data field" x="574" y="407.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
+    <text id="Title data field" x="405" y="371.2" freecad:editable="title"><tspan>ISO 7200 titleblock</tspan></text>
+    <text id="Supplementary title 1 data field" x="405" y="377.2" freecad:editable="supplementary_title_1"><tspan>ST1</tspan></text>
+    <text id="Supplementary title 2 data field" x="405" y="383.2" freecad:editable="supplementary_title_2"><tspan>ST2</tspan></text>
+    <text id="Responsible department data field" x="545" y="395.2" freecad:editable="responsible_department"><tspan>RD</tspan></text>
+    <text id="Approval person data field" x="485" y="383.2" freecad:editable="approved_by"><tspan>B. Hecate</tspan></text>
+    <text id="Document type data field" x="405" y="395.2" freecad:editable="document_type"><tspan>Assembly Drawing</tspan></text>
+    <text id="Creator data field" x="485" y="371.2" freecad:editable="created_by"><tspan>A. Nemesis</tspan></text>
+    <text id="Document status data field" x="405" y="407.2" freecad:editable="document_status"><tspan>In preparation</tspan></text>
+    <text id="Paper size data field" x="494" y="407.2" style="text-align:center;text-anchor:middle">A2</text>
+    <text id="Sheet scale data field" x="534" y="359.2" style="text-align:center;text-anchor:middle" freecad:editable="page_scale"><tspan>1 : 1</tspan></text>
+    <text id="General tolerances data field" x="485" y="359.2" freecad:editable="general_tolerances"><tspan>ISO 2768-m</tspan></text>
+    <text id="Part material data field" x="405" y="359.2" freecad:editable="general_notes"><tspan>Stainless steel Mat.No. 1.4301</tspan></text>
+  </g>
+  <g id="Outlines" style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round">
+    <path id="Trapezoid" d="m 563,345 -10,2.5 v 5 l 10,2.5 z"/>
+    <circle id="Inner circle" cx="570" r="2.5" cy="350"/>
+    <circle id="Outer circle" cx="570" r="5" cy="350"/>
+  </g>
+  <g id="Centre lines" style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:6, 0.75, 0.125, 0.75">
+      <path id="Horizontal" d="m 552,350 h 24" style="stroke-dashoffset:0.25"/>
+      <path id="Vertical" d="m 570,356 v -12" style="stroke-dashoffset:4.625"/>
   </g>
 </svg>
diff --git a/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_minimal.svg b/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_minimal.svg
index d8d5c16583..f2dcf83b25 100644
--- a/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_minimal.svg
+++ b/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_minimal.svg
@@ -118,61 +118,59 @@
     <path id="Bottom left"  d="m 0,420 h 10 v -5 h -5 v -5 h -5 z" />
   </g>
 <!-- Title block -->
-  <g id="Title block">
-    <g id="Borders" style="fill:none;stroke:#000000;stroke-width:0.35;stroke-linecap:round;stroke-linejoin:round">
-      <rect id="Frame" x="404" y="374" width="180" height="36" style="stroke-width:0.7"/>
-      <rect id="Owner border" x="544" y="374" width="40" height="24"/>
-      <rect id="Identification number border" x="404" y="398" width="80" height="12"/>
-      <rect id="Revision index border" x="544" y="398" width="20" height="12"/>
-      <rect id="Date of issue border" x="504" y="398" width="40" height="12"/>
-      <rect id="Sheet number border" x="564" y="398" width="20" height="12"/>
-      <rect id="Title border" x="404" y="374" width="80" height="12"/>
-      <rect id="Approval person border" x="484" y="386" width="60" height="12"/>
-      <rect id="Creator border" x="484" y="374" width="60" height="12"/>
-      <rect id="Document type border" x="404" y="386" width="80" height="12"/>
-      <rect id="Paper size border" x="484" y="398" width="20" height="12"/>
-    </g>
-    <g id="Labels" style="font-size:3.5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
-      <text id="Owner label" x="544.5" y="377.6">Owner:</text>
-      <text id="Identification number label" x="404.5" y="401.6">Drawing number:</text>
-      <text id="Revision index label" x="544.5" y="401.6">Revision:</text>
-      <text id="Date of issue label" x="504.5" y="401.6">Issue date:</text>
-      <text id="Sheet number label" x="564.5" y="401.6">Sheet:</text>
-      <text id="Title label" x="404.5" y="377.6">Title:</text>
-      <text id="Approval person label" x="484.5" y="389.6">Approved by:</text>
-      <text id="Creator label" x="484.5" y="377.6">Created by:</text>
-      <text id="Document type label" x="404.5" y="389.6">Document type:</text>
-      <text id="Paper size label" x="484.5" y="401.6">Paper size:</text>
-      <text id="Sheet scale label" x="524.5" y="365.6">Scale:</text>
-      <text id="General tolerances label" x="484.5" y="365.6">General tolerances:</text>
-      <text id="Part material label" x="404.5" y="365.6">Part Material:</text>
-    </g>
-    <g id="Data fields" style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
+  <g id="Borders" style="fill:none;stroke:#000000;stroke-width:0.35;stroke-linecap:round;stroke-linejoin:round">
+    <rect id="Frame" x="404" y="374" width="180" height="36" style="stroke-width:0.7"/>
+    <rect id="Owner border" x="544" y="374" width="40" height="24"/>
+    <rect id="Identification number border" x="404" y="398" width="80" height="12"/>
+    <rect id="Revision index border" x="544" y="398" width="20" height="12"/>
+    <rect id="Date of issue border" x="504" y="398" width="40" height="12"/>
+    <rect id="Sheet number border" x="564" y="398" width="20" height="12"/>
+    <rect id="Title border" x="404" y="374" width="80" height="12"/>
+    <rect id="Approval person border" x="484" y="386" width="60" height="12"/>
+    <rect id="Creator border" x="484" y="374" width="60" height="12"/>
+    <rect id="Document type border" x="404" y="386" width="80" height="12"/>
+    <rect id="Paper size border" x="484" y="398" width="20" height="12"/>
+  </g>
+  <g id="Labels" style="font-size:3.5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
+    <text id="Owner label" x="544.5" y="377.6">Owner:</text>
+    <text id="Identification number label" x="404.5" y="401.6">Drawing number:</text>
+    <text id="Revision index label" x="544.5" y="401.6">Revision:</text>
+    <text id="Date of issue label" x="504.5" y="401.6">Issue date:</text>
+    <text id="Sheet number label" x="564.5" y="401.6">Sheet:</text>
+    <text id="Title label" x="404.5" y="377.6">Title:</text>
+    <text id="Approval person label" x="484.5" y="389.6">Approved by:</text>
+    <text id="Creator label" x="484.5" y="377.6">Created by:</text>
+    <text id="Document type label" x="404.5" y="389.6">Document type:</text>
+    <text id="Paper size label" x="484.5" y="401.6">Paper size:</text>
+    <text id="Sheet scale label" x="524.5" y="365.6">Scale:</text>
+    <text id="General tolerances label" x="484.5" y="365.6">General tolerances:</text>
+    <text id="Part material label" x="404.5" y="365.6">Part Material:</text>
+  </g>
+  <g id="Data fields" style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
     <text id="owner_1_data_field" x="564" y="383.1" freecad:editable="owner_1" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="owner_2_data_field" x="564" y="387.1" freecad:editable="owner_2" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="owner_3_data_field" x="564" y="391.1" freecad:editable="owner_3" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="owner_4_data_field" x="564" y="395.1" freecad:editable="owner_4" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
-      <text id="Identification number data field" x="405" y="407.2" freecad:editable="drawing_number"><tspan>DN</tspan></text>
-      <text id="Revision index data field" x="554" y="407.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
-      <text id="Date of issue data field" x="505" y="407.2" freecad:editable="issue_date"><tspan>YYYY-MM-DD</tspan></text>
-      <text id="Sheet number data field" x="574" y="407.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
-      <text id="Title data field" x="405" y="383.2" freecad:editable="title"><tspan>ISO 5457 template</tspan></text>
-      <text id="Approval person data field" x="485" y="395.2" freecad:editable="approved_by"><tspan>B. Hecate</tspan></text>
-      <text id="Creator data field" x="485" y="383.2" freecad:editable="created_by"><tspan>A. Nemesis</tspan></text>
-      <text id="Document type data field" x="405" y="395.2" freecad:editable="document_type"><tspan>Assembly Drawing</tspan></text>
-      <text id="Paper size data field" x="494" y="407.2" style="text-align:center;text-anchor:middle">A2</text>
-      <text id="Sheet scale data field" x="534" y="371.2" style="text-align:center;text-anchor:middle" freecad:editable="page_scale"><tspan>1 : 1</tspan></text>
-      <text id="General tolerances data field" x="485" y="371.2" freecad:editable="general_tolerances"><tspan>ISO 2768-m</tspan></text>
-      <text id="Part material data field" x="405" y="371.2" freecad:editable="general_notes"><tspan>Stainless steel Mat.No. 1.4301</tspan></text>
-    </g>
-    <g id="Outlines" style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round">
-      <path id="Trapezoid" d="m 563,357 -10,2.5 v 5 l 10,2.5 z"/>
-      <circle id="Inner circle" cx="570" r="2.5" cy="362"/>
-      <circle id="Outer circle" cx="570" r="5" cy="362"/>
-    </g>
-    <g id="Centre lines" style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:6, 0.75, 0.125, 0.75">
-      <path id="Horizontal" d="m 552,362 h 24" style="stroke-dashoffset:0.25"/>
-      <path id="Vertical" d="m 570,368 v -12" style="stroke-dashoffset:4.625"/>
-    </g>
+    <text id="Identification number data field" x="405" y="407.2" freecad:editable="drawing_number"><tspan>DN</tspan></text>
+    <text id="Revision index data field" x="554" y="407.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
+    <text id="Date of issue data field" x="505" y="407.2" freecad:editable="issue_date"><tspan>YYYY-MM-DD</tspan></text>
+    <text id="Sheet number data field" x="574" y="407.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
+    <text id="Title data field" x="405" y="383.2" freecad:editable="title"><tspan>ISO 5457 template</tspan></text>
+    <text id="Approval person data field" x="485" y="395.2" freecad:editable="approved_by"><tspan>B. Hecate</tspan></text>
+    <text id="Creator data field" x="485" y="383.2" freecad:editable="created_by"><tspan>A. Nemesis</tspan></text>
+    <text id="Document type data field" x="405" y="395.2" freecad:editable="document_type"><tspan>Assembly Drawing</tspan></text>
+    <text id="Paper size data field" x="494" y="407.2" style="text-align:center;text-anchor:middle">A2</text>
+    <text id="Sheet scale data field" x="534" y="371.2" style="text-align:center;text-anchor:middle" freecad:editable="page_scale"><tspan>1 : 1</tspan></text>
+    <text id="General tolerances data field" x="485" y="371.2" freecad:editable="general_tolerances"><tspan>ISO 2768-m</tspan></text>
+    <text id="Part material data field" x="405" y="371.2" freecad:editable="general_notes"><tspan>Stainless steel Mat.No. 1.4301</tspan></text>
+  </g>
+  <g id="Outlines" style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round">
+    <path id="Trapezoid" d="m 563,357 -10,2.5 v 5 l 10,2.5 z"/>
+    <circle id="Inner circle" cx="570" r="2.5" cy="362"/>
+    <circle id="Outer circle" cx="570" r="5" cy="362"/>
+  </g>
+  <g id="Centre lines" style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:6, 0.75, 0.125, 0.75">
+    <path id="Horizontal" d="m 552,362 h 24" style="stroke-dashoffset:0.25"/>
+    <path id="Vertical" d="m 570,368 v -12" style="stroke-dashoffset:4.625"/>
   </g>
 </svg>
diff --git a/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_advanced.svg b/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_advanced.svg
index 01f316fe68..3639023d6e 100644
--- a/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_advanced.svg
+++ b/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_advanced.svg
@@ -94,69 +94,68 @@
     <path id="Bottom right" d="m 420,297 h -10 v -5 h 5 v -5 h 5 z" />
     <path id="Bottom left"  d="m 0,297 h 10 v -5 h -5 v -5 h -5 z" />
   </g>
-  <g id="Title block">
-    <g id="Borders" style="fill:none;stroke:#000000;stroke-width:0.35;stroke-linecap:round;stroke-linejoin:round">
-      <rect id="Frame" x="230" y="239" width="180" height="48" style="stroke-width:0.7"/>
-      <rect id="Owner border" x="370" y="239" width="40" height="24"/>
-      <rect id="Identification number border" x="310" y="263" width="60" height="12"/>
-      <rect id="Revision index border" x="370" y="275" width="20" height="12"/>
-      <rect id="Date of issue border" x="330" y="275" width="40" height="12"/>
-      <rect id="Sheet number border" x="390" y="275" width="20" height="12"/>
-      <rect id="Title border" x="230" y="239" width="80" height="24"/>
-      <rect id="Responsible department border" x="370" y="263" width="40" height="12"/>
-      <rect id="Approval person border" x="310" y="251" width="60" height="12"/>
-      <rect id="Document type border" x="230" y="263" width="80" height="12"/>
-      <rect id="Creator border" x="310" y="239" width="60" height="12"/>
-      <rect id="Document status border" x="230" y="275" width="80" height="12"/>
-      <rect id="Paper size border" x="310" y="275" width="20" height="12"/>
-    </g>
-    <g id="Labels" style="font-size:3.5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
-      <text id="Owner label" x="370.5" y="242.6">Owner:</text>
-      <text id="Identification number label" x="310.5" y="266.6">Drawing number:</text>
-      <text id="Revision index label" x="370.5" y="278.6">Revision:</text>
-      <text id="Date of issue label" x="330.5" y="278.6">Issue date:</text>
-      <text id="Sheet number label" x="390.5" y="278.6">Sheet:</text>
-      <text id="Title label" x="230.5" y="242.6">Title, supplementary title:</text>
-      <text id="Responsible department label" x="370.5" y="266.6">Responsible department:</text>
-      <text id="Approval person label" x="310.5" y="254.6">Approved by:</text>
-      <text id="Document type label" x="230.5" y="266.6">Document type:</text>
-      <text id="Creator label" x="310.5" y="242.6">Created by:</text>
-      <text id="Document status label" x="230.5" y="278.6">Document status:</text>
-      <text id="Paper size label" x="310.5" y="278.6">Paper size:</text>
-      <text id="Sheet scale label" x="350.5" y="230.6">Scale:</text>
-      <text id="General tolerances label" x="310.5" y="230.6">General tolerances:</text>
-      <text id="Part material label" x="230.5" y="230.6">Part Material:</text>
-    </g>
-    <g id="Data fields" style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
+<!-- Title block -->
+  <g id="Borders" style="fill:none;stroke:#000000;stroke-width:0.35;stroke-linecap:round;stroke-linejoin:round">
+    <rect id="Frame" x="230" y="239" width="180" height="48" style="stroke-width:0.7"/>
+    <rect id="Owner border" x="370" y="239" width="40" height="24"/>
+    <rect id="Identification number border" x="310" y="263" width="60" height="12"/>
+    <rect id="Revision index border" x="370" y="275" width="20" height="12"/>
+    <rect id="Date of issue border" x="330" y="275" width="40" height="12"/>
+    <rect id="Sheet number border" x="390" y="275" width="20" height="12"/>
+    <rect id="Title border" x="230" y="239" width="80" height="24"/>
+    <rect id="Responsible department border" x="370" y="263" width="40" height="12"/>
+    <rect id="Approval person border" x="310" y="251" width="60" height="12"/>
+    <rect id="Document type border" x="230" y="263" width="80" height="12"/>
+    <rect id="Creator border" x="310" y="239" width="60" height="12"/>
+    <rect id="Document status border" x="230" y="275" width="80" height="12"/>
+    <rect id="Paper size border" x="310" y="275" width="20" height="12"/>
+  </g>
+  <g id="Labels" style="font-size:3.5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
+    <text id="Owner label" x="370.5" y="242.6">Owner:</text>
+    <text id="Identification number label" x="310.5" y="266.6">Drawing number:</text>
+    <text id="Revision index label" x="370.5" y="278.6">Revision:</text>
+    <text id="Date of issue label" x="330.5" y="278.6">Issue date:</text>
+    <text id="Sheet number label" x="390.5" y="278.6">Sheet:</text>
+    <text id="Title label" x="230.5" y="242.6">Title, supplementary title:</text>
+    <text id="Responsible department label" x="370.5" y="266.6">Responsible department:</text>
+    <text id="Approval person label" x="310.5" y="254.6">Approved by:</text>
+    <text id="Document type label" x="230.5" y="266.6">Document type:</text>
+    <text id="Creator label" x="310.5" y="242.6">Created by:</text>
+    <text id="Document status label" x="230.5" y="278.6">Document status:</text>
+    <text id="Paper size label" x="310.5" y="278.6">Paper size:</text>
+    <text id="Sheet scale label" x="350.5" y="230.6">Scale:</text>
+    <text id="General tolerances label" x="310.5" y="230.6">General tolerances:</text>
+    <text id="Part material label" x="230.5" y="230.6">Part Material:</text>
+  </g>
+  <g id="Data fields" style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
     <text id="owner_1_data_field" x="390" y="248.1" freecad:editable="owner_1" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="owner_2_data_field" x="390" y="252.1" freecad:editable="owner_2" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="owner_3_data_field" x="390" y="256.1" freecad:editable="owner_3" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="owner_4_data_field" x="390" y="260.1" freecad:editable="owner_4" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
-      <text id="Identification number data field" x="311" y="272.2" freecad:editable="drawing_number"><tspan>DN</tspan></text>
-      <text id="Revision index data field" x="380" y="284.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
-      <text id="Date of issue data field" x="331" y="284.2" freecad:editable="issue_date"><tspan>YYYY-MM-DD</tspan></text>
-      <text id="Sheet number data field" x="400" y="284.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
-      <text id="Title data field" x="231" y="248.2" freecad:editable="title"><tspan>ISO 7200 titleblock</tspan></text>
-      <text id="Supplementary title 1 data field" x="231" y="254.2" freecad:editable="supplementary_title_1"><tspan>ST1</tspan></text>
-      <text id="Supplementary title 2 data field" x="231" y="260.2" freecad:editable="supplementary_title_2"><tspan>ST2</tspan></text>
-      <text id="Responsible department data field" x="371" y="272.2" freecad:editable="responsible_department"><tspan>RD</tspan></text>
-      <text id="Approval person data field" x="311" y="260.2" freecad:editable="approved_by"><tspan>B. Hecate</tspan></text>
-      <text id="Document type data field" x="231" y="272.2" freecad:editable="document_type"><tspan>Assembly Drawing</tspan></text>
-      <text id="Creator data field" x="311" y="248.2" freecad:editable="created_by"><tspan>A. Nemesis</tspan></text>
-      <text id="Document status data field" x="231" y="284.2" freecad:editable="document_status"><tspan>In preparation</tspan></text>
-      <text id="Paper size data field" x="320" y="284.2" style="text-align:center;text-anchor:middle">A3</text>
-      <text id="Sheet scale data field" x="360" y="236.2" style="text-align:center;text-anchor:middle" freecad:editable="page_scale"><tspan>1 : 1</tspan></text>
-      <text id="General tolerances data field" x="311" y="236.2" freecad:editable="general_tolerances"><tspan>ISO 2768-m</tspan></text>
-      <text id="Part material data field" x="231" y="236.2" freecad:editable="general_notes"><tspan>Stainless steel Mat.No. 1.4301</tspan></text>
-    </g>
-    <g id="Outlines" style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round">
-      <path id="Trapezoid" d="m 389,222 -10,2.5 v 5 l 10,2.5 z"/>
-      <circle id="Inner circle" cx="396" r="2.5" cy="227"/>
-      <circle id="Outer circle" cx="396" r="5" cy="227"/>
-    </g>
-    <g id="Centre lines" style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:6, 0.75, 0.125, 0.75">
-        <path id="Horizontal" d="m 378,227 h 24" style="stroke-dashoffset:0.25"/>
-        <path id="Vertical" d="m 396,233 v -12" style="stroke-dashoffset:4.625"/>
-    </g>
+    <text id="Identification number data field" x="311" y="272.2" freecad:editable="drawing_number"><tspan>DN</tspan></text>
+    <text id="Revision index data field" x="380" y="284.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
+    <text id="Date of issue data field" x="331" y="284.2" freecad:editable="issue_date"><tspan>YYYY-MM-DD</tspan></text>
+    <text id="Sheet number data field" x="400" y="284.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
+    <text id="Title data field" x="231" y="248.2" freecad:editable="title"><tspan>ISO 7200 titleblock</tspan></text>
+    <text id="Supplementary title 1 data field" x="231" y="254.2" freecad:editable="supplementary_title_1"><tspan>ST1</tspan></text>
+    <text id="Supplementary title 2 data field" x="231" y="260.2" freecad:editable="supplementary_title_2"><tspan>ST2</tspan></text>
+    <text id="Responsible department data field" x="371" y="272.2" freecad:editable="responsible_department"><tspan>RD</tspan></text>
+    <text id="Approval person data field" x="311" y="260.2" freecad:editable="approved_by"><tspan>B. Hecate</tspan></text>
+    <text id="Document type data field" x="231" y="272.2" freecad:editable="document_type"><tspan>Assembly Drawing</tspan></text>
+    <text id="Creator data field" x="311" y="248.2" freecad:editable="created_by"><tspan>A. Nemesis</tspan></text>
+    <text id="Document status data field" x="231" y="284.2" freecad:editable="document_status"><tspan>In preparation</tspan></text>
+    <text id="Paper size data field" x="320" y="284.2" style="text-align:center;text-anchor:middle">A3</text>
+    <text id="Sheet scale data field" x="360" y="236.2" style="text-align:center;text-anchor:middle" freecad:editable="page_scale"><tspan>1 : 1</tspan></text>
+    <text id="General tolerances data field" x="311" y="236.2" freecad:editable="general_tolerances"><tspan>ISO 2768-m</tspan></text>
+    <text id="Part material data field" x="231" y="236.2" freecad:editable="general_notes"><tspan>Stainless steel Mat.No. 1.4301</tspan></text>
+  </g>
+  <g id="Outlines" style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round">
+    <path id="Trapezoid" d="m 389,222 -10,2.5 v 5 l 10,2.5 z"/>
+    <circle id="Inner circle" cx="396" r="2.5" cy="227"/>
+    <circle id="Outer circle" cx="396" r="5" cy="227"/>
+  </g>
+  <g id="Centre lines" style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:6, 0.75, 0.125, 0.75">
+      <path id="Horizontal" d="m 378,227 h 24" style="stroke-dashoffset:0.25"/>
+      <path id="Vertical" d="m 396,233 v -12" style="stroke-dashoffset:4.625"/>
   </g>
 </svg>
diff --git a/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_minimal.svg b/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_minimal.svg
index 03b41ca886..44256ba0d8 100644
--- a/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_minimal.svg
+++ b/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_minimal.svg
@@ -94,61 +94,60 @@
     <path id="Bottom right" d="m 420,297 h -10 v -5 h 5 v -5 h 5 z" />
     <path id="Bottom left"  d="m 0,297 h 10 v -5 h -5 v -5 h -5 z" />
   </g>
-  <g id="Title block">
-    <g id="Borders" style="fill:none;stroke:#000000;stroke-width:0.35;stroke-linecap:round;stroke-linejoin:round">
-      <rect id="Frame" x="230" y="251" width="180" height="36" style="stroke-width:0.7"/>
-      <rect id="Owner border" x="370" y="251" width="40" height="24"/>
-      <rect id="Identification number border" x="230" y="275" width="80" height="12"/>
-      <rect id="Revision index border" x="370" y="275" width="20" height="12"/>
-      <rect id="Date of issue border" x="330" y="275" width="40" height="12"/>
-      <rect id="Sheet number border" x="390" y="275" width="20" height="12"/>
-      <rect id="Title border" x="230" y="251" width="80" height="12"/>
-      <rect id="Approval person border" x="310" y="263" width="60" height="12"/>
-      <rect id="Creator border" x="310" y="251" width="60" height="12"/>
-      <rect id="Document type border" x="230" y="263" width="80" height="12"/>
-      <rect id="Paper size border" x="310" y="275" width="20" height="12"/>
-    </g>
-    <g id="Labels" style="font-size:3.5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
-      <text id="Owner label" x="370.5" y="254.6">Owner:</text>
-      <text id="Identification number label" x="230.5" y="278.6">Drawing number:</text>
-      <text id="Revision index label" x="370.5" y="278.6">Revision:</text>
-      <text id="Date of issue label" x="330.5" y="278.6">Issue date:</text>
-      <text id="Sheet number label" x="390.5" y="278.6">Sheet:</text>
-      <text id="Title label" x="230.5" y="254.6">Title:</text>
-      <text id="Approval person label" x="310.5" y="266.6">Approved by:</text>
-      <text id="Creator label" x="310.5" y="254.6">Created by:</text>
-      <text id="Document type label" x="230.5" y="266.6">Document type:</text>
-      <text id="Paper size label" x="310.5" y="278.6">Paper size:</text>
-      <text id="Sheet scale label" x="350.5" y="242.6">Scale:</text>
-      <text id="General tolerances label" x="310.5" y="242.6">General tolerances:</text>
-      <text id="Part material label" x="230.5" y="242.6">Part Material:</text>
-    </g>
-    <g id="Data fields" style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
+<!-- Title block -->
+  <g id="Borders" style="fill:none;stroke:#000000;stroke-width:0.35;stroke-linecap:round;stroke-linejoin:round">
+    <rect id="Frame" x="230" y="251" width="180" height="36" style="stroke-width:0.7"/>
+    <rect id="Owner border" x="370" y="251" width="40" height="24"/>
+    <rect id="Identification number border" x="230" y="275" width="80" height="12"/>
+    <rect id="Revision index border" x="370" y="275" width="20" height="12"/>
+    <rect id="Date of issue border" x="330" y="275" width="40" height="12"/>
+    <rect id="Sheet number border" x="390" y="275" width="20" height="12"/>
+    <rect id="Title border" x="230" y="251" width="80" height="12"/>
+    <rect id="Approval person border" x="310" y="263" width="60" height="12"/>
+    <rect id="Creator border" x="310" y="251" width="60" height="12"/>
+    <rect id="Document type border" x="230" y="263" width="80" height="12"/>
+    <rect id="Paper size border" x="310" y="275" width="20" height="12"/>
+  </g>
+  <g id="Labels" style="font-size:3.5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
+    <text id="Owner label" x="370.5" y="254.6">Owner:</text>
+    <text id="Identification number label" x="230.5" y="278.6">Drawing number:</text>
+    <text id="Revision index label" x="370.5" y="278.6">Revision:</text>
+    <text id="Date of issue label" x="330.5" y="278.6">Issue date:</text>
+    <text id="Sheet number label" x="390.5" y="278.6">Sheet:</text>
+    <text id="Title label" x="230.5" y="254.6">Title:</text>
+    <text id="Approval person label" x="310.5" y="266.6">Approved by:</text>
+    <text id="Creator label" x="310.5" y="254.6">Created by:</text>
+    <text id="Document type label" x="230.5" y="266.6">Document type:</text>
+    <text id="Paper size label" x="310.5" y="278.6">Paper size:</text>
+    <text id="Sheet scale label" x="350.5" y="242.6">Scale:</text>
+    <text id="General tolerances label" x="310.5" y="242.6">General tolerances:</text>
+    <text id="Part material label" x="230.5" y="242.6">Part Material:</text>
+  </g>
+  <g id="Data fields" style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
     <text id="owner_1_data_field" x="390" y="260.1" freecad:editable="owner_1" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="owner_2_data_field" x="390" y="264.1" freecad:editable="owner_2" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="owner_3_data_field" x="390" y="268.1" freecad:editable="owner_3" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="owner_4_data_field" x="390" y="272.1" freecad:editable="owner_4" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
-      <text id="Identification number data field" x="231" y="284.2" freecad:editable="drawing_number"><tspan>DN</tspan></text>
-      <text id="Revision index data field" x="380" y="284.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
-      <text id="Date of issue data field" x="331" y="284.2" freecad:editable="issue_date"><tspan>YYYY-MM-DD</tspan></text>
-      <text id="Sheet number data field" x="400" y="284.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
-      <text id="Title data field" x="231" y="260.2" freecad:editable="title"><tspan>ISO 5457 template</tspan></text>
-      <text id="Approval person data field" x="311" y="272.2" freecad:editable="approved_by"><tspan>B. Hecate</tspan></text>
-      <text id="Creator data field" x="311" y="260.2" freecad:editable="created_by"><tspan>A. Nemesis</tspan></text>
-      <text id="Document type data field" x="231" y="272.2" freecad:editable="document_type"><tspan>Assembly Drawing</tspan></text>
-      <text id="Paper size data field" x="320" y="284.2" style="text-align:center;text-anchor:middle">A3</text>
-      <text id="Sheet scale data field" x="360" y="248.2" style="text-align:center;text-anchor:middle" freecad:editable="page_scale"><tspan>1 : 1</tspan></text>
-      <text id="General tolerances data field" x="311" y="248.2" freecad:editable="general_tolerances"><tspan>ISO 2768-m</tspan></text>
-      <text id="Part material data field" x="231" y="248.2" freecad:editable="general_notes"><tspan>Stainless steel Mat.No. 1.4301</tspan></text>
-    </g>
-      <g id="Outlines" style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round">
-      <path id="Trapezoid" d="m 389,234 -10,2.5 v 5 l 10,2.5 z"/>
-      <circle id="Inner circle" cx="396" r="2.5" cy="239"/>
-      <circle id="Outer circle" cx="396" r="5" cy="239"/>
-    </g>
-    <g id="Centre lines" style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:6, 0.75, 0.125, 0.75">
-      <path id="Horizontal" d="m 378,239 h 24" style="stroke-dashoffset:0.25"/>
-      <path id="Vertical" d="m 396,245 v -12" style="stroke-dashoffset:4.625"/>
-    </g>
+    <text id="Identification number data field" x="231" y="284.2" freecad:editable="drawing_number"><tspan>DN</tspan></text>
+    <text id="Revision index data field" x="380" y="284.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
+    <text id="Date of issue data field" x="331" y="284.2" freecad:editable="issue_date"><tspan>YYYY-MM-DD</tspan></text>
+    <text id="Sheet number data field" x="400" y="284.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
+    <text id="Title data field" x="231" y="260.2" freecad:editable="title"><tspan>ISO 5457 template</tspan></text>
+    <text id="Approval person data field" x="311" y="272.2" freecad:editable="approved_by"><tspan>B. Hecate</tspan></text>
+    <text id="Creator data field" x="311" y="260.2" freecad:editable="created_by"><tspan>A. Nemesis</tspan></text>
+    <text id="Document type data field" x="231" y="272.2" freecad:editable="document_type"><tspan>Assembly Drawing</tspan></text>
+    <text id="Paper size data field" x="320" y="284.2" style="text-align:center;text-anchor:middle">A3</text>
+    <text id="Sheet scale data field" x="360" y="248.2" style="text-align:center;text-anchor:middle" freecad:editable="page_scale"><tspan>1 : 1</tspan></text>
+    <text id="General tolerances data field" x="311" y="248.2" freecad:editable="general_tolerances"><tspan>ISO 2768-m</tspan></text>
+    <text id="Part material data field" x="231" y="248.2" freecad:editable="general_notes"><tspan>Stainless steel Mat.No. 1.4301</tspan></text>
+  </g>
+    <g id="Outlines" style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round">
+    <path id="Trapezoid" d="m 389,234 -10,2.5 v 5 l 10,2.5 z"/>
+    <circle id="Inner circle" cx="396" r="2.5" cy="239"/>
+    <circle id="Outer circle" cx="396" r="5" cy="239"/>
+  </g>
+  <g id="Centre lines" style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:6, 0.75, 0.125, 0.75">
+    <path id="Horizontal" d="m 378,239 h 24" style="stroke-dashoffset:0.25"/>
+    <path id="Vertical" d="m 396,245 v -12" style="stroke-dashoffset:4.625"/>
   </g>
 </svg>
diff --git a/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_advanced.svg b/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_advanced.svg
index c7666b10d4..dd18ca0c0b 100644
--- a/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_advanced.svg
+++ b/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_advanced.svg
@@ -68,69 +68,68 @@
     <path id="Bottom right" d="m 297,210 h -10 v -5 h 5 v -5 h 5 z" />
     <path id="Bottom left"  d="m 0,210 h 10 v -5 h -5 v -5 h -5 z" />
   </g>
-  <g id="Title block">
-    <g id="Borders" style="fill:none;stroke:#000000;stroke-width:0.35;stroke-linecap:round;stroke-linejoin:round">
-      <rect id="Frame" x="107" y="152" width="180" height="48" style="stroke-width:0.7"/>
-      <rect id="Owner border" x="247" y="152" width="40" height="24"/>
-      <rect id="Identification number border" x="187" y="176" width="60" height="12"/>
-      <rect id="Revision index border" x="247" y="188" width="20" height="12"/>
-      <rect id="Date of issue border" x="207" y="188" width="40" height="12"/>
-      <rect id="Sheet number border" x="267" y="188" width="20" height="12"/>
-      <rect id="Title border" x="107" y="152" width="80" height="24"/>
-      <rect id="Responsible department border" x="247" y="176" width="40" height="12"/>
-      <rect id="Approval person border" x="187" y="164" width="60" height="12"/>
-      <rect id="Document type border" x="107" y="176" width="80" height="12"/>
-      <rect id="Creator border" x="187" y="152" width="60" height="12"/>
-      <rect id="Document status border" x="107" y="188" width="80" height="12"/>
-      <rect id="Paper size border" x="187" y="188" width="20" height="12"/>
-    </g>
-    <g id="Labels" style="font-size:3.5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
-      <text id="Owner label" x="247.5" y="155.6">Owner:</text>
-      <text id="Identification number label" x="187.5" y="179.6">Drawing number:</text>
-      <text id="Revision index label" x="247.5" y="191.6">Revision:</text>
-      <text id="Date of issue label" x="207.5" y="191.6">Issue date:</text>
-      <text id="Sheet number label" x="267.5" y="191.6">Sheet:</text>
-      <text id="Title label" x="107.5" y="155.6">Title, supplementary title:</text>
-      <text id="Responsible department label" x="247.5" y="179.6">Responsible department:</text>
-      <text id="Approval person label" x="187.5" y="167.6">Approved by:</text>
-      <text id="Document type label" x="107.5" y="179.6">Document type:</text>
-      <text id="Creator label" x="187.5" y="155.6">Created by:</text>
-      <text id="Document status label" x="107.5" y="191.6">Document status:</text>
-      <text id="Paper size label" x="187.5" y="191.6">Paper size:</text>
-      <text id="Sheet scale label" x="227.5" y="143.6">Scale:</text>
-      <text id="General tolerances label" x="187.5" y="143.6">General tolerances:</text>
-      <text id="Part material label" x="107.5" y="143.6">Part Material:</text>
-    </g>
-    <g id="Data fields" style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
+<!-- Title block -->
+  <g id="Borders" style="fill:none;stroke:#000000;stroke-width:0.35;stroke-linecap:round;stroke-linejoin:round">
+    <rect id="Frame" x="107" y="152" width="180" height="48" style="stroke-width:0.7"/>
+    <rect id="Owner border" x="247" y="152" width="40" height="24"/>
+    <rect id="Identification number border" x="187" y="176" width="60" height="12"/>
+    <rect id="Revision index border" x="247" y="188" width="20" height="12"/>
+    <rect id="Date of issue border" x="207" y="188" width="40" height="12"/>
+    <rect id="Sheet number border" x="267" y="188" width="20" height="12"/>
+    <rect id="Title border" x="107" y="152" width="80" height="24"/>
+    <rect id="Responsible department border" x="247" y="176" width="40" height="12"/>
+    <rect id="Approval person border" x="187" y="164" width="60" height="12"/>
+    <rect id="Document type border" x="107" y="176" width="80" height="12"/>
+    <rect id="Creator border" x="187" y="152" width="60" height="12"/>
+    <rect id="Document status border" x="107" y="188" width="80" height="12"/>
+    <rect id="Paper size border" x="187" y="188" width="20" height="12"/>
+  </g>
+  <g id="Labels" style="font-size:3.5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
+    <text id="Owner label" x="247.5" y="155.6">Owner:</text>
+    <text id="Identification number label" x="187.5" y="179.6">Drawing number:</text>
+    <text id="Revision index label" x="247.5" y="191.6">Revision:</text>
+    <text id="Date of issue label" x="207.5" y="191.6">Issue date:</text>
+    <text id="Sheet number label" x="267.5" y="191.6">Sheet:</text>
+    <text id="Title label" x="107.5" y="155.6">Title, supplementary title:</text>
+    <text id="Responsible department label" x="247.5" y="179.6">Responsible department:</text>
+    <text id="Approval person label" x="187.5" y="167.6">Approved by:</text>
+    <text id="Document type label" x="107.5" y="179.6">Document type:</text>
+    <text id="Creator label" x="187.5" y="155.6">Created by:</text>
+    <text id="Document status label" x="107.5" y="191.6">Document status:</text>
+    <text id="Paper size label" x="187.5" y="191.6">Paper size:</text>
+    <text id="Sheet scale label" x="227.5" y="143.6">Scale:</text>
+    <text id="General tolerances label" x="187.5" y="143.6">General tolerances:</text>
+    <text id="Part material label" x="107.5" y="143.6">Part Material:</text>
+  </g>
+  <g id="Data fields" style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
     <text id="owner_1_data_field" x="267" y="161.1" freecad:editable="owner_1" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="owner_2_data_field" x="267" y="165.1" freecad:editable="owner_2" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="owner_3_data_field" x="267" y="169.1" freecad:editable="owner_3" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="owner_4_data_field" x="267" y="173.1" freecad:editable="owner_4" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
-      <text id="Identification number data field" x="188" y="185.2" freecad:editable="drawing_number"><tspan>DN</tspan></text>
-      <text id="Revision index data field" x="257" y="197.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
-      <text id="Date of issue data field" x="208" y="197.2" freecad:editable="issue_date"><tspan>YYYY-MM-DD</tspan></text>
-      <text id="Sheet number data field" x="277" y="197.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
-      <text id="Title data field" x="108" y="161.2" freecad:editable="title"><tspan>ISO 7200 titleblock</tspan></text>
-      <text id="Supplementary title 1 data field" x="108" y="167.2" freecad:editable="supplementary_title_1"><tspan>ST1</tspan></text>
-      <text id="Supplementary title 2 data field" x="108" y="173.2" freecad:editable="supplementary_title_2"><tspan>ST2</tspan></text>
-      <text id="Responsible department data field" x="248" y="185.2" freecad:editable="responsible_department"><tspan>RD</tspan></text>
-      <text id="Approval person data field" x="188" y="173.2" freecad:editable="approved_by"><tspan>B. Hecate</tspan></text>
-      <text id="Document type data field" x="108" y="185.2" freecad:editable="document_type"><tspan>Assembly Drawing</tspan></text>
-      <text id="Creator data field" x="188" y="161.2" freecad:editable="created_by"><tspan>A. Nemesis</tspan></text>
-      <text id="Document status data field" x="108" y="197.2" freecad:editable="document_status"><tspan>In preparation</tspan></text>
-      <text id="Paper size data field" x="197" y="197.2" style="text-align:center;text-anchor:middle">A4</text>
-      <text id="Sheet scale data field" x="237" y="149.2" style="text-align:center;text-anchor:middle" freecad:editable="page_scale"><tspan>1 : 1</tspan></text>
-      <text id="General tolerances data field" x="188" y="149.2" freecad:editable="general_tolerances"><tspan>ISO 2768-m</tspan></text>
-      <text id="Part material data field" x="108" y="149.2" freecad:editable="general_notes"><tspan>Stainless steel Mat.No. 1.4301</tspan></text>
-    </g>
-    <g id="Outlines" style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round">
-      <path id="Trapezoid" d="m 266,135 -10,2.5 v 5 l 10,2.5 z"/>
-      <circle id="Inner circle" cx="273" r="2.5" cy="140"/>
-      <circle id="Outer circle" cx="273" r="5" cy="140"/>
-    </g>
-    <g id="Centre lines" style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:6, 0.75, 0.125, 0.75">
-        <path id="Horizontal" d="m 255,140 h 24" style="stroke-dashoffset:0.25"/>
-        <path id="Vertical" d="m 273,146 v -12" style="stroke-dashoffset:4.625"/>
-    </g>
+    <text id="Identification number data field" x="188" y="185.2" freecad:editable="drawing_number"><tspan>DN</tspan></text>
+    <text id="Revision index data field" x="257" y="197.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
+    <text id="Date of issue data field" x="208" y="197.2" freecad:editable="issue_date"><tspan>YYYY-MM-DD</tspan></text>
+    <text id="Sheet number data field" x="277" y="197.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
+    <text id="Title data field" x="108" y="161.2" freecad:editable="title"><tspan>ISO 7200 titleblock</tspan></text>
+    <text id="Supplementary title 1 data field" x="108" y="167.2" freecad:editable="supplementary_title_1"><tspan>ST1</tspan></text>
+    <text id="Supplementary title 2 data field" x="108" y="173.2" freecad:editable="supplementary_title_2"><tspan>ST2</tspan></text>
+    <text id="Responsible department data field" x="248" y="185.2" freecad:editable="responsible_department"><tspan>RD</tspan></text>
+    <text id="Approval person data field" x="188" y="173.2" freecad:editable="approved_by"><tspan>B. Hecate</tspan></text>
+    <text id="Document type data field" x="108" y="185.2" freecad:editable="document_type"><tspan>Assembly Drawing</tspan></text>
+    <text id="Creator data field" x="188" y="161.2" freecad:editable="created_by"><tspan>A. Nemesis</tspan></text>
+    <text id="Document status data field" x="108" y="197.2" freecad:editable="document_status"><tspan>In preparation</tspan></text>
+    <text id="Paper size data field" x="197" y="197.2" style="text-align:center;text-anchor:middle">A4</text>
+    <text id="Sheet scale data field" x="237" y="149.2" style="text-align:center;text-anchor:middle" freecad:editable="page_scale"><tspan>1 : 1</tspan></text>
+    <text id="General tolerances data field" x="188" y="149.2" freecad:editable="general_tolerances"><tspan>ISO 2768-m</tspan></text>
+    <text id="Part material data field" x="108" y="149.2" freecad:editable="general_notes"><tspan>Stainless steel Mat.No. 1.4301</tspan></text>
+  </g>
+  <g id="Outlines" style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round">
+    <path id="Trapezoid" d="m 266,135 -10,2.5 v 5 l 10,2.5 z"/>
+    <circle id="Inner circle" cx="273" r="2.5" cy="140"/>
+    <circle id="Outer circle" cx="273" r="5" cy="140"/>
+  </g>
+  <g id="Centre lines" style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:6, 0.75, 0.125, 0.75">
+      <path id="Horizontal" d="m 255,140 h 24" style="stroke-dashoffset:0.25"/>
+      <path id="Vertical" d="m 273,146 v -12" style="stroke-dashoffset:4.625"/>
   </g>
 </svg>
diff --git a/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_minimal.svg b/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_minimal.svg
index aade7c20f5..df9b320c46 100644
--- a/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_minimal.svg
+++ b/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_minimal.svg
@@ -68,64 +68,63 @@
     <path id="Bottom right" d="m 297,210 h -10 v -5 h 5 v -5 h 5 z" />
     <path id="Bottom left"  d="m 0,210 h 10 v -5 h -5 v -5 h -5 z" />
   </g>
-  <g id="Title block">
-    <g id="Borders" style="fill:none;stroke:#000000;stroke-width:0.35;stroke-linecap:round;stroke-linejoin:round">
-      <rect id="Frame" x="107" y="164" width="180" height="36" style="stroke-width:0.7"/>
-      <rect id="Owner border" x="247" y="164" width="40" height="24"/>
-      <rect id="Identification number border" x="107" y="188" width="80" height="12"/>
-      <rect id="Revision index border" x="247" y="188" width="20" height="12"/>
-      <rect id="Date of issue border" x="207" y="188" width="40" height="12"/>
-      <rect id="Sheet number border" x="267" y="188" width="20" height="12"/>
-      <rect id="Title border" x="107" y="164" width="80" height="12"/>
-      <rect id="Approval person border" x="187" y="176" width="60" height="12"/>
-      <rect id="Creator border" x="187" y="164" width="60" height="12"/>
-      <rect id="Document type border" x="107" y="176" width="80" height="12"/>
-      <rect id="Paper size border" x="187" y="188" width="20" height="12"/>
-    </g>
-    <g id="Labels" style="font-size:3.5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
-      <text id="Owner label" x="247.5" y="167.6">Owner:</text>
-      <text id="Identification number label" x="107.5" y="191.6">Drawing number:</text>
-      <text id="Revision index label" x="247.5" y="191.6">Revision:</text>
-      <text id="Date of issue label" x="207.5" y="191.6">Issue date:</text>
-      <text id="Sheet number label" x="267.5" y="191.6">Sheet:</text>
-      <text id="Title label" x="107.5" y="167.6">Title:</text>
-      <text id="Approval person label" x="187.5" y="179.6">Approved by:</text>
-      <text id="Creator label" x="187.5" y="167.6">Created by:</text>
-      <text id="Document type label" x="107.5" y="179.6">Document type:</text>
-      <text id="Paper size label" x="187.5" y="191.6">Paper size:</text>
-      <text id="Sheet scale label" x="227.5" y="155.6">Scale:</text>
-      <text id="General tolerances label" x="187.5" y="155.6">General tolerances:</text>
-      <text id="Part material label" x="107.5" y="155.6">Part Material:</text>
-      <text id="Sheet scale label" x="227.5" y="155.6">Scale:</text>
-      <text id="General tolerances label" x="187.5" y="155.6">General tolerances:</text>
-      <text id="Part material label" x="107.5" y="155.6">Part Material:</text>
-    </g>
-    <g id="Data fields" style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
+<!-- Title block -->
+  <g id="Borders" style="fill:none;stroke:#000000;stroke-width:0.35;stroke-linecap:round;stroke-linejoin:round">
+    <rect id="Frame" x="107" y="164" width="180" height="36" style="stroke-width:0.7"/>
+    <rect id="Owner border" x="247" y="164" width="40" height="24"/>
+    <rect id="Identification number border" x="107" y="188" width="80" height="12"/>
+    <rect id="Revision index border" x="247" y="188" width="20" height="12"/>
+    <rect id="Date of issue border" x="207" y="188" width="40" height="12"/>
+    <rect id="Sheet number border" x="267" y="188" width="20" height="12"/>
+    <rect id="Title border" x="107" y="164" width="80" height="12"/>
+    <rect id="Approval person border" x="187" y="176" width="60" height="12"/>
+    <rect id="Creator border" x="187" y="164" width="60" height="12"/>
+    <rect id="Document type border" x="107" y="176" width="80" height="12"/>
+    <rect id="Paper size border" x="187" y="188" width="20" height="12"/>
+  </g>
+  <g id="Labels" style="font-size:3.5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
+    <text id="Owner label" x="247.5" y="167.6">Owner:</text>
+    <text id="Identification number label" x="107.5" y="191.6">Drawing number:</text>
+    <text id="Revision index label" x="247.5" y="191.6">Revision:</text>
+    <text id="Date of issue label" x="207.5" y="191.6">Issue date:</text>
+    <text id="Sheet number label" x="267.5" y="191.6">Sheet:</text>
+    <text id="Title label" x="107.5" y="167.6">Title:</text>
+    <text id="Approval person label" x="187.5" y="179.6">Approved by:</text>
+    <text id="Creator label" x="187.5" y="167.6">Created by:</text>
+    <text id="Document type label" x="107.5" y="179.6">Document type:</text>
+    <text id="Paper size label" x="187.5" y="191.6">Paper size:</text>
+    <text id="Sheet scale label" x="227.5" y="155.6">Scale:</text>
+    <text id="General tolerances label" x="187.5" y="155.6">General tolerances:</text>
+    <text id="Part material label" x="107.5" y="155.6">Part Material:</text>
+    <text id="Sheet scale label" x="227.5" y="155.6">Scale:</text>
+    <text id="General tolerances label" x="187.5" y="155.6">General tolerances:</text>
+    <text id="Part material label" x="107.5" y="155.6">Part Material:</text>
+  </g>
+  <g id="Data fields" style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
     <text id="owner_1_data_field" x="267" y="173.1" freecad:editable="owner_1" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="owner_2_data_field" x="267" y="177.1" freecad:editable="owner_2" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="owner_3_data_field" x="267" y="181.1" freecad:editable="owner_3" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="owner_4_data_field" x="267" y="185.1" freecad:editable="owner_4" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
-      <text id="Identification number data field" x="108" y="197.2" freecad:editable="drawing_number"><tspan>DN</tspan></text>
-      <text id="Revision index data field" x="257" y="197.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
-      <text id="Date of issue data field" x="208" y="197.2" freecad:editable="issue_date"><tspan>YYYY-MM-DD</tspan></text>
-      <text id="Sheet number data field" x="277" y="197.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
-      <text id="Title data field" x="108" y="173.2" freecad:editable="title"><tspan>ISO 5457 template</tspan></text>
-      <text id="Approval person data field" x="188" y="185.2" freecad:editable="approved_by"><tspan>B. Hecate</tspan></text>
-      <text id="Creator data field" x="188" y="173.2" freecad:editable="created_by"><tspan>A. Nemesis</tspan></text>
-      <text id="Document type data field" x="108" y="185.2" freecad:editable="document_type"><tspan>Assembly Drawing</tspan></text>
-      <text id="Paper size data field" x="197" y="197.2" style="text-align:center;text-anchor:middle">A4</text>
-      <text id="Sheet scale data field" x="237" y="161.2" style="text-align:center;text-anchor:middle" freecad:editable="page_scale"><tspan>1 : 1</tspan></text>
-      <text id="General tolerances data field" x="188" y="161.2" freecad:editable="general_tolerances"><tspan>ISO 2768-m</tspan></text>
-      <text id="Part material data field" x="108" y="161.2" freecad:editable="general_notes"><tspan>Stainless steel Mat.No. 1.4301</tspan></text>
-    </g>
-    <g id="Outlines" style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round">
-      <path id="Trapezoid" d="m 266,147 -10,2.5 v 5 l 10,2.5 z"/>
-      <circle id="Inner circle" cx="273" r="2.5" cy="152"/>
-      <circle id="Outer circle" cx="273" r="5" cy="152"/>
-    </g>
-    <g id="Centre lines" style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:6, 0.75, 0.125, 0.75">
-        <path id="Horizontal" d="m 255,152 h 24" style="stroke-dashoffset:0.25"/>
-        <path id="Vertical" d="m 273,158 v -12" style="stroke-dashoffset:4.625"/>
-    </g>
+    <text id="Identification number data field" x="108" y="197.2" freecad:editable="drawing_number"><tspan>DN</tspan></text>
+    <text id="Revision index data field" x="257" y="197.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
+    <text id="Date of issue data field" x="208" y="197.2" freecad:editable="issue_date"><tspan>YYYY-MM-DD</tspan></text>
+    <text id="Sheet number data field" x="277" y="197.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
+    <text id="Title data field" x="108" y="173.2" freecad:editable="title"><tspan>ISO 5457 template</tspan></text>
+    <text id="Approval person data field" x="188" y="185.2" freecad:editable="approved_by"><tspan>B. Hecate</tspan></text>
+    <text id="Creator data field" x="188" y="173.2" freecad:editable="created_by"><tspan>A. Nemesis</tspan></text>
+    <text id="Document type data field" x="108" y="185.2" freecad:editable="document_type"><tspan>Assembly Drawing</tspan></text>
+    <text id="Paper size data field" x="197" y="197.2" style="text-align:center;text-anchor:middle">A4</text>
+    <text id="Sheet scale data field" x="237" y="161.2" style="text-align:center;text-anchor:middle" freecad:editable="page_scale"><tspan>1 : 1</tspan></text>
+    <text id="General tolerances data field" x="188" y="161.2" freecad:editable="general_tolerances"><tspan>ISO 2768-m</tspan></text>
+    <text id="Part material data field" x="108" y="161.2" freecad:editable="general_notes"><tspan>Stainless steel Mat.No. 1.4301</tspan></text>
+  </g>
+  <g id="Outlines" style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round">
+    <path id="Trapezoid" d="m 266,147 -10,2.5 v 5 l 10,2.5 z"/>
+    <circle id="Inner circle" cx="273" r="2.5" cy="152"/>
+    <circle id="Outer circle" cx="273" r="5" cy="152"/>
+  </g>
+  <g id="Centre lines" style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:6, 0.75, 0.125, 0.75">
+      <path id="Horizontal" d="m 255,152 h 24" style="stroke-dashoffset:0.25"/>
+      <path id="Vertical" d="m 273,158 v -12" style="stroke-dashoffset:4.625"/>
   </g>
 </svg>
diff --git a/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_advanced.svg b/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_advanced.svg
index 537493c0a7..a92f00d7b1 100644
--- a/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_advanced.svg
+++ b/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_advanced.svg
@@ -68,69 +68,68 @@
     <path id="Bottom right" d="m 210,297 h -10 v -5 h 5 v -5 h 5 z" />
     <path id="Bottom left"  d="m 0,297 h 10 v -5 h -5 v -5 h -5 z" />
   </g>
-  <g id="Title block">
-    <g id="Borders" style="fill:none;stroke:#000000;stroke-width:0.35;stroke-linecap:round;stroke-linejoin:round">
-      <rect id="Frame" x="20" y="239" width="180" height="48" style="stroke-width:0.7"/>
-      <rect id="Owner border" x="160" y="239" width="40" height="24"/>
-      <rect id="Identification number border" x="100" y="263" width="60" height="12"/>
-      <rect id="Revision index border" x="160" y="275" width="20" height="12"/>
-      <rect id="Date of issue border" x="120" y="275" width="40" height="12"/>
-      <rect id="Sheet number border" x="180" y="275" width="20" height="12"/>
-      <rect id="Title border" x="20" y="239" width="80" height="24"/>
-      <rect id="Responsible department border" x="160" y="263" width="40" height="12"/>
-      <rect id="Approval person border" x="100" y="251" width="60" height="12"/>
-      <rect id="Document type border" x="20" y="263" width="80" height="12"/>
-      <rect id="Creator border" x="100" y="239" width="60" height="12"/>
-      <rect id="Document status border" x="20" y="275" width="80" height="12"/>
-      <rect id="Paper size border" x="100" y="275" width="20" height="12"/>
-    </g>
-    <g id="Labels" style="font-size:3.5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
-      <text id="Owner label" x="160.5" y="242.6">Owner:</text>
-      <text id="Identification number label" x="100.5" y="266.6">Drawing number:</text>
-      <text id="Revision index label" x="160.5" y="278.6">Revision:</text>
-      <text id="Date of issue label" x="120.5" y="278.6">Issue date:</text>
-      <text id="Sheet number label" x="180.5" y="278.6">Sheet:</text>
-      <text id="Title label" x="20.5" y="242.6">Title, supplementary title:</text>
-      <text id="Responsible department label" x="160.5" y="266.6">Responsible department:</text>
-      <text id="Approval person label" x="100.5" y="254.6">Approved by:</text>
-      <text id="Document type label" x="20.5" y="266.6">Document type:</text>
-      <text id="Creator label" x="100.5" y="242.6">Created by:</text>
-      <text id="Document status label" x="20.5" y="278.6">Document status:</text>
-      <text id="Paper size label" x="100.5" y="278.6">Paper size:</text>
-      <text id="Sheet scale label" x="140.5" y="230.6">Scale:</text>
-      <text id="General tolerances label" x="100.5" y="230.6">General tolerances:</text>
-      <text id="Part material label" x="20.5" y="230.6">Part Material:</text>
-    </g>
-    <g id="Data fields" style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
+<!-- Title block -->
+  <g id="Borders" style="fill:none;stroke:#000000;stroke-width:0.35;stroke-linecap:round;stroke-linejoin:round">
+    <rect id="Frame" x="20" y="239" width="180" height="48" style="stroke-width:0.7"/>
+    <rect id="Owner border" x="160" y="239" width="40" height="24"/>
+    <rect id="Identification number border" x="100" y="263" width="60" height="12"/>
+    <rect id="Revision index border" x="160" y="275" width="20" height="12"/>
+    <rect id="Date of issue border" x="120" y="275" width="40" height="12"/>
+    <rect id="Sheet number border" x="180" y="275" width="20" height="12"/>
+    <rect id="Title border" x="20" y="239" width="80" height="24"/>
+    <rect id="Responsible department border" x="160" y="263" width="40" height="12"/>
+    <rect id="Approval person border" x="100" y="251" width="60" height="12"/>
+    <rect id="Document type border" x="20" y="263" width="80" height="12"/>
+    <rect id="Creator border" x="100" y="239" width="60" height="12"/>
+    <rect id="Document status border" x="20" y="275" width="80" height="12"/>
+    <rect id="Paper size border" x="100" y="275" width="20" height="12"/>
+  </g>
+  <g id="Labels" style="font-size:3.5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
+    <text id="Owner label" x="160.5" y="242.6">Owner:</text>
+    <text id="Identification number label" x="100.5" y="266.6">Drawing number:</text>
+    <text id="Revision index label" x="160.5" y="278.6">Revision:</text>
+    <text id="Date of issue label" x="120.5" y="278.6">Issue date:</text>
+    <text id="Sheet number label" x="180.5" y="278.6">Sheet:</text>
+    <text id="Title label" x="20.5" y="242.6">Title, supplementary title:</text>
+    <text id="Responsible department label" x="160.5" y="266.6">Responsible department:</text>
+    <text id="Approval person label" x="100.5" y="254.6">Approved by:</text>
+    <text id="Document type label" x="20.5" y="266.6">Document type:</text>
+    <text id="Creator label" x="100.5" y="242.6">Created by:</text>
+    <text id="Document status label" x="20.5" y="278.6">Document status:</text>
+    <text id="Paper size label" x="100.5" y="278.6">Paper size:</text>
+    <text id="Sheet scale label" x="140.5" y="230.6">Scale:</text>
+    <text id="General tolerances label" x="100.5" y="230.6">General tolerances:</text>
+    <text id="Part material label" x="20.5" y="230.6">Part Material:</text>
+  </g>
+  <g id="Data fields" style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
     <text id="owner_1_data_field" x="180" y="248.1" freecad:editable="owner_1" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="owner_2_data_field" x="180" y="252.1" freecad:editable="owner_2" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="owner_3_data_field" x="180" y="256.1" freecad:editable="owner_3" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="owner_4_data_field" x="180" y="260.1" freecad:editable="owner_4" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
-      <text id="Identification number data field" x="101" y="272.2" freecad:editable="drawing_number"><tspan>DN</tspan></text>
-      <text id="Revision index data field" x="170" y="284.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
-      <text id="Date of issue data field" x="121" y="284.2" freecad:editable="issue_date"><tspan>YYYY-MM-DD</tspan></text>
-      <text id="Sheet number data field" x="190" y="284.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
-      <text id="Title data field" x="21" y="248.2" freecad:editable="title"><tspan>ISO 7200 titleblock</tspan></text>
-      <text id="Supplementary title 1 data field" x="21" y="254.2" freecad:editable="supplementary_title_1"><tspan>ST1</tspan></text>
-      <text id="Supplementary title 2 data field" x="21" y="260.2" freecad:editable="supplementary_title_2"><tspan>ST2</tspan></text>
-      <text id="Responsible department data field" x="161" y="272.2" freecad:editable="responsible_department"><tspan>RD</tspan></text>
-      <text id="Approval person data field" x="101" y="260.2" freecad:editable="approved_by"><tspan>B. Hecate</tspan></text>
-      <text id="Document type data field" x="21" y="272.2" freecad:editable="document_type"><tspan>Assembly Drawing</tspan></text>
-      <text id="Creator data field" x="101" y="248.2" freecad:editable="created_by"><tspan>A. Nemesis</tspan></text>
-      <text id="Document status data field" x="21" y="284.2" freecad:editable="document_status"><tspan>In preparation</tspan></text>
-      <text id="Paper size data field" x="110" y="284.2" style="text-align:center;text-anchor:middle">A4</text>
-      <text id="Sheet scale data field" x="150" y="236.2" style="text-align:center;text-anchor:middle" freecad:editable="page_scale"><tspan>1 : 1</tspan></text>
-      <text id="General tolerances data field" x="101" y="236.2" freecad:editable="general_tolerances"><tspan>ISO 2768-m</tspan></text>
-      <text id="Part material data field" x="21" y="236.2" freecad:editable="general_notes"><tspan>Stainless steel Mat.No. 1.4301</tspan></text>
-    </g>
-    <g id="Outlines" style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round">
-      <path id="Trapezoid" d="m 179,222 -10,2.5 v 5 l 10,2.5 z"/>
-      <circle id="Inner circle" cx="186" r="2.5" cy="227"/>
-      <circle id="Outer circle" cx="186" r="5" cy="227"/>
-    </g>
-    <g id="Centre lines" style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:6, 0.75, 0.125, 0.75">
-        <path id="Horizontal" d="m 168,227 h 24" style="stroke-dashoffset:0.25"/>
-        <path id="Vertical" d="m 186,233 v -12" style="stroke-dashoffset:4.625"/>
-    </g>
+    <text id="Identification number data field" x="101" y="272.2" freecad:editable="drawing_number"><tspan>DN</tspan></text>
+    <text id="Revision index data field" x="170" y="284.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
+    <text id="Date of issue data field" x="121" y="284.2" freecad:editable="issue_date"><tspan>YYYY-MM-DD</tspan></text>
+    <text id="Sheet number data field" x="190" y="284.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
+    <text id="Title data field" x="21" y="248.2" freecad:editable="title"><tspan>ISO 7200 titleblock</tspan></text>
+    <text id="Supplementary title 1 data field" x="21" y="254.2" freecad:editable="supplementary_title_1"><tspan>ST1</tspan></text>
+    <text id="Supplementary title 2 data field" x="21" y="260.2" freecad:editable="supplementary_title_2"><tspan>ST2</tspan></text>
+    <text id="Responsible department data field" x="161" y="272.2" freecad:editable="responsible_department"><tspan>RD</tspan></text>
+    <text id="Approval person data field" x="101" y="260.2" freecad:editable="approved_by"><tspan>B. Hecate</tspan></text>
+    <text id="Document type data field" x="21" y="272.2" freecad:editable="document_type"><tspan>Assembly Drawing</tspan></text>
+    <text id="Creator data field" x="101" y="248.2" freecad:editable="created_by"><tspan>A. Nemesis</tspan></text>
+    <text id="Document status data field" x="21" y="284.2" freecad:editable="document_status"><tspan>In preparation</tspan></text>
+    <text id="Paper size data field" x="110" y="284.2" style="text-align:center;text-anchor:middle">A4</text>
+    <text id="Sheet scale data field" x="150" y="236.2" style="text-align:center;text-anchor:middle" freecad:editable="page_scale"><tspan>1 : 1</tspan></text>
+    <text id="General tolerances data field" x="101" y="236.2" freecad:editable="general_tolerances"><tspan>ISO 2768-m</tspan></text>
+    <text id="Part material data field" x="21" y="236.2" freecad:editable="general_notes"><tspan>Stainless steel Mat.No. 1.4301</tspan></text>
+  </g>
+  <g id="Outlines" style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round">
+    <path id="Trapezoid" d="m 179,222 -10,2.5 v 5 l 10,2.5 z"/>
+    <circle id="Inner circle" cx="186" r="2.5" cy="227"/>
+    <circle id="Outer circle" cx="186" r="5" cy="227"/>
+  </g>
+  <g id="Centre lines" style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:6, 0.75, 0.125, 0.75">
+      <path id="Horizontal" d="m 168,227 h 24" style="stroke-dashoffset:0.25"/>
+      <path id="Vertical" d="m 186,233 v -12" style="stroke-dashoffset:4.625"/>
   </g>
 </svg>
diff --git a/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_minimal.svg b/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_minimal.svg
index 944b642e46..318bfe8eec 100644
--- a/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_minimal.svg
+++ b/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_minimal.svg
@@ -68,61 +68,60 @@
     <path id="Bottom right" d="m 210,297 h -10 v -5 h 5 v -5 h 5 z" />
     <path id="Bottom left"  d="m 0,297 h 10 v -5 h -5 v -5 h -5 z" />
   </g>
-  <g id="Title block">
-    <g id="Borders" style="fill:none;stroke:#000000;stroke-width:0.35;stroke-linecap:round;stroke-linejoin:round">
-      <rect id="Frame" x="20" y="251" width="180" height="36" style="stroke-width:0.7"/>
-      <rect id="Owner border" x="160" y="251" width="40" height="24"/>
-      <rect id="Identification number border" x="20" y="275" width="80" height="12"/>
-      <rect id="Revision index border" x="160" y="275" width="20" height="12"/>
-      <rect id="Date of issue border" x="120" y="275" width="40" height="12"/>
-      <rect id="Sheet number border" x="180" y="275" width="20" height="12"/>
-      <rect id="Title border" x="20" y="251" width="80" height="12"/>
-      <rect id="Approval person border" x="100" y="263" width="60" height="12"/>
-      <rect id="Creator border" x="100" y="251" width="60" height="12"/>
-      <rect id="Document type border" x="20" y="263" width="80" height="12"/>
-      <rect id="Paper size border" x="100" y="275" width="20" height="12"/>
-    </g>
-    <g id="Labels" style="font-size:3.5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
-      <text id="Owner label" x="160.5" y="254.6">Owner:</text>
-      <text id="Identification number label" x="20.5" y="278.6">Drawing number:</text>
-      <text id="Revision index label" x="160.5" y="278.6">Revision:</text>
-      <text id="Date of issue label" x="120.5" y="278.6">Issue date:</text>
-      <text id="Sheet number label" x="180.5" y="278.6">Sheet:</text>
-      <text id="Title label" x="20.5" y="254.6">Title:</text>
-      <text id="Approval person label" x="100.5" y="266.6">Approved by:</text>
-      <text id="Creator label" x="100.5" y="254.6">Created by:</text>
-      <text id="Document type label" x="20.5" y="266.6">Document type:</text>
-      <text id="Paper size label" x="100.5" y="278.6">Paper size:</text>
-      <text id="Sheet scale label" x="140.5" y="242.6">Scale:</text>
-      <text id="General tolerances label" x="100.5" y="242.6">General tolerances:</text>
-      <text id="Part material label" x="20.5" y="242.6">Part Material:</text>
-    </g>
-    <g id="Data fields" style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
+<!-- Title block -->
+  <g id="Borders" style="fill:none;stroke:#000000;stroke-width:0.35;stroke-linecap:round;stroke-linejoin:round">
+    <rect id="Frame" x="20" y="251" width="180" height="36" style="stroke-width:0.7"/>
+    <rect id="Owner border" x="160" y="251" width="40" height="24"/>
+    <rect id="Identification number border" x="20" y="275" width="80" height="12"/>
+    <rect id="Revision index border" x="160" y="275" width="20" height="12"/>
+    <rect id="Date of issue border" x="120" y="275" width="40" height="12"/>
+    <rect id="Sheet number border" x="180" y="275" width="20" height="12"/>
+    <rect id="Title border" x="20" y="251" width="80" height="12"/>
+    <rect id="Approval person border" x="100" y="263" width="60" height="12"/>
+    <rect id="Creator border" x="100" y="251" width="60" height="12"/>
+    <rect id="Document type border" x="20" y="263" width="80" height="12"/>
+    <rect id="Paper size border" x="100" y="275" width="20" height="12"/>
+  </g>
+  <g id="Labels" style="font-size:3.5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
+    <text id="Owner label" x="160.5" y="254.6">Owner:</text>
+    <text id="Identification number label" x="20.5" y="278.6">Drawing number:</text>
+    <text id="Revision index label" x="160.5" y="278.6">Revision:</text>
+    <text id="Date of issue label" x="120.5" y="278.6">Issue date:</text>
+    <text id="Sheet number label" x="180.5" y="278.6">Sheet:</text>
+    <text id="Title label" x="20.5" y="254.6">Title:</text>
+    <text id="Approval person label" x="100.5" y="266.6">Approved by:</text>
+    <text id="Creator label" x="100.5" y="254.6">Created by:</text>
+    <text id="Document type label" x="20.5" y="266.6">Document type:</text>
+    <text id="Paper size label" x="100.5" y="278.6">Paper size:</text>
+    <text id="Sheet scale label" x="140.5" y="242.6">Scale:</text>
+    <text id="General tolerances label" x="100.5" y="242.6">General tolerances:</text>
+    <text id="Part material label" x="20.5" y="242.6">Part Material:</text>
+  </g>
+  <g id="Data fields" style="font-size:5px;font-family:osifont;text-anchor:start;fill:#000000;stroke:none">
     <text id="owner_1_data_field" x="180" y="260.1" freecad:editable="owner_1" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="owner_2_data_field" x="180" y="264.1" freecad:editable="owner_2" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="owner_3_data_field" x="180" y="268.1" freecad:editable="owner_3" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="owner_4_data_field" x="180" y="272.1" freecad:editable="owner_4" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
-      <text id="Identification number data field" x="21" y="284.2" freecad:editable="drawing_number"><tspan>DN</tspan></text>
-      <text id="Revision index data field" x="170" y="284.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
-      <text id="Date of issue data field" x="121" y="284.2" freecad:editable="issue_date"><tspan>YYYY-MM-DD</tspan></text>
-      <text id="Sheet number data field" x="190" y="284.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
-      <text id="Title data field" x="21" y="260.2" freecad:editable="title"><tspan>ISO 5457 template</tspan></text>
-      <text id="Approval person data field" x="101" y="272.2" freecad:editable="approved_by"><tspan>B. Hecate</tspan></text>
-      <text id="Creator data field" x="101" y="260.2" freecad:editable="created_by"><tspan>A. Nemesis</tspan></text>
-      <text id="Document type data field" x="21" y="272.2" freecad:editable="document_type"><tspan>Assembly Drawing</tspan></text>
-      <text id="Paper size data field" x="110" y="284.2" style="text-align:center;text-anchor:middle">A4</text>
-      <text id="Sheet scale data field" x="150" y="248.2" style="text-align:center;text-anchor:middle" freecad:editable="page_scale"><tspan>1 : 1</tspan></text>
-      <text id="General tolerances data field" x="101" y="248.2" freecad:editable="general_tolerances"><tspan>ISO 2768-m</tspan></text>
-      <text id="Part material data field" x="21" y="248.2" freecad:editable="general_notes"><tspan>Stainless steel Mat.No. 1.4301</tspan></text>
-    </g>
-    <g id="Outlines" style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round">
-      <path id="Trapezoid" d="m 179,234 -10,2.5 v 5 l 10,2.5 z"/>
-      <circle id="Inner circle" cx="186" r="2.5" cy="239"/>
-      <circle id="Outer circle" cx="186" r="5" cy="239"/>
-    </g>
-    <g id="Centre lines" style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:6, 0.75, 0.125, 0.75">
-        <path id="Horizontal" d="m 168,239 h 24" style="stroke-dashoffset:0.25"/>
-        <path id="Vertical" d="m 186,245 v -12" style="stroke-dashoffset:4.625"/>
-    </g>
+    <text id="Identification number data field" x="21" y="284.2" freecad:editable="drawing_number"><tspan>DN</tspan></text>
+    <text id="Revision index data field" x="170" y="284.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
+    <text id="Date of issue data field" x="121" y="284.2" freecad:editable="issue_date"><tspan>YYYY-MM-DD</tspan></text>
+    <text id="Sheet number data field" x="190" y="284.2" freecad:editable="sheet_number" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
+    <text id="Title data field" x="21" y="260.2" freecad:editable="title"><tspan>ISO 5457 template</tspan></text>
+    <text id="Approval person data field" x="101" y="272.2" freecad:editable="approved_by"><tspan>B. Hecate</tspan></text>
+    <text id="Creator data field" x="101" y="260.2" freecad:editable="created_by"><tspan>A. Nemesis</tspan></text>
+    <text id="Document type data field" x="21" y="272.2" freecad:editable="document_type"><tspan>Assembly Drawing</tspan></text>
+    <text id="Paper size data field" x="110" y="284.2" style="text-align:center;text-anchor:middle">A4</text>
+    <text id="Sheet scale data field" x="150" y="248.2" style="text-align:center;text-anchor:middle" freecad:editable="page_scale"><tspan>1 : 1</tspan></text>
+    <text id="General tolerances data field" x="101" y="248.2" freecad:editable="general_tolerances"><tspan>ISO 2768-m</tspan></text>
+    <text id="Part material data field" x="21" y="248.2" freecad:editable="general_notes"><tspan>Stainless steel Mat.No. 1.4301</tspan></text>
+  </g>
+  <g id="Outlines" style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round">
+    <path id="Trapezoid" d="m 179,234 -10,2.5 v 5 l 10,2.5 z"/>
+    <circle id="Inner circle" cx="186" r="2.5" cy="239"/>
+    <circle id="Outer circle" cx="186" r="5" cy="239"/>
+  </g>
+  <g id="Centre lines" style="fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:6, 0.75, 0.125, 0.75">
+      <path id="Horizontal" d="m 168,239 h 24" style="stroke-dashoffset:0.25"/>
+      <path id="Vertical" d="m 186,245 v -12" style="stroke-dashoffset:4.625"/>
   </g>
 </svg>