Fluid support for high res graphics

Changing all pixmaps to Hi DPI
Fixed wrong tooltip
Fixed misleading "invisible" indicator

56 files changed, 2049 insertions, 1045 deletions

diff --git a/fluid/pixmaps/flAdjuster.xpm b/fluid/pixmaps/flAdjuster.xpm
index 1a16b9055..a1662bd59 100644
--- a/fluid/pixmaps/flAdjuster.xpm
+++ b/fluid/pixmaps/flAdjuster.xpm
@@ -1,29 +1,46 @@
 /* XPM */
 static const char * const flAdjuster_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 6 1",
+"32 32 7 1",
 /* colors */
 "a c #606060",
-"b c #2020ff",
+". c #ffff00",
 "c c none",
-"d c #c0c0c0",
+"d c #bbbbbb",
 "e c #8080ff",
-"f c #e0e0e0",
+"f c #dddddd",
+"x c #000000",
 /* pixels */
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"fffffffffffffffc",
-"fdddafdddafdddac",
-"fdddafdddafdddac",
-"fdddafdddafdddac",
-"fdddafdddafdddac",
-"fdddafdddafdddac",
-"fdddafdddafdddac",
-"aaaaaaaaaaaaaaac",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxc",
+"xffffffffffffffffffffffffffffffx",
+"xfdddddddaxxfddddddaxxfdddddddax",
+"xfdddddddaxxfddddddaxxfdddddddax",
+"xfdddddddaxxfddddddaxxfdddddddax",
+"xfdddddddaxxfddddddaxxfdddddddax",
+"xfdddddddaxxfddddddaxxfdddddddax",
+"xfdddddddaxxfddddddaxxfdddddddax",
+"xfdddddddaxxfddddddaxxfdddddddax",
+"xfdddddddaxxfddddddaxxfdddddddax",
+"xfdddddddaxxfddddddaxxfdddddddax",
+"xfdddddddaxxfddddddaxxfdddddddax",
+"xfdddddddaxxfddddddaxxfdddddddax",
+"xfdddddddaxxfddddddaxxfdddddddax",
+"xfaaaaaaaaaaaaaaaaaaaaaaaaaaaaax",
+"cxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/flBox.xpm b/fluid/pixmaps/flBox.xpm
index b3483f513..b6d9f98de 100644
--- a/fluid/pixmaps/flBox.xpm
+++ b/fluid/pixmaps/flBox.xpm
@@ -1,29 +1,45 @@
 /* XPM */
 static const char * const flBox_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 6 1",
+"32 32 6 1",
 /* colors */
 "a c #606060",
 "b c #2020ff",
 "c c none",
-"d c #c0c0c0",
-"e c #909090",
+"d c #cccccc",
+"e c #8080ff",
 "f c #000000",
 /* pixels */
-"cccccccccccccccc",
-"cccccccccccccccc",
-"dddddddddddddddc",
-"dddddddddddddddc",
-"deeeeeeeeeeeeedc",
-"deeeeeeeeeeeeedc",
-"deeeeeeeeeeeeedc",
-"deeeeeeeeeeeeedc",
-"deeeeeeeeeeeeedc",
-"deeeeeeeeeeeeedc",
-"deeeeeeeeeeeeedc",
-"deeeeeeeeeeeeedc",
-"dddddddddddddddc",
-"dddddddddddddddc",
-"cccccccccccccccc",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"ffffffffffffffffffffffffffffffcc",
+"ffffffffffffffffffffffffffffffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffffffffffffffffffffffffffffffcc",
+"ffffffffffffffffffffffffffffffcc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/flBrowser.xpm b/fluid/pixmaps/flBrowser.xpm
index 7ed8f5301..1c275f3cd 100644
--- a/fluid/pixmaps/flBrowser.xpm
+++ b/fluid/pixmaps/flBrowser.xpm
@@ -1,29 +1,45 @@
 /* XPM */
 static const char * const flBrowser_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 6 1",
+"32 32 6 1",
 /* colors */
 "a c #606060",
-"b c #808080",
+"b c #888888",
 "c c none",
-"d c #c0c0c0",
-"e c #ffffff",
+"d c #ffffff",
+"e c #bbbbbb",
 "f c #000000",
 /* pixels */
-"cccccccccccccccc",
-"dddddddddddddddc",
-"dfffffffffffffdc",
-"dfeeeeeeeeebbfdc",
-"dfeeeeeeeeebdfdc",
-"dfeeeeeeeeebdfdc",
-"dfeeeeeeeeebffdc",
-"dfeeeeeeeeebdfdc",
-"dfeeeeeeeeebdfdc",
-"dfeeeeeeeeebdfdc",
-"dfeeeeeeeeebdfdc",
-"dfbbbbbbbbbbbfdc",
-"dfbdddfddddbdfdc",
-"dfffffffffffffdc",
-"dddddddddddddddc",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"ffffffffffffffffffffffffffffffcc",
+"ffffffffffffffffffffffffffffffcc",
+"ffddddddddddddddddddddddaaeeffcc",
+"ffddddddddddddddddddddddaaeeffcc",
+"ffddddddddddddddddddddddaaeeffcc",
+"ffddddddddddddddddddddddaaeeffcc",
+"ffddddddddddddddddddddddaabbffcc",
+"ffddddddddddddddddddddddaabbffcc",
+"ffddddddddddddddddddddddaabbffcc",
+"ffddddddddddddddddddddddaabbffcc",
+"ffddddddddddddddddddddddaabbffcc",
+"ffddddddddddddddddddddddaabbffcc",
+"ffddddddddddddddddddddddaabbffcc",
+"ffddddddddddddddddddddddaabbffcc",
+"ffddddddddddddddddddddddaabbffcc",
+"ffddddddddddddddddddddddaabbffcc",
+"ffddddddddddddddddddddddaaeeffcc",
+"ffddddddddddddddddddddddaaeeffcc",
+"ffddddddddddddddddddddddaaeeffcc",
+"ffddddddddddddddddddddddaaeeffcc",
+"ffddddddddddddddddddddddaaeeffcc",
+"ffddddddddddddddddddddddaaeeffcc",
+"ffaaaaaaaaaaaaaaaaaaaaaaaaaaffcc",
+"ffaaaaaaaaaaaaaaaaaaaaaaaaaaffcc",
+"ffeebbbbbbbbbbeeeeeeeeeeaaeeffcc",
+"ffeebbbbbbbbbbeeeeeeeeeeaaeeffcc",
+"ffffffffffffffffffffffffffffffcc",
+"ffffffffffffffffffffffffffffffcc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/flButton.xpm b/fluid/pixmaps/flButton.xpm
index 9a2292dec..c3bebb29f 100644
--- a/fluid/pixmaps/flButton.xpm
+++ b/fluid/pixmaps/flButton.xpm
@@ -1,29 +1,46 @@
 /* XPM */
 static const char * const flButton_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 6 1",
+"32 32 7 1",
 /* colors */
-"a c #606060",
+"a c #808080",
 "b c #2020ff",
 "c c none",
 "d c #a0a0a0",
 "e c #8080ff",
 "f c #d0d0d0",
+"g c #000000",
 /* pixels */
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"ffffffffffffffac",
-"fdddddddddddddac",
-"fdddddddddddddac",
-"fdddddddddddddac",
-"fdddddddddddddac",
-"fdddddddddddddac",
-"fdddddddddddddac",
-"aaaaaaaaaaaaaaac",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccggggggggggggggggggggggggggccc",
+"ccgffffffffffffffffffffffffffgcc",
+"cgffddddddddddddddddddddddddfagc",
+"cgfddddddddddddddddddddddddddagc",
+"cgfddddddddddddddddddddddddddagc",
+"cgfddddddddddddddddddddddddddagc",
+"cgfddddddddddddddddddddddddddagc",
+"cgfddddddddddddddddddddddddddagc",
+"cgfddddddddddddddddddddddddddagc",
+"cgfddddddddddddddddddddddddddagc",
+"cgfddddddddddddddddddddddddddagc",
+"cgfddddddddddddddddddddddddddagc",
+"cgfddddddddddddddddddddddddddagc",
+"cgffddddddddddddddddddddddddaagc",
+"ccgaaaaaaaaaaaaaaaaaaaaaaaaaagcc",
+"cccggggggggggggggggggggggggggccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/flCheckBrowser.xpm b/fluid/pixmaps/flCheckBrowser.xpm
index 3d494a63a..b1baa16a4 100644
--- a/fluid/pixmaps/flCheckBrowser.xpm
+++ b/fluid/pixmaps/flCheckBrowser.xpm
@@ -1,29 +1,44 @@
 /* XPM */
 static const char * const flCheckBrowser_xpm[] = {
-/* width height ncolors chars_per_pixel */
-"16 16 6 1",
+"32 32 6 1",
 /* colors */
 "a c #606060",
-"b c #808080",
+"b c #888888",
 "c c none",
-"d c #c0c0c0",
-"e c #ffffff",
+"d c #ffffff",
+"e c #bbbbbb",
 "f c #000000",
 /* pixels */
-"cccccccccccccccc",
-"dddddddddddddddc",
-"dfffffffffffffdc",
-"dfeeeeeeeeebbfdc",
-"dfefffeeeeebdfdc",
-"dfefefeeeeebdfdc",
-"dfefffeeeeebffdc",
-"dfeeeeeeeeebdfdc",
-"dfefffeeeeebdfdc",
-"dfefefeeeeebdfdc",
-"dfefffeeeeebdfdc",
-"dfbbbbbbbbbbbfdc",
-"dfbdddfddddbdfdc",
-"dfffffffffffffdc",
-"dddddddddddddddc",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"ffffffffffffffffffffffffffffffcc",
+"ffffffffffffffffffffffffffffffcc",
+"ffddddddddddddddddddddddaaeeffcc",
+"ffddddddddddddddddddddddaaeeffcc",
+"ffddffffffddddddddddddddaabbffcc",
+"ffddffffffddddddddddddddaabbffcc",
+"ffddffddffddddddddddddddaabbffcc",
+"ffddffddffddddddddddddddaabbffcc",
+"ffddffffffddddddddddddddaabbffcc",
+"ffddffffffddddddddddddddaabbffcc",
+"ffddddddddddddddddddddddaabbffcc",
+"ffddddddddddddddddddddddaabbffcc",
+"ffddffffffddddddddddddddaabbffcc",
+"ffddffffffddddddddddddddaabbffcc",
+"ffddffddffddddddddddddddaabbffcc",
+"ffddffddffddddddddddddddaabbffcc",
+"ffddffffffddddddddddddddaabbffcc",
+"ffddffffffddddddddddddddaabbffcc",
+"ffddddddddddddddddddddddaabbffcc",
+"ffddddddddddddddddddddddaabbffcc",
+"ffddddddddddddddddddddddaabbffcc",
+"ffddddddddddddddddddddddaabbffcc",
+"ffaaaaaaaaaaaaaaaaaaaaaaaaaaffcc",
+"ffaaaaaaaaaaaaaaaaaaaaaaaaaaffcc",
+"ffeebbbbbbbbbbeeeeeeeeeeaaeeffcc",
+"ffeebbbbbbbbbbeeeeeeeeeeaaeeffcc",
+"ffffffffffffffffffffffffffffffcc",
+"ffffffffffffffffffffffffffffffcc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/flCheckButton.xpm b/fluid/pixmaps/flCheckButton.xpm
index b61954ddc..3c21c3c8c 100644
--- a/fluid/pixmaps/flCheckButton.xpm
+++ b/fluid/pixmaps/flCheckButton.xpm
@@ -1,30 +1,47 @@
 /* XPM */
 static const char * const flCheckButton_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 7 1",
+"32 32 8 1",
 /* colors */
-"a c #606060",
+"m c #111111",
+"a c #777777",
 "b c #2020ff",
 "c c none",
 "d c #ffffff",
-"e c #8080ff",
-"f c #d0d0d0",
+"f c #aaaaaa",
+"g c #222222",
 "' c #000000",
 /* pixels */
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccaaaaaaaaaaccc",
-"cccaddddddddfccc",
-"cccadddddd''fccc",
-"cccaddddd''dfccc",
-"cccaddddd''dfccc",
-"ccca''dd''ddfccc",
-"cccad''''dddfccc",
-"cccadd''ddddfccc",
-"cccaddddddddfccc",
-"cccaaaaaaaaaaccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"ccccccccmmmmmmmmmmmmmmmmccccccc",
+"cccccccmaaaaaaaaaaaaaaaagccccccc",
+"ccccccmaadddddddddddddddfgcccccc",
+"ccccccmaddddddddddddddddfgcccccc",
+"ccccccmadddddddddddd'''dfgcccccc",
+"ccccccmadddddddddddd'''dfgcccccc",
+"ccccccmaddddddddddd'''ddfgcccccc",
+"ccccccmaddddddddddd'''ddfgcccccc",
+"ccccccmadddddddddd'''dddfgcccccc",
+"ccccccmadddddddddd'''dddfgcccccc",
+"ccccccmad'''ddddd'''ddddfgcccccc",
+"ccccccmadd'''dddd'''ddddfgcccccc",
+"ccccccmaddd'''dd'''dddddfgcccccc",
+"ccccccmadddd'''d'''dddddfgcccccc",
+"ccccccmaddddd'''''ddddddfgcccccc",
+"ccccccmadddddd''''ddddddfgcccccc",
+"ccccccmaddddddd''dddddddfgcccccc",
+"ccccccmadddddddddddddddffgcccccc",
+"cccccccmafffffffffffffffgccccccc",
+"ccccccccmgggggggggggggggcccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/flChoice.xpm b/fluid/pixmaps/flChoice.xpm
index 78750cd7d..70ebd7d62 100644
--- a/fluid/pixmaps/flChoice.xpm
+++ b/fluid/pixmaps/flChoice.xpm
@@ -1,29 +1,46 @@
 /* XPM */
 static const char * const flChoice_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 6 1",
+"32 32 7 1",
 /* colors */
-"a c #606060",
-". c #000000",
+"a c #808080",
+"b c #2020ff",
 "c c none",
-"d c #b0b0b0",
-"e c #ffffff",
+"d c #a0a0a0",
+"e c #8080ff",
 "f c #d0d0d0",
+"g c #000000",
 /* pixels */
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"ffffffffffffffff",
-"feeeeeafddddddda",
-"feeeeeafddddddda",
-"feeeeeaf.......a",
-"feeeeeafd.....da",
-"feeeeeafdd...dda",
-"feeeeeafddd.ddda",
-"feeeeeafddddddda",
-"feeeeeafddddddda",
-"aaaaaaaaaaaaaaaa",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccggggggggggggggggggggggggggccc",
+"ccgffffffffffffgfffffffffffffgcc",
+"cgffdddddddddddgddddddgdddddfagc",
+"cgfddddddddddddgdddddgggdddddagc",
+"cgfddddddddddddgddddgggggddddagc",
+"cgfddddddddddddgdddgggggggdddagc",
+"cgfddddddddddddgddgggggggggddagc",
+"cgfddddddddddddgdddddddddddddagc",
+"cgfddddddddddddgdddddddddddddagc",
+"cgfddddddddddddgddgggggggggddagc",
+"cgfddddddddddddgdddgggggggdddagc",
+"cgfddddddddddddgddddgggggddddagc",
+"cgfddddddddddddgdddddgggdddddagc",
+"cgffdddddddddddgddddddgdddddaagc",
+"ccgaaaaaaaaaaaagaaaaaaaaaaaaagcc",
+"cccggggggggggggggggggggggggggccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/flClass.xpm b/fluid/pixmaps/flClass.xpm
index 757886f59..62fb62d74 100644
--- a/fluid/pixmaps/flClass.xpm
+++ b/fluid/pixmaps/flClass.xpm
@@ -1,27 +1,43 @@
 /* XPM */
 static const char * const flClass_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 4 1",
+"32 32 4 1",
 /* colors */
 ". c none",
 "a c #000000",
 "b c #c0e0c0",
 "c c #000000",
 /* pixels */
-"................",
-"................",
-"...aaaaaaaaaaaaa",
-"..abbbbbbbbbbbc.",
-".abbbbbbbbbbbc..",
-".abbbbbbbbbbbc..",
-"abbbbbbbbbbbc...",
-"abbbbbbbbbbbc...",
-"abbbbbbbbbbbc...",
-"abbbbbbbbbbbc...",
-".abbbbbbbbbbbc..",
-".abbbbbbbbbbbc..",
-"..cbbbbbbbbbbbc.",
-"...ccccccccccccc",
-"................",
-"................",
+"................................",
+"................................",
+"................................",
+"................................",
+".....aaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+"....aaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+"...aaabbbbbbbbbbbbbbbbbbbbbbaaa..",
+"..aaabbbbbbbbbbbbbbbbbbbbbbaaa...",
+"..aabbbbbbbbbbbbbbbbbbbbbbbaa....",
+".aaabbbbbbbbbbbbbbbbbbbbbbaaa....",
+".aabbbbbbbbbbbbbbbbbbbbbbbaa.....",
+".aabbbbbbbbbbbbbbbbbbbbbbbaa.....",
+"aaabbbbbbbbbbbbbbbbbbbbbbaaa.....",
+"aabbbbbbbbbbbbbbbbbbbbbbbaa......",
+"aabbbbbbbbbbbbbbbbbbbbbbbaa......",
+"aabbbbbbbbbbbbbbbbbbbbbbbaa......",
+"aabbbbbbbbbbbbbbbbbbbbbbbaa......",
+"aabbbbbbbbbbbbbbbbbbbbbbbaa......",
+"aabbbbbbbbbbbbbbbbbbbbbbbaa......",
+"aaabbbbbbbbbbbbbbbbbbbbbbaaa.....",
+".aabbbbbbbbbbbbbbbbbbbbbbbaa.....",
+".aabbbbbbbbbbbbbbbbbbbbbbbaa.....",
+".aaabbbbbbbbbbbbbbbbbbbbbbaaa....",
+"..aabbbbbbbbbbbbbbbbbbbbbbbaa....",
+"..aaabbbbbbbbbbbbbbbbbbbbbbaaa...",
+"...aaabbbbbbbbbbbbbbbbbbbbbbaaa..",
+"....ccccccccccccccccccccccccccccc",
+".....cccccccccccccccccccccccccccc",
+"................................",
+"................................",
+"................................",
+"................................",
 };
