diff --git a/gedit-2.15.1-python.patch b/gedit-2.23.1-python.patch
similarity index 61%
rename from gedit-2.15.1-python.patch
rename to gedit-2.23.1-python.patch
index bdcaa48..db18b08 100644
--- a/gedit-2.15.1-python.patch
+++ b/gedit-2.23.1-python.patch
@@ -1,6 +1,7 @@
---- gedit-2.15.1/configure.ac.python	2006-04-24 14:07:25.000000000 -0400
-+++ gedit-2.15.1/configure.ac	2006-05-09 21:36:47.000000000 -0400
-@@ -116,10 +116,6 @@
+diff -up gedit-2.23.1/configure.ac.python gedit-2.23.1/configure.ac
+--- gedit-2.23.1/configure.ac.python	2008-05-12 11:32:44.000000000 -0400
++++ gedit-2.23.1/configure.ac	2008-08-09 22:35:22.000000000 -0400
+@@ -203,10 +203,6 @@ if test "x$have_python" != "xno"; then
  fi
  
  if test "x$have_python" != "xno"; then
@@ -11,9 +12,9 @@
  	PY_PREFIX=`$PYTHON -c 'import sys ; print sys.prefix'`
  	PY_EXEC_PREFIX=`$PYTHON -c 'import sys ; print sys.exec_prefix'`
  	PYTHON_LIBS="-lpython$PYTHON_VERSION"
-@@ -224,8 +220,6 @@
- dnl ================================================================
+@@ -329,8 +325,6 @@ dnl ====================================
  AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
+ AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
  			      
 -GNOME_COMPILE_WARNINGS(yes)
 -
diff --git a/gedit.spec b/gedit.spec
index aa0fc66..3afe525 100644
--- a/gedit.spec
+++ b/gedit.spec
@@ -18,7 +18,7 @@
 Summary:	gEdit is a small but powerful text editor for GNOME
 Name:		gedit
 Version: 	2.23.1
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL
 Group:		Applications/Editors
@@ -44,9 +44,10 @@ Patch1: gedit-2.13.90-libdir.patch
 
 # po/LINGUAS disaster forces us to regenerate configure
 # and I needed this patch to make autoconf happy
-Patch2: gedit-2.15.1-python.patch
+Patch2: gedit-2.23.1-python.patch
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=542300
+# http://bugzilla.gnome.org/show_bug.cgi?id=547129
 Patch3: icon-names.patch
 
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -198,6 +199,9 @@ fi
 
 
 %changelog
+* Sat Aug  9 2008 Matthias Clasen <mclasen@redhat.com> - 1:2.23.1-3
+- One more icon name fix
+
 * Wed Jul  9 2008 Matthias Clasen <mclasen@redhat.com> - 1:2.23.1-2
 - Use standard icon names
 
diff --git a/icon-names.patch b/icon-names.patch
index 1eb3753..6c366c7 100644
--- a/icon-names.patch
+++ b/icon-names.patch
@@ -34,3 +34,16 @@ diff -up gedit-2.23.1/plugins/filebrowser/gedit-file-browser-store.c.icon-names
  		}
  
  		model_add_node (model, node, parent);
+Index: gedit-2.23.1/plugins/filebrowser/gedit-file-browser-plugin.c
+===================================================================
+--- gedit-2.23.1/plugins/filebrowser/gedit-file-browser-plugin.c	(revision 6372)
++++ gedit-2.23.1/plugins/filebrowser/gedit-file-browser-plugin.c	(working copy)
+@@ -723,7 +723,7 @@
+ 			  window);			  
+ 
+ 	panel = gedit_window_get_side_panel (window);
+-	pixbuf = gedit_file_browser_utils_pixbuf_from_theme("file-manager",  
++	pixbuf = gedit_file_browser_utils_pixbuf_from_theme("system-file-manager",  
+ 	                                                    GTK_ICON_SIZE_MENU);
+ 	
+ 	if (pixbuf) {