Index: glchess/glchess.desktop.in
===================================================================
--- glchess/glchess.desktop.in	(revision 6239)
+++ glchess/glchess.desktop.in	(working copy)
@@ -8,7 +8,7 @@
 Type=Application
 Categories=GNOME;Game;BoardGame;
 StartupNotify=true
-Icon=glchess
+Icon=gnome-glchess
 MimeType=application/x-chess-pgn;
 GenericName=3D Chess Game
 GenericName[pt_BR]=Jogo de Xadrez 3D
Index: glchess/src/lib/gtkui/gtkui.py
===================================================================
--- glchess/src/lib/gtkui/gtkui.py	(revision 6239)
+++ glchess/src/lib/gtkui/gtkui.py	(working copy)
@@ -1043,7 +1057,7 @@
         dialog.set_translator_credits(string[:-1])
         dialog.set_website(WEBSITE)
         dialog.set_website_label(WEBSITE_LABEL)
-        dialog.set_logo_icon_name('glchess')
+        dialog.set_logo_icon_name('gnome-glchess')
         dialog.connect('response', self._on_glchess_about_dialog_close)
         dialog.show()        

Index: glchess/data/glchess.svg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/svg+xml
Index: glchess/data/Makefile.am
===================================================================
--- glchess/data/Makefile.am	(revision 6239)
+++ glchess/data/Makefile.am	(working copy)
@@ -3,11 +3,8 @@
 schema_DATA = $(schema_in_files:.schemas.in=.schemas)
 @INTLTOOL_SCHEMAS_RULE@
 
-EXTRA_DIST = ai.xml glchess.svg $(schema_in_files)
+EXTRA_DIST = ai.xml $(schema_in_files)
 aidir = $(datadir)/glchess/
-ai_DATA = ai.xml glchess.svg
+ai_DATA = ai.xml
 
-icondir = $(datadir)/pixmaps
-icon_DATA = glchess.svg
-
 DISTCLEANFILES = $(schema_DATA)

Index: glchess/glade/save_game.glade
===================================================================
--- glchess/glade/save_game.glade	(revision 6239)
+++ glchess/glade/save_game.glade	(working copy)
@@ -12,7 +12,7 @@
   <property name="modal">False</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">glchess.svg</property>
+  <property name="icon_name">gnome-glchess</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
Index: glchess/glade/glchess.glade
===================================================================
--- glchess/glade/glchess.glade	(revision 6239)
+++ glchess/glade/glchess.glade	(working copy)
@@ -12,7 +12,7 @@
   <property name="default_width">400</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">glchess.svg</property>
+  <property name="icon_name">gnome-glchess</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -859,7 +869,7 @@
   <property name="default_height">200</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">glchess.svg</property>
+  <property name="icon_name">gnome-glchess</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
Index: glchess/glade/load_game.glade
===================================================================
--- glchess/glade/load_game.glade	(revision 6239)
+++ glchess/glade/load_game.glade	(working copy)
@@ -12,7 +12,7 @@
   <property name="modal">False</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">glchess.svg</property>
+  <property name="icon_name">gnome-glchess</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
Index: glchess/glade/new_game.glade
===================================================================
--- glchess/glade/new_game.glade	(revision 6239)
+++ glchess/glade/new_game.glade	(working copy)
@@ -11,7 +11,7 @@
   <property name="modal">False</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">glchess.svg</property>
+  <property name="icon_name">gnome-glchess</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -406,7 +406,7 @@
 			<widget class="GtkImage" id="image1">
 			  <property name="visible">True</property>
 			  <property name="icon_size">6</property>
-			  <property name="icon_name">glchess</property>
+			  <property name="icon_name">gnome-glchess</property>
 			  <property name="xalign">0</property>
 			  <property name="yalign">0</property>
 			  <property name="xpad">0</property>
Index: glchess/glade/network_game.glade
===================================================================
--- glchess/glade/network_game.glade	(revision 6239)
+++ glchess/glade/network_game.glade	(working copy)
@@ -270,7 +270,7 @@
 			<widget class="GtkImage" id="image3">
 			  <property name="visible">True</property>
 			  <property name="icon_size">6</property>
