diff --git a/gnome-session.spec b/gnome-session.spec
index aca5b62..c56ad51 100644
--- a/gnome-session.spec
+++ b/gnome-session.spec
@@ -12,7 +12,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.23.4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-session/2.23/%{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -59,6 +59,8 @@ Patch34: gnome-session-nautilus.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=542086
 Patch47: escape-comment.patch
 
+Patch49: icon-names.patch
+
 BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: dbus-devel >= %{dbus_version}
@@ -103,6 +105,7 @@ GNOME components and handles logout and saving the session.
 #%patch22 -p1 -b .ice-leaks
 %patch34 -p1 -b .nautilus
 %patch47 -p1 -b .escape-comment
+%patch49 -p1 -b .icon-names
 
 %build
 
@@ -188,6 +191,9 @@ fi
 
 
 %changelog
+* Wed Jul  9 2008 Matthias Clasen <mclasen@redhat.com> - 2.23.4.1-3
+- Use more standard icon names
+
 * Tue Jul  8 2008 Matthias Clasen <mclasen@redhat.com> - 2.23.4.1-2
 - Escape comments for markup
 
diff --git a/icon-names.patch b/icon-names.patch
new file mode 100644
index 0000000..5dbcdba
--- /dev/null
+++ b/icon-names.patch
@@ -0,0 +1,14 @@
+diff -up gnome-session-2.23.4.1/gnome-session/logout-dialog.c.icon-names gnome-session-2.23.4.1/gnome-session/logout-dialog.c
+--- gnome-session-2.23.4.1/gnome-session/logout-dialog.c.icon-names	2008-07-09 16:12:41.000000000 -0400
++++ gnome-session-2.23.4.1/gnome-session/logout-dialog.c	2008-07-09 16:13:10.000000000 -0400
+@@ -41,8 +41,8 @@
+ 
+ #define AUTOMATIC_ACTION_TIMEOUT 60
+ 
+-#define GSM_ICON_LOGOUT   "gnome-logout"
+-#define GSM_ICON_SHUTDOWN "gnome-shutdown"
++#define GSM_ICON_LOGOUT   "system-logout"
++#define GSM_ICON_SHUTDOWN "system-shutdown"
+ 
+ struct _GsmLogoutDialogPrivate 
+ {