diff --git a/src/Mod/TechDraw/Symbols/gd-and-t/ConcentricityFrame.svg b/src/Mod/TechDraw/Symbols/gd-and-t/ConcentricityFrame.svg
new file mode 100644
index 0000000000..30ed7a9181
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/gd-and-t/ConcentricityFrame.svg
@@ -0,0 +1,36 @@
+
+
diff --git a/src/Mod/TechDraw/Symbols/gd-and-t/CylindricityFrame.svg b/src/Mod/TechDraw/Symbols/gd-and-t/CylindricityFrame.svg
new file mode 100644
index 0000000000..feb879875b
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/gd-and-t/CylindricityFrame.svg
@@ -0,0 +1,37 @@
+
+
diff --git a/src/Mod/TechDraw/Symbols/gd-and-t/FlatnessFrame.svg b/src/Mod/TechDraw/Symbols/gd-and-t/FlatnessFrame.svg
new file mode 100644
index 0000000000..036857ae32
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/gd-and-t/FlatnessFrame.svg
@@ -0,0 +1,2 @@
+
+
diff --git a/src/Mod/TechDraw/Symbols/gd-and-t/ParallelismFrame.svg b/src/Mod/TechDraw/Symbols/gd-and-t/ParallelismFrame.svg
new file mode 100644
index 0000000000..8bdec00030
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/gd-and-t/ParallelismFrame.svg
@@ -0,0 +1,58 @@
+
+
diff --git a/src/Mod/TechDraw/Symbols/gd-and-t/ReferenceSurface.svg b/src/Mod/TechDraw/Symbols/gd-and-t/ReferenceSurface.svg
new file mode 100644
index 0000000000..6d0ff32172
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/gd-and-t/ReferenceSurface.svg
@@ -0,0 +1,24 @@
+
+
diff --git a/src/Mod/TechDraw/Symbols/gd-and-t/RoundnessFrame.svg b/src/Mod/TechDraw/Symbols/gd-and-t/RoundnessFrame.svg
new file mode 100644
index 0000000000..8b1a9f1438
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/gd-and-t/RoundnessFrame.svg
@@ -0,0 +1,35 @@
+
+
diff --git a/src/Mod/TechDraw/Symbols/gd-and-t/SquarenessFrame.svg b/src/Mod/TechDraw/Symbols/gd-and-t/SquarenessFrame.svg
new file mode 100644
index 0000000000..d501eb59be
--- /dev/null
+++ b/src/Mod/TechDraw/Symbols/gd-and-t/SquarenessFrame.svg
@@ -0,0 +1,36 @@
+
+
diff --git a/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/ConcentricityFrame.svg b/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/ConcentricityFrame.svg
deleted file mode 100644
index 1c674e11de..0000000000
--- a/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/ConcentricityFrame.svg
+++ /dev/null
@@ -1,125 +0,0 @@
-
-
diff --git a/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/CylindricityFrame.svg b/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/CylindricityFrame.svg
deleted file mode 100644
index e6652e0137..0000000000
--- a/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/CylindricityFrame.svg
+++ /dev/null
@@ -1,124 +0,0 @@
-
-
diff --git a/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/FlatnessFrame.svg b/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/FlatnessFrame.svg
deleted file mode 100644
index c388753b5b..0000000000
--- a/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/FlatnessFrame.svg
+++ /dev/null
@@ -1,114 +0,0 @@
-
-
diff --git a/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/ParallelismFrame.svg b/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/ParallelismFrame.svg
deleted file mode 100644
index d1ce3ec298..0000000000
--- a/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/ParallelismFrame.svg
+++ /dev/null
@@ -1,141 +0,0 @@
-
-
diff --git a/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/ReferenceSurface.svg b/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/ReferenceSurface.svg
deleted file mode 100644
index 1efa4e0e18..0000000000
--- a/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/ReferenceSurface.svg
+++ /dev/null
@@ -1,112 +0,0 @@
-
-
diff --git a/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/RoundnessFrame.svg b/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/RoundnessFrame.svg
deleted file mode 100644
index ed1b6108f0..0000000000
--- a/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/RoundnessFrame.svg
+++ /dev/null
@@ -1,112 +0,0 @@
-
-
diff --git a/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/SquarenessFrame.svg b/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/SquarenessFrame.svg
deleted file mode 100644
index 08cb7864b5..0000000000
--- a/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/SquarenessFrame.svg
+++ /dev/null
@@ -1,121 +0,0 @@
-
-
diff --git a/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/angularity-left.svg b/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/angularity-left.svg
deleted file mode 100644
index 3bc6689788..0000000000
--- a/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/angularity-left.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/angularity-right.svg b/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/angularity-right.svg
deleted file mode 100644
index b14ae39ac8..0000000000
--- a/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/angularity-right.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/concentricity.svg b/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/concentricity.svg
deleted file mode 100644
index 70175d5cfb..0000000000
--- a/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/concentricity.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
diff --git a/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/cylindricity.svg b/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/cylindricity.svg
deleted file mode 100644
index c77568cb89..0000000000
--- a/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/cylindricity.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
diff --git a/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/flatness.svg b/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/flatness.svg
deleted file mode 100644
index d9d8c61519..0000000000
--- a/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/flatness.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/parallelism.svg b/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/parallelism.svg
deleted file mode 100644
index 1397310eb1..0000000000
--- a/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/parallelism.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
diff --git a/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/perpendicularity.svg b/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/perpendicularity.svg
deleted file mode 100644
index 243f61c291..0000000000
--- a/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/perpendicularity.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
diff --git a/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/position.svg b/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/position.svg
deleted file mode 100644
index 58e4b0c4d6..0000000000
--- a/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/position.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
diff --git a/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/profile-tolerance-of-line.svg b/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/profile-tolerance-of-line.svg
deleted file mode 100644
index 75db1bab74..0000000000
--- a/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/profile-tolerance-of-line.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/profile-tolerance-of-plane.svg b/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/profile-tolerance-of-plane.svg
deleted file mode 100644
index 24e7a1f36f..0000000000
--- a/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/profile-tolerance-of-plane.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/roundness.svg b/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/roundness.svg
deleted file mode 100644
index 3092582bf2..0000000000
--- a/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/roundness.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
\ No newline at end of file
diff --git a/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/symmetry.svg b/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/symmetry.svg
deleted file mode 100644
index 56c035b899..0000000000
--- a/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/symmetry.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
\ No newline at end of file
diff --git a/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/totalrunout.svg b/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/totalrunout.svg
deleted file mode 100644
index 67aad643b7..0000000000
--- a/src/Mod/TechDraw/Symbols/gd-and-t/gd-and-t/totalrunout.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-
-