diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2405a8419e65..ab76d0355474 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -22571,6 +22571,12 @@
     githubId = 98333944;
     name = "Sven Over";
   };
+  Svenum = {
+    email = "s.ziegler@holypenguin.net";
+    github = "Svenum";
+    githubId = 43136984;
+    name = "Sven Ziegler";
+  };
   svrana = {
     email = "shaw@vranix.com";
     github = "svrana";
diff --git a/pkgs/by-name/ta/tail-tray/desktop.patch b/pkgs/by-name/ta/tail-tray/desktop.patch
new file mode 100644
index 000000000000..56162f2f4c01
--- /dev/null
+++ b/pkgs/by-name/ta/tail-tray/desktop.patch
@@ -0,0 +1,16 @@
+diff --git a/tail-tray.desktop.in b/tail-tray.desktop.in
+index 2d1c7be..5e859ae 100644
+--- a/tail-tray.desktop.in
++++ b/tail-tray.desktop.in
+@@ -2,8 +2,8 @@
+ Name=Tail Tray
+ GenericName=Tail Tray
+ Comment=Tailscale Tray Application
+-Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/tail-tray
+-Icon=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATAROOTDIR@/icons/hicolor/128x128/apps/tailscale.png
++Exec=@CMAKE_INSTALL_PREFIX@/bin/tail-tray
++Icon=@CMAKE_INSTALL_PREFIX@/share/icons/hicolor/128x128/apps/tailscale.png
+ Type=Application
+ Categories=Qt;KDE;Utility;X-Networking;X-Internet;X-VPN;
+ StartupNotify=true
+
diff --git a/pkgs/by-name/ta/tail-tray/package.nix b/pkgs/by-name/ta/tail-tray/package.nix
new file mode 100644
index 000000000000..42d010639c23
--- /dev/null
+++ b/pkgs/by-name/ta/tail-tray/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  fetchFromGitHub,
+  davfs2,
+  cmake,
+  stdenv,
+  fetchpatch,
+  pkg-config,
+  kdePackages,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "tail-tray";
+  version = "0.2.13";
+
+  src = fetchFromGitHub {
+    owner = "SneWs";
+    repo = "tail-tray";
+    tag = "v${version}";
+    sha256 = "sha256-BzE32XvDEdlS5D8XjZ4m2OEn+6nS0F7oJYX/a/UKhJ4=";
+  };
+
+  nativeBuildInputs = with kdePackages; [
+    wrapQtAppsHook
+    qttools
+    cmake
+    pkg-config
+  ];
+
+  buildInputs = with kdePackages; [
+    qtbase
+    davfs2
+  ];
+
+  patches = [ ./desktop.patch ];
+
+  meta = {
+    description = "Tray icon to manage Tailscale";
+    homepage = "https://github.com/SneWs/tail-tray";
+    changelog = "https://github.com/SneWs/tail-tray/releases/tag/${version}";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ Svenum ];
+    platforms = lib.platforms.linux;
+  };
+}