diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 5f8a60bde..1ee0df38a 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,5 +1,7 @@
 2006-03-02  Alex Roitman  <shura@gramps-project.org>
 	* calendar, filers: Remove directories.
+	* images: Create directory.
+	* src/*png, src/*jpg: move under images directory.
 
 2006-03-02  Don Allingham  <don@gramps-project.org>
 	* configure.in: make distcheck fixes
diff --git a/gramps2/src/Assistant.py b/gramps2/src/Assistant.py
index 261ff0172..771be3aff 100644
--- a/gramps2/src/Assistant.py
+++ b/gramps2/src/Assistant.py
@@ -48,8 +48,8 @@ import const
 # Constants
 #
 #-------------------------------------------------------------------------
-_gramps_png = "%s/gramps.png" % const.rootDir
-_splash_jpg = "%s/splash.jpg" % const.rootDir
+_gramps_png = "%s/images/gramps.png" % const.rootDir
+_splash_jpg = "%s/images/splash.jpg" % const.rootDir
 _format = '<span weight="bold" size="xx-large">%s</span>'
 
 #-------------------------------------------------------------------------
diff --git a/gramps2/src/ImgManip.py b/gramps2/src/ImgManip.py
index 233636caa..5994d7049 100644
--- a/gramps2/src/ImgManip.py
+++ b/gramps2/src/ImgManip.py
@@ -1,7 +1,7 @@
 #
 # Gramps - a GTK+/GNOME based genealogy program
 #
-# Copyright (C) 2000-2003  Donald N. Allingham
+# Copyright (C) 2000-2006  Donald N. Allingham
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -155,7 +155,8 @@ def get_thumbnail_image(path,mtype=None):
         if mtype:
             return GrampsMime.find_mime_type_pixbuf(mtype)
         else:
-            return gtk.gdk.pixbuf_new_from_file(os.path.join(const.dataDir,"document.png"))
+            return gtk.gdk.pixbuf_new_from_file(os.path.join(
+                const.dataDir,"images/document.png"))
 
 def get_thumbnail_path(path,mtype=None):
     filename = _build_thumb_path(path)
diff --git a/gramps2/src/MapView.py b/gramps2/src/MapView.py
index 1aef9e763..65fed3b2d 100644
--- a/gramps2/src/MapView.py
+++ b/gramps2/src/MapView.py
@@ -1,7 +1,7 @@
 #
 # Gramps - a GTK+/GNOME based genealogy program
 #
-# Copyright (C) 2001-2005  Donald N. Allingham
+# Copyright (C) 2001-2006  Donald N. Allingham
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -396,9 +396,9 @@ class MapView(PageView.PageView):
         no = gtk.Image()
         # The large zoomable map
         self.zoom_map = ZoomMap(
-            gtk.gdk.pixbuf_new_from_file("land_shallow_topo_2048.jpg"),
-            gtk.gdk.pixbuf_new_from_file("bad.png"),
-            gtk.gdk.pixbuf_new_from_file("good.png"))
+            gtk.gdk.pixbuf_new_from_file("images/land_shallow_topo_2048.jpg"),
+            gtk.gdk.pixbuf_new_from_file("images/bad.png"),
+            gtk.gdk.pixbuf_new_from_file("images/good.png"))
         self.zoom_map.set_size_request(300,300)
         hbox.pack_start( self.zoom_map, True, True, 0)
         
@@ -408,7 +408,7 @@ class MapView(PageView.PageView):
         
         # The small guide map
         self.guide_map = GuideMap(
-            gtk.gdk.pixbuf_new_from_file("land_shallow_topo_350.jpg"))
+            gtk.gdk.pixbuf_new_from_file("images/land_shallow_topo_350.jpg"))
         self.guide_map.set_size_request(128,64)
         vbox.pack_start( self.guide_map, False, True, 0)
         
diff --git a/gramps2/src/ScratchPad.py b/gramps2/src/ScratchPad.py
index ca033b817..8b5e044a3 100644
--- a/gramps2/src/ScratchPad.py
+++ b/gramps2/src/ScratchPad.py
@@ -1,7 +1,7 @@
 #
 # Gramps - a GTK+/GNOME based genealogy program
 #
-# Copyright (C) 2000-2005  Donald N. Allingham
+# Copyright (C) 2000-2006  Donald N. Allingham
 #
 # This program is free software; you can redistribute it and/or modiy
 # it under the terms of the GNU General Public License as published by
@@ -59,7 +59,7 @@ from DdTargets import DdTargets
 #-------------------------------------------------------------------------
 
 LINK_PIC = gtk.gdk.pixbuf_new_from_file( "%s/%s" % (os.path.dirname(__file__),
-                                                    'stock_link.png'))
+                                                    'images/stock_link.png'))
 BLANK_PIC = gtk.gdk.Pixbuf(0,0,8,1,1)
 
 #-------------------------------------------------------------------------
diff --git a/gramps2/src/const.py.in b/gramps2/src/const.py.in
index 4ff392854..7c20b2600 100644
--- a/gramps2/src/const.py.in
+++ b/gramps2/src/const.py.in
@@ -3,7 +3,7 @@
 #
 # Gramps - a GTK+/GNOME based genealogy program
 #
-# Copyright (C) 2000-2005  Donald N. Allingham
+# Copyright (C) 2000-2006  Donald N. Allingham
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -96,9 +96,9 @@ custom_filters = "~/.gramps/custom_filters.xml"
 report_options = "~/.gramps/report_options.xml"
 tool_options   = "~/.gramps/tool_options.xml"
 bsddbenv_dir   = "~/.gramps/bsddbenv"
-icon           = os.path.join(rootDir,"gramps.png")
-logo           = os.path.join(rootDir,"logo.png")
-splash         = os.path.join(rootDir,"splash.jpg")
+icon           = os.path.join(rootDir,"images/gramps.png")
+logo           = os.path.join(rootDir,"images/logo.png")
+splash         = os.path.join(rootDir,"images/splash.jpg")
 license        = os.path.join(rootDir,"COPYING")
 gladeFile      = os.path.join(rootDir,"gramps.glade")
 editPersonFile = os.path.join(rootDir,"edit_person.glade")
diff --git a/gramps2/src/edit_person.glade b/gramps2/src/edit_person.glade
index 3124b099c..438647428 100644
--- a/gramps2/src/edit_person.glade
+++ b/gramps2/src/edit_person.glade
@@ -12,7 +12,7 @@
   <property name="default_height">500</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">gramps.png</property>
+  <property name="icon">images/gramps.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -541,7 +541,7 @@ Unknown</property>
 		  <child>
 		    <widget class="GtkImage" id="image2261">
 		      <property name="visible">True</property>
-		      <property name="pixbuf">edit_sm.png</property>
+		      <property name="pixbuf">images/edit_sm.png</property>
 		      <property name="xalign">0.5</property>
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
diff --git a/gramps2/src/gramps.glade b/gramps2/src/gramps.glade
index 3036722af..1c66b39ca 100644
--- a/gramps2/src/gramps.glade
+++ b/gramps2/src/gramps.glade
@@ -14,7 +14,7 @@
   <property name="default_height">450</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">gramps.png</property>
+  <property name="icon">images/gramps.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -356,7 +356,7 @@
   <property name="modal">False</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">gramps.png</property>
+  <property name="icon">images/gramps.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -502,7 +502,7 @@
   <property name="default_height">500</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">gramps.png</property>
+  <property name="icon">images/gramps.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -1380,7 +1380,7 @@
   <property name="default_height">450</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">gramps.png</property>
+  <property name="icon">images/gramps.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -2169,7 +2169,7 @@
   <property name="modal">False</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">gramps.png</property>
+  <property name="icon">images/gramps.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -4034,7 +4034,7 @@ Text Beside Icons</property>
   <property name="default_height">450</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">gramps.png</property>
+  <property name="icon">images/gramps.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -4171,7 +4171,7 @@ Text Beside Icons</property>
   <property name="default_height">300</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">gramps.png</property>
+  <property name="icon">images/gramps.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -4335,7 +4335,7 @@ Text Beside Icons</property>
 		      <child>
 			<widget class="GtkImage" id="image2329">
 			  <property name="visible">True</property>
-			  <property name="pixbuf">edit_sm.png</property>
+			  <property name="pixbuf">images/edit_sm.png</property>
 			  <property name="xalign">0.5</property>
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
@@ -4399,7 +4399,7 @@ Text Beside Icons</property>
   <property name="modal">True</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">gramps.png</property>
+  <property name="icon">images/gramps.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -5953,7 +5953,7 @@ Text Beside Icons</property>
   <property name="default_height">450</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">gramps.png</property>
+  <property name="icon">images/gramps.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -6271,7 +6271,7 @@ Text Beside Icons</property>
   <property name="default_height">450</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">gramps.png</property>
+  <property name="icon">images/gramps.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -7023,7 +7023,7 @@ Text Beside Icons</property>
   <property name="default_height">450</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">gramps.png</property>
+  <property name="icon">images/gramps.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -8776,7 +8776,7 @@ Text Beside Icons</property>
   <property name="default_height">450</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">gramps.png</property>
+  <property name="icon">images/gramps.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -9223,7 +9223,7 @@ Text Beside Icons</property>
   <property name="default_height">400</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">gramps.png</property>
+  <property name="icon">images/gramps.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -9488,7 +9488,7 @@ Text Beside Icons</property>
   <property name="default_width">500</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">gramps.png</property>
+  <property name="icon">images/gramps.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -9992,7 +9992,7 @@ Text Beside Icons</property>
   <property name="default_height">450</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">gramps.png</property>
+  <property name="icon">images/gramps.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -10542,7 +10542,7 @@ Text Beside Icons</property>
   <property name="default_width">600</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">gramps.png</property>
+  <property name="icon">images/gramps.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -10866,7 +10866,7 @@ Text Beside Icons</property>
   <property name="default_width">600</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">gramps.png</property>
+  <property name="icon">images/gramps.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -12008,7 +12008,7 @@ Text Beside Icons</property>
   <property name="modal">False</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">gramps.png</property>
+  <property name="icon">images/gramps.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -12914,7 +12914,7 @@ Text Beside Icons</property>
   <property name="default_height">400</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">gramps.png</property>
+  <property name="icon">images/gramps.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -13005,7 +13005,7 @@ Text Beside Icons</property>
   <property name="default_height">450</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">gramps.png</property>
+  <property name="icon">images/gramps.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -13309,7 +13309,7 @@ Text Beside Icons</property>
   <property name="default_width">550</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">gramps.png</property>
+  <property name="icon">images/gramps.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -13856,7 +13856,7 @@ Text Beside Icons</property>
   <property name="default_height">450</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">gramps.png</property>
+  <property name="icon">images/gramps.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -14632,7 +14632,7 @@ Text Beside Icons</property>
   <property name="default_width">600</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">gramps.png</property>
+  <property name="icon">images/gramps.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -15519,7 +15519,7 @@ Very High</property>
   <property name="default_height">450</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">gramps.png</property>
+  <property name="icon">images/gramps.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
diff --git a/gramps2/src/gramps_main.py b/gramps2/src/gramps_main.py
index 6e01b453a..3264d8231 100644
--- a/gramps2/src/gramps_main.py
+++ b/gramps2/src/gramps_main.py
@@ -1,7 +1,7 @@
 #
 # Gramps - a GTK+/GNOME based genealogy program
 #
-# Copyright (C) 2001-2005  Donald N. Allingham
+# Copyright (C) 2001-2006  Donald N. Allingham
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -65,17 +65,26 @@ iconpaths = [".",const.rootDir]
 def register_stock_icons ():
     import os
     items = [
-        ('person.svg',('gramps-person','Person',gtk.gdk.CONTROL_MASK,0,'')),
-        ('relation.svg',('gramps-family','Relationships',gtk.gdk.CONTROL_MASK,0,'')),
-        ('flist.svg',('gramps-family-list','Family List',gtk.gdk.CONTROL_MASK,0,'')),
-        ('media.svg',('gramps-media','Media',gtk.gdk.CONTROL_MASK,0,'')),
-        ('ped24.png',('gramps-pedigree','Pedigree',gtk.gdk.CONTROL_MASK,0,'')),
-        ('repos.png',('gramps-repository','Repositories',
-                      gtk.gdk.CONTROL_MASK,0,'')),
-        ('sources.png',('gramps-source','Sources',gtk.gdk.CONTROL_MASK,0,'')),
-        ('events.png',('gramps-event','Events',gtk.gdk.CONTROL_MASK,0,'')),
-        ('place.png',('gramps-place','Places',gtk.gdk.CONTROL_MASK,0,'')),
-        ('place.png',('gramps-map','Map',gtk.gdk.CONTROL_MASK,0,'')),
+        ('images/person.svg',('gramps-person',
+                              'Person',gtk.gdk.CONTROL_MASK,0,'')),
+        ('images/relation.svg',('gramps-family',
+                                'Relationships',gtk.gdk.CONTROL_MASK,0,'')),
+        ('images/flist.svg',('gramps-family-list',
+                             'Family List',gtk.gdk.CONTROL_MASK,0,'')),
+        ('images/media.svg',('gramps-media',
+                             'Media',gtk.gdk.CONTROL_MASK,0,'')),
+        ('images/ped24.png',('gramps-pedigree',
+                             'Pedigree',gtk.gdk.CONTROL_MASK,0,'')),
+        ('images/repos.png',('gramps-repository',
+                             'Repositories',gtk.gdk.CONTROL_MASK,0,'')),
+        ('images/sources.png',('gramps-source',
+                               'Sources',gtk.gdk.CONTROL_MASK,0,'')),
+        ('images/events.png',('gramps-event',
+                              'Events',gtk.gdk.CONTROL_MASK,0,'')),
+        ('images/place.png',('gramps-place',
+                             'Places',gtk.gdk.CONTROL_MASK,0,'')),
+        ('images/place.png',('gramps-map',
+                             'Map',gtk.gdk.CONTROL_MASK,0,'')),
         ]
     
     # Register our stock items
@@ -92,7 +101,7 @@ def register_stock_icons ():
             if os.path.isfile(icon_file):
                 break
         else:
-            icon_file = os.path.join(iconpaths[0],'gramps.png')
+            icon_file = os.path.join(iconpaths[0],'images/gramps.png')
             
         pixbuf = gtk.gdk.pixbuf_new_from_file (icon_file)
         pixbuf = pixbuf.add_alpha(True, chr(0xff), chr(0xff), chr(0xff))
diff --git a/gramps2/src/bad.png b/gramps2/src/images/bad.png
similarity index 100%
rename from gramps2/src/bad.png
rename to gramps2/src/images/bad.png
diff --git a/gramps2/src/caution.png b/gramps2/src/images/caution.png
similarity index 100%
rename from gramps2/src/caution.png
rename to gramps2/src/images/caution.png
diff --git a/gramps2/src/edit.png b/gramps2/src/images/edit.png
similarity index 100%
rename from gramps2/src/edit.png
rename to gramps2/src/images/edit.png
diff --git a/gramps2/src/edit_sm.png b/gramps2/src/images/edit_sm.png
similarity index 100%
rename from gramps2/src/edit_sm.png
rename to gramps2/src/images/edit_sm.png
diff --git a/gramps2/src/events.png b/gramps2/src/images/events.png
similarity index 100%
rename from gramps2/src/events.png
rename to gramps2/src/images/events.png
diff --git a/gramps2/src/events24.png b/gramps2/src/images/events24.png
similarity index 100%
rename from gramps2/src/events24.png
rename to gramps2/src/images/events24.png
diff --git a/gramps2/src/flist.svg b/gramps2/src/images/flist.svg
similarity index 100%
rename from gramps2/src/flist.svg
rename to gramps2/src/images/flist.svg
diff --git a/gramps2/src/good.png b/gramps2/src/images/good.png
similarity index 100%
rename from gramps2/src/good.png
rename to gramps2/src/images/good.png
diff --git a/gramps2/src/gramps.png b/gramps2/src/images/gramps.png
similarity index 100%
rename from gramps2/src/gramps.png
rename to gramps2/src/images/gramps.png
diff --git a/gramps2/src/land_shallow_topo_2048.jpg b/gramps2/src/images/land_shallow_topo_2048.jpg
similarity index 100%
rename from gramps2/src/land_shallow_topo_2048.jpg
rename to gramps2/src/images/land_shallow_topo_2048.jpg
diff --git a/gramps2/src/land_shallow_topo_350.jpg b/gramps2/src/images/land_shallow_topo_350.jpg
similarity index 100%
rename from gramps2/src/land_shallow_topo_350.jpg
rename to gramps2/src/images/land_shallow_topo_350.jpg
diff --git a/gramps2/src/locked.png b/gramps2/src/images/locked.png
similarity index 100%
rename from gramps2/src/locked.png
rename to gramps2/src/images/locked.png
diff --git a/gramps2/src/logo.png b/gramps2/src/images/logo.png
similarity index 100%
rename from gramps2/src/logo.png
rename to gramps2/src/images/logo.png
diff --git a/gramps2/src/media.png b/gramps2/src/images/media.png
similarity index 100%
rename from gramps2/src/media.png
rename to gramps2/src/images/media.png
diff --git a/gramps2/src/media.svg b/gramps2/src/images/media.svg
similarity index 100%
rename from gramps2/src/media.svg
rename to gramps2/src/images/media.svg
diff --git a/gramps2/src/ped24.png b/gramps2/src/images/ped24.png
similarity index 100%
rename from gramps2/src/ped24.png
rename to gramps2/src/images/ped24.png
diff --git a/gramps2/src/person.svg b/gramps2/src/images/person.svg
similarity index 100%
rename from gramps2/src/person.svg
rename to gramps2/src/images/person.svg
diff --git a/gramps2/src/place.png b/gramps2/src/images/place.png
similarity index 100%
rename from gramps2/src/place.png
rename to gramps2/src/images/place.png
diff --git a/gramps2/src/place24.png b/gramps2/src/images/place24.png
similarity index 100%
rename from gramps2/src/place24.png
rename to gramps2/src/images/place24.png
diff --git a/gramps2/src/relation.svg b/gramps2/src/images/relation.svg
similarity index 100%
rename from gramps2/src/relation.svg
rename to gramps2/src/images/relation.svg
diff --git a/gramps2/src/repos.png b/gramps2/src/images/repos.png
similarity index 100%
rename from gramps2/src/repos.png
rename to gramps2/src/images/repos.png
diff --git a/gramps2/src/repos24.png b/gramps2/src/images/repos24.png
similarity index 100%
rename from gramps2/src/repos24.png
rename to gramps2/src/images/repos24.png
diff --git a/gramps2/src/sources.png b/gramps2/src/images/sources.png
similarity index 100%
rename from gramps2/src/sources.png
rename to gramps2/src/images/sources.png
diff --git a/gramps2/src/sources24.png b/gramps2/src/images/sources24.png
similarity index 100%
rename from gramps2/src/sources24.png
rename to gramps2/src/images/sources24.png
diff --git a/gramps2/src/splash.jpg b/gramps2/src/images/splash.jpg
similarity index 100%
rename from gramps2/src/splash.jpg
rename to gramps2/src/images/splash.jpg
diff --git a/gramps2/src/stock_link.png b/gramps2/src/images/stock_link.png
similarity index 100%
rename from gramps2/src/stock_link.png
rename to gramps2/src/images/stock_link.png
diff --git a/gramps2/src/tools.png b/gramps2/src/images/tools.png
similarity index 100%
rename from gramps2/src/tools.png
rename to gramps2/src/images/tools.png
diff --git a/gramps2/src/mergedata.glade b/gramps2/src/mergedata.glade
index 857a49346..54644c423 100644
--- a/gramps2/src/mergedata.glade
+++ b/gramps2/src/mergedata.glade
@@ -11,7 +11,7 @@
   <property name="modal">True</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">gramps.png</property>
+  <property name="icon">images/gramps.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -287,7 +287,7 @@
   <property name="default_height">500</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">gramps.png</property>
+  <property name="icon">images/gramps.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -552,7 +552,7 @@
   <property name="modal">False</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">gramps.png</property>
+  <property name="icon">images/gramps.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -1153,7 +1153,7 @@
   <property name="default_width">300</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">gramps.png</property>
+  <property name="icon">images/gramps.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
diff --git a/gramps2/src/plugins.glade b/gramps2/src/plugins.glade
index ca333b6b8..abfb4093f 100644
--- a/gramps2/src/plugins.glade
+++ b/gramps2/src/plugins.glade
@@ -11,7 +11,7 @@
   <property name="modal">False</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">gramps.png</property>
+  <property name="icon">images/gramps.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -136,7 +136,7 @@
   <property name="default_height">400</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">gramps.png</property>
+  <property name="icon">images/gramps.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -238,7 +238,7 @@
 		  <child>
 		    <widget class="GtkImage" id="image">
 		      <property name="visible">True</property>
-		      <property name="pixbuf">gramps.png</property>
+		      <property name="pixbuf">images/gramps.png</property>
 		      <property name="xalign">0.5</property>
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
diff --git a/gramps2/src/rule.glade b/gramps2/src/rule.glade
index ded0dffa0..eba07175e 100644
--- a/gramps2/src/rule.glade
+++ b/gramps2/src/rule.glade
@@ -12,7 +12,7 @@
   <property name="modal">False</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">gramps.png</property>
+  <property name="icon">images/gramps.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -533,7 +533,7 @@
   <property name="default_height">350</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">gramps.png</property>
+  <property name="icon">images/gramps.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -849,7 +849,7 @@
   <property name="default_height">400</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">gramps.png</property>
+  <property name="icon">images/gramps.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -958,7 +958,7 @@
   <property name="modal">False</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">gramps.png</property>
+  <property name="icon">images/gramps.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>