diff --git a/fluid/pixmaps/flClock.xpm b/fluid/pixmaps/flClock.xpm
index 839ca8901..8293a009c 100644
--- a/fluid/pixmaps/flClock.xpm
+++ b/fluid/pixmaps/flClock.xpm
@@ -1,28 +1,46 @@
 /* XPM */
 static const char * const flClock_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 5 1",
+"32 32 5 1",
 /* colors */
 ". c none",
 "a c #000000",
-"b c #c0c0c0",
+"b c #bbbbbb",
 "c c #000000",
 "' c #202080",
 /* pixels */
-"................",
-"................",
-"....aaaaaaa.....",
-"..aabbbbbbbcc...",
-".abbbbbbbbb'bc..",
-".abb'bbbbb'bbc..",
-"abbbb'bbb'bbbbc.",
-"abbbbb'b'bbbbbc.",
-"abbbbbb'bbbbbbc.",
-"abbbbbbbbbbbbbc.",
-"abbbbbbbbbbbbbc.",
-".abbbbbbbbbbbc..",
-".abbbbbbbbbbbc..",
-"..ccbbbbbbbcc...",
-"....ccccccc.....",
-"................",
+"................................",
+"................................",
+"................................",
+"............aaaaaaaa............",
+".........aaaaaaaaaaaaaa.........",
+".......aaaaaabbbbbbcccccc.......",
+"......aaabbbbbbbbbbbbbbccc......",
+".....aaabbbbbbbbbbbbbbbbccc.....",
+"....aaabbbbbbbbbbbbbbbbabccc....",
+"....aabbbbbbbbbbbbbbbbaaabcc....",
+"...aaabbbbbbbbbbbbbbbaaabbccc...",
+"...aabbbbbbbbbbbbbbbaaabbbbcc...",
+"...aabbbbbbbabbbbbbaaabbbbbcc...",
+"..aaabbbbbbaaabbbbaaabbbbbbccc..",
+"..aabbbbbbbbaaabbaaabbbbbbbbcc..",
+"..aabbbbbbbbbaaaaaabbbbbbbbbcc..",
+"..aabbbbbbbbbbaaaabbbbbbbbbbcc..",
+"..aabbbbbbbbbbaaaabbbbbbbbbbcc..",
+"..aabbbbbbbbbbbaabbbbbbbbbbbcc..",
+"..aabbbbbbbbbbbbbbbbbbbbbbbbcc..",
+"..aaabbbbbbbbbbbbbbbbbbbbbbccc..",
+"...aabbbbbbbbbbbbbbbbbbbbbbcc...",
+"...aabbbbbbbbbbbbbbbbbbbbbbcc...",
+"...aaabbbbbbbbbbbbbbbbbbbbccc...",
+"....aabbbbbbbbbbbbbbbbbbbbcc....",
+"....aaabbbbbbbbbbbbbbbbbbccc....",
+".....aaabbbbbbbbbbbbbbbbccc.....",
+"......cccbbbbbbbbbbbbbcccc......",
+".......cccccbbbbbbbbccccc.......",
+".........cccccccccccccc.........",
+"............cccccccc............",
+"................................",
+"................................",
+"................................",
 };
diff --git a/fluid/pixmaps/flCode.xpm b/fluid/pixmaps/flCode.xpm
index 8e26067f0..39eaf3227 100644
--- a/fluid/pixmaps/flCode.xpm
+++ b/fluid/pixmaps/flCode.xpm
@@ -1,27 +1,43 @@
 /* XPM */
 static const char * const flCode_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 4 1",
+"32 32 4 1",
 /* colors */
 ". c none",
 "a c #000000",
 "b c #c0e0c0",
 "c c #000000",
 /* pixels */
-"................",
-"................",
-"aaaaaaaaaaaaaaaa",
-"abbbbbbbbbbbbbbc",
-"abbbbbbbbbbbbbbc",
-"abbbbbbbbbbbbbbc",
-"abbbbbbbbbbbbbbc",
-"abbbbbbbbbbbbbbc",
-"abbbbbbbbbbbbbbc",
-"abbbbbbbbbbbbbbc",
-"abbbbbbbbbbbbbbc",
-"abbbbbbbbbbbbbbc",
-"abbbbbbbbbbbbbbc",
-"accccccccccccccc",
-"................",
-"................",
+"................................",
+"................................",
+"................................",
+"................................",
+"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+"aabbbbbbbbbbbbbbbbbbbbbbbbbbbbcc",
+"aabbbbbbbbbbbbbbbbbbbbbbbbbbbbcc",
+"aabbbbbbbbbbbbbbbbbbbbbbbbbbbbcc",
+"aabbbbbbbbbbbbbbbbbbbbbbbbbbbbcc",
+"aabbbbbbbbbbbbbbbbbbbbbbbbbbbbcc",
+"aabbbbbbbbbbbbbbbbbbbbbbbbbbbbcc",
+"aabbbbbbbbbbbbbbbbbbbbbbbbbbbbcc",
+"aabbbbbbbbbbbbbbbbbbbbbbbbbbbbcc",
+"aabbbbbbbbbbbbbbbbbbbbbbbbbbbbcc",
+"aabbbbbbbbbbbbbbbbbbbbbbbbbbbbcc",
+"aabbbbbbbbbbbbbbbbbbbbbbbbbbbbcc",
+"aabbbbbbbbbbbbbbbbbbbbbbbbbbbbcc",
+"aabbbbbbbbbbbbbbbbbbbbbbbbbbbbcc",
+"aabbbbbbbbbbbbbbbbbbbbbbbbbbbbcc",
+"aabbbbbbbbbbbbbbbbbbbbbbbbbbbbcc",
+"aabbbbbbbbbbbbbbbbbbbbbbbbbbbbcc",
+"aabbbbbbbbbbbbbbbbbbbbbbbbbbbbcc",
+"aabbbbbbbbbbbbbbbbbbbbbbbbbbbbcc",
+"aabbbbbbbbbbbbbbbbbbbbbbbbbbbbcc",
+"aabbbbbbbbbbbbbbbbbbbbbbbbbbbbcc",
+"aacccccccccccccccccccccccccccccc",
+"aacccccccccccccccccccccccccccccc",
+"................................",
+"................................",
+"................................",
+"................................",
 };
diff --git a/fluid/pixmaps/flCodeBlock.xpm b/fluid/pixmaps/flCodeBlock.xpm
index 7b3d0d1d2..a9ed246be 100644
--- a/fluid/pixmaps/flCodeBlock.xpm
+++ b/fluid/pixmaps/flCodeBlock.xpm
@@ -1,27 +1,43 @@
 /* XPM */
 static const char * const flCodeBlock_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 4 1",
+"32 32 4 1",
 /* colors */
 ". c none",
 "a c #000000",
 "b c #c0e0c0",
 "c c #000000",
 /* pixels */
-".......aa.......",
-"......abbc......",
-".....abbbbc.....",
-"....abbbbbbc....",
-"...abbbbbbbbc...",
-"..abbbbbbbbbbc..",
-".abbbbbbbbbbbbc.",
-"abbbbbbbbbbbbbbc",
-"abbbbbbbbbbbbbbc",
-".abbbbbbbbbbbbc.",
-"..abbbbbbbbbbc..",
-"...abbbbbbbbc...",
-"....abbbbbbc....",
-".....abbbbc.....",
-"......abbc......",
-".......ac.......",
+"...............aa...............",
+"..............aaaa..............",
+".............aaaccc.............",
+"............aaabbccc............",
+"...........aaabbbbccc...........",
+"..........aaabbbbbbccc..........",
+".........aaabbbbbbbbccc.........",
+"........aaabbbbbbbbbbccc........",
+".......aaabbbbbbbbbbbbccc.......",
+"......aaabbbbbbbbbbbbbbccc......",
+".....aaabbbbbbbbbbbbbbbbccc.....",
+"....aaabbbbbbbbbbbbbbbbbbccc....",
+"...aaabbbbbbbbbbbbbbbbbbbbccc...",
+"..aaabbbbbbbbbbbbbbbbbbbbbbccc..",
+".aaabbbbbbbbbbbbbbbbbbbbbbbbccc.",
+"aaabbbbbbbbbbbbbbbbbbbbbbbbbbccc",
+"aaabbbbbbbbbbbbbbbbbbbbbbbbbbccc",
+".aaabbbbbbbbbbbbbbbbbbbbbbbbccc.",
+"..aaabbbbbbbbbbbbbbbbbbbbbbccc..",
+"...aaabbbbbbbbbbbbbbbbbbbbccc...",
+"....aaabbbbbbbbbbbbbbbbbbccc....",
+".....aaabbbbbbbbbbbbbbbbccc.....",
+"......aaabbbbbbbbbbbbbbccc......",
+".......aaabbbbbbbbbbbbccc.......",
+"........aaabbbbbbbbbbccc........",
+".........aaabbbbbbbbccc.........",
+"..........aaabbbbbbccc..........",
+"...........aaabbbbccc...........",
+"............aaabbccc............",
+".............aaaccc.............",
+"..............aacc..............",
+"...............ac...............",
 };
diff --git a/fluid/pixmaps/flComment.xpm b/fluid/pixmaps/flComment.xpm
index aaeeffb47..e1785972b 100644
--- a/fluid/pixmaps/flComment.xpm
+++ b/fluid/pixmaps/flComment.xpm
@@ -1,27 +1,43 @@
 /* XPM */
 static const char * const flComment_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 4 1",
+"32 32 4 1",
 /* colors */
 ". c none",
 "a c #000000",
 "b c #c0e0c0",
 "c c #000000",
 /* pixels */
-"................",
-"................",
-".aaaaaaaaaaaaaa.",
-".abbbbbbbbbbbbc.",
-".abbbbbccbbccbc.",
-".abbbbccbbccbbc.",
-".abbbbccbbccbbc.",
-".abbbccbbccbbbc.",
-".abbbccbbccbbbc.",
-".abbccbbccbbbbc.",
-".abbccbbccbbbbc.",
-".abccbbccbbbbbc.",
-".abbbbbbbbbbbbc.",
-".accccccccccccc.",
-"................",
-"................",
+"................................",
+"................................",
+"................................",
+"................................",
+"..aaaaaaaaaaaaaaaaaaaaaaaaaaaa..",
+"..aaaaaaaaaaaaaaaaaaaaaaaaaaaa..",
+"..aabbbbbbbbbbbbbbbbbbbbbbbbcc..",
+"..aabbbbbbbbbbbbbbbbbbbbbbbbcc..",
+"..aabbbbbbbbbbbbbbbbbbbbbbbbcc..",
+"..aabbbbbbbbbbbbbbbbbbbbbbbbcc..",
+"..aabbbbbbbbbcccbbbbbcccbbbbcc..",
+"..aabbbbbbbbbcccbbbbbcccbbbbcc..",
+"..aabbbbbbbbcccbbbbbcccbbbbbcc..",
+"..aabbbbbbbbcccbbbbbcccbbbbbcc..",
+"..aabbbbbbbcccbbbbbcccbbbbbbcc..",
+"..aabbbbbbbcccbbbbbcccbbbbbbcc..",
+"..aabbbbbbcccbbbbbcccbbbbbbbcc..",
+"..aabbbbbbcccbbbbbcccbbbbbbbcc..",
+"..aabbbbbcccbbbbbcccbbbbbbbbcc..",
+"..aabbbbbcccbbbbbcccbbbbbbbbcc..",
+"..aabbbbcccbbbbbcccbbbbbbbbbcc..",
+"..aabbbbcccbbbbbcccbbbbbbbbbcc..",
+"..aabbbbbbbbbbbbbbbbbbbbbbbbcc..",
+"..aabbbbbbbbbbbbbbbbbbbbbbbbcc..",
+"..aabbbbbbbbbbbbbbbbbbbbbbbbcc..",
+"..aabbbbbbbbbbbbbbbbbbbbbbbbcc..",
+"..aacccccccccccccccccccccccccc..",
+"..aacccccccccccccccccccccccccc..",
+"................................",
+"................................",
+"................................",
+"................................",
 };
diff --git a/fluid/pixmaps/flCounter.xpm b/fluid/pixmaps/flCounter.xpm
index 13345cd14..b639e5d77 100644
--- a/fluid/pixmaps/flCounter.xpm
+++ b/fluid/pixmaps/flCounter.xpm
@@ -1,29 +1,46 @@
 /* XPM */
 static const char * const flCounter_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 6 1",
+"32 32 7 1",
 /* colors */
-"a c #606060",
-"' c #000000",
+"f c #606060",
+". c #ffffff",
 "c c none",
-"d c #c0c0c0",
-"e c #ffffff",
-"f c #e0e0e0",
+"d c #bbbbbb",
+"e c #8080ff",
+"a c #dddddd",
+"x c #000000",
 /* pixels */
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"fffffffffffffffc",
-"fdddaeeeeefdddac",
-"fd'daee'eefd'dac",
-"f''dae''eefd''ac",
-"f''daee'eefd''ac",
-"fd'dae'''efd'dac",
-"fdddaeeeeefdddac",
-"aaaaaaaaaaaaaaac",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxc",
+"xffffffffffffffffffffffffffffffx",
+"xfddddddaa............ffddddddax",
+"xfddddddaa............ffddddddax",
+"xfdddxddaa.....xx.....ffddxdddax",
+"xfddxxddaa....xxx.....ffddxxddax",
+"xfdxxxddaa...xxxx.....ffddxxxdax",
+"xfxxxxddaa...xxxx.....ffddxxxxax",
+"xfxxxxddaa.....xx.....ffddxxxxax",
+"xfdxxxddaa.....xx.....ffddxxxdax",
+"xfddxxddaa...xxxxxx...ffddxxddax",
+"xfdddxddaa...xxxxxx...ffddxdddax",
+"xfddddddaa............ffddddddax",
+"xfddddddaa............ffddddddax",
+"xfaaaaaaaaaaaaaaaaaaaaaaaaaaaaax",
+"cxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/flData.xpm b/fluid/pixmaps/flData.xpm
index 1f39f868c..227ff7a93 100644
--- a/fluid/pixmaps/flData.xpm
+++ b/fluid/pixmaps/flData.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 static const char * const flData_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 6 1",
+"32 32 6 1",
 /* colors */
 ". c none",
 "a c #000000",
