diff --git a/docs/logo/rockbox-clef.svg b/docs/logo/rockbox-clef.svg
index 748cd09..3407a02 100644
--- a/docs/logo/rockbox-clef.svg
+++ b/docs/logo/rockbox-clef.svg
@@ -2,16 +2,51 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.1"
-   width="116.58416"
-   height="116.0891"
-   viewBox="0 0 3290.2639 3276.2924"
+   width="120"
+   height="120"
+   viewBox="0 0 3386.6665 3386.6666"
    id="svg2"
    xml:space="preserve"
-   style="fill-rule:evenodd"><defs
+   style="fill-rule:evenodd"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="rockbox-clef.svg"><metadata
+   id="metadata18"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="864"
+   inkscape:window-height="720"
+   id="namedview16"
+   showgrid="true"
+   inkscape:zoom="4"
+   inkscape:cx="82.5729"
+   inkscape:cy="69.674808"
+   inkscape:window-x="0"
+   inkscape:window-y="24"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Ebene_x0020_1"><inkscape:grid
+     type="xygrid"
+     id="grid2993"
+     empspacing="5"
+     visible="true"
+     enabled="true"
+     snapvisiblegridlinesonly="true" /></sodipodi:namedview><defs
    id="defs38"><linearGradient
      id="linearGradient3657"><stop
        id="stop3659"
@@ -28,7 +63,7 @@
      xlink:href="#linearGradient3657"
      gradientUnits="userSpaceOnUse" /></defs>
  <g
-   transform="translate(674.12392,-1803.1351)"
+   transform="matrix(0.90063697,0,0,0.88724946,748.25202,-1317.6084)"
    id="Ebene_x0020_1">
   <defs
    id="defs5">
@@ -56,22 +91,24 @@
   
   
   <rect
-   width="3290.2639"
-   height="3276.2925"
-   ry="311.51636"
-   x="-674.12396"
-   y="1803.1351"
+   width="3133.5845"
+   height="3180.8667"
+   ry="302.44305"
+   x="-517.4447"
+   y="1803.135"
    id="rect3694"
    style="fill:#ffc001;fill-opacity:1;fill-rule:evenodd;stroke:none" /><path
    d="m 1133.6395,3200.4269 c 11.2559,18.2986 22.432,36.6011 33.5473,54.9487 60.3406,-16.5847 123.9814,-25.3702 188.4648,-26.059 126.1999,-1.316 246.2441,48.6846 317.2687,132.1614 64.2026,75.4539 101.1079,162.6951 106.6733,252.1193 2.3212,37.3762 -5.6502,74.466 -23.3869,108.7376 -43.5526,84.192 -117.9946,155.791 -214.1337,205.9842 45.7615,89.9291 90.0403,180.2716 132.8495,271.0265 81.8832,173.6387 132.6702,354.6655 150.8198,537.8489 4.676,47.2371 -2.5858,94.4734 -21.3927,138.9539 -19.2847,45.5742 -58.1673,84.1121 -110.1785,109.1541 -37.7378,18.1621 -83.751,23.2435 -127.4177,14.0995 -43.6802,-9.1436 -81.2498,-31.7365 -104.0476,-62.5664 -26.5203,-35.904 -42.2855,-75.8627 -46.0345,-116.7994 -2.1173,-23.0223 9.3653,-45.2202 31.1441,-60.2062 27.4567,-18.8993 62.7411,-29.5144 99.7917,-30.07 24.3266,-0.3368 47.3936,9.6188 60.3568,26.0881 12.9472,16.4494 13.7396,36.8489 2.1096,53.3337 -14.3314,20.3045 -37.0946,36.0653 -64.6429,44.7438 l 11.8035,16.1533 c 5.7557,9.2105 16.8132,15.7847 29.6363,17.5515 12.8112,1.7777 25.7362,-1.4481 34.5823,-8.6399 43.6788,-34.3792 67.7315,-81.3042 66.8875,-130.5556 -3.562,-84.7728 -16.3171,-169.3555 -38.1543,-252.8527 -55.7305,-177.8644 -127.5412,-352.777 -214.8999,-523.3512 -16.3737,5.1045 -33.0607,9.6178 -49.9908,13.5678 -49.5652,11.5132 -99.9157,21.0976 -150.8427,28.7217 l -100.813,-814.0936 z m 248.7771,672.5156 c -50.5142,19.7875 -104.412,34.1161 -160.2241,42.5737 l -50.7294,-409.6546 c 72.2514,121.1726 142.3288,243.0983 210.2123,365.7262 0.2567,0.458 0.4978,0.8959 0.7412,1.3547 0,0 0,0 0,0 0,0 0,0 0,0 0,0 0,0 0,0 m -150.076,-508.6879 c 17.5147,-4.8294 35.3415,-9.0782 53.3625,-12.729 56.5362,-11.4397 117.3362,-3.637 167.586,21.5055 45.7565,22.8959 80.8463,56.9138 99.7551,96.6234 42.1044,88.5079 47.194,184.4321 14.5179,273.6257 -6.8456,18.7164 -19.8851,35.5583 -37.8052,48.8537 -13.7547,10.2054 -28.1066,19.8974 -43.0038,29.0629 -80.5314,-153.6773 -165.3681,-306.0385 -254.4125,-456.9422 m -10.1481,551.2616 c -14.298,2.1559 -28.7086,3.9408 -43.196,5.3209 -157.9011,15.1267 -314.30239,-47.8917 -393.33817,-158.4708 -140.27886,-196.2782 -185.31029,-423.8857 -126.59762,-639.7364 20.62766,-75.767 42.25356,-151.3353 64.91887,-226.6963 6.26181,-20.8439 12.63094,-41.6829 19.09409,-62.5163 104.89649,154.512 206.20813,310.449 303.84503,467.7319 -104.88444,52.3821 -185.1784,129.7162 -229.58648,221.109 -7.33244,15.1065 -1.5786,32.4892 14.38626,43.3632 15.95163,10.8746 38.6339,12.8768 56.5858,5.0072 15.19318,-10.1136 29.0455,-21.3616 41.40015,-33.6098 49.89688,-51.7003 111.96607,-95.3657 183.00107,-128.7738 19.7486,32.4884 39.3155,65.0179 58.7576,97.6166 l -37.8236,-305.4347 c -92.6263,-150.6417 -189.46344,-299.7421 -290.47048,-447.1875 -16.73566,-24.4224 -33.73799,-48.7363 -51.00315,-72.9107 12.53936,-37.7911 25.36472,-75.5343 38.46801,-113.1874 18.72476,-53.759 31.27196,-108.8276 37.52831,-164.6129 7.04724,-63.0773 -7.52517,-127.0079 -42.2481,-185.2058 -79.1109,-132.6193 -213.39469,-241.1725 -380.18823,-307.3322 -73.37553,-29.1121 -155.31083,-41.0734 -235.85269,-34.4583 -67.48248,5.551 -116.971987,50.5243 -114.340324,103.8724 2.381016,48.4159 22.574124,95.696 58.086904,136.1456 32.88527,37.4341 67.82132,73.7652 104.71321,108.8721 113.82257,108.3303 214.95374,224.3585 302.12809,346.5898 17.13041,24.0557 34.19842,48.1462 51.17499,72.252 -15.99656,48.3246 -31.52841,96.7397 -46.59165,145.277 -69.85813,225.1541 -104.21032,456.9898 -102.24126,690.3515 0.92822,110.1406 26.98496,219.8501 76.97168,323.9736 68.55723,142.8242 245.98138,237.2059 438.57406,233.2775 86.18513,-1.7571 171.82603,-8.9862 256.10363,-21.6231 l -12.26,-99.0043"
    id="path24"
