From aabbad31d86289f991068ad5c8fe389db7d1700d Mon Sep 17 00:00:00 2001
From: Alexander Babikov <2708460+lemondrops@users.noreply.github.com>
Date: Wed, 20 Dec 2023 15:28:32 +0500
Subject: [PATCH 1/2] qt: Set the window icon per-application, instead of
 per-window

---
 src/qt/qt_main.cpp       | 11 +++++++++++
 src/qt/qt_mainwindow.cpp |  9 ---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/qt/qt_main.cpp b/src/qt/qt_main.cpp
index c859fe033..1d6526521 100644
--- a/src/qt/qt_main.cpp
+++ b/src/qt/qt_main.cpp
@@ -194,6 +194,17 @@ main(int argc, char *argv[])
     QApplication::setFont(QFont(font_name, font_size.toInt()));
     SetCurrentProcessExplicitAppUserModelID(L"86Box.86Box");
 #endif
+
+#ifdef RELEASE_BUILD
+    app.setWindowIcon(QIcon(":/settings/win/icons/86Box-green.ico"));
+#elif defined ALPHA_BUILD
+    app.setWindowIcon(QIcon(":/settings/win/icons/86Box-red.ico"));
+#elif defined BETA_BUILD
+    app.setWindowIcon(QIcon(":/settings/win/icons/86Box-yellow.ico"));
+#else
+    app.setWindowIcon(QIcon(":/settings/win/icons/86Box-gray.ico"));
+#endif
+
     if (!pc_init_modules()) {
         ui_msgbox_header(MBX_FATAL, (void *) IDS_2121, (void *) IDS_2056);
         return 6;
diff --git a/src/qt/qt_mainwindow.cpp b/src/qt/qt_mainwindow.cpp
index f3503caeb..e0252dd7a 100644
--- a/src/qt/qt_mainwindow.cpp
+++ b/src/qt/qt_mainwindow.cpp
@@ -196,15 +196,6 @@ MainWindow::MainWindow(QWidget *parent)
     auto toolbar_label = new QLabel();
     ui->toolBar->addWidget(toolbar_label);
 
-#ifdef RELEASE_BUILD
-    this->setWindowIcon(QIcon(":/settings/win/icons/86Box-green.ico"));
-#elif defined ALPHA_BUILD
-    this->setWindowIcon(QIcon(":/settings/win/icons/86Box-red.ico"));
-#elif defined BETA_BUILD
-    this->setWindowIcon(QIcon(":/settings/win/icons/86Box-yellow.ico"));
-#else
-    this->setWindowIcon(QIcon(":/settings/win/icons/86Box-gray.ico"));
-#endif
     this->setWindowFlag(Qt::MSWindowsFixedSizeDialogHint, vid_resize != 1);
     this->setWindowFlag(Qt::WindowMaximizeButtonHint, vid_resize == 1);
 

From fdae410884246cf81c0226f44554ac24087b35f3 Mon Sep 17 00:00:00 2001
From: Alexander Babikov <2708460+lemondrops@users.noreply.github.com>
Date: Wed, 20 Dec 2023 20:15:31 +0500
Subject: [PATCH 2/2] qt: Set the .desktop file name on *nix

May fix generic icon instead of 86Box's icon showing up on Wayland
---
 src/qt/qt_main.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/qt/qt_main.cpp b/src/qt/qt_main.cpp
index 1d6526521..02a0026d8 100644
--- a/src/qt/qt_main.cpp
+++ b/src/qt/qt_main.cpp
@@ -205,6 +205,10 @@ main(int argc, char *argv[])
     app.setWindowIcon(QIcon(":/settings/win/icons/86Box-gray.ico"));
 #endif
 
+#if (!defined(Q_OS_WINDOWS) && !defined(__APPLE__))
+    app.setDesktopFileName("net.86box.86Box");
+#endif
+
     if (!pc_init_modules()) {
         ui_msgbox_header(MBX_FATAL, (void *) IDS_2121, (void *) IDS_2056);
         return 6;