diff --git a/src/musredit_qt6/mupp/PmuppAdmin.h b/src/musredit_qt6/mupp/PmuppAdmin.h
index 587a8afb..5e2b5b6a 100644
--- a/src/musredit_qt6/mupp/PmuppAdmin.h
+++ b/src/musredit_qt6/mupp/PmuppAdmin.h
@@ -59,7 +59,6 @@
 #include <QString>
 #include <QVector>
 #include <QMap>
-#include <QPixmap>
 #include <QXmlStreamReader>
 
 #include "mupp.h"
diff --git a/src/musredit_qt6/mupp/PmuppGui.cpp b/src/musredit_qt6/mupp/PmuppGui.cpp
index d0261f1d..51da0fef 100644
--- a/src/musredit_qt6/mupp/PmuppGui.cpp
+++ b/src/musredit_qt6/mupp/PmuppGui.cpp
@@ -381,7 +381,7 @@ PmuppGui::PmuppGui(QStringList fln)
     iconName = QString(":/icons/mupp-dark.svg");
   else
     iconName = QString(":/icons/mupp-plain.svg");
-  setWindowIcon( QIcon( QPixmap(iconName) ) );
+  setWindowIcon( QIcon( iconName ) );
 
   // setup menus
   setupFileActions();
@@ -624,14 +624,14 @@ void PmuppGui::setupFileActions()
     iconName = QString(":/icons/document-open-dark.svg");
   else
     iconName = QString(":/icons/document-open-plain.svg");
-  a = new QAction( QIcon( QPixmap(iconName) ), tr( "&Open..." ), this );
+  a = new QAction( QIcon( iconName ), tr( "&Open..." ), this );
   a->setShortcut( tr("Ctrl+O") );
   a->setStatusTip( tr("Open a musrfit parameter file.") );
   connect( a, SIGNAL( triggered() ), this, SLOT( fileOpen() ) );
   menu->addAction(a);
   if (!fDarkThemeIconsToolbar) { // tool bar icon is not dark, even though the theme is (ubuntu, mx, xfce)
     iconName = QString(":/icons/document-open-plain.svg");
-    a = new QAction( QIcon( QPixmap(iconName) ), tr( "&New..." ), this );
+    a = new QAction( QIcon( iconName ), tr( "&New..." ), this );
     connect( a, SIGNAL( triggered() ), this, SLOT( fileOpen() ) );
   }
   tb->addAction(a);
diff --git a/src/musredit_qt6/musrStep/PMusrStep.cpp b/src/musredit_qt6/musrStep/PMusrStep.cpp
index e38503f6..2ac06b72 100644
--- a/src/musredit_qt6/musrStep/PMusrStep.cpp
+++ b/src/musredit_qt6/musrStep/PMusrStep.cpp
@@ -50,7 +50,6 @@
 #include <QLineEdit>
 #include <QDoubleValidator>
 #include <QTextStream>
-#include <QPixmap>
 #include <QGuiApplication>
 #include <QScreen>
 
@@ -189,7 +188,7 @@ PMusrStep::PMusrStep(const char *fln, QWidget *parent) :
     str = QString(":/icons/musrStep-22x22-dark.svg");
   else
     str = QString(":/icons/musrStep-22x22.svg");
-  setWindowIcon(QIcon(QPixmap(str)));
+  setWindowIcon(QIcon(str));
 
   fValid = false;
 
@@ -200,7 +199,7 @@ PMusrStep::PMusrStep(const char *fln, QWidget *parent) :
     str = QString(":/icons/musrStep-32x32-dark.svg");
   else
     str = QString(":/icons/musrStep-32x32.svg");
-  icon->setPixmap(QPixmap(str));
+  icon->setPixmap(str);
 
   QHBoxLayout *titleLayout = new QHBoxLayout;
   titleLayout->addWidget(fTitleLabel.get());
diff --git a/src/musredit_qt6/musrWiz/PMusrWiz.cpp b/src/musredit_qt6/musrWiz/PMusrWiz.cpp
index 53fb3881..99b24a4b 100644
--- a/src/musredit_qt6/musrWiz/PMusrWiz.cpp
+++ b/src/musredit_qt6/musrWiz/PMusrWiz.cpp
@@ -32,7 +32,6 @@
 
 #include <QtWidgets>
 #include <QObject>
-#include <QPixmap>
 #include <QLabel>
 #include <QFormLayout>
 #include <QVBoxLayout>
@@ -44,6 +43,7 @@
 #include <QFile>
 #include <QTextStream>
 #include <QInputDialog>
+#include <QPixmap>
 
 #include <QDebug>
 
@@ -1996,7 +1996,7 @@ PMusrWiz::PMusrWiz(PAdmin *admin, PMsrData *msrData, QWidget *parent) :
     iconTheme = QString(":/icons/musrWiz-22x22-dark.svg");
   else
     iconTheme = QString(":/icons/musrWiz-22x22.svg");
-  setWindowIcon(QIcon(QPixmap(iconTheme)));
+  setWindowIcon(QIcon(iconTheme));
 
   if (isDark)
     iconTheme = QString(":/icons/musrWiz-32x32-dark.svg");
diff --git a/src/musredit_qt6/musredit/PTextEdit.cpp b/src/musredit_qt6/musredit/PTextEdit.cpp
index d47258ff..cba34790 100644
--- a/src/musredit_qt6/musredit/PTextEdit.cpp
+++ b/src/musredit_qt6/musredit/PTextEdit.cpp
@@ -115,7 +115,6 @@
 #include <QPainter>
 #include <QMessageBox>
 #include <QDialog>
-#include <QPixmap>
 #include <QTextCursor>
 #include <QTextBlock>
 #include <QTextDocumentFragment>
@@ -209,7 +208,7 @@ PTextEdit::PTextEdit( QWidget *parent )
     iconName = QString(":/icons/musrfit-dark.svg");
   else
     iconName = QString(":/icons/musrfit-plain.svg");
