diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionAreaAnnotation.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionAreaAnnotation.svg
index f5332ae367..b2ae54992a 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionAreaAnnotation.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionAreaAnnotation.svg
@@ -1,217 +1,117 @@
-
-
-
-
\ No newline at end of file
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionCustomizeFormat.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionCustomizeFormat.svg
new file mode 100644
index 0000000000..c873ae7ddd
--- /dev/null
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionCustomizeFormat.svg
@@ -0,0 +1,89 @@
+
+
+
\ No newline at end of file
diff --git a/src/Mod/TechDraw/Gui/TaskCustomizeFormat.ui b/src/Mod/TechDraw/Gui/TaskCustomizeFormat.ui
new file mode 100644
index 0000000000..e527c54bf9
--- /dev/null
+++ b/src/Mod/TechDraw/Gui/TaskCustomizeFormat.ui
@@ -0,0 +1,737 @@
+
+
+ TechDrawGui::TaskCustomizeFormat
+
+
+
+ 0
+ 0
+ 489
+ 601
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 250
+ 0
+
+
+
+ Format Symbols
+
+
+ -
+
+
-
+
+
+ Flatness
+
+
+ ⏥
+
+
+
+ -
+
+
+ Angularity
+
+
+ ∠
+
+
+
+ -
+
+
+ Circularity
+
+
+ ○
+
+
+
+ -
+
+
+ Cylindricity
+
+
+ ⌭
+
+
+
+ -
+
+
+ GD&T
+
+
+
+ -
+
+
+ Perpendicularity
+
+
+ ⟂
+
+
+
+ -
+
+
+ Parallelism
+
+
+ ∥
+
+
+
+ -
+
+
+ Total runout
+
+
+ ⌰
+
+
+
+ -
+
+
+
+ 9
+
+
+
+ Profile of a line
+
+
+ ⌒
+
+
+
+ -
+
+
+ Straightness
+
+
+ ⏤
+
+
+
+ -
+
+
+ Profile of a surface
+
+
+ ⌓
+
+
+
+ -
+
+
+ Circular runout
+
+
+ ↗
+
+
+
+ -
+
+
+ Position
+
+
+ ⌖
+
+
+
+ -
+
+
+ Concentricity
+
+
+ ◎
+
+
+
+ -
+
+
+ Symmetry
+
+
+ ⌯
+
+
+
+
+
+ -
+
+
+ Modifiers
+
+
+
+ -
+
+
-
+
+
+
+ 9
+
+
+
+ Least material condition (LMC)
+
+
+ Ⓛ
+
+
+
+ -
+
+
+
+ 9
+
+
+
+ Reciprocity condition
+
+
+ Ⓡ
+
+
+
+ -
+
+
+
+ 9
+
+
+
+ Regardless of feature size (RFS)
+
+
+ Ⓢ
+
+
+
+ -
+
+
+
+ 9
+
+
+
+ Unequal Bilateral
+
+
+ Ⓤ
+
+
+
+ -
+
+
+
+ 9
+
+
+
+ least inscribed geometry element
+
+
+ Ⓝ
+
+
+
+ -
+
+
+
+ 9
+
+
+
+ Least square geomtry element
+
+
+ Ⓖ
+
+
+
+ -
+
+
+
+ 9
+
+
+
+ Minimax (Tschebyschew)
+
+
+ Ⓒ
+
+
+
+ -
+
+
+
+ 9
+
+
+
+ Maximum material condition (MMC)
+
+
+ Ⓜ
+
+
+
+ -
+
+
+
+ 9
+
+
+
+ Tangent plane
+
+
+ Ⓣ
+
+
+
+ -
+
+
+
+ 9
+
+
+
+ derived geometry element
+
+
+ Ⓐ
+
+
+
+ -
+
+
+
+ 9
+
+
+
+ Free state
+
+
+ Ⓕ
+
+
+
+ -
+
+
+
+ 9
+
+
+
+ Projected tolerance zone
+
+
+ Ⓟ
+
+
+
+ -
+
+
+
+ 9
+
+
+
+ most inscribed geomtry element
+
+
+ Ⓧ
+
+
+
+ -
+
+
+
+ 9
+
+
+
+ Hull condition
+
+
+ Ⓔ
+
+
+
+
+
+ -
+
+
+ Radius & Diameter
+
+
+
+ -
+
+
-
+
+
+ Radius
+
+
+ R
+
+
+
+ -
+
+
+ Diameter
+
+
+ ⌀
+
+
+
+ -
+
+
+ Diameter of sphere
+
+
+ S⌀
+
+
+
+ -
+
+
+ Radius of sphere
+
+
+ SR
+
+
+
+ -
+
+
+ Square
+
+
+ □
+
+
+
+
+
+ -
+
+
+ Angles
+
+
+
+ -
+
+
-
+
+
+ Degree
+
+
+ °
+
+
+
+ -
+
+
+ (Arc) Tertie
+
+
+ ‴
+
+
+
+ -
+
+
+ (Arc) Second
+
+
+ ″
+
+
+
+ -
+
+
+ (Arc) Minute
+
+
+ ′
+
+
+
+
+
+ -
+
+
+ Other
+
+
+
+ -
+
+
+ 0
+
+
-
+
+
+ Plus - Minus
+
+
+ ±
+
+
+
+ -
+
+
+ Slope
+
+
+ ⌳
+
+
+
+ -
+
+
+ Countersink
+
+
+ ⌵
+
+
+
+ -
+
+
+ Counterbore
+
+
+ ⌴
+
+
+
+ -
+
+
+ Taper
+
+
+ ⌲
+
+
+
+ -
+
+
+ Centerline
+
+
+ ℄
+
+
+
+ -
+
+
+ Left/right arrow
+
+
+ ↔
+
+
+
+ -
+
+
+ Downward arrow
+
+
+ ↧
+
+
+
+ -
+
+
+ Multiplication sign
+
+
+ ×
+
+
+
+
+
+ -
+
+
+ Greek Letters
+
+
+
+ -
+
+
-
+
+
+ Capital delta
+
+
+ Δ
+
+
+
+ -
+
+
+ Small phi
+
+
+ φ
+
+
+
+ -
+
+
+ Capital sigma
+
+
+ Σ
+
+
+
+ -
+
+
+ Capital omega
+
+
+ Ω
+
+
+
+ -
+
+
+ Small omega
+
+
+ ⍵
+
+
+
+ -
+
+
+ Small mu
+
+
+ μ
+
+
+
+ -
+
+
+ Small sigma
+
+
+ σ
+
+
+
+
+
+ -
+
+
-
+
+
+ Preview:
+
+
+
+ -
+
+
+ Format:
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+