diff --git a/ChangeLog b/ChangeLog
index 614fab999..d0ea94dce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2000-07-17  Andy Hertzfeld  <set EMAIL_ADDRESS environment variable>
+
+	* libnautilus-extensions/nautilus-icon-factory.c:
+	(nautilus_icon_factory_get_icon_name_for_regular_file):
+	added code to make sure that we use the generic document icon for
+	text files so that the text-in-icons feature works, even if the
+	more specific gnome ones are installed.
+	
+	* icons/eazel/i-regular.png:
+	* icons/eazel/i-regular-12.png:
+	* icons/eazel/i-regular-24.png:
+	* icons/eazel/i-regular-36.png:
+	* icons/eazel/i-regular-72.png:
+	* icons/eazel/i-regular-96.png:
+	new icons from Susan for the non-anti-aliased case that are
+	consistent with the anti-aliased one.
+		
 2000-07-17  Pavel Cisler <pavel@eazel.com>
 
 	* libnautilus-extensions/nautilus-list.c:
diff --git a/icons/eazel/i-regular-12.png b/icons/eazel/i-regular-12.png
index 904945a7b..4ce48fb94 100644
Binary files a/icons/eazel/i-regular-12.png and b/icons/eazel/i-regular-12.png differ
diff --git a/icons/eazel/i-regular-24.png b/icons/eazel/i-regular-24.png
index 266e3f65e..bbffc1fe9 100644
Binary files a/icons/eazel/i-regular-24.png and b/icons/eazel/i-regular-24.png differ
diff --git a/icons/eazel/i-regular-36.png b/icons/eazel/i-regular-36.png
index 0153b7f85..e65b646ed 100644
Binary files a/icons/eazel/i-regular-36.png and b/icons/eazel/i-regular-36.png differ
diff --git a/icons/eazel/i-regular-72.png b/icons/eazel/i-regular-72.png
index 2a6ecca9c..d3430c2e3 100644
Binary files a/icons/eazel/i-regular-72.png and b/icons/eazel/i-regular-72.png differ
diff --git a/icons/eazel/i-regular-96.png b/icons/eazel/i-regular-96.png
index 4f49b25f7..d7a6cafd0 100644
Binary files a/icons/eazel/i-regular-96.png and b/icons/eazel/i-regular-96.png differ
diff --git a/icons/eazel/i-regular.png b/icons/eazel/i-regular.png
index 38915f95d..9da147cc9 100644
Binary files a/icons/eazel/i-regular.png and b/icons/eazel/i-regular.png differ
diff --git a/libnautilus-extensions/nautilus-icon-factory.c b/libnautilus-extensions/nautilus-icon-factory.c
index d63b79e49..254121e60 100644
--- a/libnautilus-extensions/nautilus-icon-factory.c
+++ b/libnautilus-extensions/nautilus-icon-factory.c
@@ -499,9 +499,12 @@ nautilus_icon_factory_get_icon_name_for_regular_file (NautilusFile *file)
 {
         char *mime_type;
         const char *icon_name;
-
+	gboolean is_text_file;
+	
         mime_type = nautilus_file_get_mime_type (file);
-        if (mime_type != NULL) {
+        is_text_file = mime_type != NULL && nautilus_str_has_prefix (mime_type, "text/");
+	
+	if (mime_type != NULL && !is_text_file) {
                 icon_name = gnome_vfs_mime_get_value (mime_type, "icon-filename");
 		g_free (mime_type);
 		if (icon_name != NULL) {
@@ -512,7 +515,7 @@ nautilus_icon_factory_get_icon_name_for_regular_file (NautilusFile *file)
 	/* gnome_vfs_mime didn't give us an icon name, so we have to
          * fall back on default icons.
 	 */
-	if (nautilus_file_is_executable (file)) {
+	if (nautilus_file_is_executable (file) & !is_text_file) {
 		return ICON_NAME_EXECUTABLE;
 	}
 	return ICON_NAME_REGULAR;
diff --git a/libnautilus-private/nautilus-icon-factory.c b/libnautilus-private/nautilus-icon-factory.c
index d63b79e49..254121e60 100644
--- a/libnautilus-private/nautilus-icon-factory.c
+++ b/libnautilus-private/nautilus-icon-factory.c
@@ -499,9 +499,12 @@ nautilus_icon_factory_get_icon_name_for_regular_file (NautilusFile *file)
 {
         char *mime_type;
         const char *icon_name;
-
+	gboolean is_text_file;
+	
         mime_type = nautilus_file_get_mime_type (file);
-        if (mime_type != NULL) {
+        is_text_file = mime_type != NULL && nautilus_str_has_prefix (mime_type, "text/");
+	
+	if (mime_type != NULL && !is_text_file) {
                 icon_name = gnome_vfs_mime_get_value (mime_type, "icon-filename");
 		g_free (mime_type);
 		if (icon_name != NULL) {
@@ -512,7 +515,7 @@ nautilus_icon_factory_get_icon_name_for_regular_file (NautilusFile *file)
 	/* gnome_vfs_mime didn't give us an icon name, so we have to
          * fall back on default icons.
 	 */
-	if (nautilus_file_is_executable (file)) {
+	if (nautilus_file_is_executable (file) & !is_text_file) {
 		return ICON_NAME_EXECUTABLE;
 	}
 	return ICON_NAME_REGULAR;