diff --git a/apps/settings_list.c b/apps/settings_list.c
index 31721d6840..36caf6e4dc 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -208,26 +208,57 @@ static const char graphic_numeric[] = "graphic,numeric";
 #ifdef HAVE_LCD_BITMAP
 
 #if LCD_HEIGHT <= 64
+  #define DEFAULT_FONT_HEIGHT 8
   #define DEFAULT_FONTNAME "08-Rockfont"
 #elif LCD_HEIGHT <= 80
+  #define DEFAULT_FONT_HEIGHT 11
   #define DEFAULT_FONTNAME "11-Sazanami-Mincho"
 #elif LCD_HEIGHT <= 220
-  #define DEFAULT_FONTNAME "12-Adobe-Helvetica"
+  #define DEFAULT_FONT_HEIGHT 12
 #elif LCD_HEIGHT <= 320
-  #define DEFAULT_FONTNAME "15-Adobe-Helvetica"
+  #define DEFAULT_FONT_HEIGHT 15
 #elif LCD_HEIGHT <= 400
-  #define DEFAULT_FONTNAME "16-Adobe-Helvetica"
-#elif LCD_HEIGHT <= 480 && !(CONFIG_PLATFORM & (PLATFORM_MAEMO|PLATFORM_PANDORA))
-  #define DEFAULT_FONTNAME "27-Adobe-Helvetica"
+  #define DEFAULT_FONT_HEIGHT 16
+#elif LCD_HEIGHT <= 480 && LCD_WIDTH < 800
+  #define DEFAULT_FONT_HEIGHT 27
 #else
-  #define DEFAULT_FONTNAME "35-Adobe-Helvetica"
+  #define DEFAULT_FONT_HEIGHT 35
 #endif
 #define DEFAULT_GLYPHS 250
 #define MIN_GLYPHS 50
 #define MAX_GLYPHS 65540
 
 #else
-  #define DEFAULT_FONTNAME ""
+  #define DEFAULT_FONT_HEIGHT 12
+#endif
+
+#ifndef DEFAULT_FONTNAME
+/* ugly expansion needed */
+#define _EXPAND2(x) #x
+#define _EXPAND(x) _EXPAND2(x)
+#define DEFAULT_FONTNAME _EXPAND(DEFAULT_FONT_HEIGHT) "-Adobe-Helvetica"
+#endif
+
+#ifdef HAVE_LCD_COLOR
+  #if DEFAULT_FONT_HEIGHT >= 31
+    #define DEFAULT_ICONSET "tango_icons.32x32"
+    #define DEFAULT_VIEWERS_ICONSET "tango_icons_viewers.32x32"
+  #elif DEFAULT_FONT_HEIGHT >= 23
+    #define DEFAULT_ICONSET "tango_icons.24x24"
+    #define DEFAULT_VIEWERS_ICONSET "tango_icons_viewers.24x24"
+  #elif DEFAULT_FONT_HEIGHT >= 15
+    #define DEFAULT_ICONSET "tango_icons.16x16"
+    #define DEFAULT_VIEWERS_ICONSET "tango_icons_viewers.16x16"
+  #else
+    #define DEFAULT_ICONSET "tango_icons.12x12"
+    #define DEFAULT_VIEWERS_ICONSET "tango_icons_viewers.12x12"
+  #endif
+#elif LCD_DEPTH <= 2 /* greyscale */
+  #define DEFAULT_ICONSET "tango_small_grey"
+  #define DEFAULT_VIEWERS_ICONSET "tango_small_viewers_mono"
+#else /* monochrome */
+  #define DEFAULT_ICONSET ""
+  #define DEFAULT_VIEWERS_ICONSET ""
 #endif
 
 #ifdef HAVE_REMOTE_LCD
@@ -238,17 +269,6 @@ static const char graphic_numeric[] = "graphic,numeric";
 #endif
 #endif /* HAVE_REMOTE_LCD */
 
