diff --git a/ChangeLog b/ChangeLog
index d0aabd34f..d42952cf0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2006-10-10  Don Allingham  <don@gramps-project.org>
+	* src/gramps_main.py: use pngs for windows
+
 2006-10-10  Alex Roitman  <shura@gramps-project.org>
 	* src/GrampsDb/_GrampsBSDDB.py (gramps_upgrade_10,
 	gramps_upgrade_11): Properly use TXN.	
diff --git a/src/gramps_main.py b/src/gramps_main.py
index ec33fb772..62a186b39 100644
--- a/src/gramps_main.py
+++ b/src/gramps_main.py
@@ -65,33 +65,47 @@ iconpaths = [const.image_dir,"."]
 if platform.system() == "Windows":
     person_icon = "person.png"
     relation_icon = "relation.png"
+    place_icon = "place.png"
+    family_icon = "flist.png"
+    media_icon = "media.png"
+    sources_icon = "sources.png"
+    events_icon = "events.png"
+    tools_icon = "tools.png"
+    reports_icon = "reports.png"
 else:
     person_icon = "person.svg"
     relation_icon = "relation.svg"
+    place_icon = "place.svg"
+    family_icon = "flist.svg"
+    media_icon = "media.svg"
+    sources_icon = "sources.svg"
+    events_icon = "events.svg"
+    tools_icon = "tools.svg"
+    reports_icon = "reports.svg"
 
 def register_stock_icons ():
     items = [
-        (os.path.join(const.image_dir,person_icon),
+        (os.path.join(const.image_dir, person_icon),
          ('gramps-person',_('Person'),gtk.gdk.CONTROL_MASK,0,'')),
-        (os.path.join(const.image_dir,relation_icon),
+        (os.path.join(const.image_dir, relation_icon),
          ('gramps-family',_('Relationships'),gtk.gdk.CONTROL_MASK,0,'')),
-        (os.path.join(const.image_dir,'flist.svg'),
+        (os.path.join(const.image_dir, family_icon),
          ('gramps-family-list',_('Family List'),gtk.gdk.CONTROL_MASK,0,'')),
-        (os.path.join(const.image_dir,'media.svg'),
+        (os.path.join(const.image_dir, media_icon),
          ('gramps-media',_('Media'),gtk.gdk.CONTROL_MASK,0,'')),
         (os.path.join(const.image_dir,'ped24.png'),
          ('gramps-pedigree',_('Pedigree'),gtk.gdk.CONTROL_MASK,0,'')),
         (os.path.join(const.image_dir,'repos.png'),
          ('gramps-repository',_('Repositories'),gtk.gdk.CONTROL_MASK,0,'')),
-        (os.path.join(const.image_dir,'sources.svg'),
+        (os.path.join(const.image_dir, sources_icon),
          ('gramps-source',_('Sources'),gtk.gdk.CONTROL_MASK,0,'')),
-        (os.path.join(const.image_dir,'events.svg'),
+        (os.path.join(const.image_dir, events_icon),
          ('gramps-event',_('Events'),gtk.gdk.CONTROL_MASK,0,'')),
-        (os.path.join(const.image_dir,'place.svg'),
+        (os.path.join(const.image_dir, place_icon),
          ('gramps-place',_('Places'),gtk.gdk.CONTROL_MASK,0,'')),
-        (os.path.join(const.image_dir,'tools.svg'),
+        (os.path.join(const.image_dir, tools_icon),
          ('gramps-tools',_('Tools'),gtk.gdk.CONTROL_MASK,0,'')),
-        (os.path.join(const.image_dir,'reports.svg'),
+        (os.path.join(const.image_dir, reports_icon),
          ('gramps-reports',_('Reports'),gtk.gdk.CONTROL_MASK,0,'')),
         (os.path.join(const.image_dir,'stock_export.png'),
          ('gramps-export',_('Export'),gtk.gdk.CONTROL_MASK,0,'')),
diff --git a/src/images/Makefile.am b/src/images/Makefile.am
index cd021de32..968d0283c 100644
--- a/src/images/Makefile.am
+++ b/src/images/Makefile.am
@@ -53,21 +53,28 @@ dist_pkgdata_DATA = \
 	bad.png\
 	caution.png\
 	events.svg\
+	events.png\
 	flist.svg\
+	flist.png\
 	good.png\
 	gramps.png\
 	locked.png\
 	logo.png\
 	media.svg\
+	media.png\
 	ped24.png\
 	person.svg\
 	person.png\
 	tools.svg\
+	tools.png\
 	place.svg\
+	place.png\
 	relation.svg\
 	repos.png\
 	reports.svg\
+	reports.png\
 	sources.svg\
+	sources.png\
 	splash.jpg\
 	stock_add-bookmark.png\
 	stock_bookmark.png\
diff --git a/src/images/edit_sm.png b/src/images/edit_sm.png
deleted file mode 100644
index 05b6f2c68..000000000
Binary files a/src/images/edit_sm.png and /dev/null differ
diff --git a/src/images/events.png b/src/images/events.png
new file mode 100644
index 000000000..21ceab14e
Binary files /dev/null and b/src/images/events.png differ
diff --git a/src/images/flist.png b/src/images/flist.png
new file mode 100644
index 000000000..359be7f5f
Binary files /dev/null and b/src/images/flist.png differ
diff --git a/src/images/media.png b/src/images/media.png
new file mode 100644
index 000000000..38edc4023
Binary files /dev/null and b/src/images/media.png differ
diff --git a/src/images/place.png b/src/images/place.png
index 84bebd7e9..ad89e1890 100644
Binary files a/src/images/place.png and b/src/images/place.png differ
diff --git a/src/images/place24.png b/src/images/place24.png
deleted file mode 100644
index 60e5abd4d..000000000
Binary files a/src/images/place24.png and /dev/null 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/reports.png b/src/images/reports.png
new file mode 100644
index 000000000..b85c280eb
Binary files /dev/null and b/src/images/reports.png differ
diff --git a/src/images/repos24.png b/src/images/repos24.png
deleted file mode 100644
index e15dc11b2..000000000
Binary files a/src/images/repos24.png and /dev/null differ
diff --git a/src/images/sources.png b/src/images/sources.png
new file mode 100644
index 000000000..c0b32088a
Binary files /dev/null and b/src/images/sources.png differ
diff --git a/src/images/sources24.png b/src/images/sources24.png
deleted file mode 100644
index 95464373f..000000000
Binary files a/src/images/sources24.png and /dev/null differ
diff --git a/src/images/tools.png b/src/images/tools.png
new file mode 100644
index 000000000..a1fdef73f
Binary files /dev/null and b/src/images/tools.png differ