diff --git a/src/Gui/PrefWidgets.cpp b/src/Gui/PrefWidgets.cpp
index c5750981a4..77d7408d6f 100644
--- a/src/Gui/PrefWidgets.cpp
+++ b/src/Gui/PrefWidgets.cpp
@@ -640,4 +640,45 @@ void PrefQuantitySpinBox::setHistorySize(int i)
     d->historySize = i;
 }
 
+// --------------------------------------------------------------------
+
+PrefFontBox::PrefFontBox ( QWidget * parent )
+  : QFontComboBox(parent), PrefWidget()
+{
+}
+
+PrefFontBox::~PrefFontBox()
+{
+}
+
+void PrefFontBox::restorePreferences()
+{
+  if ( getWindowParameter().isNull() )
+  {
+    Console().Warning("Cannot restore!\n");
+    return;
+  }
+
+  QFont currFont = currentFont();                         //QFont from selector widget
+  QString currName = currFont.family();
+  
+  std::string prefName = getWindowParameter()->GetASCII(entryName(), currName.toUtf8());  //font name from cfg file
+
+  currFont.setFamily(QString::fromStdString(prefName));
+  setCurrentFont(currFont);                               //set selector widget to name from cfg file
+}
+
+void PrefFontBox::savePreferences()
+{
+  if (getWindowParameter().isNull())
+  {
+    Console().Warning("Cannot save!\n");
+    return;
+  }
+
+  QFont currFont = currentFont();
+  QString currName = currFont.family();
+  getWindowParameter()->SetASCII( entryName() , currName.toUtf8() );
+}
+
 #include "moc_PrefWidgets.cpp"
diff --git a/src/Gui/PrefWidgets.h b/src/Gui/PrefWidgets.h
index 1a9870334e..643ef265ba 100644
--- a/src/Gui/PrefWidgets.h
+++ b/src/Gui/PrefWidgets.h
@@ -27,6 +27,8 @@
 #include <QCheckBox>
 #include <QComboBox>
 #include <QRadioButton>
+#include <QFontComboBox>
+#include <QFont>
 #include <Base/Parameter.h>
 #include "Widgets.h"
 #include "Window.h"
@@ -322,6 +324,26 @@ private:
     Q_DECLARE_PRIVATE(PrefQuantitySpinBox)
 };
 
+/** The PrefFontBox class.
+ * \author wandererfan
+ */
+class GuiExport PrefFontBox : public QFontComboBox, public PrefWidget
+{
+  Q_OBJECT
+
+  Q_PROPERTY( QByteArray prefEntry READ entryName     WRITE setEntryName     )
+  Q_PROPERTY( QByteArray prefPath  READ paramGrpPath  WRITE setParamGrpPath  )
+
+public:
+  PrefFontBox ( QWidget * parent = 0 );
+  virtual ~PrefFontBox();
+
+protected:
+  // restore from/save to parameters
+  void restorePreferences();
+  void savePreferences();
+};
+
 } // namespace Gui
 
 #endif // GUI_PREFWIDGETS_H
diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw.ui
index 05e5384605..b38b000983 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw.ui
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw.ui
@@ -159,29 +159,6 @@
           </property>
          </widget>
         </item>
-        <item row="5" column="0">
-         <widget class="QLabel" name="lbl_TemplateDot">
-          <property name="text">
-           <string>Template Dot Size</string>
-          </property>
-         </widget>
-        </item>
-        <item row="5" column="1">
-         <widget class="Gui::PrefDoubleSpinBox" name="dsb_TemplateDot">
-          <property name="toolTip">
-           <string>EditableText Dot Size in mm</string>
-          </property>
-          <property name="value">
-           <double>3.000000000000000</double>
-          </property>
-          <property name="prefEntry" stdset="0">
-           <cstring>TemplateDotSize</cstring>
-          </property>
-          <property name="prefPath" stdset="0">
-           <cstring>/Mod/TechDraw/General</cstring>
-          </property>
-         </widget>
-        </item>
        </layout>
       </item>
       <item>
@@ -603,7 +580,23 @@
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_4">
       <item>
-       <layout class="QGridLayout" name="gridLayout_2" columnstretch="1,0,0">
+       <layout class="QGridLayout" name="gridLayout_2" rowstretch="0,0,0" columnstretch="0,0,0">
+        <item row="0" column="1">
+         <spacer name="horizontalSpacer_2">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Preferred</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
         <item row="1" column="2">
          <widget class="Gui::PrefDoubleSpinBox" name="dsb_LabelSize">
           <property name="toolTip">
