diff --git a/tools/lammps-gui/application-exit.png b/tools/lammps-gui/application-exit.png
new file mode 100644
index 0000000000..2d0cd61bd3
Binary files /dev/null and b/tools/lammps-gui/application-exit.png differ
diff --git a/tools/lammps-gui/document-revert.png b/tools/lammps-gui/document-revert.png
new file mode 100644
index 0000000000..0dcc72a2d1
Binary files /dev/null and b/tools/lammps-gui/document-revert.png differ
diff --git a/tools/lammps-gui/edit-copy.png b/tools/lammps-gui/edit-copy.png
new file mode 100644
index 0000000000..3e95555a4e
Binary files /dev/null and b/tools/lammps-gui/edit-copy.png differ
diff --git a/tools/lammps-gui/edit-cut.png b/tools/lammps-gui/edit-cut.png
new file mode 100644
index 0000000000..804d0cdb43
Binary files /dev/null and b/tools/lammps-gui/edit-cut.png differ
diff --git a/tools/lammps-gui/edit-paste.png b/tools/lammps-gui/edit-paste.png
new file mode 100644
index 0000000000..65ac12ed87
Binary files /dev/null and b/tools/lammps-gui/edit-paste.png differ
diff --git a/tools/lammps-gui/edit-redo.png b/tools/lammps-gui/edit-redo.png
new file mode 100644
index 0000000000..bcf329ad23
Binary files /dev/null and b/tools/lammps-gui/edit-redo.png differ
diff --git a/tools/lammps-gui/edit-undo.png b/tools/lammps-gui/edit-undo.png
new file mode 100644
index 0000000000..92e643aa5e
Binary files /dev/null and b/tools/lammps-gui/edit-undo.png differ
diff --git a/tools/lammps-gui/emblem-default.png b/tools/lammps-gui/emblem-default.png
new file mode 100644
index 0000000000..84fe175a0e
Binary files /dev/null and b/tools/lammps-gui/emblem-default.png differ
diff --git a/tools/lammps-gui/emblem-photos.png b/tools/lammps-gui/emblem-photos.png
new file mode 100644
index 0000000000..d5b222fe4e
Binary files /dev/null and b/tools/lammps-gui/emblem-photos.png differ
diff --git a/tools/lammps-gui/help-about.png b/tools/lammps-gui/help-about.png
new file mode 100644
index 0000000000..45b5d62062
Binary files /dev/null and b/tools/lammps-gui/help-about.png differ
diff --git a/tools/lammps-gui/help-faq.png b/tools/lammps-gui/help-faq.png
new file mode 100644
index 0000000000..1d57544fcf
Binary files /dev/null and b/tools/lammps-gui/help-faq.png differ
diff --git a/tools/lammps-gui/lammpsgui.qrc b/tools/lammps-gui/lammpsgui.qrc
index 36b1ca1c2c..59a34acc5e 100644
--- a/tools/lammps-gui/lammpsgui.qrc
+++ b/tools/lammps-gui/lammpsgui.qrc
@@ -16,5 +16,23 @@
         <file>document-open-recent.png</file>
         <file>document-open.png</file>
         <file>document-new.png</file>
+        <file>edit-undo.png</file>
+        <file>edit-redo.png</file>
+        <file>edit-paste.png</file>
+        <file>edit-cut.png</file>
+        <file>edit-copy.png</file>
+        <file>application-exit.png</file>
+        <file>utilities-terminal.png</file>
+        <file>x-office-drawing.png</file>
+        <file>document-save.png</file>
+        <file>document-revert.png</file>
+        <file>preferences-desktop.png</file>
+        <file>preferences-desktop-personal.png</file>
+        <file>preferences-desktop-font.png</file>
+        <file>help-faq.png</file>
+        <file>help-about.png</file>
+        <file>emblem-photos.png</file>
+        <file>process-stop.png</file>
+        <file>emblem-default.png</file>
     </qresource>
 </RCC>
