diff --git a/ChangeLog b/ChangeLog
index 989a3ab50..e37431033 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
 	* data/gramps.schemas.in: add family-warn back in
 	
 2006-05-02  Alex Roitman  <shura@gramps-project.org>
+	* src/GrampsWidgets.py (IconButton): Replace event box with button.
+
 	* configure.in: Generate new Makefiles.
 	* src/GenericFilters.py: Remove.
 	* src/Filters: Move filtering to its own package.
diff --git a/src/GrampsWidgets.py b/src/GrampsWidgets.py
index b9f8a540a..465c92022 100644
--- a/src/GrampsWidgets.py
+++ b/src/GrampsWidgets.py
@@ -76,15 +76,16 @@ class LinkLabel(gtk.EventBox):
         self.label.set_text(text)
         self.label.set_use_markup(True)
 
-class IconButton(gtk.EventBox):
+class IconButton(gtk.Button):
 
     def __init__(self, func, handle, icon=gtk.STOCK_EDIT,
                  size=gtk.ICON_SIZE_MENU):
-        gtk.EventBox.__init__(self)
+        gtk.Button.__init__(self)
         image = gtk.Image()
         image.set_from_stock(icon, size)
         image.show()
         self.add(image)
+        self.set_relief(gtk.RELIEF_NONE)
         self.show()
 
         if func: