diff --git a/src/Gui/CommandStructure.cpp b/src/Gui/CommandStructure.cpp
index 7b0416eb19..d54428d218 100644
--- a/src/Gui/CommandStructure.cpp
+++ b/src/Gui/CommandStructure.cpp
@@ -53,7 +53,7 @@ StdCmdPart::StdCmdPart()
     sToolTipText  = QT_TR_NOOP("Create a new part and make it active");
     sWhatsThis    = "Std_Part";
     sStatusTip    = sToolTipText;
-    sPixmap       = "Geofeaturegroup.svg";
+    sPixmap       = "Geofeaturegroup";
 }
 
 void StdCmdPart::activated(int iMsg)
@@ -93,7 +93,7 @@ StdCmdGroup::StdCmdGroup()
     sToolTipText  = QT_TR_NOOP("Create a new group for ordering objects");
     sWhatsThis    = "Std_Group";
     sStatusTip    = sToolTipText;
-    sPixmap       = "Group.svg";
+    sPixmap       = "Group";
 }
 
 void StdCmdGroup::activated(int iMsg)
diff --git a/src/Mod/Fem/Gui/Command.cpp b/src/Mod/Fem/Gui/Command.cpp
index 54ba1230de..e30801eba0 100644
--- a/src/Mod/Fem/Gui/Command.cpp
+++ b/src/Mod/Fem/Gui/Command.cpp
@@ -1495,10 +1495,10 @@ Gui::Action * CmdFemPostFunctions::createAction(void)
     applyCommandData(this->className(), pcAction);
 
     QAction* cmd0 = pcAction->addAction(QString());
-    cmd0->setIcon(Gui::BitmapFactory().pixmap("fem-post-geo-plane"));
+    cmd0->setIcon(Gui::BitmapFactory().iconFromTheme("fem-post-geo-plane"));
 
     QAction* cmd1 = pcAction->addAction(QString());
-    cmd1->setIcon(Gui::BitmapFactory().pixmap("fem-post-geo-sphere"));
+    cmd1->setIcon(Gui::BitmapFactory().iconFromTheme("fem-post-geo-sphere"));
 
     _pcAction = pcAction;
     languageChange();
diff --git a/src/Mod/Image/ImageTools/_CommandImageScaling.py b/src/Mod/Image/ImageTools/_CommandImageScaling.py
index 40964ec844..9d28c9e078 100644
--- a/src/Mod/Image/ImageTools/_CommandImageScaling.py
+++ b/src/Mod/Image/ImageTools/_CommandImageScaling.py
@@ -59,7 +59,7 @@ if FreeCAD.GuiUp:
 class _CommandImageScaling:
     "Command to Scale an Image to an Image Plane"
     def GetResources(self):
-        return {'Pixmap': ":/icons/image-scale.svg",
+        return {'Pixmap': "image-scale",
                 'MenuText': QtCore.QT_TRANSLATE_NOOP("Image_Scaling", "Scale image plane"),
                 'Accel': "",
                 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Image_Scaling", "Scales an image plane by defining a distance between two points")}
diff --git a/src/Mod/Part/AttachmentEditor/Commands.py b/src/Mod/Part/AttachmentEditor/Commands.py
index cd3da81ab2..3e7bd63661 100644
--- a/src/Mod/Part/AttachmentEditor/Commands.py
+++ b/src/Mod/Part/AttachmentEditor/Commands.py
@@ -76,7 +76,7 @@ def editAttachment(feature = None,
 class CommandEditAttachment:
     'Command to edit attachment'
     def GetResources(self):
-        return {'Pixmap': ':/icons/Part_Attachment.svg',
+        return {'Pixmap': 'Part_Attachment',
                 'MenuText': QT_TRANSLATE_NOOP("AttachmentEditor","Attachment..."),
                 'Accel': "",
                 'ToolTip': QT_TRANSLATE_NOOP("AttachmentEditor","Edit attachment of selected object.")}
diff --git a/src/Mod/Part/Gui/Command.cpp b/src/Mod/Part/Gui/Command.cpp
index 6b84f8559d..de8f4e4fc4 100644
--- a/src/Mod/Part/Gui/Command.cpp
+++ b/src/Mod/Part/Gui/Command.cpp
@@ -586,11 +586,11 @@ Gui::Action * CmdPartCompJoinFeatures::createAction(void)
     applyCommandData(this->className(), pcAction);
 
     QAction* cmd0 = pcAction->addAction(QString());
-    cmd0->setIcon(Gui::BitmapFactory().pixmap("Part_JoinConnect"));
+    cmd0->setIcon(Gui::BitmapFactory().iconFromTheme("Part_JoinConnect"));
     QAction* cmd1 = pcAction->addAction(QString());
-    cmd1->setIcon(Gui::BitmapFactory().pixmap("Part_JoinEmbed"));
+    cmd1->setIcon(Gui::BitmapFactory().iconFromTheme("Part_JoinEmbed"));
     QAction* cmd2 = pcAction->addAction(QString());
-    cmd2->setIcon(Gui::BitmapFactory().pixmap("Part_JoinCutout"));
+    cmd2->setIcon(Gui::BitmapFactory().iconFromTheme("Part_JoinCutout"));
 
     _pcAction = pcAction;
     languageChange();
@@ -694,13 +694,13 @@ Gui::Action * CmdPartCompSplitFeatures::createAction(void)
     applyCommandData(this->className(), pcAction);
 
     QAction* cmd0 = pcAction->addAction(QString());
-    cmd0->setIcon(Gui::BitmapFactory().pixmap("Part_BooleanFragments"));
+    cmd0->setIcon(Gui::BitmapFactory().iconFromTheme("Part_BooleanFragments"));
     QAction* cmd1 = pcAction->addAction(QString());
-    cmd1->setIcon(Gui::BitmapFactory().pixmap("Part_SliceApart"));
+    cmd1->setIcon(Gui::BitmapFactory().iconFromTheme("Part_SliceApart"));
     QAction* cmd2 = pcAction->addAction(QString());
-    cmd2->setIcon(Gui::BitmapFactory().pixmap("Part_Slice"));
+    cmd2->setIcon(Gui::BitmapFactory().iconFromTheme("Part_Slice"));
     QAction* cmd3 = pcAction->addAction(QString());
-    cmd3->setIcon(Gui::BitmapFactory().pixmap("Part_XOR"));
+    cmd3->setIcon(Gui::BitmapFactory().iconFromTheme("Part_XOR"));
 
     _pcAction = pcAction;
     languageChange();
@@ -814,11 +814,11 @@ Gui::Action * CmdPartCompCompoundTools::createAction(void)
     applyCommandData(this->className(), pcAction);
 
     QAction* cmd0 = pcAction->addAction(QString());
-    cmd0->setIcon(Gui::BitmapFactory().pixmap("Part_Compound"));
+    cmd0->setIcon(Gui::BitmapFactory().iconFromTheme("Part_Compound"));
     QAction* cmd1 = pcAction->addAction(QString());
-    cmd1->setIcon(Gui::BitmapFactory().pixmap("Part_ExplodeCompound"));
+    cmd1->setIcon(Gui::BitmapFactory().iconFromTheme("Part_ExplodeCompound"));
     QAction* cmd2 = pcAction->addAction(QString());
-    cmd2->setIcon(Gui::BitmapFactory().pixmap("Part_CompoundFilter"));
+    cmd2->setIcon(Gui::BitmapFactory().iconFromTheme("Part_CompoundFilter"));
 
     _pcAction = pcAction;
     languageChange();
@@ -1049,7 +1049,7 @@ CmdPartExport::CmdPartExport()
     sToolTipText  = QT_TR_NOOP("Exports to a CAD file");
     sWhatsThis    = "Part_Export";
     sStatusTip    = sToolTipText;
-    sPixmap       = "Part_Export.svg";
+    sPixmap       = "Part_Export";
 }
 
 void CmdPartExport::activated(int iMsg)
@@ -1469,7 +1469,7 @@ CmdPartMirror::CmdPartMirror()
     sToolTipText  = QT_TR_NOOP("Mirroring a selected shape");
     sWhatsThis    = "Part_Mirror";
     sStatusTip    = sToolTipText;
-    sPixmap       = "Part_Mirror.svg";
+    sPixmap       = "Part_Mirror";
 }
 
 void CmdPartMirror::activated(int iMsg)
@@ -1750,9 +1750,9 @@ Gui::Action * CmdPartCompOffset::createAction(void)
     applyCommandData(this->className(), pcAction);
 
     QAction* cmd0 = pcAction->addAction(QString());
-    cmd0->setIcon(Gui::BitmapFactory().pixmap("Part_Offset"));
+    cmd0->setIcon(Gui::BitmapFactory().iconFromTheme("Part_Offset"));
     QAction* cmd1 = pcAction->addAction(QString());
-    cmd1->setIcon(Gui::BitmapFactory().pixmap("Part_Offset2D"));
+    cmd1->setIcon(Gui::BitmapFactory().iconFromTheme("Part_Offset2D"));
 
     _pcAction = pcAction;
     languageChange();
diff --git a/src/Mod/Part/Gui/CommandSimple.cpp b/src/Mod/Part/Gui/CommandSimple.cpp
index 37e2c7fb4a..956c96d45d 100644
--- a/src/Mod/Part/Gui/CommandSimple.cpp
+++ b/src/Mod/Part/Gui/CommandSimple.cpp
@@ -110,7 +110,7 @@ CmdPartShapeFromMesh::CmdPartShapeFromMesh()
     sToolTipText  = QT_TR_NOOP("Create shape from selected mesh object");
     sWhatsThis    = "Part_ShapeFromMesh";
     sStatusTip    = sToolTipText;
-    sPixmap       = "Part_Shape_from_Mesh.svg";
+    sPixmap       = "Part_Shape_from_Mesh";
 }
 
 void CmdPartShapeFromMesh::activated(int iMsg)
@@ -174,7 +174,7 @@ CmdPartSimpleCopy::CmdPartSimpleCopy()
     sToolTipText  = QT_TR_NOOP("Create a simple non-parametric copy");
     sWhatsThis    = "Part_SimpleCopy";
     sStatusTip    = sToolTipText;
-    sPixmap       = "Tree_Part.svg";
+    sPixmap       = "Tree_Part";
 }
 
 void CmdPartSimpleCopy::activated(int iMsg)