diff --git a/tools/lammps-gui/lammpsgui.ui b/tools/lammps-gui/lammpsgui.ui
index fa1b3279d4..06a366387f 100644
--- a/tools/lammps-gui/lammpsgui.ui
+++ b/tools/lammps-gui/lammpsgui.ui
@@ -100,248 +100,172 @@
   <widget class="QStatusBar" name="statusbar"/>
   <action name="actionNew">
    <property name="icon">
-    <iconset theme="document-new">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme=":/document-new.png"/>
    </property>
    <property name="text">
     <string>&amp;New</string>
    </property>
-   <property name="toolTip">
-    <string>Start a New Input File</string>
-   </property>
-   <property name="statusTip">
-    <string>Start a New Input File</string>
-   </property>
    <property name="shortcut">
     <string>Ctrl+N</string>
    </property>
   </action>
   <action name="actionOpen">
    <property name="icon">
-    <iconset theme="document-open">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme=":/document-open.png"/>
    </property>
    <property name="text">
     <string>&amp;Open</string>
    </property>
-   <property name="toolTip">
-    <string>Open an Input File</string>
-   </property>
-   <property name="statusTip">
-    <string>Open an Input File</string>
-   </property>
    <property name="shortcut">
     <string>Ctrl+O</string>
    </property>
   </action>
   <action name="actionSave">
    <property name="icon">
-    <iconset theme="document-save">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme=":/document-save.png"/>
    </property>
    <property name="text">
     <string>&amp;Save</string>
    </property>
-   <property name="toolTip">
-    <string>Save Input File</string>
-   </property>
-   <property name="statusTip">
-    <string>Save Input File</string>
-   </property>
    <property name="shortcut">
     <string>Ctrl+S</string>
    </property>
   </action>
   <action name="actionSave_As">
    <property name="icon">
-    <iconset theme="document-save-as">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme=":/document-save-as.png"/>
    </property>
    <property name="text">
     <string>Save &amp;As</string>
    </property>
-   <property name="toolTip">
-    <string>Save Input File As...</string>
-   </property>
-   <property name="statusTip">
-    <string>Save Input File As...</string>
-   </property>
    <property name="shortcut">
     <string>Ctrl+Shift+S</string>
    </property>
   </action>
   <action name="actionQuit">
    <property name="icon">
-    <iconset theme="application-exit">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme=":/application-exit.png"/>
    </property>
    <property name="text">
     <string>&amp;Quit</string>
    </property>
-   <property name="toolTip">
-    <string>Quit LAMMPS-GUI</string>
-   </property>
-   <property name="statusTip">
-    <string>Quit LAMMPS-GUI</string>
-   </property>
    <property name="shortcut">
     <string>Ctrl+Q</string>
    </property>
   </action>
   <action name="actionCut">
    <property name="icon">
-    <iconset theme="edit-cut">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme=":/edit-cut.png"/>
    </property>
    <property name="text">
     <string>Cu&amp;t</string>
    </property>
-   <property name="statusTip">
-    <string>Cut Selected Text to Clipboard</string>
-   </property>
    <property name="shortcut">
     <string>Ctrl+X</string>
    </property>
   </action>
   <action name="actionCopy">
    <property name="icon">
-    <iconset theme="edit-copy">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme=":/edit-copy.png"/>
    </property>
    <property name="text">
     <string>&amp;Copy</string>
    </property>
-   <property name="statusTip">
-    <string>Copy Selected Text to Clipboard</string>
-   </property>
    <property name="shortcut">
     <string>Ctrl+C</string>
    </property>
   </action>
   <action name="actionPaste">
    <property name="icon">
-    <iconset theme="edit-paste">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme=":/edit-paste.png"/>
    </property>
    <property name="text">
     <string>&amp;Paste</string>
    </property>
-   <property name="statusTip">
-    <string>Paste Text from Clipboard</string>
-   </property>
    <property name="shortcut">
     <string>Ctrl+V</string>
    </property>
   </action>
   <action name="actionUndo">
    <property name="icon">
-    <iconset theme="edit-undo">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme=":/edit-undo.png"/>
    </property>
    <property name="text">
     <string>&amp;Undo</string>
    </property>
-   <property name="statusTip">
-    <string>Undo Edit</string>
-   </property>
    <property name="shortcut">
     <string>Ctrl+Z</string>
    </property>
   </action>
   <action name="actionRedo">
    <property name="icon">
