Index: modules/menu/desktop-menu.c
===================================================================
--- modules/menu/desktop-menu.c	(revision 25910)
+++ modules/menu/desktop-menu.c	(working copy)
@@ -233,14 +233,18 @@
                 icon_name = NULL;
             }
             
-            mi = gtk_image_menu_item_new_with_label(name);
-            if(icon_name) {
-                img = gtk_image_new_from_icon_name(icon_name,
-                                                   GTK_ICON_SIZE_MENU);
-                gtk_widget_show(img);
-                gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(mi), img);
+            if(desktop_menu->use_menu_icons) {
+                mi = gtk_image_menu_item_new_with_label(name);
+                if(icon_name) {
+                    img = gtk_image_new_from_icon_name(icon_name,
+                                                       GTK_ICON_SIZE_MENU);
+                    gtk_widget_show(img);
+                    gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(mi), img);
+                }
+            } else {
+                mi = gtk_menu_item_new_with_label(name);
             }
-            gtk_widget_show(mi);
+            gtk_widget_show_all(mi);
             gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
             gtk_menu_item_set_submenu(GTK_MENU_ITEM(mi), submenu);
             
@@ -264,12 +268,20 @@
                 continue;
             }
             
-            mi = xfce_app_menu_item_new_full(xfce_menu_item_get_name(xfce_item),
-                                             xfce_menu_item_get_command(xfce_item),
-                                             xfce_menu_item_get_icon_name(xfce_item),
-                                             xfce_menu_item_requires_terminal(xfce_item),
-                                             xfce_menu_item_supports_startup_notification(xfce_item));
-            gtk_widget_show(mi);
+            if(desktop_menu->use_menu_icons) {
+                mi = xfce_app_menu_item_new_full(xfce_menu_item_get_name(xfce_item),
+                                                 xfce_menu_item_get_command(xfce_item),
+                                                 xfce_menu_item_get_icon_name(xfce_item),
+                                                 xfce_menu_item_requires_terminal(xfce_item),
+                                                 xfce_menu_item_supports_startup_notification(xfce_item));
+            } else {
+                mi = xfce_app_menu_item_new_full(xfce_menu_item_get_name(xfce_item),
+                                                 xfce_menu_item_get_command(xfce_item),
+                                                 NULL,
+                                                 xfce_menu_item_requires_terminal(xfce_item),
+                                                 xfce_menu_item_supports_startup_notification(xfce_item));
+            }
+            gtk_widget_show_all(mi);
             gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
             
             desktop_menu_watch_dirs_add(watch_dirs,