diff --git a/src/Mod/PartDesign/Gui/CommandPrimitive.cpp b/src/Mod/PartDesign/Gui/CommandPrimitive.cpp
index f47dd660e4..5bcdfafd99 100644
--- a/src/Mod/PartDesign/Gui/CommandPrimitive.cpp
+++ b/src/Mod/PartDesign/Gui/CommandPrimitive.cpp
@@ -136,35 +136,35 @@ Gui::Action * CmdPrimtiveCompAdditive::createAction(void)
     applyCommandData(this->className(), pcAction);
 
     QAction* p1 = pcAction->addAction(QString());
-    p1->setIcon(Gui::BitmapFactory().pixmap("PartDesign_Additive_Box"));
+    p1->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_Additive_Box"));
     p1->setObjectName(QString::fromLatin1("PartDesign_AdditiveBox"));
     p1->setWhatsThis(QString::fromLatin1("PartDesign_AdditiveBox"));
     QAction* p2 = pcAction->addAction(QString());
-    p2->setIcon(Gui::BitmapFactory().pixmap("PartDesign_Additive_Cylinder"));
+    p2->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_Additive_Cylinder"));
     p2->setObjectName(QString::fromLatin1("PartDesign_AdditiveCylinder"));
     p2->setWhatsThis(QString::fromLatin1("PartDesign_AdditiveCylinder"));
     QAction* p3 = pcAction->addAction(QString());
-    p3->setIcon(Gui::BitmapFactory().pixmap("PartDesign_Additive_Sphere"));
+    p3->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_Additive_Sphere"));
     p3->setObjectName(QString::fromLatin1("PartDesign_AdditiveSphere"));
     p3->setWhatsThis(QString::fromLatin1("PartDesign_AdditiveSphere"));
     QAction* p4 = pcAction->addAction(QString());
-    p4->setIcon(Gui::BitmapFactory().pixmap("PartDesign_Additive_Cone"));
+    p4->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_Additive_Cone"));
     p4->setObjectName(QString::fromLatin1("PartDesign_AdditiveCone"));
     p4->setWhatsThis(QString::fromLatin1("PartDesign_AdditiveCone"));
     QAction* p5 = pcAction->addAction(QString());
-    p5->setIcon(Gui::BitmapFactory().pixmap("PartDesign_Additive_Ellipsoid"));
+    p5->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_Additive_Ellipsoid"));
     p5->setObjectName(QString::fromLatin1("PartDesign_AdditiveEllipsoid"));
     p5->setWhatsThis(QString::fromLatin1("PartDesign_AdditiveEllipsoid"));
     QAction* p6 = pcAction->addAction(QString());
-    p6->setIcon(Gui::BitmapFactory().pixmap("PartDesign_Additive_Torus"));
+    p6->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_Additive_Torus"));
     p6->setObjectName(QString::fromLatin1("PartDesign_AdditiveTorus"));
     p6->setWhatsThis(QString::fromLatin1("PartDesign_AdditiveTorus"));
     QAction* p7 = pcAction->addAction(QString());
-    p7->setIcon(Gui::BitmapFactory().pixmap("PartDesign_Additive_Prism"));
+    p7->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_Additive_Prism"));
     p7->setObjectName(QString::fromLatin1("PartDesign_AdditivePrism"));
     p7->setWhatsThis(QString::fromLatin1("PartDesign_AdditivePrism"));
     QAction* p8 = pcAction->addAction(QString());
-    p8->setIcon(Gui::BitmapFactory().pixmap("PartDesign_Additive_Wedge"));
+    p8->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_Additive_Wedge"));
     p8->setObjectName(QString::fromLatin1("PartDesign_AdditiveWedge"));
     p8->setWhatsThis(QString::fromLatin1("PartDesign_AdditiveWedge"));
 
@@ -301,35 +301,35 @@ Gui::Action * CmdPrimtiveCompSubtractive::createAction(void)
     applyCommandData(this->className(), pcAction);
 
     QAction* p1 = pcAction->addAction(QString());
-    p1->setIcon(Gui::BitmapFactory().pixmap("PartDesign_Subtractive_Box"));
+    p1->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_Subtractive_Box"));
     p1->setObjectName(QString::fromLatin1("PartDesign_SubtractiveBox"));
     p1->setWhatsThis(QString::fromLatin1("PartDesign_SubtractiveBox"));
     QAction* p2 = pcAction->addAction(QString());
-    p2->setIcon(Gui::BitmapFactory().pixmap("PartDesign_Subtractive_Cylinder"));
+    p2->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_Subtractive_Cylinder"));
     p2->setObjectName(QString::fromLatin1("PartDesign_SubtractiveCylinder"));
     p2->setWhatsThis(QString::fromLatin1("PartDesign_SubtractiveCylinder"));
     QAction* p3 = pcAction->addAction(QString());
-    p3->setIcon(Gui::BitmapFactory().pixmap("PartDesign_Subtractive_Sphere"));
+    p3->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_Subtractive_Sphere"));
     p3->setObjectName(QString::fromLatin1("PartDesign_SubtractiveSphere"));
     p3->setWhatsThis(QString::fromLatin1("PartDesign_SubtractiveSphere"));
     QAction* p4 = pcAction->addAction(QString());
-    p4->setIcon(Gui::BitmapFactory().pixmap("PartDesign_Subtractive_Cone"));
+    p4->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_Subtractive_Cone"));
     p4->setObjectName(QString::fromLatin1("PartDesign_SubtractiveCone"));
     p4->setWhatsThis(QString::fromLatin1("PartDesign_SubtractiveCone"));
     QAction* p5 = pcAction->addAction(QString());
-    p5->setIcon(Gui::BitmapFactory().pixmap("PartDesign_Subtractive_Ellipsoid"));
+    p5->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_Subtractive_Ellipsoid"));
     p5->setObjectName(QString::fromLatin1("PartDesign_SubtractiveEllipsoid"));
     p5->setWhatsThis(QString::fromLatin1("PartDesign_SubtractiveEllipsoid"));
     QAction* p6 = pcAction->addAction(QString());
-    p6->setIcon(Gui::BitmapFactory().pixmap("PartDesign_Subtractive_Torus"));
+    p6->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_Subtractive_Torus"));
     p6->setObjectName(QString::fromLatin1("PartDesign_SubtractiveTorus"));
     p6->setWhatsThis(QString::fromLatin1("PartDesign_SubtractiveTorus"));
     QAction* p7 = pcAction->addAction(QString());
-    p7->setIcon(Gui::BitmapFactory().pixmap("PartDesign_Subtractive_Prism"));
+    p7->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_Subtractive_Prism"));
     p7->setObjectName(QString::fromLatin1("PartDesign_SubtractivePrism"));
     p7->setWhatsThis(QString::fromLatin1("PartDesign_SubtractivePrism"));
     QAction* p8 = pcAction->addAction(QString());
-    p8->setIcon(Gui::BitmapFactory().pixmap("PartDesign_Subtractive_Wedge"));
+    p8->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_Subtractive_Wedge"));
     p8->setObjectName(QString::fromLatin1("PartDesign_SubtractiveWedge"));
     p8->setWhatsThis(QString::fromLatin1("PartDesign_SubtractiveWedge"));
 
diff --git a/src/Mod/Raytracing/Gui/Command.cpp b/src/Mod/Raytracing/Gui/Command.cpp
index 7a54d45683..d180ed2d05 100644
--- a/src/Mod/Raytracing/Gui/Command.cpp
+++ b/src/Mod/Raytracing/Gui/Command.cpp
@@ -385,7 +385,7 @@ Gui::Action * CmdRaytracingNewPovrayProject::createAction(void)
         for (unsigned int i=0; i<dir.count(); i++ ) {
             QFileInfo fi(dir[i]);
             QAction* a = pcAction->addAction(fi.baseName());
-            a->setIcon(Gui::BitmapFactory().pixmap("Raytrace_New"));
+            a->setIcon(Gui::BitmapFactory().iconFromTheme("Raytrace_New"));
 
             a->setProperty("Template", dir.absoluteFilePath(dir[i]));
         }
@@ -819,7 +819,7 @@ Gui::Action * CmdRaytracingNewLuxProject::createAction(void)
         for (unsigned int i=0; i<dir.count(); i++ ) {
             QFileInfo fi(dir[i]);
             QAction* a = pcAction->addAction(fi.baseName());
-            a->setIcon(Gui::BitmapFactory().pixmap("Raytrace_Lux"));
+            a->setIcon(Gui::BitmapFactory().iconFromTheme("Raytrace_Lux"));
 
             a->setProperty("Template", dir.absoluteFilePath(dir[i]));
         }
diff --git a/src/Mod/Sketcher/Gui/CommandConstraints.cpp b/src/Mod/Sketcher/Gui/CommandConstraints.cpp
index 690ecccc09..bf17a5fc01 100644
--- a/src/Mod/Sketcher/Gui/CommandConstraints.cpp
+++ b/src/Mod/Sketcher/Gui/CommandConstraints.cpp
@@ -1887,11 +1887,11 @@ void CmdSketcherConstrainLock::updateAction(int mode)
     switch (mode) {
     case Reference:
         if (getAction())
-            getAction()->setIcon(Gui::BitmapFactory().pixmap("Sketcher_ConstrainLock_Driven"));
+            getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_ConstrainLock_Driven"));
         break;
     case Driving:
         if (getAction())
-            getAction()->setIcon(Gui::BitmapFactory().pixmap("Sketcher_ConstrainLock"));
+            getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_ConstrainLock"));
         break;
     }
 }
@@ -2769,11 +2769,11 @@ void CmdSketcherConstrainDistance::updateAction(int mode)
     switch (mode) {
     case Reference:
         if (getAction())
-            getAction()->setIcon(Gui::BitmapFactory().pixmap("Constraint_Length_Driven"));
+            getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Constraint_Length_Driven"));
         break;
     case Driving:
         if (getAction())
-            getAction()->setIcon(Gui::BitmapFactory().pixmap("Constraint_Length"));
+            getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Constraint_Length"));
         break;
     }
 }
@@ -3245,11 +3245,11 @@ void CmdSketcherConstrainDistanceX::updateAction(int mode)
     switch (mode) {
     case Reference:
         if (getAction())
-            getAction()->setIcon(Gui::BitmapFactory().pixmap("Constraint_HorizontalDistance_Driven"));
+            getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Constraint_HorizontalDistance_Driven"));
         break;
     case Driving:
         if (getAction())
-            getAction()->setIcon(Gui::BitmapFactory().pixmap("Constraint_HorizontalDistance"));
+            getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Constraint_HorizontalDistance"));
         break;
     }
 }
@@ -3492,11 +3492,11 @@ void CmdSketcherConstrainDistanceY::updateAction(int mode)
     switch (mode) {
     case Reference:
         if (getAction())
-            getAction()->setIcon(Gui::BitmapFactory().pixmap("Constraint_VerticalDistance_Driven"));
+            getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Constraint_VerticalDistance_Driven"));
         break;
     case Driving:
         if (getAction())
-            getAction()->setIcon(Gui::BitmapFactory().pixmap("Constraint_VerticalDistance"));
+            getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Constraint_VerticalDistance"));
         break;
     }
 }
@@ -5451,11 +5451,11 @@ void CmdSketcherConstrainRadius::updateAction(int mode)
     switch (mode) {
     case Reference:
         if (getAction())
-            getAction()->setIcon(Gui::BitmapFactory().pixmap("Constraint_Radius_Driven"));
+            getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Constraint_Radius_Driven"));
         break;
     case Driving:
         if (getAction())
-            getAction()->setIcon(Gui::BitmapFactory().pixmap("Constraint_Radius"));
+            getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Constraint_Radius"));
         break;
     }
 }
@@ -5922,11 +5922,11 @@ void CmdSketcherConstrainDiameter::updateAction(int mode)
     switch (mode) {
         case Reference:
             if (getAction())
-                getAction()->setIcon(Gui::BitmapFactory().pixmap("Constraint_Diameter_Driven"));
+                getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Constraint_Diameter_Driven"));
             break;
         case Driving:
             if (getAction())
-                getAction()->setIcon(Gui::BitmapFactory().pixmap("Constraint_Diameter"));
+                getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Constraint_Diameter"));
             break;
     }
 }
@@ -5976,9 +5976,9 @@ Gui::Action * CmdSketcherCompConstrainRadDia::createAction(void)
     applyCommandData(this->className(), pcAction);
 
     QAction* arc1 = pcAction->addAction(QString());
-    arc1->setIcon(Gui::BitmapFactory().pixmap("Constraint_Radius"));
+    arc1->setIcon(Gui::BitmapFactory().iconFromTheme("Constraint_Radius"));
     QAction* arc2 = pcAction->addAction(QString());
-    arc2->setIcon(Gui::BitmapFactory().pixmap("Constraint_Diameter"));
+    arc2->setIcon(Gui::BitmapFactory().iconFromTheme("Constraint_Diameter"));
 
     _pcAction = pcAction;
     languageChange();
@@ -6002,13 +6002,13 @@ void CmdSketcherCompConstrainRadDia::updateAction(int mode)
     int index = pcAction->property("defaultAction").toInt();
     switch (mode) {
         case Reference:
-            a[0]->setIcon(Gui::BitmapFactory().pixmap("Constraint_Radius_Driven"));
-            a[1]->setIcon(Gui::BitmapFactory().pixmap("Constraint_Diameter_Driven"));
+            a[0]->setIcon(Gui::BitmapFactory().iconFromTheme("Constraint_Radius_Driven"));
+            a[1]->setIcon(Gui::BitmapFactory().iconFromTheme("Constraint_Diameter_Driven"));
             getAction()->setIcon(a[index]->icon());
             break;
         case Driving:
-            a[0]->setIcon(Gui::BitmapFactory().pixmap("Constraint_Radius"));
-            a[1]->setIcon(Gui::BitmapFactory().pixmap("Constraint_Diameter"));
+            a[0]->setIcon(Gui::BitmapFactory().iconFromTheme("Constraint_Radius"));
+            a[1]->setIcon(Gui::BitmapFactory().iconFromTheme("Constraint_Diameter"));
             getAction()->setIcon(a[index]->icon());
             break;
     }
@@ -6543,11 +6543,11 @@ void CmdSketcherConstrainAngle::updateAction(int mode)
     switch (mode) {
     case Reference:
         if (getAction())
-            getAction()->setIcon(Gui::BitmapFactory().pixmap("Constraint_InternalAngle_Driven"));
+            getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Constraint_InternalAngle_Driven"));
         break;
     case Driving:
         if (getAction())
-            getAction()->setIcon(Gui::BitmapFactory().pixmap("Constraint_InternalAngle"));
+            getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Constraint_InternalAngle"));
         break;
     }
 }
diff --git a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp
index 71348bd7f3..814b6cb75e 100644
--- a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp
+++ b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp
@@ -436,11 +436,11 @@ void CmdSketcherCreateLine::updateAction(int mode)
     switch (mode) {
     case Normal:
         if (getAction())
-            getAction()->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateLine"));
+            getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateLine"));
         break;
     case Construction:
         if (getAction())
-            getAction()->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateLine_Constr"));
+            getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateLine_Constr"));
         break;
     }
 }