-			  <property name="icon_name">glchess</property>
+			  <property name="icon_name">gnome-glchess</property>
 			  <property name="xalign">0</property>
 			  <property name="yalign">0</property>
 			  <property name="xpad">0</property>
Index: aisleriot/gnome-aisleriot.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: aisleriot/gnome-freecell.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: aisleriot/Makefile.am
===================================================================
--- aisleriot/Makefile.am	(revision 6239)
+++ aisleriot/Makefile.am	(working copy)
@@ -1,7 +1,6 @@
 if HAVE_GUILE
 
 cardimagedir = $(datadir)/pixmaps/cards
-icondir = $(datadir)/icons/hicolor/48x48/apps
 Gamesdir  = $(datadir)/applications
 scmdir  = $(datadir)/sol-games
 gladedir = $(datadir)/sol-games/glade
@@ -61,10 +60,8 @@
 
 cardimage_DATA = baize.png slot.svg
 
-icon_DATA = gnome-aisleriot.png gnome-freecell.png
-
 EXTRA_DIST = AUTHORS $(scm_DATA) $(cardimage_DATA) \
-	$(icon_DATA) sol.desktop.in freecell.desktop.in \
+	sol.desktop.in freecell.desktop.in \
 	translatable_game_names.h \
 	$(schema_in_files) $(glade_DATA)
 
Index: gnomine/22x22/gnome-gnomine.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: gnomine/32x32/gnome-gnomine.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: gnomine/16x16/gnome-gnomine.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: gnomine/48x48/gnome-gnomine.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: gnomine/Makefile.am
===================================================================
--- gnomine/Makefile.am	(revision 6239)
+++ gnomine/Makefile.am	(working copy)
@@ -33,24 +33,8 @@
 	face-worried.png \
 	flag.svg flag-question.svg mine.svg bang.svg warning.svg
 
-icon16dir = $(datadir)/icons/hicolor/16x16/apps/
-icon16_DATA = 16x16/gnome-gnomine.png
-icon22dir = $(datadir)/icons/hicolor/22x22/apps/
-icon22_DATA = 22x22/gnome-gnomine.png
-icon32dir = $(datadir)/icons/hicolor/32x32/apps/
-icon32_DATA = 32x32/gnome-gnomine.png
-icon48dir = $(datadir)/icons/hicolor/48x48/apps/
-icon48_DATA = 48x48/gnome-gnomine.png
-svgicondir = $(datadir)/icons/hicolor/scalable/apps/
-svgicon_DATA = scalable/gnome-gnomine.svg
-
 EXTRA_DIST = gnomine.desktop.in README AUTHORS \
-	$(schema_in_files) $(pixmap_DATA) \
-	$(icon16_DATA) \
-	$(icon22_DATA) \
-	$(icon32_DATA) \
-	$(icon48_DATA) \
-	$(svgicon_DATA)
+	$(schema_in_files) $(pixmap_DATA)
 
 Games_in_files = gnomine.desktop.in
 Games_DATA = $(Games_in_files:.desktop.in=.desktop)
Index: gnomine/gnomine.c
===================================================================
--- gnomine/gnomine.c	(revision 6239)
+++ gnomine/gnomine.c	(working copy)
@@ -468,7 +468,7 @@
 			 "license", license, "authors", authors, "artists",
 			 artists, "documenters", documenters,
 			 "translator_credits", _("translator-credits"),
-			 "logo-icon-name", "gnome-gnomine", "website",
+			 "logo-icon-name", "gnome-mines", "website",
 			 "http://www.gnome.org/projects/gnome-games/",
 			 "wrap-license", TRUE, NULL);
   g_free (license);
@@ -1007,7 +1007,7 @@
   gconf_client_notify_add (conf_client, KEY_DIR,
 			   gconf_key_change_cb, NULL, NULL, NULL);
 
-  gtk_window_set_default_icon_name ("gnome-gnomine");
+  gtk_window_set_default_icon_name ("gnome-mines");
   client = gnome_master_client ();
   g_signal_connect (G_OBJECT (client), "save_yourself",
 		    G_CALLBACK (save_state), argv[0]);
