diff -up gdm-2.22.0/gui/simple-greeter/gdm-language-option-widget.c.icon-names gdm-2.22.0/gui/simple-greeter/gdm-language-option-widget.c
--- gdm-2.22.0/gui/simple-greeter/gdm-language-option-widget.c.icon-names	2008-07-10 12:55:21.000000000 -0400
+++ gdm-2.22.0/gui/simple-greeter/gdm-language-option-widget.c	2008-07-10 12:57:47.000000000 -0400
@@ -233,7 +233,7 @@ gdm_language_option_widget_new (void)
 
         object = g_object_new (GDM_TYPE_LANGUAGE_OPTION_WIDGET,
                                "label-text", _("_Language:"),
-                               "icon-name", "config-language",
+                               "icon-name", "preferences-desktop-locale",
                                "max-item-count", 8,
                                NULL);
 
diff -up gdm-2.22.0/gui/simple-greeter/gdm-layout-option-widget.c.icon-names gdm-2.22.0/gui/simple-greeter/gdm-layout-option-widget.c
--- gdm-2.22.0/gui/simple-greeter/gdm-layout-option-widget.c.icon-names	2008-07-10 13:08:38.000000000 -0400
+++ gdm-2.22.0/gui/simple-greeter/gdm-layout-option-widget.c	2008-07-10 13:06:41.000000000 -0400
@@ -226,7 +226,7 @@ gdm_layout_option_widget_new (void)
 
         object = g_object_new (GDM_TYPE_LAYOUT_OPTION_WIDGET,
                                "label-text", _("_Keyboard:"),
-                               "icon-name", "keyboard",
+                               "icon-name", "preferences-desktop-keyboard",
                                "max-item-count", 8,
                                NULL);
 
diff -up gdm-2.22.0/gui/simple-greeter/gdm-session-option-widget.c.icon-names gdm-2.22.0/gui/simple-greeter/gdm-session-option-widget.c