-#ifdef HAVE_LCD_COLOR
-  #define DEFAULT_ICONSET "tango_small"
-  #define DEFAULT_VIEWERS_ICONSET "tango_small_viewers"
-#elif LCD_DEPTH >= 2
-  #define DEFAULT_ICONSET "tango_small_mono"
-  #define DEFAULT_VIEWERS_ICONSET "tango_small_viewers_mono"
-#else /* monochrome */
-  #define DEFAULT_ICONSET ""
-  #define DEFAULT_VIEWERS_ICONSET ""
-#endif
-
 #define DEFAULT_THEME_FOREGROUND LCD_RGBPACK(0xce, 0xcf, 0xce)
 #define DEFAULT_THEME_BACKGROUND LCD_RGBPACK(0x00, 0x00, 0x00)
 #define DEFAULT_THEME_SELECTOR_START LCD_RGBPACK(0xff, 0xeb, 0x9c)
diff --git a/docs/logo/rockbox-clef.svg b/docs/logo/rockbox-clef.svg
index 748cd09a56..3407a02a9a 100644
Binary files a/docs/logo/rockbox-clef.svg and b/docs/logo/rockbox-clef.svg differ
diff --git a/icons/create-icons-from-tango.pl b/icons/create-icons-from-tango.pl
index bfdbe804ac..8cd0ece2d3 100755
--- a/icons/create-icons-from-tango.pl
+++ b/icons/create-icons-from-tango.pl
@@ -22,51 +22,93 @@
 # To be run from the icons/ folder in a Rockbox checkout.
 
 use File::Temp;
+use Getopt::Long;
 
 # list of icons for strip