Index: gtali/pix/22x22/gnome-tali.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: gtali/pix/32x32/gnome-tali.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: gtali/pix/16x16/gnome-tali.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: gtali/pix/48x48/gnome-tali.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: gtali/pix/scalable/gnome-tali.svg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/svg+xml
Index: gtali/pix/Makefile.am
===================================================================
--- gtali/pix/Makefile.am	(revision 6239)
+++ gtali/pix/Makefile.am	(working copy)
@@ -1,13 +1,3 @@
-icon16dir = $(datadir)/icons/hicolor/16x16/apps/
-icon16_DATA = 16x16/gnome-tali.png
-icon22dir = $(datadir)/icons/hicolor/22x22/apps/
-icon22_DATA = 22x22/gnome-tali.png
-icon32dir = $(datadir)/icons/hicolor/32x32/apps/
-icon32_DATA = 32x32/gnome-tali.png
-icon48dir = $(datadir)/icons/hicolor/48x48/apps/
-icon48_DATA = 48x48/gnome-tali.png
-svgicondir = $(datadir)/icons/hicolor/scalable/apps/
-svgicon_DATA = scalable/gnome-tali.svg
 
 Pixmapdir = $(datadir)/pixmaps/gtali
 Pixmap_DATA = \
@@ -26,9 +16,4 @@
 	kismet6.svg \
 	kismet-none.svg
 
-EXTRA_DIST = $(Pixmap_DATA) \
-	$(icon16_DATA) \
-	$(icon22_DATA) \
-	$(icon32_DATA) \
-	$(icon48_DATA) \
-	$(svgicon_DATA)
+EXTRA_DIST = $(Pixmap_DATA)
Index: blackjack/pixmaps/gnome-blackjack.xcf
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/x-xcf
Index: blackjack/pixmaps/Makefile.am
===================================================================
--- blackjack/pixmaps/Makefile.am	(revision 6239)
+++ blackjack/pixmaps/Makefile.am	(working copy)
@@ -6,13 +6,9 @@
 		chip-1.svg \
 		baize.png
 
-icondir       = $(datadir)/icons/hicolor/48x48/apps/
-icon_DATA     = gnome-blackjack.png 
-
 cardslotdir   = $(datadir)/pixmaps/cards/slots/
 cardslot_DATA = white-outline.svg
 
 EXTRA_DIST    = $(image_DATA) \
-		$(icon_DATA) \
 		$(cardslot_DATA)
 
Index: blackjack/pixmaps/gnome-blackjack.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: gnometris/pix/Makefile.am
===================================================================
--- gnometris/pix/Makefile.am	(revision 6239)
+++ gnometris/pix/Makefile.am	(working copy)
@@ -1,12 +1,9 @@
 pixmapdir= $(datadir)/pixmaps/gnometris
-icondir=$(datadir)/icons/hicolor/48x48/apps/
 
 pixmap_DATA=\
 	7blocks-tig.png \
 	7blocks-gw.png
 
-icon_DATA=gnome-gnometris.png
+EXTRA_DIST=$(pixmap_DATA)
 
-EXTRA_DIST=$(pixmap_DATA) $(icon_DATA)
 
-
Index: gnometris/pix/gnome-gnometris.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: gnotravex/gnome-tetravex.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: gnotravex/Makefile.am
===================================================================
--- gnotravex/Makefile.am	(revision 6239)
+++ gnotravex/Makefile.am	(working copy)
@@ -22,16 +22,12 @@
 	$(GNOME_GAMES_LIBS) \
 	$(INTLLIBS) 
 
