diff --git a/deluge/plugins/Notifications/deluge/plugins/notifications/gtkui.py b/deluge/plugins/Notifications/deluge/plugins/notifications/gtkui.py
index 9b1cbaada..816cb36e5 100644
--- a/deluge/plugins/Notifications/deluge/plugins/notifications/gtkui.py
+++ b/deluge/plugins/Notifications/deluge/plugins/notifications/gtkui.py
@@ -177,7 +177,7 @@ class GtkUiNotifications(CustomNotifications):
             return defer.fail(_('libnotify is not installed'))
 
         if Notify.init('Deluge'):
-            self.note = Notify.Notification.new(title, message, 'deluge-tray')
+            self.note = Notify.Notification.new(title, message, 'deluge-panel')
             self.note.set_hint('desktop-entry', 'deluge')
             if not self.note.show():
                 err_msg = _('Failed to popup notification')
diff --git a/setup.py b/setup.py
index 632d9d6f0..7d1183da2 100755
--- a/setup.py
+++ b/setup.py
@@ -457,12 +457,8 @@ cmdclass = {
 if not windows_check() and not osx_check():
     for icon_path in glob.glob('deluge/ui/data/icons/hicolor/*x*'):
         size = os.path.basename(icon_path)
-        _data_files.append(
-            (
-                'share/icons/hicolor/{}/apps'.format(size),
-                ['{}/apps/deluge.png'.format(icon_path)],
-            )
-        )
+        icons = glob.glob(os.path.join(icon_path, 'apps', 'deluge*.png'))
+        _data_files.append(('share/icons/hicolor/{}/apps'.format(size), icons))
     _data_files.extend(
         [
             (