diff --git a/deluge/data/share/applications/deluge.desktop b/deluge/data/share/applications/deluge.desktop
index 570cd9ed8..85cd5ea1b 100644
--- a/deluge/data/share/applications/deluge.desktop
+++ b/deluge/data/share/applications/deluge.desktop
@@ -4,10 +4,9 @@ Encoding=UTF-8
 Name=Deluge BitTorrent Client
 Comment=Bittorrent client written in PyGTK
 Exec=deluge
-Icon=deluge.xpm
+Icon=deluge.png
 Terminal=false
 Type=Application
 Categories=Application;Network
 StartupNotify=true
 MimeType=application/x-bittorrent;
-GenericName=
diff --git a/deluge/ui/gtkui/systemtray.py b/deluge/ui/gtkui/systemtray.py
index 8a380aad5..fc4fcb560 100644
--- a/deluge/ui/gtkui/systemtray.py
+++ b/deluge/ui/gtkui/systemtray.py
@@ -52,7 +52,7 @@ class SystemTray:
         """Enables the system tray icon."""
         log.debug("Enabling the system tray icon..")
         self.core = functions.get_core()
-        self.tray = gtk.status_icon_new_from_pixbuf(deluge.common.get_logo(48))        
+        self.tray = gtk.status_icon_new_from_icon_name('deluge')
         self.tray.connect("activate", self.on_tray_clicked)
         self.tray.connect("popup-menu", self.on_tray_popup)
         
diff --git a/setup.py b/setup.py
index 1f098d887..20f575a37 100644
--- a/setup.py
+++ b/setup.py
@@ -162,29 +162,29 @@ setup(
                                 "i18n/*/LC_MESSAGES/*.mo"]},
     data_files = [('/usr/share/deluge/icons/scalable/apps', [
                          'deluge/data/icons/scalable/apps/deluge.svg']),
-                ('/usr/share/deluge/icons/hicolor/128x128/apps', [
+                ('/usr/share/icons/hicolor/128x128/apps', [
                         'deluge/data/icons/hicolor/128x128/apps/deluge.png']),
-                ('/usr/share/deluge/icons/hicolor/16x16/apps', [
+                ('/usr/share/icons/hicolor/16x16/apps', [
                         'deluge/data/icons/hicolor/16x16/apps/deluge.png']),
-                ('/usr/share/deluge/icons/hicolor/192x192/apps', [
+                ('/usr/share/icons/hicolor/192x192/apps', [
                         'deluge/data/icons/hicolor/192x192/apps/deluge.png']),
-                ('/usr/share/deluge/icons/hicolor/22x22/apps', [
+                ('/usr/share/icons/hicolor/22x22/apps', [
                         'deluge/data/icons/hicolor/22x22/apps/deluge.png']),
-                ('/usr/share/deluge/icons/hicolor/24x24/apps', [
+                ('/usr/share/icons/hicolor/24x24/apps', [
                         'deluge/data/icons/hicolor/24x24/apps/deluge.png']),
-                ('/usr/share/deluge/icons/hicolor/256x256/apps', [
+                ('/usr/share/icons/hicolor/256x256/apps', [
                         'deluge/data/icons/hicolor/256x256/apps/deluge.png']),
-                ('/usr/share/deluge/icons/hicolor/32x32/apps', [
+                ('/usr/share/icons/hicolor/32x32/apps', [
                         'deluge/data/icons/hicolor/32x32/apps/deluge.png']),
-                ('/usr/share/deluge/icons/hicolor/36x36/apps', [
+                ('/usr/share/icons/hicolor/36x36/apps', [
                         'deluge/data/icons/hicolor/36x36/apps/deluge.png']),
-                ('/usr/share/deluge/icons/hicolor/48x48/apps', [
+                ('/usr/share/icons/hicolor/48x48/apps', [
                         'deluge/data/icons/hicolor/48x48/apps/deluge.png']),
-                ('/usr/share/deluge/icons/hicolor/64x64/apps', [
+                ('/usr/share/icons/hicolor/64x64/apps', [
                         'deluge/data/icons/hicolor/64x64/apps/deluge.png']),
-                ('/usr/share/deluge/icons/hicolor/72x72/apps', [
+                ('/usr/share/icons/hicolor/72x72/apps', [
                         'deluge/data/icons/hicolor/72x72/apps/deluge.png']),
-                ('/usr/share/deluge/icons/hicolor/96x96/apps', [
+                ('/usr/share/icons/hicolor/96x96/apps', [
                         'deluge/data/icons/hicolor/96x96/apps/deluge.png']),
                 ('/usr/share/applications', [
                         'deluge/data/share/applications/deluge.desktop'])],