diff --git a/gtk/gui.py b/gtk/gui.py
index 573df0a..5c045ca 100644
--- a/gtk/gui.py
+++ b/gtk/gui.py
@@ -232,10 +232,7 @@ class appGui(object):
 
         self.status_area.hide_all()
 
-        if os.path.exists(os.path.join(wpath.images, "wicd.png")):
-            self.window.set_icon_from_file(
-                os.path.join(wpath.images, "wicd.png")
-            )
+        self.window.set_icon_name('wicd-gtk')
         self.statusID = None
         self.first_dialog_load = True
         self.is_visible = True
diff --git a/gtk/netentry.py b/gtk/netentry.py
index a1d2c4d..a434431 100644
--- a/gtk/netentry.py
+++ b/gtk/netentry.py
@@ -802,7 +802,7 @@ class WiredNetworkEntry(NetworkEntry):
         self.image.set_padding(0, 0)
         self.image.set_alignment(.5, .5)
         self.image.set_size_request(60, -1)
-        self.image.set_from_icon_name("wired-gui", 4)
+        self.image.set_from_icon_name("wired-gui", gtk.ICON_SIZE_DND)
         self.image.show()
         self.connect_button.show()
 
@@ -1130,28 +1130,28 @@ class WirelessNetworkEntry(NetworkEntry):
             # "converted" to strength bars, so suggestions from people
             # for a better way would be welcome.
             if dbm_strength >= -60:
-                signal_img = 'signal-100.png'
+                signal_img = 'signal-100'
             elif dbm_strength >= -70:
-                signal_img = 'signal-75.png'
+                signal_img = 'signal-75'
             elif dbm_strength >= -80:
-                signal_img = 'signal-50.png'
+                signal_img = 'signal-50'
             else:
-                signal_img = 'signal-25.png'
+                signal_img = 'signal-25'
             ending = "dBm"
             disp_strength = str(dbm_strength)
         else:
             # Uses normal link quality, should be fine in most cases
             if strength > 75:
-                signal_img = 'signal-100.png'
+                signal_img = 'signal-100'
             elif strength > 50:
-                signal_img = 'signal-75.png'
+                signal_img = 'signal-75'
             elif strength > 25:
-                signal_img = 'signal-50.png'
+                signal_img = 'signal-50'
             else:
-                signal_img = 'signal-25.png'
+                signal_img = 'signal-25'
             ending = "%"
             disp_strength = str(strength)
-        self.image.set_from_file(wpath.images + signal_img)
+        self.image.set_from_icon_name(signal_img, gtk.ICON_SIZE_DND)
         self.lbl_strength.set_label(disp_strength + ending)
         self.image.show()
 
diff --git a/gtk/prefs.py b/gtk/prefs.py
index bbd2ee1..f34a559 100644
--- a/gtk/prefs.py
+++ b/gtk/prefs.py
@@ -378,9 +378,7 @@ class PreferencesDialog(object):
 
         self.dialog = self.wTree.get_object("pref_dialog")
         self.dialog.set_title(_('Preferences'))
-        if os.path.exists(os.path.join(wpath.images, "wicd.png")):
-            self.dialog.set_icon_from_file(
-                os.path.join(wpath.images, "wicd.png"))
+        self.dialog.set_icon_name('wicd-gtk')
         width = int(gtk.gdk.screen_width() / 2.4)
         if width > 450:
             width = 450
diff --git a/gtk/wicd-client.py b/gtk/wicd-client.py
index 20cdaed..c8335eb 100644
--- a/gtk/wicd-client.py
+++ b/gtk/wicd-client.py
@@ -701,9 +701,11 @@ TX:'''))
             image = gtk.Image()
 
             if type_ == "__wired__":
-                image.set_from_icon_name("network-wired", 2)
+                image.set_from_icon_name("network-wired",
+                    gtk.ICON_SIZE_SMALL_TOOLBAR)
             else:
-                image.set_from_icon_name(self._get_img(n_id), 2)
+                image.set_from_icon_name(self._get_img(n_id),
+                    gtk.ICON_SIZE_SMALL_TOOLBAR)
             item.set_image(image)
             del image
             item.connect("activate", network_selected, type_, n_id)