@@ -675,11 +675,11 @@ void CmdSketcherCreateRectangle::updateAction(int mode)
     switch (mode) {
     case Normal:
         if (getAction())
-            getAction()->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateRectangle"));
+            getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateRectangle"));
         break;
     case Construction:
         if (getAction())
-            getAction()->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateRectangle_Constr"));
+            getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateRectangle_Constr"));
         break;
     }
 }
@@ -1408,11 +1408,11 @@ void CmdSketcherCreatePolyline::updateAction(int mode)
     switch (mode) {
     case Normal:
         if (getAction())
-            getAction()->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreatePolyline"));
+            getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreatePolyline"));
         break;
     case Construction:
         if (getAction())
-            getAction()->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreatePolyline_Constr"));
+            getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreatePolyline_Constr"));
         break;
     }
 }
@@ -2046,9 +2046,9 @@ Gui::Action * CmdSketcherCompCreateArc::createAction(void)
     applyCommandData(this->className(), pcAction);
 
     QAction* arc1 = pcAction->addAction(QString());
-    arc1->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateArc"));
+    arc1->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateArc"));
     QAction* arc2 = pcAction->addAction(QString());
-    arc2->setIcon(Gui::BitmapFactory().pixmap("Sketcher_Create3PointArc"));
+    arc2->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_Create3PointArc"));
 
     _pcAction = pcAction;
     languageChange();
@@ -2070,13 +2070,13 @@ void CmdSketcherCompCreateArc::updateAction(int mode)
     int index = pcAction->property("defaultAction").toInt();
     switch (mode) {
     case Normal:
-        a[0]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateArc"));
-        a[1]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_Create3PointArc"));
+        a[0]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateArc"));
+        a[1]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_Create3PointArc"));
         getAction()->setIcon(a[index]->icon());
         break;
     case Construction:
-        a[0]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateArc_Constr"));
-        a[1]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_Create3PointArc_Constr"));
+        a[0]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateArc_Constr"));
+        a[1]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_Create3PointArc_Constr"));
         getAction()->setIcon(a[index]->icon());
         break;
     }
@@ -4338,25 +4338,25 @@ Gui::Action * CmdSketcherCompCreateConic::createAction(void)
     applyCommandData(this->className(), pcAction);
 
     QAction* ellipseByCenter = pcAction->addAction(QString());
-    ellipseByCenter->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateEllipse"));
+    ellipseByCenter->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateEllipse"));
      /// @todo replace with correct icon
     QAction* ellipseBy3Points = pcAction->addAction(QString());
-    ellipseBy3Points->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateEllipse_3points"));
+    ellipseBy3Points->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateEllipse_3points"));
 
     QAction* arcofellipse = pcAction->addAction(QString());
-    arcofellipse->setIcon(Gui::BitmapFactory().pixmap("Sketcher_Elliptical_Arc"));
+    arcofellipse->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_Elliptical_Arc"));
 
     QAction* arcofhyperbola = pcAction->addAction(QString());
-    arcofhyperbola->setIcon(Gui::BitmapFactory().pixmap("Sketcher_Hyperbolic_Arc"));
+    arcofhyperbola->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_Hyperbolic_Arc"));
 
     QAction* arcofparabola = pcAction->addAction(QString());
-    arcofparabola->setIcon(Gui::BitmapFactory().pixmap("Sketcher_Parabolic_Arc"));
+    arcofparabola->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_Parabolic_Arc"));
 
     _pcAction = pcAction;
     languageChange();
 
     // set ellipse by center, a, b as default method
-    pcAction->setIcon(Gui::BitmapFactory().pixmap("Sketcher_Conics"));
+    pcAction->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_Conics"));
     int defaultId = 0;
     pcAction->setProperty("defaultAction", QVariant(defaultId));
 
@@ -4373,19 +4373,19 @@ void CmdSketcherCompCreateConic::updateAction(int mode)
     int index = pcAction->property("defaultAction").toInt();
     switch (mode) {
     case Normal:
-        a[0]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateEllipse"));
-        a[1]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateEllipse_3points"));
-        a[2]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_Elliptical_Arc"));
-        a[3]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_Hyperbolic_Arc"));
-        a[4]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_Parabolic_Arc"));
+        a[0]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateEllipse"));
+        a[1]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateEllipse_3points"));
+        a[2]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_Elliptical_Arc"));
+        a[3]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_Hyperbolic_Arc"));
+        a[4]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_Parabolic_Arc"));
         getAction()->setIcon(a[index]->icon());
         break;
     case Construction:
-        a[0]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateEllipse_Constr"));
-        a[1]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateEllipse_3points_Constr"));
-        a[2]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_Elliptical_Arc_Constr"));
-        a[3]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_Hyperbolic_Arc_Constr"));
-        a[4]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_Parabolic_Arc_Constr"));
+        a[0]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateEllipse_Constr"));
+        a[1]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateEllipse_3points_Constr"));
+        a[2]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_Elliptical_Arc_Constr"));
+        a[3]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_Hyperbolic_Arc_Constr"));
+        a[4]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_Parabolic_Arc_Constr"));
         getAction()->setIcon(a[index]->icon());
         break;
     }
@@ -4889,11 +4889,11 @@ void CmdSketcherCreateBSpline::activated(int iMsg)
     switch (mode) {
     case Normal:
         if (getAction())
-            getAction()->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateBSpline"));
+            getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateBSpline"));
         break;
     case Construction:
         if (getAction())
-            getAction()->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateBSpline_Constr"));
+            getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateBSpline_Constr"));
         break;
     }
 }*/
@@ -4982,16 +4982,16 @@ Gui::Action * CmdSketcherCompCreateBSpline::createAction(void)
     applyCommandData(this->className(), pcAction);
 
     QAction* bspline = pcAction->addAction(QString());
-    bspline->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateBSpline"));
+    bspline->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateBSpline"));
 
     QAction* periodicbspline = pcAction->addAction(QString());
-    periodicbspline->setIcon(Gui::BitmapFactory().pixmap("Sketcher_Create_Periodic_BSpline"));
+    periodicbspline->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_Create_Periodic_BSpline"));
 
     _pcAction = pcAction;
     languageChange();
 
     // default
-    pcAction->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateBSpline"));
+    pcAction->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateBSpline"));
     int defaultId = 0;
     pcAction->setProperty("defaultAction", QVariant(defaultId));
 
@@ -5008,13 +5008,13 @@ void CmdSketcherCompCreateBSpline::updateAction(int mode)
     int index = pcAction->property("defaultAction").toInt();
     switch (mode) {
         case Normal:
-            a[0]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateBSpline"));
-            a[1]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_Create_Periodic_BSpline"));
+            a[0]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateBSpline"));
+            a[1]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_Create_Periodic_BSpline"));
             getAction()->setIcon(a[index]->icon());
             break;
         case Construction:
-            a[0]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateBSpline_Constr"));
-            a[1]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_Create_Periodic_BSpline_Constr"));
+            a[0]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateBSpline_Constr"));
+            a[1]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_Create_Periodic_BSpline_Constr"));
             getAction()->setIcon(a[index]->icon());
             break;
     }
@@ -5337,9 +5337,9 @@ Gui::Action * CmdSketcherCompCreateCircle::createAction(void)
     applyCommandData(this->className(), pcAction);
 
     QAction* arc1 = pcAction->addAction(QString());
-    arc1->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateCircle"));
+    arc1->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateCircle"));
     QAction* arc2 = pcAction->addAction(QString());
-    arc2->setIcon(Gui::BitmapFactory().pixmap("Sketcher_Create3PointCircle"));
+    arc2->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_Create3PointCircle"));
 
     _pcAction = pcAction;
     languageChange();
@@ -5361,13 +5361,13 @@ void CmdSketcherCompCreateCircle::updateAction(int mode)
     int index = pcAction->property("defaultAction").toInt();
     switch (mode) {
     case Normal:
-        a[0]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateCircle"));
-        a[1]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_Create3PointCircle"));
+        a[0]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateCircle"));
+        a[1]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_Create3PointCircle"));
         getAction()->setIcon(a[index]->icon());
         break;
     case Construction:
-        a[0]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateCircle_Constr"));
-        a[1]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_Create3PointCircle_Constr"));
+        a[0]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateCircle_Constr"));
+        a[1]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_Create3PointCircle_Constr"));
         getAction()->setIcon(a[index]->icon());
         break;
     }
