diff --git a/src/Mod/TechDraw/CMakeLists.txt b/src/Mod/TechDraw/CMakeLists.txt
index ed51245705..e7cd586963 100644
--- a/src/Mod/TechDraw/CMakeLists.txt
+++ b/src/Mod/TechDraw/CMakeLists.txt
@@ -11,25 +11,25 @@ set(TechDraw_Scripts
     TestTechDrawApp.py
 )
 
-if(BUILD_GUI)
-    list (APPEND Image_Scripts InitGui.py)
-    set(TechDraw_ToolsScripts
-        TechDrawTools/__init__.py
-        TechDrawTools/CommandMoveView.py
-        TechDrawTools/CommandCopyView.py
-        TechDrawTools/TaskMoveView.py
-        TechDrawTools/TaskCopyView.py
-        TechDrawTools/TDToolsUtil.py
-        TechDrawTools/TDToolsMovers.py
-        Gui/TaskMoveView.ui
-        Gui/DlgPageChooser.ui
-    )
-endif(BUILD_GUI)
-
 if(BUILD_GUI)
     list (APPEND TechDraw_Scripts InitGui.py)
 endif(BUILD_GUI)
 
+set(TechDraw_ToolsScripts
+    TechDrawTools/__init__.py
+    TechDrawTools/CommandMoveView.py
+    TechDrawTools/CommandCopyView.py
+    TechDrawTools/TaskMoveView.py
+    TechDrawTools/TaskCopyView.py
+    TechDrawTools/TDToolsUtil.py
+    TechDrawTools/TDToolsMovers.py
+)
+
+set(TechDraw_ToolsGui
+    Gui/TaskMoveView.ui
+    Gui/DlgPageChooser.ui
+)
+
 SET(TechDraw_PATFile
     PAT/FCPAT.pat
 )
