diff --git a/src/fe-gtk/chanlist.c b/src/fe-gtk/chanlist.c
index def01330..66e54a73 100644
--- a/src/fe-gtk/chanlist.c
+++ b/src/fe-gtk/chanlist.c
@@ -133,10 +133,14 @@ chanlist_icon_menu_item (const char *label, const char *icon_name,
 	GtkWidget *box;
 	GtkWidget *image = NULL;
 	GtkWidget *label_widget;
+	const char *icon_name_gtk3;
 
 	item = gtk_menu_item_new ();
 	box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-	image = icon_name ? gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU) : NULL;
+	icon_name_gtk3 = gtkutil_icon_name_from_stock (icon_name);
+	if (!icon_name_gtk3)
+		icon_name_gtk3 = icon_name;
+	image = icon_name_gtk3 ? gtk_image_new_from_icon_name (icon_name_gtk3, GTK_ICON_SIZE_MENU) : NULL;
 	label_widget = gtk_label_new_with_mnemonic (label);
 	if (image)
 		gtk_box_pack_start (GTK_BOX (box), image, FALSE, FALSE, 0);
diff --git a/src/fe-gtk/menu.c b/src/fe-gtk/menu.c
index 8addfc7d..d603dd26 100644
--- a/src/fe-gtk/menu.c
+++ b/src/fe-gtk/menu.c
@@ -296,6 +296,8 @@ menu_quick_item (char *cmd, char *label, GtkWidget * menu, int flags,
 				{
 #if HAVE_GTK3
 					icon_name = gtkutil_icon_name_from_stock (icon);
+					if (!icon_name)
+						icon_name = icon;
 #endif
 #if !HAVE_GTK3
 					img = gtk_image_new_from_stock (icon, GTK_ICON_SIZE_MENU);
@@ -2018,6 +2020,8 @@ create_icon_menu (char *labeltext, void *stock_name, int is_stock)
 	{
 #if HAVE_GTK3
 		icon_name = gtkutil_icon_name_from_stock (stock_name);
+		if (!icon_name)
+			icon_name = stock_name;
 		if (icon_name)
 			image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
 #endif
diff --git a/src/fe-gtk/sexy-spell-entry.c b/src/fe-gtk/sexy-spell-entry.c
index 9346c2a9..0f99a900 100644
--- a/src/fe-gtk/sexy-spell-entry.c
+++ b/src/fe-gtk/sexy-spell-entry.c
@@ -640,6 +640,8 @@ sexy_spell_entry_icon_menu_item (const char *label, const char *stock_name)
 	GtkWidget *label_widget;
 
 	icon_name = gtkutil_icon_name_from_stock (stock_name);
+	if (!icon_name)
+		icon_name = stock_name;
 	item = gtk_menu_item_new ();
 	box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 	if (icon_name)