diff --git a/gtk/gui.py b/gtk/gui.py
index 2534cf1..0dc9bdc 100644
--- a/gtk/gui.py
+++ b/gtk/gui.py
@@ -151,7 +151,7 @@ class appGui(object):
         gladefile = os.path.join(wpath.gtk, "wicd.glade")
         self.wTree = gtk.glade.XML(gladefile)
         self.window = self.wTree.get_widget("window1")
-        self.window.set_icon_name("wicd-client")
+        self.window.set_icon_name("wicd-gtk")
         size = daemon.ReadWindowSize("main")
         width = size[0]
         height = size[1]
diff --git a/icons/128px/wicd-client.png b/icons/128px/wicd-gtk.png
similarity index 100%
rename from icons/128px/wicd-client.png
rename to icons/128px/wicd-gtk.png
diff --git a/icons/16px/wicd-client.png b/icons/16px/wicd-gtk.png
similarity index 100%
rename from icons/16px/wicd-client.png
rename to icons/16px/wicd-gtk.png
diff --git a/icons/192px/wicd-client.png b/icons/192px/wicd-gtk.png
similarity index 100%
rename from icons/192px/wicd-client.png
rename to icons/192px/wicd-gtk.png
diff --git a/icons/22px/wicd-client.png b/icons/22px/wicd-gtk.png
similarity index 100%
rename from icons/22px/wicd-client.png
rename to icons/22px/wicd-gtk.png
diff --git a/icons/24px/wicd-client.png b/icons/24px/wicd-gtk.png
similarity index 100%
rename from icons/24px/wicd-client.png
rename to icons/24px/wicd-gtk.png
diff --git a/icons/32px/wicd-client.png b/icons/32px/wicd-gtk.png
similarity index 100%
rename from icons/32px/wicd-client.png
rename to icons/32px/wicd-gtk.png
diff --git a/icons/36px/wicd-client.png b/icons/36px/wicd-gtk.png
similarity index 100%
rename from icons/36px/wicd-client.png
rename to icons/36px/wicd-gtk.png
diff --git a/icons/48px/wicd-client.png b/icons/48px/wicd-gtk.png
similarity index 100%
rename from icons/48px/wicd-client.png
rename to icons/48px/wicd-gtk.png
diff --git a/icons/64px/wicd-client.png b/icons/64px/wicd-gtk.png
similarity index 100%
rename from icons/64px/wicd-client.png
rename to icons/64px/wicd-gtk.png
diff --git a/icons/72px/wicd-client.png b/icons/72px/wicd-gtk.png
similarity index 100%
rename from icons/72px/wicd-client.png
rename to icons/72px/wicd-gtk.png
diff --git a/icons/96px/wicd-client.png b/icons/96px/wicd-gtk.png
similarity index 100%
rename from icons/96px/wicd-client.png
rename to icons/96px/wicd-gtk.png
diff --git a/icons/scalable/wicd-client.svg b/icons/scalable/wicd-gtk.svg
similarity index 100%
rename from icons/scalable/wicd-client.svg
rename to icons/scalable/wicd-gtk.svg
diff --git a/setup.py b/setup.py
index 839fb02..1f4464d 100644
--- a/setup.py
+++ b/setup.py
@@ -512,18 +512,18 @@ try:
         data.append((wpath.autostart, ['other/wicd-tray.desktop']))
         if not wpath.no_install_man:
             data.append((wpath.mandir + 'man1/', [ 'man/wicd-client.1' ]))
-        data.append((wpath.icons + 'scalable/apps/', ['icons/scalable/wicd-client.svg']))
-        data.append((wpath.icons + '192x192/apps/', ['icons/192px/wicd-client.png']))
-        data.append((wpath.icons + '128x128/apps/', ['icons/128px/wicd-client.png']))
-        data.append((wpath.icons + '96x96/apps/', ['icons/96px/wicd-client.png']))
-        data.append((wpath.icons + '72x72/apps/', ['icons/72px/wicd-client.png']))
-        data.append((wpath.icons + '64x64/apps/', ['icons/64px/wicd-client.png']))
-        data.append((wpath.icons + '48x48/apps/', ['icons/48px/wicd-client.png']))
-        data.append((wpath.icons + '36x36/apps/', ['icons/36px/wicd-client.png']))
-        data.append((wpath.icons + '32x32/apps/', ['icons/32px/wicd-client.png']))
-        data.append((wpath.icons + '24x24/apps/', ['icons/24px/wicd-client.png']))
-        data.append((wpath.icons + '22x22/apps/', ['icons/22px/wicd-client.png']))
-        data.append((wpath.icons + '16x16/apps/', ['icons/16px/wicd-client.png']))
+        data.append((wpath.icons + 'scalable/apps/', ['icons/scalable/wicd-gtk.svg']))
+        data.append((wpath.icons + '192x192/apps/', ['icons/192px/wicd-gtk.png']))
+        data.append((wpath.icons + '128x128/apps/', ['icons/128px/wicd-gtk.png']))
+        data.append((wpath.icons + '96x96/apps/', ['icons/96px/wicd-gtk.png']))
+        data.append((wpath.icons + '72x72/apps/', ['icons/72px/wicd-gtk.png']))
+        data.append((wpath.icons + '64x64/apps/', ['icons/64px/wicd-gtk.png']))
+        data.append((wpath.icons + '48x48/apps/', ['icons/48px/wicd-gtk.png']))
+        data.append((wpath.icons + '36x36/apps/', ['icons/36px/wicd-gtk.png']))
+        data.append((wpath.icons + '32x32/apps/', ['icons/32px/wicd-gtk.png']))
+        data.append((wpath.icons + '24x24/apps/', ['icons/24px/wicd-gtk.png']))
+        data.append((wpath.icons + '22x22/apps/', ['icons/22px/wicd-gtk.png']))
+        data.append((wpath.icons + '16x16/apps/', ['icons/16px/wicd-gtk.png']))
         data.append((wpath.images, [('images/' + b) for b in os.listdir('images') if not b.startswith('.')]))
         data.append((wpath.pixmaps, ['other/wicd-gtk.xpm']))
     if not wpath.no_install_ncurses: