diff --git a/src/gui/src/dialogs/ServerConfigDialog.cpp b/src/gui/src/dialogs/ServerConfigDialog.cpp
index ced945291a..469b215aae 100644
--- a/src/gui/src/dialogs/ServerConfigDialog.cpp
+++ b/src/gui/src/dialogs/ServerConfigDialog.cpp
@@ -44,6 +44,10 @@ ServerConfigDialog::ServerConfigDialog(QWidget *parent, ServerConfig &config, Ap
 {
   ui->setupUi(this);
 
+  const auto folderIcon =
+      QIcon::fromTheme(QIcon::ThemeIcon::DocumentOpen, QIcon(QStringLiteral(":/icons/64x64/folder.png")));
+  ui->m_pButtonBrowseConfigFile->setIcon(folderIcon);
+
   // force the first tab, since qt creator sets the active tab as the last one
   // the developer was looking at, and it's easy to accidentally save that.
   ui->m_pTabWidget->setCurrentIndex(0);
diff --git a/src/gui/src/dialogs/ServerConfigDialog.ui b/src/gui/src/dialogs/ServerConfigDialog.ui
index 3ee430a794..24f0bceb39 100644
--- a/src/gui/src/dialogs/ServerConfigDialog.ui
+++ b/src/gui/src/dialogs/ServerConfigDialog.ui
@@ -1098,16 +1098,6 @@ Enabling this setting will disable the server config GUI.</string>
            <property name="text">
             <string/>
            </property>
-           <property name="icon">
-            <iconset>
-             <normaloff>:/icons/64x64/folder.png</normaloff>:/icons/64x64/folder.png</iconset>
-           </property>
-           <property name="iconSize">
-            <size>
-             <width>20</width>
-             <height>13</height>
-            </size>
-           </property>
            <property name="flat">
             <bool>true</bool>
            </property>
diff --git a/src/gui/src/dialogs/SettingsDialog.cpp b/src/gui/src/dialogs/SettingsDialog.cpp
index 01d74cda6d..0268a91d87 100644
--- a/src/gui/src/dialogs/SettingsDialog.cpp
+++ b/src/gui/src/dialogs/SettingsDialog.cpp
@@ -50,6 +50,11 @@ SettingsDialog::SettingsDialog(
 
   ui->setupUi(this);
 
+  const auto folderIcon =
+      QIcon::fromTheme(QIcon::ThemeIcon::DocumentOpen, QIcon(QStringLiteral(":/icons/64x64/folder.png")));
+  ui->m_pPushButtonTlsCertPath->setIcon(folderIcon);
+  ui->m_pButtonBrowseLog->setIcon(folderIcon);
+
   // force the first tab, since qt creator sets the active tab as the last one
   // the developer was looking at, and it's easy to accidentally save that.
   ui->m_pTabWidget->setCurrentIndex(0);
diff --git a/src/gui/src/dialogs/SettingsDialog.ui b/src/gui/src/dialogs/SettingsDialog.ui
index cf2454d8c7..d3aeeaf43b 100644
--- a/src/gui/src/dialogs/SettingsDialog.ui
+++ b/src/gui/src/dialogs/SettingsDialog.ui
@@ -276,16 +276,6 @@
               <property name="text">
                <string/>
               </property>
-              <property name="icon">
-               <iconset>
-                <normaloff>:/icons/64x64/folder.png</normaloff>:/icons/64x64/folder.png</iconset>
-              </property>
-              <property name="iconSize">
-               <size>
-                <width>20</width>
-                <height>13</height>
-               </size>
-              </property>
               <property name="flat">
                <bool>true</bool>
               </property>
@@ -563,16 +553,6 @@
               <property name="text">
                <string/>
               </property>
-              <property name="icon">
-               <iconset>
-                <normaloff>:/icons/64x64/folder.png</normaloff>:/icons/64x64/folder.png</iconset>
-              </property>
-              <property name="iconSize">
-               <size>
-                <width>20</width>
-                <height>13</height>
-               </size>
-              </property>
               <property name="flat">
                <bool>true</bool>
               </property>