diff --git a/art/tango/22x22/gnucash-22x22.png b/art/tango/22x22/gnucash-22x22.png
new file mode 100644
index 0000000000..768c89f80c
Binary files /dev/null and b/art/tango/22x22/gnucash-22x22.png differ
diff --git a/art/tango/22x22/gnucash.png b/art/tango/22x22/gnucash-24x24.png
similarity index 100%
rename from art/tango/22x22/gnucash.png
rename to art/tango/22x22/gnucash-24x24.png
diff --git a/src/pixmaps/Makefile.am b/src/pixmaps/Makefile.am
index fa6acbbc9a..d4e21c7618 100644
--- a/src/pixmaps/Makefile.am
+++ b/src/pixmaps/Makefile.am
@@ -36,31 +36,48 @@ gncpixmap_DATA = \
   stock_split_title.png \
   stock_split_watermark.png
 
-gncnormalicondir = ${datadir}/icons/hicolor/48x48/apps
-gncnormalicon_DATA = 48x48/gnucash-icon.png
-48x48/gnucash-icon.png: gnucash-icon-48x48.png
-	-mkdir -p 48x48
-	cp ${srcdir}/gnucash-icon-48x48.png 48x48/gnucash-icon.png
+gnclargeicondir = ${datadir}/icons/hicolor/48x48/apps
+gnclargeicon_DATA = 48x48/gnucash-icon.png
 
 gncmediumicondir = ${datadir}/icons/hicolor/32x32/apps
 gncmediumicon_DATA = 32x32/gnucash-icon.png
-32x32/gnucash-icon.png: gnucash-icon-32x32.png
-	-mkdir -p 32x32
-	cp ${srcdir}/gnucash-icon-32x32.png 32x32/gnucash-icon.png
 
-gncsmallicondir = ${datadir}/icons/hicolor/16x16/apps
-gncsmallicon_DATA = 16x16/gnucash-icon.png
-16x16/gnucash-icon.png: gnucash-icon-16x16.png
-	-mkdir -p 16x16
-	cp ${srcdir}/gnucash-icon-16x16.png 16x16/gnucash-icon.png
+gncsmalltwfouricondir = ${datadir}/icons/hicolor/24x24/apps
+gncsmalltwfouricon_DATA = 24x24/gnucash-icon.png
+
+gncsmalltwtwoicondir = ${datadir}/icons/hicolor/22x22/apps
+gncsmalltwtwoicon_DATA = 22x22/gnucash-icon.png
+
+gncextrasmallicondir = ${datadir}/icons/hicolor/16x16/apps
+gncextrasmallicon_DATA = 16x16/gnucash-icon.png
 
 gncscalableicondir = ${datadir}/icons/hicolor/scalable/apps
 gncscalableicon_DATA = scalable/gnucash-icon.svg
 
 if BUILDING_FROM_SVN
-scalable/gnucash-icon.svg: ${top_srcdir}/art/icon.svgz
+48x48/gnucash-icon.png: gnucash-icon-48x48.png
+	-mkdir -p 48x48
+	cp ${srcdir}/gnucash-icon-48x48.png 48x48/gnucash-icon.png
+
+32x32/gnucash-icon.png: ${top_srcdir}/art/tango/32x32/gnucash.png
+	-mkdir -p 32x32
+	cp ${top_srcdir}/art/tango/32x32/gnucash.png 32x32/gnucash-icon.png
+
+24x24/gnucash-icon.png: ${top_srcdir}/art/tango/22x22/gnucash-24x24.png
+	-mkdir -p 24x24
+	cp ${top_srcdir}/art/tango/22x22/gnucash-24x24.png 24x24/gnucash-icon.png
+
+22x22/gnucash-icon.png: ${top_srcdir}/art/tango/22x22/gnucash-22x22.png
+	-mkdir -p 22x22
+	cp ${top_srcdir}/art/tango/22x22/gnucash-22x22.png 22x22/gnucash-icon.png
+
+16x16/gnucash-icon.png: ${top_srcdir}/art/tango/16x16/gnucash.png
+	-mkdir -p 16x16
+	cp ${top_srcdir}/art/tango/16x16/gnucash.png 16x16/gnucash-icon.png
+
+scalable/gnucash-icon.svg: ${top_srcdir}/art/tango/scalable/gnucash.svg
 	-mkdir -p scalable
-	gzip -cd ${top_srcdir}/art/icon.svgz > scalable/gnucash-icon.svg
+	cp ${top_srcdir}/art/tango/scalable/gnucash.svg scalable/gnucash-icon.svg
 endif
 
 # As suggested by <http://live.gnome.org/GnomeGoals/AppIcon>
@@ -80,7 +97,12 @@ endif
 
 EXTRA_DIST = \
   ${gncpixmap_DATA} \
-  ${gncnormalicon_DATA} ${gncmediumicon_DATA} ${gncsmallicon_DATA} ${gncscalableicon_DATA}
+  ${gnclargeicon_DATA} \
+  ${gncmediumicon_DATA} \
+  ${gncsmalltwfouricon_DATA} \
+  ${gncsmalltwtwoicon_DATA} \
+  ${gncextrasmallicon_DATA} \
+  ${gncscalableicon_DATA}
 
 clean-local:
-	-rm -rf 48x48 32x32 16x16 scalable
+	-rm -rf 48x48 32x32 24x24 22x22 16x16 scalable