diff --git a/src/Tools/_TEMPLATE_/App/App_TEMPLATE_.cpp b/src/Tools/_TEMPLATE_/App/App_TEMPLATE_.cpp
index 7385296172..1babbf973e 100644
--- a/src/Tools/_TEMPLATE_/App/App_TEMPLATE_.cpp
+++ b/src/Tools/_TEMPLATE_/App/App_TEMPLATE_.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (c) YEAR YOUR NAME         <Your e-mail address>            *
+ *   Copyright (c) YEAR YOUR NAME <Your e-mail address>                    *
  *                                                                         *
  *   This file is part of the FreeCAD CAx development system.              *
  *                                                                         *
diff --git a/src/Tools/_TEMPLATE_/App/PreCompiled.cpp b/src/Tools/_TEMPLATE_/App/PreCompiled.cpp
index c32e030c6d..68d7ea8a80 100644
--- a/src/Tools/_TEMPLATE_/App/PreCompiled.cpp
+++ b/src/Tools/_TEMPLATE_/App/PreCompiled.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (c) YEAR YOUR NAME         <Your e-mail address>            *
+ *   Copyright (c) YEAR YOUR NAME <Your e-mail address>                    *
  *                                                                         *
  *   This file is part of the FreeCAD CAx development system.              *
  *                                                                         *
diff --git a/src/Tools/_TEMPLATE_/App/PreCompiled.h b/src/Tools/_TEMPLATE_/App/PreCompiled.h
index 1ab6433715..7556c1fd3e 100644
--- a/src/Tools/_TEMPLATE_/App/PreCompiled.h
+++ b/src/Tools/_TEMPLATE_/App/PreCompiled.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (c) YEAR YOUR NAME         <Your e-mail address>            *
+ *   Copyright (c) YEAR YOUR NAME <Your e-mail address>                    *
  *                                                                         *
  *   This file is part of the FreeCAD CAx development system.              *
  *                                                                         *
diff --git a/src/Tools/_TEMPLATE_/Gui/App_TEMPLATE_Gui.cpp b/src/Tools/_TEMPLATE_/Gui/App_TEMPLATE_Gui.cpp
index d96b311ee6..e7019bcadc 100644
--- a/src/Tools/_TEMPLATE_/Gui/App_TEMPLATE_Gui.cpp
+++ b/src/Tools/_TEMPLATE_/Gui/App_TEMPLATE_Gui.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (c) YEAR YOUR NAME         <Your e-mail address>            *
+ *   Copyright (c) YEAR YOUR NAME <Your e-mail address>                    *
  *                                                                         *
  *   This file is part of the FreeCAD CAx development system.              *
  *                                                                         *
diff --git a/src/Tools/_TEMPLATE_/Gui/Command.cpp b/src/Tools/_TEMPLATE_/Gui/Command.cpp
index 7399a8851d..2f3420ff18 100644
--- a/src/Tools/_TEMPLATE_/Gui/Command.cpp
+++ b/src/Tools/_TEMPLATE_/Gui/Command.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (c) YEAR YOUR NAME         <Your e-mail address>            *
+ *   Copyright (c) YEAR YOUR NAME <Your e-mail address>                    *
  *                                                                         *
  *   This file is part of the FreeCAD CAx development system.              *
  *                                                                         *
diff --git a/src/Tools/_TEMPLATE_/Gui/PreCompiled.cpp b/src/Tools/_TEMPLATE_/Gui/PreCompiled.cpp
index c32e030c6d..68d7ea8a80 100644
--- a/src/Tools/_TEMPLATE_/Gui/PreCompiled.cpp
+++ b/src/Tools/_TEMPLATE_/Gui/PreCompiled.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (c) YEAR YOUR NAME         <Your e-mail address>            *
+ *   Copyright (c) YEAR YOUR NAME <Your e-mail address>                    *
  *                                                                         *
  *   This file is part of the FreeCAD CAx development system.              *
  *                                                                         *
diff --git a/src/Tools/_TEMPLATE_/Gui/PreCompiled.h b/src/Tools/_TEMPLATE_/Gui/PreCompiled.h
index 25ebdd6dfd..3475d3af9b 100644
--- a/src/Tools/_TEMPLATE_/Gui/PreCompiled.h
+++ b/src/Tools/_TEMPLATE_/Gui/PreCompiled.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (c) YEAR YOUR NAME         <Your e-mail address>            *
+ *   Copyright (c) YEAR YOUR NAME <Your e-mail address>                    *
  *                                                                         *
  *   This file is part of the FreeCAD CAx development system.              *
  *                                                                         *
diff --git a/src/Tools/_TEMPLATE_/Gui/Workbench.cpp b/src/Tools/_TEMPLATE_/Gui/Workbench.cpp
index 6587391b20..fe66b3ea01 100644
--- a/src/Tools/_TEMPLATE_/Gui/Workbench.cpp
+++ b/src/Tools/_TEMPLATE_/Gui/Workbench.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (c) YEAR YOUR NAME         <Your e-mail address>            *
+ *   Copyright (c) YEAR YOUR NAME <Your e-mail address>                    *
  *                                                                         *
  *   This file is part of the FreeCAD CAx development system.              *
  *                                                                         *
diff --git a/src/Tools/_TEMPLATE_/Gui/Workbench.h b/src/Tools/_TEMPLATE_/Gui/Workbench.h
index 58676eb428..dfe9eeb56e 100644
--- a/src/Tools/_TEMPLATE_/Gui/Workbench.h
+++ b/src/Tools/_TEMPLATE_/Gui/Workbench.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (c) YEAR YOUR NAME         <Your e-mail address>            *
+ *   Copyright (c) YEAR YOUR NAME <Your e-mail address>                    *
  *                                                                         *
  *   This file is part of the FreeCAD CAx development system.              *
  *                                                                         *
diff --git a/src/Tools/generateTemplates/templateCPPFile.py b/src/Tools/generateTemplates/templateCPPFile.py
index 227618d825..9bb5414d19 100644
--- a/src/Tools/generateTemplates/templateCPPFile.py
+++ b/src/Tools/generateTemplates/templateCPPFile.py
@@ -13,7 +13,7 @@ class TemplateCPPFile (template.ModelTemplate):
 
 Template = """
 /***************************************************************************
- *   Copyright (c) YEAR YOUR NAME         <Your e-mail address>            *
+ *   Copyright (c) YEAR YOUR NAME <Your e-mail address>                    *
  *                                                                         *
  *   This file is part of the FreeCAD CAx development system.              *
  *                                                                         *