-    <iconset theme="edit-redo">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme=":/edit-redo.png"/>
    </property>
    <property name="text">
     <string>&amp;Redo</string>
    </property>
-   <property name="statusTip">
-    <string>Redo Edit</string>
-   </property>
    <property name="shortcut">
     <string>Ctrl+Shift+Z</string>
    </property>
   </action>
   <action name="actionRun_Buffer">
    <property name="icon">
-    <iconset theme="emblem-default">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme=":/emblem-default.png"/>
    </property>
    <property name="text">
     <string>&amp;Run LAMMPS</string>
    </property>
-   <property name="toolTip">
-    <string>Run LAMMPS with Input</string>
-   </property>
    <property name="shortcut">
     <string>Ctrl+Return</string>
    </property>
   </action>
   <action name="actionStop_LAMMPS">
    <property name="icon">
-    <iconset theme="process-stop">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme=":/process-stop.png"/>
    </property>
    <property name="text">
     <string>&amp;Stop LAMMPS</string>
    </property>
-   <property name="toolTip">
-    <string>Stop LAMMPS Process</string>
-   </property>
    <property name="shortcut">
     <string>Ctrl+/</string>
    </property>
   </action>
   <action name="actionImage">
    <property name="icon">
-    <iconset theme="emblem-photos">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme=":/emblem-photos.png"/>
    </property>
    <property name="text">
     <string>View &amp;Image</string>
    </property>
-   <property name="toolTip">
-    <string>View Snapshot image of current LAMMPS state</string>
-   </property>
    <property name="shortcut">
     <string>Ctrl+I</string>
    </property>
   </action>
   <action name="actionAbout_LAMMPS_GUI">
    <property name="icon">
-    <iconset theme="help-about">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme=":/help-about.png"/>
    </property>
    <property name="text">
     <string>&amp;About LAMMPS-GUI</string>
    </property>
-   <property name="toolTip">
-    <string>About LAMMPS-GUI</string>
-   </property>
    <property name="shortcut">
     <string>Ctrl+Shift+A</string>
    </property>
   </action>
   <action name="action_Help">
    <property name="icon">
-    <iconset theme="help-faq">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme=":/help-faq.png"/>
    </property>
    <property name="text">
     <string>Quick &amp;Help</string>
    </property>
-   <property name="toolTip">
-    <string>Quick Help</string>
-   </property>
    <property name="shortcut">
     <string>Ctrl+Shift+H</string>
    </property>
   </action>
   <action name="actionPreferences">
    <property name="icon">
-    <iconset theme="preferences-desktop">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme=":/preferences-desktop.png"/>
    </property>
    <property name="text">
     <string>Pre&amp;ferences...</string>
@@ -352,8 +276,7 @@
   </action>
   <action name="actionLAMMPS_Manual">
    <property name="icon">
-    <iconset theme="help-browser">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme=":/help-browser.png"/>
    </property>
    <property name="text">
     <string>LAMMPS &amp;Manual</string>
@@ -364,8 +287,7 @@
   </action>
   <action name="actionDefaults">
    <property name="icon">
-    <iconset theme="document-revert">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme=":/document-revert.png"/>
    </property>
    <property name="text">
     <string>Reset to &amp;Defaults</string>
@@ -373,8 +295,7 @@
   </action>
   <action name="actionView_Log_Window">
    <property name="icon">
-    <iconset theme="utilities-terminal">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme=":/utilities-terminal.png"/>
    </property>
    <property name="text">
     <string>&amp;Log Window</string>
@@ -385,8 +306,7 @@
   </action>
   <action name="actionView_Graph_Window">
    <property name="icon">
-    <iconset theme="x-office-drawing">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme=":/x-office-drawing.png"/>
    </property>
    <property name="text">
     <string>&amp;Chart Window</string>
@@ -429,8 +349,7 @@
   </action>
   <action name="action_5">
    <property name="icon">
