diff --git a/ChangeLog b/ChangeLog
index e27090025..5175bdfa8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-29  Alex Roitman  <shura@gramps-project.org>
+	* src/GrampsWidgets.py (PlaceEntry.set_button): Dynamically set
+	tooltips.
+	* src/glade/gramps.glade (event_edit, eref-edit): Do not set tooltips.
+
 2006-11-29  Martin Hawlisch  <Martin.Hawlisch@gmx.de>
 	* src/DataViews/_RelationView.py (write_title): Always write Label
 	for birth and death.
diff --git a/src/GrampsWidgets.py b/src/GrampsWidgets.py
index fc749536c..781b3a3fa 100644
--- a/src/GrampsWidgets.py
+++ b/src/GrampsWidgets.py
@@ -534,6 +534,7 @@ class PlaceEntry:
         self.set_val = set_val
         self.uistate = uistate
         self.track = track
+        self.tooltips = gtk.Tooltips()
 
         self.obj.drag_dest_set(gtk.DEST_DEFAULT_ALL, [DdTargets.PLACE_LINK.target()], 
                                gtk.gdk.ACTION_COPY)
@@ -627,6 +628,7 @@ class PlaceEntry:
             image.set_from_stock(gtk.STOCK_EDIT,gtk.ICON_SIZE_BUTTON)
             image.show()
             self.share.add(image)
+            self.tooltips.set_tip(self.add_del, _('Remove place'))
         else:
             image = gtk.Image()
             image.set_from_stock(gtk.STOCK_ADD,gtk.ICON_SIZE_BUTTON)
@@ -636,3 +638,4 @@ class PlaceEntry:
             image.set_from_stock(gtk.STOCK_INDEX,gtk.ICON_SIZE_BUTTON)
             image.show()
             self.share.add(image)
+            self.tooltips.set_tip(self.add_del, _('Add a new place'))
diff --git a/src/glade/gramps.glade b/src/glade/gramps.glade
index e7464299a..851bbd5f7 100644
--- a/src/glade/gramps.glade
+++ b/src/glade/gramps.glade
@@ -7001,7 +7001,6 @@
 	      <child>
 		<widget class="GtkButton" id="add_del_place">
 		  <property name="visible">True</property>
-		  <property name="tooltip" translatable="yes">Add a new place</property>
 		  <property name="can_focus">True</property>
 		  <property name="relief">GTK_RELIEF_NONE</property>
 		  <property name="focus_on_click">True</property>
@@ -10865,7 +10864,6 @@
 		  <child>
 		    <widget class="GtkButton" id="add_del_place">
 		      <property name="visible">True</property>
-		      <property name="tooltip" translatable="yes">Add a new place</property>
 		      <property name="can_focus">True</property>
 		      <property name="relief">GTK_RELIEF_NONE</property>
 		      <property name="focus_on_click">True</property>