-icondir = $(datadir)/icons/hicolor/48x48/apps/
-icon_DATA = gnome-tetravex.png
-
 Games_in_files = gnotravex.desktop.in
 Games_DATA = $(Games_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
 EXTRA_DIST = README \
 	gnotravex.desktop.in \
-	$(icon_DATA) \
 	$(schema_in_files)
 
 DISTCLEANFILES = $(Games_DATA) $(schema_DATA)
Index: gnotski/gnome-klotski.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: gnotski/Makefile.am
===================================================================
--- gnotski/Makefile.am	(revision 6239)
+++ gnotski/Makefile.am	(working copy)
@@ -29,15 +29,11 @@
 
 pixmap_DATA = gnotski.svg
 
-icondir = $(datadir)/icons/hicolor/48x48/apps/
-icon_DATA = gnome-klotski.png
-
 Games_in_files = gnotski.desktop.in
 Games_DATA = $(Games_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-EXTRA_DIST = README $(Games_in_files) $(pixmap_DATA) $(schema_in_files) \
-             $(icon_DATA)
+EXTRA_DIST = README $(Games_in_files) $(pixmap_DATA) $(schema_in_files)
 
 CLEANFILES = $(Games_DATA)
 
Index: glines/glines.c
===================================================================
--- glines/glines.c	(revision 6246)
+++ glines/glines.c	(working copy)
@@ -1230,10 +1230,10 @@
 			 "copyright",
 			 "Copyright \xc2\xa9 1997-2007 Free Software Foundation, Inc.",
 			 "license", license, "authors", authors,
-			 "documenters", documenters, "translator_credits",
-			 _("translator-credits"), "logo-icon-name",
-			 "gnome-five-or-more", "website",
-			 "http://www.gnome.org/projects/gnome-games/",
+			 "documenters", documenters,
+			 "translator_credits", _("translator-credits"),
+			 "logo-icon-name", "gnome-glines",
+			 "website", "http://www.gnome.org/projects/gnome-games/",
 			 "wrap-license", TRUE, NULL);
   g_free (license);
   return TRUE;
@@ -1890,7 +1890,7 @@
   do_fullscreen = gconf_client_get_bool (conf_client, KEY_FULLSCREEN, NULL);
 
   games_stock_init ();
-  gtk_window_set_default_icon_name ("gnome-five-or-more");
+  gtk_window_set_default_icon_name ("gnome-glines");
   client = gnome_master_client ();
 
   g_signal_connect (G_OBJECT (client), "save_yourself",
Index: glines/Makefile.am
===================================================================
--- glines/Makefile.am	(revision 6246)
+++ glines/Makefile.am	(working copy)
@@ -6,7 +6,6 @@
 @INTLTOOL_SCHEMAS_RULE@
 
 pixmapdir = $(datadir)/pixmaps/glines
-icondir = $(datadir)/icons/hicolor/48x48/apps/
 Gamesdir = $(datadir)/applications
 
 INCLUDES = -I.. -I$(srcdir)/..		\
@@ -30,12 +29,9 @@
 EXTRA_DIST = 			\
 	glines.desktop.in	\
 	$(pixmap_DATA)		\
-	$(icon_DATA)		\
 	$(schema_in_files)
 
 
-icon_DATA = gnome-five-or-more.png
-
 Games_in_files = glines.desktop.in
 Games_DATA = $(Games_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
Index: glines/gnome-five-or-more.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: glines/glines.desktop.in
===================================================================
--- glines/glines.desktop.in	(revision 6246)
+++ glines/glines.desktop.in	(working copy)
@@ -3,7 +3,7 @@
 _Name=Five or More
 _Comment=Remove colored balls from the board by forming lines
 Exec=glines
-Icon=gnome-five-or-more
+Icon=gnome-glines
 Terminal=false
 Type=Application
 Categories=GNOME;GTK;Game;LogicGame;
Index: gnibbles/scalable/gnome-nibbles.svg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/svg+xml
Index: gnibbles/16x16/gnome-nibbles.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: gnibbles/22x22/gnome-nibbles.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: gnibbles/48x48/gnome-nibbles.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: gnibbles/gnibbles.desktop.in
===================================================================
--- gnibbles/gnibbles.desktop.in	(revision 6239)
+++ gnibbles/gnibbles.desktop.in	(working copy)
@@ -3,7 +3,7 @@
 _Name=Nibbles
 _Comment=Guide a worm around a maze
 Exec=gnibbles
-Icon=gnome-nibbles
+Icon=gnome-gnibbles
 Terminal=false
 Type=Application
 Categories=GNOME;GTK;Game;ArcadeGame;
Index: gnibbles/32x32/gnome-nibbles.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: gnibbles/main.c
===================================================================
--- gnibbles/main.c	(revision 6239)
+++ gnibbles/main.c	(working copy)
@@ -248,7 +248,7 @@
 			 _("A worm game for GNOME."), "authors", authors,
 			 "documenters", documenters, "translator-credits",
 			 _("translator-credits"), "logo-icon-name",
-			 "gnome-nibbles", "website",
+			 "gnome-gnibbles", "website",
 			 "http://www.gnome.org/projects/gnome-games/",
 			 "wrap-license", TRUE, NULL);
   g_free (license);
@@ -1064,7 +1064,7 @@
 				argc, argv,
 				GNOME_PARAM_POPT_TABLE, NULL,
 				GNOME_PARAM_APP_DATADIR, REAL_DATADIR, NULL);
-  gtk_window_set_default_icon_name ("gnome-nibbles");
+  gtk_window_set_default_icon_name ("gnome-gnibbles");
   srand (time (NULL));
 
   highscores = games_scores_new (&scoredesc);
Index: gnibbles/Makefile.am
===================================================================
--- gnibbles/Makefile.am	(revision 6239)
+++ gnibbles/Makefile.am	(working copy)
@@ -27,17 +27,6 @@
 bin_PROGRAMS = gnibbles 
 endif
 
-icon16dir = $(datadir)/icons/hicolor/16x16/apps/
-icon16_DATA = 16x16/gnome-nibbles.png
-icon22dir = $(datadir)/icons/hicolor/22x22/apps/
-icon22_DATA = 22x22/gnome-nibbles.png
-icon32dir = $(datadir)/icons/hicolor/32x32/apps/
-icon32_DATA = 32x32/gnome-nibbles.png
-icon48dir = $(datadir)/icons/hicolor/48x48/apps/
-icon48_DATA = 48x48/gnome-nibbles.png
-svgicondir = $(datadir)/icons/hicolor/scalable/apps/
-svgicon_DATA = scalable/gnome-nibbles.svg
-
 if GGZ_CLIENT
 GGZ_FILES =	ggz-network.h \
 		ggz-network.c \
@@ -125,11 +114,6 @@
 	$(config_DATA) \
 	$(soundlist_in_files) \
 	$(schema_in_files) \
-	$(icon16_DATA) \
-	$(icon22_DATA) \
-	$(icon32_DATA) \
-	$(icon48_DATA) \
-	$(svgicon_DATA) \
 	gnibbles-client.dsc.in \
 	gnibbles-server.dsc.in \
         gnibbles.room          
Index: configure.in
===================================================================
--- configure.in	(revision 6239)
+++ configure.in	(working copy)
@@ -444,6 +444,7 @@
 dependencies/ggzmod-ggz/Makefile
 dependencies/ggz-gtk/Makefile
 dependencies/gnuchess/Makefile
+icons/Makefile
 libgames-support/Makefile
 blackjack/Makefile
 blackjack/data/Makefile
Index: same-gnome/ui.c
===================================================================
--- same-gnome/ui.c	(revision 6239)
+++ same-gnome/ui.c	(working copy)
@@ -125,9 +125,9 @@
 			 "Copyright \xc2\xa9 2007 Callum McKenzie", "license",
 			 license, "name", _(APPNAME_LONG),
 			 "translator_credits", _("translator-credits"),
-			 "version", VERSION, "logo-icon-name",
-			 "gnome-same-gnome", "website",
-			 "http://www.gnome.org/projects/gnome-games/",
+			 "version", VERSION,
+			 "logo-icon-name", "gnome-samegnome",
+			 "website", "http://www.gnome.org/projects/gnome-games/",
 			 "wrap-license", TRUE, NULL);
   g_free (license);
 }
