Index: gui/greeter/greeter_canvas_item.c
===================================================================
--- gui/greeter/greeter_canvas_item.c	(revision 4693)
+++ gui/greeter/greeter_canvas_item.c	(working copy)
@@ -158,14 +158,20 @@
 	menu = gtk_menu_new ();
 	gtk_menu_item_set_submenu (GTK_MENU_ITEM (w), menu);
 
-	w = gtk_menu_item_new_with_mnemonic (_("Select _Language..."));
+	w = gtk_image_menu_item_new_with_mnemonic (_("Select _Language..."));
+	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (w), 
+		gtk_image_new_from_icon_name ("preferences-desktop-locale", GTK_ICON_SIZE_MENU));
+
 	gtk_menu_shell_append (GTK_MENU_SHELL (menu), w);
 	gtk_widget_show (GTK_WIDGET (w));
 	g_signal_connect (G_OBJECT (w), "activate",
 			  G_CALLBACK (activate_button),
 			  "language_button");
 
-	w = gtk_menu_item_new_with_mnemonic (_("Select _Session..."));
+	w = gtk_image_menu_item_new_with_mnemonic (_("Select _Session..."));
+	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (w), 
+		gtk_image_new_from_icon_name ("user-desktop", GTK_ICON_SIZE_MENU));
+
 	gtk_menu_shell_append (GTK_MENU_SHELL (menu), w);
 	gtk_widget_show (GTK_WIDGET (w));
 	g_signal_connect (G_OBJECT (w), "activate",
@@ -179,9 +185,13 @@
 	 * flexi, even if not local (non-local xnest).  and Disconnect
 	 * only for xdmcp */
 	if ( ! ve_string_empty (g_getenv ("GDM_FLEXI_SERVER"))) {
-		w = gtk_menu_item_new_with_mnemonic (_("_Quit"));
+		w = gtk_image_menu_item_new_with_mnemonic (_("_Quit"));
+		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (w), 
+			gtk_image_new_from_icon_name ("gnome-logout", GTK_ICON_SIZE_MENU));
 	} else if (ve_string_empty (g_getenv ("GDM_IS_LOCAL"))) {
-		w = gtk_menu_item_new_with_mnemonic (_("D_isconnect"));
+		w = gtk_image_menu_item_new_with_mnemonic (_("D_isconnect"));
+		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (w), 
+			gtk_image_new_from_icon_name ("gnome-logout", GTK_ICON_SIZE_MENU));
 	} else {
 		w = NULL;
 	}
Index: gui/greeter/greeter_system.c
===================================================================
--- gui/greeter/greeter_system.c	(revision 4693)
+++ gui/greeter/greeter_system.c	(working copy)
@@ -183,7 +183,10 @@
 		return;
 
 	if (gdm_config_get_bool (GDM_KEY_CHOOSER_BUTTON)) {
-		w = gtk_menu_item_new_with_mnemonic (_("Remote Login via _XDMCP..."));
+		w = gtk_image_menu_item_new_with_mnemonic (_("Remote Login via _XDMCP..."));
+		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (w),
+			gtk_image_new_from_icon_name ("preferences-desktop-remote-desktop", GTK_ICON_SIZE_MENU));
+
 		gtk_menu_shell_append (GTK_MENU_SHELL (menu), w);
 		gtk_widget_show (GTK_WIDGET (w));
 		g_signal_connect (G_OBJECT (w), "activate",
@@ -193,7 +196,10 @@
 
 	if (gdm_config_get_bool (GDM_KEY_CONFIG_AVAILABLE) &&
 	    bin_exists (gdm_config_get_string (GDM_KEY_CONFIGURATOR))) {
-		w = gtk_menu_item_new_with_mnemonic (_("Confi_gure Login Manager..."));
+		w = gtk_image_menu_item_new_with_mnemonic (_("Confi_gure Login Manager..."));
+		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (w),
+			gtk_image_new_from_icon_name ("gdm-setup", GTK_ICON_SIZE_MENU));
+
 		gtk_menu_shell_append (GTK_MENU_SHELL (menu), w);
 		gtk_widget_show (GTK_WIDGET (w));
 		g_signal_connect (G_OBJECT (w), "activate",
@@ -208,7 +214,9 @@
 	}
 
 	if (GdmRebootFound) {
-		w = gtk_menu_item_new_with_mnemonic (_("_Restart"));
+		w = gtk_image_menu_item_new_with_mnemonic (_("_Restart"));
+		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (w),
+					       gtk_image_new_from_icon_name ("system-restart", GTK_ICON_SIZE_MENU));
 		gtk_menu_shell_append (GTK_MENU_SHELL (menu), w);
 		gtk_widget_show (GTK_WIDGET (w));
 		g_signal_connect (G_OBJECT (w), "activate",
@@ -235,7 +243,9 @@
 	}
 
 	if (GdmHaltFound) {
-		w = gtk_menu_item_new_with_mnemonic (_("Shut _Down"));
+		w = gtk_image_menu_item_new_with_mnemonic (_("Shut _Down"));
+		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (w), 
+					       gtk_image_new_from_icon_name ("system-shut-down", GTK_ICON_SIZE_MENU));
 		gtk_menu_shell_append (GTK_MENU_SHELL (menu), w);
 		gtk_widget_show (GTK_WIDGET (w));
 		g_signal_connect (G_OBJECT (w), "activate",
@@ -244,7 +254,9 @@
 	}
 
 	if (GdmSuspendFound) {
-		w = gtk_menu_item_new_with_mnemonic (_("Sus_pend"));
+		w = gtk_image_menu_item_new_with_mnemonic (_("Sus_pend"));
+		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (w),
+					       gtk_image_new_from_icon_name ("system-suspend", GTK_ICON_SIZE_MENU));
 		gtk_menu_shell_append (GTK_MENU_SHELL (menu), w);
 		gtk_widget_show (GTK_WIDGET (w));
 		g_signal_connect (G_OBJECT (w), "activate",