@@ -6889,11 +6889,11 @@ static const char *cursor_carboncopy[]={
         switch (mode) {
             case Normal:
                 if (getAction())
-                    getAction()->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CarbonCopy"));
+                    getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CarbonCopy"));
                 break;
             case Construction:
                 if (getAction())
-                    getAction()->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CarbonCopy_Constr"));
+                    getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CarbonCopy_Constr"));
                 break;
         }
     }
@@ -7164,11 +7164,11 @@ void CmdSketcherCreateSlot::updateAction(int mode)
     switch (mode) {
     case Normal:
         if (getAction())
-            getAction()->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateSlot"));
+            getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateSlot"));
         break;
     case Construction:
         if (getAction())
-            getAction()->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateSlot_Constr"));
+            getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateSlot_Constr"));
         break;
     }
 }
@@ -7614,19 +7614,19 @@ Gui::Action * CmdSketcherCompCreateRegularPolygon::createAction(void)
     applyCommandData(this->className(), pcAction);
 
     QAction* triangle = pcAction->addAction(QString());
-    triangle->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateTriangle"));
+    triangle->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateTriangle"));
     QAction* square = pcAction->addAction(QString());
-    square->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateSquare"));
+    square->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateSquare"));
     QAction* pentagon = pcAction->addAction(QString());
-    pentagon->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreatePentagon"));
+    pentagon->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreatePentagon"));
     QAction* hexagon = pcAction->addAction(QString());
-    hexagon->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateHexagon"));
+    hexagon->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateHexagon"));
     QAction* heptagon = pcAction->addAction(QString());
-    heptagon->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateHeptagon"));
+    heptagon->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateHeptagon"));
     QAction* octagon = pcAction->addAction(QString());
-    octagon->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateOctagon"));
+    octagon->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateOctagon"));
     QAction* regular = pcAction->addAction(QString());
-    regular->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateRegularPolygon"));
+    regular->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateRegularPolygon"));
 
     _pcAction = pcAction;
     languageChange();
@@ -7648,23 +7648,23 @@ void CmdSketcherCompCreateRegularPolygon::updateAction(int mode)
     int index = pcAction->property("defaultAction").toInt();
     switch (mode) {
     case Normal:
-        a[0]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateTriangle"));
-        a[1]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateSquare"));
-        a[2]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreatePentagon"));
-        a[3]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateHexagon"));
-        a[4]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateHeptagon"));
-        a[5]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateOctagon"));
-        a[6]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateRegularPolygon"));
+        a[0]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateTriangle"));
+        a[1]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateSquare"));
+        a[2]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreatePentagon"));
+        a[3]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateHexagon"));
+        a[4]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateHeptagon"));
+        a[5]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateOctagon"));
+        a[6]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateRegularPolygon"));
         getAction()->setIcon(a[index]->icon());
         break;
     case Construction:
-        a[0]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateTriangle_Constr"));
-        a[1]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateSquare_Constr"));
-        a[2]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreatePentagon_Constr"));
-        a[3]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateHexagon_Constr"));
-        a[4]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateHeptagon_Constr"));
-        a[5]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateOctagon_Constr"));
-        a[6]->setIcon(Gui::BitmapFactory().pixmap("Sketcher_CreateRegularPolygon_Constr"));
+        a[0]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateTriangle_Constr"));
+        a[1]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateSquare_Constr"));
+        a[2]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreatePentagon_Constr"));
+        a[3]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateHexagon_Constr"));
+        a[4]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateHeptagon_Constr"));
+        a[5]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateOctagon_Constr"));
+        a[6]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateRegularPolygon_Constr"));
         getAction()->setIcon(a[index]->icon());
         break;
     }
