diff --git a/src/profile-editor.c b/src/profile-editor.c
index e89daff..873dd11 100644
--- a/src/profile-editor.c
+++ b/src/profile-editor.c
@@ -501,13 +501,13 @@ custom_command_entry_changed_cb (GtkEntry *entry)
 
 	if (g_shell_parse_argv (command, NULL, NULL, &error))
 	{
-		gtk_entry_set_icon_from_stock (entry, GTK_PACK_END, NULL);
+		gtk_entry_set_icon_from_icon_name (entry, GTK_PACK_END, NULL);
 	}
 	else
 	{
 		char *tooltip;
 
-		gtk_entry_set_icon_from_stock (entry, GTK_PACK_END, GTK_STOCK_DIALOG_WARNING);
+		gtk_entry_set_icon_from_icon_name (entry, GTK_PACK_END, "dialog-warning");
 
 		tooltip = g_strdup_printf (_("Error parsing command: %s"), error->message);
 		gtk_entry_set_icon_tooltip_text (entry, GTK_PACK_END, tooltip);
diff --git a/src/terminal-tab-label.c b/src/terminal-tab-label.c
index 84745c3..930429a 100644
--- a/src/terminal-tab-label.c
+++ b/src/terminal-tab-label.c
@@ -156,7 +156,7 @@ terminal_tab_label_constructor (GType type,
 	gtk_widget_set_name (close_button, "mate-terminal-tab-close-button");
 	gtk_widget_set_tooltip_text (close_button, _("Close tab"));
 
-	image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
+	image = gtk_image_new_from_icon_name ("window-close", GTK_ICON_SIZE_MENU);
 	gtk_container_add (GTK_CONTAINER (close_button), image);
 	gtk_box_pack_end (GTK_BOX (hbox), close_button, FALSE, FALSE, 0);