@@ -523,7 +523,7 @@
   GtkUIManager *ui_manager;
   GtkActionGroup *action_group;
 
-  gtk_window_set_default_icon_name ("gnome-same-gnome");
+  gtk_window_set_default_icon_name ("gnome-samegnome");
 
   application = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title (GTK_WINDOW (application), _(APPNAME_LONG));
Index: same-gnome/same-gnome.desktop.in
===================================================================
--- same-gnome/same-gnome.desktop.in	(revision 6239)
+++ same-gnome/same-gnome.desktop.in	(working copy)
@@ -3,7 +3,7 @@
 _Name=Same GNOME
 _Comment=Clear the screen by removing groups of colored balls
 Exec=same-gnome
-Icon=gnome-same-gnome
+Icon=gnome-samegnome
 Terminal=false
 Type=Application
 Categories=GNOME;GTK;Game;LogicGame;
Index: same-gnome/Makefile.am
===================================================================
--- same-gnome/Makefile.am	(revision 6239)
+++ same-gnome/Makefile.am	(working copy)
@@ -2,7 +2,6 @@
 
 
 pixmapdir = $(datadir)/gnome-games/same-gnome/themes/2.10
-icondir = $(datadir)/icons/hicolor/48x48/apps/
 Gamesdir = $(datadir)/applications
 
 SUBDIRS = help