-  setWindowIcon( QIcon( QPixmap(iconName) ) );
+  setWindowIcon( QIcon( iconName ) );
 
   // if arguments are give, try to load those files, otherwise create an empty new file
   if ( qApp->arguments().size() != 1 ) {
@@ -292,7 +291,7 @@ void PTextEdit::setupFileActions()
     iconName = QString(":/icons/document-new-dark.svg");
   else
     iconName = QString(":/icons/document-new-plain.svg");
-  a = new QAction( QIcon( QPixmap(iconName) ), tr( "&New..." ), this );
+  a = new QAction( QIcon( iconName ), tr( "&New..." ), this );
   a->setShortcut( tr("Ctrl+N") );
   a->setStatusTip( tr("Create a new msr-file") );
   connect( a, SIGNAL( triggered() ), this, SLOT( fileNew() ) );
@@ -301,7 +300,7 @@ void PTextEdit::setupFileActions()
 
   if (!fDarkToolBarIcon) { // tool bar icon is not dark, even though the theme is (ubuntu)
     iconName = QString(":/icons/document-new-plain.svg");
-    a = new QAction( QIcon( QPixmap(iconName) ), tr( "&New..." ), this );
+    a = new QAction( QIcon( iconName ), tr( "&New..." ), this );
     connect( a, SIGNAL( triggered() ), this, SLOT( fileNew() ) );
   }
   tb->addAction(a);
@@ -312,7 +311,7 @@ void PTextEdit::setupFileActions()
     iconName = QString(":/icons/document-open-dark.svg");
   else
     iconName = QString(":/icons/document-open-plain.svg");
-  a = new QAction( QIcon( QPixmap(iconName) ), tr( "&Open..." ), this );
+  a = new QAction( QIcon( iconName ), tr( "&Open..." ), this );
   a->setShortcut( tr("Ctrl+O") );
   a->setStatusTip( tr("Opens a msr-file") );
   connect( a, SIGNAL( triggered() ), this, SLOT( fileOpen() ) );
@@ -321,7 +320,7 @@ void PTextEdit::setupFileActions()
 
   if (!fDarkToolBarIcon) { // tool bar icon is not dark, even though the theme is (ubuntu)
     iconName = QString(":/icons/document-open-plain.svg");
-    a = new QAction( QIcon( QPixmap(iconName) ), tr( "&Open..." ), this );
+    a = new QAction( QIcon( iconName ), tr( "&Open..." ), this );
     connect( a, SIGNAL( triggered() ), this, SLOT( fileOpen() ) );
   }
   tb->addAction(a);
@@ -342,7 +341,7 @@ void PTextEdit::setupFileActions()
     iconName = QString(":/icons/view-refresh-dark.svg");
   else
     iconName = QString(":/icons/view-refresh-plain.svg");
-  a = new QAction( QIcon( QPixmap(iconName) ), tr( "Reload..." ), this );
+  a = new QAction( QIcon( iconName ), tr( "Reload..." ), this );
   a->setShortcut( tr("F5") );
   a->setStatusTip( tr("Reload msr-file") );
   connect( a, SIGNAL( triggered() ), this, SLOT( fileReload() ) );
@@ -351,7 +350,7 @@ void PTextEdit::setupFileActions()
 
   if (!fDarkToolBarIcon) { // tool bar icon is not dark, even though the theme is (ubuntu)
     iconName = QString(":/icons/view-refresh-plain.svg");
-    a = new QAction( QIcon( QPixmap(iconName) ), tr( "Reload..." ), this );
+    a = new QAction( QIcon( iconName ), tr( "Reload..." ), this );
     connect( a, SIGNAL( triggered() ), this, SLOT( fileReload() ) );
   }
   tb->addAction(a);
@@ -368,7 +367,7 @@ void PTextEdit::setupFileActions()
     iconName = QString(":/icons/document-save-dark.svg");
   else
     iconName = QString(":/icons/document-save-plain.svg");
-  a = new QAction( QIcon( QPixmap(iconName) ), tr( "&Save..." ), this );
+  a = new QAction( QIcon( iconName ), tr( "&Save..." ), this );
   a->setShortcut( tr("Ctrl+S") );
   a->setStatusTip( tr("Save msr-file") );
   connect( a, SIGNAL( triggered() ), this, SLOT( fileSave() ) );
@@ -377,7 +376,7 @@ void PTextEdit::setupFileActions()
 
   if (!fDarkToolBarIcon) { // tool bar icon is not dark, even though the theme is (ubuntu)
     iconName = QString(":/icons/document-save-plain.svg");
-    a = new QAction( QIcon( QPixmap(iconName) ), tr( "&Save..." ), this );
+    a = new QAction( QIcon( iconName ), tr( "&Save..." ), this );
     connect( a, SIGNAL( triggered() ), this, SLOT( fileSave() ) );
   }
   tb->addAction(a);
@@ -402,7 +401,7 @@ void PTextEdit::setupFileActions()
     iconName = QString(":/icons/document-print-dark.svg");
   else
     iconName = QString(":/icons/document-print-plain.svg");
-  a = new QAction( QIcon( QPixmap(iconName) ), tr( "&Print..." ), this );
+  a = new QAction( QIcon( iconName ), tr( "&Print..." ), this );
   a->setShortcut( tr("Ctrl+P") );
   a->setStatusTip( tr("Print msr-file") );
   connect( a, SIGNAL( triggered() ), this, SLOT( filePrint() ) );
@@ -411,7 +410,7 @@ void PTextEdit::setupFileActions()
 
   if (!fDarkToolBarIcon) { // tool bar icon is not dark, even though the theme is (ubuntu)
     iconName = QString(":/icons/document-print-plain.svg");
-    a = new QAction( QIcon( QPixmap(iconName) ), tr( "&Print..." ), this );
+    a = new QAction( QIcon( iconName ), tr( "&Print..." ), this );
     connect( a, SIGNAL( triggered() ), this, SLOT( filePrint() ) );
   }
   tb->addAction(a);
@@ -474,7 +473,7 @@ void PTextEdit::setupEditActions()
     iconName = QString(":/icons/edit-undo-dark.svg");
   else
     iconName = QString(":/icons/edit-undo-plain.svg");
-  a = new QAction( QIcon( QPixmap(iconName) ), tr( "&Undo" ), this );
+  a = new QAction( QIcon( iconName ), tr( "&Undo" ), this );
   a->setShortcut( tr("Ctrl+Z") );
   a->setStatusTip( tr("Edit Undo") );
   connect( a, SIGNAL( triggered() ), this, SLOT( editUndo() ) );
@@ -483,7 +482,7 @@ void PTextEdit::setupEditActions()
 
   if (!fDarkToolBarIcon) { // tool bar icon is not dark, even though the theme is (ubuntu)
     iconName = QString(":/icons/edit-undo-plain.svg");
-    a = new QAction( QIcon( QPixmap(iconName) ), tr( "&Undo" ), this );
+    a = new QAction( QIcon( iconName ), tr( "&Undo" ), this );
     connect( a, SIGNAL( triggered() ), this, SLOT( editUndo() ) );
   }
   tb->addAction(a);
@@ -494,7 +493,7 @@ void PTextEdit::setupEditActions()
     iconName = QString(":/icons/edit-redo-dark.svg");
   else
     iconName = QString(":/icons/edit-redo-plain.svg");
-  a = new QAction( QIcon( QPixmap(iconName) ), tr( "&Redo" ), this );
+  a = new QAction( QIcon( iconName ), tr( "&Redo" ), this );
   a->setShortcut( tr("Ctrl+Y") );
   a->setStatusTip( tr("Edit Redo") );
   connect( a, SIGNAL( triggered() ), this, SLOT( editRedo() ) );
@@ -503,7 +502,7 @@ void PTextEdit::setupEditActions()
 
   if (!fDarkToolBarIcon) { // tool bar icon is not dark, even though the theme is (ubuntu)
     iconName = QString(":/icons/edit-redo-plain.svg");
-    a = new QAction( QIcon( QPixmap(iconName) ), tr( "&Redo" ), this );
+    a = new QAction( QIcon( iconName ), tr( "&Redo" ), this );
     connect( a, SIGNAL( triggered() ), this, SLOT( editRedo() ) );
   }
   tb->addAction(a);
@@ -526,7 +525,7 @@ void PTextEdit::setupEditActions()
     iconName = QString(":/icons/edit-copy-dark.svg");
   else
     iconName = QString(":/icons/edit-copy-plain.svg");
-  a = new QAction( QIcon( QPixmap(iconName) ), tr( "&Copy" ), this );
+  a = new QAction( QIcon( iconName ), tr( "&Copy" ), this );
   a->setShortcut( tr("Ctrl+C") );
   a->setStatusTip( tr("Edit Copy") );
   connect( a, SIGNAL( triggered() ), this, SLOT( editCopy() ) );
@@ -535,7 +534,7 @@ void PTextEdit::setupEditActions()
 
   if (!fDarkToolBarIcon) { // tool bar icon is not dark, even though the theme is (ubuntu)
     iconName = QString(":/icons/edit-copy-plain.svg");
-    a = new QAction( QIcon( QPixmap(iconName) ), tr( "&Copy" ), this );
+    a = new QAction( QIcon( iconName ), tr( "&Copy" ), this );
     connect( a, SIGNAL( triggered() ), this, SLOT( editCopy() ) );
   }
   tb->addAction(a);
@@ -546,7 +545,7 @@ void PTextEdit::setupEditActions()
     iconName = QString(":/icons/edit-cut-dark.svg");
   else
     iconName = QString(":/icons/edit-cut-plain.svg");
-  a = new QAction( QIcon( QPixmap(iconName) ), tr( "Cu&t" ), this );
+  a = new QAction( QIcon( iconName ), tr( "Cu&t" ), this );
   a->setShortcut( tr("Ctrl+X") );
   a->setStatusTip( tr("Edit Cut") );
   connect( a, SIGNAL( triggered() ), this, SLOT( editCut() ) );
@@ -555,7 +554,7 @@ void PTextEdit::setupEditActions()
 
   if (!fDarkToolBarIcon) { // tool bar icon is not dark, even though the theme is (ubuntu)
     iconName = QString(":/icons/edit-cut-plain.svg");
-    a = new QAction( QIcon( QPixmap(iconName) ), tr( "Cu&t" ), this );
+    a = new QAction( QIcon( iconName ), tr( "Cu&t" ), this );
     connect( a, SIGNAL( triggered() ), this, SLOT( editCut() ) );
   }
   tb->addAction(a);
@@ -566,7 +565,7 @@ void PTextEdit::setupEditActions()
     iconName = QString(":/icons/edit-paste-dark.svg");
   else
     iconName = QString(":/icons/edit-paste-plain.svg");
-  a = new QAction( QIcon( QPixmap(iconName) ), tr( "&Paste" ), this );
+  a = new QAction( QIcon( iconName ), tr( "&Paste" ), this );
   a->setShortcut( tr("Ctrl+V") );
   a->setStatusTip( tr("Edit Paste") );
   connect( a, SIGNAL( triggered() ), this, SLOT( editPaste() ) );
@@ -575,7 +574,7 @@ void PTextEdit::setupEditActions()
 
   if (!fDarkToolBarIcon) { // tool bar icon is not dark, even though the theme is (ubuntu)
     iconName = QString(":/icons/edit-paste-plain.svg");
-    a = new QAction( QIcon( QPixmap(iconName) ), tr( "&Paste" ), this );
+    a = new QAction( QIcon( iconName ), tr( "&Paste" ), this );
     connect( a, SIGNAL( triggered() ), this, SLOT( editPaste() ) );
   }
   tb->addAction(a);
@@ -589,7 +588,7 @@ void PTextEdit::setupEditActions()
     iconName = QString(":/icons/edit-find-dark.svg");
   else
     iconName = QString(":/icons/edit-find-plain.svg");
-  a = new QAction( QIcon( QPixmap(iconName) ), tr( "&Find" ), this );
+  a = new QAction( QIcon( iconName ), tr( "&Find" ), this );
   a->setShortcut( tr("Ctrl+F") );
   a->setStatusTip( tr("Edit Find") );
   connect( a, SIGNAL( triggered() ), this, SLOT( editFind() ) );
@@ -598,7 +597,7 @@ void PTextEdit::setupEditActions()
 
   if (!fDarkToolBarIcon) { // tool bar icon is not dark, even though the theme is (ubuntu)
     iconName = QString(":/icons/edit-find-plain.svg");
-    a = new QAction( QIcon( QPixmap(iconName) ), tr( "&Find" ), this );
+    a = new QAction( QIcon( iconName ), tr( "&Find" ), this );
     connect( a, SIGNAL( triggered() ), this, SLOT( editFind() ) );
   }
   tb->addAction(a);
@@ -609,7 +608,7 @@ void PTextEdit::setupEditActions()
     iconName = QString(":/icons/go-next-use-dark.svg");
   else
     iconName = QString(":/icons/go-next-use-plain.svg");
-  a = new QAction( QIcon( QPixmap(iconName) ), tr( "Find &Next" ), this );
+  a = new QAction( QIcon( iconName ), tr( "Find &Next" ), this );
   a->setShortcut( tr("F3") );
   a->setStatusTip( tr("Edit Find Next") );
   connect( a, SIGNAL( triggered() ), this, SLOT( editFindNext() ) );
@@ -618,7 +617,7 @@ void PTextEdit::setupEditActions()
 
   if (!fDarkToolBarIcon) { // tool bar icon is not dark, even though the theme is (ubuntu)
     iconName = QString(":/icons/go-next-use-plain.svg");
-    a = new QAction( QIcon( QPixmap(iconName) ), tr( "Find &Next" ), this );
+    a = new QAction( QIcon( iconName ), tr( "Find &Next" ), this );
     connect( a, SIGNAL( triggered() ), this, SLOT( editFindNext() ) );
   }
   tb->addAction(a);
@@ -629,7 +628,7 @@ void PTextEdit::setupEditActions()
     iconName = QString(":/icons/go-previous-use-dark.svg");
   else
     iconName = QString(":/icons/go-previous-use-plain.svg");
-  a = new QAction( QIcon( QPixmap(iconName) ) , tr( "Find Pre&vious" ), this );
+  a = new QAction( QIcon( iconName ) , tr( "Find Pre&vious" ), this );
   a->setShortcut( tr("Shift+F4") );
   a->setStatusTip( tr("Edit Find Previous") );
   connect( a, SIGNAL( triggered() ), this, SLOT( editFindPrevious() ) );
@@ -638,7 +637,7 @@ void PTextEdit::setupEditActions()
 
   if (!fDarkToolBarIcon) { // tool bar icon is not dark, even though the theme is (ubuntu)
     iconName = QString(":/icons/go-previous-use-plain.svg");
-    a = new QAction( QIcon( QPixmap(iconName) ), tr( "Find Pre&vious" ), this );
+    a = new QAction( QIcon( iconName ), tr( "Find Pre&vious" ), this );
     connect( a, SIGNAL( triggered() ), this, SLOT( editFindPrevious() ) );
   }
   tb->addAction(a);
@@ -807,7 +806,7 @@ void PTextEdit::setupMusrActions()
     iconName = QString(":/icons/musrWiz-32x32-dark.svg");
   else
     iconName = QString(":/icons/musrWiz-32x32.svg");
-  a = new QAction( QIcon( QPixmap(iconName) ), tr( "musr&Wiz" ), this );
+  a = new QAction( QIcon( iconName ), tr( "musr&Wiz" ), this );
   a->setShortcut( tr("Alt+W") );
   a->setStatusTip( tr("Call musrWiz which helps to create msr-files - currently still very limited") );
   connect( a, SIGNAL( triggered() ), this, SLOT( musrWiz() ) );
@@ -816,7 +815,7 @@ void PTextEdit::setupMusrActions()
 
   if (!fDarkToolBarIcon) { // tool bar icon is not dark, even though the theme is (ubuntu)
     iconName = QString(":/icons/musrWiz-32x32.svg");
-    a = new QAction( QIcon( QPixmap(iconName) ), tr( "musr&Wiz" ), this );
+    a = new QAction( QIcon( iconName ), tr( "musr&Wiz" ), this );
     connect( a, SIGNAL( triggered() ), this, SLOT( musrWiz() ) );
   }
   tb->addAction(a);
@@ -830,7 +829,7 @@ void PTextEdit::setupMusrActions()
     iconName = QString(":/icons/musrchisq-dark.svg");
   else
     iconName = QString(":/icons/musrchisq-plain.svg");
-  a = new QAction( QIcon( QPixmap(iconName) ), tr( "Calculate &Chisq" ), this );
+  a = new QAction( QIcon( iconName ), tr( "Calculate &Chisq" ), this );
   a->setShortcut( tr("Alt+C") );
   a->setStatusTip( tr("Calculate Chi Square (Log Max Likelihood)") );
   connect( a, SIGNAL( triggered() ), this, SLOT( musrCalcChisq() ) );
@@ -839,7 +838,7 @@ void PTextEdit::setupMusrActions()
 
   if (!fDarkToolBarIcon) { // tool bar icon is not dark, even though the theme is (ubuntu)
     iconName = QString(":/icons/musrchisq-plain.svg");
-    a = new QAction( QIcon( QPixmap(iconName) ), tr( "Calculate &Chisq" ), this );
+    a = new QAction( QIcon( iconName ), tr( "Calculate &Chisq" ), this );
     connect( a, SIGNAL( triggered() ), this, SLOT( musrCalcChisq() ) );
   }
   tb->addAction(a);
@@ -850,7 +849,7 @@ void PTextEdit::setupMusrActions()
     iconName = QString(":/icons/musrfit-dark.svg");
   else
     iconName = QString(":/icons/musrfit-plain.svg");
-  a = new QAction( QIcon( QPixmap(iconName) ), tr( "&Fit" ), this );
+  a = new QAction( QIcon( iconName ), tr( "&Fit" ), this );
   a->setShortcut( tr("Alt+F") );
   a->setStatusTip( tr("Fit") );
   connect( a, SIGNAL( triggered() ), this, SLOT( musrFit() ) );
@@ -859,7 +858,7 @@ void PTextEdit::setupMusrActions()
 
   if (!fDarkToolBarIcon) { // tool bar icon is not dark, even though the theme is (ubuntu)
     iconName = QString(":/icons/musrfit-plain.svg");
-    a = new QAction( QIcon( QPixmap(iconName) ), tr( "&Fit" ), this );
+    a = new QAction( QIcon( iconName ), tr( "&Fit" ), this );
     connect( a, SIGNAL( triggered() ), this, SLOT( musrFit() ) );
   }
   tb->addAction(a);
@@ -870,7 +869,7 @@ void PTextEdit::setupMusrActions()
     iconName = QString(":/icons/musrswap-dark.svg");
   else
     iconName = QString(":/icons/musrswap-plain.svg");
-  a = new QAction( QIcon( QPixmap(iconName) ), tr( "&Swap Msr <-> Mlog" ), this );
+  a = new QAction( QIcon( iconName ), tr( "&Swap Msr <-> Mlog" ), this );
   a->setShortcut( tr("Alt+S") );
   a->setStatusTip( tr("Swap msr-file <-> mlog-file") );
   connect( a, SIGNAL( triggered() ), this, SLOT( musrSwapMsrMlog() ) );
@@ -879,7 +878,7 @@ void PTextEdit::setupMusrActions()
 
   if (!fDarkToolBarIcon) { // tool bar icon is not dark, even though the theme is (ubuntu)
     iconName = QString(":/icons/musrswap-plain.svg");
-    a = new QAction( QIcon( QPixmap(iconName) ), tr( "&Swap Msr <-> Mlog" ), this );
+    a = new QAction( QIcon( iconName ), tr( "&Swap Msr <-> Mlog" ), this );
     connect( a, SIGNAL( triggered() ), this, SLOT( musrSwapMsrMlog() ) );
   }
   tb->addAction(a);
@@ -890,7 +889,7 @@ void PTextEdit::setupMusrActions()
     iconName = QString(":/icons/musrStep-32x32-dark.svg");
   else
     iconName = QString(":/icons/musrStep-32x32.svg");
-  a = new QAction( QIcon( QPixmap(iconName) ), tr( "Set Ste&ps" ), this );
+  a = new QAction( QIcon( iconName ), tr( "Set Ste&ps" ), this );
   a->setShortcut( tr("Alt+P") );
   a->setStatusTip( tr("Set Steps") );
   connect( a, SIGNAL( triggered() ), this, SLOT( musrSetSteps() ) );
@@ -899,7 +898,7 @@ void PTextEdit::setupMusrActions()
 
   if (!fDarkToolBarIcon) { // tool bar icon is not dark, even though the theme is (ubuntu)
     iconName = QString(":/icons/musrStep-32x32.svg");
-    a = new QAction( QIcon( QPixmap(iconName) ), tr( "Set Ste&ps" ), this );
+    a = new QAction( QIcon( iconName ), tr( "Set Ste&ps" ), this );
     connect( a, SIGNAL( triggered() ), this, SLOT( musrSetSteps() ) );
   }
   tb->addAction(a);
@@ -910,7 +909,7 @@ void PTextEdit::setupMusrActions()
     iconName = QString(":/icons/msr2data-dark.svg");
   else
     iconName = QString(":/icons/msr2data-plain.svg");
-  a = new QAction( QIcon( QPixmap(iconName) ), tr( "Msr&2Data" ), this );
+  a = new QAction( QIcon( iconName ), tr( "Msr&2Data" ), this );
   a->setShortcut( tr("Alt+2") );
   a->setStatusTip( tr("Start msr2data interface") );
   connect( a, SIGNAL( triggered() ), this, SLOT( musrMsr2Data() ) );
@@ -919,7 +918,7 @@ void PTextEdit::setupMusrActions()
 
   if (!fDarkToolBarIcon) { // tool bar icon is not dark, even though the theme is (ubuntu)
     iconName = QString(":/icons/msr2data-plain.svg");
-    a = new QAction( QIcon( QPixmap(iconName) ), tr( "&Msr2Data" ), this );
+    a = new QAction( QIcon( iconName ), tr( "&Msr2Data" ), this );
     connect( a, SIGNAL( triggered() ), this, SLOT( musrMsr2Data() ) );
   }
   tb->addAction(a);
@@ -930,7 +929,7 @@ void PTextEdit::setupMusrActions()
     iconName = QString(":/icons/mupp-dark.svg");
   else
     iconName = QString(":/icons/mupp-plain.svg");
-  a = new QAction( QIcon( QPixmap(iconName) ), tr( "m&upp" ), this );
+  a = new QAction( QIcon( iconName ), tr( "m&upp" ), this );
   a->setShortcut( tr("Alt+U") );
   a->setStatusTip( tr("Start mupp, the muSR parameter plotter") );
   connect( a, SIGNAL( triggered() ), this, SLOT( mupp() ) );
@@ -939,7 +938,7 @@ void PTextEdit::setupMusrActions()
 
   if (!fDarkToolBarIcon) { // tool bar icon is not dark, even though the theme is (ubuntu)
     iconName = QString(":/icons/mupp-plain.svg");
-    a = new QAction( QIcon( QPixmap(iconName) ), tr( "m&upp" ), this );
+    a = new QAction( QIcon( iconName ), tr( "m&upp" ), this );
     connect( a, SIGNAL( triggered() ), this, SLOT( mupp() ) );
   }
   tb->addAction(a);
@@ -950,7 +949,7 @@ void PTextEdit::setupMusrActions()
     iconName = QString(":/icons/musrview2dat-dark.svg");
   else
     iconName = QString(":/icons/musrview2dat-plain.svg");
-  a = new QAction( QIcon( QPixmap(iconName) ), tr( "View2Dat" ), this );
+  a = new QAction( QIcon( iconName ), tr( "View2Dat" ), this );
   a->setStatusTip( tr("Export musrview data from a collection of msr-files.") );
   connect( a, SIGNAL( triggered() ), this, SLOT( musrView2Dat() ) );
   menu->addAction(a);
@@ -958,7 +957,7 @@ void PTextEdit::setupMusrActions()
 
   if (!fDarkToolBarIcon) { // tool bar icon is not dark, even though the theme is (ubuntu)
     iconName = QString(":/icons/musrview2dat-plain.svg");
-    a = new QAction( QIcon( QPixmap(iconName) ), tr( "View2Dat" ), this );
+    a = new QAction( QIcon( iconName ), tr( "View2Dat" ), this );
     connect( a, SIGNAL( triggered() ), this, SLOT( musrView2Dat() ) );
   }
   tb->addAction(a);
@@ -972,7 +971,7 @@ void PTextEdit::setupMusrActions()
     iconName = QString(":/icons/musrview-dark.svg");
   else
     iconName = QString(":/icons/musrview-plain.svg");
-  a = new QAction( QIcon( QPixmap(iconName) ), tr( "&View" ), this );
+  a = new QAction( QIcon( iconName ), tr( "&View" ), this );
   a->setShortcut( tr("Alt+V") );
   a->setStatusTip( tr("Start musrview") );
   connect( a, SIGNAL( triggered() ), this, SLOT( musrView() ) );
@@ -981,7 +980,7 @@ void PTextEdit::setupMusrActions()
 
   if (!fDarkToolBarIcon) { // tool bar icon is not dark, even though the theme is (ubuntu)
     iconName = QString(":/icons/musrview-plain.svg");
-    a = new QAction( QIcon( QPixmap(iconName) ), tr( "&View" ), this );
+    a = new QAction( QIcon( iconName ), tr( "&View" ), this );
     connect( a, SIGNAL( triggered() ), this, SLOT( musrView() ) );
   }
   tb->addAction(a);
@@ -992,14 +991,14 @@ void PTextEdit::setupMusrActions()
     iconName = QString(":/icons/musrt0-dark.svg");
   else
     iconName = QString(":/icons/musrt0-plain.svg");
-  fMusrT0Action = std::make_unique<QAction>( QIcon( QPixmap(iconName) ), tr( "&T0" ), this );
+  fMusrT0Action = std::make_unique<QAction>( QIcon( iconName ), tr( "&T0" ), this );
   fMusrT0Action->setStatusTip( tr("Start musrt0") );
   connect( fMusrT0Action.get(), SIGNAL( triggered() ), this, SLOT( musrT0() ) );
   menu->addAction(fMusrT0Action.get());
   fActions["musrt0"] = fMusrT0Action.get();
   if (!fDarkToolBarIcon) { // tool bar icon is not dark, even though the theme is (ubuntu)
     iconName = QString(":/icons/musrt0-plain.svg");
-    a = new QAction( QIcon( QPixmap(iconName) ), tr( "&T0" ), this );
+    a = new QAction( QIcon( iconName ), tr( "&T0" ), this );
     connect( a, SIGNAL( triggered() ), this, SLOT( musrT0() ) );
   }
   tb->addAction(fMusrT0Action.get());
@@ -1011,7 +1010,7 @@ void PTextEdit::setupMusrActions()
     iconName = QString(":/icons/musrFT-dark.svg");
   else
     iconName = QString(":/icons/musrFT-plain.svg");
-  a = new QAction( QIcon( QPixmap(iconName) ), tr( "Raw Fourier" ), this );
+  a = new QAction( QIcon( iconName ), tr( "Raw Fourier" ), this );
   a->setStatusTip( tr("Start musrFT") );
   connect( a, SIGNAL( triggered() ), this, SLOT( musrFT() ) );
   menu->addAction(a);
@@ -1019,7 +1018,7 @@ void PTextEdit::setupMusrActions()
 
   if (!fDarkToolBarIcon) { // tool bar icon is not dark, even though the theme is (ubuntu)
     iconName = QString(":/icons/musrFT-plain.svg");
-    a = new QAction( QIcon( QPixmap(iconName) ), tr( "Raw Fourier" ), this );
+    a = new QAction( QIcon( iconName ), tr( "Raw Fourier" ), this );
     connect( a, SIGNAL( triggered() ), this, SLOT( musrFT() ) );
   }
   tb->addAction(a);
@@ -1030,7 +1029,7 @@ void PTextEdit::setupMusrActions()
     iconName = QString(":/icons/musrprefs-dark.svg");
   else
     iconName = QString(":/icons/musrprefs-plain.svg");
-  a = new QAction( QIcon( QPixmap(iconName) ), tr( "&Preferences" ), this );
+  a = new QAction( QIcon( iconName ), tr( "&Preferences" ), this );
   a->setStatusTip( tr("Show Preferences") );
   connect( a, SIGNAL( triggered() ), this, SLOT( musrPrefs() ) );
   menu->addAction(a);
@@ -1038,7 +1037,7 @@ void PTextEdit::setupMusrActions()
 
   if (!fDarkToolBarIcon) { // tool bar icon is not dark, even though the theme is (ubuntu)
     iconName = QString(":/icons/musrprefs-plain.svg");
-    a = new QAction( QIcon( QPixmap(iconName) ), tr( "&Preferences" ), this );
+    a = new QAction( QIcon( iconName ), tr( "&Preferences" ), this );
     connect( a, SIGNAL( triggered() ), this, SLOT( musrPrefs() ) );
   }
   tb->addAction(a);
@@ -1052,14 +1051,14 @@ void PTextEdit::setupMusrActions()
     iconName = QString(":/icons/musrdump-dark.svg");
   else
     iconName = QString(":/icons/musrdump-plain.svg");
-  a = new QAction( QIcon( QPixmap(iconName)), tr( "&Dump Header"), this);
+  a = new QAction( QIcon( iconName), tr( "&Dump Header"), this);
   a->setStatusTip( tr("Dumps muSR File Header Information") );
   connect( a, SIGNAL(triggered()), this, SLOT(musrDump()));
   menu->addAction(a);
   fActions["musrdump"] = a;
   if (!fDarkToolBarIcon) { // tool bar icon is not dark, even though the theme is (ubuntu)
     iconName = QString(":/icons/musrdump-plain.svg");
-    a = new QAction( QIcon( QPixmap(iconName) ), tr( "&Dump Header" ), this );
+    a = new QAction( QIcon( iconName ), tr( "&Dump Header" ), this );
     connect( a, SIGNAL( triggered() ), this, SLOT( musrDump() ) );
   }
   tb->addAction(a);
@@ -3738,59 +3737,59 @@ bool PTextEdit::fileAlreadyOpen(QFileInfo &finfo, int &idx)
 void PTextEdit::switchMenuIcons()
 {
   if (fAdmin->getDarkThemeIconsMenuFlag()) { // dark theme icons
-    fActions["New"]->setIcon(QIcon(QPixmap(":/icons/document-new-dark.svg")));
-    fActions["Open"]->setIcon(QIcon(QPixmap(":/icons/document-open-dark.svg")));
-    fActions["Reload"]->setIcon(QIcon(QPixmap(":/icons/view-refresh-dark.svg")));
-    fActions["Save"]->setIcon(QIcon(QPixmap(":/icons/document-save-dark.svg")));
-    fActions["Print"]->setIcon(QIcon(QPixmap(":/icons/document-print-dark.svg")));
-    fActions["Undo"]->setIcon(QIcon(QPixmap(":/icons/edit-undo-dark.svg")));
-    fActions["Redo"]->setIcon(QIcon(QPixmap(":/icons/edit-redo-dark.svg")));
-    fActions["Copy"]->setIcon(QIcon(QPixmap(":/icons/edit-copy-dark.svg")));
-    fActions["Cut"]->setIcon(QIcon(QPixmap(":/icons/edit-cut-dark.svg")));
-    fActions["Paste"]->setIcon(QIcon(QPixmap(":/icons/edit-paste-dark.svg")));
-    fActions["Find"]->setIcon(QIcon(QPixmap(":/icons/edit-find-dark.svg")));
-    fActions["Find Next"]->setIcon(QIcon(QPixmap(":/icons/go-next-use-dark.svg")));
-    fActions["Find Previous"]->setIcon(QIcon(QPixmap(":/icons/go-previous-use-dark.svg")));
-    fActions["musrWiz"]->setIcon(QIcon(QPixmap(":/icons/musrWiz-32x32-dark.svg")));
-    fActions["calcChisq"]->setIcon(QIcon(QPixmap(":/icons/musrchisq-dark.svg")));
-    fActions["musrfit"]->setIcon(QIcon(QPixmap(":/icons/musrfit-dark.svg")));
-    fActions["Swap Msr/Mlog"]->setIcon(QIcon(QPixmap(":/icons/musrswap-dark.svg")));
-    fActions["musrStep"]->setIcon(QIcon(QPixmap(":/icons/musrStep-32x32-dark.svg")));
-    fActions["msr2data"]->setIcon(QIcon(QPixmap(":/icons/msr2data-dark.svg")));
-    fActions["mupp"]->setIcon(QIcon(QPixmap(":/icons/mupp-dark.svg")));
-    fActions["musrview2dat"]->setIcon(QIcon(QPixmap(":/icons/musrview2dat-dark.svg")));
-    fActions["musrview"]->setIcon(QIcon(QPixmap(":/icons/musrview-dark.svg")));
-    fActions["musrt0"]->setIcon(QIcon(QPixmap(":/icons/musrt0-dark.svg")));
-    fActions["musrFT"]->setIcon(QIcon(QPixmap(":/icons/musrFT-dark.svg")));
-    fActions["musrprefs"]->setIcon(QIcon(QPixmap(":/icons/musrprefs-dark.svg")));
-    fActions["musrdump"]->setIcon(QIcon(QPixmap(":/icons/musrdump-dark.svg")));
+    fActions["New"]->setIcon(QIcon(":/icons/document-new-dark.svg"));
+    fActions["Open"]->setIcon(QIcon(":/icons/document-open-dark.svg"));
+    fActions["Reload"]->setIcon(QIcon(":/icons/view-refresh-dark.svg"));
+    fActions["Save"]->setIcon(QIcon(":/icons/document-save-dark.svg"));
+    fActions["Print"]->setIcon(QIcon(":/icons/document-print-dark.svg"));
+    fActions["Undo"]->setIcon(QIcon(":/icons/edit-undo-dark.svg"));
+    fActions["Redo"]->setIcon(QIcon(":/icons/edit-redo-dark.svg"));
+    fActions["Copy"]->setIcon(QIcon(":/icons/edit-copy-dark.svg"));
+    fActions["Cut"]->setIcon(QIcon(":/icons/edit-cut-dark.svg"));
+    fActions["Paste"]->setIcon(QIcon(":/icons/edit-paste-dark.svg"));
+    fActions["Find"]->setIcon(QIcon(":/icons/edit-find-dark.svg"));
+    fActions["Find Next"]->setIcon(QIcon(":/icons/go-next-use-dark.svg"));
+    fActions["Find Previous"]->setIcon(QIcon(":/icons/go-previous-use-dark.svg"));
+    fActions["musrWiz"]->setIcon(QIcon(":/icons/musrWiz-32x32-dark.svg"));
+    fActions["calcChisq"]->setIcon(QIcon(":/icons/musrchisq-dark.svg"));
+    fActions["musrfit"]->setIcon(QIcon(":/icons/musrfit-dark.svg"));
+    fActions["Swap Msr/Mlog"]->setIcon(QIcon(":/icons/musrswap-dark.svg"));
+    fActions["musrStep"]->setIcon(QIcon(":/icons/musrStep-32x32-dark.svg"));
+    fActions["msr2data"]->setIcon(QIcon(":/icons/msr2data-dark.svg"));
+    fActions["mupp"]->setIcon(QIcon(":/icons/mupp-dark.svg"));
+    fActions["musrview2dat"]->setIcon(QIcon(":/icons/musrview2dat-dark.svg"));
+    fActions["musrview"]->setIcon(QIcon(":/icons/musrview-dark.svg"));
+    fActions["musrt0"]->setIcon(QIcon(":/icons/musrt0-dark.svg"));
+    fActions["musrFT"]->setIcon(QIcon(":/icons/musrFT-dark.svg"));
+    fActions["musrprefs"]->setIcon(QIcon(":/icons/musrprefs-dark.svg"));
+    fActions["musrdump"]->setIcon(QIcon(":/icons/musrdump-dark.svg"));
   } else { // plain theme icons
-    fActions["New"]->setIcon(QIcon(QPixmap(":/icons/document-new-plain.svg")));
-    fActions["Open"]->setIcon(QIcon(QPixmap(":/icons/document-open-plain.svg")));
-    fActions["Reload"]->setIcon(QIcon(QPixmap(":/icons/view-refresh-plain.svg")));
-    fActions["Save"]->setIcon(QIcon(QPixmap(":/icons/document-save-plain.svg")));
-    fActions["Print"]->setIcon(QIcon(QPixmap(":/icons/document-print-plain.svg")));
-    fActions["Undo"]->setIcon(QIcon(QPixmap(":/icons/edit-undo-plain.svg")));
-    fActions["Redo"]->setIcon(QIcon(QPixmap(":/icons/edit-redo-plain.svg")));
-    fActions["Copy"]->setIcon(QIcon(QPixmap(":/icons/edit-copy-plain.svg")));
-    fActions["Cut"]->setIcon(QIcon(QPixmap(":/icons/edit-cut-plain.svg")));
-    fActions["Paste"]->setIcon(QIcon(QPixmap(":/icons/edit-paste-plain.svg")));
-    fActions["Find"]->setIcon(QIcon(QPixmap(":/icons/edit-find-plain.svg")));
-    fActions["Find Next"]->setIcon(QIcon(QPixmap(":/icons/go-next-use-plain.svg")));
-    fActions["Find Previous"]->setIcon(QIcon(QPixmap(":/icons/go-previous-use-plain.svg")));
-    fActions["musrWiz"]->setIcon(QIcon(QPixmap(":/icons/musrWiz-32x32.svg")));
-    fActions["calcChisq"]->setIcon(QIcon(QPixmap(":/icons/musrchisq-plain.svg")));
-    fActions["musrfit"]->setIcon(QIcon(QPixmap(":/icons/musrfit-plain.svg")));
-    fActions["Swap Msr/Mlog"]->setIcon(QIcon(QPixmap(":/icons/musrswap-plain.svg")));
-    fActions["musrStep"]->setIcon(QIcon(QPixmap(":/icons/musrStep-32x32.svg")));
-    fActions["msr2data"]->setIcon(QIcon(QPixmap(":/icons/msr2data-plain.svg")));
-    fActions["mupp"]->setIcon(QIcon(QPixmap(":/icons/mupp-plain.svg")));
-    fActions["musrview2dat"]->setIcon(QIcon(QPixmap(":/icons/musrview2dat-plain.svg")));
-    fActions["musrview"]->setIcon(QIcon(QPixmap(":/icons/musrview-plain.svg")));
-    fActions["musrt0"]->setIcon(QIcon(QPixmap(":/icons/musrt0-plain.svg")));
-    fActions["musrFT"]->setIcon(QIcon(QPixmap(":/icons/musrFT-plain.svg")));
-    fActions["musrprefs"]->setIcon(QIcon(QPixmap(":/icons/musrprefs-plain.svg")));
-    fActions["musrdump"]->setIcon(QIcon(QPixmap(":/icons/musrdump-plain.svg")));
+    fActions["New"]->setIcon(QIcon(":/icons/document-new-plain.svg"));
+    fActions["Open"]->setIcon(QIcon(":/icons/document-open-plain.svg"));
+    fActions["Reload"]->setIcon(QIcon(":/icons/view-refresh-plain.svg"));
+    fActions["Save"]->setIcon(QIcon(":/icons/document-save-plain.svg"));
+    fActions["Print"]->setIcon(QIcon(":/icons/document-print-plain.svg"));
+    fActions["Undo"]->setIcon(QIcon(":/icons/edit-undo-plain.svg"));
+    fActions["Redo"]->setIcon(QIcon(":/icons/edit-redo-plain.svg"));
+    fActions["Copy"]->setIcon(QIcon(":/icons/edit-copy-plain.svg"));
+    fActions["Cut"]->setIcon(QIcon(":/icons/edit-cut-plain.svg"));
+    fActions["Paste"]->setIcon(QIcon(":/icons/edit-paste-plain.svg"));
+    fActions["Find"]->setIcon(QIcon(":/icons/edit-find-plain.svg"));
+    fActions["Find Next"]->setIcon(QIcon(":/icons/go-next-use-plain.svg"));
+    fActions["Find Previous"]->setIcon(QIcon(":/icons/go-previous-use-plain.svg"));
+    fActions["musrWiz"]->setIcon(QIcon(":/icons/musrWiz-32x32.svg"));
+    fActions["calcChisq"]->setIcon(QIcon(":/icons/musrchisq-plain.svg"));
+    fActions["musrfit"]->setIcon(QIcon(":/icons/musrfit-plain.svg"));
+    fActions["Swap Msr/Mlog"]->setIcon(QIcon(":/icons/musrswap-plain.svg"));
+    fActions["musrStep"]->setIcon(QIcon(":/icons/musrStep-32x32.svg"));
+    fActions["msr2data"]->setIcon(QIcon(":/icons/msr2data-plain.svg"));
+    fActions["mupp"]->setIcon(QIcon(":/icons/mupp-plain.svg"));
+    fActions["musrview2dat"]->setIcon(QIcon(":/icons/musrview2dat-plain.svg"));
+    fActions["musrview"]->setIcon(QIcon(":/icons/musrview-plain.svg"));
+    fActions["musrt0"]->setIcon(QIcon(":/icons/musrt0-plain.svg"));
+    fActions["musrFT"]->setIcon(QIcon(":/icons/musrFT-plain.svg"));
+    fActions["musrprefs"]->setIcon(QIcon(":/icons/musrprefs-plain.svg"));
+    fActions["musrdump"]->setIcon(QIcon(":/icons/musrdump-plain.svg"));
   }
 }
 
@@ -3801,59 +3800,59 @@ void PTextEdit::switchMenuIcons()
 void PTextEdit::switchToolbarIcons()
 {
   if (fAdmin->getDarkThemeIconsToolbarFlag()) { // dark theme icons
-    fActions["New-tb"]->setIcon(QIcon(QPixmap(":/icons/document-new-dark.svg")));
-    fActions["Open-tb"]->setIcon(QIcon(QPixmap(":/icons/document-open-dark.svg")));
-    fActions["Reload-tb"]->setIcon(QIcon(QPixmap(":/icons/view-refresh-dark.svg")));
-    fActions["Save-tb"]->setIcon(QIcon(QPixmap(":/icons/document-save-dark.svg")));
-    fActions["Print-tb"]->setIcon(QIcon(QPixmap(":/icons/document-print-dark.svg")));
-    fActions["Undo-tb"]->setIcon(QIcon(QPixmap(":/icons/edit-undo-dark.svg")));
-    fActions["Redo-tb"]->setIcon(QIcon(QPixmap(":/icons/edit-redo-dark.svg")));
-    fActions["Copy-tb"]->setIcon(QIcon(QPixmap(":/icons/edit-copy-dark.svg")));
-    fActions["Cut-tb"]->setIcon(QIcon(QPixmap(":/icons/edit-cut-dark.svg")));
-    fActions["Paste-tb"]->setIcon(QIcon(QPixmap(":/icons/edit-paste-dark.svg")));
-    fActions["Find-tb"]->setIcon(QIcon(QPixmap(":/icons/edit-find-dark.svg")));
-    fActions["Find Next-tb"]->setIcon(QIcon(QPixmap(":/icons/go-next-use-dark.svg")));
-    fActions["Find Previous-tb"]->setIcon(QIcon(QPixmap(":/icons/go-previous-use-dark.svg")));
-    fActions["musrWiz-tb"]->setIcon(QIcon(QPixmap(":/icons/musrWiz-32x32-dark.svg")));
-    fActions["calcChisq-tb"]->setIcon(QIcon(QPixmap(":/icons/musrchisq-dark.svg")));
-    fActions["musrfit-tb"]->setIcon(QIcon(QPixmap(":/icons/musrfit-dark.svg")));
-    fActions["Swap Msr/Mlog-tb"]->setIcon(QIcon(QPixmap(":/icons/musrswap-dark.svg")));
-    fActions["musrStep-tb"]->setIcon(QIcon(QPixmap(":/icons/musrStep-32x32-dark.svg")));
-    fActions["msr2data-tb"]->setIcon(QIcon(QPixmap(":/icons/msr2data-dark.svg")));
-    fActions["mupp-tb"]->setIcon(QIcon(QPixmap(":/icons/mupp-dark.svg")));
-    fActions["musrview2dat-tb"]->setIcon(QIcon(QPixmap(":/icons/musrview2dat-dark.svg")));
-    fActions["musrview-tb"]->setIcon(QIcon(QPixmap(":/icons/musrview-dark.svg")));
-    fActions["musrt0-tb"]->setIcon(QIcon(QPixmap(":/icons/musrt0-dark.svg")));
-    fActions["musrFT-tb"]->setIcon(QIcon(QPixmap(":/icons/musrFT-dark.svg")));
-    fActions["musrprefs-tb"]->setIcon(QIcon(QPixmap(":/icons/musrprefs-dark.svg")));
-    fActions["musrdump-tb"]->setIcon(QIcon(QPixmap(":/icons/musrdump-dark.svg")));
+    fActions["New-tb"]->setIcon(QIcon(":/icons/document-new-dark.svg"));
+    fActions["Open-tb"]->setIcon(QIcon(":/icons/document-open-dark.svg"));
+    fActions["Reload-tb"]->setIcon(QIcon(":/icons/view-refresh-dark.svg"));
+    fActions["Save-tb"]->setIcon(QIcon(":/icons/document-save-dark.svg"));
+    fActions["Print-tb"]->setIcon(QIcon(":/icons/document-print-dark.svg"));
+    fActions["Undo-tb"]->setIcon(QIcon(":/icons/edit-undo-dark.svg"));
+    fActions["Redo-tb"]->setIcon(QIcon(":/icons/edit-redo-dark.svg"));
+    fActions["Copy-tb"]->setIcon(QIcon(":/icons/edit-copy-dark.svg"));
+    fActions["Cut-tb"]->setIcon(QIcon(":/icons/edit-cut-dark.svg"));
+    fActions["Paste-tb"]->setIcon(QIcon(":/icons/edit-paste-dark.svg"));
+    fActions["Find-tb"]->setIcon(QIcon(":/icons/edit-find-dark.svg"));
+    fActions["Find Next-tb"]->setIcon(QIcon(":/icons/go-next-use-dark.svg"));
+    fActions["Find Previous-tb"]->setIcon(QIcon(":/icons/go-previous-use-dark.svg"));
+    fActions["musrWiz-tb"]->setIcon(QIcon(":/icons/musrWiz-32x32-dark.svg"));
+    fActions["calcChisq-tb"]->setIcon(QIcon(":/icons/musrchisq-dark.svg"));
+    fActions["musrfit-tb"]->setIcon(QIcon(":/icons/musrfit-dark.svg"));
+    fActions["Swap Msr/Mlog-tb"]->setIcon(QIcon(":/icons/musrswap-dark.svg"));
+    fActions["musrStep-tb"]->setIcon(QIcon(":/icons/musrStep-32x32-dark.svg"));
+    fActions["msr2data-tb"]->setIcon(QIcon(":/icons/msr2data-dark.svg"));
+    fActions["mupp-tb"]->setIcon(QIcon(":/icons/mupp-dark.svg"));
+    fActions["musrview2dat-tb"]->setIcon(QIcon(":/icons/musrview2dat-dark.svg"));
+    fActions["musrview-tb"]->setIcon(QIcon(":/icons/musrview-dark.svg"));
+    fActions["musrt0-tb"]->setIcon(QIcon(":/icons/musrt0-dark.svg"));
+    fActions["musrFT-tb"]->setIcon(QIcon(":/icons/musrFT-dark.svg"));
+    fActions["musrprefs-tb"]->setIcon(QIcon(":/icons/musrprefs-dark.svg"));
+    fActions["musrdump-tb"]->setIcon(QIcon(":/icons/musrdump-dark.svg"));
   } else { // plain theme icons
-    fActions["New-tb"]->setIcon(QIcon(QPixmap(":/icons/document-new-plain.svg")));
-    fActions["Open-tb"]->setIcon(QIcon(QPixmap(":/icons/document-open-plain.svg")));
-    fActions["Reload-tb"]->setIcon(QIcon(QPixmap(":/icons/view-refresh-plain.svg")));
-    fActions["Save-tb"]->setIcon(QIcon(QPixmap(":/icons/document-save-plain.svg")));
-    fActions["Print-tb"]->setIcon(QIcon(QPixmap(":/icons/document-print-plain.svg")));
-    fActions["Undo-tb"]->setIcon(QIcon(QPixmap(":/icons/edit-undo-plain.svg")));
-    fActions["Redo-tb"]->setIcon(QIcon(QPixmap(":/icons/edit-redo-plain.svg")));
-    fActions["Copy-tb"]->setIcon(QIcon(QPixmap(":/icons/edit-copy-plain.svg")));
-    fActions["Cut-tb"]->setIcon(QIcon(QPixmap(":/icons/edit-cut-plain.svg")));
-    fActions["Paste-tb"]->setIcon(QIcon(QPixmap(":/icons/edit-paste-plain.svg")));
-    fActions["Find-tb"]->setIcon(QIcon(QPixmap(":/icons/edit-find-plain.svg")));
-    fActions["Find Next-tb"]->setIcon(QIcon(QPixmap(":/icons/go-next-use-plain.svg")));
-    fActions["Find Previous-tb"]->setIcon(QIcon(QPixmap(":/icons/go-previous-use-plain.svg")));
-    fActions["musrWiz-tb"]->setIcon(QIcon(QPixmap(":/icons/musrWiz-32x32.svg")));
-    fActions["calcChisq-tb"]->setIcon(QIcon(QPixmap(":/icons/musrchisq-plain.svg")));
-    fActions["musrfit-tb"]->setIcon(QIcon(QPixmap(":/icons/musrfit-plain.svg")));
-    fActions["Swap Msr/Mlog-tb"]->setIcon(QIcon(QPixmap(":/icons/musrswap-plain.svg")));
-    fActions["musrStep-tb"]->setIcon(QIcon(QPixmap(":/icons/musrStep-32x32.svg")));
-    fActions["msr2data-tb"]->setIcon(QIcon(QPixmap(":/icons/msr2data-plain.svg")));
-    fActions["mupp-tb"]->setIcon(QIcon(QPixmap(":/icons/mupp-plain.svg")));
-    fActions["musrview2dat-tb"]->setIcon(QIcon(QPixmap(":/icons/musrview2dat-plain.svg")));
-    fActions["musrview-tb"]->setIcon(QIcon(QPixmap(":/icons/musrview-plain.svg")));
-    fActions["musrt0-tb"]->setIcon(QIcon(QPixmap(":/icons/musrt0-plain.svg")));
-    fActions["musrFT-tb"]->setIcon(QIcon(QPixmap(":/icons/musrFT-plain.svg")));
-    fActions["musrprefs-tb"]->setIcon(QIcon(QPixmap(":/icons/musrprefs-plain.svg")));
-    fActions["musrdump-tb"]->setIcon(QIcon(QPixmap(":/icons/musrdump-plain.svg")));
+    fActions["New-tb"]->setIcon(QIcon(":/icons/document-new-plain.svg"));
+    fActions["Open-tb"]->setIcon(QIcon(":/icons/document-open-plain.svg"));
+    fActions["Reload-tb"]->setIcon(QIcon(":/icons/view-refresh-plain.svg"));
+    fActions["Save-tb"]->setIcon(QIcon(":/icons/document-save-plain.svg"));
+    fActions["Print-tb"]->setIcon(QIcon(":/icons/document-print-plain.svg"));
+    fActions["Undo-tb"]->setIcon(QIcon(":/icons/edit-undo-plain.svg"));
+    fActions["Redo-tb"]->setIcon(QIcon(":/icons/edit-redo-plain.svg"));
+    fActions["Copy-tb"]->setIcon(QIcon(":/icons/edit-copy-plain.svg"));
+    fActions["Cut-tb"]->setIcon(QIcon(":/icons/edit-cut-plain.svg"));
+    fActions["Paste-tb"]->setIcon(QIcon(":/icons/edit-paste-plain.svg"));
+    fActions["Find-tb"]->setIcon(QIcon(":/icons/edit-find-plain.svg"));
+    fActions["Find Next-tb"]->setIcon(QIcon(":/icons/go-next-use-plain.svg"));
+    fActions["Find Previous-tb"]->setIcon(QIcon(":/icons/go-previous-use-plain.svg"));
+    fActions["musrWiz-tb"]->setIcon(QIcon(":/icons/musrWiz-32x32.svg"));
+    fActions["calcChisq-tb"]->setIcon(QIcon(":/icons/musrchisq-plain.svg"));
+    fActions["musrfit-tb"]->setIcon(QIcon(":/icons/musrfit-plain.svg"));
+    fActions["Swap Msr/Mlog-tb"]->setIcon(QIcon(":/icons/musrswap-plain.svg"));
+    fActions["musrStep-tb"]->setIcon(QIcon(":/icons/musrStep-32x32.svg"));
+    fActions["msr2data-tb"]->setIcon(QIcon(":/icons/msr2data-plain.svg"));
+    fActions["mupp-tb"]->setIcon(QIcon(":/icons/mupp-plain.svg"));
+    fActions["musrview2dat-tb"]->setIcon(QIcon(":/icons/musrview2dat-plain.svg"));
+    fActions["musrview-tb"]->setIcon(QIcon(":/icons/musrview-plain.svg"));
+    fActions["musrt0-tb"]->setIcon(QIcon(":/icons/musrt0-plain.svg"));
+    fActions["musrFT-tb"]->setIcon(QIcon(":/icons/musrFT-plain.svg"));
+    fActions["musrprefs-tb"]->setIcon(QIcon(":/icons/musrprefs-plain.svg"));
+    fActions["musrdump-tb"]->setIcon(QIcon(":/icons/musrdump-plain.svg"));
   }
 }