diff --git a/src/Tools/plugins/widget/plugin.cpp b/src/Tools/plugins/widget/plugin.cpp
index cce6a5da4c..fde9909747 100644
--- a/src/Tools/plugins/widget/plugin.cpp
+++ b/src/Tools/plugins/widget/plugin.cpp
@@ -1423,35 +1423,37 @@ public:
 
 /* XPM */
 static const char *fontbox_pixmap[]={
-"22 22 6 1",
+"22 22 8 1",
 "a c #000000",
 "# c #000080",
-"b c #008080",
-"c c #808080",
-"d c #c0c0c0",
+"e c #008080",
+"f c #800000",
+"b c #808080",
+"c c #c0c0c0",
+"d c #ff0000",
 ". 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#..."};
+".#aaaaaaaaaaaaaaaaaa#.",
+"#bbccccccccccccccccdd#",
+"accee#########e.addfaa",
+"#c..............a.fa.#",
+"e#aaaaaaaaaaaaaaaaaa#e",
+"....#c...............#",
+"....ac...............a",
+"....ac.ccbbbbbbbbeb..a",
+"....ac.bbbeeeeeee##c.a",
+"....ac.bee########ac.a",
+"....ac..cccccccccccc.a",
+"....ac.ccccccccccbec.a",
+"....ac.cccccccccbbec.a",
+"....ac.bcbbbbbbbbbec.a",
+"....ac..cccccccccccc.a",
+"....ac.cbbeeeeeee#bc.a",
+"....ac.bee########ac.a",
+"....ab.b##aaaaaaaaacca",
+"....#bc.ccccccccccccc#",
+".....ab............ca.",
+".....eacc.........ca#.",
+".......#aaaaaaaaaa#..."};
 
 class PrefFontBoxPlugin : public QDesignerCustomWidgetInterface
 {
diff --git a/src/Tools/plugins/widget/plugin.h b/src/Tools/plugins/widget/plugin.h
index d59cda0b96..32abaaac22 100644
--- a/src/Tools/plugins/widget/plugin.h
+++ b/src/Tools/plugins/widget/plugin.h
@@ -21,11 +21,8 @@
  ***************************************************************************/
 
 
-#include <QtDesigner/QDesignerContainerExtension>
-#include <QtDesigner/QDesignerCustomWidgetCollectionInterface>
-
-#include <QtCore/qplugin.h>
-#include <QtGui/QIcon>
+#include <QtDesigner>
+#include <qplugin.h>
 
 class QDesignerFormEditorInterface;
 
@@ -33,6 +30,9 @@ class CustomWidgetPlugin : public QObject, public QDesignerCustomWidgetCollectio
 {
     Q_OBJECT
     Q_INTERFACES(QDesignerCustomWidgetCollectionInterface)
+#if QT_VERSION >= 0x050000
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetCollectionInterface")
+#endif // QT_VERSION >= 0x050000
 public:
     CustomWidgetPlugin(QObject *parent = 0);
     QList<QDesignerCustomWidgetInterface *> customWidgets () const;
diff --git a/src/Tools/plugins/widget/plugin.pro b/src/Tools/plugins/widget/plugin.pro
index f9e1b4e3d5..4e11ebe1f5 100644
--- a/src/Tools/plugins/widget/plugin.pro
+++ b/src/Tools/plugins/widget/plugin.pro
@@ -6,7 +6,7 @@ greaterThan(QT_MAJOR_VERSION, 4) {
 } else {
   CONFIG += designer
 }
-TARGET = FreeCAD_widgets
+TARGET = $$qtLibraryTarget(FreeCAD_widgets)
 DEPENDPATH += .
 INCLUDEPATH += .