+# Use relative paths to point to icons in the tree, relative to the icons/ folder
+# (must start with . or ..)
+# Other are treated relatively to the tango sources tree
 my @iconlist = (
-    "mimetypes/audio-x-generic",                # Icon_Audio
-    "places/folder",                            # Icon_Folder
-    "actions/format-indent-more",               # Icon_Playlist
-    "actions/media-playback-start",             # Icon_Cursor ###
-    "apps/preferences-desktop-wallpaper",       # Icon_Wps
-    "devices/computer",                         # Icon_Firmware ###
-    "apps/preferences-desktop-font",            # Icon_Font
-    "apps/preferences-desktop-locale",          # Icon_Language
-    "categories/preferences-system",            # Icon_Config
-    "status/software-update-available",         # Icon_Plugin
-    "actions/bookmark-new",                     # Icon_Bookmark
-    "places/start-here",                        # Icon_Preset
-    "actions/go-jump",                          # Icon_Queued
-    "actions/go-next",                          # Icon_Moving
-    "devices/input-keyboard",                   # Icon_Keyboard
-    "actions/mail-send-receive",                # Icon_Reverse_Cursor
-    "apps/help-browser",                        # Icon_Questionmark
-    "actions/document-properties",              # Icon_Menu_setting
-    "categories/applications-other",            # Icon_Menu_functioncall
-    "actions/list-add",                         # Icon_Submenu
-    "categories/preferences-system",            # Icon_Submenu_Entered
-    "actions/media-record",                     # Icon_Recording
-    "devices/audio-input-microphone",           # Icon_Voice ###
-    "categories/preferences-desktop",           # Icon_General_settings_menu
-    "categories/applications-other",            # Icon_System_menu
-    "actions/media-playback-start",             # Icon_Playback_menu
-    "devices/video-display",                    # Icon_Display_menu
-    "devices/video-display",                    # Icon_Remote_Display_menu
-    "devices/network-wireless",                 # Icon_Radio_screen ###
-    "mimetypes/package-x-generic",              # Icon_file_view_menu
-    "apps/utilities-system-monitor",            # Icon_EQ
-    "../docs/logo/rockbox-clef.svg"             # Icon_Rockbox
+    "./tango-svg/audio-x-generic",                  # Icon_Audio
+    "./tango-svg/folder",                           # Icon_Folder
+    "./tango-svg/format-indent-more",               # Icon_Playlist
+    "./new_icons-svg/media-playback-start-green",   # Icon_Cursor ###
+    "./tango-svg/preferences-desktop-wallpaper",    # Icon_Wps
+    "./tango-svg/media-flash",                      # Icon_Firmware ###
+    "./tango-svg/preferences-desktop-font",         # Icon_Font
+    "./tango-svg/preferences-desktop-locale",       # Icon_Language
+    "./tango-svg/preferences-system",               # Icon_Config
+    "./tango-svg/software-update-available",        # Icon_Plugin
+    "./tango-svg/bookmark-new",                     # Icon_Bookmark
+    "./tango-svg/start-here",                       # Icon_Preset
+    "./tango-svg/go-jump",                          # Icon_Queued
+    "./tango-svg/go-next",                          # Icon_Moving
+    "./tango-svg/input-keyboard",                   # Icon_Keyboard
+    "./tango-svg/go-previous",                      # Icon_Reverse_Cursor
+    "./tango-svg/help-browser",                     # Icon_Questionmark
+    "./tango-svg/document-properties",              # Icon_Menu_setting
+    "./tango-svg/applications-other",               # Icon_Menu_functioncall
+    "./tango-svg/list-add",                         # Icon_Submenu
+    "./tango-svg/preferences-system",               # Icon_Submenu_Entered
+    "./tango-svg/media-record",                     # Icon_Recording
+    "./new_icons-svg/face-shout",                   # Icon_Voice ###
+    "./tango-svg/preferences-desktop",              # Icon_General_settings_menu
+    "./tango-svg/emblem-system",                    # Icon_System_menu
+    "./tango-svg/media-playback-start",             # Icon_Playback_menu
+    "./tango-svg/video-display",                    # Icon_Display_menu
+    "./tango-svg/network-receive",                  # Icon_Remote_Display_menu
+    "./tango-svg/network-wireless",                 # Icon_Radio_screen ###
+    "./tango-svg/system-file-manager",              # Icon_file_view_menu
+    "./tango-svg/utilities-system-monitor",         # Icon_EQ
+    "../docs/logo/rockbox-clef"                     # Icon_Rockbox
+);
+my @iconlist_viewers = (
+    "./tango-svg/applications-graphics",     # bmp
+    "./tango-svg/applications-multimedia",   # mpeg
+    "./tango-svg/applications-other",        # ch8, tap, sna, tzx, z80
+    "./tango-svg/audio-x-generic",           # mp3, mid, rmi, wav
+    "./tango-svg/format-justify-left",       # txt, nfo
+    "./tango-svg/text-x-generic-template",   # ss
+    "./mint-x-svg/applications-games",       # gb, gbc
+    "./tango-svg/image-x-generic",           # jpg, jpe, jpeg
+    "./tango-svg/format-indent-more",        # m3u
+    "./mint-x-svg/gnome-glchess",            # pgn
+    "./tango-svg/dialog-information",        # zzz
 );
 
 