@@ -39,8 +38,7 @@
 @INTLTOOL_SCHEMAS_RULE@
 
 pixmap_DATA = planets.png stones.png
-icon_DATA = gnome-same-gnome.png
-EXTRA_DIST = same-gnome.desktop.in $(pixmap_DATA) $(icon_DATA) $(schema_in_files)
+EXTRA_DIST = same-gnome.desktop.in $(pixmap_DATA) $(schema_in_files)
 
 Games_in_files = same-gnome.desktop.in
 Games_DATA = $(Games_in_files:.desktop.in=.desktop)
Index: same-gnome/gnome-same-gnome.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: mahjongg/gnome-mahjongg.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: mahjongg/Makefile.am
===================================================================
--- mahjongg/Makefile.am	(revision 6239)
+++ mahjongg/Makefile.am	(working copy)
@@ -4,7 +4,6 @@
 mapdir = $(datadir)/gnome-games/mahjongg/maps
 pixmapdir = $(datadir)/pixmaps/mahjongg
 Gamesdir = $(datadir)/applications
-icondir=$(datadir)/icons/hicolor/48x48/apps/
 
 schemadir   = @GCONF_SCHEMA_FILE_DIR@
 schema_in_files = mahjongg.schemas.in
@@ -42,9 +41,7 @@
 
 pixmap_DATA = smooth.png postmodern.svg
 
-icon_DATA = gnome-mahjongg.png
-
-EXTRA_DIST = mahjongg.desktop.in $(pixmap_DATA) $(icon_DATA) \
+EXTRA_DIST = mahjongg.desktop.in $(pixmap_DATA) \
 	$(schema_in_files) $(map_DATA)
 
 Games_in_files = mahjongg.desktop.in
Index: iagno/22x22/gnome-iagno.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: iagno/32x32/gnome-iagno.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: iagno/16x16/gnome-iagno.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: iagno/48x48/gnome-iagno.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: iagno/scalable/gnome-iagno.svg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/svg+xml
Index: iagno/Makefile.am
===================================================================
--- iagno/Makefile.am	(revision 6239)
+++ iagno/Makefile.am	(working copy)
@@ -54,17 +54,6 @@
 	classic.png \
 	woodtrim.png
 
