diff --git a/src/apps/deskflow-gui/MainWindow.cpp b/src/apps/deskflow-gui/MainWindow.cpp
index 42cc6a981..65965a6b6 100644
--- a/src/apps/deskflow-gui/MainWindow.cpp
+++ b/src/apps/deskflow-gui/MainWindow.cpp
@@ -80,7 +80,7 @@ MainWindow::MainWindow(ConfigScopes &configScopes, AppConfig &appConfig)
       m_guiDupeChecker{new QLocalServer(this)},
       m_actionAbout{new QAction(this)},
       m_actionClearSettings{new QAction(tr("Clear settings"), this)},
-      m_actionHelp{new QAction(tr("Report a Bug"), this)},
+      m_actionReportBug{new QAction(tr("Report a Bug"), this)},
       m_actionMinimize{new QAction(tr("&Minimize to tray"), this)},
       m_actionQuit{new QAction(tr("&Quit"), this)},
       m_actionTrayQuit{new QAction(tr("&Quit"), this)},
@@ -117,6 +117,8 @@ MainWindow::MainWindow(ConfigScopes &configScopes, AppConfig &appConfig)
   m_actionStartCore->setShortcut(QKeySequence(tr("Ctrl+S")));
   m_actionStopCore->setShortcut(QKeySequence(tr("Ctrl+T")));
 
+  m_actionReportBug->setIcon(QIcon(QIcon::fromTheme(QStringLiteral("tools-report-bug"))));
+
 #ifdef Q_OS_MAC
   ui->btnToggleLog->setFixedHeight(ui->lblLog->height() * 0.6);
 #endif
@@ -258,7 +260,7 @@ void MainWindow::connectSlots()
 
   connect(m_actionAbout, &QAction::triggered, this, &MainWindow::openAboutDialog);
   connect(m_actionClearSettings, &QAction::triggered, this, &MainWindow::clearSettings);
-  connect(m_actionHelp, &QAction::triggered, this, &MainWindow::openHelpUrl);
+  connect(m_actionReportBug, &QAction::triggered, this, &MainWindow::openHelpUrl);
   connect(m_actionMinimize, &QAction::triggered, this, &MainWindow::hide);
 
   connect(m_actionQuit, &QAction::triggered, this, &MainWindow::close);
@@ -570,7 +572,7 @@ void MainWindow::createMenuBar()
 
   auto menuHelp = new QMenu(tr("Help"));
   menuHelp->addAction(m_actionAbout);
-  menuHelp->addAction(m_actionHelp);
+  menuHelp->addAction(m_actionReportBug);
   menuHelp->addSeparator();
   menuHelp->addAction(m_actionClearSettings);
 
diff --git a/src/apps/deskflow-gui/MainWindow.h b/src/apps/deskflow-gui/MainWindow.h
index 09f1c793e..d2ae0db11 100644
--- a/src/apps/deskflow-gui/MainWindow.h
+++ b/src/apps/deskflow-gui/MainWindow.h
@@ -203,7 +203,7 @@ private:
   // Window Actions
   QAction *m_actionAbout = nullptr;
   QAction *m_actionClearSettings = nullptr;
-  QAction *m_actionHelp = nullptr;
+  QAction *m_actionReportBug = nullptr;
   QAction *m_actionMinimize = nullptr;
   QAction *m_actionQuit = nullptr;
   QAction *m_actionTrayQuit = nullptr;
diff --git a/src/apps/res/deskflow.qrc b/src/apps/res/deskflow.qrc
index 64fe0445e..c0f37fdca 100644
--- a/src/apps/res/deskflow.qrc
+++ b/src/apps/res/deskflow.qrc
@@ -2,10 +2,13 @@
     <qresource prefix="/">
         <file>icons/deskflow-dark/actions/16/edit-copy.svg</file>
         <file>icons/deskflow-dark/actions/16/document-open.svg</file>
+        <file>icons/deskflow-dark/actions/16/tools-report-bug.svg</file>
         <file>icons/deskflow-dark/actions/22/edit-copy.svg</file>
         <file>icons/deskflow-dark/actions/22/document-open.svg</file>
+        <file>icons/deskflow-dark/actions/22/tools-report-bug.svg</file>
         <file>icons/deskflow-dark/actions/24/edit-copy.svg</file>
         <file>icons/deskflow-dark/actions/24/document-open.svg</file>
+        <file>icons/deskflow-dark/actions/24/tools-report-bug.svg</file>
         <file>icons/deskflow-dark/actions/32/dialog-cancel.svg</file>
         <file>icons/deskflow-dark/actions/32/dialog-ok.svg</file>
         <file>icons/deskflow-dark/actions/32/dialog-ok-apply.svg</file>
@@ -25,10 +28,13 @@
         <file>icons/deskflow-dark/index.theme</file>
         <file>icons/deskflow-light/actions/16/edit-copy.svg</file>
         <file>icons/deskflow-light/actions/16/document-open.svg</file>