-if($#ARGV < 1) {
-    print "Usage: $0 <path to iconset> <size>\n";
+my $help;
+my $do_viewers;
+my $tangopath="";
+my $size;
+my @list = @iconlist;
+my $output = "tango_icons";
+
+GetOptions ( 'v'		=> \$do_viewers,
+             't|tango-path=s' => \$tangopath,
+             'o|output=s' => \$output,
+             'h|help'   => \$help,
+    );
+
+if($#ARGV != 0 or $help) {
+    print "Usage: $0 [-v] [-t <path to iconset>] [-o <output prefix>] SIZE\n";
+    print "\n";
+    print "\t-v\tGenerate viewer icons\n";
+    print "\t-t\tPath to source of tango iconset if required\n";
+    print "\t-t\tPath to source of tango iconset if required\n";
+    print "\t-o\tUse <output prefix> instead of \"tango_icons\" for the output filename\n";
+    print "\n";
+    print "\tSIZE can be in the form of NN or NNxNN and will be used for the output filename\n";
     exit();
 }
-my $tangopath = $ARGV[0];
-my $size = $ARGV[1];
 
+
+$size = $ARGV[0];
+
+if ($do_viewers) {
+    $output .= "_viewers";
+    @list = @iconlist_viewers;
+}
 # temporary files
 my $alphatemp = File::Temp->new(SUFFIX => ".png");
 my $alphatempfname = $alphatemp->filename();
@@ -75,7 +117,7 @@ my $exporttempfname = $exporttemp->filename();
 my $tempstrip = File::Temp->new(SUFFIX => ".png");
 my $tempstripfname = $tempstrip->filename();
 
-my $newoutput = "tango_icons.$size.bmp";
+my $newoutput = "$output.$size.bmp";
 
 if(-e $newoutput) {
     die("output file $newoutput does already exist!");
@@ -85,23 +127,29 @@ print "Creating icon strip as $newoutput\n\n";
 
 my $count;
 $count = 0;
-foreach(@iconlist) {
+
+foreach(@list) {
     print "processing $_ ...\n";
     my $file;
     if(m/^$/) {
         # if nothing is defined make it empty / transparent
         my $s = $size . "x" . $size;
-        `convert -size $s xc:"#f0f" $exporttempfname`
+        `convert -size $s xc:"#ff00ff" -alpha transparent $exporttempfname`
     }
-    elsif(m/\.\./) {
+    elsif(m/\./) {
         # icon is inside the Rockbox tree
-        $file = $_;
+        $file = $_ . ".svg";
         `inkscape --export-png=$exporttempfname --export-width=$size --export-height=$size $file`
     }
     else {
         # icon is inside the tango tree
+        if ($tangopath eq "") {
+            print "Path to tango sources needed but not given!\n";
+            exit(1);
+        }
         $file = "$tangopath/scalable/" . $_ . ".svg";
-        `inkscape --export-png=$exporttempfname --export-width=$size --export-height=$size $file`
+        #~ `inkscape --export-png=$exporttempfname --export-width=$size --export-height=$size $file`
+        `cp $file tango-svg/`;
     }
     if($count != 0) {
         `convert -append $tempstripfname $exporttempfname $tempstripfname`;
@@ -111,10 +159,7 @@ foreach(@iconlist) {
     }
     $count++;
 }
-print "masking and converting result ...\n";
-# create mask
-`convert $tempstripfname -alpha extract -monochrome -negate -alpha copy -colorize 0,100,0 $alphatempfname`;
-# combine mask with image and drop transparency and scale down
-`convert -composite $tempstripfname $alphatempfname -flatten -background '#f0f' -alpha off $newoutput`;
-print "done!\n";
+print "Converting result ...\n";
+`convert $tempstripfname $newoutput`;
+print "Done!\n";
 
diff --git a/icons/mint-x-svg/applications-games.svg b/icons/mint-x-svg/applications-games.svg
new file mode 100644
index 0000000000..10b7e22be3
Binary files /dev/null and b/icons/mint-x-svg/applications-games.svg differ
diff --git a/icons/mint-x-svg/gnome-glchess.svg b/icons/mint-x-svg/gnome-glchess.svg
new file mode 100644
index 0000000000..cd88f92b03
Binary files /dev/null and b/icons/mint-x-svg/gnome-glchess.svg differ
diff --git a/icons/new_icons-svg/face-shout.svg b/icons/new_icons-svg/face-shout.svg
new file mode 100644
index 0000000000..3737d2bffd
Binary files /dev/null and b/icons/new_icons-svg/face-shout.svg differ
diff --git a/icons/new_icons-svg/media-playback-start-green.svg b/icons/new_icons-svg/media-playback-start-green.svg
new file mode 100644
index 0000000000..f8e6648300
Binary files /dev/null and b/icons/new_icons-svg/media-playback-start-green.svg differ
diff --git a/icons/tango-svg/applications-games.svg b/icons/tango-svg/applications-games.svg
new file mode 100644
index 0000000000..1d89e485b6
Binary files /dev/null and b/icons/tango-svg/applications-games.svg differ
diff --git a/icons/tango-svg/applications-graphics.svg b/icons/tango-svg/applications-graphics.svg
new file mode 100644
index 0000000000..641d860e88
Binary files /dev/null and b/icons/tango-svg/applications-graphics.svg differ
diff --git a/icons/tango-svg/applications-multimedia.svg b/icons/tango-svg/applications-multimedia.svg
new file mode 100644
index 0000000000..6844e8db1a
Binary files /dev/null and b/icons/tango-svg/applications-multimedia.svg differ
diff --git a/icons/tango-svg/applications-other.svg b/icons/tango-svg/applications-other.svg
new file mode 100644
index 0000000000..5e30c277c2
Binary files /dev/null and b/icons/tango-svg/applications-other.svg differ
diff --git a/icons/tango-svg/applications-system.svg b/icons/tango-svg/applications-system.svg
new file mode 100644
index 0000000000..9d767742df
Binary files /dev/null and b/icons/tango-svg/applications-system.svg differ
diff --git a/icons/tango-svg/audio-input-microphone.svg b/icons/tango-svg/audio-input-microphone.svg
new file mode 100644
index 0000000000..d31409c4e5
Binary files /dev/null and b/icons/tango-svg/audio-input-microphone.svg differ
diff --git a/icons/tango-svg/audio-x-generic.svg b/icons/tango-svg/audio-x-generic.svg
new file mode 100644
index 0000000000..be2d18ad3f
Binary files /dev/null and b/icons/tango-svg/audio-x-generic.svg differ
diff --git a/icons/tango-svg/bookmark-new.svg b/icons/tango-svg/bookmark-new.svg
new file mode 100644
index 0000000000..d6d095b715
Binary files /dev/null and b/icons/tango-svg/bookmark-new.svg differ
diff --git a/icons/tango-svg/dialog-information.svg b/icons/tango-svg/dialog-information.svg
new file mode 100644
index 0000000000..922b316fac
Binary files /dev/null and b/icons/tango-svg/dialog-information.svg differ
diff --git a/icons/tango-svg/document-properties.svg b/icons/tango-svg/document-properties.svg
new file mode 100644
index 0000000000..c57f96d2e2
Binary files /dev/null and b/icons/tango-svg/document-properties.svg differ
diff --git a/icons/tango-svg/emblem-system.svg b/icons/tango-svg/emblem-system.svg
new file mode 100644
index 0000000000..8bfdf70f5b
Binary files /dev/null and b/icons/tango-svg/emblem-system.svg differ
diff --git a/icons/tango-svg/folder.svg b/icons/tango-svg/folder.svg
new file mode 100644
index 0000000000..79b25c305b
Binary files /dev/null and b/icons/tango-svg/folder.svg differ
diff --git a/icons/tango-svg/format-indent-more.svg b/icons/tango-svg/format-indent-more.svg
new file mode 100644
index 0000000000..2047b623a4
Binary files /dev/null and b/icons/tango-svg/format-indent-more.svg differ
diff --git a/icons/tango-svg/format-justify-left.svg b/icons/tango-svg/format-justify-left.svg
new file mode 100644
index 0000000000..c250195007
Binary files /dev/null and b/icons/tango-svg/format-justify-left.svg differ
diff --git a/icons/tango-svg/go-jump.svg b/icons/tango-svg/go-jump.svg
new file mode 100644
index 0000000000..4832fe9484
Binary files /dev/null and b/icons/tango-svg/go-jump.svg differ
diff --git a/icons/tango-svg/go-next.svg b/icons/tango-svg/go-next.svg
new file mode 100644
index 0000000000..41e5990b8f
Binary files /dev/null and b/icons/tango-svg/go-next.svg differ
diff --git a/icons/tango-svg/go-previous.svg b/icons/tango-svg/go-previous.svg
new file mode 100644
index 0000000000..d5381de3a5
Binary files /dev/null and b/icons/tango-svg/go-previous.svg differ
diff --git a/icons/tango-svg/help-browser.svg b/icons/tango-svg/help-browser.svg
new file mode 100644
index 0000000000..851327f776
Binary files /dev/null and b/icons/tango-svg/help-browser.svg differ
diff --git a/icons/tango-svg/image-x-generic.svg b/icons/tango-svg/image-x-generic.svg
new file mode 100644
index 0000000000..45dd641ae7
Binary files /dev/null and b/icons/tango-svg/image-x-generic.svg differ
diff --git a/icons/tango-svg/input-keyboard.svg b/icons/tango-svg/input-keyboard.svg
new file mode 100644
index 0000000000..534dd384f4
Binary files /dev/null and b/icons/tango-svg/input-keyboard.svg differ
diff --git a/icons/tango-svg/list-add.svg b/icons/tango-svg/list-add.svg
new file mode 100644
index 0000000000..6eaed44811
Binary files /dev/null and b/icons/tango-svg/list-add.svg differ
diff --git a/icons/tango-svg/media-flash.svg b/icons/tango-svg/media-flash.svg
new file mode 100644
index 0000000000..13f910fdd8
Binary files /dev/null and b/icons/tango-svg/media-flash.svg differ
diff --git a/icons/tango-svg/media-playback-start.svg b/icons/tango-svg/media-playback-start.svg
new file mode 100644
index 0000000000..75616de46f
Binary files /dev/null and b/icons/tango-svg/media-playback-start.svg differ
diff --git a/icons/tango-svg/media-record.svg b/icons/tango-svg/media-record.svg
new file mode 100644
index 0000000000..85bbb98f6e
Binary files /dev/null and b/icons/tango-svg/media-record.svg differ
diff --git a/icons/tango-svg/network-receive.svg b/icons/tango-svg/network-receive.svg
new file mode 100644
index 0000000000..01ed0fa3ea
Binary files /dev/null and b/icons/tango-svg/network-receive.svg differ
diff --git a/icons/tango-svg/network-wireless.svg b/icons/tango-svg/network-wireless.svg
new file mode 100644
index 0000000000..e52d2bbcf0
Binary files /dev/null and b/icons/tango-svg/network-wireless.svg differ
diff --git a/icons/tango-svg/preferences-desktop-font.svg b/icons/tango-svg/preferences-desktop-font.svg
new file mode 100644
index 0000000000..079398021d
Binary files /dev/null and b/icons/tango-svg/preferences-desktop-font.svg differ
diff --git a/icons/tango-svg/preferences-desktop-locale.svg b/icons/tango-svg/preferences-desktop-locale.svg
new file mode 100644
index 0000000000..2e71f18a80
Binary files /dev/null and b/icons/tango-svg/preferences-desktop-locale.svg differ
diff --git a/icons/tango-svg/preferences-desktop-wallpaper.svg b/icons/tango-svg/preferences-desktop-wallpaper.svg
new file mode 100644
index 0000000000..0f94fbd157
Binary files /dev/null and b/icons/tango-svg/preferences-desktop-wallpaper.svg differ
diff --git a/icons/tango-svg/preferences-desktop.svg b/icons/tango-svg/preferences-desktop.svg
new file mode 100644
index 0000000000..a0fd144942
Binary files /dev/null and b/icons/tango-svg/preferences-desktop.svg differ
diff --git a/icons/tango-svg/preferences-system.svg b/icons/tango-svg/preferences-system.svg
new file mode 100644
index 0000000000..d41028fc8d
Binary files /dev/null and b/icons/tango-svg/preferences-system.svg differ
diff --git a/icons/tango-svg/software-update-available.svg b/icons/tango-svg/software-update-available.svg
new file mode 100644
index 0000000000..9a5a688be4
Binary files /dev/null and b/icons/tango-svg/software-update-available.svg differ
diff --git a/icons/tango-svg/start-here.svg b/icons/tango-svg/start-here.svg
new file mode 100644
index 0000000000..3f5313054c
Binary files /dev/null and b/icons/tango-svg/start-here.svg differ
diff --git a/icons/tango-svg/system-file-manager.svg b/icons/tango-svg/system-file-manager.svg
new file mode 100644
index 0000000000..99ad454a49
Binary files /dev/null and b/icons/tango-svg/system-file-manager.svg differ
diff --git a/icons/tango-svg/text-x-generic-template.svg b/icons/tango-svg/text-x-generic-template.svg
new file mode 100644
index 0000000000..f70eda469c
Binary files /dev/null and b/icons/tango-svg/text-x-generic-template.svg differ
diff --git a/icons/tango-svg/utilities-system-monitor.svg b/icons/tango-svg/utilities-system-monitor.svg
new file mode 100644
index 0000000000..8f4b9462e3
Binary files /dev/null and b/icons/tango-svg/utilities-system-monitor.svg differ
diff --git a/icons/tango-svg/video-display.svg b/icons/tango-svg/video-display.svg
new file mode 100644
index 0000000000..26fe3a9e80
Binary files /dev/null and b/icons/tango-svg/video-display.svg differ
diff --git a/icons/tango_icons.12x12.bmp b/icons/tango_icons.12x12.bmp
new file mode 100644
index 0000000000..9dc085c0e2
Binary files /dev/null and b/icons/tango_icons.12x12.bmp differ
diff --git a/icons/tango_icons.16x16.bmp b/icons/tango_icons.16x16.bmp
new file mode 100644
index 0000000000..2e71fe1bff
Binary files /dev/null and b/icons/tango_icons.16x16.bmp differ
diff --git a/icons/tango_icons.24x24.bmp b/icons/tango_icons.24x24.bmp
new file mode 100644
index 0000000000..e49a2f5bed
Binary files /dev/null and b/icons/tango_icons.24x24.bmp differ
diff --git a/icons/tango_icons.32x32.bmp b/icons/tango_icons.32x32.bmp
new file mode 100644
index 0000000000..f2f33c87c4
Binary files /dev/null and b/icons/tango_icons.32x32.bmp differ
diff --git a/icons/tango_icons_viewers.12x12.bmp b/icons/tango_icons_viewers.12x12.bmp
new file mode 100644
index 0000000000..e53701f084
Binary files /dev/null and b/icons/tango_icons_viewers.12x12.bmp differ
diff --git a/icons/tango_icons_viewers.16x16.bmp b/icons/tango_icons_viewers.16x16.bmp
new file mode 100644
index 0000000000..3d31333acd
Binary files /dev/null and b/icons/tango_icons_viewers.16x16.bmp differ
diff --git a/icons/tango_icons_viewers.24x24.bmp b/icons/tango_icons_viewers.24x24.bmp
new file mode 100644
index 0000000000..b0ba3c32dd
Binary files /dev/null and b/icons/tango_icons_viewers.24x24.bmp differ
diff --git a/icons/tango_icons_viewers.32x32.bmp b/icons/tango_icons_viewers.32x32.bmp
new file mode 100644
index 0000000000..d34525fcec
Binary files /dev/null and b/icons/tango_icons_viewers.32x32.bmp differ
diff --git a/icons/tango_small.bmp b/icons/tango_small.bmp
deleted file mode 100644
index d95172651f..0000000000
Binary files a/icons/tango_small.bmp and /dev/null differ
diff --git a/icons/tango_small_viewers.bmp b/icons/tango_small_viewers.bmp
deleted file mode 100644
index 4ab498f6b0..0000000000
Binary files a/icons/tango_small_viewers.bmp and /dev/null differ
diff --git a/wps/WPSLIST b/wps/WPSLIST
index 6533a43eb3..cd3fbcfde5 100644
--- a/wps/WPSLIST
+++ b/wps/WPSLIST
@@ -102,38 +102,38 @@ selector type.160x128x2: bar (inverse)
 selector type.138x110x2: bar (inverse)
 
 #icons
-iconset.800x480x16: icons/tango_small.bmp
-iconset.480x800x16: icons/tango_small.bmp 
-iconset.320x480x16: icons/tango_small.bmp 
-iconset.320x240x16: icons/tango_small.bmp 
-iconset.128x128x16: icons/tango_small.bmp
-iconset.128x160x16: icons/tango_small.bmp
-iconset.132x80x16: icons/tango_small.bmp 
-iconset.138x110x2: icons/tango_small_mono.bmp
-iconset.160x128x16: icons/tango_small.bmp 
-iconset.160x128x2: icons/tango_small_mono.bmp
-iconset.176x132x16: icons/tango_small.bmp 
-iconset.176x220x16: icons/tango_small.bmp 
-iconset.220x176x16: icons/tango_small.bmp 
-iconset.240x320x16: icons/tango_small.bmp 
-iconset.240x400x16: icons/tango_small.bmp 
+iconset.800x480x16: icons/tango_icons.32x32.bmp
+iconset.480x800x16: icons/tango_icons.32x32.bmp
+iconset.320x480x16: icons/tango_icons.24x24.bmp
+iconset.320x240x16: icons/tango_icons.16x16.bmp
+iconset.128x128x16: icons/tango_icons.12x12.bmp
+iconset.128x160x16: icons/tango_icons.12x12.bmp
+iconset.132x80x16:  icons/tango_icons.12x12.bmp
+iconset.138x110x2:  icons/tango_small_mono.bmp
+iconset.160x128x16: icons/tango_icons.12x12.bmp
+iconset.160x128x2:  icons/tango_small_mono.bmp
+iconset.176x132x16: icons/tango_icons.12x12.bmp
+iconset.176x220x16: icons/tango_icons.12x12.bmp
+iconset.220x176x16: icons/tango_icons.12x12.bmp
+iconset.240x320x16: icons/tango_icons.16x16.bmp
+iconset.240x400x16: icons/tango_icons.16x16.bmp
 
 #viewer icons
-viewers iconset.800x480x16: icons/tango_small_viewers.bmp
-viewers iconset.480x800x16: icons/tango_small_viewers.bmp
-viewers iconset.320x480x16: icons/tango_small_viewers.bmp
-viewers iconset.320x240x16: icons/tango_small_viewers.bmp
-viewers iconset.128x128x16: icons/tango_small_viewers.bmp
-viewers iconset.128x160x16: icons/tango_small_viewers.bmp
-viewers iconset.132x80x16: icons/tango_small_viewers.bmp
-viewers iconset.138x110x2: icons/tango_small_viewers_mono.bmp
-viewers iconset.160x128x16: icons/tango_small_viewers.bmp
-viewers iconset.160x128x2: icons/tango_small_viewers_mono.bmp
-viewers iconset.176x132x16: icons/tango_small_viewers.bmp 
-viewers iconset.176x220x16: icons/tango_small_viewers.bmp 
-viewers iconset.220x176x16: icons/tango_small_viewers.bmp
-viewers iconset.240x320x16: icons/tango_small_viewers.bmp 
-viewers iconset.240x400x16: icons/tango_small_viewers.bmp 
+viewers iconset.800x480x16: icons/tango_icons_viewers.32x32.bmp
+viewers iconset.480x800x16: icons/tango_icons_viewers.32x32.bmp
+viewers iconset.320x480x16: icons/tango_icons_viewers.24x24.bmp
+viewers iconset.320x240x16: icons/tango_icons_viewers.16x16.bmp
+viewers iconset.128x128x16: icons/tango_icons_viewers.12x12.bmp
+viewers iconset.128x160x16: icons/tango_icons_viewers.12x12.bmp
+viewers iconset.132x80x16:  icons/tango_icons_viewers.12x12.bmp
+viewers iconset.138x110x2:  icons/tango_small_viewers_mono.bmp
+viewers iconset.160x128x16: icons/tango_icons_viewers.12x12.bmp
+viewers iconset.160x128x2:  icons/tango_small_viewers_mono.bmp
+viewers iconset.176x132x16: icons/tango_icons_viewers.12x12.bmp
+viewers iconset.176x220x16: icons/tango_icons_viewers.12x12.bmp
+viewers iconset.220x176x16: icons/tango_icons_viewers.12x12.bmp
+viewers iconset.240x320x16: icons/tango_icons_viewers.16x16.bmp
+viewers iconset.240x400x16: icons/tango_icons_viewers.16x16.bmp
 
 # Whether the WPS is designed to have the statusbar on or off
 Statusbar: top