diff --git a/src/Mod/TechDraw/Gui/Command.cpp b/src/Mod/TechDraw/Gui/Command.cpp
index 2a9fed5130..8e0dbc9c06 100644
--- a/src/Mod/TechDraw/Gui/Command.cpp
+++ b/src/Mod/TechDraw/Gui/Command.cpp
@@ -727,7 +727,7 @@ CmdTechDrawClipPlus::CmdTechDrawClipPlus()
   : Command("TechDraw_ClipPlus")
 {
     sGroup        = QT_TR_NOOP("TechDraw");
-    sMenuText     = QT_TR_NOOP("Add View to ClipGroup");
+    sMenuText     = QT_TR_NOOP("Add View to Clip group");
     sToolTipText  = QT_TR_NOOP("Add a View to Clip group");
     sWhatsThis    = "TechDraw_ClipPlus";
     sStatusTip    = sToolTipText;
@@ -740,7 +740,7 @@ void CmdTechDrawClipPlus::activated(int iMsg)
    std::vector<Gui::SelectionObject> selection = getSelection().getSelectionEx();
    if (selection.size() != 2) {
        QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
-                            QObject::tr("Select 1 DrawViewClip and 1 DrawView."));
+                            QObject::tr("Select 1 Clip group and 1 View."));
        return;
    }
 
@@ -756,12 +756,12 @@ void CmdTechDrawClipPlus::activated(int iMsg)
     }
     if (!view) {
         QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
-            QObject::tr("Select exactly one Drawing View object."));
+            QObject::tr("Select exactly one View to add to group."));
         return;
     }
     if (!clip) {
         QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
-            QObject::tr("Select exactly one Clip object."));
+            QObject::tr("Select exactly one Clip group."));
         return;
     }
 
@@ -824,7 +824,7 @@ void CmdTechDrawClipMinus::activated(int iMsg)
     if (dObj.empty()) {
         QMessageBox::warning( Gui::getMainWindow(),
                               QObject::tr("Wrong selection"),
-                              QObject::tr("Select exactly one Drawing View object.") );
+                              QObject::tr("Select exactly one View to remove from Group.") );
         return;
     }
 
@@ -939,8 +939,8 @@ CmdTechDrawDraftView::CmdTechDrawDraftView()
 {
     // setting the Gui eye-candy
     sGroup        = QT_TR_NOOP("TechDraw");
-    sMenuText     = QT_TR_NOOP("Insert a DraftView");
-    sToolTipText  = QT_TR_NOOP("Inserts a Draft WB object");
+    sMenuText     = QT_TR_NOOP("Insert a DraftWB object");
+    sToolTipText  = QT_TR_NOOP("Insert a View of a Draft Workbench object");
     sWhatsThis    = "TechDraw_NewDraft";
     sStatusTip    = sToolTipText;
     sPixmap       = "actions/techdraw-draft-view";
@@ -992,8 +992,8 @@ CmdTechDrawArchView::CmdTechDrawArchView()
 {
     // setting the Gui eye-candy
     sGroup        = QT_TR_NOOP("TechDraw");
-    sMenuText     = QT_TR_NOOP("Insert an ArchView");
-    sToolTipText  = QT_TR_NOOP("Inserts a view of an Arch Section Plane");
+    sMenuText     = QT_TR_NOOP("Insert a Section Plane");
+    sToolTipText  = QT_TR_NOOP("Inserts a view of a Section Plane from Arch Workbench");
     sWhatsThis    = "TechDraw_NewArch";
     sStatusTip    = sToolTipText;
     sPixmap       = "actions/techdraw-arch-view";
@@ -1027,7 +1027,7 @@ void CmdTechDrawArchView::activated(int iMsg)
         archObj = objects[ifound];
     } else {
         QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
-            QObject::tr("There is no Arch Section Plane in selection."));
+            QObject::tr("There is no Section Plane in selection."));
         return;
     }
 
