--- empathy-2.27.5/libempathy-gtk/empathy-presence-chooser.c	2009-07-29 04:18:26.000000000 -0400
+++ hacked/libempathy-gtk/empathy-presence-chooser.c	2009-08-24 02:00:31.892689425 -0400
@@ -223,7 +223,7 @@
 
 	gtk_list_store_insert_with_values (store, NULL, -1,
 		COL_STATUS_TEXT, _("Edit Custom Messages..."),
-		COL_STATE_ICON_NAME, GTK_STOCK_EDIT,
+		COL_STATE_ICON_NAME, NULL,
 		COL_DISPLAY_MARKUP, _("Edit Custom Messages..."),
 		COL_TYPE, ENTRY_TYPE_EDIT_CUSTOM,
 		-1);
@@ -1049,6 +1049,7 @@
 	gtk_widget_show (image);
 
 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+	gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
 	gtk_widget_show (item);
 
 	g_object_set_data_full (G_OBJECT (item),