-icon16dir = $(datadir)/icons/hicolor/16x16/apps/
-icon16_DATA = 16x16/gnome-iagno.png
-icon22dir = $(datadir)/icons/hicolor/22x22/apps/
-icon22_DATA = 22x22/gnome-iagno.png
-icon32dir = $(datadir)/icons/hicolor/32x32/apps/
-icon32_DATA = 32x32/gnome-iagno.png
-icon48dir = $(datadir)/icons/hicolor/48x48/apps/
-icon48_DATA = 48x48/gnome-iagno.png
-svgicondir = $(datadir)/icons/hicolor/scalable/apps/
-svgicon_DATA = scalable/gnome-iagno.svg
-
 Games_in_files = iagno.desktop.in
 Games_DATA = $(Games_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
@@ -82,11 +71,6 @@
 	iagno.desktop.in 	\
 	iagno.soundlist.in \
 	$(pixmap_DATA)	\
-	$(icon16_DATA)	\
-	$(icon22_DATA)	\
-	$(icon32_DATA)	\
-	$(icon48_DATA)	\
-	$(svgicon_DATA) \
 	$(schema_in_files)
 
 install-data-local:
Index: gnobots2/gnome-robots.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: gnobots2/gnome-robots.svg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/svg+xml
Index: gnobots2/Makefile.am
===================================================================
--- gnobots2/Makefile.am	(revision 6239)
+++ gnobots2/Makefile.am	(working copy)
@@ -82,8 +82,6 @@
 EXTRA_DIST = AUTHORS \
              gnobots2.desktop.in \
              gnobots2.soundlist.in \
-	     $(icon_DATA) \
-	     $(svgicon_DATA) \
              $(pixmap_DATA) \
 	     $(sound_DATA) \
 	     $(Games_DATA) \
@@ -91,11 +89,6 @@
 	     $(config_DATA) \
              $(schema_in_files)
 
-icondir = $(datadir)/icons/hicolor/48x48/apps
-icon_DATA = gnome-robots.png
-svgicondir = $(datadir)/icons/hicolor/scalable/apps
-svgicon_DATA = gnome-robots.svg
-
 install-data-local:
 if GCONF_SCHEMAS_INSTALL
 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gnobots2/$(schema_DATA)

Index: gnect/src/main.c
===================================================================
--- gnect/src/main.c	(revision 6239)
+++ gnect/src/main.c	(working copy)
@@ -832,7 +832,7 @@
   gtk_box_pack_start (GTK_BOX (GTK_DIALOG (scorebox)->vbox), vbox, TRUE, TRUE,
 		      0);
 
-  icon = gtk_image_new_from_icon_name ("gnome-four-in-a-row", 48);
+  icon = gtk_image_new_from_icon_name ("gnome-gnect", 48);
   gtk_box_pack_start (GTK_BOX (vbox), icon, FALSE, FALSE, 0);
 
   table = gtk_table_new (3, 2, FALSE);
@@ -921,9 +921,9 @@
 			 ("\"Four in a Row\" for GNOME, with a computer player driven by Giuliano Bertoletti's Velena Engine."),
 			 "authors", authors, "documenters", documenters,
 			 "artists", artists, "translator_credits",
-			 _("translator-credits"), "logo-icon-name",
-			 "gnome-four-in-a-row", "website",
-			 "http://www.gnome.org/projects/gnome-games/",
+			 _("translator-credits"),
+			 "logo-icon-name", "gnome-gnect",
+			 "website", "http://www.gnome.org/projects/gnome-games/",
 			 "wrap-license", TRUE, NULL);
   g_free (license);
 }
@@ -1437,7 +1437,7 @@
   g_signal_connect (G_OBJECT (app), "configure_event",
 		    G_CALLBACK (on_window_resize), NULL);
 
-  gtk_window_set_default_icon_name ("gnome-four-in-a-row");
+  gtk_window_set_default_icon_name ("gnome-gnect");
 
   statusbar = gtk_statusbar_new ();
   ui_manager = gtk_ui_manager_new ();
Index: gnect/data/gnome-four-in-a-row.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: gnect/data/Makefile.am
===================================================================
--- gnect/data/Makefile.am	(revision 6239)
+++ gnect/data/Makefile.am	(working copy)
@@ -11,9 +11,6 @@
 schema_DATA = $(schema_in_files:.schemas.in=.schemas)
 @INTLTOOL_SCHEMAS_RULE@
 
-icondir   = $(datadir)/icons/hicolor/48x48/apps/
-icon_DATA = gnome-four-in-a-row.png
-
 ## Removed until sounds are fixed up. We probably won't be using the
 ## sound list again.
 ##
@@ -27,8 +24,7 @@
              gnect.room          \
 	     $(velena_DATA)      \
              $(Games_in_files)   \
