diff --git a/src/Gui/BitmapFactory.cpp b/src/Gui/BitmapFactory.cpp
index 9b781a4d0..4b5adccb9 100644
--- a/src/Gui/BitmapFactory.cpp
+++ b/src/Gui/BitmapFactory.cpp
@@ -166,6 +166,9 @@ QStringList BitmapFactoryInst::findIconFiles() const
             files << it->absoluteFilePath();
     }
 
+#if QT_VERSION >= 0x040500
+    files.removeDuplicates();
+#endif
     return files;
 }
 
diff --git a/src/Gui/DlgActionsImp.cpp b/src/Gui/DlgActionsImp.cpp
index 6c392426b..664277bcb 100644
--- a/src/Gui/DlgActionsImp.cpp
+++ b/src/Gui/DlgActionsImp.cpp
@@ -384,7 +384,8 @@ IconDialog::IconDialog(QWidget* parent)
     QStringList names = BitmapFactory().findIconFiles();
     for (QStringList::Iterator it = names.begin(); it != names.end(); ++it) {
         item = new QListWidgetItem(ui->listWidget);
-        item->setIcon(QIcon(*it));
+        //item->setIcon(QIcon(*it));
+        item->setIcon(QIcon(BitmapFactory().pixmap((const char*)it->toUtf8())));
         item->setText(QFileInfo(*it).baseName());
         item->setToolTip(*it);
     }