-    <iconset>
-            <normaloff>:/document-open-recent.png</normaloff>:/document-open-recent.png</iconset>
+    <iconset theme=":/document-open-recent.png"/>
    </property>
    <property name="text">
     <string>&amp;5.</string>
@@ -438,8 +357,7 @@
   </action>
   <action name="actionView_Image_Window">
    <property name="icon">
-    <iconset theme="emblem-photos">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme=":/emblem-photos.png"/>
    </property>
    <property name="text">
     <string>&amp;Image Window</string>
@@ -450,8 +368,7 @@
   </action>
   <action name="actionSet_Variables">
    <property name="icon">
-    <iconset theme="preferences-desktop-personal">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme=":/preferences-desktop-personal.png"/>
    </property>
    <property name="text">
     <string>Set &amp;Variables...</string>
@@ -462,8 +379,7 @@
   </action>
   <action name="actionLAMMPS_GUI_Howto">
    <property name="icon">
-    <iconset>
-     <normaloff>:/system-help.png</normaloff>:/system-help.png</iconset>
+    <iconset theme=":/system-help.png"/>
    </property>
    <property name="text">
     <string>LAMMPS GUI Howto</string>
diff --git a/tools/lammps-gui/preferences-desktop-font.png b/tools/lammps-gui/preferences-desktop-font.png
new file mode 100644
index 0000000000..383eaa6ca1
Binary files /dev/null and b/tools/lammps-gui/preferences-desktop-font.png differ
diff --git a/tools/lammps-gui/preferences-desktop-personal.png b/tools/lammps-gui/preferences-desktop-personal.png
new file mode 100644
index 0000000000..dd4718435d
Binary files /dev/null and b/tools/lammps-gui/preferences-desktop-personal.png differ
diff --git a/tools/lammps-gui/preferences-desktop.png b/tools/lammps-gui/preferences-desktop.png
new file mode 100644
index 0000000000..208c6ef101
Binary files /dev/null and b/tools/lammps-gui/preferences-desktop.png differ
diff --git a/tools/lammps-gui/preferences.cpp b/tools/lammps-gui/preferences.cpp
index 0cd8b19a3a..a35d8713e4 100644
--- a/tools/lammps-gui/preferences.cpp
+++ b/tools/lammps-gui/preferences.cpp
@@ -28,6 +28,7 @@
 #include <QFontDialog>
 #include <QGroupBox>
 #include <QHBoxLayout>
+#include <QIcon>
 #include <QIntValidator>
 #include <QLabel>
 #include <QLineEdit>
@@ -182,9 +183,11 @@ GeneralTab::GeneralTab(QSettings *_settings, LammpsWrapper *_lammps, QWidget *pa
     connect(pluginbrowse, &QPushButton::released, this, &GeneralTab::pluginpath);
 #endif
 
-    auto *fontlayout  = new QHBoxLayout;
-    auto *getallfont  = new QPushButton("Select Default Font...");
-    auto *gettextfont = new QPushButton("Select Text Font...");
+    auto *fontlayout = new QHBoxLayout;
+    auto *getallfont =
+        new QPushButton(QIcon(":/preferences-desktop-font.png"), "Select Default Font...");
+    auto *gettextfont =
+        new QPushButton(QIcon(":/preferences-desktop-font.png"), "Select Text Font...");
     fontlayout->addWidget(getallfont);
     fontlayout->addWidget(gettextfont);
     connect(getallfont, &QPushButton::released, this, &GeneralTab::newallfont);
diff --git a/tools/lammps-gui/process-stop.png b/tools/lammps-gui/process-stop.png
new file mode 100644
index 0000000000..5f547cfee3
Binary files /dev/null and b/tools/lammps-gui/process-stop.png differ
diff --git a/tools/lammps-gui/utilities-terminal.png b/tools/lammps-gui/utilities-terminal.png
new file mode 100644
index 0000000000..362f7636f9
Binary files /dev/null and b/tools/lammps-gui/utilities-terminal.png differ
diff --git a/tools/lammps-gui/x-office-drawing.png b/tools/lammps-gui/x-office-drawing.png
new file mode 100644
index 0000000000..e93899922e
Binary files /dev/null and b/tools/lammps-gui/x-office-drawing.png differ