diff --git a/gramps/src/Config.py b/gramps/src/Config.py
index 2c01f264a..bf8655d94 100644
--- a/gramps/src/Config.py
+++ b/gramps/src/Config.py
@@ -323,6 +323,16 @@ def store_researcher(res):
     gnome.config.set_string("/gramps/researcher/phone",res.phone)
     gnome.config.set_string("/gramps/researcher/email",res.email)
     gnome.config.sync()
+
+#-------------------------------------------------------------------------
+#
+#
+#
+#-------------------------------------------------------------------------
+def on_propertybox_help(obj,page):
+    import gnome.help
+
+    gnome.help.display("gramps","preferences.html#prefs_tab%d" % page)
     
 #-------------------------------------------------------------------------
 #
@@ -514,6 +524,7 @@ def display_preferences_box():
     prefsTop.signal_autoconnect({
         "destroy_passed_object" : utils.destroy_passed_object,
         "on_propertybox_apply" : on_propertybox_apply,
+        "on_propertybox_help" : on_propertybox_help,
         "on_color_toggled" : on_color_toggled,
         "on_color_set" : on_color_set,
         "on_object_toggled" : on_object_toggled
diff --git a/gramps/src/config.glade b/gramps/src/config.glade
index 6131f9dc4..22092741d 100644
--- a/gramps/src/config.glade
+++ b/gramps/src/config.glade
@@ -26,6 +26,11 @@
     <object>propertybox</object>
     <last_modification_time>Tue, 05 Dec 2000 01:34:12 GMT</last_modification_time>
   </signal>
+  <signal>
+    <name>help</name>
+    <handler>on_propertybox_help</handler>
+    <last_modification_time>Wed, 22 Aug 2001 02:13:46 GMT</last_modification_time>
+  </signal>
   <title>Gramps - Preferences</title>
   <position>GTK_WIN_POS_CENTER</position>
   <modal>False</modal>
diff --git a/gramps/src/fam.xpm b/gramps/src/fam.xpm
index f7db3e9b1..5a7c3683f 100644
--- a/gramps/src/fam.xpm
+++ b/gramps/src/fam.xpm
@@ -1,26 +1,48 @@
 /* XPM */
-static char * fam_xpm[] = {
-"24 20 3 1",
+static char * icon_family01b_24x24_xpm[] = {
+"24 24 21 1",
 " 	c None",
-".	c #8080FF",
-"+	c #32029C",
+".	c #DDD5C1",
+"+	c #FFFFFF",
+"@	c #B0A384",
+"#	c #B5A781",
+"$	c #0E0400",
+"%	c #000000",
+"&	c #5D4D2D",
+"*	c #5B4103",
+"=	c #EFEBDB",
+"-	c #9B9791",
+";	c #9C9892",
+">	c #8F8DA5",
+",	c #302157",
+"'	c #A8A7BB",
+")	c #7B76AE",
+"!	c #7C77AF",
+"~	c #7C75AD",
+"{	c #B0B0E2",
+"]	c #5E4D2A",
+"^	c #646464",
 "                        ",
 "                        ",
-"                        ",
-"    .+.                 ",
-"    +++           .+.   ",
-"    .+.           +++   ",
-"                  .+.   ",
-"   .+++.   .+.          ",
-"  .+++++.  +++   .+++.  ",
-"  +++++++  .+.  +++++++ ",
-"  + +++ +       +.+++.+ ",
-"  + +++ + .+++. + +++ + ",
-"  + +++ + +++++ + +++ + ",
-"    +++   +++++  .+++.  ",
-"    + +   +++++ .+++++. ",
-"    + +   .+++. +++++++ ",
-"    + +    + +    + +   ",
-"    + +    + +    + +   ",
-"    + +    + +    + +   ",
+".+++++++++++++++++++++@ ",
+"#$%%%%%%%%%%%%%%%%%%%&*%",
+"#*===================#*%",
+"#*====--;--------====#*%",
+"#*===-+++++++++++-===#*%",
+"#*==-++++++++++++++==#*%",
+"#*=-++>,>+++++++++++=#*%",
+"#*=-++,,,++++++>,>++=#*%",
+"#*=-++>,>++++++,,,++=#*%",
+"#*=-++')'+>,>++>,>++=#*%",
+"#*=-++!!!+,,,++'~'++=#*%",
+"#*=-+>!!!>{,{+>!!!>+=#*%",
+"#*=-+!!!!!'!'+>!!!>+=#*%",
+"#*==-!!!!'!!!'!!!!!==#*%",
+"#*===-!!'!!!!!'!!!===#*%",
+"#*====!!!!!!!!!!!====#*%",
+"#*===================#*%",
+"#@+++++++++++++++++++.*%",
+"]%%%%%%%%%%%%%%%%%%%%%$%",
+"  %%%%%%%%%%%%%%%%%%%%%%",
+"   ^^^^^^^^^^^^^^^^^^^^^",
 "                        "};
diff --git a/gramps/src/gramps.glade b/gramps/src/gramps.glade
index 0e8aa7d8c..241437d60 100644
--- a/gramps/src/gramps.glade
+++ b/gramps/src/gramps.glade
@@ -453,7 +453,7 @@
 	    <last_modification_time>Thu, 15 Feb 2001 22:24:33 GMT</last_modification_time>
 	  </signal>
 	  <label>People</label>
-	  <stock_pixmap>GNOME_STOCK_PIXMAP_INDEX</stock_pixmap>
+	  <icon>people.xpm</icon>
 	  <child>
 	    <new_group>True</new_group>
 	  </child>
diff --git a/gramps/src/people.xpm b/gramps/src/people.xpm
new file mode 100644
index 000000000..a0923f41e
--- /dev/null
+++ b/gramps/src/people.xpm
@@ -0,0 +1,52 @@
+/* XPM */
+static char * icon_people03b_24x24_xpm[] = {
+"24 24 25 1",
+" 	c None",
+".	c #DBD8D1",
+"+	c #FBFBFB",
+"@	c #B9B4A9",
+"#	c #BBB6A8",
+"$	c #50493B",
+"%	c #433C31",
+"&	c #7F796D",
+"*	c #776E57",
+"=	c #F0E7C8",
+"-	c #000000",
+";	c #9B9791",
+">	c #FFFFFF",
+",	c #B9B7AB",
+"'	c #929081",
+")	c #898777",
+"!	c #6E6951",
+"~	c #817E69",
+"{	c #8E8C7B",
+"]	c #868474",
+"^	c #A19E8F",
+"/	c #7F796C",
+"(	c #423C30",
+"_	c #50493A",
+":	c #646464",
+"                        ",
+"   .++++++++++++++++@   ",
+"   #$%%%%%%%%%%%%%%&*   ",
+"   #*==============#*-  ",
+"   #*====;;;;;;====#*-  ",
+"   #*===;>>>>>>;===#*-  ",
+"   #*==;>>>,,>>>>==#*-  ",
+"   #*=;>>>,'',>>>>=#*-  ",
+"   #*=;>>>)!!~>>>>=#*-  ",
+"   #*=;>>>!!!!>>>>=#*-  ",
+"   #*=;>>>{!!~>>>>=#*-  ",
+"   #*=;>>>>!!>>>>>=#*-  ",
+"   #*=;>>>,!!,>>>>=#*-  ",
+"   #*=;>>,]!!]^>>>=#*-  ",
+"   #*=;>,]!!!!]^>>=#*-  ",
+"   #*==^!!!!!!!!^==#*-  ",
+"   #*===^!!!!!!^===#*-  ",
+"   #*====^^^^^^====#*-  ",
+"   #*==============#*-  ",
+"   #@++++++++++++++.*-  ",
+"   /((((((((((((((((_-  ",
+"    ------------------  ",
+"     :::::::::::::::::  ",
+"                        "};
diff --git a/gramps/src/plugins/patchnames.glade b/gramps/src/plugins/patchnames.glade
index 718a56fe7..35bcba363 100644
--- a/gramps/src/plugins/patchnames.glade
+++ b/gramps/src/plugins/patchnames.glade
@@ -135,9 +135,9 @@
 	<class>GtkLabel</class>
 	<name>label1</name>
 	<label>Below is a list of the nicknames and titles that Gramps can extract from the 
-current database. If you select &quot;Yes&quot;, Gramps will modify your database as 
+current database. If you select 'Yes', Gramps will modify your database as 
 specified below. If you do not approve of these changes, you should select 
-&quot;No&quot;, and your database will not be altered.
+'No', and your database will not be altered.
 
 Should the following changes be made?</label>
 	<justify>GTK_JUSTIFY_LEFT</justify>