+        <file>icons/deskflow-light/actions/16/tools-report-bug.svg</file>
         <file>icons/deskflow-light/actions/22/edit-copy.svg</file>
         <file>icons/deskflow-light/actions/22/document-open.svg</file>
+        <file>icons/deskflow-light/actions/22/tools-report-bug.svg</file>
         <file>icons/deskflow-light/actions/24/edit-copy.svg</file>
         <file>icons/deskflow-light/actions/24/document-open.svg</file>
+        <file>icons/deskflow-light/actions/24/tools-report-bug.svg</file>
         <file>icons/deskflow-light/actions/32/dialog-cancel.svg</file>
         <file>icons/deskflow-light/actions/32/dialog-ok.svg</file>
         <file>icons/deskflow-light/actions/32/dialog-ok-apply.svg</file>
diff --git a/src/apps/res/icons/deskflow-dark/actions/16/tools-report-bug.svg b/src/apps/res/icons/deskflow-dark/actions/16/tools-report-bug.svg
new file mode 100644
index 000000000..1a3dc89fc
--- /dev/null
+++ b/src/apps/res/icons/deskflow-dark/actions/16/tools-report-bug.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">.ColorScheme-Text { color: #fcfcfc; } </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" d="m2 2v12h12v-12zm1 1h10v10h-10zm1 2v2h2v-2zm6 0v2h2v-2zm-4 4v1h4v-1zm4 1v1h1v-1zm1 1v1h1v-1zm-5-1h-1v1h1zm-1 1h-1v1h1z" class="ColorScheme-Text"/>
+</svg>
diff --git a/src/apps/res/icons/deskflow-dark/actions/22/tools-report-bug.svg b/src/apps/res/icons/deskflow-dark/actions/22/tools-report-bug.svg
new file mode 100644
index 000000000..d0249a177
--- /dev/null
+++ b/src/apps/res/icons/deskflow-dark/actions/22/tools-report-bug.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">.ColorScheme-Text { color: #fcfcfc; } </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" d="M 3 3 L 3 19 L 4 19 L 19 19 L 19 18 L 19 3 L 18 3 L 4 3 L 3 3 z M 4 4 L 18 4 L 18 18 L 4 18 L 4 4 z M 5 5 L 5 6 L 6 6 L 6 5 L 5 5 z M 6 6 L 6 8 L 8 8 L 8 6 L 6 6 z M 8 6 L 9 6 L 9 5 L 8 5 L 8 6 z M 8 8 L 8 9 L 9 9 L 9 8 L 8 8 z M 6 8 L 5 8 L 5 9 L 6 9 L 6 8 z M 13 5 L 13 6 L 14 6 L 14 5 L 13 5 z M 14 6 L 14 8 L 16 8 L 16 6 L 14 6 z M 16 6 L 17 6 L 17 5 L 16 5 L 16 6 z M 16 8 L 16 9 L 17 9 L 17 8 L 16 8 z M 14 8 L 13 8 L 13 9 L 14 9 L 14 8 z M 9 11 L 9 13 L 13 13 L 13 11 L 9 11 z M 13 13 L 13 15 L 15 15 L 15 13 L 13 13 z M 15 15 L 15 17 L 17 17 L 17 15 L 15 15 z M 9 13 L 7 13 L 7 15 L 9 15 L 9 13 z M 7 15 L 5 15 L 5 17 L 7 17 L 7 15 z " class="ColorScheme-Text"/>  
+</svg>
diff --git a/src/apps/res/icons/deskflow-dark/actions/24/tools-report-bug.svg b/src/apps/res/icons/deskflow-dark/actions/24/tools-report-bug.svg
new file mode 100644
index 000000000..5a700d527
--- /dev/null
+++ b/src/apps/res/icons/deskflow-dark/actions/24/tools-report-bug.svg
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">.ColorScheme-Text { color: #fcfcfc; } </style>
+  </defs>
+  <g transform="translate(1,1)">
+    <path style="fill:currentColor;fill-opacity:1;stroke:none" d="M 3 3 L 3 19 L 4 19 L 19 19 L 19 18 L 19 3 L 18 3 L 4 3 L 3 3 z M 4 4 L 18 4 L 18 18 L 4 18 L 4 4 z M 5 5 L 5 6 L 6 6 L 6 5 L 5 5 z M 6 6 L 6 8 L 8 8 L 8 6 L 6 6 z M 8 6 L 9 6 L 9 5 L 8 5 L 8 6 z M 8 8 L 8 9 L 9 9 L 9 8 L 8 8 z M 6 8 L 5 8 L 5 9 L 6 9 L 6 8 z M 13 5 L 13 6 L 14 6 L 14 5 L 13 5 z M 14 6 L 14 8 L 16 8 L 16 6 L 14 6 z M 16 6 L 17 6 L 17 5 L 16 5 L 16 6 z M 16 8 L 16 9 L 17 9 L 17 8 L 16 8 z M 14 8 L 13 8 L 13 9 L 14 9 L 14 8 z M 9 11 L 9 13 L 13 13 L 13 11 L 9 11 z M 13 13 L 13 15 L 15 15 L 15 13 L 13 13 z M 15 15 L 15 17 L 17 17 L 17 15 L 15 15 z M 9 13 L 7 13 L 7 15 L 9 15 L 9 13 z M 7 15 L 5 15 L 5 17 L 7 17 L 7 15 z " class="ColorScheme-Text"/>
+  </g>
+</svg>
diff --git a/src/apps/res/icons/deskflow-light/actions/16/tools-report-bug.svg b/src/apps/res/icons/deskflow-light/actions/16/tools-report-bug.svg
new file mode 100644
index 000000000..4f41ad6b8
--- /dev/null
+++ b/src/apps/res/icons/deskflow-light/actions/16/tools-report-bug.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="m2 2v12h12v-12zm1 1h10v10h-10zm1 2v2h2v-2zm6 0v2h2v-2zm-4 4v1h4v-1zm4 1v1h1v-1zm1 1v1h1v-1zm-5-1h-1v1h1zm-1 1h-1v1h1z"
+     class="ColorScheme-Text"
+     />
+</svg>
diff --git a/src/apps/res/icons/deskflow-light/actions/22/tools-report-bug.svg b/src/apps/res/icons/deskflow-light/actions/22/tools-report-bug.svg
new file mode 100644
index 000000000..113a02f80
--- /dev/null
+++ b/src/apps/res/icons/deskflow-light/actions/22/tools-report-bug.svg
@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+ <path 
+    style="fill:currentColor;fill-opacity:1;stroke:none" 
+    d="M 3 3 L 3 19 L 4 19 L 19 19 L 19 18 L 19 3 L 18 3 L 4 3 L 3 3 z M 4 4 L 18 4 L 18 18 L 4 18 L 4 4 z M 5 5 L 5 6 L 6 6 L 6 5 L 5 5 z M 6 6 L 6 8 L 8 8 L 8 6 L 6 6 z M 8 6 L 9 6 L 9 5 L 8 5 L 8 6 z M 8 8 L 8 9 L 9 9 L 9 8 L 8 8 z M 6 8 L 5 8 L 5 9 L 6 9 L 6 8 z M 13 5 L 13 6 L 14 6 L 14 5 L 13 5 z M 14 6 L 14 8 L 16 8 L 16 6 L 14 6 z M 16 6 L 17 6 L 17 5 L 16 5 L 16 6 z M 16 8 L 16 9 L 17 9 L 17 8 L 16 8 z M 14 8 L 13 8 L 13 9 L 14 9 L 14 8 z M 9 11 L 9 13 L 13 13 L 13 11 L 9 11 z M 13 13 L 13 15 L 15 15 L 15 13 L 13 13 z M 15 15 L 15 17 L 17 17 L 17 15 L 15 15 z M 9 13 L 7 13 L 7 15 L 9 15 L 9 13 z M 7 15 L 5 15 L 5 17 L 7 17 L 7 15 z "
+    class="ColorScheme-Text"
+    />  
+</svg>
diff --git a/src/apps/res/icons/deskflow-light/actions/24/tools-report-bug.svg b/src/apps/res/icons/deskflow-light/actions/24/tools-report-bug.svg
new file mode 100644
index 000000000..840ef2ab3
--- /dev/null
+++ b/src/apps/res/icons/deskflow-light/actions/24/tools-report-bug.svg
@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+  <g transform="translate(1,1)">
+    <path style="fill:currentColor;fill-opacity:1;stroke:none" d="M 3 3 L 3 19 L 4 19 L 19 19 L 19 18 L 19 3 L 18 3 L 4 3 L 3 3 z M 4 4 L 18 4 L 18 18 L 4 18 L 4 4 z M 5 5 L 5 6 L 6 6 L 6 5 L 5 5 z M 6 6 L 6 8 L 8 8 L 8 6 L 6 6 z M 8 6 L 9 6 L 9 5 L 8 5 L 8 6 z M 8 8 L 8 9 L 9 9 L 9 8 L 8 8 z M 6 8 L 5 8 L 5 9 L 6 9 L 6 8 z M 13 5 L 13 6 L 14 6 L 14 5 L 13 5 z M 14 6 L 14 8 L 16 8 L 16 6 L 14 6 z M 16 6 L 17 6 L 17 5 L 16 5 L 16 6 z M 16 8 L 16 9 L 17 9 L 17 8 L 16 8 z M 14 8 L 13 8 L 13 9 L 14 9 L 14 8 z M 9 11 L 9 13 L 13 13 L 13 11 L 9 11 z M 13 13 L 13 15 L 15 15 L 15 13 L 13 13 z M 15 15 L 15 17 L 17 17 L 17 15 L 15 15 z M 9 13 L 7 13 L 7 15 L 9 15 L 9 13 z M 7 15 L 5 15 L 5 17 L 7 17 L 7 15 z " class="ColorScheme-Text"/>
+  </g>
+</svg>