diff --git a/ChangeLog b/ChangeLog
index cf7423943..7acc3f928 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-09  Don Allingham  <don@gramps-project.org>
+	* src/DataViews/_MapView.py: add tool tips to tool buttons
+	* src/ViewManager.py: add tool tips to Open button
+
 2006-05-08  Alex Roitman  <shura@gramps-project.org>
 	* src/GrampsDb/_GrampsDbBase.py (get_default_person): Use proper
 	way of getting person from the handle.
diff --git a/src/DataViews/_MapView.py b/src/DataViews/_MapView.py
index fb72e4edd..f98628c2e 100644
--- a/src/DataViews/_MapView.py
+++ b/src/DataViews/_MapView.py
@@ -572,13 +572,18 @@ class MapView(PageView.PageView):
 
     def define_actions(self):
         self.add_action('ZoomIn',gtk.STOCK_ZOOM_IN,
-                        _("Zoom _In"),callback=self.zoom_in_cb)
+                        _("Zoom _In"),tip=_("Zoom in by a factor of 2"),
+                        callback=self.zoom_in_cb)
         self.add_action('ZoomOut',gtk.STOCK_ZOOM_OUT,
-                        _("Zoom _Out"),callback=self.zoom_out_cb)
+                        _("Zoom _Out"),tip=_("Zoom out by a factor of 2"),
+                        callback=self.zoom_out_cb)
         self.add_action('ZoomNormal',gtk.STOCK_ZOOM_100,
-                        _("_Normal Size"), callback=self.zoom_100_cb)
+                        _("_Normal Size"), tip=_("Return to normal size"),
+                        callback=self.zoom_100_cb)
         self.add_action('ZoomFit',gtk.STOCK_ZOOM_FIT,
-                        _("Best _Fit"),callback=self.zoom_fit_cb)
+                        _("Best _Fit"),
+                        tip=_("Produce the best fit of the map in the window"),
+                        callback=self.zoom_fit_cb)
 
     def get_stock(self):
         """
diff --git a/src/ViewManager.py b/src/ViewManager.py
index e348a585f..96df78abb 100644
--- a/src/ViewManager.py
+++ b/src/ViewManager.py
@@ -251,12 +251,23 @@ class ViewManager:
 
         toolbar = self.uimanager.get_widget('/ToolBar')
         openbtn = gtk.MenuToolButton(gtk.STOCK_OPEN)
-        openbtn.show()
         openbtn.connect('clicked', self.open_activate)
         openbtn.set_sensitive(False)
+
         self.uistate.set_open_widget(openbtn)
         toolbar.insert(openbtn, 1)
 
+        self.open_tips = gtk.Tooltips()
+        openbtn.set_arrow_tooltip(self.open_tips,
+                                  _("Open a recently opened database"),
+                                  _("Open a recently opened database"))
+        
+        openbtn.set_tooltip(self.open_tips,
+                            _("Open an existing database"),
+                            _("Open an existing database")
+                            )
+        openbtn.show()
+        
         self.person_nav = Navigation.PersonNavigation(self.uistate)
         self._navigation_type[PageView.NAVIGATION_PERSON] = (self.person_nav,
                                                              None)