@@ -10,20 +10,36 @@ static const char * const flData_xpm[] = {
 "  c #000000",
 "- c #607006",
 /* pixels */
-"................",
-"................",
-"...aaaaaaaaaaaaa",
-"...abbbbbbbbbbbc",
-"...ab b- -b bbbc",
-"..abb b b b bbc.",
-"..abb b- -b bbc.",
-"..abbbbbbbbbbbc.",
-".abbbbbbbbbbbc..",
-".ab b b- -bbbc..",
-".ab b b b bbbc..",
-"abb b b- -bbc...",
-"abbbbbbbbbbbc...",
-"acccccccccccc...",
-"................",
-"................",
+"................................",
+"................................",
+"................................",
+"................................",
+".......aaaaaaaaaaaaaaaaaaaaaaaaa",
+".......aaaaaaaaaaaaaaaaaaaaaaaaa",
+".......aabbbbbbbbbbbbbbbbbbbbbcc",
+"......aabbbbbbbbbbbbbbbbbbbbbcc.",
+"......aabbb  bbb-  -bbb  bbbbcc.",
+"......aabb   bb-    -b   bbbbcc.",
+".....aabbbb  bb  bb  bb  bbbcc..",
+".....aabbbb  bb  bb  bb  bbbcc..",
+".....aabbbb  bb-    -bb  bbbcc..",
+"....aabbbbb  bbb-  -bbb  bbcc...",
+"....aabbbbbbbbbbbbbbbbbbbbbcc...",
+"....aabbbbbbbbbbbbbbbbbbbbbcc...",
+"...aabbbbbbbbbbbbbbbbbbbbbcc....",
+"...aabbbbbbbbbbbbbbbbbbbbbcc....",
+"...aabb  bb  bbb-  -bbbbbbcc....",
+"..aabb   b   bb-    -bbbbcc.....",
+"..aabbb  bb  bb  bb  bbbbcc.....",
+"..aabbb  bb  bb  bb  bbbbcc.....",
+".aabbbb  bb  bb-    -bbbcc......",
+".aabbbb  bb  bbb-  -bbbbcc......",
+".aabbbbbbbbbbbbbbbbbbbbbcc......",
+"aabbbbbbbbbbbbbbbbbbbbbbcc.......",
+"aaccccccccccccccccccccccc.......",
+"aaccccccccccccccccccccccc.......",
+"................................",
+"................................",
+"................................",
+"................................",
 };
diff --git a/fluid/pixmaps/flDeclaration.xpm b/fluid/pixmaps/flDeclaration.xpm
index 6ef53dc87..993bdf1eb 100644
--- a/fluid/pixmaps/flDeclaration.xpm
+++ b/fluid/pixmaps/flDeclaration.xpm
@@ -1,27 +1,43 @@
 /* XPM */
 static const char * const flDeclaration_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 4 1",
+"32 32 4 1",
 /* colors */
 ". c none",
 "a c #000000",
 "b c #c0e0c0",
 "c c #000000",
 /* pixels */
-"................",
-"................",
-"...aaaaaaaaaaaaa",
-"...abbbbbbbbbbbc",
-"...abbbbbbbbbbbc",
-"..abbbbbbbbbbbc.",
-"..abbbbbbbbbbbc.",
-"..abbbbbbbbbbbc.",
-".abbbbbbbbbbbc..",
-".abbbbbbbbbbbc..",
-".abbbbbbbbbbbc..",
-"abbbbbbbbbbbc...",
-"abbbbbbbbbbbc...",
-"acccccccccccc...",
-"................",
-"................",
+"................................",
+"................................",
+"................................",
+"................................",
+".......aaaaaaaaaaaaaaaaaaaaaaaaa",
+".......aaaaaaaaaaaaaaaaaaaaaaaaa",
+".......aabbbbbbbbbbbbbbbbbbbbbcc",
+"......aabbbbbbbbbbbbbbbbbbbbbcc.",
+"......aabbbbbbbbbbbbbbbbbbbbbcc.",
+"......aabbbbbbbbbbbbbbbbbbbbbcc.",
+".....aabbbbbbbbbbbbbbbbbbbbbcc..",
+".....aabbbbbbbbbbbbbbbbbbbbbcc..",
+".....aabbbbbbbbbbbbbbbbbbbbbcc..",
+"....aabbbbbbbbbbbbbbbbbbbbbcc...",
+"....aabbbbbbbbbbbbbbbbbbbbbcc...",
+"....aabbbbbbbbbbbbbbbbbbbbbcc...",
+"...aabbbbbbbbbbbbbbbbbbbbbcc....",
+"...aabbbbbbbbbbbbbbbbbbbbbcc....",
+"...aabbbbbbbbbbbbbbbbbbbbbcc....",
+"..aabbbbbbbbbbbbbbbbbbbbbcc.....",
+"..aabbbbbbbbbbbbbbbbbbbbbcc.....",
+"..aabbbbbbbbbbbbbbbbbbbbbcc.....",
+".aabbbbbbbbbbbbbbbbbbbbbcc......",
+".aabbbbbbbbbbbbbbbbbbbbbcc......",
+".aabbbbbbbbbbbbbbbbbbbbccc......",
+"aabbbbbbbbbbbbbbbbbbbbbcc.......",
+"aaccccccccccccccccccccccc.......",
+"aaccccccccccccccccccccccc.......",
+"................................",
+"................................",
+"................................",
+"................................",
 };
diff --git a/fluid/pixmaps/flDeclarationBlock.xpm b/fluid/pixmaps/flDeclarationBlock.xpm
index d43ec615a..dce669584 100644
--- a/fluid/pixmaps/flDeclarationBlock.xpm
+++ b/fluid/pixmaps/flDeclarationBlock.xpm
@@ -1,27 +1,43 @@
 /* XPM */
 static const char * const flDeclarationBlock_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 4 1",
+"32 32 4 1",
 /* colors */
 ". c none",
 "a c #000000",
 "b c #c0e0c0",
 "c c #000000",
 /* pixels */
-".......aa.......",
-"......abbc......",
-".....abbbbc.....",
-"....abbbbbbc....",
-"...abbbbbbbbc...",
-"..abbbcbbcbbbc..",
-".abbbccccccbbbc.",
-"abbbbbcbbcbbbbbc",
-"abbbbbcbbcbbbbbc",
-".abbbccccccbbbc.",
-"..abbbcbbcbbbc..",
-"...abbbbbbbbc...",
-"....abbbbbbc....",
-".....abbbbc.....",
-"......abbc......",
-".......ac.......",
+"...............aa...............",
+"..............aaaa..............",
+".............aaaccc.............",
+"............aaabbccc............",
+"...........aaabbbbccc...........",
+"..........aaabbbbbbccc..........",
+".........aaabbbbbbbbccc.........",
+"........aaabbbbbbbbbbccc........",
+".......aaabbbbbbbbbbbbccc.......",
+"......aaabbbbbbbbbbbbbbccc......",
+".....aaabbbbccbbbbccbbbbccc.....",
+"....aaabbbbbccbbbbccbbbbbccc....",
+"...aaabbbbccccccccccccbbbbccc...",
+"..aaabbbbbccccccccccccbbbbbccc..",
+".aaabbbbbbbbccbbbbccbbbbbbbbccc.",
+"aaabbbbbbbbbccbbbbccbbbbbbbbbccc",
+"aabbbbbbbbbbccbbbbccbbbbbbbbbccc",
+".aaabbbbbbbbccbbbbccbbbbbbbbccc.",
+"..aaabbbbbccccccccccccbbbbbccc..",
+"...aaabbbbccccccccccccbbbbccc...",
+"....aaabbbbbccbbbbccbbbbbccc....",
+".....aaabbbbccbbbbccbbbbccc.....",
+"......aaabbbbbbbbbbbbbbccc......",
+".......aaabbbbbbbbbbbbccc.......",
+"........aaabbbbbbbbbbccc........",
+".........aaabbbbbbbbccc.........",
+"..........aaabbbbbbccc..........",
+"...........aaabbbbccc...........",
+"............aaabbccc............",
+".............aaaccc.............",
+"..............aacc..............",
+"...............ac...............",
 };
diff --git a/fluid/pixmaps/flDial.xpm b/fluid/pixmaps/flDial.xpm
index 128d56cd5..9c57471cf 100644
--- a/fluid/pixmaps/flDial.xpm
+++ b/fluid/pixmaps/flDial.xpm
@@ -1,28 +1,46 @@
 /* XPM */
 static const char * const flDial_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 5 1",
+"32 32 5 1",
 /* colors */
 ". c none",
 "a c #000000",
-"b c #c0c0c0",
+"b c #bbbbbb",
 "c c #000000",
 "' c #202080",
 /* pixels */
-"................",
-"................",
-"....aaaaaaa.....",
-"..aabbbbbbbcc...",
-".abbbbbbbbbbbc..",
-".ab''bbbbbbbbc..",
-"ab'bb'bbbbbbbbc.",
-"ab'bb'bbbbbbbbc.",
-"abb''bbbbbbbbbc.",
-"abbbbbbbbbbbbbc.",
-"abbbbbbbbbbbbbc.",
-".abbbbbbbbbbbc..",
-".abbbbbbbbbbbc..",
-"..ccbbbbbbbcc...",
-"....ccccccc.....",
-"................",
+"................................",
+"................................",
+"................................",
+"............aaaaaaaa............",
+".........aaaaaaaaaaaaaa.........",
+".......aaaaaabbbbbbcccccc.......",
+"......aaabbbbbbbbbbbbbbccc......",
+".....aaabbbbbbbbbbbbbbbbccc.....",
+"....aaabbbbbbbbbbbbbbbbbbccc....",
+"....aabbbaaaabbbbbbbbbbbbbcc....",
+"...aaabbaaaaaabbbbbbbbbbbbccc...",
+"...aabbaaabbaaabbbbbbbbbbbbcc...",
+"...aabbaabbbbaabbbbbbbbbbbbcc...",
+"..aaabbaabbbbaabbbbbbbbbbbbccc..",
+"..aabbbaaabbaaabbbbbbbbbbbbbcc..",
+"..aabbbbaaaaaabbbbbbbbbbbbbbcc..",
+"..aabbbbbaaaabbbbbbbbbbbbbbbcc..",
+"..aabbbbbbbbbbbbbbbbbbbbbbbbcc..",
+"..aabbbbbbbbbbbbbbbbbbbbbbbbcc..",
+"..aabbbbbbbbbbbbbbbbbbbbbbbbcc..",
+"..aaabbbbbbbbbbbbbbbbbbbbbbccc..",
+"...aabbbbbbbbbbbbbbbbbbbbbbcc...",
+"...aabbbbbbbbbbbbbbbbbbbbbbcc...",
+"...aaabbbbbbbbbbbbbbbbbbbbccc...",
+"....aabbbbbbbbbbbbbbbbbbbbcc....",
+"....aaabbbbbbbbbbbbbbbbbbccc....",
+".....aaabbbbbbbbbbbbbbbbccc.....",
+"......cccbbbbbbbbbbbbbcccc......",
+".......cccccbbbbbbbbccccc.......",
+".........cccccccccccccc.........",
+"............cccccccc............",
+"................................",
+"................................",
+"................................",
 };