diff --git a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp
index 9366476100..61e914350e 100644
--- a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp
+++ b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp
@@ -200,7 +200,7 @@ void CmdTechDrawNewDimension::activated(int iMsg)
         subs.push_back(SubNames[1]);
     } else {
         QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect Selection"),
-                                                   QObject::tr("Can't make a Dimension from this selection"));
+                                                   QObject::tr("Can not make a Dimension from this selection"));
         return;
     }
 
@@ -1079,7 +1079,7 @@ bool _checkDrawViewPart(Gui::Command* cmd) {
     if( !objFeat ) {
         QMessageBox::warning( Gui::getMainWindow(),
                               QObject::tr("Incorrect selection"),
-                              QObject::tr("No DrawViewPart in selection.") );
+                              QObject::tr("No View of a Part in selection.") );
         return false;
     }
     return true;
@@ -1096,7 +1096,7 @@ bool _checkPartFeature(Gui::Command* cmd) {
     }
     if(!result) {
         QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect selection"),
-                             QObject::tr("No DrawViewPart in selection."));
+                             QObject::tr("No Feature with Shape in selection."));
     }
     return result;
 }
diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw.ui
index 47d33b63f5..22ece13fc5 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw.ui
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw.ui
@@ -7,11 +7,11 @@
     <x>0</x>
     <y>0</y>
     <width>558</width>
-    <height>883</height>
+    <height>935</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>TechDraw 1</string>
+   <string>TechDraw General</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_5">
    <item row="0" column="0">
@@ -671,7 +671,7 @@
         <item row="2" column="0">
          <widget class="QLabel" name="lbl_TemplateDot">
           <property name="text">
-           <string>Template Dot Size</string>
+           <string>Editable Text Marker Size</string>
           </property>
          </widget>
         </item>
@@ -707,7 +707,7 @@
            <string>View Label size in units</string>
           </property>
           <property name="value">
-           <double>3.500000000000000</double>
+           <double>6.000000000000000</double>
           </property>
           <property name="prefEntry" stdset="0">
            <cstring>LabelSize</cstring>
@@ -720,7 +720,7 @@
         <item row="2" column="2">
          <widget class="Gui::PrefUnitSpinBox" name="plsb_TemplateDot">
           <property name="toolTip">
-           <string>Green edit dot size in units</string>
+           <string>Size of editable text marker in Templates (green dot).</string>
           </property>
           <property name="value">
            <double>3.000000000000000</double>
diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2.ui
index 148daf17e9..19ff21ce83 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2.ui
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2.ui
@@ -7,11 +7,11 @@
     <x>0</x>
     <y>0</y>
     <width>521</width>
-    <height>716</height>
+    <height>732</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>TechDraw 2</string>
+   <string>TechDraw Dimensions</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_5">
    <item row="0" column="0">
diff --git a/src/Mod/TechDraw/Gui/MDIViewPage.cpp b/src/Mod/TechDraw/Gui/MDIViewPage.cpp
index bed5cad9df..8692486fac 100644
--- a/src/Mod/TechDraw/Gui/MDIViewPage.cpp
+++ b/src/Mod/TechDraw/Gui/MDIViewPage.cpp
@@ -120,7 +120,9 @@ MDIViewPage::MDIViewPage(ViewProviderPage *pageVp, Gui::Document* doc, QWidget*
 
     isSelectionBlocked = false;
 
-    setWindowTitle(tr("dummy[*]"));      //Yuck. prevents "QWidget::setWindowModified: The window title does not contain a '[*]' placeholder"
+    QString tabText = QString::fromUtf8(pageVp->getDrawPage()->getNameInDocument());
+    tabText += QString::fromUtf8("[*]");
+    setWindowTitle(tabText);
     setCentralWidget(m_view);            //this makes m_view a Qt child of MDIViewPage
 
     // Connect Signals and Slots