diff --git a/src/Mod/Draft/CMakeLists.txt b/src/Mod/Draft/CMakeLists.txt
index 845d39529f..0f1a0054b1 100644
--- a/src/Mod/Draft/CMakeLists.txt
+++ b/src/Mod/Draft/CMakeLists.txt
@@ -64,6 +64,9 @@ SET(Draft_objects
     draftobjects/orthoarray.py
     draftobjects/polararray.py
     draftobjects/arc_3points.py
+    draftobjects/draft_annotation.py
+    draftobjects/dimension.py
+    draftobjects/dimensionstyle.py
     draftobjects/README.md
 )
 
@@ -72,6 +75,9 @@ SET(Draft_view_providers
     draftviewproviders/view_circulararray.py
     draftviewproviders/view_orthoarray.py
     draftviewproviders/view_polararray.py
+    draftviewproviders/view_draft_annotation.py
+    draftviewproviders/view_dimension.py
+    draftviewproviders/view_dimensionstyle.py
     draftviewproviders/README.md
 )
 
@@ -79,6 +85,7 @@ SET(Draft_GUI_tools
     draftguitools/__init__.py
     draftguitools/gui_base.py
     draftguitools/gui_circulararray.py
+    draftguitools/gui_dimensionstyle.py
     draftguitools/gui_orthoarray.py
     draftguitools/gui_polararray.py
     draftguitools/gui_planeproxy.py
diff --git a/src/Mod/Draft/Resources/Draft.qrc b/src/Mod/Draft/Resources/Draft.qrc
index 0b8b5145ee..06c8ea3b8c 100644
--- a/src/Mod/Draft/Resources/Draft.qrc
+++ b/src/Mod/Draft/Resources/Draft.qrc
@@ -3,6 +3,7 @@
         <file>icons/Draft_2DShapeView.svg</file>
         <file>icons/Draft_AddPoint.svg</file>
         <file>icons/Draft_AddToGroup.svg</file>
+        <file>icons/Draft_Annotation_Style.svg</file>
         <file>icons/Draft_Apply.svg</file>
         <file>icons/Draft_Arc.svg</file>
         <file>icons/Draft_Arc_3Points.svg</file>
@@ -24,6 +25,8 @@
         <file>icons/Draft_DelPoint.svg</file>
         <file>icons/Draft_Dimension.svg</file>
         <file>icons/Draft_Dimension_Tree.svg</file>
+        <file>icons/Draft_Dimension_Style.svg</file>
+        <file>icons/Draft_Dimension_Style_Tree.svg</file>
         <file>icons/Draft_DimensionAngular.svg</file>
         <file>icons/Draft_DimensionRadius.svg</file>
         <file>icons/Draft_Dot.svg</file>
diff --git a/src/Mod/Draft/draftobjects/dimension.py b/src/Mod/Draft/draftobjects/dimension.py
index f26998461f..b91ef8d456 100644
--- a/src/Mod/Draft/draftobjects/dimension.py
+++ b/src/Mod/Draft/draftobjects/dimension.py
@@ -1,5 +1,7 @@
+# -*- coding: utf-8 -*-
 # ***************************************************************************
-# *   (c) 2020 Carlo Pavan                                                  *
+# *   Copyright (c) 2009, 2010 Yorik van Havre <yorik@uncreated.net>        *
+# *   Copyright (c) 2009, 2010 Ken Cline <cline@frii.com>                   *
 # *                                                                         *
 # *   This file is part of the FreeCAD CAx development system.              *
 # *                                                                         *
@@ -21,11 +23,11 @@
 # *                                                                         *
 # ***************************************************************************
 
-"""This module provides the object code for Draft DimensionStyle.
+"""This module provides the object code for Draft Dimension.
 """
 ## @package style_dimension
 # \ingroup DRAFT
-# \brief This module provides the object code for Draft DimensionStyle.
+# \brief This module provides the object code for Draft Dimension.
 
 import FreeCAD as App
 import math
diff --git a/src/Mod/Draft/draftobjects/dimensionstyle.py b/src/Mod/Draft/draftobjects/dimensionstyle.py
index 598071a47d..dff2b6250d 100644
--- a/src/Mod/Draft/draftobjects/dimensionstyle.py
+++ b/src/Mod/Draft/draftobjects/dimensionstyle.py
@@ -1,5 +1,4 @@
 # ***************************************************************************
-# *   (c) 2020 Carlo Pavan                                                  *
 # *                                                                         *
 # *   This file is part of the FreeCAD CAx development system.              *
 # *                                                                         *
diff --git a/src/Mod/Draft/draftviewproviders/view_dimension.py b/src/Mod/Draft/draftviewproviders/view_dimension.py
index 0b58a1253a..eac7a6d046 100644
--- a/src/Mod/Draft/draftviewproviders/view_dimension.py
+++ b/src/Mod/Draft/draftviewproviders/view_dimension.py
@@ -1,5 +1,6 @@
 # ***************************************************************************
-# *   (c) 2019 Eliud Cabrera Castillo <e.cabrera-castillo@tum.de>           *
+# *   Copyright (c) 2009, 2010 Yorik van Havre <yorik@uncreated.net>        *
+# *   Copyright (c) 2009, 2010 Ken Cline <cline@frii.com>                   *
 # *                                                                         *
 # *   This file is part of the FreeCAD CAx development system.              *
 # *                                                                         *
@@ -20,11 +21,11 @@
 # *   USA                                                                   *
 # *                                                                         *
 # ***************************************************************************
-"""This module provides the Draft Annotations view provider base classes
+"""This module provides the Draft Dimensions view provider classes
 """
 ## @package polararray
 # \ingroup DRAFT
-# \brief This module provides the view provider code for Draft PolarArray.
+# \brief This module provides the view provider code for Draft Dimensions.
 
 
 import FreeCAD as App
diff --git a/src/Mod/Draft/draftviewproviders/view_dimensionstyle.py b/src/Mod/Draft/draftviewproviders/view_dimensionstyle.py
index c28a9097ce..2dd20198ee 100644
--- a/src/Mod/Draft/draftviewproviders/view_dimensionstyle.py
+++ b/src/Mod/Draft/draftviewproviders/view_dimensionstyle.py
@@ -1,5 +1,4 @@
 # ***************************************************************************
-# *   (c) 2020 Carlo Pavan                                                  *
 # *                                                                         *
 # *   This file is part of the FreeCAD CAx development system.              *
 # *                                                                         *
diff --git a/src/Mod/Draft/draftviewproviders/view_draft_annotation.py b/src/Mod/Draft/draftviewproviders/view_draft_annotation.py
index ab0c0f15b5..2cc0f38d8c 100644
--- a/src/Mod/Draft/draftviewproviders/view_draft_annotation.py
+++ b/src/Mod/Draft/draftviewproviders/view_draft_annotation.py
@@ -1,5 +1,4 @@
 # ***************************************************************************
-# *   (c) 2019 Eliud Cabrera Castillo <e.cabrera-castillo@tum.de>           *
 # *                                                                         *
 # *   This file is part of the FreeCAD CAx development system.              *
 # *                                                                         *