diff --git a/fluid/pixmaps/flFileBrowser.xpm b/fluid/pixmaps/flFileBrowser.xpm
index 6edef0e5c..1e5f9a6df 100644
--- a/fluid/pixmaps/flFileBrowser.xpm
+++ b/fluid/pixmaps/flFileBrowser.xpm
@@ -1,7 +1,50 @@
 /* XPM */
 static const char * const flFileBrowser_xpm[] = {
+"32 32 7 1",
+/* colors */
+"a c #606060",
+"b c #888888",
+"c c none",
+"d c #ffffff",
+"e c #bbbbbb",
+"f c #000000",
+". c #ffff00",
+/* pixels */
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"ffffffffffffffffffffffffffffffcc",
+"ffffffffffffffffffffffffffffffcc",
+"ffddddddddddddddddddddddaaeeffcc",
+"ffddddddddddddddddddddddaaeeffcc",
+"ffddddfffffdddddddddddddaabbffcc",
+"ffdddfffffffddddddddddddaabbffcc",
+"ffddfff....fffffffffffddaabbffcc",
+"ffddff......ffffffffffddaabbffcc",
+"ffddff..............ffddaabbffcc",
+"ffddff..............ffddaabbffcc",
+"ffddff..............ffddaabbffcc",
+"ffddff..............ffddaabbffcc",
+"ffddff..............ffddaabbffcc",
+"ffddff..............ffddaabbffcc",
+"ffddff..............ffddaabbffcc",
+"ffddff..............ffddaabbffcc",
+"ffddff..............ffddaabbffcc",
+"ffddff..............ffddaabbffcc",
+"ffddffffffffffffffffffddaaeeffcc",
+"ffddffffffffffffffffffddaaeeffcc",
+"ffddddddddddddddddddddddaaeeffcc",
+"ffddddddddddddddddddddddaaeeffcc",
+"ffaaaaaaaaaaaaaaaaaaaaaaaaaaffcc",
+"ffaaaaaaaaaaaaaaaaaaaaaaaaaaffcc",
+"ffeebbbbbbbbbbeeeeeeeeeeaaeeffcc",
+"ffeebbbbbbbbbbeeeeeeeeeeaaeeffcc",
+"ffffffffffffffffffffffffffffffcc",
+"ffffffffffffffffffffffffffffffcc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
+,
 /* width height ncolors chars_per_pixel */
-"16 16 6 1",
+"32 32 6 1",
 /* colors */
 "a c #ffff00",
 "b c #808080",
@@ -10,20 +53,36 @@ static const char * const flFileBrowser_xpm[] = {
 "e c #ffffff",
 "f c #000000",
 /* pixels */
-"cccccccccccccccc",
-"dddddddddddddddc",
-"dfffffffffffffdc",
-"dfeeeeeeeeebbfdc",
-"dfeefffeeeebdfdc",
-"dfefaaafffebdfdc",
-"dfefaaaaafebffdc",
-"dfefaaaaafebdfdc",
-"dfefaaaaafebdfdc",
-"dfefffffffebdfdc",
-"dfeeeeeeeeebdfdc",
-"dfbbbbbbbbbbbfdc",
-"dfbdddfddddbdfdc",
-"dfffffffffffffdc",
-"dddddddddddddddc",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"ddddddddddddddddddddddddddddddcc",
+"ddddddddddddddddddddddddddddddcc",
+"ddffffffffffffffffffffffffffddcc",
+"ddffffffffffffffffffffffffffddcc",
+"ddffeeeeeeeeeeeeeeeeeebbbbffddcc",
+"ddffeeeeeeeeeeeeeeeeeebbbbffddcc",
+"ddffeeeeffffffeeeeeeeebbddffddcc",
+"ddffeeeeffffffeeeeeeeebbddffddcc",
+"ddffeeffaaaaaaffffffeebbddffddcc",
+"ddffeeffaaaaaaffffffeebbddffddcc",
+"ddffeeffaaaaaaaaaaffeebbffffddcc",
+"ddffeeffaaaaaaaaaaffeebbffffddcc",
+"ddffeeffaaaaaaaaaaffeebbddffddcc",
+"ddffeeffaaaaaaaaaaffeebbddffddcc",
+"ddffeeffaaaaaaaaaaffeebbddffddcc",
+"ddffeeffaaaaaaaaaaffeebbddffddcc",
+"ddffeeffffffffffffffeebbddffddcc",
+"ddffeeffffffffffffffeebbddffddcc",
+"ddffeeeeeeeeeeeeeeeeeebbddffddcc",
+"ddffeeeeeeeeeeeeeeeeeebbddffddcc",
+"ddffbbbbbbbbbbbbbbbbbbbbbbffddcc",
+"ddffbbbbbbbbbbbbbbbbbbbbbbffddcc",
+"ddffbbddddddffddddddddbbddffddcc",
+"ddffbbddddddffddddddddbbddffddcc",
+"ddffffffffffffffffffffffffffddcc",
+"ddffffffffffffffffffffffffffddcc",
+"ddddddddddddddddddddddddddddddcc",
+"ddddddddddddddddddddddddddddddcc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/flFileInput.xpm b/fluid/pixmaps/flFileInput.xpm
index 66cbb04e2..5f8967d16 100644
--- a/fluid/pixmaps/flFileInput.xpm
+++ b/fluid/pixmaps/flFileInput.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 static const char * const flFileInput_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 6 1",
+"32 32 6 1",
 /* colors */
 "f c #606060",
 ". c #000000",
@@ -10,20 +10,36 @@ static const char * const flFileInput_xpm[] = {
 "e c #8080ff",
 "a c #d0d0d0",
 /* pixels */
-"cccccccccccccccc",
-"cccccccccccccccc",
-"ffffffffffffffff",
-"faaaaaaaafaaaaaa",
-"ffffffffffffffff",
-"fdddddddddddddda",
-"fdd...dd..ddddda",
-"fd.ddd.d..ddddda",
-"fd.ddd.d..ddddda",
-"fd.....d..ddddda",
-"fd.ddd.d..ddddda",
-"fd.ddd.d..ddddda",
-"fdddddddddddddda",
-"aaaaaaaaaaaaaaaa",
-"cccccccccccccccc",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"c..............................c",
+".ffffffffffffffffffffffffffffff.",
+".fdddddddffddddddddddddffddddda.",
+".fdddddddffddddddddddddffddddda.",
+".ffffffffffffffffffffffffffffff.",
+"................................",
+".fdddddddddddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".fddddddd..ddddddddddddddddddda.",
+".fddddd......ddddddddddddddddda.",
+".fdddd...dd...dddddddddddddddda.",
+".fdddd..dddddddddddddddddddddda.",
+".fdddd..dddddddd....dddddddddda.",
+".fdddd..dddddddd....dddddddddda.",
+".fdddd..ddddddddddddddddddddda.",
+".fdddd..ddddddddddddddddddddda.",
+".fdddd..dddddddd....dddddddddda.",
+".fdddd...dd...dd....dddddddddda.",
+".fddddd......ddddddddddddddddda.",
+".fddddddd..ddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+"c..............................c",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/flFunction.xpm b/fluid/pixmaps/flFunction.xpm
index a05c366f1..ce022b5cc 100644
--- a/fluid/pixmaps/flFunction.xpm
+++ b/fluid/pixmaps/flFunction.xpm
@@ -1,27 +1,43 @@
 /* XPM */
 static const char * const flFunction_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 4 1",
+"32 32 4 1",
 /* colors */
 ". c none",
 "a c #000000",
 "b c #c0e0c0",
 "c c #000000",
 /* pixels */
-"................",
-"................",
-"....aaaaaaaa....",
-"..aabbbbbbbbcc..",
-".abbbbbbbbbbbbc.",
-".abbbbbbbbbbbbc.",
-"abbbbbbbbbbbbbbc",
-"abbbbbbbbbbbbbbc",
-"abbbbbbbbbbbbbbc",
-"abbbbbbbbbbbbbbc",
-".abbbbbbbbbbbbc.",
-".abbbbbbbbbbbbc.",
-"..ccbbbbbbbbcc..",
-"....cccccccc....",
-"................",
-"................",
+"................................",
+"................................",
+"................................",
+"................................",
+"..........aaaaaaaaaaaa..........",
+".......aaaaaaaaaaaaaaaaaa.......",
+".....aaaaaabbbbbbbbbbcccccc.....",
+"....aaabbbbbbbbbbbbbbbbbbccc....",
+"...aaabbbbbbbbbbbbbbbbbbbbccc...",
+"..aaabbbbbbbbbbbbbbbbbbbbbbccc..",
+"..aabbbbbbbbbbbbbbbbbbbbbbbbcc..",
+".aaabbbbbbbbbbbbbbbbbbbbbbbbccc.",
+".aabbbbbbbbbbbbbbbbbbbbbbbbbbcc.",
+".aabbbbbbbbbbbbbbbbbbbbbbbbbbcc.",
+"aaabbbbbbbbbbbbbbbbbbbbbbbbbbccc",
+"aabbbbbbbbbbbbbbbbbbbbbbbbbbbbcc",
+"aabbbbbbbbbbbbbbbbbbbbbbbbbbbbcc",
+"aaabbbbbbbbbbbbbbbbbbbbbbbbbbccc",
+".aabbbbbbbbbbbbbbbbbbbbbbbbbbcc.",
+".aabbbbbbbbbbbbbbbbbbbbbbbbbbcc.",
+".aaabbbbbbbbbbbbbbbbbbbbbbbbccc.",
+"..aabbbbbbbbbbbbbbbbbbbbbbbbcc..",
+"..aaabbbbbbbbbbbbbbbbbbbbbbccc..",
+"...aaabbbbbbbbbbbbbbbbbbbbccc...",
+"....cccbbbbbbbbbbbbbbbbbcccc....",
+".....cccccbbbbbbbbbbbbccccc.....",
+".......cccccccccccccccccc.......",
+"..........cccccccccccc..........",
+"................................",
+"................................",
+"................................",
+"................................",
 };
diff --git a/fluid/pixmaps/flGroup.xpm b/fluid/pixmaps/flGroup.xpm
index a2463dca9..20fc57a00 100644
--- a/fluid/pixmaps/flGroup.xpm
+++ b/fluid/pixmaps/flGroup.xpm
@@ -1,29 +1,45 @@
 /* XPM */
 static const char * const flGroup_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 6 1",
+"32 32 6 1",
 /* colors */
 "a c #606060",
 "b c #2020ff",
 "c c none",
-"d c #c0c0c0",
+"d c #dddddd",
 "e c #8080ff",
 "f c #000000",
 /* pixels */
-"cccccccccccccccc",
-"cccccccccccccccc",
-"dddddddddddddddc",
-"dfffffffffffffdc",
-"dfdddddddddddfdc",
-"dfdddddddddddfdc",
-"dfdddddddddddfdc",
-"dfdddddddddddfdc",
-"dfdddddddddddfdc",
-"dfdddddddddddfdc",
-"dfdddddddddddfdc",
-"dfdddddddddddfdc",
-"dfffffffffffffdc",
-"dddddddddddddddc",
-"cccccccccccccccc",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"ffffffffffffffffffffffffffffffcc",
+"ffffffffffffffffffffffffffffffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffffffffffffffffffffffffffffffcc",
+"ffffffffffffffffffffffffffffffcc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/flHelp.xpm b/fluid/pixmaps/flHelp.xpm
index 3c4da9c4c..4d8721aca 100644
--- a/fluid/pixmaps/flHelp.xpm
+++ b/fluid/pixmaps/flHelp.xpm
@@ -1,29 +1,44 @@
 /* XPM */
 static const char * const flHelp_xpm[] = {
-/* width height ncolors chars_per_pixel */
-"16 16 6 1",
+"32 32 6 1",
 /* colors */
 "a c #606060",
-"b c #808080",
+"b c #888888",
 "c c none",
-"d c #c0c0c0",
-"e c #ffffff",
+"d c #ffffff",
+"e c #bbbbbb",
 "f c #000000",
 /* pixels */
-"cccccccccccccccc",
-"dddddddddddddddc",
-"dfffffffffffffdc",
-"dfeeeeeeeeebbfdc",
-"dfeeeffeeeebdfdc",
-"dfeeffeeeeebdfdc",
-"dfeffeeeeeebffdc",
-"dfeeffeeeeebdfdc",
-"dfeeeffeeeebdfdc",
-"dfeeeeeeeeebdfdc",
-"dfeeeeeeeeebdfdc",
-"dfbbbbbbbbbbbfdc",
-"dfbdddfddddbdfdc",
-"dfffffffffffffdc",
-"dddddddddddddddc",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"ffffffffffffffffffffffffffffffcc",
+"ffffffffffffffffffffffffffffffcc",
+"ffddddddddddddddddddddddaaeeffcc",
+"ffddddddddddddddddddddddaabbffcc",
+"ffddddffddddffddddddddddaaeeffcc",
+"ffddddffddddffddddddddddaaeeffcc",
+"ffdddffddddddffdddddddddaaeeffcc",
+"ffdddffddddddffdddddddddaabbffcc",
+"ffddffddddddddffddddddddaabbffcc",
+"ffddffddddddddffddddddddaabbffcc",
+"ffdddffddddddffdddddddddaabbffcc",
+"ffdddffddddddffdddddddddaabbffcc",
+"ffddddffddddffddddddddddaabbffcc",
+"ffddddffddddffddddddddddaabbffcc",
+"ffddddddddddddddddddddddaabbffcc",
+"ffddddddddddddddddddddddaabbffcc",
+"ffddddddddddddddddddddddaaeeffcc",
+"ffddddddddddddddddddddddaaeeffcc",
+"ffddddddddddddddddddddddaaeeffcc",
+"ffddddddddddddddddddddddaaeeffcc",
+"ffddddddddddddddddddddddaaeeffcc",
+"ffddddddddddddddddddddddaaeeffcc",
+"ffaaaaaaaaaaaaaaaaaaaaaaaaaaffcc",
+"ffaaaaaaaaaaaaaaaaaaaaaaaaaaffcc",
+"ffeebbbbbbbbbbeeeeeeeeeeaaeeffcc",
+"ffeebbbbbbbbbbeeeeeeeeeeaaeeffcc",
+"ffffffffffffffffffffffffffffffcc",
+"ffffffffffffffffffffffffffffffcc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/flInput.xpm b/fluid/pixmaps/flInput.xpm
index de85f7b5e..2273ab607 100644
--- a/fluid/pixmaps/flInput.xpm
+++ b/fluid/pixmaps/flInput.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 static const char * const flInput_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 6 1",
+"32 32 6 1",
 /* colors */
 "f c #606060",
 ". c #000000",
@@ -10,20 +10,36 @@ static const char * const flInput_xpm[] = {
 "e c #8080ff",
 "a c #d0d0d0",
 /* pixels */
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"ffffffffffffffff",
-"fdddddddddddddda",
-"fdd...dd..ddddda",
-"fd.ddd.d..ddddda",
-"fd.ddd.d..ddddda",
-"fd.....d..ddddda",
-"fd.ddd.d..ddddda",
-"fd.ddd.d..ddddda",
-"fdddddddddddddda",
-"aaaaaaaaaaaaaaaa",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"c..............................c",
+".ffffffffffffffffffffffffffffff.",
+".fdddddddddddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".fddddd....ddddd....dddddddddda.",
+".fdddd......dddd....dddddddddda.",
+".fdddd..dd..dddd....dddddddddda.",
+".fddd..dddd..ddd....dddddddddda.",
+".fddd..dddd..ddd....dddddddddda.",
+".fdd..dddddd..dd....dddddddddda.",
+".fdd..........dd....dddddddddda.",
+".fdd..........dd....dddddddddda.",
+".fdd..dddddd..dd....dddddddddda.",
+".fdd..dddddd..dd....dddddddddda.",
+".fdd..dddddd..dd....dddddddddda.",
+".fdd..dddddd..dd....dddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+"c..............................c",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/flInputChoice.xpm b/fluid/pixmaps/flInputChoice.xpm
new file mode 100644
index 000000000..a4aa09280
--- /dev/null
+++ b/fluid/pixmaps/flInputChoice.xpm
@@ -0,0 +1,47 @@
+/* XPM */
+static const char * const flInputChoice_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"32 32 8 1",
+/* colors */
+"a c #808080",
+"b c #2020ff",
+"c c none",
+"d c #a0a0a0",
+"e c #8080ff",
+"f c #d0d0d0",
+"g c #000000",
+"' c #ffffff",
+/* pixels */
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccggggggggggggggggggggggggggccc",
+"ccgaaaaaaaaaaaagfffffffffffffgcc",
+"cgaa'''''''''''gddddddgdddddfagc",
+"cga''''''''''''gdddddgggdddddagc",
+"cga''''''''''''gddddgggggddddagc",
+"cga''''''''''''gdddgggggggdddagc",
+"cga''''''''''''gddgggggggggddagc",
+"cga''''''''''''gdddddddddddddagc",
+"cga''''''''''''gdddddddddddddagc",
+"cga''''''''''''gddgggggggggddagc",
+"cga''''''''''''gdddgggggggdddagc",
+"cga''''''''''''gddddgggggddddagc",
+"cga''''''''''''gdddddgggdddddagc",
+"cgaa'''''''''''gddddddgdddddaagc",
+"ccgffffffffffffgaaaaaaaaaaaaagcc",
+"cccggggggggggggggggggggggggggccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
+};
diff --git a/fluid/pixmaps/flLightButton.xpm b/fluid/pixmaps/flLightButton.xpm
index e055b33a7..f20652308 100644
--- a/fluid/pixmaps/flLightButton.xpm
+++ b/fluid/pixmaps/flLightButton.xpm
@@ -1,29 +1,46 @@
 /* XPM */
 static const char * const flLightButton_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 6 1",
+"32 32 7 1",
 /* colors */
-"a c #606060",
+"a c #808080",
 "b c #ffff00",
 "c c none",
 "d c #a0a0a0",
 "e c #8080ff",
 "f c #d0d0d0",
+"g c #000000",
 /* pixels */
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"ffffffffffffffac",
-"fdddddddddddddac",
-"fdaaaaddddddddac",
-"fdabbfddddddddac",
-"fdabbfddddddddac",
-"fdafffddddddddac",
-"fdddddddddddddac",
-"aaaaaaaaaaaaaaac",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccggggggggggggggggggggggggggccc",
+"ccgffffffffffffffffffffffffffgcc",
+"cgffddddddddddddddddddddddddfagc",
+"cgfddaaaaaaddddddddddddddddddagc",
+"cgfddabbbbfddddddddddddddddddagc",
+"cgfddabbbbfddddddddddddddddddagc",
+"cgfddabbbbfddddddddddddddddddagc",
+"cgfddabbbbfddddddddddddddddddagc",
+"cgfddabbbbfddddddddddddddddddagc",
+"cgfddabbbbfddddddddddddddddddagc",
+"cgfddabbbbfddddddddddddddddddagc",
+"cgfddabbbbfddddddddddddddddddagc",
+"cgfddffffffddddddddddddddddddagc",
+"cgffddddddddddddddddddddddddaagc",
+"ccgaaaaaaaaaaaaaaaaaaaaaaaaaagcc",
+"cccggggggggggggggggggggggggggccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/flMenuButton.xpm b/fluid/pixmaps/flMenuButton.xpm
index 23a271ad0..7ccd87ce4 100644
--- a/fluid/pixmaps/flMenuButton.xpm
+++ b/fluid/pixmaps/flMenuButton.xpm
@@ -1,29 +1,46 @@
 /* XPM */
 static const char * const flMenuButton_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 6 1",
+"32 32 7 1",
 /* colors */
-"a c #606060",
-". c #000000",
+"a c #808080",
+"b c #2020ff",
 "c c none",
-"d c #b0b0b0",
-"e c #ffffff",
+"d c #a0a0a0",
+"e c #8080ff",
 "f c #d0d0d0",
+"g c #000000",
 /* pixels */
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"ffffffffffffffff",
-"fdddddddddddddda",
-"fdddddddddddddda",
-"fddddddd.......a",
-"fdddddddd.ddd.da",
-"fddddddddd.d.dda",
-"fdddddddddd.ddda",
-"fdddddddddddddda",
-"fdddddddddddddda",
-"aaaaaaaaaaaaaaaa",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccggggggggggggggggggggggggggccc",
+"ccgffffffffffffffffffffffffffgcc",
+"cgffddddddddddddddddddddddddfagc",
+"cgfddddddddddddddddddddddddddagc",
+"cgfdddddddddddddddgggggggggddagc",
+"cgfdddddddddddddddgggggggggddagc",
+"cgfddddddddddddddddgggggggdddagc",
+"cgfddddddddddddddddgggggggdddagc",
+"cgfdddddddddddddddddgggggddddagc",
+"cgfdddddddddddddddddgggggddddagc",
+"cgfddddddddddddddddddgggdddddagc",
+"cgfddddddddddddddddddgggdddddagc",
+"cgfdddddddddddddddddddgddddddagc",
+"cgffddddddddddddddddddddddddaagc",
+"ccgaaaaaaaaaaaaaaaaaaaaaaaaaagcc",
+"cccggggggggggggggggggggggggggccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/flMenubar.xpm b/fluid/pixmaps/flMenubar.xpm
index a5802b724..c6c3a1554 100644
--- a/fluid/pixmaps/flMenubar.xpm
+++ b/fluid/pixmaps/flMenubar.xpm
@@ -1,29 +1,46 @@
 /* XPM */
 static const char * const flMenubar_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 6 1",
+"32 32 8 1",
 /* colors */
-"a c #606060",
-". c #2020cf",
+"a c #808080",
+"b c #2020ff",
 "c c none",
-"d c #b0b0b0",
-"e c #ffffff",
-"f c #e0e0e0",
+"d c #aaaaaa",
+"e c #8080ff",
+"f c #d0d0d0",
+"g c #000000",
+"' c #bbbbbb",
 /* pixels */
-"cccccccccccccccc",
-"ffffffffffffffff",
-"dddddddddddddddd",
-"dddddddddddddddd",
-"dddddddddddddddd",
-"dddffffffffffffd",
-"aaafddddddddddaa",
-"cccfddddddddddac",
-"cccfddddddddddac",
-"cccfddddddddddac",
-"cccfddddddddddac",
-"cccfddddddddddac",
-"cccfddddddddddac",
-"cccfddddddddddac",
-"cccfaaaaaaaaaaac",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"gggggggggggggggggggggggggggggggg",
+"ffffffffffffffffffffffffffffffff",
+"dddddddddddddddddddddddddddddddd",
+"dddddddddddddddddddddddddddddddd",
+"ddddddddgggggggggggggggggggggddd",
+"dddddddgffffffffffffffffffffagdd",
+"dddddddgf'''''''''''''''''''agdd",
+"dddddddgf'''''''''''''''''''agdd",
+"dddddddgf'''''''''''''''''''agdd",
+"dddddddgf'''''''''''''''''''agdd",
+"dddddddgf'''''''''''''''''''agdd",
+"dddddddgf'''''''''''''''''''agdd",
+"dddddddgf'''''''''''''''''''agdd",
+"dddddddgf'''''''''''''''''''agdd",
+"aaaaaaagf'''''''''''''''''''agaa",
+"ggggggggf'''''''''''''''''''aggg",
+"cccccccgf'''''''''''''''''''agcc",
+"cccccccgf'''''''''''''''''''agcc",
+"cccccccgf'''''''''''''''''''agcc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/flMenuitem.xpm b/fluid/pixmaps/flMenuitem.xpm
index 588c3bce5..b47a8a0cc 100644
--- a/fluid/pixmaps/flMenuitem.xpm
+++ b/fluid/pixmaps/flMenuitem.xpm
@@ -1,29 +1,47 @@
 /* XPM */
 static const char * const flMenuitem_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 6 1",
+"32 32 8 1",
 /* colors */
-"a c #606060",
-". c #000000",
+"a c #808080",
+"b c #2020ff",
 "c c none",
-"d c #b0b0b0",
-"e c #d0d0d0",
-"f c #c0c0c0",
+"d c #aaaaaa",
+"e c #bbbbbb",
+"f c #d0d0d0",
+"g c #000000",
+"' c #000000",
 /* pixels */
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccffffccccccccc",
-"c.fffffffccccf.c",
-"c.ffffffffffff.c",
-"c.eeeeeeeeeeee.c",
-"c.ee.ee.eeeeee.c",
-"c.e.e.e.eee..e.c",
-"c.e...e..e.eee.c",
-"c.e.e.e..e.eee.c",
-"c.e.e.e..ee..e.c",
-"c.eeeeeeeeeeee.c",
-"c.ffffffffffff.c",
-"c.fccccfffffff.c",
-"cccccccccffffccc",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"ccccccdddddddccccccccccccccccccc",
+"ccccdddddddddddccccccccccccccccc",
+"cgfdddddddddddddccccccccccdagccc",
+"cgfdddddddddddddddccccccdddagccc",
+"cgfddddddddddddddddddddddddagccc",
+"cgfddddddddddddddddddddddddagccc",
+"cgfeeeeeeeeeeeeeeeeeeeeeeeeagccc",
+"cgfeeeeeeeeeeeeeeeeeeeeeeeeagccc",
+"cgfeee'''eeee''eeeeeeeeeeeeagccc",
+"cgfee'''''eee''eeeeeeeeeeeeagccc",
+"cgfe'''e'''ee''eeeeeeeeeeeeagccc",
+"cgfe''eee''ee'''''eeee''''eagccc",
+"cgfe'''''''ee''''''ee'''''eagccc",
+"cgfe'''''''ee''ee''ee''eeeeagccc",
+"cgfe''eee''ee''ee''ee''eeeeagccc",
+"cgfe''eee''ee''ee''ee''eeeeagccc",
+"cgfe''eee''ee''''''ee'''''eagccc",
+"cgfe''eee''ee'''''eeee''''eagccc",
+"cgfeeeeeeeeeeeeeeeeeeeeeeeeagccc",
+"cgfeeeeeeeeeeeeeeeeeeeeeeeeagccc",
+"cgfddddddddddddddddddddddddagccc",
+"cgfddddddddddddddddddddddddagccc",
+"cgfdddccccccdddddddddddddddagccc",
+"cgfdccccccccccdddddddddddddagccc",
+"ccccccccccccccccddddddddddcccccc",
+"ccccccccccccccccccddddddcccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/flOutput.xpm b/fluid/pixmaps/flOutput.xpm
index 0d8bc66be..dfca7e2a9 100644
--- a/fluid/pixmaps/flOutput.xpm
+++ b/fluid/pixmaps/flOutput.xpm
@@ -1,29 +1,45 @@
 /* XPM */
 static const char * const flOutput_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 6 1",
+"32 32 6 1",
 /* colors */
 "f c #606060",
 ". c #000000",
 "c c none",
-"d c #d0d0d0",
+"d c #cccccc",
 "e c #8080ff",
-"a c #d0d0d0",
+"a c #888888",
 /* pixels */
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"ffffffffffffffff",
-"fdddddddddddddda",
-"fdd...ddddddddda",
-"fd.ddd.dddddddda",
-"fd.ddd.dddddddda",
-"fd.....dddddddda",
-"fd.ddd.dddddddda",
-"fd.ddd.dddddddda",
-"fdddddddddddddda",
-"aaaaaaaaaaaaaaaa",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"c..............................c",
+".ffffffffffffffffffffffffffffff.",
+".fdddddddddddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".fddddd....ddddddddddddddddddda.",
+".fdddd......dddddddddddddddddda.",
+".fdddd..dd..dddddddddddddddddda.",
+".fddd..dddd..ddddddddddddddddda.",
+".fddd..dddd..ddddddddddddddddda.",
+".fdd..dddddd..dddddddddddddddda.",
+".fdd..........dddddddddddddddda.",
+".fdd..........dddddddddddddddda.",
+".fdd..dddddd..dddddddddddddddda.",
+".fdd..dddddd..dddddddddddddddda.",
+".fdd..dddddd..dddddddddddddddda.",
+".fdd..dddddd..dddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+"c..............................c",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/flPack.xpm b/fluid/pixmaps/flPack.xpm
index 42257dc60..396ced013 100644
--- a/fluid/pixmaps/flPack.xpm
+++ b/fluid/pixmaps/flPack.xpm
@@ -1,29 +1,45 @@
 /* XPM */
 static const char * const flPack_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 6 1",
+"32 32 6 1",
 /* colors */
 "a c #606060",
-"b c #f0f0f0",
+"b c #2020ff",
 "c c none",
-"d c #c0c0c0",
+"d c #dddddd",
 "e c #8080ff",
 "f c #000000",
 /* pixels */
-"cccccccccccccccc",
-"cccccccccccccccc",
-"dddddddddddddddc",
-"dfffffffffffffdc",
-"dfddfddfddfddfdc",
-"dfddfddfddfddfdc",
-"dfddfddfddfddfdc",
-"dfddfddfddfddfdc",
-"dfddfddfddfddfdc",
-"dfddfddfddfddfdc",
-"dfddfddfddfddfdc",
-"dfddfddfddfddfdc",
-"dfffffffffffffdc",
-"dddddddddddddddc",
-"cccccccccccccccc",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"ffffffffffffffffffffffffffffffcc",
+"ffffffffffffffffffffffffffffffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffffffffffffffffffffffffffffffcc",
+"ffffffffffffffffffffffffffffffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffffffffffffffffffffffffffffffcc",
+"ffffffffffffffffffffffffffffffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffffffffffffffffffffffffffffffcc",
+"ffffffffffffffffffffffffffffffcc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/flProgress.xpm b/fluid/pixmaps/flProgress.xpm
index 38b53f387..fd7f7d048 100644
--- a/fluid/pixmaps/flProgress.xpm
+++ b/fluid/pixmaps/flProgress.xpm
@@ -1,29 +1,46 @@
 /* XPM */
 static const char * const flProgress_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 6 1",
+"32 32 7 1",
 /* colors */
 "f c #606060",
-". c #f0f000",
+". c #ffff00",
 "c c none",
-"d c #ffffff",
+"d c #bbbbbb",
 "e c #8080ff",
 "a c #d0d0d0",
+"x c #000000",
 /* pixels */
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"ffffffffffffffff",
-"f.........ddddda",
-"f.........ddddda",
-"f.........ddddda",
-"f.........ddddda",
-"f.........ddddda",
-"f.........ddddda",
-"aaaaaaaaaaaaaaaa",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxc",
+"xffffffffffffffffffffffffffffffx",
+"xf..................ddddddddddax",
+"xf..................ddddddddddax",
+"xf..................ddddddddddax",
+"xf..................ddddddddddax",
+"xf..................ddddddddddax",
+"xf..................ddddddddddax",
+"xf..................ddddddddddax",
+"xf..................ddddddddddax",
+"xf..................ddddddddddax",
+"xf..................ddddddddddax",
+"xf..................ddddddddddax",
+"xf..................ddddddddddax",
+"xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaax",
+"cxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/flRepeatButton.xpm b/fluid/pixmaps/flRepeatButton.xpm
index c7d387c96..824fa50b1 100644
--- a/fluid/pixmaps/flRepeatButton.xpm
+++ b/fluid/pixmaps/flRepeatButton.xpm
@@ -1,29 +1,47 @@
 /* XPM */
 static const char * const flRepeatButton_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 6 1",
+"32 32 8 1",
 /* colors */
-"a c #606060",
 "' c #000000",
+"a c #808080",
+"b c #2020ff",
 "c c none",
 "d c #a0a0a0",
 "e c #8080ff",
 "f c #d0d0d0",
+"g c #000000",
 /* pixels */
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"ffffffffffffffac",
-"fdddddddddddddac",
-"fdddddddddddddac",
-"fdddddddddddddac",
-"fdddd''d''d''dac",
-"fdddd''d''d''dac",
-"fdddddddddddddac",
-"aaaaaaaaaaaaaaac",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccggggggggggggggggggggggggggccc",
+"ccgffffffffffffffffffffffffffgcc",
+"cgffddddddddddddddddddddddddfagc",
+"cgfddddddddddddddddddddddddddagc",
+"cgfddddddddddddddddddddddddddagc",
+"cgfddddddddddddddddddddddddddagc",
+"cgfddddddddddddddddddddddddddagc",
+"cgfddddddddddddddddddddddddddagc",
+"cgfdddddddddd''dddd''dddd''ddagc",
+"cgfddddddddd''''dd''''dd''''dagc",
+"cgfddddddddd''''dd''''dd''''dagc",
+"cgfdddddddddd''dddd''dddd''ddagc",
+"cgfddddddddddddddddddddddddddagc",
+"cgffddddddddddddddddddddddddaagc",
+"ccgaaaaaaaaaaaaaaaaaaaaaaaaaagcc",
+"cccggggggggggggggggggggggggggccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/flReturnButton.xpm b/fluid/pixmaps/flReturnButton.xpm
index 74c64242a..fed212167 100644
--- a/fluid/pixmaps/flReturnButton.xpm
+++ b/fluid/pixmaps/flReturnButton.xpm
@@ -1,29 +1,46 @@
 /* XPM */
 static const char * const flReturnButton_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 6 1",
+"32 32 7 1",
 /* colors */
-"a c #606060",
-"' c #000000",
+"a c #808080",
+"b c #2020ff",
 "c c none",
 "d c #a0a0a0",
-"e c #8080ff",
+"e c #cccccc",
 "f c #d0d0d0",
+"g c #000000",
 /* pixels */
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"ffffffffffffffac",
-"fdddddddddddddac",
-"fddddddd'dd''dac",
-"fdddddd''dd''dac",
-"fddddd'''''''dac",
-"fdddddd''dddddac",
-"fddddddd'dddddac",
-"aaaaaaaaaaaaaaac",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccggggggggggggggggggggggggggccc",
+"ccgffffffffffffffffffffffffffgcc",
+"cgffddddddddddddddddddddddddfagc",
+"cgfdddddddddddddddddddgggggddagc",
+"cgfdddddddddddggddddddgeeegddagc",
+"cgfddddddddddgegddddddgeeegddagc",
+"cgfdddddddddgeeggggggggeeegddagc",
+"cgfddddddddgeeeeeeeeeeeeeegddagc",
+"cgfdddddddgeeeeeeeeeeeeeeegddagc",
+"cgfddddddddgeeeeeeeeeeeeeegddagc",
+"cgfdddddddddgeeggggggggggggddagc",
+"cgfddddddddddgegdddddddddddddagc",
+"cgfdddddddddddggdddddddddddddagc",
+"cgffddddddddddddddddddddddddaagc",
+"ccgaaaaaaaaaaaaaaaaaaaaaaaaaagcc",
+"cccggggggggggggggggggggggggggccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/flRoller.xpm b/fluid/pixmaps/flRoller.xpm
index f54d5e35b..0df502da7 100644
--- a/fluid/pixmaps/flRoller.xpm
+++ b/fluid/pixmaps/flRoller.xpm
@@ -1,29 +1,51 @@
 /* XPM */
 static const char * const flRoller_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 6 1",
+"32 32 12 1",
 /* colors */
-"a c #e0e0e0",
-"' c #000000",
+"a c #606060",
+". c #ffff00",
 "c c none",
-"d c #c0c0c0",
-"e c #ffffff",
-"f c #606060",
+"d c #bbbbbb",
+"e c #8080ff",
+"f c #dddddd",
+"x c #000000",
+"1 c #555555",
+"2 c #777777",
+"3 c #aaaaaa",
+"4 c #cccccc",
+"5 c #eeeeee",
 /* pixels */
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"aaaaaaaaaaaaaaac",
-"a'f'ee'ddd'dd'f'",
-"a'f'ee'ddd'dd'f'",
-"a'f'ee'ddd'dd'f'",
-"a'f'ee'ddd'dd'f'",
-"a'f'ee'ddd'dd'f'",
-"a'f'ee'ddd'dd'f'",
-"''''''''''''''''",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxc",
+"x12334445555544444433333222211ax",
+"x12334445555544444433333222211ax",
+"x12334445555544444433333222211ax",
+"x12334445555544444433333222211ax",
+"x12334445555544444433333222211ax",
+"x12334445555544444433333222211ax",
+"x12334445555544444433333222211ax",
+"x12334445555544444433333222211ax",
+"x12334445555544444433333222211ax",
+"x12334445555544444433333222211ax",
+"x12334445555544444433333222211ax",
+"x12334445555544444433333222211ax",
+"x12334445555544444433333222211ax",
+"x12334445555544444433333222211ax",
+"cxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/flRoundButton.xpm b/fluid/pixmaps/flRoundButton.xpm
index 6b38b09be..6df3461e5 100644
--- a/fluid/pixmaps/flRoundButton.xpm
+++ b/fluid/pixmaps/flRoundButton.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 static const char * const flRoundButton_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 7 1",
+"32 32 7 1",
 /* colors */
 "a c #606060",
 "b c #2020ff",
@@ -11,20 +11,36 @@ static const char * const flRoundButton_xpm[] = {
 "f c #d0d0d0",
 "# c #000000",
 /* pixels */
-"................",
-"................",
-"......aaa.......",
-"....aadddaa.....",
-"...adddddddf....",
-"...add###ddf....",
-"..add#####ddf...",
-"..add#####ddf...",
-"..add#####ddf...",
-"...add###ddf....",
-"...adddddddf....",
-"....ffdddff.....",
-"......fff.......",
-"................",
-"................",
-"................"
+"................................",
+"................................",
+"................................",
+"................................",
+".............aaaaa..............",
+"...........aaaaaaaaa............",
+".........aaadddddddaaa..........",
+"........aaadddddddddaaa.........",
+".......aadddddddddddddff........",
+"......aadddddddddddddddff.......",
+"......aaddddd#####dddddff.......",
+".....aaddddd#######dddddff......",
+".....aadddd#########ddddff......",
+"....aadddd###########ddddff.....",
+"....aadddd###########ddddff.....",
+"....aadddd###########ddddff.....",
+"....aadddd###########ddddff.....",
+"....aadddd###########ddddff.....",
+".....aadddd#########ddddff......",
+".....aaddddd#######dddddff......",
+"......aaddddd#####dddddff.......",
+"......aadddddddddddddddff.......",
+".......aadddddddddddddff........",
+"........fffdddddddddfff.........",
+".........fffdddddddfff..........",
+"...........fffffffff............",
+".............fffff..............",
+"................................",
+"................................",
+"................................",
+"................................",
+"................................"
 };
diff --git a/fluid/pixmaps/flScroll.xpm b/fluid/pixmaps/flScroll.xpm
index 21f5427a6..16a49f05c 100644
--- a/fluid/pixmaps/flScroll.xpm
+++ b/fluid/pixmaps/flScroll.xpm
@@ -1,29 +1,45 @@
 /* XPM */
 static const char * const flScroll_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 6 1",
+"32 32 6 1",
 /* colors */
 "a c #606060",
-"b c #f0f0f0",
+"b c #999999",
 "c c none",
-"d c #c0c0c0",
-"e c #8080ff",
+"d c #dddddd",
+"e c #bbbbbb",
 "f c #000000",
 /* pixels */
-"cccccccccccccccc",
-"cccccccccccccccc",
-"dddddddddddddddc",
-"dfffffffffffffdc",
-"dfddddddddbbbfdc",
-"dfddddddddbddfdc",
-"dfddddddddbddfdc",
-"dfddddddddbfffdc",
-"dfddddddddbddfdc",
-"dfbbbbbbbbbbbfdc",
-"dfbdddfdddbddfdc",
-"dfbdddfdddbddfdc",
-"dfffffffffffffdc",
-"dddddddddddddddc",
-"cccccccccccccccc",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"ffffffffffffffffffffffffffffffcc",
+"ffffffffffffffffffffffffffffffcc",
+"ffddddddddddddddddddddaaeeeeffcc",
+"ffddddddddddddddddddddaaeeeeffcc",
+"ffddddddddddddddddddddaaeeeeffcc",
+"ffddddddddddddddddddddaaeeeeffcc",
+"ffddddddddddddddddddddaabbbbffcc",
+"ffddddddddddddddddddddaabbbbffcc",
+"ffddddddddddddddddddddaabbbbffcc",
+"ffddddddddddddddddddddaabbbbffcc",
+"ffddddddddddddddddddddaabbbbffcc",
+"ffddddddddddddddddddddaabbbbffcc",
+"ffddddddddddddddddddddaaeeeeffcc",
+"ffddddddddddddddddddddaaeeeeffcc",
+"ffddddddddddddddddddddaaeeeeffcc",
+"ffddddddddddddddddddddaaeeeeffcc",
+"ffaaaaaaaaaaaaaaaaaaaaaaaaaaffcc",
+"ffaaaaaaaaaaaaaaaaaaaaaaaaaaffcc",
+"ffeebbbbbbbbbbeeeeeeeeaaeeeeffcc",
+"ffeebbbbbbbbbbeeeeeeeeaaeeeeffcc",
+"ffeebbbbbbbbbbeeeeeeeeaaeeeeffcc",
+"ffeebbbbbbbbbbeeeeeeeeaaeeeeffcc",
+"ffffffffffffffffffffffffffffffcc",
+"ffffffffffffffffffffffffffffffcc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/flScrollBar.xpm b/fluid/pixmaps/flScrollBar.xpm
index d4223620f..e09c07be7 100644
--- a/fluid/pixmaps/flScrollBar.xpm
+++ b/fluid/pixmaps/flScrollBar.xpm
@@ -1,29 +1,46 @@
 /* XPM */
 static const char * const flScrollBar_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 6 1",
+"32 32 7 1",
 /* colors */
-"a c #606060",
-"b c #2020ff",
+"f c #606060",
+". c #ffff00",
 "c c none",
-"d c #c0c0c0",
+"d c #bbbbbb",
 "e c #8080ff",
-"f c #e0e0e0",
+"a c #dddddd",
+"x c #000000",
 /* pixels */
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"aaaaaaaaaaaaaaaa",
-"adddfffffddddddf",
-"ad'dfdddadddd'df",
-"a''dfdddadddd''f",
-"a''dfdddadddd''f",
-"ad'dfdddadddd'df",
-"adddfaaaaddddddf",
-"afffffffffffffff",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxc",
+"xffffffffffffffffffffffffffffffx",
+"xfdddddddddaaaaaaaaaadddddddddax",
+"xfddddddddaaaaaaaaaaffddddddddax",
+"xfdddxddddaaddddddddffddddxdddax",
+"xfddxxddddaaddddddddffddddxxddax",
+"xfdxxxddddaaddddddddffddddxxxdax",
+"xfxxxxddddaaddddddddffddddxxxxax",
+"xfxxxxddddaaddddddddffddddxxxxax",
+"xfdxxxddddaaddddddddffddddxxxdax",
+"xfddxxddddaaddddddddffddddxxddax",
+"xfdddxddddaaddddddddffddddxdddax",
+"xfddddddddafffffffffffddddddddax",
+"xfdddddddddffffffffffdddddddddax",
+"xfaaaaaaaaaaaaaaaaaaaaaaaaaaaaax",
+"cxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/flSimpleTerminal.xpm b/fluid/pixmaps/flSimpleTerminal.xpm
index 2191ebc57..9305bb66e 100644
--- a/fluid/pixmaps/flSimpleTerminal.xpm
+++ b/fluid/pixmaps/flSimpleTerminal.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 static const char * const flSimpleTerminal_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 6 1",
+"32 32 6 1",
 /* colors */
 "f c #606060",
 ". c #000000",
@@ -10,20 +10,36 @@ static const char * const flSimpleTerminal_xpm[] = {
 "e c #8080ff",
 "a c #d0d0d0",
 /* pixels */
-"cccccccccccccccc",
-"ffffffffffffffff",
-"fdddddddddddddda",
-"fdddddddddddddda",
-"fd.dddddddddddda",
-"fdd.ddddddddddda",
-"fddd.dddddddddda",
-"fdd.ddddddddddda",
-"fd.ddd....ddddda",
-"fdddddddddddddda",
-"fdddddddddddddda",
-"fdddddddddddddda",
-"fdddddddddddddda",
-"fdddddddddddddda",
-"aaaaaaaaaaaaaaaa",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"c..............................c",
+".ffffffffffffffffffffffffffffff.",
+".fdddddddddddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".fdd...ddddddddddddddddddddddda.",
+".fddd...dddddddddddddddddddddda.",
+".fdddd...ddddddddddddddddddddda.",
+".fddddd...dddddddddddddddddddda.",
+".fdddddd...ddddddddddddddddddda.",
+".fddddddd...dddddddddddddddddda.",
+".fddddddd...dddddddddddddddddda.",
+".fdddddd...ddddddddddddddddddda.",
+".fddddd...dddddddddddddddddddda.",
+".fdddd...ddddddddddddddddddddda.",
+".fddd...dddddd........dddddddda.",
+".fdd...ddddddd........dddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+"c..............................c",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/flSlider.xpm b/fluid/pixmaps/flSlider.xpm
index e6b2e5056..1ba98b975 100644
--- a/fluid/pixmaps/flSlider.xpm
+++ b/fluid/pixmaps/flSlider.xpm
@@ -1,29 +1,46 @@
 /* XPM */
 static const char * const flSlider_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 6 1",
+"32 32 7 1",
 /* colors */
-"a c #606060",
-"b c #2020ff",
+"f c #606060",
+". c #ffff00",
 "c c none",
-"d c #c0c0c0",
+"d c #bbbbbb",
 "e c #8080ff",
-"f c #e0e0e0",
+"a c #dddddd",
+"x c #000000",
 /* pixels */
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"aaaaaaaaaaaaaaaa",
-"afffffdddddddddf",
-"afdddadddddddddf",
-"afdddadddddddddf",
-"afdddadddddddddf",
-"afdddadddddddddf",
-"afaaaadddddddddf",
-"afffffffffffffff",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxc",
+"xffffffffffffffffffffffffffffffx",
+"xfdaaaaaaaaaaaadddddddddddddddax",
+"xfaaaaaaaaaaaaffddddddddddddddax",
+"xfaaddddddddddffddddddddddddddax",
+"xfaaddddddddddffddddddddddddddax",
+"xfaaddddddddddffddddddddddddddax",
+"xfaaddddddddddffddddddddddddddax",
+"xfaaddddddddddffddddddddddddddax",
+"xfaaddddddddddffddddddddddddddax",
+"xfaaddddddddddffddddddddddddddax",
+"xfaaddddddddddffddddddddddddddax",
+"xfafffffffffffffddddddddddddddax",
+"xfdffffffffffffdddddddddddddddax",
+"xfaaaaaaaaaaaaaaaaaaaaaaaaaaaaax",
+"cxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/flSpinner.xpm b/fluid/pixmaps/flSpinner.xpm
index f1b3fc178..558743870 100644
--- a/fluid/pixmaps/flSpinner.xpm
+++ b/fluid/pixmaps/flSpinner.xpm
@@ -1,25 +1,46 @@
 /* XPM */
 static const char * const flSpinner_xpm[]={
-"16 16 6 1",
-". c None",
-"c c #000000",
-"d c #606060",
-"b c #c0c0c0",
-"# c #e0e0e0",
-"a c #ffffff",
-"................",
-"................",
-"................",
-"................",
-"###############.",
-"#aaaaaaaaa#bcbd.",
-"#aaaaaacaa#cccd.",
-"#aaaaaccaaddddd.",
-"#aaaaaacaa####d.",
-"#aaaaaccca#cccd.",
-"#aaaaaaaaa#bcbd.",
-"ddddddddddddddd.",
-"................",
-"................",
-"................",
-"................"};
+/* width height ncolors chars_per_pixel */
+"32 32 7 1",
+/* colors */
+"f c #606060",
+". c #ffffff",
+"c c none",
+"d c #bbbbbb",
+"e c #8080ff",
+"a c #dddddd",
+"x c #000000",
+/* pixels */
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxc",
+"xffffffffffffffffffffffffffffffx",
+"xf....................ffddddddax",
+"xf....................ffddxxddax",
+"xf.............xx.....ffdxxxxdax",
+"xf............xxx.....ffxxxxxxax",
+"xf...........xxxx.....ffxxxxxxax",
+"xf...........xxxx.....ffddddddax",
+"xf.............xx.....ffddddddax",
+"xf.............xx.....ffxxxxxxax",
+"xf...........xxxxxx...ffxxxxxxax",
+"xf...........xxxxxx...ffdxxxxdax",
+"xf....................ffddxxddax",
+"xf....................ffddddddax",
+"xfaaaaaaaaaaaaaaaaaaaaaaaaaaaaax",
+"cxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
+};
diff --git a/fluid/pixmaps/flSubmenu.xpm b/fluid/pixmaps/flSubmenu.xpm
index 4496605c1..c417a2c3f 100644
--- a/fluid/pixmaps/flSubmenu.xpm
+++ b/fluid/pixmaps/flSubmenu.xpm
@@ -1,29 +1,48 @@
 /* XPM */
 static const char * const flSubmenu_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 6 1",
+/* width height ncolors chars_per_pixel */
+"32 32 8 1",
 /* colors */
-"a c #606060",
-". c #000000",
+"a c #808080",
+"b c #2020ff",
 "c c none",
-"d c #b0b0b0",
-"e c #d0d0d0",
-"f c #c0c0c0",
+"d c #aaaaaa",
+"e c #bbbbbb",
+"f c #d0d0d0",
+"g c #000000",
+"' c #000000",
 /* pixels */
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccffffccccccccc",
-"c.fffffffccccf.c",
-"c.ffffffffffff.c",
-"c.eeeeeeeeeeee.c",
-"c.ee.eeeee.eee.c",
-"c.e.e.eeee..ee.c",
-"c.e...eeee...e.c",
-"c.e.e.eeee..ee.c",
-"c.e.e.eeee.eee.c",
-"c.eeeeeeeee.....",
-"c.fffffffff.ffff",
-"c.fccccffff.ffff",
-"cccccccccff.ffff",
-"ccccccccccc.ffff"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"ccccccdddddddccccccccccccccccccc",
+"ccccdddddddddddccccccccccccccccc",
+"cgfdddddddddddddccccccccccdagccc",
+"cgfdddddddddddddddccccccdddagccc",
+"cgfddddddddddddddddddddddddagccc",
+"cgfddddddddddddddddddddddddagccc",
+"cgfeeeeeeeeeeeeeeeeeeeeeeeeagccc",
+"cgfeeeeeeeeeeeeeeeeeeeeeeeeagccc",
+"cgfeee'''eeee'eeeeeeeeeeeeeagccc",
+"cgfee'''''eee''eeeeeeeeeeeeagccc",
+"cgfe'''e'''ee'''eeeeeeeeeeeagccc",
+"cgfe''eee''ee''''eeeeeeeeeeagccc",
+"cgfe'''''''ee'''''eeeeeeeeeagccc",
+"cgfe'''''''ee''''eeeeeeeeeeagccc",
+"cgfe''eee''ee'''eggggggggggggggg",
+"cgfe''eee''ee''egfffffffffffffff",
+"cgfe''eee''ee'eegfeeeeeeeeeeeeee",
+"cgfe''eee''eeeeegfeeeeeeeeeeeeee",
+"cgfeeeeeeeeeeeeegfeeeeeeeeeeeeee",
+"cgfeeeeeeeeeeeeegfeeeeeeeeeeeeee",
+"cgfdddddddddddddgfeeeeeeeeeeeeee",
+"cgfdddddddddddddgfeeeeeeeeeeeeee",
+"cgfdddccccccddddgfeeeeeeeeeeeeee",
+"cgfdccccccccccddgfeeeeeeeeeeeeee",
+"ccccccccccccccccgfeeeeeeeeeeeeee",
+"ccccccccccccccccgfeeeeeeeeeeeeee",
+"ccccccccccccccccgfeeeeeeeeeeeeee",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/flTable.xpm b/fluid/pixmaps/flTable.xpm
index 04ae7d38c..589b56a98 100644
--- a/fluid/pixmaps/flTable.xpm
+++ b/fluid/pixmaps/flTable.xpm
@@ -1,29 +1,46 @@
 /* XPM */
 static const char * const flTable_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 6 1",
+"32 32 7 1",
 /* colors */
 "a c #606060",
-"b c #f0f0f0",
+"b c #888888",
 "c c none",
-"d c #c0c0c0",
-"e c #8080ff",
+"d c #ffffff",
+"e c #bbbbbb",
 "f c #000000",
+"x c #9999999",
 /* pixels */
-"cccccccccccccccc",
-"cccccccccccccccc",
-"dddddddddddddddc",
-"dfffffffffffffdc",
-"dfddfddfddfddfdc",
-"dfffffffffffffdc",
-"dfddfddfddfddfdc",
-"dfffffffffffffdc",
-"dfddfddfddfddfdc",
-"dfffffffffffffdc",
-"dfddfddfddfddfdc",
-"dfffffffffffffdc",
-"dfddfddfddfddfdc",
-"dfffffffffffffdc",
-"dddddddddddddddc",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"ffffffffffffffffffffffffffffffcc",
+"ffffffffffffffffffffffffffffffcc",
+"ffddddddddddxxddddddddddaaeeffcc",
+"ffddddddddddxxddddddddddaaeeffcc",
+"ffddddddddddxxddddddddddaaeeffcc",
+"ffddddddddddxxddddddddddaaeeffcc",
+"ffddddddddddxxddddddddddaabbffcc",
+"ffxxxxxxxxxxxxxxxxxxxxxxaabbffcc",
+"ffxxxxxxxxxxxxxxxxxxxxxxaabbffcc",
+"ffddddddddddxxddddddddddaabbffcc",
+"ffddddddddddxxddddddddddaabbffcc",
+"ffddddddddddxxddddddddddaabbffcc",
+"ffddddddddddxxddddddddddaabbffcc",
+"ffddddddddddxxddddddddddaabbffcc",
+"ffddddddddddxxddddddddddaabbffcc",
+"ffxxxxxxxxxxxxxxxxxxxxxxaabbffcc",
+"ffxxxxxxxxxxxxxxxxxxxxxxaabbffcc",
+"ffddddddddddxxddddddddddaaeeffcc",
+"ffddddddddddxxddddddddddaaeeffcc",
+"ffddddddddddxxddddddddddaaeeffcc",
+"ffddddddddddxxddddddddddaaeeffcc",
+"ffddddddddddxxddddddddddaaeeffcc",
+"ffaaaaaaaaaaaaaaaaaaaaaaaaaaffcc",
+"ffaaaaaaaaaaaaaaaaaaaaaaaaaaffcc",
+"ffeebbbbbbbbbbeeeeeeeeeeaaeeffcc",
+"ffeebbbbbbbbbbeeeeeeeeeeaaeeffcc",
+"ffffffffffffffffffffffffffffffcc",
+"ffffffffffffffffffffffffffffffcc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/flTabs.xpm b/fluid/pixmaps/flTabs.xpm
index 23dbb628b..27be1f615 100644
--- a/fluid/pixmaps/flTabs.xpm
+++ b/fluid/pixmaps/flTabs.xpm
@@ -1,29 +1,46 @@
 /* XPM */
 static const char * const flTabs_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 6 1",
+"32 32 7 1",
 /* colors */
 "a c #a0a0a0",
 "b c #2020ff",
 "c c none",
-"d c #c0c0c0",
+"d c #dddddd",
 "e c #8080ff",
 "f c #000000",
+". c #eeeeee",
 /* pixels */
-"cccccccccccccccc",
-"cccccccccccccccc",
-"dddddddddddddddc",
-"ddffffdffffddddc",
-"dfddddfaaaafdddc",
-"dfddddfaaaafdddc",
-"dfddddffffffffdc",
-"dfdddddddddddfdc",
-"dfdddddddddddfdc",
-"dfdddddddddddfdc",
-"dfdddddddddddfdc",
-"dfdddddddddddfdc",
-"dfffffffffffffdc",
-"dddddddddddddddc",
-"cccccccccccccccc",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"ccffffffffffccffffffffcccccccccc",
+"cffffffffffffcfffffffffccccccccc",
+"ff..........ffaaaaaaaaffcccccccc",
+"ff..........ffaaaaaaaaffcccccccc",
+"ff..........ffaaaaaaaaffcccccccc",
+"ff..........ffaaaaaaaaffcccccccc",
+"ff..........ffffffffffffffffffcc",
+"ff..........ffffffffffffffffffcc",
+"ff..........................ffcc",
+"ff..........................ffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffffffffffffffffffffffffffffffcc",
+"ffffffffffffffffffffffffffffffcc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/flTextDisplay.xpm b/fluid/pixmaps/flTextDisplay.xpm
index 109d81825..3c7d6af3f 100644
--- a/fluid/pixmaps/flTextDisplay.xpm
+++ b/fluid/pixmaps/flTextDisplay.xpm
@@ -1,29 +1,45 @@
 /* XPM */
 static const char * const flTextDisplay_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 6 1",
+"32 32 6 1",
 /* colors */
 "f c #606060",
 ". c #000000",
 "c c none",
-"d c #d0d0d0",
+"d c #cccccc",
 "e c #8080ff",
-"a c #d0d0d0",
+"a c #888888",
 /* pixels */
-"cccccccccccccccc",
-"ffffffffffffffff",
-"fdddddddddddddda",
-"fdd...ddddddddda",
-"fd.ddd.dddddddda",
-"fd.ddd.dddddddda",
-"fd.....dddddddda",
-"fd.ddd.dddddddda",
-"fd.ddd.dddddddda",
-"fdddddddddddddda",
-"fdddddddddddddda",
-"fdddddddddddddda",
-"fdddddddddddddda",
-"fdddddddddddddda",
-"aaaaaaaaaaaaaaaa",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"c..............................c",
+".ffffffffffffffffffffffffffffff.",
+".fdddddddddddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".fddddd....ddddddddddddddddddda.",
+".fdddd......dddddddddddddddddda.",
+".fdddd..dd..dddddddddddddddddda.",
+".fddd..dddd..ddddddddddddddddda.",
+".fddd..dddd..ddddddddddddddddda.",
+".fdd..dddddd..dddddddddddddddda.",
+".fdd..........dddddddddddddddda.",
+".fdd..........dddddddddddddddda.",
+".fdd..dddddd..dddddddddddddddda.",
+".fdd..dddddd..dddddddddddddddda.",
+".fdd..dddddd..dddddddddddddddda.",
+".fdd..dddddd..dddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+"c..............................c",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/flTextEdit.xpm b/fluid/pixmaps/flTextEdit.xpm
index 8f6918f78..e9e00cc0f 100644
--- a/fluid/pixmaps/flTextEdit.xpm
+++ b/fluid/pixmaps/flTextEdit.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 static const char * const flTextEdit_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 6 1",
+"32 32 6 1",
 /* colors */
 "f c #606060",
 ". c #000000",
@@ -10,20 +10,36 @@ static const char * const flTextEdit_xpm[] = {
 "e c #8080ff",
 "a c #d0d0d0",
 /* pixels */
-"cccccccccccccccc",
-"ffffffffffffffff",
-"fdddddddddddddda",
-"fdd...dd..ddddda",
-"fd.ddd.d..ddddda",
-"fd.ddd.d..ddddda",
-"fd.....d..ddddda",
-"fd.ddd.d..ddddda",
-"fd.ddd.d..ddddda",
-"fdddddddddddddda",
-"fdddddddddddddda",
-"fdddddddddddddda",
-"fdddddddddddddda",
-"fdddddddddddddda",
-"aaaaaaaaaaaaaaaa",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"c..............................c",
+".ffffffffffffffffffffffffffffff.",
+".fdddddddddddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".fddddd....ddddd....dddddddddda.",
+".fdddd......dddd....dddddddddda.",
+".fdddd..dd..dddd....dddddddddda.",
+".fddd..dddd..ddd....dddddddddda.",
+".fddd..dddd..ddd....dddddddddda.",
+".fdd..dddddd..dd....dddddddddda.",
+".fdd..........dd....dddddddddda.",
+".fdd..........dd....dddddddddda.",
+".fdd..dddddd..dd....dddddddddda.",
+".fdd..dddddd..dd....dddddddddda.",
+".fdd..dddddd..dd....dddddddddda.",
+".fdd..dddddd..dd....dddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+"c..............................c",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/flTile.xpm b/fluid/pixmaps/flTile.xpm
index db72e763a..e3ddf4ae1 100644
--- a/fluid/pixmaps/flTile.xpm
+++ b/fluid/pixmaps/flTile.xpm
@@ -1,29 +1,45 @@
 /* XPM */
 static const char * const flTile_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 6 1",
+"32 32 6 1",
 /* colors */
-"a c #606060",
-"b c #f0f0f0",
+"a c #eeeeee",
+"b c #2020ff",
 "c c none",
-"d c #c0c0c0",
+"d c #dddddd",
 "e c #8080ff",
 "f c #000000",
 /* pixels */
-"cccccccccccccccc",
-"cccccccccccccccc",
-"dddddddddddddddd",
-"dfffffffffffffbd",
-"dfdddddbfdddddbd",
-"dfdddddbfdddddbd",
-"dfdddddbfdddddbdc",
-"dfbbbbbbfbbbbbbd",
-"dfffffffffffffbd",
-"dfdddddbfdddddbd",
-"dfdddddbfdddddbd",
-"dfdddddbfdddddbd",
-"dfbbbbbbfbbbbbbd",
-"dddddddddddddddd",
-"cccccccccccccccc",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"ffffffffffffffffffffffffffffffcc",
+"ffffffffffffffffffffffffffffffcc",
+"ffdddddddddddaaffdddddddddddffcc",
+"ffdddddddddddaaffdddddddddddffcc",
+"ffdddddddddddaaffdddddddddddffcc",
+"ffdddddddddddaaffdddddddddddffcc",
+"ffdddddddffddaaffddffdddddddffcc",
+"ffddddddfffddddddddfffddddddffcc",
+"ffdddddffffddddddddffffdddddffcc",
+"ffddddfffffddddddddfffffddddffcc",
+"ffdddffffffddddddddffffffdddffcc",
+"ffddffffffffffffffffffffffddffcc",
+"ffddffffffffffffffffffffffddffcc",
+"ffdddffffffddddddddffffffdddffcc",
+"ffddddfffffddddddddfffffddddffcc",
+"ffdddddffffddddddddffffdddddffcc",
+"ffddddddfffddddddddfffddddddffcc",
+"ffdddddddffddaaffddffdddddddffcc",
+"ffdddddddddddaaffdddddddddddffcc",
+"ffdddddddddddaaffdddddddddddffcc",
+"ffdddddddddddaaffdddddddddddffcc",
+"ffdddddddddddaaffdddddddddddffcc",
+"ffffffffffffffffffffffffffffffcc",
+"ffffffffffffffffffffffffffffffcc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/flTree.xpm b/fluid/pixmaps/flTree.xpm
index ef93b28ba..b882213ae 100644
--- a/fluid/pixmaps/flTree.xpm
+++ b/fluid/pixmaps/flTree.xpm
@@ -1,30 +1,45 @@
 /* XPM */
 static const char * const flTree_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 7 1",
+"32 32 6 1",
 /* colors */
 "a c #606060",
-"b c #808080",
+"b c #888888",
 "c c none",
-"d c #c0c0c0",
-"e c #ffffff",
+"d c #ffffff",
+"e c #bbbbbb",
 "f c #000000",
-"g c #303030",
 /* pixels */
-"cccccccccccccccc",
-"dddddddddddddddc",
-"dfffffffffffffdc",
-"dfegeeeeeeebbfdc",
-"dfeggggeeeebdfdc",
-"dfegeegeeeebdfdc",
-"dfegeeggggebffdc",
-"dfegeegeeeebdfdc",
-"dfegeeggggebdfdc",
-"dfegeegeegebdfdc",
-"dfegeegeegebdfdc",
-"dfbbbbbbbbbbbfdc",
-"dfbdddfddddbdfdc",
-"dfffffffffffffdc",
-"dddddddddddddddc",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"ffffffffffffffffffffffffffffffcc",
+"ffffffffffffffffffffffffffffffcc",
+"ffddddddddddddddddddddddaaeeffcc",
+"ffddddddddddddddddddddddaaeeffcc",
+"ffddddddddddddddddddddddaaeeffcc",
+"ffddddffddddddddddddddddaaeeffcc",
+"ffddddffddddddddddddddddaabbffcc",
+"ffddddffffffffddddddddddaabbffcc",
+"ffddddffffffffddddddddddaabbffcc",
+"ffddddffddddffddddddddddaabbffcc",
+"ffddddffddddffddddddddddaabbffcc",
+"ffddddffddddffffffffddddaabbffcc",
+"ffddddffddddffffffffddddaabbffcc",
+"ffddddffddddffddddddddddaabbffcc",
+"ffddddffddddffddddddddddaabbffcc",
+"ffddddffddddffddddddddddaabbffcc",
+"ffddddffddddffffffffddddaaeeffcc",
+"ffddddffddddffffffffddddaaeeffcc",
+"ffddddddddddddddddddddddaaeeffcc",
+"ffddddddddddddddddddddddaaeeffcc",
+"ffddddddddddddddddddddddaaeeffcc",
+"ffddddddddddddddddddddddaaeeffcc",
+"ffaaaaaaaaaaaaaaaaaaaaaaaaaaffcc",
+"ffaaaaaaaaaaaaaaaaaaaaaaaaaaffcc",
+"ffeebbbbbbbbbbeeeeeeeeeeaaeeffcc",
+"ffeebbbbbbbbbbeeeeeeeeeeaaeeffcc",
+"ffffffffffffffffffffffffffffffcc",
+"ffffffffffffffffffffffffffffffcc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/flValueInput.xpm b/fluid/pixmaps/flValueInput.xpm
index 654db4011..6125cf8cb 100644
--- a/fluid/pixmaps/flValueInput.xpm
+++ b/fluid/pixmaps/flValueInput.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 static const char * const flValueInput_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 6 1",
+"32 32 6 1",
 /* colors */
 "f c #606060",
 ". c #000000",
@@ -10,20 +10,36 @@ static const char * const flValueInput_xpm[] = {
 "e c #8080ff",
 "a c #d0d0d0",
 /* pixels */
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"ffffffffffffffff",
-"fdddddddddddddda",
-"fdd...dd..ddddda",
-"fd.dd..d..ddddda",
-"fd.d.d.d..ddddda",
-"fd..dd.d..ddddda",
-"fd.ddd.d..ddddda",
-"fdd...dd..ddddda",
-"fdddddddddddddda",
-"aaaaaaaaaaaaaaaa",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"c..............................c",
+".ffffffffffffffffffffffffffffff.",
+".fdddddddddddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".fddddd....ddddd....dddddddddda.",
+".fdddd......dddd....dddddddddda.",
+".fddd..ddd...ddd....dddddddddda.",
+".fdd..ddd..d..dd....dddddddddda.",
+".fdd..ddd..d..dd....dddddddddda.",
+".fdd..dd..dd..dd....dddddddddda.",
+".fdd..dd..dd..dd....dddddddddda.",
+".fdd..d..ddd..dd....dddddddddda.",
+".fdd..d..ddd..dd....dddddddddda.",
+".fddd...ddd..ddd....dddddddddda.",
+".fdddd......dddd....dddddddddda.",
+".fddddd....ddddd....dddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+"c..............................c",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/flValueOutput.xpm b/fluid/pixmaps/flValueOutput.xpm
index 43de42c94..e978a99ab 100644
--- a/fluid/pixmaps/flValueOutput.xpm
+++ b/fluid/pixmaps/flValueOutput.xpm
@@ -1,29 +1,45 @@
 /* XPM */
 static const char * const flValueOutput_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 6 1",
+"32 32 6 1",
 /* colors */
 "f c #606060",
 ". c #000000",
 "c c none",
-"d c #d0d0d0",
+"d c #cccccc",
 "e c #8080ff",
-"a c #d0d0d0",
+"a c #888888",
 /* pixels */
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"ffffffffffffffff",
-"fdddddddddddddda",
-"fdd...ddddddddda",
-"fd.dd..dddddddda",
-"fd.d.d.dddddddda",
-"fd..dd.dddddddda",
-"fd.ddd.dddddddda",
-"fdd...ddddddddda",
-"fdddddddddddddda",
-"aaaaaaaaaaaaaaaa",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"c..............................c",
+".ffffffffffffffffffffffffffffff.",
+".fdddddddddddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".fddddd....ddddddddddddddddddda.",
+".fdddd......dddddddddddddddddda.",
+".fddd..ddd...ddddddddddddddddda.",
+".fdd..ddd..d..dddddddddddddddda.",
+".fdd..ddd..d..dddddddddddddddda.",
+".fdd..dd..dd..dddddddddddddddda.",
+".fdd..dd..dd..dddddddddddddddda.",
+".fdd..d..ddd..dddddddddddddddda.",
+".fdd..d..ddd..dddddddddddddddda.",
+".fddd...ddd..ddddddddddddddddda.",
+".fdddd......dddddddddddddddddda.",
+".fddddd....ddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".fdddddddddddddddddddddddddddda.",
+".aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+"c..............................c",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/flValueSlider.xpm b/fluid/pixmaps/flValueSlider.xpm
index 9e49beeea..292d56dbc 100644
--- a/fluid/pixmaps/flValueSlider.xpm
+++ b/fluid/pixmaps/flValueSlider.xpm
@@ -1,29 +1,46 @@
 /* XPM */
 static const char * const flValueSlider_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 6 1",
+"32 32 7 1",
 /* colors */
-"a c #606060",
-"b c #2020ff",
+"f c #606060",
+". c #ffff00",
 "c c none",
-"d c #c0c0c0",
-"' c #000000",
-"f c #e0e0e0",
+"d c #bbbbbb",
+"e c #8080ff",
+"a c #dddddd",
+"x c #000000",
 /* pixels */
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"aaaaaaaaaaaaaaaa",
-"adddddfffffddddf",
-"add'ddfdddaddddf",
-"ad''ddfdddaddddf",
-"add'ddfdddaddddf",
-"ad'''dfdddaddddf",
-"adddddfaaaaddddf",
-"afffffffffffffff",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxc",
+"xffffffffffffffffffffffffffffffx",
+"xfdddddddddddaaaaaaaaaadddddddax",
+"xfddddddddddaaaaaaaaaaffddddddax",
+"xfddddxxddddaaddddddddffddddddax",
+"xfdddxxxddddaaddddddddffddddddax",
+"xfddxxxxddddaaddddddddffddddddax",
+"xfddxxxxddddaaddddddddffddddddax",
+"xfddddxxddddaaddddddddffddddddax",
+"xfddddxxddddaaddddddddffddddddax",
+"xfddxxxxxxddaaddddddddffddddddax",
+"xfddxxxxxxddaaddddddddffddddddax",
+"xfddddddddddafffffffffffddddddax",
+"xfdddddddddddffffffffffdddddddax",
+"xfaaaaaaaaaaaaaaaaaaaaaaaaaaaaax",
+"cxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/flWidgetClass.xpm b/fluid/pixmaps/flWidgetClass.xpm
index 8fc90bc9d..6b975bf9c 100644
--- a/fluid/pixmaps/flWidgetClass.xpm
+++ b/fluid/pixmaps/flWidgetClass.xpm
@@ -1,31 +1,47 @@
 /* XPM */
 static const char * const flWidgetClass_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 8 1",
+"32 32 8 1",
 /* colors */
 "a c #606060",
 "b c #2020ff",
 "c c none",
-"d c #a0a0a0",
+"d c #bbbbbb",
 "e c #8080ff",
-"f c #d0d0d0",
+"f c #dddddd",
 "g c #c0e0c0",
 "h c #000000",
 /* pixels */
-"cccccccccccccccc",
-"cccccccccccccccc",
-"ffffffffffffffff",
-"feebbbbbbbeebeea",
-"feebbbbbbbeebeea",
-"fdddhhhhhhhhhhda",
-"fddhgggggggghdda",
-"fdhgggggggghddda",
-"fdhgggggggghddda",
-"fdhgggggggghddda",
-"fdhgggggggghddda",
-"fddhgggggggghdda",
-"fdddhhhhhhhhhhda",
-"faaaaaaaaaaaaaaa",
-"cccccccccccccccc",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"ffffffffffffffffffffffffffffffff",
+"feeeeebbbbbbbbbbbbbbeeeeebeeeeea",
+"feeeeebbbbbbbbbbbbbbeeeeebeeeeea",
+"feeeeebbbbbbbbbbbbbbeeeeebeeeeea",
+"feeeeebbbbbbbbbbbbbbeeeeebeeeeea",
+"feeeeebbbbbbbbbbbbbbeeeeebeeeeea",
+"fdddddddhhhhhhhhhhhhhhhhhhhhddda",
+"fddddddhhhhhhhhhhhhhhhhhhhhdddda",
+"fdddddhhgggggggggggggggghhddddda",
+"fddddhhgggggggggggggggghhdddddda",
+"fddddhhgggggggggggggggghhdddddda",
+"fdddhhgggggggggggggggghhddddddda",
+"fdddhhgggggggggggggggghhddddddda",
+"fdddhhgggggggggggggggghhddddddda",
+"fdddhhgggggggggggggggghhddddddda",
+"fdddhhgggggggggggggggghhddddddda",
+"fdddhhgggggggggggggggghhddddddda",
+"fddddhhgggggggggggggggghhdddddda",
+"fddddhhgggggggggggggggghhdddddda",
+"fdddddhhgggggggggggggggghhddddda",
+"fddddddhhhhhhhhhhhhhhhhhhhhdddda",
+"fdddddddhhhhhhhhhhhhhhhhhhhhddda",
+"fdddddddddddddddddddddddddddddda",
+"faaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/flWindow.xpm b/fluid/pixmaps/flWindow.xpm
index 1d8eddd01..ec752a9da 100644
--- a/fluid/pixmaps/flWindow.xpm
+++ b/fluid/pixmaps/flWindow.xpm
@@ -1,29 +1,45 @@
 /* XPM */
 static const char * const flWindow_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 6 1",
+"32 32 6 1",
 /* colors */
 "a c #606060",
 "b c #2020ff",
 "c c none",
-"d c #a0a0a0",
+"d c #bbbbbb",
 "e c #8080ff",
-"f c #d0d0d0",
+"f c #dddddd",
 /* pixels */
-"cccccccccccccccc",
-"cccccccccccccccc",
-"ffffffffffffffff",
-"feebbbbbbbeebeea",
-"feebbbbbbbeebeea",
-"fdddddddddddddda",
-"fdddddddddddddda",
-"fdddddddddddddda",
-"fdddddddddddddda",
-"fdddddddddddddda",
-"fdddddddddddddda",
-"fdddddddddddddda",
-"fdddddddddddddda",
-"faaaaaaaaaaaaaaa",
-"cccccccccccccccc",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"ffffffffffffffffffffffffffffffff",
+"feeeeebbbbbbbbbbbbbbeeeeebeeeeea",
+"feeeeebbbbbbbbbbbbbbeeeeebeeeeea",
+"feeeeebbbbbbbbbbbbbbeeeeebeeeeea",
+"feeeeebbbbbbbbbbbbbbeeeeebeeeeea",
+"feeeeebbbbbbbbbbbbbbeeeeebeeeeea",
+"fdddddddddddddddddddddddddddddda",
+"fdddddddddddddddddddddddddddddda",
+"fdddddddddddddddddddddddddddddda",
+"fdddddddddddddddddddddddddddddda",
+"fdddddddddddddddddddddddddddddda",
+"fdddddddddddddddddddddddddddddda",
+"fdddddddddddddddddddddddddddddda",
+"fdddddddddddddddddddddddddddddda",
+"fdddddddddddddddddddddddddddddda",
+"fdddddddddddddddddddddddddddddda",
+"fdddddddddddddddddddddddddddddda",
+"fdddddddddddddddddddddddddddddda",
+"fdddddddddddddddddddddddddddddda",
+"fdddddddddddddddddddddddddddddda",
+"fdddddddddddddddddddddddddddddda",
+"fdddddddddddddddddddddddddddddda",
+"fdddddddddddddddddddddddddddddda",
+"faaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/flWizard.xpm b/fluid/pixmaps/flWizard.xpm
index 355e95606..5fbd17451 100644
--- a/fluid/pixmaps/flWizard.xpm
+++ b/fluid/pixmaps/flWizard.xpm
@@ -1,29 +1,45 @@
 /* XPM */
 static const char * const flWizard_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 6 1",
+"32 32 6 1",
 /* colors */
 "a c #606060",
-"b c #f0f0f0",
+"b c #bbbbbb",
 "c c none",
-"d c #c0c0c0",
+"d c #dddddd",
 "e c #8080ff",
 "f c #000000",
 /* pixels */
-"cccccccccccccccc",
-"cccccccccccccccc",
-"dddddddddddddddc",
-"dfffffffffffffdc",
-"dfdddddddddddfdc",
-"dfdddddddddddfdc",
-"dfdddddddddddfdc",
-"dfdddddddddddfdc",
-"dfdddddddddddfdc",
-"dfbbbbbbbbbbbfdc",
-"dfbddddfbdbddfdc",
-"dfbddddfbdbddfdc",
-"dfffffffffffffdc",
-"dddddddddddddddc",
-"cccccccccccccccc",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"ffffffffffffffffffffffffffffffcc",
+"ffffffffffffffffffffffffffffffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffddddddddddddddddddddddddddffcc",
+"ffffffffffffffffffffffffffffffcc",
+"ffffffffffffffffffffffffffffffcc",
+"ffbbbbbbbbbbbbffbbbbbbbbbbbbffcc",
+"ffbbbbbbbffbbbffbbbffbbbbbbbffcc",
+"ffbbbbbffffbbbffbbbffffbbbbbffcc",
+"ffbbbffffffbbbffbbbffffffbbbffcc",
+"ffbbbbbffffbbbffbbbffffbbbbbffcc",
+"ffbbbbbbbffbbbffbbbffbbbbbbbffcc",
+"ffbbbbbbbbbbbbffbbbbbbbbbbbbffcc",
+"ffffffffffffffffffffffffffffffcc",
+"ffffffffffffffffffffffffffffffcc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/invisible.xpm b/fluid/pixmaps/invisible.xpm
index a2b04d1a3..1035c876c 100644
--- a/fluid/pixmaps/invisible.xpm
+++ b/fluid/pixmaps/invisible.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 static const char * const invisible_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 6 1",
+"32 32 6 1",
 /* colors */
 "` c #000000",
 "a c #80c080",
@@ -10,20 +10,36 @@ static const char * const invisible_xpm[] = {
 "M c #e0e0e0",
 "e c #408040",
 /* pixels */
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"ccMMMccccccccccc",
-"ccM`Mccccccccccc",
-"MMMMMccccccccccc",
-"M```Mccccccccccc",
-"MMM`Mccccccccccc",
-"ccM`Mccccccccccc",
-"MMM`MMMccccccccc",
-"M`````Mccccccccc",
-"MMMMMMMccccccccc",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"ccccMMMMMMcccccccccccccccccccccc",
+"ccccMMMMMMcccccccccccccccccccccc",
+"ccccMM``MMcccccccccccccccccccccc",
+"ccccMM``MMcccccccccccccccccccccc",
+"MMMMMMMMMMcccccccccccccccccccccc",
+"MMMMMMMMMMcccccccccccccccccccccc",
+"MM``````MMcccccccccccccccccccccc",
+"MM``````MMcccccccccccccccccccccc",
+"MMMMMM``MMcccccccccccccccccccccc",
+"MMMMMM``MMcccccccccccccccccccccc",
+"ccccMM``MMcccccccccccccccccccccc",
+"ccccMM``MMcccccccccccccccccccccc",
+"MMMMMM``MMMMMMcccccccccccccccccc",
+"MMMMMM``MMMMMMcccccccccccccccccc",
+"MM``````````MMcccccccccccccccccc",
+"MM``````````MMcccccccccccccccccc",
+"MMMMMMMMMMMMMMcccccccccccccccccc",
+"MMMMMMMMMMMMMMcccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/lock.xpm b/fluid/pixmaps/lock.xpm
index 05cefb84b..6c489a529 100644
--- a/fluid/pixmaps/lock.xpm
+++ b/fluid/pixmaps/lock.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 static const char * const lock_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 6 1",
+"32 32 6 1",
 /* colors */
 "` c #000000",
 "a c #c08080",
@@ -10,20 +10,36 @@ static const char * const lock_xpm[] = {
 "d c #FFc0c0",
 "e c #804040",
 /* pixels */
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccc```ccc",
-"ccccccccc`daa`cc",
-"cccccccc`da`bd`c",
-"cccccccc`a`c`d`c",
-"ccccccc`````````",
-"ccccccc`dddaaae`",
-"ccccccc`daa`aae`",
-"ccccccc`da`eaae`",
-"ccccccc`da`daee`",
-"ccccccc`````````",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccc`````````ccccc",
+"ccccccccccccccccc``dddddaa``cccc",
+"cccccccccccccccc``daaaaaaae``ccc",
+"cccccccccccccccc`dae`````dae`ccc",
+"cccccccccccccccc`de``ccc``de`ccc",
+"cccccccccccccccc`de`ccccc`de`ccc",
+"cccccccccccccccc`de`ccccc`de`ccc",
+"cccccccccccccccc`de`ccccc`de`ccc",
+"cccccccccccccc`````````````````c",
+"ccccccccccccc``dddddddddddddee``",
+"ccccccccccccc`ddaaaaaaaaaaaaaee`",
+"ccccccccccccc`daaaaaaaaaaaaaaae`",
+"ccccccccccccc`daaaaaa```aaaaaae`",
+"ccccccccccccc`daaaaa`````aaaaae`",
+"ccccccccccccc`daaaaa`````aaaaae`",
+"ccccccccccccc`daaaaaa```aaaaaae`",
+"ccccccccccccc`daaaaa`````aaaaae`",
+"ccccccccccccc`daaaaa`````aaaaae`",
+"ccccccccccccc`daaaae`````eaaaae`",
+"ccccccccccccc`ddaaae`````eaaaee`",
+"ccccccccccccc``ddaaaaaaaaaaaee``",
+"cccccccccccccc`````````````````c",
+"cccccccccccccccccccccccccccccccc"
 };
diff --git a/fluid/pixmaps/protected.xpm b/fluid/pixmaps/protected.xpm
index 0d6fcba00..b893cf6a6 100644
--- a/fluid/pixmaps/protected.xpm
+++ b/fluid/pixmaps/protected.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 static const char * const protected_xpm[] = {
 /* width height ncolors chars_per_pixel */
-"16 16 6 1",
+"32 32 6 1",
 /* colors */
 "` c #000000",
 "a c #80c080",
@@ -10,20 +10,36 @@ static const char * const protected_xpm[] = {
 "d c #c0ffc0",
 "e c #408040",
 /* pixels */
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccccccccc",
-"cccccccccc```ccc",
-"ccccccccc`daa`cc",
-"cccccccc`da`bd`c",
-"cccccccc`a`c`d`c",
-"ccccccc`````````",
-"ccccccc`dddaaae`",
-"ccccccc`daa`aae`",
-"ccccccc`da`eaae`",
-"ccccccc`da`daee`",
-"ccccccc`````````",
-"cccccccccccccccc"
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccc`````````ccccc",
+"ccccccccccccccccc``dddddaa``cccc",
+"cccccccccccccccc``daaaaaaae``ccc",
+"cccccccccccccccc`dae`````dae`ccc",
+"cccccccccccccccc`de``ccc``de`ccc",
+"cccccccccccccccc`de`ccccc`de`ccc",
+"cccccccccccccccc`de`ccccc`de`ccc",
+"cccccccccccccccc`de`ccccc`de`ccc",
+"cccccccccccccc`````````````````c",
+"ccccccccccccc``dddddddddddddee``",
+"ccccccccccccc`ddaaaaaaaaaaaaaee`",
+"ccccccccccccc`daaaaaaaaaaaaaaae`",
+"ccccccccccccc`daaaaaa```aaaaaae`",
+"ccccccccccccc`daaaaa`````aaaaae`",
+"ccccccccccccc`daaaaa`````aaaaae`",
+"ccccccccccccc`daaaaaa```aaaaaae`",
+"ccccccccccccc`daaaaa`````aaaaae`",
+"ccccccccccccc`daaaaa`````aaaaae`",
+"ccccccccccccc`daaaae`````eaaaae`",
+"ccccccccccccc`ddaaae`````eaaaee`",
+"ccccccccccccc``ddaaaaaaaaaaaee``",
+"cccccccccccccc`````````````````c",
+"cccccccccccccccccccccccccccccccc"
 };