diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index d7f40c3415..8274001506 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1069,7 +1069,7 @@ STOCK_ICONS = \
 	stock-icons/16/gtk-disconnect.png 		\
 	stock-icons/16/gtk-edit.png 			\
 	stock-icons/16/system-run.png 			\
-	stock-icons/16/document-x-generic.png 		\
+	stock-icons/16/text-x-generic.png 		\
 	stock-icons/16/edit-find-replace.png 		\
 	stock-icons/16/edit-find.png 			\
 	stock-icons/16/media-floppy.png 		\
@@ -1182,7 +1182,7 @@ STOCK_ICONS = \
 	stock-icons/24/gtk-disconnect.png 		\
 	stock-icons/24/gtk-edit.png 			\
 	stock-icons/24/system-run.png 			\
-	stock-icons/24/document-x-generic.png 		\
+	stock-icons/24/text-x-generic.png 		\
 	stock-icons/24/edit-find-replace.png 		\
 	stock-icons/24/edit-find.png 			\
 	stock-icons/24/gtk-font.png 			\
@@ -1340,8 +1340,6 @@ stamp-icons: $(STOCK_ICONS)
 	   && $(LN_S) folder.png user-home.png 				\
 	   && $(RM) user-desktop.png 					\
 	   && $(LN_S) folder.png user-desktop.png 			\
-	   && $(RM) text-x-generic.png 					\
-	   && $(LN_S) document-x-generic.png text-x-generic.png 	\
 	) done 								\
 	&& touch stamp-icons
 
diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index ddeae73e79..4e16bfbf37 100644
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -481,7 +481,7 @@ get_default_icons (GtkIconFactory *factory)
   register_bidi_stock_icon (factory, GTK_STOCK_UNDELETE, GTK_STOCK_UNDELETE);
   register_bidi_stock_icon (factory, GTK_STOCK_UNDO, "edit-undo");
   register_stock_icon (factory, GTK_STOCK_GO_UP, "go-up");
-  register_stock_icon (factory, GTK_STOCK_FILE, "document-x-generic");
+  register_stock_icon (factory, GTK_STOCK_FILE, "text-x-generic");
   register_stock_icon (factory, GTK_STOCK_DIRECTORY, "folder");
   register_stock_icon (factory, GTK_STOCK_ABOUT, "help-about");
   register_stock_icon (factory, GTK_STOCK_CONNECT, GTK_STOCK_CONNECT);
diff --git a/gtk/gtkrecentmanager.c b/gtk/gtkrecentmanager.c
index 655e160402..76bbf3ff8e 100644
--- a/gtk/gtkrecentmanager.c
+++ b/gtk/gtkrecentmanager.c
@@ -1962,7 +1962,7 @@ gtk_recent_info_get_icon (GtkRecentInfo *info,
           strcmp (info->mime_type, "x-directory/normal") == 0)
         retval = get_icon_fallback ("folder", size);
       else
-        retval = get_icon_fallback ("document-x-generic", size);
+        retval = get_icon_fallback ("text-x-generic", size);
     }
   
   return retval;
diff --git a/gtk/stock-icons/16/document-x-generic.png b/gtk/stock-icons/16/text-x-generic.png
similarity index 100%
rename from gtk/stock-icons/16/document-x-generic.png
rename to gtk/stock-icons/16/text-x-generic.png
diff --git a/gtk/stock-icons/16/document-x-generic.svg b/gtk/stock-icons/16/text-x-generic.svg
similarity index 100%
rename from gtk/stock-icons/16/document-x-generic.svg
rename to gtk/stock-icons/16/text-x-generic.svg
diff --git a/gtk/stock-icons/24/document-x-generic.png b/gtk/stock-icons/24/text-x-generic.png
similarity index 100%
rename from gtk/stock-icons/24/document-x-generic.png
rename to gtk/stock-icons/24/text-x-generic.png
diff --git a/gtk/stock-icons/24/document-x-generic.svg b/gtk/stock-icons/24/text-x-generic.svg
similarity index 100%
rename from gtk/stock-icons/24/document-x-generic.svg
rename to gtk/stock-icons/24/text-x-generic.svg