-   style="fill:#000000;fill-opacity:1;fill-rule:evenodd" />
+   style="fill:#000000;fill-opacity:1;fill-rule:evenodd"
+   inkscape:connector-curvature="0" />
   
   
   <path
    d="M 659.33533,2503.3767 C 573.5524,2394.5355 482.17708,2288.3563 385.43749,2185.1728 c -30.76545,-32.8099 -59.12968,-66.9092 -84.95666,-102.1687 -16.86386,-22.98 -28.28033,-48.07 -33.73308,-74.0078 -1.1599,-5.5966 0.71447,-11.2481 5.21013,-15.5497 4.45467,-4.3102 11.12647,-6.8716 18.3068,-7.0503 34.58075,-0.8971 69.10856,5.1026 100.42147,17.453 134.57561,53.071 237.34107,146.2148 284.58433,257.9109 13.77151,32.583 18.33147,66.9284 13.33714,100.5928 -7.04096,47.4029 -16.80734,94.4462 -29.27229,141.0237 l 0,0"
    id="path30"
-   style="fill:#ffc000" />
+   style="fill:#ffc000"
+   inkscape:connector-curvature="0" />
   
   
  </g>
diff --git a/icons/create-icons-from-tango.pl b/icons/create-icons-from-tango.pl
index bfdbe80..e886608 100755
--- a/icons/create-icons-from-tango.pl
+++ b/icons/create-icons-from-tango.pl
@@ -30,7 +30,7 @@ my @iconlist = (
     "actions/format-indent-more",               # Icon_Playlist
     "actions/media-playback-start",             # Icon_Cursor ###
     "apps/preferences-desktop-wallpaper",       # Icon_Wps
-    "devices/computer",                         # Icon_Firmware ###
+    "devices/media-flash",                      # Icon_Firmware ###
     "apps/preferences-desktop-font",            # Icon_Font
     "apps/preferences-desktop-locale",          # Icon_Language
     "categories/preferences-system",            # Icon_Config
@@ -40,7 +40,7 @@ my @iconlist = (
     "actions/go-jump",                          # Icon_Queued
     "actions/go-next",                          # Icon_Moving
     "devices/input-keyboard",                   # Icon_Keyboard
-    "actions/mail-send-receive",                # Icon_Reverse_Cursor
+    "actions/go-previous",                      # Icon_Reverse_Cursor
     "apps/help-browser",                        # Icon_Questionmark
     "actions/document-properties",              # Icon_Menu_setting
     "categories/applications-other",            # Icon_Menu_functioncall
@@ -49,12 +49,12 @@ my @iconlist = (
     "actions/media-record",                     # Icon_Recording
     "devices/audio-input-microphone",           # Icon_Voice ###
     "categories/preferences-desktop",           # Icon_General_settings_menu
-    "categories/applications-other",            # Icon_System_menu
+    "categories/applications-system",           # Icon_System_menu
     "actions/media-playback-start",             # Icon_Playback_menu
     "devices/video-display",                    # Icon_Display_menu
-    "devices/video-display",                    # Icon_Remote_Display_menu
+    "status/network-receive",                   # Icon_Remote_Display_menu
     "devices/network-wireless",                 # Icon_Radio_screen ###
-    "mimetypes/package-x-generic",              # Icon_file_view_menu
+    "apps/system-file-manager",                 # Icon_file_view_menu
     "apps/utilities-system-monitor",            # Icon_EQ
     "../docs/logo/rockbox-clef.svg"             # Icon_Rockbox
 );
@@ -113,8 +113,9 @@ foreach(@iconlist) {
 }
 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`;
+#`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`;
+`convert $tempstripfname $newoutput`;
 print "done!\n";