diff --git a/src/Gui/CommandStructure.cpp b/src/Gui/CommandStructure.cpp
index b9e8b02ec2..4e9344760a 100644
--- a/src/Gui/CommandStructure.cpp
+++ b/src/Gui/CommandStructure.cpp
@@ -94,7 +94,7 @@ StdCmdGroup::StdCmdGroup()
sToolTipText = QT_TR_NOOP("Create a new group for ordering objects");
sWhatsThis = "Std_Group";
sStatusTip = sToolTipText;
- sPixmap = "Group";
+ sPixmap = "folder";
}
void StdCmdGroup::activated(int iMsg)
diff --git a/src/Gui/Icons/folder.svg b/src/Gui/Icons/folder.svg
new file mode 100644
index 0000000000..1ebd0080f5
--- /dev/null
+++ b/src/Gui/Icons/folder.svg
@@ -0,0 +1,67 @@
+
+
+
diff --git a/src/Gui/Icons/resource.qrc b/src/Gui/Icons/resource.qrc
index 1b4b37b23a..4765f6d170 100644
--- a/src/Gui/Icons/resource.qrc
+++ b/src/Gui/Icons/resource.qrc
@@ -277,5 +277,6 @@
DrawStyleShaded.svg
DrawStyleWireFrame.svg
user.svg
+ folder.svg
diff --git a/src/Gui/ViewProviderDocumentObjectGroup.cpp b/src/Gui/ViewProviderDocumentObjectGroup.cpp
index d94ca8cfb6..6256a96381 100644
--- a/src/Gui/ViewProviderDocumentObjectGroup.cpp
+++ b/src/Gui/ViewProviderDocumentObjectGroup.cpp
@@ -60,7 +60,7 @@ ViewProviderDocumentObjectGroup::ViewProviderDocumentObjectGroup()
#endif
ViewProviderGroupExtension::initExtension(this);
- sPixmap = "Group.svg";
+ sPixmap = "folder";
}
ViewProviderDocumentObjectGroup::~ViewProviderDocumentObjectGroup()
@@ -78,6 +78,11 @@ bool ViewProviderDocumentObjectGroup::isShow(void) const
return Visibility.getValue();
}
+QIcon ViewProviderDocumentObjectGroup::getIcon(void) const
+{
+ return mergeOverlayIcons (Gui::BitmapFactory().iconFromTheme(sPixmap));
+}
+
/**
* Extracts the associated view providers of the objects of the associated object group group.
*/
diff --git a/src/Gui/ViewProviderDocumentObjectGroup.h b/src/Gui/ViewProviderDocumentObjectGroup.h
index 433ca3f506..2b853fab99 100644
--- a/src/Gui/ViewProviderDocumentObjectGroup.h
+++ b/src/Gui/ViewProviderDocumentObjectGroup.h
@@ -46,6 +46,8 @@ public:
std::vector getDisplayModes(void) const override;
bool isShow(void) const override;
+ /// deliver the icon shown in the tree view
+ virtual QIcon getIcon(void) const override;
protected:
void getViewProviders(std::vector&) const;
diff --git a/src/Mod/AddonManager/AddonManager.py b/src/Mod/AddonManager/AddonManager.py
index 31bde2ca53..ddb6ee5e49 100644
--- a/src/Mod/AddonManager/AddonManager.py
+++ b/src/Mod/AddonManager/AddonManager.py
@@ -123,7 +123,7 @@ class CommandAddonManager:
self.dialog.buttonInstall.setIcon(QtGui.QIcon.fromTheme("download",QtGui.QIcon(":/icons/edit_OK.svg")))
self.dialog.buttonUpdateAll.setIcon(QtGui.QIcon(":/icons/button_valid.svg"))
self.dialog.buttonConfigure.setIcon(QtGui.QIcon(":/icons/preferences-system.svg"))
- self.dialog.tabWidget.setTabIcon(0,QtGui.QIcon(":/icons/Group.svg"))
+ self.dialog.tabWidget.setTabIcon(0,QtGui.QIcon.fromTheme("folder",QtGui.QIcon(":/icons/folder.svg")))
self.dialog.tabWidget.setTabIcon(1,QtGui.QIcon(":/icons/applications-python.svg"))
@@ -263,7 +263,7 @@ class CommandAddonManager:
import AddonManager_rc
addonicon = QtGui.QIcon(":/icons/" + addon_repo[0] + "_workbench_icon.svg")
if addonicon.isNull():
- addonicon = QtGui.QIcon(":/icons/Group.svg")
+ addonicon = QtGui.QIcon.fromTheme("folder",QtGui.QIcon(":/icons/folder.svg"))
if addon_repo[2] > 0:
item = QtGui.QListWidgetItem(addonicon,str(addon_repo[0]) + str(" ("+translate("AddonsInstaller","Installed")+")"))
item.setForeground(QtGui.QBrush(QtGui.QColor(0,182,41)))
@@ -523,7 +523,7 @@ class CommandAddonManager:
self.dialog.listWorkbenches.item(i).setText(txt+ext)
else:
self.dialog.listWorkbenches.item(i).setText(txt)
- self.dialog.listWorkbenches.item(i).setIcon(QtGui.QIcon(":/icons/Group.svg"))
+ self.dialog.listWorkbenches.item(i).setIcon(QtGui.QIcon.fromTheme("folder",QtGui.QIcon(":/icons/folder.svg")))
for i in range(self.dialog.listMacros.count()):
txt = self.dialog.listMacros.item(i).text().strip()
if txt.endswith(" ("+translate("AddonsInstaller","Installed")+")"):
@@ -534,7 +534,7 @@ class CommandAddonManager:
self.dialog.listMacros.item(i).setText(txt+ext)
else:
self.dialog.listMacros.item(i).setText(txt)
- self.dialog.listMacros.item(i).setIcon(QtGui.QIcon(":/icons/Group.svg"))
+ self.dialog.listMacros.item(i).setIcon(QtGui.QIcon.fromTheme("folder",QtGui.QIcon(":/icons/folder.svg")))
else:
self.dialog.listWorkbenches.clear()
self.dialog.listMacros.clear()