diff --git a/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp b/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp
index d2c7d7de76..63ba2bd24e 100644
--- a/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp
+++ b/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp
@@ -284,13 +284,13 @@ Gui::Action * CmdSketcherCompBSplineShowHideGeometryInformation::createAction(vo
     applyCommandData(this->className(), pcAction);
     
     QAction* c1 = pcAction->addAction(QString());
-    c1->setIcon(Gui::BitmapFactory().pixmap("Sketcher_BSplineDegree"));
+    c1->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_BSplineDegree"));
     QAction* c2 = pcAction->addAction(QString());
-    c2->setIcon(Gui::BitmapFactory().pixmap("Sketcher_BSplinePolygon"));
+    c2->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_BSplinePolygon"));
     QAction* c3 = pcAction->addAction(QString());
-    c3->setIcon(Gui::BitmapFactory().pixmap("Sketcher_BSplineComb"));
+    c3->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_BSplineComb"));
     QAction* c4 = pcAction->addAction(QString());
-    c4->setIcon(Gui::BitmapFactory().pixmap("Sketcher_BSplineKnotMultiplicity"));
+    c4->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_BSplineKnotMultiplicity"));
 
     _pcAction = pcAction;
     languageChange();
@@ -856,9 +856,9 @@ Gui::Action * CmdSketcherCompModifyKnotMultiplicity::createAction(void)
     applyCommandData(this->className(), pcAction);
 
     QAction* c1 = pcAction->addAction(QString());
-    c1->setIcon(Gui::BitmapFactory().pixmap("Sketcher_BSplineIncreaseKnotMultiplicity"));
+    c1->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_BSplineIncreaseKnotMultiplicity"));
     QAction* c2 = pcAction->addAction(QString());
-    c2->setIcon(Gui::BitmapFactory().pixmap("Sketcher_BSplineDecreaseKnotMultiplicity"));
+    c2->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_BSplineDecreaseKnotMultiplicity"));
 
     _pcAction = pcAction;
     languageChange();
diff --git a/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp b/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp
index c5682bbebc..bd0129f445 100644
--- a/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp
+++ b/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp
@@ -1595,11 +1595,11 @@ Gui::Action * CmdSketcherCompCopy::createAction(void)
     applyCommandData(this->className(), pcAction);
     
     QAction* clone = pcAction->addAction(QString());
-    clone->setIcon(Gui::BitmapFactory().pixmap("Sketcher_Clone"));
+    clone->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_Clone"));
     QAction* copy = pcAction->addAction(QString());
-    copy->setIcon(Gui::BitmapFactory().pixmap("Sketcher_Copy"));
+    copy->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_Copy"));
     QAction* move = pcAction->addAction(QString());
-    move->setIcon(Gui::BitmapFactory().pixmap("Sketcher_Move"));
+    move->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_Move"));
     
     _pcAction = pcAction;
     languageChange();
diff --git a/src/Mod/Sketcher/Gui/TaskSketcherConstrains.cpp b/src/Mod/Sketcher/Gui/TaskSketcherConstrains.cpp
index c0d4183244..7eeeae6c5a 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherConstrains.cpp
+++ b/src/Mod/Sketcher/Gui/TaskSketcherConstrains.cpp
@@ -177,40 +177,40 @@ public:
             return name;
         }
         else if (role == Qt::DecorationRole) {
-            static QIcon hdist( Gui::BitmapFactory().pixmap("Constraint_HorizontalDistance") );
-            static QIcon vdist( Gui::BitmapFactory().pixmap("Constraint_VerticalDistance") );
-            static QIcon horiz( Gui::BitmapFactory().pixmap("Constraint_Horizontal") );
-            static QIcon vert ( Gui::BitmapFactory().pixmap("Constraint_Vertical") );
-          //static QIcon lock ( Gui::BitmapFactory().pixmap("Sketcher_ConstrainLock") );
-            static QIcon block ( Gui::BitmapFactory().pixmap("Sketcher_ConstrainBlock") );
-            static QIcon coinc( Gui::BitmapFactory().pixmap("Constraint_PointOnPoint") );
-            static QIcon para ( Gui::BitmapFactory().pixmap("Constraint_Parallel") );
-            static QIcon perp ( Gui::BitmapFactory().pixmap("Constraint_Perpendicular") );
-            static QIcon tang ( Gui::BitmapFactory().pixmap("Constraint_Tangent") );
-            static QIcon dist ( Gui::BitmapFactory().pixmap("Constraint_Length") );
-            static QIcon radi ( Gui::BitmapFactory().pixmap("Constraint_Radius") );
-            static QIcon dia ( Gui::BitmapFactory().pixmap("Constraint_Diameter") );
-          //static QIcon majradi ( Gui::BitmapFactory().pixmap("Constraint_Ellipse_Major_Radius") );
-          //static QIcon minradi ( Gui::BitmapFactory().pixmap("Constraint_Ellipse_Minor_Radius") );
-            static QIcon angl ( Gui::BitmapFactory().pixmap("Constraint_InternalAngle") );
-          //static QIcon ellipseXUAngl ( Gui::BitmapFactory().pixmap("Constraint_Ellipse_Axis_Angle") );
-            static QIcon equal( Gui::BitmapFactory().pixmap("Constraint_EqualLength") );
-            static QIcon pntoo( Gui::BitmapFactory().pixmap("Constraint_PointOnObject") );
-            static QIcon symm ( Gui::BitmapFactory().pixmap("Constraint_Symmetric") );
-            static QIcon snell ( Gui::BitmapFactory().pixmap("Constraint_SnellsLaw") );
-            static QIcon iaellipseminoraxis ( Gui::BitmapFactory().pixmap("Constraint_InternalAlignment_Ellipse_MinorAxis") );
-            static QIcon iaellipsemajoraxis ( Gui::BitmapFactory().pixmap("Constraint_InternalAlignment_Ellipse_MajorAxis") );
-            static QIcon iaellipsefocus1 ( Gui::BitmapFactory().pixmap("Constraint_InternalAlignment_Ellipse_Focus1") );
-            static QIcon iaellipsefocus2 ( Gui::BitmapFactory().pixmap("Constraint_InternalAlignment_Ellipse_Focus2") );
-            static QIcon iaellipseother ( Gui::BitmapFactory().pixmap("Constraint_InternalAlignment") );
+            static QIcon hdist( Gui::BitmapFactory().iconFromTheme("Constraint_HorizontalDistance") );
+            static QIcon vdist( Gui::BitmapFactory().iconFromTheme("Constraint_VerticalDistance") );
+            static QIcon horiz( Gui::BitmapFactory().iconFromTheme("Constraint_Horizontal") );
+            static QIcon vert ( Gui::BitmapFactory().iconFromTheme("Constraint_Vertical") );
+          //static QIcon lock ( Gui::BitmapFactory().iconFromTheme("Sketcher_ConstrainLock") );
+            static QIcon block ( Gui::BitmapFactory().iconFromTheme("Sketcher_ConstrainBlock") );
+            static QIcon coinc( Gui::BitmapFactory().iconFromTheme("Constraint_PointOnPoint") );
+            static QIcon para ( Gui::BitmapFactory().iconFromTheme("Constraint_Parallel") );
+            static QIcon perp ( Gui::BitmapFactory().iconFromTheme("Constraint_Perpendicular") );
+            static QIcon tang ( Gui::BitmapFactory().iconFromTheme("Constraint_Tangent") );
+            static QIcon dist ( Gui::BitmapFactory().iconFromTheme("Constraint_Length") );
+            static QIcon radi ( Gui::BitmapFactory().iconFromTheme("Constraint_Radius") );
+            static QIcon dia ( Gui::BitmapFactory().iconFromTheme("Constraint_Diameter") );
+          //static QIcon majradi ( Gui::BitmapFactory().iconFromTheme("Constraint_Ellipse_Major_Radius") );
+          //static QIcon minradi ( Gui::BitmapFactory().iconFromTheme("Constraint_Ellipse_Minor_Radius") );
+            static QIcon angl ( Gui::BitmapFactory().iconFromTheme("Constraint_InternalAngle") );
+          //static QIcon ellipseXUAngl ( Gui::BitmapFactory().iconFromTheme("Constraint_Ellipse_Axis_Angle") );
+            static QIcon equal( Gui::BitmapFactory().iconFromTheme("Constraint_EqualLength") );
+            static QIcon pntoo( Gui::BitmapFactory().iconFromTheme("Constraint_PointOnObject") );
+            static QIcon symm ( Gui::BitmapFactory().iconFromTheme("Constraint_Symmetric") );
+            static QIcon snell ( Gui::BitmapFactory().iconFromTheme("Constraint_SnellsLaw") );
+            static QIcon iaellipseminoraxis ( Gui::BitmapFactory().iconFromTheme("Constraint_InternalAlignment_Ellipse_MinorAxis") );
+            static QIcon iaellipsemajoraxis ( Gui::BitmapFactory().iconFromTheme("Constraint_InternalAlignment_Ellipse_MajorAxis") );
+            static QIcon iaellipsefocus1 ( Gui::BitmapFactory().iconFromTheme("Constraint_InternalAlignment_Ellipse_Focus1") );
+            static QIcon iaellipsefocus2 ( Gui::BitmapFactory().iconFromTheme("Constraint_InternalAlignment_Ellipse_Focus2") );
+            static QIcon iaellipseother ( Gui::BitmapFactory().iconFromTheme("Constraint_InternalAlignment") );
 
-            static QIcon hdist_driven ( Gui::BitmapFactory().pixmap("Constraint_HorizontalDistance_Driven") );
-            static QIcon vdist_driven( Gui::BitmapFactory().pixmap("Constraint_VerticalDistance_Driven") );
-            static QIcon dist_driven ( Gui::BitmapFactory().pixmap("Constraint_Length_Driven") );
-            static QIcon radi_driven ( Gui::BitmapFactory().pixmap("Constraint_Radius_Driven") );
-            static QIcon dia_driven ( Gui::BitmapFactory().pixmap("Constraint_Diameter_Driven") );
-            static QIcon angl_driven ( Gui::BitmapFactory().pixmap("Constraint_InternalAngle_Driven") );
-            static QIcon snell_driven ( Gui::BitmapFactory().pixmap("Constraint_SnellsLaw_Driven") );
+            static QIcon hdist_driven ( Gui::BitmapFactory().iconFromTheme("Constraint_HorizontalDistance_Driven") );
+            static QIcon vdist_driven( Gui::BitmapFactory().iconFromTheme("Constraint_VerticalDistance_Driven") );
+            static QIcon dist_driven ( Gui::BitmapFactory().iconFromTheme("Constraint_Length_Driven") );
+            static QIcon radi_driven ( Gui::BitmapFactory().iconFromTheme("Constraint_Radius_Driven") );
+            static QIcon dia_driven ( Gui::BitmapFactory().iconFromTheme("Constraint_Diameter_Driven") );
+            static QIcon angl_driven ( Gui::BitmapFactory().iconFromTheme("Constraint_InternalAngle_Driven") );
+            static QIcon snell_driven ( Gui::BitmapFactory().iconFromTheme("Constraint_SnellsLaw_Driven") );
 
             switch(constraint->Type){
             case Sketcher::Horizontal:
diff --git a/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp b/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp
index c06d7047d2..692a66d820 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp
+++ b/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp
@@ -650,34 +650,34 @@ void TaskSketcherElements::leaveEvent (QEvent * event)
 
 void TaskSketcherElements::slotElementsChanged(void)
 {
-    QIcon Sketcher_Element_Arc_Edge( Gui::BitmapFactory().pixmap("Sketcher_Element_Arc_Edge") );
-    QIcon Sketcher_Element_Arc_EndPoint( Gui::BitmapFactory().pixmap("Sketcher_Element_Arc_EndPoint") );
-    QIcon Sketcher_Element_Arc_MidPoint( Gui::BitmapFactory().pixmap("Sketcher_Element_Arc_MidPoint") );
-    QIcon Sketcher_Element_Arc_StartingPoint( Gui::BitmapFactory().pixmap("Sketcher_Element_Arc_StartingPoint") );
-    QIcon Sketcher_Element_Circle_Edge( Gui::BitmapFactory().pixmap("Sketcher_Element_Circle_Edge") );
-    QIcon Sketcher_Element_Circle_MidPoint( Gui::BitmapFactory().pixmap("Sketcher_Element_Circle_MidPoint") );
-    QIcon Sketcher_Element_Line_Edge( Gui::BitmapFactory().pixmap("Sketcher_Element_Line_Edge") );
-    QIcon Sketcher_Element_Line_EndPoint( Gui::BitmapFactory().pixmap("Sketcher_Element_Line_EndPoint") );
-    QIcon Sketcher_Element_Line_StartingPoint( Gui::BitmapFactory().pixmap("Sketcher_Element_Line_StartingPoint") );
-    QIcon Sketcher_Element_Point_StartingPoint( Gui::BitmapFactory().pixmap("Sketcher_Element_Point_StartingPoint") );
-    QIcon Sketcher_Element_Ellipse_Edge( Gui::BitmapFactory().pixmap("Sketcher_Element_Ellipse_Edge_2") );
-    QIcon Sketcher_Element_Ellipse_MidPoint( Gui::BitmapFactory().pixmap("Sketcher_Element_Ellipse_CentrePoint") );
-    QIcon Sketcher_Element_ArcOfEllipse_Edge( Gui::BitmapFactory().pixmap("Sketcher_Element_Elliptical_Arc_Edge") );
-    QIcon Sketcher_Element_ArcOfEllipse_MidPoint( Gui::BitmapFactory().pixmap("Sketcher_Element_Elliptical_Arc_Centre_Point") );
-    QIcon Sketcher_Element_ArcOfEllipse_StartingPoint( Gui::BitmapFactory().pixmap("Sketcher_Element_Elliptical_Arc_Start_Point") );
-    QIcon Sketcher_Element_ArcOfEllipse_EndPoint( Gui::BitmapFactory().pixmap("Sketcher_Element_Elliptical_Arc_End_Point") );
-    QIcon Sketcher_Element_ArcOfHyperbola_Edge( Gui::BitmapFactory().pixmap("Sketcher_Element_Hyperbolic_Arc_Edge") );
-    QIcon Sketcher_Element_ArcOfHyperbola_MidPoint( Gui::BitmapFactory().pixmap("Sketcher_Element_Hyperbolic_Arc_Centre_Point") );
-    QIcon Sketcher_Element_ArcOfHyperbola_StartingPoint( Gui::BitmapFactory().pixmap("Sketcher_Element_Hyperbolic_Arc_Start_Point") );
-    QIcon Sketcher_Element_ArcOfHyperbola_EndPoint( Gui::BitmapFactory().pixmap("Sketcher_Element_Hyperbolic_Arc_End_Point") );
-    QIcon Sketcher_Element_ArcOfParabola_Edge( Gui::BitmapFactory().pixmap("Sketcher_Element_Parabolic_Arc_Edge") );
-    QIcon Sketcher_Element_ArcOfParabola_MidPoint( Gui::BitmapFactory().pixmap("Sketcher_Element_Parabolic_Arc_Centre_Point") );
-    QIcon Sketcher_Element_ArcOfParabola_StartingPoint( Gui::BitmapFactory().pixmap("Sketcher_Element_Parabolic_Arc_Start_Point") );
-    QIcon Sketcher_Element_ArcOfParabola_EndPoint( Gui::BitmapFactory().pixmap("Sketcher_Element_Parabolic_Arc_End_Point") );
-    QIcon Sketcher_Element_BSpline_Edge( Gui::BitmapFactory().pixmap("Sketcher_Element_BSpline_Edge") );
-    QIcon Sketcher_Element_BSpline_StartingPoint( Gui::BitmapFactory().pixmap("Sketcher_Element_BSpline_StartPoint") );
-    QIcon Sketcher_Element_BSpline_EndPoint( Gui::BitmapFactory().pixmap("Sketcher_Element_BSpline_EndPoint") );
-    QIcon none( Gui::BitmapFactory().pixmap("Sketcher_Element_SelectionTypeInvalid") );
+    QIcon Sketcher_Element_Arc_Edge( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Arc_Edge") );
+    QIcon Sketcher_Element_Arc_EndPoint( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Arc_EndPoint") );
+    QIcon Sketcher_Element_Arc_MidPoint( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Arc_MidPoint") );
+    QIcon Sketcher_Element_Arc_StartingPoint( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Arc_StartingPoint") );
+    QIcon Sketcher_Element_Circle_Edge( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Circle_Edge") );
+    QIcon Sketcher_Element_Circle_MidPoint( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Circle_MidPoint") );
+    QIcon Sketcher_Element_Line_Edge( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Line_Edge") );
+    QIcon Sketcher_Element_Line_EndPoint( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Line_EndPoint") );
+    QIcon Sketcher_Element_Line_StartingPoint( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Line_StartingPoint") );
+    QIcon Sketcher_Element_Point_StartingPoint( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Point_StartingPoint") );
+    QIcon Sketcher_Element_Ellipse_Edge( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Ellipse_Edge_2") );
+    QIcon Sketcher_Element_Ellipse_MidPoint( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Ellipse_CentrePoint") );
+    QIcon Sketcher_Element_ArcOfEllipse_Edge( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Elliptical_Arc_Edge") );
+    QIcon Sketcher_Element_ArcOfEllipse_MidPoint( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Elliptical_Arc_Centre_Point") );
+    QIcon Sketcher_Element_ArcOfEllipse_StartingPoint( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Elliptical_Arc_Start_Point") );
+    QIcon Sketcher_Element_ArcOfEllipse_EndPoint( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Elliptical_Arc_End_Point") );
+    QIcon Sketcher_Element_ArcOfHyperbola_Edge( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Hyperbolic_Arc_Edge") );
+    QIcon Sketcher_Element_ArcOfHyperbola_MidPoint( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Hyperbolic_Arc_Centre_Point") );
+    QIcon Sketcher_Element_ArcOfHyperbola_StartingPoint( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Hyperbolic_Arc_Start_Point") );
+    QIcon Sketcher_Element_ArcOfHyperbola_EndPoint( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Hyperbolic_Arc_End_Point") );
+    QIcon Sketcher_Element_ArcOfParabola_Edge( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Parabolic_Arc_Edge") );
+    QIcon Sketcher_Element_ArcOfParabola_MidPoint( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Parabolic_Arc_Centre_Point") );
+    QIcon Sketcher_Element_ArcOfParabola_StartingPoint( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Parabolic_Arc_Start_Point") );
+    QIcon Sketcher_Element_ArcOfParabola_EndPoint( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Parabolic_Arc_End_Point") );
+    QIcon Sketcher_Element_BSpline_Edge( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_BSpline_Edge") );
+    QIcon Sketcher_Element_BSpline_StartingPoint( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_BSpline_StartPoint") );
+    QIcon Sketcher_Element_BSpline_EndPoint( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_BSpline_EndPoint") );
+    QIcon none( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_SelectionTypeInvalid") );
 
     assert(sketchView);
     // Build up ListView with the elements
@@ -973,34 +973,34 @@ void TaskSketcherElements::clearWidget()
 
 void TaskSketcherElements::updateIcons(int element)
 {
-    QIcon Sketcher_Element_Arc_Edge( Gui::BitmapFactory().pixmap("Sketcher_Element_Arc_Edge") );
-    QIcon Sketcher_Element_Arc_EndPoint( Gui::BitmapFactory().pixmap("Sketcher_Element_Arc_EndPoint") );
-    QIcon Sketcher_Element_Arc_MidPoint( Gui::BitmapFactory().pixmap("Sketcher_Element_Arc_MidPoint") );
-    QIcon Sketcher_Element_Arc_StartingPoint( Gui::BitmapFactory().pixmap("Sketcher_Element_Arc_StartingPoint") );
-    QIcon Sketcher_Element_Circle_Edge( Gui::BitmapFactory().pixmap("Sketcher_Element_Circle_Edge") );
-    QIcon Sketcher_Element_Circle_MidPoint( Gui::BitmapFactory().pixmap("Sketcher_Element_Circle_MidPoint") );
-    QIcon Sketcher_Element_Line_Edge( Gui::BitmapFactory().pixmap("Sketcher_Element_Line_Edge") );
-    QIcon Sketcher_Element_Line_EndPoint( Gui::BitmapFactory().pixmap("Sketcher_Element_Line_EndPoint") );
-    QIcon Sketcher_Element_Line_StartingPoint( Gui::BitmapFactory().pixmap("Sketcher_Element_Line_StartingPoint") );
-    QIcon Sketcher_Element_Point_StartingPoint( Gui::BitmapFactory().pixmap("Sketcher_Element_Point_StartingPoint") );
-    QIcon Sketcher_Element_Ellipse_Edge( Gui::BitmapFactory().pixmap("Sketcher_Element_Ellipse_Edge_2") );
-    QIcon Sketcher_Element_Ellipse_MidPoint( Gui::BitmapFactory().pixmap("Sketcher_Element_Ellipse_CentrePoint") );
-    QIcon Sketcher_Element_ArcOfEllipse_Edge( Gui::BitmapFactory().pixmap("Sketcher_Element_Elliptical_Arc_Edge") );
-    QIcon Sketcher_Element_ArcOfEllipse_MidPoint( Gui::BitmapFactory().pixmap("Sketcher_Element_Elliptical_Arc_Centre_Point") );
-    QIcon Sketcher_Element_ArcOfEllipse_StartingPoint( Gui::BitmapFactory().pixmap("Sketcher_Element_Elliptical_Arc_Start_Point") );
-    QIcon Sketcher_Element_ArcOfEllipse_EndPoint( Gui::BitmapFactory().pixmap("Sketcher_Element_Elliptical_Arc_End_Point") );
-    QIcon Sketcher_Element_ArcOfHyperbola_Edge( Gui::BitmapFactory().pixmap("Sketcher_Element_Hyperbolic_Arc_Edge") );
-    QIcon Sketcher_Element_ArcOfHyperbola_MidPoint( Gui::BitmapFactory().pixmap("Sketcher_Element_Hyperbolic_Arc_Centre_Point") );
-    QIcon Sketcher_Element_ArcOfHyperbola_StartingPoint( Gui::BitmapFactory().pixmap("Sketcher_Element_Hyperbolic_Arc_Start_Point") );
-    QIcon Sketcher_Element_ArcOfHyperbola_EndPoint( Gui::BitmapFactory().pixmap("Sketcher_Element_Hyperbolic_Arc_End_Point") );
-    QIcon Sketcher_Element_ArcOfParabola_Edge( Gui::BitmapFactory().pixmap("Sketcher_Element_Parabolic_Arc_Edge") );
-    QIcon Sketcher_Element_ArcOfParabola_MidPoint( Gui::BitmapFactory().pixmap("Sketcher_Element_Parabolic_Arc_Centre_Point") );
-    QIcon Sketcher_Element_ArcOfParabola_StartingPoint( Gui::BitmapFactory().pixmap("Sketcher_Element_Parabolic_Arc_Start_Point") );
-    QIcon Sketcher_Element_ArcOfParabola_EndPoint( Gui::BitmapFactory().pixmap("Sketcher_Element_Parabolic_Arc_End_Point") );
-    QIcon Sketcher_Element_BSpline_Edge( Gui::BitmapFactory().pixmap("Sketcher_Element_BSpline_Edge") );
-    QIcon Sketcher_Element_BSpline_StartingPoint( Gui::BitmapFactory().pixmap("Sketcher_Element_BSpline_StartPoint") );
-    QIcon Sketcher_Element_BSpline_EndPoint( Gui::BitmapFactory().pixmap("Sketcher_Element_BSpline_EndPoint") );
-    QIcon none( Gui::BitmapFactory().pixmap("Sketcher_Element_SelectionTypeInvalid") );
+    QIcon Sketcher_Element_Arc_Edge( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Arc_Edge") );
+    QIcon Sketcher_Element_Arc_EndPoint( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Arc_EndPoint") );
+    QIcon Sketcher_Element_Arc_MidPoint( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Arc_MidPoint") );
+    QIcon Sketcher_Element_Arc_StartingPoint( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Arc_StartingPoint") );
+    QIcon Sketcher_Element_Circle_Edge( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Circle_Edge") );
+    QIcon Sketcher_Element_Circle_MidPoint( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Circle_MidPoint") );
+    QIcon Sketcher_Element_Line_Edge( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Line_Edge") );
+    QIcon Sketcher_Element_Line_EndPoint( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Line_EndPoint") );
+    QIcon Sketcher_Element_Line_StartingPoint( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Line_StartingPoint") );
+    QIcon Sketcher_Element_Point_StartingPoint( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Point_StartingPoint") );
+    QIcon Sketcher_Element_Ellipse_Edge( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Ellipse_Edge_2") );
+    QIcon Sketcher_Element_Ellipse_MidPoint( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Ellipse_CentrePoint") );
+    QIcon Sketcher_Element_ArcOfEllipse_Edge( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Elliptical_Arc_Edge") );
+    QIcon Sketcher_Element_ArcOfEllipse_MidPoint( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Elliptical_Arc_Centre_Point") );
+    QIcon Sketcher_Element_ArcOfEllipse_StartingPoint( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Elliptical_Arc_Start_Point") );
+    QIcon Sketcher_Element_ArcOfEllipse_EndPoint( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Elliptical_Arc_End_Point") );
+    QIcon Sketcher_Element_ArcOfHyperbola_Edge( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Hyperbolic_Arc_Edge") );
+    QIcon Sketcher_Element_ArcOfHyperbola_MidPoint( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Hyperbolic_Arc_Centre_Point") );
+    QIcon Sketcher_Element_ArcOfHyperbola_StartingPoint( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Hyperbolic_Arc_Start_Point") );
+    QIcon Sketcher_Element_ArcOfHyperbola_EndPoint( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Hyperbolic_Arc_End_Point") );
+    QIcon Sketcher_Element_ArcOfParabola_Edge( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Parabolic_Arc_Edge") );
+    QIcon Sketcher_Element_ArcOfParabola_MidPoint( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Parabolic_Arc_Centre_Point") );
+    QIcon Sketcher_Element_ArcOfParabola_StartingPoint( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Parabolic_Arc_Start_Point") );
+    QIcon Sketcher_Element_ArcOfParabola_EndPoint( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_Parabolic_Arc_End_Point") );
+    QIcon Sketcher_Element_BSpline_Edge( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_BSpline_Edge") );
+    QIcon Sketcher_Element_BSpline_StartingPoint( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_BSpline_StartPoint") );
+    QIcon Sketcher_Element_BSpline_EndPoint( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_BSpline_EndPoint") );
+    QIcon none( Gui::BitmapFactory().iconFromTheme("Sketcher_Element_SelectionTypeInvalid") );
 
     for (int i=0;i<ui->listWidgetElements->count(); i++) {
       Base::Type type = static_cast<ElementItem *>(ui->listWidgetElements->item(i))->GeometryType;
diff --git a/src/Mod/Surface/Gui/Command.cpp b/src/Mod/Surface/Gui/Command.cpp
index 8ddc4a6007..9d98aec578 100644
--- a/src/Mod/Surface/Gui/Command.cpp
+++ b/src/Mod/Surface/Gui/Command.cpp
@@ -79,7 +79,7 @@ CmdSurfaceCut::CmdSurfaceCut()
     sToolTipText  = QT_TR_NOOP("Cuts a Shape with another Shape.\nReturns a modified version of the first shape");
     sWhatsThis    = "Surface_Cut";
     sStatusTip    = QT_TR_NOOP("Surface Cut function");
-    sPixmap       = "Cut.svg";
+    sPixmap       = "Surface_Cut";
     sAccel        = "CTRL+H";
 }
 
@@ -137,7 +137,7 @@ CmdSurfaceFilling::CmdSurfaceFilling()
     sToolTipText  = QT_TR_NOOP("Fills a series of boundary curves, constraint curves and vertexes with a surface");
     sStatusTip    = QT_TR_NOOP("Fills a series of boundary curves, constraint curves and vertexes with a surface");
     sWhatsThis    = "Surface_Filling";
-    sPixmap       = "Filling.svg";
+    sPixmap       = "Surface_Filling";
 }
 
 void CmdSurfaceFilling::activated(int iMsg)
diff --git a/src/Mod/Surface/Gui/Resources/Surface.qrc b/src/Mod/Surface/Gui/Resources/Surface.qrc
index 7c907c425d..cb23f43285 100644
--- a/src/Mod/Surface/Gui/Resources/Surface.qrc
+++ b/src/Mod/Surface/Gui/Resources/Surface.qrc
@@ -2,8 +2,8 @@
     <qresource> 
         <file>icons/BezSurf.svg</file>
         <file>icons/BSplineSurf.svg</file>
-        <file>icons/Cut.svg</file>
-        <file>icons/Filling.svg</file>
+        <file>icons/Surface_Cut.svg</file>
+        <file>icons/Surface_Filling.svg</file>
         <file>icons/Sewing.svg</file>
     </qresource>
 </RCC> 
diff --git a/src/Mod/Surface/Gui/Resources/icons/Cut.svg b/src/Mod/Surface/Gui/Resources/icons/Surface_Cut.svg
similarity index 100%
rename from src/Mod/Surface/Gui/Resources/icons/Cut.svg
rename to src/Mod/Surface/Gui/Resources/icons/Surface_Cut.svg
diff --git a/src/Mod/Surface/Gui/Resources/icons/Filling.svg b/src/Mod/Surface/Gui/Resources/icons/Surface_Filling.svg
similarity index 100%
rename from src/Mod/Surface/Gui/Resources/icons/Filling.svg
rename to src/Mod/Surface/Gui/Resources/icons/Surface_Filling.svg