@@ -623,22 +616,6 @@
           </property>
          </widget>
         </item>
-        <item row="0" column="1">
-         <spacer name="horizontalSpacer_2">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Fixed</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
         <item row="0" column="0">
          <widget class="QLabel" name="lbl_LabelFont">
           <property name="text">
@@ -646,19 +623,6 @@
           </property>
          </widget>
         </item>
-        <item row="0" column="2">
-         <widget class="Gui::PrefLineEdit" name="le_LabelFont">
-          <property name="text">
-           <string>osifont</string>
-          </property>
-          <property name="prefEntry" stdset="0">
-           <cstring>LabelFont</cstring>
-          </property>
-          <property name="prefPath" stdset="0">
-           <cstring>Mod/TechDraw/Labels</cstring>
-          </property>
-         </widget>
-        </item>
         <item row="1" column="0">
          <widget class="QLabel" name="label_6">
           <property name="text">
@@ -666,6 +630,73 @@
           </property>
          </widget>
         </item>
+        <item row="0" column="2">
+         <widget class="Gui::PrefFontBox" name="pfb_LabelFont">
+          <property name="toolTip">
+           <string>Font for View Labels</string>
+          </property>
+          <property name="currentFont">
+           <font>
+            <family>osifont</family>
+           </font>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>LabelFont</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>/Mod/TechDraw/Labels</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="0">
+         <widget class="QLabel" name="lbl_TemplateDot">
+          <property name="text">
+           <string>Template Dot Size</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="2">
+         <widget class="Gui::PrefDoubleSpinBox" name="dsb_TemplateDot">
+          <property name="toolTip">
+           <string>EditableText Dot Size in mm</string>
+          </property>
+          <property name="value">
+           <double>3.000000000000000</double>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>TemplateDotSize</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>/Mod/TechDraw/General</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <spacer name="horizontalSpacer_6">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item row="2" column="1">
+         <spacer name="horizontalSpacer_7">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
        </layout>
       </item>
       <item>
@@ -740,6 +771,11 @@
    <extends>QDoubleSpinBox</extends>
    <header>Gui/PrefWidgets.h</header>
   </customwidget>
+  <customwidget>
+   <class>Gui::PrefFontBox</class>
+   <extends>QFontComboBox</extends>
+   <header>Gui/PrefWidgets.h</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawImp.cpp b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawImp.cpp
index d5e57fa7d2..1c53fc7237 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawImp.cpp
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawImp.cpp
@@ -58,7 +58,7 @@ void DlgPrefsTechDrawImp::saveSettings()
     pcb_Background->onSave();
     pcb_Hatch->onSave();
 
-    le_LabelFont->onSave();
+    pfb_LabelFont->onSave();
     dsb_LabelSize->onSave();
 
     pfc_DefTemp->onSave();
@@ -85,7 +85,7 @@ void DlgPrefsTechDrawImp::loadSettings()
     pcb_Background->onRestore();
     pcb_Hatch->onRestore();
 
-    le_LabelFont->onRestore();
+    pfb_LabelFont->onRestore();
     dsb_LabelSize->onRestore();
 
     pfc_DefTemp->onRestore();
diff --git a/src/Tools/plugins/widget/customwidgets.cpp b/src/Tools/plugins/widget/customwidgets.cpp
index 51f70a6dfa..b1840c3793 100644
--- a/src/Tools/plugins/widget/customwidgets.cpp
+++ b/src/Tools/plugins/widget/customwidgets.cpp
@@ -1224,3 +1224,35 @@ void PrefSlider::setParamGrpPath ( const QByteArray& name )
 {
     m_sPrefGrp = name;
 }
+
+// --------------------------------------------------------------------
+
+PrefFontBox::PrefFontBox ( QWidget * parent )
+  : QFontComboBox(parent)
+{
+}
+
+PrefFontBox::~PrefFontBox()
+{
+}
+
+QByteArray PrefFontBox::entryName () const
+{
+    return m_sPrefName;
+}
+
+QByteArray PrefFontBox::paramGrpPath () const
+{
+    return m_sPrefGrp;
+}
+
+void PrefFontBox::setEntryName ( const QByteArray& name )
+{
+    m_sPrefName = name;
+}
+
+void PrefFontBox::setParamGrpPath ( const QByteArray& name )
+{
+    m_sPrefGrp = name;
+}
+
diff --git a/src/Tools/plugins/widget/customwidgets.h b/src/Tools/plugins/widget/customwidgets.h
index cdb697aab2..361418eb87 100644
--- a/src/Tools/plugins/widget/customwidgets.h
+++ b/src/Tools/plugins/widget/customwidgets.h
@@ -38,6 +38,7 @@
 #include <QGroupBox>
 #include <QGridLayout>
 #include <QTreeWidget>
