diff --git a/ChangeLog b/ChangeLog
index 1ab4d506d..fad037490 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
 2006-05-16  Don Allingham  <don@gramps-project.org>
+	* src/DisplayTabs/_WebEmbedList.py: icon fixes
+	* src/images/stock_insert-url.png: added
+	* src/images/person.png: added
+	* src/images/relation.png: added
+	* src/images/Makefile.am: added new images
+	* src/gramps_main.py: register icons as stock
 	* src/GrampsDb/_ReadGedcom.py: handle blank lines
 
 2006-05-16  Alex Roitman  <shura@gramps-project.org>
diff --git a/src/DisplayTabs/_WebEmbedList.py b/src/DisplayTabs/_WebEmbedList.py
index bdab8529b..8efb7b64d 100644
--- a/src/DisplayTabs/_WebEmbedList.py
+++ b/src/DisplayTabs/_WebEmbedList.py
@@ -60,7 +60,7 @@ class WebEmbedList(EmbeddedList):
                               _('Internet'), WebModel)
 
     def get_icon_name(self):
-        return (0,'stock_insert-url')
+        return 'gramps-url'
 
     def get_data(self):
         return self.data
diff --git a/src/gramps_main.py b/src/gramps_main.py
index b3bb6ec5b..5cf190ae8 100644
--- a/src/gramps_main.py
+++ b/src/gramps_main.py
@@ -51,12 +51,22 @@ from gettext import gettext as _
 
 iconpaths = [const.image_dir,"."]
 
+
+import platform
+
+if platform.system() == "Windows":
+    person_icon = "person.png"
+    relation_icon = "relation.png"
+else:
+    person_icon = "person.svg"
+    relation_icon = "relation.svg"
+
 def register_stock_icons ():
     import os
     items = [
-        (os.path.join(const.image_dir,'person.svg'),
+        (os.path.join(const.image_dir,person_icon),
          ('gramps-person',_('Person'),gtk.gdk.CONTROL_MASK,0,'')),
-        (os.path.join(const.image_dir,'relation.svg'),
+        (os.path.join(const.image_dir,relation_icon),
          ('gramps-family',_('Relationships'),gtk.gdk.CONTROL_MASK,0,'')),
         (os.path.join(const.image_dir,'flist.svg'),
          ('gramps-family-list',_('Family List'),gtk.gdk.CONTROL_MASK,0,'')),
@@ -82,6 +92,8 @@ def register_stock_icons ():
          ('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,'')),
+        (os.path.join(const.image_dir,'stock_insert-url.png'),
+         ('gramps-url',_('URL'),gtk.gdk.CONTROL_MASK,0,'')),
         ]
     
     # Register our stock items
diff --git a/src/images/Makefile.am b/src/images/Makefile.am
index 513ab9918..cb75a3225 100644
--- a/src/images/Makefile.am
+++ b/src/images/Makefile.am
@@ -62,14 +62,24 @@ dist_pkgdata_DATA = \
 	media.svg\
 	ped24.png\
 	person.svg\
+	person.png\
 	place.png\
 	place24.png\
 	relation.svg\
+	relation.png\
 	repos.png\
 	repos24.png\
 	sources.png\
 	sources24.png\
 	splash.jpg\
+	stock_add-bookmark.png\
+	stock_bookmark.png\
+	stock_delete-bookmark.png\
+	stock_edit-bookmark.png\
+	stock_export.png\
+	stock_insert-url.png\
+	stock_new-html.png\
+	stock_undo-history.png\
 	stock_link.png\
 	stock_lock-open.png\
 	stock_lock.png\
diff --git a/src/images/person.png b/src/images/person.png
new file mode 100644
index 000000000..b0bf31027
Binary files /dev/null and b/src/images/person.png differ
diff --git a/src/images/relation.png b/src/images/relation.png
new file mode 100644
index 000000000..1cdc8fbf5
Binary files /dev/null and b/src/images/relation.png differ
diff --git a/src/images/stock_insert-url.png b/src/images/stock_insert-url.png
new file mode 100644
index 000000000..380aa3361
Binary files /dev/null and b/src/images/stock_insert-url.png differ