diff --git a/gnome/applet/Makefile.am b/gnome/applet/Makefile.am
index 46d10d0b3a..b8e6295f4f 100644
--- a/gnome/applet/Makefile.am
+++ b/gnome/applet/Makefile.am
@@ -17,7 +17,7 @@ nm_applet_CPPFLAGS =									\
 	$(LIBGNOMEUI_CFLAGS)								\
 	$(PANEL_APPLET_CFLAGS)								\
 	$(GNOME_KEYRING_CFLAGS)								\
-	-DICONDIR=\""$(datadir)/pixmaps"\"						\
+	-DICONDIR=\""$(datadir)/icons"\"						\
 	-DGLADEDIR=\""$(gladedir)"\"							\
 	-DBINDIR=\""$(bindir)"\"								\
 	-DSYSCONFDIR=\""$(sysconfdir)"\"						\
diff --git a/gnome/applet/applet.c b/gnome/applet/applet.c
index de5ae140cf..2913879948 100644
--- a/gnome/applet/applet.c
+++ b/gnome/applet/applet.c
@@ -144,6 +144,9 @@ static void nma_class_init (NMAppletClass *klass)
 {
 	GObjectClass *gobject_class;
 
+	gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
+								ICONDIR);
+
 	gobject_class = G_OBJECT_CLASS (klass);
 	gobject_class->constructor = nma_constructor;
 }
@@ -2303,7 +2306,6 @@ static void nma_dropdown_menu_deactivate_cb (GtkWidget *menu, NMApplet *applet)
 	gtk_widget_set_state (applet->event_box, GTK_STATE_NORMAL);
 }
 
-
 /*
  * nma_setup_widgets
  *
diff --git a/gnome/vpn-properties/Makefile.am b/gnome/vpn-properties/Makefile.am
index 550a6cc96d..e35bc263a9 100644
--- a/gnome/vpn-properties/Makefile.am
+++ b/gnome/vpn-properties/Makefile.am
@@ -21,13 +21,13 @@ nm_vpn_properties_CFLAGS =                              \
         $(GCONF_CFLAGS)                                 \
         $(GMODULE_CFLAGS)                               \
         $(LIBGNOMEUI_CFLAGS)                            \
-        -DSYSCONFDIR=\"$(sysconfdir)\"			\
-        -DICONDIR=\""$(datadir)/pixmaps"\"              \
+        -DSYSCONFDIR=\"$(sysconfdir)\"                  \
+        -DICONDIR=\""$(datadir)/icons"\"                \
         -DGLADEDIR=\""$(gladedir)"\"                    \
         -DG_DISABLE_DEPRECATED                          \
         -DGDK_DISABLE_DEPRECATED                        \
         -DGNOME_DISABLE_DEPRECATED                      \
-	-DGNOMELOCALEDIR=\"$(datadir)/locale\"		\
+        -DGNOMELOCALEDIR=\"$(datadir)/locale\"          \
         -DVERSION=\"$(VERSION)\" \
         $(NULL)