diff --git a/ChangeLog b/ChangeLog
index a50d2a2cf..75abbec2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
 2006-06-30  Don Allingham  <don@gramps-project.org>
+	* src/GrampsDb/_DbUtils.py (remove_parent_from_family): adjust the
+	transaction message for appropriate father/mother indicator
 	* src/GrampsWidgets.py: Add GenderWidget to try to isolate windows 
 	font problems by switching fonts if needed
 
diff --git a/src/DateEdit.py b/src/DateEdit.py
index 039ce1cac..7c0ef63ad 100644
--- a/src/DateEdit.py
+++ b/src/DateEdit.py
@@ -138,11 +138,13 @@ class DateEdit:
                                             gtk.ICON_SIZE_MENU))
         elif self.date_obj.is_regular():
             self.pixmap_obj.set_from_pixbuf(
-                self.pixmap_obj.render_icon(gtk.STOCK_YES,gtk.ICON_SIZE_MENU))
+                self.pixmap_obj.render_icon(gtk.STOCK_YES,
+                                            gtk.ICON_SIZE_MENU))
         else:
             self.pixmap_obj.set_from_pixbuf(
                 self.pixmap_obj.render_icon(gtk.STOCK_DIALOG_WARNING,
                                             gtk.ICON_SIZE_MENU))
+
         
     def parse_and_check(self,*obj):
         """
diff --git a/src/GrampsDb/_DbUtils.py b/src/GrampsDb/_DbUtils.py
index 2f17854ab..5bb2d57db 100644
--- a/src/GrampsDb/_DbUtils.py
+++ b/src/GrampsDb/_DbUtils.py
@@ -69,7 +69,9 @@ def remove_parent_from_family(db, person_handle, family_handle, trans=None):
     person.remove_family_handle(family_handle)
     if family.get_father_handle() == person_handle:
         family.set_father_handle(None)
+        msg = _("Remove father from family")
     elif family.get_mother_handle() == person_handle:
+        msg = _("Remove mother from family")
         family.set_mother_handle(None)
 
     child_list = family.get_child_ref_list()
@@ -80,10 +82,8 @@ def remove_parent_from_family(db, person_handle, family_handle, trans=None):
             child = db.get_person_from_handle(child_list[0].ref)
             child.remove_parent_family_handle(family_handle)
             db.commit_person(child, trans)
-        msg = _("Remove father from family")
     else:
         db.commit_family(family, trans)
-        msg = _("Remove mother from family")
     db.commit_person(person, trans)
     
     if need_commit:
diff --git a/src/glade/gramps.glade b/src/glade/gramps.glade
index 33e68e21b..e1a7362fd 100644
--- a/src/glade/gramps.glade
+++ b/src/glade/gramps.glade
@@ -12551,7 +12551,7 @@ Text Beside Icons</property>
 		  <child>
 		    <widget class="GtkImage" id="image2675">
 		      <property name="visible">True</property>
-		      <property name="icon_size">4</property>
+		      <property name="icon_size">1</property>
 		      <property name="icon_name">stock_lock-open</property>
 		      <property name="xalign">0.5</property>
 		      <property name="yalign">0.5</property>
@@ -13002,7 +13002,7 @@ Text Beside Icons</property>
 		      <child>
 			<widget class="GtkImage" id="image2676">
 			  <property name="visible">True</property>
-			  <property name="icon_size">4</property>
+			  <property name="icon_size">1</property>
 			  <property name="icon_name">stock_lock-open</property>
 			  <property name="xalign">0.5</property>
 			  <property name="yalign">0.5</property>