resolved merge conflict (hopefully)

1 files changed, 192 insertions, 217 deletions

diff --git a/library/inlinepics_p.h b/library/inlinepics_p.h
index edb1eae..befd72e 100644
--- a/library/inlinepics_p.h
+++ b/library/inlinepics_p.h
@@ -4,3 +4,3 @@
 #include <qimage.h>
-#include <stdlib.h>
+#include <qdict.h>
 static const QRgb _to1_data[] = {
@@ -382,13 +382,13 @@ static const QRgb CloseButton_data[] = {
     0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0x3edcdcdc,0x93dbdbdb,0xd5dedede,0xfadcdcdc,0xd8d1d1d1,0x9ec8c8c8,0x509d9d9d,0xc000000,0x3000000,0xffffff,0xffffff,
-    0xffffff,0xffffff,0x60dcdcdc,0xdbe3e3e3,0xffe2e2e2,0xffd3d3d3,0xffcecece,0xffcdcdcd,0xffd7d7d7,0xe6c5c5c5,0x838d8d8d,0x18000000,0x4000000,0xffffff,
-    0xffffff,0x3edddcdc,0xdbdadada,0xffcbcbcb,0xff353535,0xff888888,0xffc2c1c2,0xff878687,0xff343434,0xffb1b2b1,0xec9e9d9e,0x75595959,0x18000000,0x3000000,
-    0xffffff,0x94d5d6d5,0xffd1d0d0,0xff8c8c8c,0xff000000,0xff000000,0xff5a5a5a,0xff000000,0xff000000,0xff868786,0xffabaaaa,0xc8616161,0x3d000000,0xc000000,
-    0xffffff,0xd5cbcbcb,0xffbbbbbb,0xffadadad,0xff7a7a7a,0xff000000,0xff000000,0xff000000,0xff777777,0xffb1b1b1,0xffb1b1b1,0xef616161,0x61000000,0x1a000000,
-    0xffffff,0xfabfbfbf,0xffababab,0xffa4a4a4,0xff7a7a7a,0xff000000,0xff000000,0xff000000,0xff747474,0xffaeaeae,0xffa2a2a2,0xfd5d5d5d,0x7c000000,0x25000000,
-    0xffffff,0xd9b0b0b0,0xffa0a0a0,0xff7d7d7d,0xff000000,0xff000000,0xff4a4a4a,0xff000000,0xff000000,0xff7a7a7a,0xff8c8c8c,0xf2484848,0x85000000,0x2b000000,
-    0xffffff,0xa0949494,0xff9b9b9a,0xff959696,0xff383838,0xff6a6a6a,0xffa1a1a0,0xff6e6e6e,0xff353535,0xff969796,0xff6a696a,0xdf363636,0x7c000000,0x25000000,
-    0xffffff,0x516f6f6f,0xe7818181,0xff8d8d8d,0xff949494,0xff999a9a,0xff9b9b9b,0xff9e9e9e,0xff8f8f8f,0xff737273,0xf5414141,0xbb1a1a1a,0x61000000,0x1a000000,
-    0xffffff,0xc000000,0x84505050,0xed626262,0xff6f6e6e,0xff7b7b7a,0xff7d7d7d,0xff767576,0xff636263,0xf5414140,0xcd1f1f1f,0x83000000,0x3d000000,0xc000000,
-    0xffffff,0x3000000,0x18000000,0x762f2f2f,0xc93b3b3b,0xf0404040,0xfd464646,0xf3393939,0xdf2a2a2a,0xbb161616,0x83000000,0x4b000000,0x18000000,0x3000000,
+    0xffffff,0xffffff,0xffffff,0x3ed5d5d5,0x93d4d4d4,0xd5d8d8d8,0xfad5d5d5,0xd8c8c8c8,0x9ebebebe,0x508e8e8e,0xc000000,0x3000000,0xffffff,0xffffff,
+    0xffffff,0xffffff,0x60d5d5d5,0xdbdddddd,0xffdcdcdc,0xffcbcbcb,0xffc5c5c5,0xffc4c4c4,0xffd0d0d0,0xe6bbbbbb,0x837d7d7d,0x18000000,0x4000000,0xffffff,
+    0xffffff,0x3ed6d5d5,0xdbd3d3d3,0xffc1c1c1,0xff262626,0xff777777,0xffb7b6b7,0xff767576,0xff252525,0xffa4a5a4,0xec8f8e8f,0x75474747,0x18000000,0x3000000,
+    0xffffff,0x94cdcecd,0xffc8c7c7,0xff7b7b7b,0xff000000,0xff000000,0xff484848,0xff000000,0xff000000,0xff757675,0xff9d9c9c,0xc84f4f4f,0x3d000000,0xc000000,
+    0xffffff,0xd5c2c2c2,0xffafafaf,0xffa0a0a0,0xff686868,0xff000000,0xff000000,0xff000000,0xff656565,0xffa4a4a4,0xffa4a4a4,0xef4f4f4f,0x61000000,0x1a000000,
+    0xffffff,0xfab4b4b4,0xff9d9d9d,0xff959595,0xff696969,0xff000000,0xff000000,0xff000000,0xff626262,0xffa1a1a1,0xff939393,0xfd4b4b4b,0x7c000000,0x25000000,
+    0xffffff,0xd9a3a3a3,0xff919191,0xff6c6c6c,0xff000000,0xff000000,0xff393939,0xff000000,0xff000000,0xff696969,0xff7b7b7b,0xf2373737,0x85000000,0x2b000000,
+    0xffffff,0xa0848484,0xff8c8c8b,0xff858686,0xff292929,0xff585858,0xff929291,0xff5c5c5c,0xff262626,0xff868786,0xff585758,0xdf272727,0x7c000000,0x25000000,
+    0xffffff,0x515d5d5d,0xe7707070,0xff7c7c7c,0xff848484,0xff898a8a,0xff8c8c8c,0xff8f8f8f,0xff7f7f7f,0xff616061,0xf5313131,0xbb101010,0x61000000,0x1a000000,
+    0xffffff,0xc000000,0x843f3f3f,0xed505050,0xff5d5c5c,0xff6a6a69,0xff6c6c6c,0xff646364,0xff515051,0xf5313130,0xcd141414,0x83000000,0x3d000000,0xc000000,
+    0xffffff,0x3000000,0x18000000,0x76212121,0xc92b2b2b,0xf0303030,0xfd353535,0xf32a2a2a,0xdf1d1d1d,0xbb0d0d0d,0x83000000,0x4b000000,0x18000000,0x3000000,
     0xffffff,0xffffff,0x4000000,0x18000000,0x3d000000,0x61000000,0x7c000000,0x85000000,0x7c000000,0x61000000,0x3d000000,0x18000000,0x4000000,0xffffff,
@@ -707,74 +707,74 @@ static const QRgb DocumentTypePowerPoint_data[] = {
     0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x1000500,0x2000500,0x5000500,0x9000500,0x10000500,0x18000500,0x22000500,
-    0x2c000500,0x36000500,0x3f000500,0x45000500,0x4a000500,0x4d000500,0x4e000500,0x4e000500,0x4e000500,0x4c000500,0x49000500,0x45000500,0x3f000500,0x37000500,
-    0x2e000500,0x25000500,0x1c000500,0x13000500,0xd000500,0x8000500,0x4000500,0x2000500,0xffffff,0xffffff,0xffffff,0x1000500,0x3000500,0x7000500,
-    0xd000500,0x16000500,0x22000500,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,
-    0xff000000,0xff000000,0xfd373737,0x72545754,0x44000500,0x37000500,0x2b000500,0x1f000500,0x15000500,0xd000500,0x8000500,0x4000500,0xffffff,0xffffff,
-    0xffffff,0x1000500,0x4000500,0x9000500,0x11000500,0x1d000500,0x2c000500,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffefefe,
-    0xfffefefe,0xfffdfdfd,0xfffafafa,0xfff5f5f5,0xffededed,0xffe3e3e3,0xffd1d1d1,0xfd363636,0x76404240,0x4e000500,0x3d000500,0x2e000500,0x21000500,0x16000500,
-    0xe000500,0x8000500,0xffffff,0xffffff,0xffffff,0x2000500,0x5000500,0xb000500,0x15000500,0x24000500,0x36000500,0xff000000,0xffffffff,0xffffffff,
-    0xffffffff,0xffffffff,0xfffefefe,0xfffefefe,0xfffdfdfd,0xfffdfdfd,0xfff8f8f8,0xfff0f0f0,0xffe3e3e3,0xffd4d4d4,0xfffefefe,0xffbebebe,0xfd383838,0x803e403e,
-    0x53000500,0x40000500,0x2f000500,0x21000500,0x16000500,0xd000500,0xffffff,0xffffff,0xffffff,0x2000500,0x6000500,0xd000500,0x18000500,0x29000500,
-    0x3f000500,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffefefe,0xfffdfdfd,0xfffdfdfd,0xfffbfbfb,0xfff6f6f6,0xffededed,0xffdbdbdb,0xffc6c6c6,
-    0xffffffff,0xfffdfdfd,0xffaeaeae,0xfd3b3b3b,0x7e353735,0x55000500,0x41000500,0x2f000500,0x20000500,0x15000500,0xffffff,0xffffff,0x1000500,0x2000500,
-    0x6000500,0xe000500,0x1b000500,0x2d000500,0x45000500,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffdfdfd,0xfffdfdfd,0xfffcfcfc,0xfffafafa,
-    0xfff4f4f4,0xffe8e8e8,0xffd5d5d5,0xffbababa,0xffffffff,0xffffffff,0xfffdfdfd,0xffa3a3a3,0xfd3e3e3e,0x7a2a2d2a,0x55000500,0x40000500,0x2d000500,0x1e000500,
-    0xffffff,0xffffff,0x1000500,0x2000500,0x7000500,0xf000500,0x1d000500,0x30000500,0x4a000500,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,
-    0xfffdfdfd,0xfffdfdfd,0xfffcfcfc,0xfff8f8f8,0xfff3f3f3,0xffe7e7e7,0xffd1d1d1,0xffb4b4b4,0xffffffff,0xffffffff,0xffffffff,0xfffafafa,0xff9d9d9d,0xfd454545,
-    0x782b2b2b,0x52000500,0x3c000500,0x29000500,0xffffff,0xffffff,0x1000500,0x3000500,0x7000500,0x10000500,0x1e000500,0x32000500,0x4d000500,0xff000000,
-    0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffdfdfd,0xfffcfcfc,0xfffbfbfb,0xfff8f8f8,0xfff3f3f3,0xffe6e6e6,0xffd1d1d1,0xffb3b3b3,0xffffffff,0xffffffff,
-    0xffffffff,0xffffffff,0xfff9f9f9,0xff9e9e9e,0xfc4c4c4c,0x701f231f,0x4c000500,0x36000500,0x1000000,0x2000000,0x5000000,0x9000000,0xf000000,0x18000000,
-    0x27000000,0x3b000000,0x55000600,0xff000000,0xfff7f7f7,0xfff7f7f7,0xfff7f7f7,0xfff8f8f8,0xfff6f6f6,0xfff7f7f7,0xfff7f7f7,0xfff6f6f6,0xfff2f2f2,0xffe8e8e8,
-    0xffd4d4d4,0xffb9b9b9,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffbfbfb,0xffa1a1a1,0xfb545454,0x5c000500,0x42000500,0x4000000,0x7000000,
-    0xd000000,0x15000000,0x1d000000,0x29000000,0x38000000,0x4c000000,0x64000000,0xff000000,0xffe5e5e5,0xffe5e5e5,0xffe7e7e7,0xffe8e8e8,0xffe8e8e8,0xffececec,
-    0xffefefef,0xfff3f3f3,0xfff0f0f0,0xffeaeaea,0xffdddddd,0xffc9c9c9,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffbfbfb,0xff3e3e3e,
-    0x6a000500,0x4e000500,0x7000000,0xf000000,0x19000000,0x28000000,0x34000000,0x43000000,0x52000000,0x64000000,0x79000500,0xff000000,0xffcbcbcb,0xffcbcbcb,
-    0xffcdcdcd,0xffd1d1d1,0xffd6d6d6,0xffdddddd,0xffe7e7e7,0xffececec,0xffefefef,0xffefefef,0xffe7e7e7,0xffc5c5c5,0xff9f9f9f,0xff7f7f7f,0xff6f6f6f,0xff6b6b6b,
-    0xff717171,0xff8c8c8c,0xffb5b5b5,0xff000000,0x76000500,0x58000500,0xc000000,0x19000000,0xff78cf7b,0xff75cd78,0xff71cb75,0xff6ec872,0xff69c56d,0xff67c56b,
-    0xff62c466,0xff5ec463,0xff58c15d,0xff51bf57,0xff4dbd50,0xff45bc4a,0xff42b948,0xffc6c6c6,0xffd7d7d7,0xffe5e5e5,0xffeeeeee,0xfff2f2f2,0xffcfcfcf,0xffa0a0a0,
-    0xff8d8d8d,0xff828282,0xff828282,0xff7d7d7d,0xff717171,0xff707070,0xff747474,0xff000000,0x80000500,0x60000500,0x12000000,0x27000000,0xff74cb77,0xff6fc673,
-    0xff6ac16d,0xff64bc68,0xff61ba65,0xff5db860,0xff59b95d,0xff53b757,0xff4db552,0xff48b24c,0xff41b047,0xff3ead43,0xff3ead42,0xffa7a7a7,0xffc4c4c4,0xffdbdbdb,
-    0xffececec,0xffd9d9d9,0xffababab,0xff9a9a9a,0xffa4a4a4,0xffc0c0c0,0xffcecece,0xffcfcfcf,0xffc4c4c4,0xff919191,0xff6e6e6e,0xff000000,0x87000500,0x66000500,
-    0x17000000,0x31000000,0xff6fc673,0xffffffff,0xffffffff,0xffffffff,0xfff4f9f5,0xffa5d1a7,0xff4ca74f,0xffffffff,0xffffffff,0xffffffff,0xfff3f9f3,0xff9acb9c,
-    0xff399e3d,0xff8d8d8d,0xffb1b1b1,0xffd3d3d3,0xffdddddd,0xffbdbdbd,0xffa8a8a8,0xffb5b5b5,0xffe6e6e6,0xfff3f3f3,0xfff7f7f7,0xfff3f3f3,0xffd1d1d1,0xffe7e7e7,
-    0xff9f9f9f,0xff000000,0x8b000500,0x6a000500,0x1b000000,0x3c000000,0xff69bf6c,0xffffffff,0xffe0eee1,0xff7fb582,0xffc6ddc7,0xffffffff,0xff78b07a,0xffffffff,
-    0xffdceadd,0xff6fa972,0xffc0d9c1,0xffffffff,0xff70ad73,0xff767676,0xffa2a2a2,0xffc8c8c8,0xffcacaca,0xffb3b3b3,0xffb1b1b1,0xffe3e3e3,0xfffafafa,0xfff8f8f8,
-    0xfff7f7f7,0xffafafaf,0xff7a7a7a,0xffb6b6b6,0xffe1e1e1,0xff000000,0x8e000500,0x6d000500,0x1d000000,0x43000000,0xff62ba66,0xffffffff,0xffd1e3d2,0xff418943,
-    0xff77a778,0xffffffff,0xff99bd9a,0xffffffff,0xffcbddcc,0xff2a772e,0xff6b9f6d,0xffffffff,0xff96bc98,0xff666666,0xff979797,0xffbfbfbf,0xffbfbfbf,0xffb2b2b2,
-    0xffc5c5c5,0xfff5f5f5,0xfffbfbfb,0xfffafafa,0xffb6b6b6,0xff7c7c7c,0xff777777,0xff9b9b9b,0xffefefef,0xff000000,0x8f000500,0x6e000500,0x1f000000,0x45000000,
-    0xff5eb661,0xffffffff,0xffd1e2d1,0xff3b803d,0xff9abc9a,0xffffffff,0xff88af8a,0xffffffff,0xffcbdacb,0xff276c29,0xff93b495,0xffffffff,0xff88b089,0xff606060,
-    0xff919191,0xffbcbcbc,0xffb8b8b8,0xffb2b2b2,0xffcecece,0xfffdfdfd,0xfffcfcfc,0xffbababa,0xff828282,0xff7a7a7a,0xff808080,0xffe4e4e4,0xffffffff,0xff000000,
-    0x90000500,0x6e000500,0x1f000000,0x46000000,0xff58b35d,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffdbe7dc,0xff397e3d,0xffffffff,0xffffffff,0xffffffff,
-    0xffffffff,0xffdae5db,0xff3b803e,0xff616161,0xff929292,0xffbdbdbd,0xffbbbbbb,0xffaeaeae,0xffc6c6c6,0xfff9f9f9,0xffbcbcbc,0xff868686,0xff7e7e7e,0xff777777,
-    0xff747474,0xffa4a4a4,0xfff4f4f4,0xff000000,0x90000500,0x6f000500,0x1f000000,0x46000000,0xff53b257,0xffffffff,0xffdde9dd,0xff70a473,0xff5d9a5f,0xff2d7d30,
-    0xff2b7a2f,0xffffffff,0xffdae4da,0xff68936a,0xff578c5a,0xff29722b,0xff2b7a2f,0xff656565,0xff969696,0xffc2c2c2,0xffc5c5c5,0xffa8a8a8,0xffadadad,0xffeaeaea,
-    0xffb9b9b9,0xff7e7e7e,0xff9b9b9b,0xff9a9a9a,0xff696969,0xff676767,0xff939393,0xff000000,0x90000500,0x6f000500,0x1f000000,0x46000000,0xff4eaf51,0xffffffff,
-    0xffcee1ce,0xff2f8334,0xff308734,0xff2f8634,0xff2f8433,0xffffffff,0xffcbdbcb,0xff286f2a,0xff29732b,0xff2b7a2f,0xff2f8233,0xff6b6b6b,0xff9b9b9b,0xffc5c5c5,
-    0xffd3d3d3,0xffa8a8a8,0xff949494,0xffb5b5b5,0xfff0f0f0,0xffc5c5c5,0xffebebeb,0xfffcfcfc,0xff9e9e9e,0xff686868,0xff686868,0xff000000,0x90000500,0x6f000500,
-    0x1d000000,0x43000000,0xff49b04e,0xffffffff,0xffcde2ce,0xff318834,0xff338d37,0xff348e37,0xff318c36,0xffffffff,0xffcbdccc,0xff29752d,0xff2b7a2f,0xff2e7f31,
-    0xff318834,0xff757575,0xffa4a4a4,0xffc7c7c7,0xffe3e3e3,0xffc5c5c5,0xff8d8d8d,0xff818181,0xffa5a5a5,0xffdddddd,0xffe8e8e8,0xffeaeaea,0xffcbcbcb,0xff707070,
-    0xff696969,0xff000000,0x90000500,0x6f000500,0x1b000000,0x3e000000,0xff45b148,0xffffffff,0xffcde3ce,0xff348f37,0xff359439,0xff359539,0xff349138,0xffffffff,
-    0xffcbddcc,0xff2d7b30,0xff2e8031,0xff308734,0xff338d37,0xff858585,0xffadadad,0xffcbcbcb,0xffe4e4e4,0xffeeeeee,0xffb7b7b7,0xff7d7d7d,0xff767676,0xff797979,
-    0xff868686,0xff868686,0xff7c7c7c,0xff6d6d6d,0xff6d6d6d,0xff000000,0x90000500,0x6f000500,0x17000000,0x34000000,0xff3fb245,0xff3ba43f,0xff36993b,0xff369639,
-    0xff369a3c,0xff36993b,0xff359539,0xff338e37,0xff2f8433,0xff2f8331,0xff308634,0xff318a35,0xff338e37,0xff979797,0xffb8b8b8,0xffd2d2d2,0xffe3e3e3,0xfff3f3f3,
-    0xfff5f5f5,0xffc7c7c7,0xff969696,0xff727272,0xff727272,0xff727272,0xff727272,0xff939393,0xffbebebe,0xff000000,0x90000500,0x6e000500,0x12000000,0x28000000,
-    0x47000000,0x6b000000,0x87000000,0x9a000000,0xa7000000,0xb2000000,0xbc000000,0xff000000,0xff6d6d6d,0xff6e6e6e,0xff767676,0xff848484,0xff969696,0xffadadad,
-    0xffc6c6c6,0xffd9d9d9,0xffe8e8e8,0xffefefef,0xfff7f7f7,0xfff9f9f9,0xffebebeb,0xffd7d7d7,0xffc9c9c9,0xffc9c9c9,0xffd6d6d6,0xffeaeaea,0xfffafafa,0xff000000,
-    0x8e000500,0x6d000500,0xc000000,0x1a000000,0x2f000000,0x47000000,0x5b000000,0x6c000000,0x79000000,0x87000000,0x97000000,0xff000000,0xffa0a0a0,0xffa0a0a0,
-    0xffa5a5a5,0xffafafaf,0xffbababa,0xffc7c7c7,0xffd7d7d7,0xffe4e4e4,0xffededed,0xfff2f2f2,0xfff4f4f4,0xfff5f5f5,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,
-    0xfff8f8f8,0xfff7f7f7,0xfff4f4f4,0xff000000,0x8c000500,0x6b000500,0x7000000,0x10000000,0x1b000000,0x2a000000,0x37000000,0x45000000,0x53000000,0x63000000,
-    0x76000000,0xff000000,0xffc9c9c9,0xffc9c9c9,0xffcbcbcb,0xffd1d1d1,0xffd5d5d5,0xffdcdcdc,0xffe6e6e6,0xffececec,0xfff2f2f2,0xfff5f5f5,0xfff6f6f6,0xfff6f6f6,
-    0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xff000000,0x87000500,0x68000500,0x4000000,0x7000000,0xd000000,0x14000000,
-    0x1c000000,0x28000000,0x35000000,0x47000000,0x5c000600,0xff000000,0xffe5e5e5,0xffe5e5e5,0xffe7e7e7,0xffe8e8e8,0xffe8e8e8,0xffececec,0xfff1f1f1,0xfff3f3f3,
-    0xfff5f5f5,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xfff8f8f8,0xff000000,0x7f000500,0x61000500,
-    0x1000000,0x2000000,0x4000000,0x8000000,0xe000000,0x16000000,0x21000000,0x31000000,0x47000000,0xff000000,0xfff7f7f7,0xfff7f7f7,0xfff7f7f7,0xfff8f8f8,
-    0xfff8f8f8,0xfffafafa,0xfffcfcfc,0xfffdfdfd,0xfffefefe,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,
-    0xffffffff,0xff000000,0x73000500,0x58000500,0xffffff,0xffffff,0xffffff,0x2000500,0x5000500,0xb000500,0x15000500,0x24000500,0x36000500,0xff000000,
+    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x1000200,0x2000200,0x5000200,0x9000200,0x10000200,0x18000200,0x22000200,
+    0x2c000200,0x36000200,0x3f000200,0x45000200,0x4a000200,0x4d000200,0x4e000200,0x4e000200,0x4e000200,0x4c000200,0x49000200,0x45000200,0x3f000200,0x37000200,
+    0x2e000200,0x25000200,0x1c000200,0x13000200,0xd000200,0x8000200,0x4000200,0x2000200,0xffffff,0xffffff,0xffffff,0x1000200,0x3000200,0x7000200,
+    0xd000200,0x16000200,0x22000200,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,
+    0xff000000,0xff000000,0xfd282828,0x72434543,0x44000200,0x37000200,0x2b000200,0x1f000200,0x15000200,0xd000200,0x8000200,0x4000200,0xffffff,0xffffff,
+    0xffffff,0x1000200,0x4000200,0x9000200,0x11000200,0x1d000200,0x2c000200,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffefefe,
+    0xfffefefe,0xfffcfcfc,0xfff9f9f9,0xfff3f3f3,0xffe9e9e9,0xffdedede,0xffc8c8c8,0xfd272727,0x76303230,0x4e000200,0x3d000200,0x2e000200,0x21000200,0x16000200,
+    0xe000200,0x8000200,0xffffff,0xffffff,0xffffff,0x2000200,0x5000200,0xb000200,0x15000200,0x24000200,0x36000200,0xff000000,0xffffffff,0xffffffff,
+    0xffffffff,0xffffffff,0xfffefefe,0xfffefefe,0xfffdfdfd,0xfffcfcfc,0xfff6f6f6,0xffededed,0xffdedede,0xffcccccc,0xfffefefe,0xffb3b3b3,0xfd292929,0x802e302e,
+    0x53000200,0x40000200,0x2f000200,0x21000200,0x16000200,0xd000200,0xffffff,0xffffff,0xffffff,0x2000200,0x6000200,0xd000200,0x18000200,0x29000200,
+    0x3f000200,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffefefe,0xfffdfdfd,0xfffcfcfc,0xfffafafa,0xfff4f4f4,0xffe9e9e9,0xffd4d4d4,0xffbcbcbc,
+    0xffffffff,0xfffcfcfc,0xffa1a1a1,0xfd2b2b2b,0x7e262826,0x55000200,0x41000200,0x2f000200,0x20000200,0x15000200,0xffffff,0xffffff,0x1000200,0x2000200,
+    0x6000200,0xe000200,0x1b000200,0x2d000200,0x45000200,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffdfdfd,0xfffdfdfd,0xfffbfbfb,0xfff9f9f9,
+    0xfff2f2f2,0xffe4e4e4,0xffcdcdcd,0xffaeaeae,0xffffffff,0xffffffff,0xfffcfcfc,0xff949494,0xfd2e2e2e,0x7a1d1f1d,0x55000200,0x40000200,0x2d000200,0x1e000200,
+    0xffffff,0xffffff,0x1000200,0x2000200,0x7000200,0xf000200,0x1d000200,0x30000200,0x4a000200,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xffffffff,
+    0xfffdfdfd,0xfffcfcfc,0xfffbfbfb,0xfff7f7f7,0xfff0f0f0,0xffe2e2e2,0xffc8c8c8,0xffa7a7a7,0xffffffff,0xffffffff,0xffffffff,0xfff9f9f9,0xff8e8e8e,0xfd343434,
+    0x781e1e1e,0x52000200,0x3c000200,0x29000200,0xffffff,0xffffff,0x1000200,0x3000200,0x7000200,0x10000200,0x1e000200,0x32000200,0x4d000200,0xff000000,
+    0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffcfcfc,0xfffbfbfb,0xfffafafa,0xfff7f7f7,0xfff0f0f0,0xffe1e1e1,0xffc8c8c8,0xffa6a6a6,0xffffffff,0xffffffff,
+    0xffffffff,0xffffffff,0xfff8f8f8,0xff8f8f8f,0xfc3b3b3b,0x70141714,0x4c000200,0x36000200,0x1000000,0x2000000,0x5000000,0x9000000,0xf000000,0x18000000,
+    0x27000000,0x3b000000,0x55000300,0xff000000,0xfff5f5f5,0xfff5f5f5,0xfff5f5f5,0xfff6f6f6,0xfff4f4f4,0xfff5f5f5,0xfff5f5f5,0xfff4f4f4,0xffefefef,0xffe4e4e4,
+    0xffcccccc,0xffadadad,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffafafa,0xff929292,0xfb434343,0x5c000200,0x42000200,0x4000000,0x7000000,
+    0xd000000,0x15000000,0x1d000000,0x29000000,0x38000000,0x4c000000,0x64000000,0xff000000,0xffe0e0e0,0xffe0e0e0,0xffe2e2e2,0xffe4e4e4,0xffe4e4e4,0xffe8e8e8,
+    0xffececec,0xfff0f0f0,0xffededed,0xffe6e6e6,0xffd7d7d7,0xffbfbfbf,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffafafa,0xff2e2e2e,
+    0x6a000200,0x4e000200,0x7000000,0xf000000,0x19000000,0x28000000,0x34000000,0x43000000,0x52000000,0x64000000,0x79000200,0xff000000,0xffc2c2c2,0xffc2c2c2,
+    0xffc4c4c4,0xffc9c9c9,0xffcecece,0xffd6d6d6,0xffe2e2e2,0xffe8e8e8,0xffececec,0xffececec,0xffe2e2e2,0xffbbbbbb,0xff909090,0xff6e6e6e,0xff5d5d5d,0xff595959,
+    0xff5f5f5f,0xff7b7b7b,0xffa8a8a8,0xff000000,0x76000200,0x58000200,0xc000000,0x19000000,0xff66c66a,0xff63c466,0xff5fc163,0xff5cbe60,0xff57bb5b,0xff55bb59,
+    0xff50ba54,0xff4cba51,0xff46b64b,0xff40b445,0xff3cb13f,0xff34b039,0xff32ad37,0xffbcbcbc,0xffd0d0d0,0xffe0e0e0,0xffebebeb,0xffefefef,0xffc6c6c6,0xff919191,
+    0xff7c7c7c,0xff717171,0xff717171,0xff6c6c6c,0xff5f5f5f,0xff5e5e5e,0xff626262,0xff000000,0x80000200,0x60000200,0x12000000,0x27000000,0xff62c265,0xff5dbc61,
+    0xff58b65b,0xff52b056,0xff4fae53,0xff4bac4e,0xff47ad4b,0xff42ab45,0xff3ca841,0xff37a53b,0xff31a336,0xff2ea033,0xff2e9f32,0xff999999,0xffb9b9b9,0xffd4d4d4,
+    0xffe8e8e8,0xffd2d2d2,0xff9d9d9d,0xff8b8b8b,0xff959595,0xffb5b5b5,0xffc5c5c5,0xffc6c6c6,0xffbababa,0xff818181,0xff5c5c5c,0xff000000,0x87000200,0x66000200,
+    0x17000000,0x31000000,0xff5dbc61,0xffffffff,0xffffffff,0xffffffff,0xfff2f8f3,0xff97c899,0xff3b993e,0xffffffff,0xffffffff,0xffffffff,0xfff1f8f1,0xff8bc28d,
+    0xff2a8f2d,0xff7c7c7c,0xffa4a4a4,0xffcbcbcb,0xffd7d7d7,0xffb1b1b1,0xff9a9a9a,0xffa8a8a8,0xffe1e1e1,0xfff1f1f1,0xfff5f5f5,0xfff0f0f0,0xffc9c9c9,0xffe2e2e2,
+    0xff909090,0xff000000,0x8b000200,0x6a000200,0x1b000000,0x3c000000,0xff57b45a,0xffffffff,0xffdaeadb,0xff6ea871,0xffbcd6bd,0xffffffff,0xff66a369,0xffffffff,
+    0xffd5e6d6,0xff5d9b60,0xffb5d2b6,0xffffffff,0xff5e9f61,0xff646464,0xff939393,0xffbebebe,0xffc0c0c0,0xffa6a6a6,0xffa4a4a4,0xffdedede,0xfff9f9f9,0xfff6f6f6,
+    0xfff5f5f5,0xffa2a2a2,0xff686868,0xffa9a9a9,0xffdbdbdb,0xff000000,0x8e000200,0x6d000200,0x1d000000,0x43000000,0xff50ae54,0xffffffff,0xffc9deca,0xff317833,
+    0xff659966,0xffffffff,0xff89b18a,0xffffffff,0xffc2d6c3,0xff1d6520,0xff59905b,0xffffffff,0xff86b088,0xff545454,0xff878787,0xffb4b4b4,0xffb4b4b4,0xffa5a5a5,
+    0xffbbbbbb,0xfff3f3f3,0xfffafafa,0xfff9f9f9,0xffaaaaaa,0xff6b6b6b,0xff656565,0xff8c8c8c,0xffececec,0xff000000,0x8f000200,0x6e000200,0x1f000000,0x45000000,
+    0xff4caa4f,0xffffffff,0xffc8dcc9,0xff2b6f2d,0xff8ab08b,0xffffffff,0xff77a279,0xffffffff,0xffc1d3c2,0xff1a5a1c,0xff83a785,0xffffffff,0xff77a378,0xff4e4e4e,
+    0xff818181,0xffb0b0b0,0xffacacac,0xffa5a5a5,0xffc5c5c5,0xfffcfcfc,0xfffbfbfb,0xffaeaeae,0xff717171,0xff696969,0xff6f6f6f,0xffdfdfdf,0xffffffff,0xff000000,
+    0x90000200,0x6e000200,0x1f000000,0x46000000,0xff46a64b,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffd4e2d5,0xff2a6d2d,0xffffffff,0xffffffff,0xffffffff,
+    0xffffffff,0xffd3e0d4,0xff2b6f2e,0xff4f4f4f,0xff828282,0xffb2b2b2,0xffafafaf,0xffa1a1a1,0xffbcbcbc,0xfff8f8f8,0xffb0b0b0,0xff757575,0xff6d6d6d,0xff656565,
+    0xff626262,0xff959595,0xfff2f2f2,0xff000000,0x90000200,0x6f000200,0x1f000000,0x46000000,0xff42a545,0xffffffff,0xffd6e5d7,0xff5e9561,0xff4b8a4d,0xff1f6c22,
+    0xff1e6921,0xffffffff,0xffd3dfd3,0xff568358,0xff457b48,0xff1c601e,0xff1e6921,0xff535353,0xff868686,0xffb7b7b7,0xffbbbbbb,0xff9a9a9a,0xff9f9f9f,0xffe6e6e6,
+    0xffadadad,0xff6d6d6d,0xff8c8c8c,0xff8b8b8b,0xff575757,0xff555555,0xff838383,0xff000000,0x90000200,0x6f000200,0x1f000000,0x46000000,0xff3da240,0xffffffff,
+    0xffc5dbc5,0xff217225,0xff227625,0xff217525,0xff217324,0xffffffff,0xffc1d4c2,0xff1b5d1d,0xff1c611e,0xff1e6821,0xff217124,0xff595959,0xff8c8c8c,0xffbbbbbb,
+    0xffcbcbcb,0xff9a9a9a,0xff848484,0xffa8a8a8,0xffededed,0xffbbbbbb,0xffe7e7e7,0xfffbfbfb,0xff8f8f8f,0xff565656,0xff565656,0xff000000,0x90000200,0x6f000200,
+    0x1d000000,0x43000000,0xff38a33d,0xffffffff,0xffc4dcc5,0xff237725,0xff247d28,0xff257e28,0xff237b27,0xffffffff,0xffc2d5c3,0xff1c631f,0xff1e6921,0xff206e23,
+    0xff237725,0xff636363,0xff959595,0xffbdbdbd,0xffdddddd,0xffbbbbbb,0xff7c7c7c,0xff707070,0xff979797,0xffd6d6d6,0xffe3e3e3,0xffe6e6e6,0xffc2c2c2,0xff5e5e5e,
+    0xff575757,0xff000000,0x90000200,0x6f000200,0x1b000000,0x3e000000,0xff34a437,0xffffffff,0xffc4ddc5,0xff257f28,0xff26842a,0xff26852a,0xff258129,0xffffffff,
+    0xffc2d7c3,0xff1f6a22,0xff206f23,0xff227625,0xff247c28,0xff747474,0xff9f9f9f,0xffc1c1c1,0xffdfdfdf,0xffebebeb,0xffababab,0xff6c6c6c,0xff646464,0xff676767,
+    0xff757575,0xff757575,0xff6b6b6b,0xff5b5b5b,0xff5b5b5b,0xff000000,0x90000200,0x6f000200,0x17000000,0x34000000,0xff2fa534,0xff2b952f,0xff27892b,0xff27862a,
+    0xff278a2c,0xff27892b,0xff26852a,0xff247e28,0xff217324,0xff217223,0xff227525,0xff237926,0xff247e28,0xff878787,0xffacacac,0xffcacaca,0xffdedede,0xfff0f0f0,
+    0xfff3f3f3,0xffbdbdbd,0xff868686,0xff606060,0xff606060,0xff606060,0xff606060,0xff838383,0xffb3b3b3,0xff000000,0x90000200,0x6e000200,0x12000000,0x28000000,
+    0x47000000,0x6b000000,0x87000000,0x9a000000,0xa7000000,0xb2000000,0xbc000000,0xff000000,0xff5b5b5b,0xff5c5c5c,0xff646464,0xff737373,0xff868686,0xff9f9f9f,
+    0xffbcbcbc,0xffd2d2d2,0xffe4e4e4,0xffececec,0xfff5f5f5,0xfff8f8f8,0xffe7e7e7,0xffcfcfcf,0xffbfbfbf,0xffbfbfbf,0xffcecece,0xffe6e6e6,0xfff9f9f9,0xff000000,
+    0x8e000200,0x6d000200,0xc000000,0x1a000000,0x2f000000,0x47000000,0x5b000000,0x6c000000,0x79000000,0x87000000,0x97000000,0xff000000,0xff919191,0xff919191,
+    0xff979797,0xffa2a2a2,0xffaeaeae,0xffbdbdbd,0xffd0d0d0,0xffdfdfdf,0xffe9e9e9,0xffefefef,0xfff2f2f2,0xfff3f3f3,0xfff6f6f6,0xfff7f7f7,0xfff7f7f7,0xfff7f7f7,
+    0xfff7f7f7,0xfff5f5f5,0xfff2f2f2,0xff000000,0x8c000200,0x6b000200,0x7000000,0x10000000,0x1b000000,0x2a000000,0x37000000,0x45000000,0x53000000,0x63000000,
+    0x76000000,0xff000000,0xffbfbfbf,0xffbfbfbf,0xffc2c2c2,0xffc8c8c8,0xffcdcdcd,0xffd5d5d5,0xffe1e1e1,0xffe8e8e8,0xffefefef,0xfff3f3f3,0xfff4f4f4,0xfff4f4f4,
+    0xfff4f4f4,0xfff4f4f4,0xfff4f4f4,0xfff4f4f4,0xfff4f4f4,0xfff4f4f4,0xfff4f4f4,0xff000000,0x87000200,0x68000200,0x4000000,0x7000000,0xd000000,0x14000000,
+    0x1c000000,0x28000000,0x35000000,0x47000000,0x5c000300,0xff000000,0xffe0e0e0,0xffe0e0e0,0xffe2e2e2,0xffe4e4e4,0xffe4e4e4,0xffe8e8e8,0xffeeeeee,0xfff1f1f1,
+    0xfff3f3f3,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xfff6f6f6,0xff000000,0x7f000200,0x61000200,
+    0x1000000,0x2000000,0x4000000,0x8000000,0xe000000,0x16000000,0x21000000,0x31000000,0x47000000,0xff000000,0xfff5f5f5,0xfff5f5f5,0xfff5f5f5,0xfff6f6f6,
+    0xfff7f7f7,0xfff9f9f9,0xfffbfbfb,0xfffdfdfd,0xfffefefe,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,
+    0xffffffff,0xff000000,0x73000200,0x58000200,0xffffff,0xffffff,0xffffff,0x2000200,0x5000200,0xb000200,0x15000200,0x24000200,0x36000200,0xff000000,
     0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,
-    0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0x63000500,0x4c000500,0xffffff,0xffffff,0xffffff,0x1000500,0x4000500,0x9000500,
-    0x11000500,0x1d000500,0x2c000500,0x3e000500,0x51000500,0x63000500,0x73000500,0x7f000500,0x87000500,0x8c000500,0x8e000500,0x90000500,0x90000500,0x90000500,
-    0x90000500,0x90000500,0x90000500,0x90000500,0x8e000500,0x8c000500,0x87000500,0x7f000500,0x73000500,0x63000500,0x51000500,0x3e000500,0xffffff,0xffffff,
-    0xffffff,0x1000500,0x3000500,0x7000500,0xd000500,0x16000500,0x22000500,0x30000500,0x3e000500,0x4c000500,0x58000500,0x61000500,0x68000500,0x6b000500,
-    0x6d000500,0x6e000500,0x6f000500,0x6f000500,0x6f000500,0x6f000500,0x6f000500,0x6e000500,0x6d000500,0x6b000500,0x68000500,0x61000500,0x58000500,0x4c000500,
-    0x3e000500,0x30000500
+    0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0xff000000,0x63000200,0x4c000200,0xffffff,0xffffff,0xffffff,0x1000200,0x4000200,0x9000200,
+    0x11000200,0x1d000200,0x2c000200,0x3e000200,0x51000200,0x63000200,0x73000200,0x7f000200,0x87000200,0x8c000200,0x8e000200,0x90000200,0x90000200,0x90000200,
+    0x90000200,0x90000200,0x90000200,0x90000200,0x8e000200,0x8c000200,0x87000200,0x7f000200,0x73000200,0x63000200,0x51000200,0x3e000200,0xffffff,0xffffff,
+    0xffffff,0x1000200,0x3000200,0x7000200,0xd000200,0x16000200,0x22000200,0x30000200,0x3e000200,0x4c000200,0x58000200,0x61000200,0x68000200,0x6b000200,
+    0x6d000200,0x6e000200,0x6f000200,0x6f000200,0x6f000200,0x6f000200,0x6f000200,0x6e000200,0x6d000200,0x6b000200,0x68000200,0x61000200,0x58000200,0x4c000200,
+    0x3e000200,0x30000200
 };
@@ -994,3 +994,3 @@ static const QRgb fastforward_data[] = {
 
-static const QRgb fileopen_data[] = {
+static const QRgb folder_open_data[] = {
     0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3bc4cce8,0x49c1c9e7,0x0,0x0,0x0,0x0,0x0,
@@ -1245,34 +1245,17 @@ static const QRgb HelpButton_data[] = {
 
-static const QRgb help_icon_data[] = {
-    0x0,0x0,0x0,0x0,0x18fdb293,0x5ffdbba0,0x81fbc4ac,0x81fbba9e,0x60fa7a50,0x19ee662d,0x0,0x0,0x0,0x0,
-    0x0,0x0,0x8fdbfa4,0x88fea391,0xf3fdeae2,0xfffdfaf9,0xfffdfdfd,0xfffdfdfd,0xffffbebc,0xf4fe8473,0x8cf64a1b,0xabe3700,0x0,0x0,
-    0x0,0x8fdbfa4,0xbaff9687,0xffffb7b6,0xfffdefef,0xfffcfcfc,0xfffbfbfb,0xfffbf5f5,0xfffdcdcd,0xfffecccc,0xffffb2af,0xbfee502d,0xc982900,0x0,
-    0x0,0x88fe8f7c,0xffffabaa,0xfffebfbf,0xfff9b6b5,0xf6eec9ba,0xcbdaa28a,0xc8dd7d62,0xf5ef604c,0xfff7a9a8,0xfffdbfbf,0xfffea9a7,0x93d25735,0x1000000,
-    0x18fdb293,0xf3ff877f,0xfffeaaaa,0xfff79696,0xd6e0533a,0x3974381f,0x7000000,0x4000000,0x26aa3100,0xcae13a19,0xfff4bbba,0xfffbf2f2,0xf6ecc4b8,0x257e1d00,
-    0x5ffdba9e,0xfffddcdb,0xfffac5c5,0xf6ed7061,0x3974381f,0x0,0x0,0x0,0x0,0x1ec23501,0xf2e5b9aa,0xfff8f8f8,0xfff9f4f2,0x70a6482f,
-    0x81fbc3ab,0xfffbfbfb,0xfff6f6f6,0xcbd9a189,0x7000000,0x0,0x0,0x0,0x0,0x0,0xb9d7947e,0xfff5f5f5,0xfffafafa,0x96ae6a5a,
-    0x81fbba9e,0xfffafafa,0xfff4f4f4,0xc8dc9c82,0x4000000,0x0,0x0,0x0,0x0,0x0,0xb8d28470,0xfff3f0f0,0xfff9f9f9,0x98a66558,
-    0x60fa966c,0xfffaf5f3,0xfff4f3f3,0xf5e9917e,0x26aa3100,0x0,0x0,0x0,0x0,0x1ab62700,0xf2d02c21,0xffee6868,0xfff68988,0x79852e20,
-    0x19ee662d,0xf4fbaf9e,0xfff76d6d,0xffe83838,0xcadb2908,0x1ec23400,0x0,0x0,0x1ab62700,0xc4c11c08,0xffe03837,0xfff14040,0xf7db2622,0x32430900,
-    0x0,0x8cf6390b,0xfffc2926,0xfff12b2b,0xffe22525,0xf2da5748,0xb9d6937d,0xb8d2917d,0xf2d69c91,0xffdc2b2b,0xffea2b2b,0xfff32726,0xa5900d05,0x6000000,
-    0x0,0xbc23800,0xbfed2a06,0xfff91614,0xfff01616,0xffedaaaa,0xffececec,0xffececec,0xffefeeee,0xffef7979,0xfff11514,0xcda80d06,0x1c230400,0x0,
-    0x0,0x0,0xc932800,0x93d22301,0xf6eb1407,0xfff5e0df,0xfff6f6f6,0xfff6f6f6,0xfff3efee,0xf7d8a6a1,0xa5900c04,0x1c230400,0x0,0x0,
-    0x0,0x0,0x0,0x1000000,0x257e1d00,0x70a5482e,0x96ae6959,0x98a66658,0x7985392b,0x32430900,0x6000000,0x0,0x0,0x0
-};
-
-static const QRgb home_data[] = {
-    0x0,0x8097dff,0x20097dff,0x11097bfa,0x10135ca5,0x47115ba4,0x891b61a7,0x7a1860a7,0x290754a0,0xb0855a0,0x0,0x0,0x0,0x0,
-    0x0,0x40097dff,0xff097dff,0x9f0a76ed,0x982b6dae,0xea598cc0,0xfd92b3d6,0xfb81a8d1,0xe53876b4,0x791a61a8,0x150e59a3,0x0,0x0,0x0,
-    0x0,0x40097dff,0xf90a79f4,0xe82174cb,0xf27aa3ce,0xfed8e4f4,0xffe7effb,0xffe0eafa,0xfdbed4ed,0xe45d8fc6,0x842368ad,0x190e59a4,0x0,0x0,
-    0x0,0x360c6fd9,0xde2073cc,0xf174a0cd,0xfecadbf1,0xffdce8fa,0xffd5e3f9,0xffcedff7,0xffc6daf6,0xfda9c5eb,0xe6568bc6,0x84185ca7,0x15054a9b,0x0,
-    0xb05539f,0x77175fa7,0xe76192c6,0xfebfd4ef,0xffd0e0f8,0xffc9dbf6,0xffc2d6f5,0xffb9d0f4,0xffb1ccf3,0xffa9c6f2,0xfd8ab0e5,0xe92f69ba,0x940245a7,0xf0044a9,
-    0xc34878b0,0xe62d6eb1,0xfdacc7ea,0xffc3d7f5,0xffbbd2f4,0xffb4cdf3,0xffacc8f2,0xffa2c2f1,0xff9abcef,0xff90b6ed,0xff6696e1,0xff1a59c8,0xf2024ab7,0xc54777b3,
-    0x3b497db7,0xf85e90c8,0xffb4cdf3,0xffadc9f2,0xffa5c4f1,0xffd8ebfa,0xffe9f8fd,0xffe7f7fd,0xffc1dbf7,0xff3e7be1,0xff115bdc,0xff0251dc,0xff0f5bd3,0x3c316ec2,
-    0x1f4680c1,0xfa5d90cd,0xff99bcef,0xff80abed,0xff5089e8,0xffc5def9,0xfff2ffff,0xfff2ffff,0xffb6d6fb,0xff005aef,0xff015df2,0xff015ff4,0xff0e64e1,0x201365da,
-    0x1f3d7abf,0xfa4d86cb,0xff639aef,0xff1f70f1,0xff025ff3,0xffb6d7fc,0xfff2ffff,0xfff2ffff,0xffb7dafe,0xff066bfc,0xff096dfd,0xff0b6ffe,0xff126ce5,0x20146add,
-    0x1f3274bf,0xfa3278cd,0xff237af8,0xff096dfd,0xff0b6ffe,0xffb8dbff,0xfff2ffff,0xfff2ffff,0xffbcdeff,0xff197cff,0xff1d7fff,0xff2082ff,0xff1b75e4,0x201970dc,
-    0x1f2672cc,0xfb2374d9,0xff1a7dff,0xff1c7fff,0xff2082ff,0xffbee0ff,0xfff2ffff,0xfff2ffff,0xffc2e3ff,0xff3291ff,0xff3694ff,0xff3a97ff,0xff287fe4,0x202177db,
-    0x20287cdf,0xfd2a81e7,0xff3291ff,0xff3694ff,0xff3997ff,0xffc4e5ff,0xfff2ffff,0xfff2ffff,0xffc9e9ff,0xff4ea8ff,0xff52aaff,0xff56adff,0xff378be3,0x202c7fda,
-    0x1f267ad1,0xf92a7fd7,0xfa388fe7,0xfb3b91e8,0xfe3e93ea,0xff60a6eb,0xff6cadeb,0xff6daeeb,0xff64aaea,0xff499cea,0xff4b9eea,0xff4ea0ea,0xf93080ce,0x1f2675c4,
-    0x42477cb,0x1f297cd0,0x1f378cdf,0x1f3a8ee1,0x203c8fe3,0x203e91e4,0x203f92e4,0x204093e4,0x204294e3,0x204495e3,0x204697e3,0x204899e3,0x1f2c7bc6,0x42271bc
+static const QRgb installed_data[] = {
+    0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+    0x0,0x0,0x10000ff,0xd0303ff,0x370606ff,0x760808ff,0xa30808ff,0xa90505ff,0x820202ff,0x3e0101ff,0xf0000ff,0x10000ff,0x0,0x0,
+    0x0,0x10000ff,0x1a0505ff,0x6b0f0fff,0xb72121ff,0xd73030ff,0xe52e2eff,0xee1e1eff,0xf10f0fff,0xde0505ff,0x830101ff,0x1d0000ff,0x10000ff,0x0,
+    0x0,0xe0303ff,0x6c0f0fff,0xbe3434ff,0xdd6666ff,0xf07575ff,0xf96161ff,0xfb3e3eff,0xfb2323ff,0xfa0f0fff,0xee0404ff,0x820000ff,0xe0000ff,0x0,
+    0x0,0x390606ff,0xb82121ff,0xdc6868ff,0xf4a7a7ff,0xfdaeaeff,0xfe8383ff,0xff4f4fff,0xfe2e2eff,0xfe1717ff,0xfd0808ff,0xe30101ff,0x3a0000ff,0x0,
+    0x0,0x7b0707ff,0xd63131ff,0xf07878ff,0xfdb1b1ff,0xffb6b6ff,0xff8888ff,0xff5252ff,0xff3030ff,0xff1818ff,0xfe0909ff,0xfd0101ff,0x7f0000ff,0x0,
+    0x0,0xa90808ff,0xe53131ff,0xf96565ff,0xfe8686ff,0xff8a8aff,0xff6e6eff,0xff4646ff,0xff2929ff,0xff1515ff,0xff0808ff,0xfe0101ff,0xac0000ff,0x0,
+    0x0,0xb20505ff,0xed1f1fff,0xfb4040ff,0xff5252ff,0xff5454ff,0xff4747ff,0xff2f2fff,0xff1d1dff,0xff0e0eff,0xff0505ff,0xff0101ff,0xad0000ff,0x0,
+    0x0,0x8e0202ff,0xf10f0fff,0xfa2424ff,0xfe3030ff,0xff3131ff,0xff2a2aff,0xff1d1dff,0xff1111ff,0xff0808ff,0xff0202ff,0xfe0000ff,0x7f0000ff,0x0,
+    0x0,0x470101ff,0xe40505ff,0xf90f0fff,0xfd1717ff,0xff1919ff,0xff1616ff,0xff0f0fff,0xff0909ff,0xff0303ff,0xff0000ff,0xe50000ff,0x390000ff,0x0,
+    0x0,0x120000ff,0x900101ff,0xf20404ff,0xfd0808ff,0xfe0909ff,0xfe0808ff,0xff0606ff,0xff0202ff,0xff0000ff,0xf30000ff,0x830000ff,0xe0000ff,0x0,
+    0x0,0x20000ff,0x240000ff,0x910000ff,0xeb0101ff,0xfe0101ff,0xfe0101ff,0xff0101ff,0xff0000ff,0xe80000ff,0x870000ff,0x1d0000ff,0x10000ff,0x0,
+    0x0,0x0,0x20000ff,0x120000ff,0x490000ff,0x950000ff,0xc00000ff,0xbf0000ff,0x8e0000ff,0x410000ff,0xf0000ff,0x10000ff,0x0,0x0,
+    0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0
 };
@@ -1654,17 +1637,17 @@ static const QRgb MPEGPlayer_data[] = {
 
-static const QRgb mute_data[] = {
-    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x20202,0xd000000,0x7000000,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xff000000,0x3f000000,0x19000000,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xffffffff,0xff000000,0x79000000,0x2b000000,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xff000000,0xffffffff,0xffffffff,0xff000000,0xe3020202,0xcb020202,0x2f020202,0xbf020202,0xbf020202,0xbf020202,
-    0xff000000,0xff000000,0xff000000,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xff000000,0xffffffff,0xbb575757,0xbf020202,0xab5f5f5f,0xffffffff,0xbf020202,
-    0xff000000,0xffcde6ff,0xffcee6ff,0xffcee6ff,0xffcde5ff,0xffcee5ff,0xffcee5ff,0xff000000,0xda4b4b4b,0xffffffff,0xab5f5f5f,0xffffffff,0xab5f5f5f,0xbf020202,
-    0xff000000,0xff8ec5ff,0xff8ec5ff,0xff8ec5ff,0xff8ec5ff,0xff8ec4ff,0xff8ec4ff,0xff000000,0xe3020202,0xbb575757,0xffffffff,0xab5f5f5f,0xbf020202,0x2f020202,
-    0xff000000,0xff4ea3ff,0xff4ea4ff,0xff4ea3ff,0xff4fa4ff,0xff4ea4ff,0xff4ea4ff,0xff000000,0xda4b4b4b,0xffffffff,0xab5f5f5f,0xffffffff,0xab5f5f5f,0xbf020202,
-    0xff000000,0xff000000,0xff000000,0xff000000,0xff1d8aff,0xff1d8aff,0xff1d8aff,0xff000000,0xffffffff,0xbb575757,0xbf020202,0xab5f5f5f,0xffffffff,0xbf020202,
-    0x26000000,0x6b000000,0x8f000000,0x8f000000,0xff000000,0xff1d8aff,0xff1d8aff,0xff000000,0xe3020202,0xcb020202,0x2f020202,0xbf020202,0xbf020202,0xbf020202,
-    0x16000000,0x24000000,0x30000000,0x32000000,0x48000000,0xff000000,0xff1d8aff,0xff000000,0x8f000000,0x30000000,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xd000000,0x3c000000,0xff000000,0xff000000,0x8f000000,0x30000000,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xc000000,0x3c000000,0x78000000,0x79000000,0x2b000000,0xffffff,0xffffff,0xffffff,0xffffff,
-    0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0xc000000,0x34000000,0x3f000000,0x19000000,0xffffff,0xffffff,0xffffff,0xffffff
+static const QRgb newfolder_data[] = {
+    0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4fdbe1f9,0x49d3daf4,0x0,0x0,0x0,0x0,0x0,
+    0x0,0x0,0x0,0x0,0x0,0x4dae1f9,0x3fe1e5f9,0xe3eff0f9,0xcce5e8f3,0x268d9bc8,0x34bc,0x0,0x0,0x0,
+    0x0,0x0,0x240a0fe,0xb6bb7ff,0x48ac3fe,0x46eaedfb,0xd8f3f5fa,0xffeeeef4,0xfce8e9f3,0xa5abbbe1,0xa3460bf,0x92e63d5,0x4255dd4,0x0,
+    0xc6bbef8,0x368dc8f9,0x7fa1cdf8,0xc4afd5fe,0x95afcef4,0xdcf4f6fb,0xfff4f4f8,0xffededf3,0xffe7e7f0,0xf2c7d1eb,0x806891db,0xa44d80de,0x362158c8,0x1000000,
+    0x5395d1fc,0xe7cde5fc,0xfdd1e5fe,0xffc9ddf7,0xfeecf0f7,0xfff8f8fb,0xfff5f4f8,0xffc1d3ed,0xff9fbee9,0xff87a6d3,0xde5897e8,0xc30b4bca,0x45022c90,0x1000000,
+    0x2e81c8fe,0xdfd2e8fe,0xffcce2fd,0xffdde3ee,0xfffdfdfd,0xfff0f4f9,0xffc2d8f0,0xff9bc7f6,0xff78aae6,0xffbca173,0xf26d7ba0,0xc80331b2,0x37002478,0x0,
+    0x952b2ff,0xb6b5d6f7,0xffcae1fe,0xffbfd1eb,0xffcbe1f4,0xffbcdaf5,0xffa7cff7,0xff7cb8fa,0xff85a5c7,0xffefcc5f,0xf6a07f62,0xb70c30a7,0x23001d60,0x0,
+    0x0,0x6c9acafa,0xfec3dcfd,0xffa4cbf8,0xffc4e0f2,0xffbed7e3,0xffa1bdd4,0xff829abd,0xffbca36e,0xfffff753,0xfff0d05a,0xcd8e7471,0x44a45c25,0x21d65b00,
+    0x0,0x348dbff5,0xedb4d4fb,0xff9ecaf9,0xffb8d1dd,0xffdaba72,0xffeacf73,0xffead461,0xfff7e554,0xfffffd43,0xfffdf44d,0xf7efd251,0xdef2c74c,0xcae89932,
+    0x0,0x137db2f0,0xbca4caf7,0xff98c7f8,0xff9accfa,0xffa7b6bb,0xfff0c650,0xfffee82d,0xffffed2d,0xffffed2d,0xffffed2d,0xffffe82e,0xeff5c125,0x91e1800e,
+    0x0,0x54995f0,0x799ac2f3,0xfe94c3f5,0xffbeddfa,0xffdde4f0,0xffe7d7c8,0xfff1b227,0xfffed218,0xffffd519,0xffffd519,0xfbf7b616,0x80e27b09,0xbd55a01,
+    0x0,0x0,0x3d71a7ee,0xf1a2c9f2,0xfff2f6f9,0xfaccdaef,0xd287a4d3,0xf2e79a13,0xfffeb906,0xfffdb208,0xfffeba07,0xfdf7a506,0x65e06e02,0x0,
+    0x0,0x0,0x1267a1ef,0xce8dbbf1,0xd098bdeb,0x6f5480bf,0x517a5843,0xf3f68e00,0xe0f68d00,0xa2e97a01,0xc3ec8200,0xf4f48c00,0x97dd6500,0x1c54300,
+    0x0,0x0,0x4529af8,0x404b90e5,0x2d164682,0xc1d1209,0x4ee26e00,0xb0ec7400,0x45e66c00,0x7dd6200,0x1cd45600,0x7ddb5d00,0xa4cf4e00,0xdc34100
 };
@@ -2785,8 +2768,8 @@ static const QRgb volume_data[] = {
     0xff000000,0xff000000,0xff000000,0xff000000,0xffffffff,0xffffffff,0xffffffff,0xff000000,0x8f000000,0xff000000,0x24000000,0x3c000000,0xff000000,0x30000000,
-    0xff000000,0xffd5eaff,0xffd6eaff,0xffd6eaff,0xffd5e9ff,0xffd6e9ff,0xffd6e9ff,0xff000000,0x8f000000,0x48000000,0xff000000,0x3c000000,0xff000000,0x54000000,
-    0xff000000,0xff9dceff,0xff9dceff,0xff9dceff,0xff9dceff,0xff9dcdff,0xff9dcdff,0xff000000,0x8f000000,0x3c000000,0xff000000,0x54000000,0xff000000,0x60000000,
-    0xff000000,0xff60b0ff,0xff60b1ff,0xff60b0ff,0xff61b1ff,0xff60b1ff,0xff60b1ff,0xff000000,0x8f000000,0x30000000,0xff000000,0x60000000,0xff000000,0x60000000,
-    0xff000000,0xff000000,0xff000000,0xff000000,0xff2a9aff,0xff2a9aff,0xff2a9aff,0xff000000,0x8f000000,0xff000000,0x3c000000,0x54000000,0xff000000,0x60000000,
-    0x24000000,0x6b000000,0x8f000000,0x8f000000,0xff000000,0xff2a9aff,0xff2a9aff,0xff000000,0x8f000000,0x48000000,0x3c000000,0xff000000,0x48000000,0x54000000,
-    0xc000000,0x24000000,0x30000000,0x30000000,0x48000000,0xff000000,0xff2a9aff,0xff000000,0x8f000000,0x3c000000,0xff000000,0x3c000000,0x48000000,0x30000000,
+    0xff000000,0xffcde6ff,0xffcee6ff,0xffcee6ff,0xffcde5ff,0xffcee5ff,0xffcee5ff,0xff000000,0x8f000000,0x48000000,0xff000000,0x3c000000,0xff000000,0x54000000,
+    0xff000000,0xff8ec5ff,0xff8ec5ff,0xff8ec5ff,0xff8ec5ff,0xff8ec4ff,0xff8ec4ff,0xff000000,0x8f000000,0x3c000000,0xff000000,0x54000000,0xff000000,0x60000000,
+    0xff000000,0xff4ea3ff,0xff4ea4ff,0xff4ea3ff,0xff4fa4ff,0xff4ea4ff,0xff4ea4ff,0xff000000,0x8f000000,0x30000000,0xff000000,0x60000000,0xff000000,0x60000000,
+    0xff000000,0xff000000,0xff000000,0xff000000,0xff1d8aff,0xff1d8aff,0xff1d8aff,0xff000000,0x8f000000,0xff000000,0x3c000000,0x54000000,0xff000000,0x60000000,
+    0x24000000,0x6b000000,0x8f000000,0x8f000000,0xff000000,0xff1d8aff,0xff1d8aff,0xff000000,0x8f000000,0x48000000,0x3c000000,0xff000000,0x48000000,0x54000000,
+    0xc000000,0x24000000,0x30000000,0x30000000,0x48000000,0xff000000,0xff1d8aff,0xff000000,0x8f000000,0x3c000000,0xff000000,0x3c000000,0x48000000,0x30000000,
     0xffffff,0xffffff,0xffffff,0xffffff,0xc000000,0x3c000000,0xff000000,0xff000000,0x8f000000,0x30000000,0x18000000,0x3c000000,0x30000000,0xc000000,
@@ -2797,16 +2780,16 @@ static const QRgb volume_data[] = {
 static const QRgb wait_data[] = {
-    0x1000000,0x1d000000,0xffa77843,0xffa77843,0xffa77843,0xffa77843,0xffa77843,0xffa77843,0xffa77843,0xffa77843,0xffa77843,0x28000000,0xb000000,0x5000000,
-    0x3000000,0x15000000,0x33000000,0xff888888,0xff8e8e8e,0xff949494,0xff9b9b9b,0xffa1a1a1,0xffa6a6a6,0xffababab,0x4b000000,0x29000000,0x12000000,0x9000000,
-    0x4000000,0xc000000,0x19000000,0xff9a9a9a,0xffa1a1a1,0xffa6a6a6,0xffadadad,0xffb3b3b3,0xffb7b7b7,0xffbbbbbb,0x41000000,0x2b000000,0x19000000,0xc000000,
-    0x4000000,0xe000000,0x1d000000,0xff888888,0xff8b8b8b,0xff8e8e8e,0xff919191,0xff929292,0xff949494,0xff929292,0x4d000000,0x32000000,0x1d000000,0xe000000,
-    0x4000000,0xe000000,0x1e000000,0xcc515151,0xff7a7a7a,0xff7b7b7b,0xff7c7c7c,0xff7c7c7c,0xff7b7b7b,0xda4d4d4d,0x51000000,0x34000000,0x1e000000,0xe000000,
-    0x4000000,0xc000000,0x1b000000,0x31000000,0xd24e4e4e,0xff7a7a7a,0xff7a7a7a,0xff7a7a7a,0xde4b4b4b,0x6a000000,0x4f000000,0x31000000,0x1b000000,0xc000000,
-    0x2000000,0xa000000,0x17000000,0x2c000000,0x48000000,0xd74f4f4f,0xff838383,0xde4e4e4e,0x78000000,0x63000000,0x48000000,0x2c000000,0x17000000,0xa000000,
-    0x2000000,0x7000000,0x13000000,0x28000000,0x41000000,0xd5595959,0xffa1a1a1,0xdc5b5b5b,0x70000000,0x5b000000,0x41000000,0x28000000,0x13000000,0x7000000,
-    0x2000000,0x7000000,0x13000000,0x28000000,0xce636363,0xffadadad,0xffb6b6b6,0xffbdbdbd,0xdb6f6f6f,0x5b000000,0x41000000,0x28000000,0x13000000,0x7000000,
-    0x2000000,0xa000000,0x17000000,0xca646464,0xffababab,0xffaeaeae,0xffadadad,0xffc2c2c2,0xffc7c7c7,0xd87b7b7b,0x48000000,0x2c000000,0x17000000,0xa000000,
-    0x4000000,0xc000000,0x1b000000,0xffa3a3a3,0xffababab,0xffa4a4a4,0xff909090,0xffc2c2c2,0xffc8c8c8,0xffcecece,0x4f000000,0x31000000,0x1b000000,0xc000000,
-    0x4000000,0xe000000,0x1e000000,0xffa0a0a0,0xff999999,0xff848484,0xff7b7b7b,0xff888888,0xff8e8e8e,0xff8d8d8d,0x51000000,0x34000000,0x1e000000,0xe000000,
-    0x4000000,0x19000000,0x3d000000,0xff707070,0xff696969,0xff656565,0xff656565,0xff656565,0xff656565,0xff656565,0x66000000,0x3c000000,0x1d000000,0xe000000,
-    0x4000000,0x23000000,0xffa77843,0xffa77843,0xffa77843,0xffa77843,0xffa77843,0xffa77843,0xffa77843,0xffa77843,0xffa77843,0x3f000000,0x19000000,0xc000000
+    0x1000000,0x1d000000,0xff996633,0xff996633,0xff996633,0xff996633,0xff996633,0xff996633,0xff996633,0xff996633,0xff996633,0x28000000,0xb000000,0x5000000,
+    0x3000000,0x15000000,0x33000000,0xff777777,0xff7e7e7e,0xff848484,0xff8c8c8c,0xff929292,0xff989898,0xff9d9d9d,0x4b000000,0x29000000,0x12000000,0x9000000,
+    0x4000000,0xc000000,0x19000000,0xff8a8a8a,0xff929292,0xff989898,0xff9f9f9f,0xffa6a6a6,0xffababab,0xffafafaf,0x41000000,0x2b000000,0x19000000,0xc000000,
+    0x4000000,0xe000000,0x1d000000,0xff777777,0xff7a7a7a,0xff7e7e7e,0xff818181,0xff828282,0xff848484,0xff828282,0x4d000000,0x32000000,0x1d000000,0xe000000,
+    0x4000000,0xe000000,0x1e000000,0xcc404040,0xff696969,0xff6a6a6a,0xff6b6b6b,0xff6b6b6b,0xff6a6a6a,0xda3c3c3c,0x51000000,0x34000000,0x1e000000,0xe000000,
+    0x4000000,0xc000000,0x1b000000,0x31000000,0xd23d3d3d,0xff686868,0xff686868,0xff686868,0xde3a3a3a,0x6a000000,0x4f000000,0x31000000,0x1b000000,0xc000000,
+    0x2000000,0xa000000,0x17000000,0x2c000000,0x48000000,0xd73e3e3e,0xff727272,0xde3d3d3d,0x78000000,0x63000000,0x48000000,0x2c000000,0x17000000,0xa000000,
+    0x2000000,0x7000000,0x13000000,0x28000000,0x41000000,0xd5474747,0xff929292,0xdc494949,0x70000000,0x5b000000,0x41000000,0x28000000,0x13000000,0x7000000,
+    0x2000000,0x7000000,0x13000000,0x28000000,0xce515151,0xffa0a0a0,0xffa9a9a9,0xffb1b1b1,0xdb5d5d5d,0x5b000000,0x41000000,0x28000000,0x13000000,0x7000000,
+    0x2000000,0xa000000,0x17000000,0xca525252,0xff9d9d9d,0xffa1a1a1,0xffa0a0a0,0xffb7b7b7,0xffbdbdbd,0xd86a6a6a,0x48000000,0x2c000000,0x17000000,0xa000000,
+    0x4000000,0xc000000,0x1b000000,0xff949494,0xff9d9d9d,0xff969696,0xff808080,0xffb7b7b7,0xffbebebe,0xffc5c5c5,0x4f000000,0x31000000,0x1b000000,0xc000000,
+    0x4000000,0xe000000,0x1e000000,0xff919191,0xff898989,0xff737373,0xff6a6a6a,0xff777777,0xff7e7e7e,0xff7c7c7c,0x51000000,0x34000000,0x1e000000,0xe000000,
+    0x4000000,0x19000000,0x3d000000,0xff5e5e5e,0xff575757,0xff535353,0xff535353,0xff535353,0xff535353,0xff535353,0x66000000,0x3c000000,0x1d000000,0xe000000,
+    0x4000000,0x23000000,0xff996633,0xff996633,0xff996633,0xff996633,0xff996633,0xff996633,0xff996633,0xff996633,0xff996633,0x3f000000,0x19000000,0xc000000
 };
@@ -2907,31 +2890,7 @@ static struct EmbedImage {
     { 14, 14, 32, (const unsigned char*)_to1_data, 0, 0, TRUE, "1to1" },
-    { 14, 14, 32, (const unsigned char*)AppsIcon_data, 0, 0, TRUE, "AppsIcon" },
-    { 32, 32, 32, (const unsigned char*)Calibrate_data, 0, 0, TRUE, "Calibrate" },
-    { 32, 32, 32, (const unsigned char*)Clock_data, 0, 0, TRUE, "Clock" },
-    { 14, 14, 32, (const unsigned char*)CloseButton_data, 0, 0, TRUE, "CloseButton" },
-    { 14, 14, 32, (const unsigned char*)DocsIcon_data, 0, 0, TRUE, "DocsIcon" },
-    { 32, 32, 32, (const unsigned char*)DocumentTypeExcel_data, 0, 0, TRUE, "DocumentTypeExcel" },
-    { 32, 32, 32, (const unsigned char*)DocumentTypeNone_data, 0, 0, TRUE, "DocumentTypeNone" },
-    { 32, 32, 32, (const unsigned char*)DocumentTypePowerPoint_data, 0, 0, TRUE, "DocumentTypePowerPoint" },
-    { 32, 32, 32, (const unsigned char*)DocumentTypeWord_data, 0, 0, TRUE, "DocumentTypeWord" },
-    { 14, 14, 32, (const unsigned char*)Games_data, 0, 0, TRUE, "Games" },
-    { 12, 12, 32, (const unsigned char*)Go_black_data, 0, 0, TRUE, "Go-black" },
-    { 12, 12, 32, (const unsigned char*)Go_black_highlight_data, 0, 0, TRUE, "Go-black-highlight" },
-    { 12, 12, 32, (const unsigned char*)Go_white_data, 0, 0, TRUE, "Go-white" },
-    { 14, 14, 32, (const unsigned char*)HelpButton_data, 0, 0, TRUE, "HelpButton" },
-    { 32, 32, 32, (const unsigned char*)Language_data, 0, 0, TRUE, "Language" },
-    { 32, 32, 32, (const unsigned char*)MPEGPlayer_data, 0, 0, TRUE, "MPEGPlayer" },
-    { 28, 14, 32, (const unsigned char*)OKButton_data, 0, 0, TRUE, "OKButton" },
-    { 32, 32, 32, (const unsigned char*)Rotation_data, 0, 0, TRUE, "Rotation" },
-    { 14, 14, 32, (const unsigned char*)SettingsIcon_data, 0, 0, TRUE, "SettingsIcon" },
-    { 32, 32, 32, (const unsigned char*)Shutdown_data, 0, 0, TRUE, "Shutdown" },
-    { 32, 32, 32, (const unsigned char*)Sound_data, 0, 0, TRUE, "Sound" },
-    { 32, 32, 32, (const unsigned char*)SoundPlayer_data, 0, 0, TRUE, "SoundPlayer" },
-    { 32, 32, 32, (const unsigned char*)Spreadsheet_data, 0, 0, TRUE, "Spreadsheet" },
-    { 32, 32, 32, (const unsigned char*)Tux_data, 0, 0, TRUE, "Tux" },
-    { 14, 14, 32, (const unsigned char*)UtilsIcon_data, 0, 0, TRUE, "UtilsIcon" },
     { 14, 14, 32, (const unsigned char*)accessories_data, 0, 0, TRUE, "accessories" },
     { 14, 14, 32, (const unsigned char*)appearance_data, 0, 0, TRUE, "appearance" },
-    { 14, 14, 32, (const unsigned char*)back_data, 0, 0, TRUE, "back" },
+    { 14, 14, 32, (const unsigned char*)AppsIcon_data, 0, 0, TRUE, "AppsIcon" },
     { 14, 14, 32, (const unsigned char*)back_inactive_data, 0, 0, TRUE, "back_inactive" },
+    { 14, 14, 32, (const unsigned char*)back_data, 0, 0, TRUE, "back" },
     { 14, 14, 32, (const unsigned char*)beam_data, 0, 0, TRUE, "beam" },
@@ -2940,17 +2899,25 @@ static struct EmbedImage {
     { 14, 14, 32, (const unsigned char*)bold_data, 0, 0, TRUE, "bold" },
-    { 14, 14, 32, (const unsigned char*)c_src_data, 0, 0, TRUE, "c_src" },
     { 14, 14, 32, (const unsigned char*)calculator_data, 0, 0, TRUE, "calculator" },
+    { 32, 32, 32, (const unsigned char*)Calibrate_data, 0, 0, TRUE, "Calibrate" },
     { 14, 14, 32, (const unsigned char*)center_data, 0, 0, TRUE, "center" },
     { 14, 14, 32, (const unsigned char*)citytime_icon_data, 0, 0, TRUE, "citytime_icon" },
+    { 32, 32, 32, (const unsigned char*)Clock_data, 0, 0, TRUE, "Clock" },
+    { 14, 14, 32, (const unsigned char*)CloseButton_data, 0, 0, TRUE, "CloseButton" },
     { 14, 14, 32, (const unsigned char*)close_data, 0, 0, TRUE, "close" },
-    { 14, 14, 32, (const unsigned char*)copy_data, 0, 0, TRUE, "copy" },
     { 14, 14, 32, (const unsigned char*)copy_inactive_data, 0, 0, TRUE, "copy_inactive" },
-    { 14, 14, 32, (const unsigned char*)cut_data, 0, 0, TRUE, "cut" },
+    { 14, 14, 32, (const unsigned char*)copy_data, 0, 0, TRUE, "copy" },
+    { 14, 14, 32, (const unsigned char*)c_src_data, 0, 0, TRUE, "c_src" },
     { 14, 14, 32, (const unsigned char*)cut_inactive_data, 0, 0, TRUE, "cut_inactive" },
+    { 14, 14, 32, (const unsigned char*)cut_data, 0, 0, TRUE, "cut" },
     { 14, 14, 32, (const unsigned char*)datebook_icon_data, 0, 0, TRUE, "datebook_icon" },
     { 14, 14, 32, (const unsigned char*)day_data, 0, 0, TRUE, "day" },
+    { 14, 14, 32, (const unsigned char*)DocsIcon_data, 0, 0, TRUE, "DocsIcon" },
+    { 32, 32, 32, (const unsigned char*)DocumentTypeExcel_data, 0, 0, TRUE, "DocumentTypeExcel" },
+    { 32, 32, 32, (const unsigned char*)DocumentTypeNone_data, 0, 0, TRUE, "DocumentTypeNone" },
+    { 32, 32, 32, (const unsigned char*)DocumentTypePowerPoint_data, 0, 0, TRUE, "DocumentTypePowerPoint" },
+    { 32, 32, 32, (const unsigned char*)DocumentTypeWord_data, 0, 0, TRUE, "DocumentTypeWord" },
     { 14, 14, 32, (const unsigned char*)done_data, 0, 0, TRUE, "done" },
     { 14, 14, 32, (const unsigned char*)down_data, 0, 0, TRUE, "down" },
-    { 14, 14, 32, (const unsigned char*)edit_data, 0, 0, TRUE, "edit" },
     { 14, 14, 32, (const unsigned char*)editdelete_data, 0, 0, TRUE, "editdelete" },
+    { 14, 14, 32, (const unsigned char*)edit_data, 0, 0, TRUE, "edit" },
     { 14, 14, 32, (const unsigned char*)enter_data, 0, 0, TRUE, "enter" },
@@ -2962,7 +2929,7 @@ static struct EmbedImage {
     { 14, 14, 32, (const unsigned char*)finish_data, 0, 0, TRUE, "finish" },
-    { 14, 14, 32, (const unsigned char*)folder_data, 0, 0, TRUE, "folder" },
     { 14, 14, 32, (const unsigned char*)folder_open_data, 0, 0, TRUE, "folder_open" },
+    { 14, 14, 32, (const unsigned char*)folder_data, 0, 0, TRUE, "folder" },
     { 14, 14, 32, (const unsigned char*)font_data, 0, 0, TRUE, "font" },
-    { 14, 14, 32, (const unsigned char*)forward_data, 0, 0, TRUE, "forward" },
     { 14, 14, 32, (const unsigned char*)forward_inactive_data, 0, 0, TRUE, "forward_inactive" },
+    { 14, 14, 32, (const unsigned char*)forward_data, 0, 0, TRUE, "forward" },
     { 14, 14, 32, (const unsigned char*)fullscreen_data, 0, 0, TRUE, "fullscreen" },
@@ -2972,4 +2939,5 @@ static struct EmbedImage {
     { 14, 14, 32, (const unsigned char*)home_data, 0, 0, TRUE, "home" },
-    { 14, 14, 32, (const unsigned char*)install_data, 0, 0, TRUE, "install" },
+    { 14, 14, 32, (const unsigned char*)h_src_data, 0, 0, TRUE, "h_src" },
     { 14, 14, 32, (const unsigned char*)installed_data, 0, 0, TRUE, "installed" },
+    { 14, 14, 32, (const unsigned char*)install_data, 0, 0, TRUE, "install" },
     { 14, 14, 32, (const unsigned char*)italic_data, 0, 0, TRUE, "italic" },
@@ -2977,6 +2945,7 @@ static struct EmbedImage {
     { 14, 14, 32, (const unsigned char*)language_data, 0, 0, TRUE, "language" },
+    { 32, 32, 32, (const unsigned char*)Language_data, 0, 0, TRUE, "Language" },
     { 14, 14, 32, (const unsigned char*)left_data, 0, 0, TRUE, "left" },
     { 14, 14, 32, (const unsigned char*)library_data, 0, 0, TRUE, "library" },
-    { 14, 14, 32, (const unsigned char*)locked_data, 0, 0, TRUE, "locked" },
     { 14, 14, 32, (const unsigned char*)lockedfolder_data, 0, 0, TRUE, "lockedfolder" },
+    { 14, 14, 32, (const unsigned char*)locked_data, 0, 0, TRUE, "locked" },
     { 14, 14, 32, (const unsigned char*)logout_data, 0, 0, TRUE, "logout" },
@@ -2984,13 +2953,15 @@ static struct EmbedImage {
     { 14, 14, 32, (const unsigned char*)month_data, 0, 0, TRUE, "month" },
+    { 32, 32, 32, (const unsigned char*)MPEGPlayer_data, 0, 0, TRUE, "MPEGPlayer" },
     { 14, 14, 32, (const unsigned char*)mute_data, 0, 0, TRUE, "mute" },
-    { 14, 14, 32, (const unsigned char*)new_data, 0, 0, TRUE, "new" },
     { 14, 14, 32, (const unsigned char*)newfolder_data, 0, 0, TRUE, "newfolder" },
+    { 14, 14, 32, (const unsigned char*)new_data, 0, 0, TRUE, "new" },
     { 14, 14, 32, (const unsigned char*)next_data, 0, 0, TRUE, "next" },
+    { 28, 14, 32, (const unsigned char*)OKButton_data, 0, 0, TRUE, "OKButton" },
     { 13, 11, 8, (const unsigned char*)oneoverx_data, 2, oneoverx_ctable, TRUE, "oneoverx" },
     { 16, 14, 8, (const unsigned char*)pass_data, 3, pass_ctable, TRUE, "pass" },
-    { 14, 14, 32, (const unsigned char*)paste_data, 0, 0, TRUE, "paste" },
     { 14, 14, 32, (const unsigned char*)paste_inactive_data, 0, 0, TRUE, "paste_inactive" },
+    { 14, 14, 32, (const unsigned char*)paste_data, 0, 0, TRUE, "paste" },
     { 14, 14, 32, (const unsigned char*)pixmap_data, 0, 0, TRUE, "pixmap" },
-    { 14, 14, 32, (const unsigned char*)play_data, 0, 0, TRUE, "play" },
     { 14, 14, 32, (const unsigned char*)play2_data, 0, 0, TRUE, "play2" },
+    { 14, 14, 32, (const unsigned char*)play_data, 0, 0, TRUE, "play" },
     { 14, 14, 32, (const unsigned char*)programs_data, 0, 0, TRUE, "programs" },
@@ -3002,3 +2973,9 @@ static struct EmbedImage {
     { 14, 14, 32, (const unsigned char*)rotate_data, 0, 0, TRUE, "rotate" },
+    { 32, 32, 32, (const unsigned char*)Rotation_data, 0, 0, TRUE, "Rotation" },
     { 14, 14, 32, (const unsigned char*)save_data, 0, 0, TRUE, "save" },
+    { 14, 14, 32, (const unsigned char*)SettingsIcon_data, 0, 0, TRUE, "SettingsIcon" },
+    { 32, 32, 32, (const unsigned char*)Shutdown_data, 0, 0, TRUE, "Shutdown" },
+    { 32, 32, 32, (const unsigned char*)SoundPlayer_data, 0, 0, TRUE, "SoundPlayer" },
+    { 32, 32, 32, (const unsigned char*)Sound_data, 0, 0, TRUE, "Sound" },
+    { 32, 32, 32, (const unsigned char*)Spreadsheet_data, 0, 0, TRUE, "Spreadsheet" },
     { 14, 14, 32, (const unsigned char*)start_data, 0, 0, TRUE, "start" },
@@ -3012,2 +2989,3 @@ static struct EmbedImage {
     { 14, 14, 32, (const unsigned char*)trash_data, 0, 0, TRUE, "trash" },
+    { 32, 32, 32, (const unsigned char*)Tux_data, 0, 0, TRUE, "Tux" },
     { 14, 14, 32, (const unsigned char*)txt_data, 0, 0, TRUE, "txt" },
@@ -3015,5 +2993,6 @@ static struct EmbedImage {
     { 14, 14, 32, (const unsigned char*)undo_data, 0, 0, TRUE, "undo" },
-    { 14, 14, 32, (const unsigned char*)uninstall_data, 0, 0, TRUE, "uninstall" },
     { 14, 14, 32, (const unsigned char*)uninstalled_data, 0, 0, TRUE, "uninstalled" },
+    { 14, 14, 32, (const unsigned char*)uninstall_data, 0, 0, TRUE, "uninstall" },
     { 14, 14, 32, (const unsigned char*)up_data, 0, 0, TRUE, "up" },
+    { 14, 14, 32, (const unsigned char*)UtilsIcon_data, 0, 0, TRUE, "UtilsIcon" },
     { 14, 14, 32, (const unsigned char*)volume_data, 0, 0, TRUE, "volume" },
@@ -3025,33 +3004,29 @@ static struct EmbedImage {
     { 14, 14, 32, (const unsigned char*)zoom_data, 0, 0, TRUE, "zoom" },
+    { 0, 0, 0, 0, 0, 0, 0, 0 }
 };
 
-static int cmpEmbedImage(const void *a, const void *b)
+static const QImage& qembed_findImage( const QString& name )
 {
-    const EmbedImage* ea = (const EmbedImage*)a;
-    const EmbedImage* eb = (const EmbedImage*)b;
-    return strcmp(ea->name,eb->name);
-}
-inline const QImage& qembed_findImage(const char* name)
-{
-    EmbedImage key; key.name = name;
-    EmbedImage* r = (EmbedImage*)bsearch( &key, embed_image_vec,
-        sizeof(embed_image_vec)/sizeof(EmbedImage), sizeof(EmbedImage), cmpEmbedImage );
-    QImage* img;
-    if ( r ) {
-        img = new QImage((uchar*)r->data,
-                            r->width,
-                            r->height,
-                            r->depth,
-#ifdef _WS_QWS_
-                            (r->width*r->depth+31)/32*4,
-#endif
-                            (QRgb*)r->colorTable,
-                            r->numColors,
-                            QImage::BigEndian
-                    );
-        if ( r->alpha )
-            img->setAlphaBuffer(TRUE);
-    } else {
-        static QImage dummy;
-        img = &dummy;
+    static QDict<QImage> dict;
+    QImage* img = dict.find( name );
+    if ( !img ) {
+	for ( int i = 0; embed_image_vec[i].data; i++ ) {
+	    if ( strcmp(embed_image_vec[i].name, name.latin1()) == 0 ) {
+		img = new QImage((uchar*)embed_image_vec[i].data,
+			    embed_image_vec[i].width,
+			    embed_image_vec[i].height,
+			    embed_image_vec[i].depth,
+			    (QRgb*)embed_image_vec[i].colorTable,
+			    embed_image_vec[i].numColors,
+			    QImage::BigEndian );
+		if ( embed_image_vec[i].alpha )
+		    img->setAlphaBuffer( TRUE );
+		dict.insert( name, img );
+		break;
+	    }
+	}
+	if ( !img ) {
+	    static QImage dummy;
+	    return dummy;
+	}
     }