-             $(schema_in_files)  \
-             $(icon_DATA)
+             $(schema_in_files)
 ##             $(soundlist_DATA)  \
 
 DISTCLEANFILES = $(schema_DATA) $(Games_DATA)
Index: Makefile.am
===================================================================
--- Makefile.am	(revision 6239)
+++ Makefile.am	(working copy)
@@ -1,11 +1,12 @@
 SUBDIRS= \
 	po \
 	dependencies \
+	icons \
 	libgames-support \
 	tests \
 	$(gamelist)
 
-DIST_SUBDIRS = po dependencies libgames-support tests $(allgames)
+DIST_SUBDIRS = po dependencies icons libgames-support tests $(allgames)
 
 ACLOCAL_AMFLAGS = -I m4
 
Index: gnome-sudoku/images/Makefile.am
===================================================================
--- gnome-sudoku/images/Makefile.am	(revision 6239)
+++ gnome-sudoku/images/Makefile.am	(working copy)
@@ -1,6 +1,4 @@
-EXTRA_DIST = sudoku.png footprints.png
-icondir = $(datadir)/pixmaps
-icon_DATA = sudoku.png
+EXTRA_DIST = footprints.png
 
 pixmapdir = $(datadir)/pixmaps/gnome-sudoku/
 pixmap_DATA = footprints.png
Index: gnome-sudoku/images/sudoku.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: gnome-sudoku/src/lib/gnome_sudoku.py
===================================================================
--- gnome-sudoku/src/lib/gnome_sudoku.py	(revision 6239)
+++ gnome-sudoku/src/lib/gnome_sudoku.py	(working copy)
@@ -408,8 +408,7 @@
             gobject.timeout_add(1000,lambda *args: self.start_worker_thread() and True)
         self.gsd.show()
         
-        icon = gtk.gdk.pixbuf_new_from_file(os.path.join(ICON_DIR,'sudoku.png'))
-        self.w.set_icon(icon)
+        self.w.set_icon_name('gnome-sudoku')
         self.w.show()
 
     @simple_debug
@@ -808,9 +807,8 @@
         about.set_comments(DESCRIPTION)
         about.set_authors(AUTHORS)
         about.set_website("http://www.gnome.org/projects/gnome-games/")
-        about.set_logo_icon_name("sudoku")
+        about.set_logo_icon_name("gnome-sudoku")
         about.set_translator_credits(_("translator-credits"))
-        about.set_icon_from_file(ICON_DIR + "/sudoku.png")
         about.connect("response", lambda d, r: d.destroy())
         about.show()
 
Index: gnome-sudoku/src/lib/defaults.py.in
===================================================================
--- gnome-sudoku/src/lib/defaults.py.in	(revision 6239)
+++ gnome-sudoku/src/lib/defaults.py.in	(working copy)
@@ -2,9 +2,8 @@
 import gettext
 
 APP_DATA_DIR = os.path.join('@prefix@', 'share') 
-ICON_DIR =     os.path.join(APP_DATA_DIR,'pixmaps')
-IMAGE_DIR = os.path.join(ICON_DIR,'gnome-sudoku')
-LOCALEDIR 	= os.path.join(APP_DATA_DIR, 'locale')
+IMAGE_DIR = os.path.join(APP_DATA_DIR, 'pixmaps', 'gnome-sudoku')
+LOCALEDIR = os.path.join(APP_DATA_DIR, 'locale')
 GLADE_DIR = os.path.join(APP_DATA_DIR,'gnome-sudoku')
 BASE_DIR = os.path.join(APP_DATA_DIR,'gnome-sudoku')
 
Index: gnome-sudoku/gnome-sudoku.desktop.in
===================================================================
--- gnome-sudoku/gnome-sudoku.desktop.in	(revision 6239)
+++ gnome-sudoku/gnome-sudoku.desktop.in	(working copy)
@@ -8,7 +8,7 @@
 Type=Application
 Categories=GNOME;Game;LogicGame;
 StartupNotify=true
-Icon=sudoku.png
+Icon=gnome-sudoku
 Name[en_GB]=Sudoku
 Name[en_US]=Sudoku
 Name[es_ES]=Sudoku
