diff -r bf8ed95aaa1c -r 38eebb7c9019 pidgin/gtkstatusbox.c
--- a/pidgin/gtkstatusbox.c	Fri Jun 17 18:11:18 2016 -0500
+++ b/pidgin/gtkstatusbox.c	Fri Jul 01 00:19:12 2016 -0700
@@ -310,13 +310,12 @@
 
 		box->icon_box_menu = gtk_menu_new();
 
-		pidgin_new_item_from_stock(box->icon_box_menu,
+		pidgin_new_menu_item(box->icon_box_menu,
 			_("Select Buddy Icon"), GTK_STOCK_ADD,
-			G_CALLBACK(choose_buddy_icon_cb), box, 0, 0, NULL);
-
-		menu_item = pidgin_new_item_from_stock(box->icon_box_menu, _("Remove"), GTK_STOCK_REMOVE,
-						     G_CALLBACK(remove_buddy_icon_cb),
-						     box, 0, 0, NULL);
+			G_CALLBACK(choose_buddy_icon_cb), box);
+
+		menu_item = pidgin_new_menu_item(box->icon_box_menu, _("Remove"), GTK_STOCK_REMOVE,
+                                G_CALLBACK(remove_buddy_icon_cb), box);
 		if (!(path = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/accounts/buddyicon"))
 				|| !*path)
 			gtk_widget_set_sensitive(menu_item, FALSE);