diff --git a/capplets/font/font-properties.glade b/capplets/font/font-properties.glade
index be0e27167..4e8e64b10 100644
--- a/capplets/font/font-properties.glade
+++ b/capplets/font/font-properties.glade
@@ -6,13 +6,13 @@
 
 <widget class="GtkDialog" id="font_dialog">
   <property name="visible">True</property>
-  <property name="title" translatable="yes">Font Properties</property>
+  <property name="title" translatable="yes">Font Preferences</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="has_separator">False</property>
+  <property name="has_separator">True</property>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox1">
@@ -44,6 +44,7 @@
 	    <widget class="GtkButton" id="closebutton1">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
+	      <property name="has_default">True</property>
 	      <property name="can_focus">True</property>
 	      <property name="label">gtk-close</property>
 	      <property name="use_stock">True</property>
@@ -62,7 +63,7 @@
 
       <child>
 	<widget class="GtkTable" id="table3">
-	  <property name="border_width">16</property>
+	  <property name="border_width">5</property>
 	  <property name="width_request">300</property>
 	  <property name="visible">True</property>
 	  <property name="n_rows">2</property>
@@ -74,16 +75,17 @@
 	  <child>
 	    <widget class="GtkLabel" id="label5">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Standard Desktop Font</property>
-	      <property name="use_underline">False</property>
+	      <property name="label" translatable="yes">Standard _application font:</property>
+	      <property name="use_underline">True</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_RIGHT</property>
 	      <property name="wrap">False</property>
 	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
+	      <property name="xalign">0</property>
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
+	      <property name="mnemonic_widget">application_font</property>
 	    </widget>
 	    <packing>
 	      <property name="left_attach">0</property>
@@ -98,16 +100,17 @@
 	  <child>
 	    <widget class="GtkLabel" id="label6">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">File Manager Font</property>
-	      <property name="use_underline">False</property>
+	      <property name="label" translatable="yes">_Desktop font:</property>
+	      <property name="use_underline">True</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_RIGHT</property>
 	      <property name="wrap">False</property>
 	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
+	      <property name="xalign">0</property>
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
+	      <property name="mnemonic_widget">desktop_font</property>
 	    </widget>
 	    <packing>
 	      <property name="left_attach">0</property>
@@ -122,6 +125,7 @@
 	  <child>
 	    <widget class="GnomeFontPicker" id="application_font">
 	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">Set the font for applications</property>
 	      <property name="can_focus">True</property>
 	      <property name="mode">GNOME_FONT_PICKER_MODE_FONT_INFO</property>
 	      <property name="show_size">True</property>
@@ -140,6 +144,7 @@
 	  <child>
 	    <widget class="GnomeFontPicker" id="desktop_font">
 	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">Set the font for the icons on the desktop</property>
 	      <property name="can_focus">True</property>
 	      <property name="mode">GNOME_FONT_PICKER_MODE_FONT_INFO</property>
 	      <property name="show_size">True</property>
diff --git a/capplets/font/main.c b/capplets/font/main.c
index a1d14e42a..d5ec4b477 100644
--- a/capplets/font/main.c
+++ b/capplets/font/main.c
@@ -46,12 +46,15 @@ cb_dialog_response (GtkDialog *dialog, gint response_id)
 		gtk_main_quit ();
 }
 
+
 static void
 setup_dialog (GladeXML *dialog)
 {
   GConfClient *client;
   GtkWidget *widget;
   GObject *peditor;
+  gchar *filename;
+  GdkPixbuf *icon_pixbuf;
 
   client = gconf_client_get_default ();
 
@@ -66,6 +69,11 @@ setup_dialog (GladeXML *dialog)
 				    PEDITOR_FONT_COMBINED, NULL);
 
   widget = WID ("font_dialog");
+  filename = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_APP_PIXMAP, "keyboard-shortcut.png", TRUE, NULL);
+  icon_pixbuf = gdk_pixbuf_new_from_file ("font-capplet.png", NULL);
+  gtk_window_set_icon (GTK_WINDOW (widget), icon_pixbuf);
+  g_free (filename);
+  g_object_unref (icon_pixbuf);
   gtk_widget_show (widget);
 
   g_signal_connect (G_OBJECT (widget),