diff --git a/deploy/linux/deploy.cmake b/deploy/linux/deploy.cmake
index 203d84c21..39e97b3b9 100644
--- a/deploy/linux/deploy.cmake
+++ b/deploy/linux/deploy.cmake
@@ -16,9 +16,8 @@ install(FILES ${MY_DIR}/org.deskflow.deskflow.png DESTINATION share/icons/hicolo
 
 # Install our symbolic icon
 install(
-  FILES ${CMAKE_SOURCE_DIR}/src/apps/res/icons/deskflow-light/apps/64/deskflow-symbolic.svg
+  FILES ${CMAKE_SOURCE_DIR}/src/apps/res/icons/deskflow-light/apps/64/org.deskflow.deskflow-symbolic.svg
   DESTINATION share/icons/hicolor/symbolic/apps/
-  RENAME org.deskflow.deskflow-symbolic.svg
 )
 
 # Install our metainfo
diff --git a/src/apps/res/deskflow.qrc b/src/apps/res/deskflow.qrc
index c81ec246d..e6ea98f1d 100644
--- a/src/apps/res/deskflow.qrc
+++ b/src/apps/res/deskflow.qrc
@@ -57,8 +57,8 @@
         <file>icons/deskflow-dark/actions/32/document-save-as.svg</file>
         <file>icons/deskflow-dark/actions/32/help-about.svg</file>
         <file>icons/deskflow-dark/actions/32/view-refresh.svg</file>
-        <file>icons/deskflow-dark/apps/64/deskflow.svg</file>
-        <file>icons/deskflow-dark/apps/64/deskflow-symbolic.svg</file>
+        <file>icons/deskflow-dark/apps/64/org.deskflow.deskflow.svg</file>
+        <file>icons/deskflow-dark/apps/64/org.deskflow.deskflow-symbolic.svg</file>
         <file>icons/deskflow-dark/devices/64/video-display.svg</file>
         <file>icons/deskflow-dark/places/64/user-trash.svg</file>
         <file>icons/deskflow-dark/status/32/software-updates-release.svg</file>
@@ -130,8 +130,8 @@
         <file>icons/deskflow-light/actions/32/document-save-as.svg</file>
         <file>icons/deskflow-light/actions/32/help-about.svg</file>
         <file>icons/deskflow-light/actions/32/view-refresh.svg</file>
-        <file>icons/deskflow-light/apps/64/deskflow.svg</file>
-        <file>icons/deskflow-light/apps/64/deskflow-symbolic.svg</file>
+        <file>icons/deskflow-light/apps/64/org.deskflow.deskflow.svg</file>
+        <file>icons/deskflow-light/apps/64/org.deskflow.deskflow-symbolic.svg</file>
         <file>icons/deskflow-light/devices/64/video-display.svg</file>
         <file>icons/deskflow-light/status/32/software-updates-release.svg</file>
         <file>icons/deskflow-light/status/64/dialog-error.svg</file>
diff --git a/src/apps/res/icons/deskflow-dark/apps/64/deskflow-symbolic.svg b/src/apps/res/icons/deskflow-dark/apps/64/org.deskflow.deskflow-symbolic.svg
similarity index 100%
rename from src/apps/res/icons/deskflow-dark/apps/64/deskflow-symbolic.svg
rename to src/apps/res/icons/deskflow-dark/apps/64/org.deskflow.deskflow-symbolic.svg
diff --git a/src/apps/res/icons/deskflow-dark/apps/64/deskflow.svg b/src/apps/res/icons/deskflow-dark/apps/64/org.deskflow.deskflow.svg
similarity index 100%
rename from src/apps/res/icons/deskflow-dark/apps/64/deskflow.svg
rename to src/apps/res/icons/deskflow-dark/apps/64/org.deskflow.deskflow.svg
diff --git a/src/apps/res/icons/deskflow-light/apps/64/deskflow-symbolic.svg b/src/apps/res/icons/deskflow-light/apps/64/org.deskflow.deskflow-symbolic.svg
similarity index 100%
rename from src/apps/res/icons/deskflow-light/apps/64/deskflow-symbolic.svg
rename to src/apps/res/icons/deskflow-light/apps/64/org.deskflow.deskflow-symbolic.svg
diff --git a/src/apps/res/icons/deskflow-light/apps/64/deskflow.svg b/src/apps/res/icons/deskflow-light/apps/64/org.deskflow.deskflow.svg
similarity index 100%
rename from src/apps/res/icons/deskflow-light/apps/64/deskflow.svg
rename to src/apps/res/icons/deskflow-light/apps/64/org.deskflow.deskflow.svg
diff --git a/src/lib/gui/MainWindow.cpp b/src/lib/gui/MainWindow.cpp
index 770deff3e..1b77d6ee3 100644
--- a/src/lib/gui/MainWindow.cpp
+++ b/src/lib/gui/MainWindow.cpp
@@ -93,7 +93,7 @@ MainWindow::MainWindow()
 {
   ui->setupUi(this);
 
-  setWindowIcon(QIcon::fromTheme(kAppId));
+  setWindowIcon(QIcon::fromTheme(kRevFqdnName));
 
   addDockWidget(Qt::BottomDockWidgetArea, m_logDock);
 
diff --git a/src/lib/gui/dialogs/AboutDialog.cpp b/src/lib/gui/dialogs/AboutDialog.cpp
index 9f531c7c7..9b52ea386 100644
--- a/src/lib/gui/dialogs/AboutDialog.cpp
+++ b/src/lib/gui/dialogs/AboutDialog.cpp
@@ -27,7 +27,8 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent), ui{std::make_unique
   const QSize pixmapSize(px, px);
   ui->lblIcon->setFixedSize(pixmapSize);
 
-  ui->lblIcon->setPixmap(QPixmap(QIcon::fromTheme(kAppId).pixmap(QSize().scaled(pixmapSize, Qt::KeepAspectRatio))));
+  ui->lblIcon->setPixmap(QPixmap(QIcon::fromTheme(kRevFqdnName).pixmap(QSize().scaled(pixmapSize, Qt::KeepAspectRatio)))
+  );
 
   ui->btnCopyVersion->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::EditCopy));
   connect(ui->btnCopyVersion, &QPushButton::clicked, this, &AboutDialog::copyVersionText);
diff --git a/src/lib/gui/dialogs/SettingsDialog.cpp b/src/lib/gui/dialogs/SettingsDialog.cpp
index e7d67db04..62a2f81e1 100644
--- a/src/lib/gui/dialogs/SettingsDialog.cpp
+++ b/src/lib/gui/dialogs/SettingsDialog.cpp
@@ -44,8 +44,8 @@ SettingsDialog::SettingsDialog(QWidget *parent, const IServerConfig &serverConfi
   ui->comboTlsKeyLength->setItemIcon(1, QIcon::fromTheme(QIcon::ThemeIcon::SecurityHigh));
   ui->lblTlsCertInfo->setFixedSize(28, 28);
 
-  ui->rbIconMono->setIcon(QIcon::fromTheme(QStringLiteral("%1-symbolic").arg(kAppId)));
-  ui->rbIconColorful->setIcon(QIcon::fromTheme(kAppId));
+  ui->rbIconMono->setIcon(QIcon::fromTheme(QStringLiteral("%1-symbolic").arg(kRevFqdnName)));
+  ui->rbIconColorful->setIcon(QIcon::fromTheme(kRevFqdnName));
 
   // 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.