diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 750b87372..11cc1d1b2 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,4 +1,14 @@
 2006-05-15  Don Allingham  <don@gramps-project.org>
+	* src/ViewManager.py: new stock icon support
+	* src/gramps_main.py: new stock icon support
+	* src/PageView.py: new stock icon support
+	* src/images/stock_new-html.png: added
+	* src/images/stock_delete-bookmark.png: added
+	* src/images/stock_export.png: added
+	* src/images/stock_edit-bookmark.png: added
+	* src/images/stock_add-bookmark.png: added
+	* src/images/stock_undo-history.png: added
+	* src/images/stock_bookmark.png: added
 	* src/DisplayTabs/_DataEmbedList.py: disable DND
 
 2006-05-15  Alex Roitman  <shura@gramps-project.org>
diff --git a/gramps2/src/PageView.py b/gramps2/src/PageView.py
index 9b12326c0..586e3206d 100644
--- a/gramps2/src/PageView.py
+++ b/gramps2/src/PageView.py
@@ -242,9 +242,9 @@ class BookMarkView(PageView):
     def define_actions(self):
         self.book_action = gtk.ActionGroup(self.title + '/Bookmark')
         self.book_action.add_actions([
-            ('AddBook',gtk.STOCK_INDEX,_('_Add bookmark'),'<control>d',None,
+            ('AddBook','gramps-add-bookmark', _('_Add bookmark'),'<control>d',None,
              self.add_bookmark), 
-            ('EditBook',None,_('_Edit bookmarks'),'<control>b',None,
+            ('EditBook','gramps-edit-bookmark', _('_Edit bookmarks'),'<control>b',None,
              self.edit_bookmarks),
             ])
 
diff --git a/gramps2/src/ViewManager.py b/gramps2/src/ViewManager.py
index 92cf3ca5f..742df2429 100644
--- a/gramps2/src/ViewManager.py
+++ b/gramps2/src/ViewManager.py
@@ -337,7 +337,7 @@ class ViewManager:
         self._action_action_list = [
             ('SaveAs', gtk.STOCK_SAVE_AS, _('_Save As'),"<control><shift>s",
              None, self.save_as_activate), 
-            ('Export', gtk.STOCK_SAVE_AS, _('_Export'), "<control>e", None,
+            ('Export', 'gramps-export', _('_Export'), "<control>e", None,
              self.export_data), 
             ('Abandon', gtk.STOCK_REVERT_TO_SAVED,
              _('_Abandon changes and quit'), None, None, self.abort), 
@@ -387,7 +387,7 @@ class ViewManager:
             ]
 
         self._undo_history_action_list = [
-            ('UndoHistory', 'stock_undo-history',
+            ('UndoHistory', 'gramps-undo-history',
              _('Undo History'), None, None, self.undo_history),
             ]
 
diff --git a/gramps2/src/gramps_main.py b/gramps2/src/gramps_main.py
index d07c2f208..b3bb6ec5b 100644
--- a/gramps2/src/gramps_main.py
+++ b/gramps2/src/gramps_main.py
@@ -74,6 +74,14 @@ def register_stock_icons ():
          ('gramps-place',_('Places'),gtk.gdk.CONTROL_MASK,0,'')),
         (os.path.join(const.image_dir,'place.png'),
          ('gramps-map',_('Map'),gtk.gdk.CONTROL_MASK,0,'')),
+        (os.path.join(const.image_dir,'stock_export.png'),
+         ('gramps-export',_('Map'),gtk.gdk.CONTROL_MASK,0,'')),
+        (os.path.join(const.image_dir,'stock_undo-history.png'),
+         ('gramps-undo-history',_('Undo History'),gtk.gdk.CONTROL_MASK,0,'')),
+        (os.path.join(const.image_dir,'stock_add-bookmark.png'),
+         ('gramps-add-bookmark',_('Add bookmark'),gtk.gdk.CONTROL_MASK,0,'')),
+        (os.path.join(const.image_dir,'stock_edit-bookmark.png'),
+         ('gramps-edit-bookmark',_('Edit bookmarks'),gtk.gdk.CONTROL_MASK,0,'')),
         ]
     
     # Register our stock items
diff --git a/gramps2/src/images/stock_add-bookmark.png b/gramps2/src/images/stock_add-bookmark.png
new file mode 100644
index 000000000..cf3295281
Binary files /dev/null and b/gramps2/src/images/stock_add-bookmark.png differ
diff --git a/gramps2/src/images/stock_bookmark.png b/gramps2/src/images/stock_bookmark.png
new file mode 100644
index 000000000..df496d22a
Binary files /dev/null and b/gramps2/src/images/stock_bookmark.png differ
diff --git a/gramps2/src/images/stock_delete-bookmark.png b/gramps2/src/images/stock_delete-bookmark.png
new file mode 100644
index 000000000..4a8a3ccdb
Binary files /dev/null and b/gramps2/src/images/stock_delete-bookmark.png differ
diff --git a/gramps2/src/images/stock_edit-bookmark.png b/gramps2/src/images/stock_edit-bookmark.png
new file mode 100644
index 000000000..9164a2067
Binary files /dev/null and b/gramps2/src/images/stock_edit-bookmark.png differ
diff --git a/gramps2/src/images/stock_export.png b/gramps2/src/images/stock_export.png
new file mode 100644
index 000000000..2e560a748
Binary files /dev/null and b/gramps2/src/images/stock_export.png differ
diff --git a/gramps2/src/images/stock_new-html.png b/gramps2/src/images/stock_new-html.png
new file mode 100644
index 000000000..c3552b137
Binary files /dev/null and b/gramps2/src/images/stock_new-html.png differ
diff --git a/gramps2/src/images/stock_undo-history.png b/gramps2/src/images/stock_undo-history.png
new file mode 100644
index 000000000..caae3d321
Binary files /dev/null and b/gramps2/src/images/stock_undo-history.png differ