diff --git a/src/mumble/CMakeLists.txt b/src/mumble/CMakeLists.txt
index fa41283bcca..aef67ab2ef8 100644
--- a/src/mumble/CMakeLists.txt
+++ b/src/mumble/CMakeLists.txt
@@ -309,6 +309,8 @@ set(MUMBLE_SOURCES
 	"widgets/SearchDialogTree.h"
 	"widgets/SemanticSlider.cpp"
 	"widgets/SemanticSlider.h"
+	"widgets/TrayIcon.cpp"
+	"widgets/TrayIcon.h"
 
 
 	"${SHARED_SOURCE_DIR}/ACL.cpp"
diff --git a/src/mumble/Global.cpp b/src/mumble/Global.cpp
index 06cab015838..de46978b0fd 100644
--- a/src/mumble/Global.cpp
+++ b/src/mumble/Global.cpp
@@ -93,6 +93,7 @@ void Global::migrateDataDir(const QDir &toDir) {
 
 Global::Global(const QString &qsConfigPath) {
 	mw              = 0;
+	trayIcon        = 0;
 	db              = 0;
 	pluginManager   = 0;
 	nam             = 0;
diff --git a/src/mumble/Global.h b/src/mumble/Global.h
index c129d26e214..3f624e67fa4 100644
--- a/src/mumble/Global.h
+++ b/src/mumble/Global.h
@@ -34,6 +34,7 @@ class OverlayClient;
 class LogEmitter;
 class DeveloperConsole;
 class TalkingUI;
+class TrayIcon;
 
 class QNetworkAccessManager;
 
@@ -50,6 +51,7 @@ struct Global Q_DECL_FINAL {
 	static Global &get();
 
 	MainWindow *mw;
+	TrayIcon *trayIcon;
 	Settings s;
 	boost::shared_ptr< ServerHandler > sh;
 	boost::shared_ptr< AudioInput > ai;
diff --git a/src/mumble/main.cpp b/src/mumble/main.cpp
index be28b37cf8e..241550fd297 100644
--- a/src/mumble/main.cpp
+++ b/src/mumble/main.cpp
@@ -51,6 +51,8 @@
 #include "VersionCheck.h"
 #include "Global.h"
 
+#include "widgets/TrayIcon.h"
+
 #include <QLocale>
 #include <QScreen>
 #include <QtCore/QProcess>
@@ -684,6 +686,8 @@ int main(int argc, char **argv) {
 	Global::get().mw = new MainWindow(nullptr);
 	Global::get().mw->show();
 
+	Global::get().trayIcon = new TrayIcon(Global::get().mw);
+
 	Global::get().talkingUI = new TalkingUI();
 
 	// Set TalkingUI's position
diff --git a/src/mumble/widgets/TrayIcon.cpp b/src/mumble/widgets/TrayIcon.cpp
new file mode 100644
index 00000000000..dfd822d9527
--- /dev/null
+++ b/src/mumble/widgets/TrayIcon.cpp
@@ -0,0 +1,14 @@
+// Copyright 2024 The Mumble Developers. All rights reserved.
+// Use of this source code is governed by a BSD-style license
+// that can be found in the LICENSE file at the root of the
+// Mumble source tree or at <https://www.mumble.info/LICENSE>.
+
+#include "TrayIcon.h"
+
+#include "../Global.h"
+#include "../MainWindow.h"
+
+TrayIcon::TrayIcon(QObject *parent) : QSystemTrayIcon(parent) {
+	setIcon(Global::get().mw->qiIcon);
+	show();
+}
diff --git a/src/mumble/widgets/TrayIcon.h b/src/mumble/widgets/TrayIcon.h
new file mode 100644
index 00000000000..27bee36f11e
--- /dev/null
+++ b/src/mumble/widgets/TrayIcon.h
@@ -0,0 +1,18 @@
+// Copyright 2024 The Mumble Developers. All rights reserved.
+// Use of this source code is governed by a BSD-style license
+// that can be found in the LICENSE file at the root of the
+// Mumble source tree or at <https://www.mumble.info/LICENSE>.
+
+#ifndef MUMBLE_MUMBLE_WIDGETS_TRAYICCON_H_
+#define MUMBLE_MUMBLE_WIDGETS_TRAYICCON_H_
+
+#include <QtWidgets/QSystemTrayIcon>
+
+class TrayIcon : public QSystemTrayIcon {
+	Q_OBJECT
+
+public:
+	TrayIcon(QObject *parent);
+};
+
+#endif // MUMBLE_MUMBLE_WIDGETS_TRAYICCON_H_