@@ -39,7 +39,7 @@ SET(TechDraw_LineGroupFile
 )
 
 add_custom_target(TechDraw_Data ALL
-SOURCES ${TechDraw_Scripts} ${TechDraw_PATFile} ${TechDraw_LineGroupFile} ${TechDraw_ToolsScripts}
+SOURCES ${TechDraw_Scripts} ${TechDraw_PATFile} ${TechDraw_LineGroupFile} ${TechDraw_ToolsScripts} ${TechDraw_ToolsGui}
 )
 
 fc_target_copy_resource(TechDraw_Data
@@ -64,6 +64,12 @@ fc_target_copy_resource(TechDraw_Data
     ${TechDraw_ToolsScripts}
 )
 
+fc_target_copy_resource(TechDraw_Data
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_BINARY_DIR}/Mod/TechDraw/TechDrawTools
+    ${TechDraw_ToolsGui}
+)
+
 INSTALL(
     FILES
         ${TechDraw_Scripts}
@@ -78,6 +84,13 @@ INSTALL(
         Mod/TechDraw/TechDrawTools
 )
 
+INSTALL(
+    FILES
+        ${TechDraw_ToolsGui}
+    DESTINATION
+        Mod/TechDraw/TechDrawTools/Gui
+)
+
 INSTALL(
     DIRECTORY
         Templates
diff --git a/src/Mod/TechDraw/TechDrawTools/TaskCopyView.py b/src/Mod/TechDraw/TechDrawTools/TaskCopyView.py
index da3218835c..922d13b085 100644
--- a/src/Mod/TechDraw/TechDrawTools/TaskCopyView.py
+++ b/src/Mod/TechDraw/TechDrawTools/TaskCopyView.py
@@ -40,7 +40,7 @@ import os
 class TaskCopyView:
     def __init__(self):
         self._uiPath = App.getHomePath()
-        self._uiPath = os.path.join(self._uiPath, "Mod/TechDraw/Gui/TaskMoveView.ui")
+        self._uiPath = os.path.join(self._uiPath, "Mod/TechDraw/TechDrawTools/Gui/TaskMoveView.ui")
         self.form = Gui.PySideUic.loadUi(self._uiPath)
 
         self.form.setWindowTitle(QT_TRANSLATE_NOOP("CopyView", "Copy View to a second Page"))
@@ -68,7 +68,7 @@ class TaskCopyView:
     def pickView(self):
 #        print("pickView")
         _dlgPath = App.getHomePath()
-        _dlgPath = os.path.join(_dlgPath, "Mod/TechDraw/Gui/DlgPageChooser.ui")
+        _dlgPath = os.path.join(_dlgPath, "Mod/TechDraw/TechDrawTools/Gui/DlgPageChooser.ui")
         dlg = Gui.PySideUic.loadUi(_dlgPath)
         dlg.lPrompt.setText(QT_TRANSLATE_NOOP("CopyView", "Select View to copy from list."))
         dlg.setWindowTitle(QT_TRANSLATE_NOOP("CopyView", "Select View"))
@@ -87,7 +87,7 @@ class TaskCopyView:
     def pickFromPage(self):
 #        print("pickFromPage")
         _dlgPath = App.getHomePath()
-        _dlgPath = os.path.join(_dlgPath, "Mod/TechDraw/Gui/DlgPageChooser.ui")
+        _dlgPath = os.path.join(_dlgPath, "Mod/TechDraw/TechDrawTools/Gui/DlgPageChooser.ui")
         dlg = Gui.PySideUic.loadUi(_dlgPath)
         dlg.lPrompt.setText(QT_TRANSLATE_NOOP("CopyView", "Select From Page."))
         dlg.setWindowTitle(QT_TRANSLATE_NOOP("CopyView", "Select Page"))
@@ -106,7 +106,7 @@ class TaskCopyView:
     def pickToPage(self):
 #        print("pickToPage")
         _dlgPath = App.getHomePath()
-        _dlgPath = os.path.join(_dlgPath, "Mod/TechDraw/Gui/DlgPageChooser.ui")
+        _dlgPath = os.path.join(_dlgPath, "Mod/TechDraw/TechDrawTools/Gui/DlgPageChooser.ui")
         dlg = Gui.PySideUic.loadUi(_dlgPath)
         dlg.lPrompt.setText(QT_TRANSLATE_NOOP("CopyView", "Select To Page."))
         dlg.setWindowTitle(QT_TRANSLATE_NOOP("CopyView", "Select Page"))
diff --git a/src/Mod/TechDraw/TechDrawTools/TaskMoveView.py b/src/Mod/TechDraw/TechDrawTools/TaskMoveView.py
index c1d92dfd99..87f1d825aa 100644
--- a/src/Mod/TechDraw/TechDrawTools/TaskMoveView.py
+++ b/src/Mod/TechDraw/TechDrawTools/TaskMoveView.py
@@ -41,7 +41,7 @@ class TaskMoveView:
     def __init__(self):
         import os
         self._uiPath = App.getHomePath()
-        self._uiPath = os.path.join(self._uiPath, "Mod/TechDraw/Gui/TaskMoveView.ui")
+        self._uiPath = os.path.join(self._uiPath, "Mod/TechDraw/TechDrawTools/Gui/TaskMoveView.ui")
         self.form = Gui.PySideUic.loadUi(self._uiPath)
 
         self.form.setWindowTitle(QT_TRANSLATE_NOOP("MoveView", "Move View to a different Page"))
@@ -69,7 +69,7 @@ class TaskMoveView:
     def pickView(self):
 #        print("pickView")
         _dlgPath = App.getHomePath()
-        _dlgPath = os.path.join(_dlgPath, "Mod/TechDraw/Gui/DlgPageChooser.ui")
+        _dlgPath = os.path.join(_dlgPath, "Mod/TechDraw/TechDrawTools/Gui/DlgPageChooser.ui")
         dlg = Gui.PySideUic.loadUi(_dlgPath)
         dlg.lPrompt.setText(QT_TRANSLATE_NOOP("MoveView", "Select View to move from list."))
         dlg.setWindowTitle(QT_TRANSLATE_NOOP("MoveView", "Select View"))
@@ -88,7 +88,7 @@ class TaskMoveView:
     def pickFromPage(self):
 #        print("pickFromPage")
         _dlgPath = App.getHomePath()
-        _dlgPath = os.path.join(_dlgPath, "Mod/TechDraw/Gui/DlgPageChooser.ui")
+        _dlgPath = os.path.join(_dlgPath, "Mod/TechDraw/TechDrawTools/Gui/DlgPageChooser.ui")
         dlg = Gui.PySideUic.loadUi(_dlgPath)
         dlg.lPrompt.setText(QT_TRANSLATE_NOOP("MoveView", "Select From Page."))
         dlg.setWindowTitle(QT_TRANSLATE_NOOP("MoveView", "Select Page"))
@@ -107,7 +107,7 @@ class TaskMoveView:
     def pickToPage(self):
 #        print("pickToPage")
         _dlgPath = App.getHomePath()
-        _dlgPath = os.path.join(_dlgPath, "Mod/TechDraw/Gui/DlgPageChooser.ui")
+        _dlgPath = os.path.join(_dlgPath, "Mod/TechDraw/TechDrawTools/Gui/DlgPageChooser.ui")
         dlg = Gui.PySideUic.loadUi(_dlgPath)
         dlg.lPrompt.setText(QT_TRANSLATE_NOOP("MoveView", "Select To Page."))
         dlg.setWindowTitle(QT_TRANSLATE_NOOP("MoveView", "Select Page"))