diff --git a/0001-top-icons-Don-t-use-wm_class-as-role.patch b/0001-top-icons-Don-t-use-wm_class-as-role.patch
new file mode 100644
index 0000000..bc3b89b
--- /dev/null
+++ b/0001-top-icons-Don-t-use-wm_class-as-role.patch
@@ -0,0 +1,27 @@
+From ce48dc2f4fba6a7084540df256cb5b3eb0da43da Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Wed, 2 Jun 2021 17:32:21 +0200
+Subject: [PATCH] top-icons: Don't use wm_class as role
+
+This prevents adding icons for multiple instances of the same app,
+which may be desirable in some circumstances.
+---
+ extensions/top-icons/extension.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/extensions/top-icons/extension.js b/extensions/top-icons/extension.js
+index 79e2f423..3dfba469 100644
+--- a/extensions/top-icons/extension.js
++++ b/extensions/top-icons/extension.js
+@@ -63,7 +63,7 @@ class SysTray {
+             button.destroy();
+         });
+ 
+-        let role = wmClass || `${icon}`;
++        const role = `${icon}`;
+         Main.panel.addToStatusArea(role, button);
+     }
+ 
+-- 
+2.31.1
+
diff --git a/add-extra-extensions.patch b/add-extra-extensions.patch
index 05ddd50..f972e9e 100644
--- a/add-extra-extensions.patch
+++ b/add-extra-extensions.patch
@@ -1,4 +1,4 @@
-From 5acb15db24dc404ac6752b0d42b23915a3cf965b Mon Sep 17 00:00:00 2001
+From 226a3d59624d71867d9efd3350f2756d189b7f8a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
 Date: Wed, 20 May 2015 17:44:50 +0200
 Subject: [PATCH 1/5] Add top-icons extension
@@ -17,7 +17,7 @@ Subject: [PATCH 1/5] Add top-icons extension
 
 diff --git a/extensions/top-icons/extension.js b/extensions/top-icons/extension.js
 new file mode 100644
-index 00000000..a8eec13c
+index 00000000..79e2f423
 --- /dev/null
 +++ b/extensions/top-icons/extension.js
 @@ -0,0 +1,96 @@
@@ -41,7 +41,7 @@ index 00000000..a8eec13c
 +    'kbd-scrolllock',
 +    'kbd-numlock',
 +    'kbd-capslock',
-+    'ibus-ui-gtk'
++    'ibus-ui-gtk',
 +];
 +
 +class SysTray {
@@ -64,11 +64,11 @@ index 00000000..a8eec13c
 +            width: iconSize,
 +            height: iconSize,
 +            x_align: Clutter.ActorAlign.CENTER,
-+            y_align: Clutter.ActorAlign.CENTER
++            y_align: Clutter.ActorAlign.CENTER,
 +        });
 +
 +        let iconBin = new St.Widget({
-+            layout_manager: new Clutter.BinLayout()
++            layout_manager: new Clutter.BinLayout(),
 +        });
 +        iconBin.add_actor(icon);
 +        button.add_actor(iconBin);
@@ -102,7 +102,7 @@ index 00000000..a8eec13c
 +            this._onTrayIconAdded.bind(this));
 +        this._tray.connect('tray-icon-removed',
 +            this._onTrayIconRemoved.bind(this));
-+        this._tray.manage_screen(Main.panel.actor);
++        this._tray.manage_screen(Main.panel);
 +    }
 +
 +    disable() {
@@ -167,7 +167,7 @@ index 91cb683c..c0097f82 100644
 2.31.1
 
 
-From a806a66301cffc3426e9511abb9a9c69b9105d48 Mon Sep 17 00:00:00 2001
+From 3b4a5aa8bd35858a693c3b5c86c8b4afc2d5f0ee Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
 Date: Wed, 20 May 2015 18:05:41 +0200
 Subject: [PATCH 2/5] Add dash-to-dock extension
@@ -44396,7 +44396,7 @@ index 6a40e212..14e60ccb 100644
 2.31.1
 
 
-From 0f9f96d51e1d9edb57e63de410d6affa28b17e04 Mon Sep 17 00:00:00 2001
+From a93fedb3011ffa57c77bfd9be23641f7a17db6ae Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
 Date: Wed, 20 May 2015 18:55:47 +0200
 Subject: [PATCH 3/5] Add panel-favorites extension
@@ -44739,7 +44739,7 @@ index 2abcdeee..fa2d31e5 100644
 2.31.1
 
 
-From d5b32fdd9e4dd993dc767e0114ce6a562da25a9e Mon Sep 17 00:00:00 2001
+From cb0de66ce28e49c2b6c95f88631ddfbcbf10f4d8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
 Date: Fri, 4 Mar 2016 17:07:21 +0100
 Subject: [PATCH 4/5] Add updates-dialog extension
@@ -45370,7 +45370,7 @@ index 0ed12762..10b1d517 100644
 2.31.1
 
 
-From d025e3be5708992ced6c5d3160be8506bb284f5c Mon Sep 17 00:00:00 2001
+From 15691bedd694799d13f9e2e6ab716c221c8898be Mon Sep 17 00:00:00 2001
 From: Carlos Soriano <csoriano@gnome.org>
 Date: Mon, 13 Aug 2018 17:28:41 +0200
 Subject: [PATCH 5/5] Add desktop icons extension
diff --git a/gnome-shell-extensions.spec b/gnome-shell-extensions.spec
index 1ce0729..bcf639d 100644
--- a/gnome-shell-extensions.spec
+++ b/gnome-shell-extensions.spec
@@ -7,7 +7,7 @@
 
 Name:           gnome-shell-extensions
 Version:        40.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Modify and extend GNOME Shell functionality and behavior
 
 License:        GPLv2+
@@ -28,6 +28,7 @@ Patch005: resurrect-system-monitor.patch
 Patch006: 0001-Include-top-icons-in-classic-session.patch
 Patch007: 0001-desktop-icons-Update-Japanese-translation.patch
 Patch008: desktop-icons-40-fixes.patch
+Patch009: 0001-top-icons-Don-t-use-wm_class-as-role.patch
 
 %description
 GNOME Shell Extensions is a collection of extensions providing additional and
@@ -348,6 +349,10 @@ workspaces.
 
 
 %changelog
+* Thu Jun 03 2021 Florian Müllner <fmuellner@redhat.com> - 40.1-4
+- Don't use status icon wm_class as top bar role
+  Resolves: #1967259
+
 * Wed May 26 2021 Florian Müllner <fmuellner@redhat.com> - 40.1-3
 - Fix various issues in downstream patches
   Resolves: #1932261