+#include <QFontComboBox>
 
 namespace Base {
     class Quantity{};
@@ -581,6 +582,28 @@ private:
     QByteArray m_sPrefGrp;
 };
 
+// ------------------------------------------------------------------------------
+
+class PrefFontBox : public QFontComboBox
+{
+    Q_OBJECT
+
+    Q_PROPERTY( QByteArray prefEntry READ entryName     WRITE setEntryName     )
+    Q_PROPERTY( QByteArray prefPath  READ paramGrpPath  WRITE setParamGrpPath  )
+
+public:
+    PrefFontBox ( QWidget * parent = 0 );
+    virtual ~PrefFontBox();
+
+    QByteArray entryName    () const;
+    QByteArray paramGrpPath () const;
+    void  setEntryName     ( const QByteArray& name );
+    void  setParamGrpPath  ( const QByteArray& name );
+
+private:
+    QByteArray m_sPrefName;
+    QByteArray m_sPrefGrp;
+};
 } // namespace Gui
 
 #endif // GUI_CUSTOMWIDGETS_H
diff --git a/src/Tools/plugins/widget/plugin.cpp b/src/Tools/plugins/widget/plugin.cpp
index 9ac5134681..450493fa6c 100644
--- a/src/Tools/plugins/widget/plugin.cpp
+++ b/src/Tools/plugins/widget/plugin.cpp
@@ -1372,6 +1372,87 @@ public:
     }
 };
 
+
+/* XPM */
+static const char *fontbox_pixmap[]={
+"22 22 6 1",
+"a c #000000",
+"# c #000080",
+"b c #008080",
+"c c #808080",
+"d c #c0c0c0",
+". c #ffffff",
+"...#aaaaaaaaaaaaaa#...",
+".baccccccccccccccccab.",
+".acccddddddddddddddca.",
+"#ccd.................a",
+"acc..................a",
+"acd..................a",
+"acd..................a",
+"acd. ................a",
+"acd..................a",
+"acd..................a",
+"acd..................a",
+"acd..................a",
+"acd..................a",
+"acd..................a",
+"acd..................a",
+"acd..................a",
+"acd..................a",
+"acd..................a",
+"#cd..................#",
+".ac................da.",
+".badd............dda#.",
+"...#aaaaaaaaaaaaaa#..."};
+
+class PrefFontBoxPlugin : public QDesignerCustomWidgetInterface
+{
+    Q_INTERFACES(QDesignerCustomWidgetInterface)
+public:
+    PrefFontBoxPlugin()
+    {
+    }
+    QWidget *createWidget(QWidget *parent)
+    {
+        return new Gui::PrefFontBox(parent);
+    }
+    QString group() const
+    {
+        return QLatin1String("Preference Widgets");
+    }
+    QIcon icon() const
+    {
+        return QIcon( QPixmap( fontbox_pixmap ) );
+    }
+    QString includeFile() const
+    {
+        return QLatin1String("Gui/PrefWidgets.h");
+    }
+    QString toolTip() const
+    {
+        return QLatin1String("Font Box");
+    }
+    QString whatsThis() const
+    {
+        return QLatin1String("Font box widget (spin button).");
+    }
+    bool isContainer() const
+    {
+        return false;
+    }
+    QString domXml() const
+    {
+        return "<ui language=\"c++\">\n"
+               " <widget class=\"Gui::PrefFontBox\" name=\"fontBox\">\n"
+               " </widget>\n"
+               "</ui>";
+    }
+    QString name() const
+    {
+        return QLatin1String("Gui::PrefFontBox");
+    }
+};
+
 /* XPM */
 /*
 static char *listbox_pixmap[]={
@@ -1432,6 +1513,7 @@ QList<QDesignerCustomWidgetInterface *> CustomWidgetPlugin::customWidgets () con
     cw.append(new PrefComboBoxPlugin);
     cw.append(new PrefLineEditPlugin);
     cw.append(new PrefDoubleSpinBoxPlugin);
+    cw.append(new PrefFontBoxPlugin);
     return cw;
 }