diff --git a/src/fe-gtk/setup.c b/src/fe-gtk/setup.c
index abe0d7f8..234193bb 100644
--- a/src/fe-gtk/setup.c
+++ b/src/fe-gtk/setup.c
@@ -2414,11 +2414,7 @@ setup_create_sound_page (void)
                                                         (GtkAttachOptions) (GTK_FILL),
                                                         (GtkAttachOptions) (0), 0, 0);
 
-#ifdef GTK_STOCK_MEDIA_PLAY
-        sound_play = gtkutil_button_new_from_stock (GTK_STOCK_MEDIA_PLAY, _("_Play"));
-#else
-        sound_play = gtkutil_button_new_from_stock (NULL, _("_Play"));
-#endif
+        sound_play = gtkutil_button_new_from_stock ("gtk-media-play", _("_Play"));
         g_signal_connect (G_OBJECT (sound_play), "clicked",
                                                         G_CALLBACK (setup_snd_play_cb), sndfile_entry);
         gtk_widget_show (sound_play);
@@ -3023,12 +3019,12 @@ setup_window_open (void)
         gtk_box_set_spacing (GTK_BOX (hbbox), 4);
         gtk_box_pack_end (GTK_BOX (vbox), hbbox, FALSE, FALSE, 0);
 
-        cancel_button = wid = gtkutil_button_new_from_stock (GTK_STOCK_CANCEL, _("_Cancel"));
+        cancel_button = wid = gtkutil_button_new_from_stock ("gtk-cancel", _("_Cancel"));
         g_signal_connect (G_OBJECT (wid), "clicked",
                                                         G_CALLBACK (gtkutil_destroy), win);
         gtk_box_pack_start (GTK_BOX (hbbox), wid, FALSE, FALSE, 0);
 
-        wid = gtkutil_button_new_from_stock (GTK_STOCK_OK, _("_OK"));
+        wid = gtkutil_button_new_from_stock ("gtk-ok", _("_OK"));
         g_signal_connect (G_OBJECT (wid), "clicked",
                                                         G_CALLBACK (setup_ok_cb), win);
         gtk_box_pack_start (GTK_BOX (hbbox), wid, FALSE, FALSE, 0);