Index: xfce4-session/xfsm-chooser.c
===================================================================
--- xfce4-session/xfsm-chooser.c	(revision 19790)
+++ xfce4-session/xfsm-chooser.c	(working copy)
@@ -236,7 +236,7 @@
   gtk_widget_show (chooser->tree);
 
   /* "Logout" button */
-  button = xfsm_imgbtn_new (_("Logout"), GTK_STOCK_QUIT, NULL);
+  button = xfce_create_mixed_button (GTK_STOCK_QUIT, _("Logout"));
   gtk_tooltips_set_tip (chooser->tooltips, button,
                         _("Cancel the login attempt and return to "
                           "the login screen."),
@@ -246,7 +246,7 @@
   gtk_widget_show (button);
 
   /* "New" button */
-  button = xfsm_imgbtn_new (_("New session"), GTK_STOCK_NEW, NULL);
+  button = xfce_create_mixed_button (GTK_STOCK_NEW, _("New session"));
   gtk_tooltips_set_tip (chooser->tooltips, button,
                         _("Create a new session."),
                         NULL);
Index: settings/splash/splash.c
===================================================================
--- settings/splash/splash.c	(revision 19790)
+++ settings/splash/splash.c	(working copy)
@@ -457,8 +457,7 @@
                                        NULL);
   gtk_tree_view_append_column (GTK_TREE_VIEW (splash_treeview), column);
 
-  splash_button_cfg = xfsm_imgbtn_new (_("Configure"), GTK_STOCK_PREFERENCES,
-                                       NULL);
+  splash_button_cfg = xfce_create_mixed_button (GTK_STOCK_PREFERENCES, _("Configure"));
   gtk_widget_set_sensitive (splash_button_cfg, FALSE);
   g_signal_connect (G_OBJECT (splash_button_cfg), "clicked",
                     splash_configure, NULL);
@@ -469,7 +468,7 @@
                           "splash screen."),
                         NULL);
 
-  splash_button_test = xfsm_imgbtn_new (_("Test"), GTK_STOCK_EXECUTE, NULL);
+  splash_button_test = xfce_create_mixed_button (GTK_STOCK_EXECUTE, _("Test"));
   gtk_widget_set_sensitive (splash_button_test, FALSE);
   g_signal_connect (G_OBJECT (splash_button_test), "clicked",
                     splash_test, NULL);
Index: libxfsm/xfsm-util.c
===================================================================
--- libxfsm/xfsm-util.c	(revision 19790)
+++ libxfsm/xfsm-util.c	(working copy)
@@ -42,41 +42,6 @@
 
 #include <libxfsm/xfsm-util.h>
 
-
-GtkWidget *
-xfsm_imgbtn_new(const gchar *text, const gchar *icon, GtkWidget **label_ret)
-{
-	GtkWidget *button;
-	GtkWidget *align;
-	GtkWidget *image;
-	GtkWidget *hbox;
-  GtkWidget *label;
-
-	button = gtk_button_new();
-
-	align = gtk_alignment_new(0.5f, 0.5f, 0.0f, 0.0f);
-	gtk_container_add(GTK_CONTAINER(button), align);
-	gtk_widget_show(align);
-
-	hbox = gtk_hbox_new(FALSE, 0);
-	gtk_container_add(GTK_CONTAINER(align), hbox);
-	gtk_widget_show(hbox);
-
-	image = gtk_image_new_from_stock(icon, GTK_ICON_SIZE_BUTTON);
-	gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 2);
-	gtk_widget_show(image);
-
-	label = gtk_label_new_with_mnemonic(text);
-	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
-	gtk_widget_show(label);
-
-  if (label_ret != NULL)
-    *label_ret = label;
-
-	return button;
-}
-
-
 gboolean
 xfsm_start_application (gchar      **command,
                         gchar      **environment,
@@ -144,40 +109,6 @@
   return result;
 }
 
-
-void
-xfsm_place_trash_window (GtkWindow *window,
-                         GdkScreen *screen,
-                         gint       monitor)
-{
-  GtkRequisition requisition;
-  GdkRectangle   geometry;
-
-  gdk_screen_get_monitor_geometry (screen, monitor, &geometry);
-  gtk_widget_size_request (GTK_WIDGET (window), &requisition);
-
-  gtk_window_move (window, 0, geometry.height - requisition.height);
-}
-
-
-gchar**
-xfsm_strv_copy (gchar **v)
-{
-  gchar **rv;
-  gsize len;
-  gsize n;
-
-  for (len = 0; v[len] != NULL; ++len) ;
-
-  rv = g_new (gchar *, len + 1);
-  for (n = 0; n < len; ++n)
-    rv[n] = g_strdup (v[n]);
-  rv[n] = NULL;
-
-  return rv;
-}
-
-
 gboolean
 xfsm_strv_equal (gchar **a, gchar **b)
 {
Index: libxfsm/xfsm-util.h
===================================================================
--- libxfsm/xfsm-util.h	(revision 19790)
+++ libxfsm/xfsm-util.h	(working copy)
@@ -28,8 +28,6 @@
 
 G_BEGIN_DECLS;
 
-GtkWidget	*xfsm_imgbtn_new(const gchar *, const gchar *, GtkWidget **);
-
 gboolean xfsm_start_application (gchar      **command,
                                  gchar      **environment,
                                  GdkScreen   *screen,
@@ -37,12 +35,7 @@
                                  const gchar *client_machine,
                                  const gchar *user_id);
 
-void xfsm_place_trash_window (GtkWindow *window,
-                              GdkScreen *screen,
-                              gint       monitor);
-
 /* XXX - move to libxfce4util? */
-gchar **xfsm_strv_copy (gchar **v);
 gboolean xfsm_strv_equal (gchar **a, gchar **b);
 
 void xfsm_window_add_border (GtkWindow *window);