diff --git a/src/fe-gtk/chanlist.c b/src/fe-gtk/chanlist.c
index 451c7ae4..7f7648ac 100644
--- a/src/fe-gtk/chanlist.c
+++ b/src/fe-gtk/chanlist.c
@@ -138,11 +138,11 @@ chanlist_icon_menu_item (const char *label, const char *icon_name,
 	box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 	image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
 	label_widget = gtk_label_new_with_mnemonic (label);
-	gtk_box_pack_start (GTK_BOX (box), image, FALSE, FALSE, 0);
+	if (image)
+		gtk_box_pack_start (GTK_BOX (box), image, FALSE, FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (box), label_widget, FALSE, FALSE, 0);
 	gtk_container_add (GTK_CONTAINER (item), box);
-#endif
-#if !HAVE_GTK3
+#else
 	GtkWidget *image;
 
 	item = gtk_image_menu_item_new_with_mnemonic (label);
diff --git a/src/fe-gtk/menu.c b/src/fe-gtk/menu.c
index ee00a2d2..118ee2f8 100644
--- a/src/fe-gtk/menu.c
+++ b/src/fe-gtk/menu.c
@@ -284,9 +284,6 @@ menu_quick_item (char *cmd, char *label, GtkWidget * menu, int flags,
 			/*if (flags & XCMENU_MARKUP)
 				item = gtk_image_menu_item_new_with_markup (label);
 			else*/
-#if !HAVE_GTK3
-				item = gtk_image_menu_item_new_with_mnemonic (label);
-#endif
 			img = NULL;
 			if (access (icon, R_OK) == 0)	/* try fullpath */
 				img = gtk_image_new_from_file (icon);
@@ -301,8 +298,7 @@ menu_quick_item (char *cmd, char *label, GtkWidget * menu, int flags,
 #if HAVE_GTK3
 					icon_name = gtkutil_icon_name_from_stock (icon);
 					img = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
-#endif
-#if !HAVE_GTK3
+#else
 					img = gtk_image_new_from_stock (icon, GTK_ICON_SIZE_MENU);
 #endif
 				}
@@ -317,9 +313,9 @@ menu_quick_item (char *cmd, char *label, GtkWidget * menu, int flags,
 				gtk_box_pack_start (GTK_BOX (box), img, FALSE, FALSE, 0);
 			gtk_box_pack_start (GTK_BOX (box), label_widget, FALSE, FALSE, 0);
 			gtk_container_add (GTK_CONTAINER (item), box);
-#endif
+#else
+			item = gtk_image_menu_item_new_with_mnemonic (label);
 			if (img)
-#if !HAVE_GTK3
 				gtk_image_menu_item_set_image ((GtkImageMenuItem *)item, img);
 #endif
 		}
diff --git a/src/fe-gtk/sexy-spell-entry.c b/src/fe-gtk/sexy-spell-entry.c
index 19b5d751..c986f979 100644
--- a/src/fe-gtk/sexy-spell-entry.c
+++ b/src/fe-gtk/sexy-spell-entry.c
@@ -644,11 +644,11 @@ sexy_spell_entry_icon_menu_item (const char *label, const char *stock_name)
 	box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 	image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
 	label_widget = gtk_label_new_with_mnemonic (label);
-	gtk_box_pack_start (GTK_BOX (box), image, FALSE, FALSE, 0);
+	if (image)
+		gtk_box_pack_start (GTK_BOX (box), image, FALSE, FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (box), label_widget, FALSE, FALSE, 0);
 	gtk_container_add (GTK_CONTAINER (item), box);
-#endif
-#if !HAVE_GTK3
+#else
 	GtkWidget *image;
 
 	item = gtk_image_menu_item_new_with_label (label);