--- nautilus-2.27.2.orig/src/file-manager/fm-directory-view.c	2009-05-23 20:13:29.000000000 +0200
+++ nautilus-2.27.2/src/file-manager/fm-directory-view.c	2009-07-01 21:50:07.000000000 +0200
@@ -4253,11 +4253,12 @@
 	char *action_name;
 	char *escaped_app;
 	GtkAction *action;
+	GIcon *app_icon;
 
 	launch_parameters = application_launch_parameters_new 
 		(application, files, view);
 	escaped_app = eel_str_double_underscores (g_app_info_get_name (application));
-	label = g_strdup_printf (_("Open with \"%s\""), escaped_app);
+	label = g_strdup_printf ("%s", escaped_app);
 	tip = g_strdup_printf (ngettext ("Use \"%s\" to open the selected item",
 					 "Use \"%s\" to open the selected items",
 					 g_list_length (files)),
@@ -4270,7 +4271,17 @@
 				 label,
 				 tip,
 				 NULL);
-	
+
+	app_icon = g_object_ref (g_app_info_get_icon (application));
+
+	if (app_icon == NULL)
+		app_icon = g_themed_icon_new ("application-x-executable");
+
+	gtk_action_set_gicon (action, app_icon);
+
+	g_object_unref (app_icon);
+
+
 	g_signal_connect_data (action, "activate",
 			       G_CALLBACK (open_with_launch_application_callback),
 			       launch_parameters, 
@@ -7811,7 +7822,7 @@
 		char *escaped_app;
 
 		escaped_app = eel_str_double_underscores (g_app_info_get_name (app));
-		label_with_underscore = g_strdup_printf (_("_Open with \"%s\""),
+		label_with_underscore = g_strdup_printf (_("_Open with %s"),
 							 escaped_app);
 
 		app_icon = g_object_ref (g_app_info_get_icon (app));