add some new capture and filter related handcrafted (toolbar) icons

add "new" capture options feature, which will act like old capture start, and change capture start option (for immediately capture)

rename Capture/Clear to Capture/Restart

svn path=/trunk/; revision=14083

10 files changed, 1932 insertions, 473 deletions

diff --git a/image/toolbar/capture_24.xpm b/image/toolbar/capture_24.xpm
deleted file mode 100644
index 1bc84748b8..0000000000
--- a/image/toolbar/capture_24.xpm
+++ /dev/null
@@ -1,192 +0,0 @@
-/* XPM */
-static char * capture_24_xpm[] = {
-"24 24 165 2",
-"  	c None",
-". 	c #000000",
-"+ 	c #D3D3D3",
-"@ 	c #F6F6F6",
-"# 	c #FFFFFF",
-"$ 	c #F9F9F9",
-"% 	c #DADADA",
-"& 	c #585858",
-"* 	c #C7C7C7",
-"= 	c #D1D1D1",
-"- 	c #D6D6D6",
-"; 	c #FEFEFE",
-"> 	c #FDFDFD",
-", 	c #C0C0C0",
-"' 	c #E1E1E1",
-") 	c #F0F0F0",
-"! 	c #9B9B9B",
-"~ 	c #FCFCFB",
-"{ 	c #FBFBFB",
-"] 	c #AFAFAE",
-"^ 	c #E9E9E9",
-"/ 	c #DFDFDF",
-"( 	c #8F8F8F",
-"_ 	c #FAFAF9",
-": 	c #F9F9F8",
-"< 	c #A4A4A3",
-"[ 	c #F4F4F4",
-"} 	c #CFCFCF",
-"| 	c #A2A2A2",
-"1 	c #F8F8F7",
-"2 	c #F8F7F6",
-"3 	c #9E9E9E",
-"4 	c #010101",
-"5 	c #F7F6F5",
-"6 	c #F6F6F4",
-"7 	c #F4F3F2",
-"8 	c #DEDDDC",
-"9 	c #D3D2D0",
-"0 	c #B7B7B5",
-"a 	c #9F9E9D",
-"b 	c #706F6F",
-"c 	c #65625A",
-"d 	c #D7D7D6",
-"e 	c #0C0C0C",
-"f 	c #C6C5C4",
-"g 	c #060606",
-"h 	c #DDDCDA",
-"i 	c #C4C4C3",
-"j 	c #D0D0CF",
-"k 	c #E4E4E2",
-"l 	c #DAD9D7",
-"m 	c #D8D8D6",
-"n 	c #CDCCCA",
-"o 	c #AFAEAC",
-"p 	c #88847B",
-"q 	c #EEEEEE",
-"r 	c #B2B2B0",
-"s 	c #484641",
-"t 	c #9F9D96",
-"u 	c #888781",
-"v 	c #373736",
-"w 	c #EEEDEB",
-"x 	c #EDECEA",
-"y 	c #E9E8E6",
-"z 	c #D5D4D3",
-"A 	c #C4C3C2",
-"B 	c #8F8A81",
-"C 	c #9D9C98",
-"D 	c #91908A",
-"E 	c #908E86",
-"F 	c #97958E",
-"G 	c #807D74",
-"H 	c #0C0C0B",
-"I 	c #ECEBE9",
-"J 	c #EAE9E7",
-"K 	c #E5E4E2",
-"L 	c #E4E3E0",
-"M 	c #D2D1CE",
-"N 	c #8D887E",
-"O 	c #C3C2C1",
-"P 	c #595854",
-"Q 	c #605E57",
-"R 	c #898883",
-"S 	c #76746B",
-"T 	c #BCBCBA",
-"U 	c #E8E7E5",
-"V 	c #E5E4E1",
-"W 	c #E2E1DE",
-"X 	c #E1DFDC",
-"Y 	c #979288",
-"Z 	c #020202",
-"` 	c #43423F",
-" .	c #282724",
-"..	c #363430",
-"+.	c #6D6B63",
-"@.	c #191919",
-"#.	c #121211",
-"$.	c #A49E93",
-"%.	c #EEEEED",
-"&.	c #B6B5AF",
-"*.	c #21201E",
-"=.	c #0A0908",
-"-.	c #181816",
-";.	c #E6E6E4",
-">.	c #65635C",
-",.	c #E3E2DF",
-"'.	c #E2E0DD",
-").	c #E1E0DC",
-"!.	c #E0DFDB",
-"~.	c #A19C90",
-"{.	c #161614",
-"].	c #8C8B89",
-"^.	c #DFDEDC",
-"/.	c #131313",
-"(.	c #E3E2DE",
-"_.	c #DFDEDA",
-":.	c #DEDDD9",
-"<.	c #DDDCD8",
-"[.	c #A19B90",
-"}.	c #BCBBB9",
-"|.	c #0B0B0B",
-"1.	c #B0AFA9",
-"2.	c #D5D4D1",
-"3.	c #93918B",
-"4.	c #B6B5B2",
-"5.	c #DCDBD7",
-"6.	c #ABA9A3",
-"7.	c #5D5C55",
-"8.	c #DBD9D5",
-"9.	c #D9D7D3",
-"0.	c #9F998D",
-"a.	c #333332",
-"b.	c #080808",
-"c.	c #494943",
-"d.	c #333232",
-"e.	c #DDDBD7",
-"f.	c #DCDAD6",
-"g.	c #D8D6D2",
-"h.	c #9E988D",
-"i.	c #EDEDED",
-"j.	c #C2C1BE",
-"k.	c #B3B2AF",
-"l.	c #181818",
-"m.	c #42413C",
-"n.	c #C1BFBC",
-"o.	c #D8D6D1",
-"p.	c #D7D5D1",
-"q.	c #9D978B",
-"r.	c #E1DFDB",
-"s.	c #E0DEDA",
-"t.	c #131312",
-"u.	c #111111",
-"v.	c #DEDCD8",
-"w.	c #D7D6D1",
-"x.	c #D5D3CE",
-"y.	c #9B958A",
-"z.	c #999891",
-"A.	c #A39E92",
-"B.	c #A39D92",
-"C.	c #A39D91",
-"D.	c #A29C90",
-"E.	c #A19B8F",
-"F.	c #9D978C",
-"G.	c #9B968A",
-"H.	c #676359",
-"                                                ",
-"      . . . . . . . . . . . . .                 ",
-"    . + @ # # # # # # # # $ % & .               ",
-"    . @ # # # # # # # # # # * = - .             ",
-"    . # # # # # # # ; # ; > , ' ) ! .           ",
-"    . # # # # # ; > ~ > ~ { ] ^ # / ( .         ",
-"    . # # # ; > ~ { _ { _ : < ) # [ } | .       ",
-"    . # ; > ~ { _ : 1 : 1 2 3 . . . . . . .     ",
-"    . # ~ { _ : 4 4 4 2 5 6 7 8 9 0 a b c .     ",
-"    . # d e e f g h g i e e j k l m n o p .     ",
-"    . # e q r e s t s e u v e w x y z A B .     ",
-"    . # e C D t t t E F G s H I J K L M N .     ",
-"    . # O e t t P Q R G S e T U V L W X Y .     ",
-"    . Z 4 s t Q `  ...t +.s @.#.V L W X $..     ",
-"    . Z %.&.t P *.=.-.;.G >.Q #.,.'.).!.~..     ",
-"    . Z g s t R ..{.].^.>.s /./.(._.:.<.[..     ",
-"    . # }.|.1.G &.;.2.3.>.|.4.(.!.:.<.5.[..     ",
-"    . # |.&.6.t G G S S 7.s |.!.:.5.8.9.0..     ",
-"    . $ |.a.P b.s S s |.c.d.|.:.e.f.9.g.h..     ",
-"    . i.j.|.|.k.l.m.l.k.|.|.n.e.f.9.o.p.q..     ",
-"    . = r.s._.:.t.u.u.:.s.v.v.f.f.g.w.x.y..     ",
-"    . z.A.$.B.C.B.~.D.~.D.E.[.0.0.F.F.G.H..     ",
-"      . . . . . . . . . . . . . . . . . .       ",
-"                                                "};
diff --git a/image/toolbar/capture_filter_24.xpm b/image/toolbar/capture_filter_24.xpm
new file mode 100644
index 0000000000..e0d0a7b30e
--- /dev/null
+++ b/image/toolbar/capture_filter_24.xpm
@@ -0,0 +1,332 @@
+/* XPM */
+static char * capture_filter_24_xpm[] = {
+"24 24 305 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #FFFFFF",
+"@ 	c #C3D3E4",
+"# 	c #7C7C7C",
+"$ 	c #6A6A6A",
+"% 	c #606060",
+"& 	c #353535",
+"* 	c #BECFE1",
+"= 	c #D8E2ED",
+"- 	c #E6ECF3",
+"; 	c #F2F5F9",
+"> 	c #E2E9F1",
+", 	c #CCD9E7",
+"' 	c #BACCDF",
+") 	c #AFC4DA",
+"! 	c #AEC3D9",
+"~ 	c #9EB8D3",
+"{ 	c #8EACCB",
+"] 	c #86A6C7",
+"^ 	c #5D88B4",
+"/ 	c #656565",
+"( 	c #C5D4E4",
+"_ 	c #DFE7F0",
+": 	c #EBF0F6",
+"< 	c #F8F9FB",
+"[ 	c #D0DCE9",
+"} 	c #B3C7DC",
+"| 	c #A4BCD5",
+"1 	c #93B0CE",
+"2 	c #8AA9C9",
+"3 	c #5E89B5",
+"4 	c #5D5D5D",
+"5 	c #CAD8E7",
+"6 	c #FDFDFE",
+"7 	c #E9EEF4",
+"8 	c #B0C5DB",
+"9 	c #9AB5D1",
+"0 	c #8BAACA",
+"a 	c #F4F6F9",
+"b 	c #ACC2D9",
+"c 	c #95B1CE",
+"d 	c #5F8AB6",
+"e 	c #C3C3C3",
+"f 	c #53654F",
+"g 	c #485642",
+"h 	c #56624B",
+"i 	c #48533F",
+"j 	c #D7E1EC",
+"k 	c #EDF1F6",
+"l 	c #EAEFF5",
+"m 	c #B7CADE",
+"n 	c #A5BDD6",
+"o 	c #6A92BB",
+"p 	c #3F4231",
+"q 	c #474C38",
+"r 	c #4C4F3A",
+"s 	c #464B37",
+"t 	c #333E2D",
+"u 	c #90948E",
+"v 	c #8CA880",
+"w 	c #647B5C",
+"x 	c #6D7D5E",
+"y 	c #637355",
+"z 	c #536047",
+"A 	c #D9E3EE",
+"B 	c #CEDBE9",
+"C 	c #B4C8DD",
+"D 	c #789CC1",
+"E 	c #596348",
+"F 	c #64745B",
+"G 	c #566447",
+"H 	c #68795E",
+"I 	c #505C41",
+"J 	c #4E6043",
+"K 	c #91988C",
+"L 	c #7A8F6C",
+"M 	c #5C7255",
+"N 	c #97A094",
+"O 	c #96A093",
+"P 	c #8E988A",
+"Q 	c #767D72",
+"R 	c #D5E0EC",
+"S 	c #364530",
+"T 	c #636E4E",
+"U 	c #757C71",
+"V 	c #495742",
+"W 	c #6F7C68",
+"X 	c #4C5449",
+"Y 	c #435438",
+"Z 	c #8E968A",
+"` 	c #313131",
+" .	c #6E7F61",
+"..	c #949C91",
+"+.	c #ACACAC",
+"@.	c #B1B1B1",
+"#.	c #AEAEAE",
+"$.	c #AAAAAA",
+"%.	c #868686",
+"&.	c #585957",
+"*.	c #4E5749",
+"=.	c #5E684A",
+"-.	c #BBB49C",
+";.	c #424936",
+">.	c #868E7B",
+",.	c #736C54",
+"'.	c #3C4C32",
+").	c #8D9488",
+"!.	c #5F5F5F",
+"~.	c #6E7F60",
+"{.	c #AFAFAF",
+"].	c #CACACA",
+"^.	c #A0A0A0",
+"/.	c #C2C2C2",
+"(.	c #545752",
+"_.	c #444C3F",
+":.	c #4E5B3F",
+"<.	c #BFB9A2",
+"[.	c #3E4431",
+"}.	c #878E7C",
+"|.	c #746E56",
+"1.	c #303D28",
+"2.	c #515151",
+"3.	c #6B8263",
+"4.	c #A2A2A2",
+"5.	c #8E8E8E",
+"6.	c #A9A9A9",
+"7.	c #8C8C8C",
+"8.	c #C2D2E3",
+"9.	c #4F524E",
+"0.	c #41493C",
+"a.	c #3C4C34",
+"b.	c #C67461",
+"c.	c #3C2B1B",
+"d.	c #887E6C",
+"e.	c #7A2310",
+"f.	c #303C27",
+"g.	c #474747",
+"h.	c #3D4B37",
+"i.	c #727671",
+"j.	c #656863",
+"k.	c #616460",
+"l.	c #5D605C",
+"m.	c #5C5E5A",
+"n.	c #C1D1E2",
+"o.	c #242B21",
+"p.	c #2A3524",
+"q.	c #596245",
+"r.	c #9C9C9C",
+"s.	c #3B4237",
+"t.	c #747C70",
+"u.	c #666666",
+"v.	c #2E3B26",
+"w.	c #8C9387",
+"x.	c #373737",
+"y.	c #7E9A75",
+"z.	c #4B5E44",
+"A.	c #3E473B",
+"B.	c #363D34",
+"C.	c #323830",
+"D.	c #2F342D",
+"E.	c #8DABCA",
+"F.	c #151A12",
+"G.	c #4C5139",
+"H.	c #3D4D34",
+"I.	c #394930",
+"J.	c #2F3B28",
+"K.	c #3E4E34",
+"L.	c #252E1E",
+"M.	c #303D27",
+"N.	c #8B9286",
+"O.	c #809B76",
+"P.	c #586E51",
+"Q.	c #616C4D",
+"R.	c #545B42",
+"S.	c #4F553D",
+"T.	c #4C513A",
+"U.	c #494E38",
+"V.	c #2B3624",
+"W.	c #565E42",
+"X.	c #566244",
+"Y.	c #506242",
+"Z.	c #616C4B",
+"`.	c #556142",
+" +	c #5E6646",
+".+	c #38472D",
+"++	c #8B9186",
+"@+	c #7E9A74",
+"#+	c #7B8562",
+"$+	c #58684A",
+"%+	c #43543C",
+"&+	c #5B6548",
+"*+	c #3C4C35",
+"=+	c #5A6346",
+"-+	c #686E4E",
+";+	c #5A6446",
+">+	c #5F6A4A",
+",+	c #64704E",
+"'+	c #687451",
+")+	c #687551",
+"!+	c #6E7C5E",
+"~+	c #9FA194",
+"{+	c #959595",
+"]+	c #2D2D2D",
+"^+	c #7C9671",
+"/+	c #A0A086",
+"(+	c #766E52",
+"_+	c #888B76",
+":+	c #868874",
+"<+	c #858772",
+"[+	c #545C41",
+"}+	c #44563A",
+"|+	c #4D6141",
+"1+	c #79825A",
+"2+	c #506442",
+"3+	c #5C6E50",
+"4+	c #7F867B",
+"5+	c #545454",
+"6+	c #909090",
+"7+	c #56534E",
+"8+	c #B6B6B6",
+"9+	c #939393",
+"0+	c #878787",
+"a+	c #77906D",
+"b+	c #80805C",
+"c+	c #323124",
+"d+	c #5B593E",
+"e+	c #343325",
+"f+	c #626245",
+"g+	c #5A583E",
+"h+	c #302E22",
+"i+	c #5F6246",
+"j+	c #677450",
+"k+	c #77805A",
+"l+	c #4F6442",
+"m+	c #5F7153",
+"n+	c #7E8479",
+"o+	c #4F4F4F",
+"p+	c #575757",
+"q+	c #505050",
+"r+	c #4E4E4E",
+"s+	c #383838",
+"t+	c #738C69",
+"u+	c #556A4C",
+"v+	c #646B4D",
+"w+	c #575F44",
+"x+	c #404D36",
+"y+	c #606648",
+"z+	c #575F43",
+"A+	c #3D4832",
+"B+	c #5B6044",
+"C+	c #545F42",
+"D+	c #566645",
+"E+	c #707A55",
+"F+	c #757E57",
+"G+	c #646F4C",
+"H+	c #565F48",
+"I+	c #171D12",
+"J+	c #10150D",
+"K+	c #7A7C79",
+"L+	c #060606",
+"M+	c #41503C",
+"N+	c #637D58",
+"O+	c #808660",
+"P+	c #606E4E",
+"Q+	c #6A7553",
+"R+	c #7D835E",
+"S+	c #5C6A4A",
+"T+	c #687351",
+"U+	c #7A7F5A",
+"V+	c #5B6A49",
+"W+	c #6C7752",
+"X+	c #7E845D",
+"Y+	c #5B6C48",
+"Z+	c #69744F",
+"`+	c #293422",
+" @	c #181F14",
+".@	c #14180F",
+"+@	c #0F130C",
+"@@	c #3A4833",
+"#@	c #C8BA89",
+"$@	c #8C9068",
+"%@	c #8C8F67",
+"&@	c #C8B988",
+"*@	c #8B8E66",
+"=@	c #8A8E65",
+"-@	c #C7B888",
+";@	c #8A8C64",
+">@	c #8A8D64",
+",@	c #898B62",
+"'@	c #868760",
+")@	c #161C12",
+"!@	c #2E3B29",
+"~@	c #C6B888",
+"{@	c #898B64",
+"]@	c #888A63",
+"^@	c #C6B887",
+"/@	c #888A62",
+"(@	c #878A62",
+"_@	c #C6B786",
+":@	c #878861",
+"<@	c #868860",
+"[@	c #83845D",
+"}@	c #181E13",
+"|@	c #3A3A3A",
+"                                                ",
+"  . . . . . . . . . . . . . . . . .     . .     ",
+"  . + + + + + + + + + + + + + + @ .   # $ % &   ",
+"  . * = - ; + ; > , ' ) ! ~ { ] ^ .   / .       ",
+"    . ( _ : < < - [ * } | 1 2 3 .     4 .       ",
+"      . 5 - ; 6 7 [ * 8 9 0 3 .       4 .       ",
+"        . [ : a - 5 * b c d .         e .       ",
+"  f g h i . j k l 5 m n o . p q r s t u .       ",
+". v w x y z . A l B C D . E F G H I J K .       ",
+". L M N O P Q . A R ] . S T U V W X Y Z `       ",
+".  ...+.@.#.$.%.. 5 . &.*.=.-.;.>.,.'.).!.      ",
+". ~.N +.{.].^./.. @ . (._.:.<.[.}.|.1.).2.      ",
+". 3.N 4.5.6.# 7.. 8.. 9.0.a.b.c.d.e.f.).g.      ",
+".  .h.i.j.k.l.m.. n.. o.p.q.r.s.t.u.v.w.x.      ",
+". y.z.A.B.C.C.D.. E.. F.G.H.I.J.K.L.M.N..       ",
+". O.P.Q.R.S.T.U.. . . V.W.X.Y.Z.`. +.+++.       ",
+". @+#+$+%+&+*+=+a.-+;+>+,+'+)+!+~+u.u.{+]+/ x.  ",
+". ^+/+(+_+(+:+(+<+(+[+}+|+1+2+3+4+5+5+6+7+8+9+0+",
+". a+b+c+d+e+f+e+g+h+i+>+j+k+l+m+n+o+p+6+q+$.r+s+",
+". t+u+v+w+x+y+z+A+B+C+D+E+l+F+G+H+I+J+K+L+.     ",
+"  M+N+O+P+Q+R+S+T+U+V+W+X+Y+Z+`+ @.@+@4 .       ",
+"    @@#@$@%@&@*@=@-@;@>@-@,@'@)@      4 .       ",
+"    !@~@{@]@^@/@(@_@:@<@_@<@[@}@      4 .       ",
+"      . . . . . . . . . . . .         |@        "};
diff --git a/image/toolbar/capture_interfaces_24.xpm b/image/toolbar/capture_interfaces_24.xpm
new file mode 100644
index 0000000000..5c19c437fd
--- /dev/null
+++ b/image/toolbar/capture_interfaces_24.xpm
@@ -0,0 +1,246 @@
+/* XPM */
+static char * capture_interfaces_24_xpm[] = {
+"24 24 219 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #202020",
+"@ 	c #2A2A2A",
+"# 	c #292929",
+"$ 	c #282828",
+"% 	c #FCFCFC",
+"& 	c #FBFBFB",
+"* 	c #FAFAFA",
+"= 	c #F9F9F9",
+"- 	c #F7F7F7",
+"; 	c #F6F6F6",
+"> 	c #F5F5F5",
+", 	c #F4F4F4",
+"' 	c #F3F3F3",
+") 	c #F1F1F1",
+"! 	c #F0F0F0",
+"~ 	c #EFEFEF",
+"{ 	c #EEEEEE",
+"] 	c #7C7C7C",
+"^ 	c #6A6A6A",
+"/ 	c #606060",
+"( 	c #353535",
+"_ 	c #EDEDED",
+": 	c #656565",
+"< 	c #EBEBEB",
+"[ 	c #EAEAEA",
+"} 	c #F8F8F8",
+"| 	c #5D5D5D",
+"1 	c #E9E9E9",
+"2 	c #E8E8E8",
+"3 	c #C3C3C3",
+"4 	c #E7E7E7",
+"5 	c #4C4F3A",
+"6 	c #464B37",
+"7 	c #333E2D",
+"8 	c #90948E",
+"9 	c #4B6983",
+"0 	c #68795E",
+"a 	c #505C41",
+"b 	c #4E6043",
+"c 	c #91988C",
+"d 	c #E5E5E5",
+"e 	c #6F7C68",
+"f 	c #4C5449",
+"g 	c #435438",
+"h 	c #8E968A",
+"i 	c #313131",
+"j 	c #868E7B",
+"k 	c #736C54",
+"l 	c #3C4C32",
+"m 	c #8D9488",
+"n 	c #5F5F5F",
+"o 	c #E4E4E4",
+"p 	c #E2E2E2",
+"q 	c #878E7C",
+"r 	c #746E56",
+"s 	c #303D28",
+"t 	c #515151",
+"u 	c #E3E3E3",
+"v 	c #E1E1E1",
+"w 	c #887E6C",
+"x 	c #7A2310",
+"y 	c #303C27",
+"z 	c #474747",
+"A 	c #B9B9B9",
+"B 	c #BFBFBF",
+"C 	c #222620",
+"D 	c #747C70",
+"E 	c #666666",
+"F 	c #2E3B26",
+"G 	c #8C9387",
+"H 	c #373737",
+"I 	c #4C5D47",
+"J 	c #030302",
+"K 	c #192015",
+"L 	c #273121",
+"M 	c #3E4E34",
+"N 	c #252E1E",
+"O 	c #303D27",
+"P 	c #8B9286",
+"Q 	c #809B76",
+"R 	c #586E51",
+"S 	c #616C4D",
+"T 	c #545B42",
+"U 	c #4F553D",
+"V 	c #4C513A",
+"W 	c #494E38",
+"X 	c #484D37",
+"Y 	c #484C36",
+"Z 	c #2B3624",
+"` 	c #565E42",
+" .	c #566244",
+"..	c #506242",
+"+.	c #616C4B",
+"@.	c #556142",
+"#.	c #5E6646",
+"$.	c #38472D",
+"%.	c #8B9186",
+"&.	c #7E9A74",
+"*.	c #7B8562",
+"=.	c #58684A",
+"-.	c #43543C",
+";.	c #5B6548",
+">.	c #3C4C35",
+",.	c #5A6346",
+"'.	c #3C4C34",
+").	c #686E4E",
+"!.	c #5A6446",
+"~.	c #5F6A4A",
+"{.	c #64704E",
+"].	c #687451",
+"^.	c #687551",
+"/.	c #6E7C5E",
+"(.	c #9FA194",
+"_.	c #959595",
+":.	c #2D2D2D",
+"<.	c #7C9671",
+"[.	c #A0A086",
+"}.	c #766E52",
+"|.	c #888B76",
+"1.	c #868874",
+"2.	c #858772",
+"3.	c #545C41",
+"4.	c #44563A",
+"5.	c #4D6141",
+"6.	c #79825A",
+"7.	c #506442",
+"8.	c #5C6E50",
+"9.	c #7F867B",
+"0.	c #545454",
+"a.	c #909090",
+"b.	c #56534E",
+"c.	c #B6B6B6",
+"d.	c #939393",
+"e.	c #878787",
+"f.	c #77906D",
+"g.	c #80805C",
+"h.	c #323124",
+"i.	c #5B593E",
+"j.	c #343325",
+"k.	c #626245",
+"l.	c #5A583E",
+"m.	c #302E22",
+"n.	c #5F6246",
+"o.	c #677450",
+"p.	c #77805A",
+"q.	c #4F6442",
+"r.	c #5F7153",
+"s.	c #7E8479",
+"t.	c #4F4F4F",
+"u.	c #575757",
+"v.	c #505050",
+"w.	c #AAAAAA",
+"x.	c #4E4E4E",
+"y.	c #383838",
+"z.	c #738C69",
+"A.	c #556A4C",
+"B.	c #646B4D",
+"C.	c #575F44",
+"D.	c #404D36",
+"E.	c #606648",
+"F.	c #575F43",
+"G.	c #3D4832",
+"H.	c #5B6044",
+"I.	c #545F42",
+"J.	c #566645",
+"K.	c #707A55",
+"L.	c #757E57",
+"M.	c #646F4C",
+"N.	c #565F48",
+"O.	c #171D12",
+"P.	c #10150D",
+"Q.	c #7A7C79",
+"R.	c #060606",
+"S.	c #41503C",
+"T.	c #637D58",
+"U.	c #808660",
+"V.	c #606E4E",
+"W.	c #6A7553",
+"X.	c #7D835E",
+"Y.	c #5C6A4A",
+"Z.	c #687351",
+"`.	c #7A7F5A",
+" +	c #5B6A49",
+".+	c #6C7752",
+"++	c #7E845D",
+"@+	c #5B6C48",
+"#+	c #69744F",
+"$+	c #293422",
+"%+	c #181F14",
+"&+	c #14180F",
+"*+	c #0F130C",
+"=+	c #3A4833",
+"-+	c #C8BA89",
+";+	c #8C9068",
+">+	c #8C8F67",
+",+	c #C8B988",
+"'+	c #8B8E66",
+")+	c #8A8E65",
+"!+	c #C7B888",
+"~+	c #8A8C64",
+"{+	c #8A8D64",
+"]+	c #898B62",
+"^+	c #868760",
+"/+	c #161C12",
+"(+	c #2E3B29",
+"_+	c #C6B888",
+":+	c #898B64",
+"<+	c #888A63",
+"[+	c #C6B887",
+"}+	c #888A62",
+"|+	c #878A62",
+"1+	c #C6B786",
+"2+	c #878861",
+"3+	c #868860",
+"4+	c #83845D",
+"5+	c #181E13",
+"6+	c #3A3A3A",
+"  . . . . . . . . . . . . . .                   ",
+". + @ @ @ # # # # # $ $ $ $ + .         . .     ",
+". % & * = - ; > , ' ) ! ~ { = .       ] ^ / (   ",
+". & * . . . . . . . . ~ . _ = .       : .       ",
+". = - ; > , ' ) ! ~ { _ < [ } .       | .       ",
+". - ; . . . . . . . . < . 1 - .       | .       ",
+". ; > , ' ) ! ~ { _ < [ 1 2 - .       3 .       ",
+". > , . . . . . . . . 1 . 4 ; . 5 6 7 8 .       ",
+". , 9 9 9 9 9 9 9 9 9 9 9 9 ; . 0 a b c .       ",
+". ' 9 ! ~ { _ < [ 1 2 9 d 9 ; . e f g h i       ",
+". ) 9 9 9 9 9 9 9 9 9 9 9 9 ; . j k l m n       ",
+". ! ~ . . . . . . . . o . p > . q r s m t       ",
+". ~ { _ < [ 1 2 4 d o u p v > . w x y m z       ",
+". A = = } } - - ; ; ; ; > > B C D E F G H       ",
+". I . . . . . . . . . . . J K L M N O P .       ",
+". Q R S T U V W X Y Y Z `  ...+.@.#.$.%..       ",
+". &.*.=.-.;.>.,.'.).!.~.{.].^./.(.E E _.:.: H   ",
+". <.[.}.|.}.1.}.2.}.3.4.5.6.7.8.9.0.0.a.b.c.d.e.",
+". f.g.h.i.j.k.j.l.m.n.~.o.p.q.r.s.t.u.a.v.w.x.y.",
+". z.A.B.C.D.E.F.G.H.I.J.K.q.L.M.N.O.P.Q.R..     ",
+"  S.T.U.V.W.X.Y.Z.`. +.+++@+#+$+%+&+*+| .       ",
+"    =+-+;+>+,+'+)+!+~+{+!+]+^+/+      | .       ",
+"    (+_+:+<+[+}+|+1+2+3+1+3+4+5+      | .       ",
+"      . . . . . . . . . . . .         6+        "};
diff --git a/image/toolbar/capture_options_24.xpm b/image/toolbar/capture_options_24.xpm
new file mode 100644
index 0000000000..1823101edc
--- /dev/null
+++ b/image/toolbar/capture_options_24.xpm
@@ -0,0 +1,288 @@
+/* XPM */
+static char * capture_options_24_xpm[] = {
+"24 24 261 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #FFFFFF",
+"@ 	c #EFEFEF",
+"# 	c #7C7C7C",
+"$ 	c #6A6A6A",
+"% 	c #606060",
+"& 	c #353535",
+"* 	c #656565",
+"= 	c #C3C3C3",
+"- 	c #5D5D5D",
+"; 	c #53654F",
+"> 	c #4D5A47",
+", 	c #687060",
+"' 	c #525D47",
+") 	c #57634C",
+"! 	c #47523E",
+"~ 	c #515540",
+"{ 	c #51543F",
+"] 	c #4C4F3B",
+"^ 	c #4C503C",
+"/ 	c #474C38",
+"( 	c #4C4F3A",
+"_ 	c #464B37",
+": 	c #333E2D",
+"< 	c #90948E",
+"[ 	c #8CA880",
+"} 	c #6A8063",
+"| 	c #717C66",
+"1 	c #627254",
+"2 	c #5F6F51",
+"3 	c #576449",
+"4 	c #4C5E44",
+"5 	c #4E6146",
+"6 	c #6C7857",
+"7 	c #64745B",
+"8 	c #566447",
+"9 	c #68795E",
+"0 	c #505C41",
+"a 	c #4E6043",
+"b 	c #91988C",
+"c 	c #7A8F6C",
+"d 	c #697D62",
+"e 	c #90968D",
+"f 	c #8D968A",
+"g 	c #8C9588",
+"h 	c #8A9286",
+"i 	c #35432F",
+"j 	c #42533A",
+"k 	c #636E4E",
+"l 	c #757C71",
+"m 	c #495742",
+"n 	c #6F7C68",
+"o 	c #4C5449",
+"p 	c #435438",
+"q 	c #8E968A",
+"r 	c #313131",
+"s 	c #79896D",
+"t 	c #A0A0A1",
+"u 	c #9D9D9D",
+"v 	c #959595",
+"w 	c #6A6C69",
+"x 	c #4E5749",
+"y 	c #5E684A",
+"z 	c #BBB49C",
+"A 	c #424936",
+"B 	c #868E7B",
+"C 	c #736C54",
+"D 	c #3C4C32",
+"E 	c #8D9488",
+"F 	c #5F5F5F",
+"G 	c #010101",
+"H 	c #BBBBBB",
+"I 	c #545752",
+"J 	c #444C3F",
+"K 	c #4E5B3F",
+"L 	c #BFB9A2",
+"M 	c #3E4431",
+"N 	c #878E7C",
+"O 	c #746E56",
+"P 	c #303D28",
+"Q 	c #515151",
+"R 	c #808080",
+"S 	c #5E5F5F",
+"T 	c #4F524E",
+"U 	c #41493C",
+"V 	c #3C4C34",
+"W 	c #C67461",
+"X 	c #3C2B1B",
+"Y 	c #887E6C",
+"Z 	c #7A2310",
+"` 	c #303C27",
+" .	c #474747",
+"..	c #6F706C",
+"+.	c #6A6C68",
+"@.	c #565955",
+"#.	c #545653",
+"$.	c #242B21",
+"%.	c #2A3524",
+"&.	c #596245",
+"*.	c #9C9C9C",
+"=.	c #3B4237",
+"-.	c #747C70",
+";.	c #666666",
+">.	c #2E3B26",
+",.	c #8C9387",
+"'.	c #373737",
+").	c #7F9876",
+"!.	c #494F47",
+"~.	c #373C35",
+"{.	c #343833",
+"].	c #2E322C",
+"^.	c #2D312B",
+"/.	c #151A12",
+"(.	c #4C5139",
+"_.	c #3D4D34",
+":.	c #394930",
+"<.	c #2F3B28",
+"[.	c #3E4E34",
+"}.	c #252E1E",
+"|.	c #303D27",
+"1.	c #8B9286",
+"2.	c #809A76",
+"3.	c #586E51",
+"4.	c #616C4D",
+"5.	c #545B42",
+"6.	c #4F553D",
+"7.	c #4C513A",
+"8.	c #494E38",
+"9.	c #484D37",
+"0.	c #484C36",
+"a.	c #2B3624",
+"b.	c #565E42",
+"c.	c #566244",
+"d.	c #506242",
+"e.	c #616C4B",
+"f.	c #556142",
+"g.	c #5E6646",
+"h.	c #38472D",
+"i.	c #8B9186",
+"j.	c #7E9A74",
+"k.	c #7B8562",
+"l.	c #58684A",
+"m.	c #43543C",
+"n.	c #5B6548",
+"o.	c #3B4B34",
+"p.	c #5A6346",
+"q.	c #686E4E",
+"r.	c #5A6446",
+"s.	c #5F6A4A",
+"t.	c #64704E",
+"u.	c #687451",
+"v.	c #687551",
+"w.	c #6E7C5E",
+"x.	c #9FA194",
+"y.	c #2D2D2D",
+"z.	c #7C9671",
+"A.	c #A0A086",
+"B.	c #726A4F",
+"C.	c #838672",
+"D.	c #766E52",
+"E.	c #80826F",
+"F.	c #848671",
+"G.	c #535B40",
+"H.	c #44563A",
+"I.	c #4D6141",
+"J.	c #79825A",
+"K.	c #506442",
+"L.	c #5C6E50",
+"M.	c #7F867B",
+"N.	c #545454",
+"O.	c #535353",
+"P.	c #8F8F8F",
+"Q.	c #56534E",
+"R.	c #B6B6B6",
+"S.	c #939393",
+"T.	c #878787",
+"U.	c #77906D",
+"V.	c #80805C",
+"W.	c #323124",
+"X.	c #5B593E",
+"Y.	c #343325",
+"Z.	c #626245",
+"`.	c #5A583E",
+" +	c #302E22",
+".+	c #5F6246",
+"++	c #677450",
+"@+	c #77805A",
+"#+	c #4F6442",
+"$+	c #5F7153",
+"%+	c #7E8479",
+"&+	c #4F4F4F",
+"*+	c #575757",
+"=+	c #909090",
+"-+	c #505050",
+";+	c #AAAAAA",
+">+	c #4E4E4E",
+",+	c #383838",
+"'+	c #738C69",
+")+	c #556A4C",
+"!+	c #646B4D",
+"~+	c #575F44",
+"{+	c #404D36",
+"]+	c #606648",
+"^+	c #575F43",
+"/+	c #3D4832",
+"(+	c #5B6044",
+"_+	c #545F42",
+":+	c #566645",
+"<+	c #707A55",
+"[+	c #757E57",
+"}+	c #646F4C",
+"|+	c #565F48",
+"1+	c #171D12",
+"2+	c #10150D",
+"3+	c #7A7C79",
+"4+	c #060606",
+"5+	c #41503C",
+"6+	c #637D58",
+"7+	c #808660",
+"8+	c #606E4E",
+"9+	c #6A7553",
+"0+	c #7D835E",
+"a+	c #5C6A4A",
+"b+	c #687351",
+"c+	c #7A7F5A",
+"d+	c #5B6A49",
+"e+	c #6C7752",
+"f+	c #7E845D",
+"g+	c #5B6C48",
+"h+	c #69744F",
+"i+	c #293422",
+"j+	c #181F14",
+"k+	c #14180F",
+"l+	c #0F130C",
+"m+	c #3A4833",
+"n+	c #C8BA89",
+"o+	c #8C9068",
+"p+	c #8C8F67",
+"q+	c #C8B988",
+"r+	c #8B8E66",
+"s+	c #8A8E65",
+"t+	c #C7B888",
+"u+	c #8A8C64",
+"v+	c #8A8D64",
+"w+	c #898B62",
+"x+	c #868760",
+"y+	c #161C12",
+"z+	c #2E3B29",
+"A+	c #C6B888",
+"B+	c #898B64",
+"C+	c #888A63",
+"D+	c #C6B887",
+"E+	c #888A62",
+"F+	c #878A62",
+"G+	c #C6B786",
+"H+	c #878861",
+"I+	c #868860",
+"J+	c #83845D",
+"K+	c #181E13",
+"L+	c #3A3A3A",
+"                                                ",
+"    . .     . .                         . .     ",
+"  . + .     . @ .                     # $ % &   ",
+"  . + . . . . @ .                     * .       ",
+"  . + @ @ @ @ = .                     - .       ",
+"    . + @ @ = .                       - .       ",
+"      . + = .                         = .       ",
+"  ; > . + @ . , ' ) ! ~ { ] ^ / ( _ : < .       ",
+". [ } . + = . | 1 2 3 4 5 6 7 8 9 0 a b .       ",
+". c d . + @ . e f g h i j k l m n o p q r       ",
+". s . + @ = = . t u v w x y z A B C D E F       ",
+"G . + @ @ @ @ = . H $ I J K L M N O P E Q       ",
+"G . + . . . . @ . R S T U V W X Y Z ` E  .      ",
+"G . + . ..+.. @ . @.#.$.%.&.*.=.-.;.>.,.'.      ",
+"G ).. . !.~.. . {.].^./.(._.:.<.[.}.|.1..       ",
+". 2.3.4.5.6.7.8.9.0.0.a.b.c.d.e.f.g.h.i..       ",
+". j.k.l.m.n.o.p.V q.r.s.t.u.v.w.x.;.;.v y.* '.  ",
+". z.A.B.C.D.E.D.F.D.G.H.I.J.K.L.M.N.O.P.Q.R.S.T.",
+". U.V.W.X.Y.Z.Y.`. +.+s.++@+#+$+%+&+*+=+-+;+>+,+",
+". '+)+!+~+{+]+^+/+(+_+:+<+#+[+}+|+1+2+3+4+.     ",
+"  5+6+7+8+9+0+a+b+c+d+e+f+g+h+i+j+k+l+- .       ",
+"    m+n+o+p+q+r+s+t+u+v+t+w+x+y+      - .       ",
+"    z+A+B+C+D+E+F+G+H+I+G+I+J+K+      - .       ",
+"      . . . . . . . . . . . .         L+        "};
diff --git a/image/toolbar/capture_restart_24.xpm b/image/toolbar/capture_restart_24.xpm
new file mode 100644
index 0000000000..8b24e7d8e3
--- /dev/null
+++ b/image/toolbar/capture_restart_24.xpm
@@ -0,0 +1,297 @@
+/* XPM */
+static char * capture_restart_24_xpm[] = {
+"24 24 270 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #F7F3DF",
+"@ 	c #7C7C7C",
+"# 	c #6A6A6A",
+"$ 	c #606060",
+"% 	c #353535",
+"& 	c #F9F6EA",
+"* 	c #EED680",
+"= 	c #656565",
+"- 	c #303030",
+"; 	c #F9F5E4",
+"> 	c #F4E4AD",
+", 	c #F7EECC",
+"' 	c #EFE4C2",
+") 	c #948A6F",
+"! 	c #5D5D5D",
+"~ 	c #F9F5E6",
+"{ 	c #F1DD97",
+"] 	c #D1B051",
+"^ 	c #F2EFE4",
+"/ 	c #C0A048",
+"( 	c #C3C3C3",
+"_ 	c #C3A970",
+": 	c #D1940C",
+"< 	c #E0B74C",
+"[ 	c #D9C374",
+"} 	c #2C2E22",
+"| 	c #4C503C",
+"1 	c #474C38",
+"2 	c #4C4F3A",
+"3 	c #464B37",
+"4 	c #333E2D",
+"5 	c #90948E",
+"6 	c #8CA880",
+"7 	c #BCA36B",
+"8 	c #D59D1C",
+"9 	c #B1933F",
+"0 	c #64745B",
+"a 	c #566447",
+"b 	c #68795E",
+"c 	c #505C41",
+"d 	c #4E6043",
+"e 	c #91988C",
+"f 	c #7A8F6C",
+"g 	c #5C7255",
+"h 	c #BEA56F",
+"i 	c #986B07",
+"j 	c #DFB74A",
+"k 	c #CCB76D",
+"l 	c #757C71",
+"m 	c #495742",
+"n 	c #6F7C68",
+"o 	c #4C5449",
+"p 	c #435438",
+"q 	c #8E968A",
+"r 	c #313131",
+"s 	c #6E7F61",
+"t 	c #949C91",
+"u 	c #ACACAC",
+"v 	c #BC9F5F",
+"w 	c #A2A2A2",
+"x 	c #5F5F5F",
+"y 	c #B8820A",
+"z 	c #D9A72E",
+"A 	c #BBB49C",
+"B 	c #424936",
+"C 	c #868E7B",
+"D 	c #736C54",
+"E 	c #3C4C32",
+"F 	c #8D9488",
+"G 	c #6E7F60",
+"H 	c #97A094",
+"I 	c #AFAFAF",
+"J 	c #C2C2C2",
+"K 	c #ABABAB",
+"L 	c #6D6D6D",
+"M 	c #BFB9A2",
+"N 	c #3E4431",
+"O 	c #878E7C",
+"P 	c #746E56",
+"Q 	c #303D28",
+"R 	c #515151",
+"S 	c #6B8263",
+"T 	c #8E8E8E",
+"U 	c #A9A9A9",
+"V 	c #8C8C8C",
+"W 	c #888888",
+"X 	c #808080",
+"Y 	c #D4B150",
+"Z 	c #A39256",
+"` 	c #1C2418",
+" .	c #C67461",
+"..	c #3C2B1B",
+"+.	c #887E6C",
+"@.	c #7A2310",
+"#.	c #303C27",
+"$.	c #474747",
+"%.	c #3D4B37",
+"&.	c #727671",
+"*.	c #656863",
+"=.	c #616460",
+"-.	c #5D605C",
+";.	c #5C5E5A",
+">.	c #5A5D59",
+",.	c #3C3E3B",
+"'.	c #E2CB79",
+").	c #4A5139",
+"!.	c #9C9C9C",
+"~.	c #3B4237",
+"{.	c #747C70",
+"].	c #666666",
+"^.	c #2E3B26",
+"/.	c #8C9387",
+"(.	c #373737",
+"_.	c #7E9A75",
+":.	c #4B5E44",
+"<.	c #3E473B",
+"[.	c #363D34",
+"}.	c #323830",
+"|.	c #2F342D",
+"1.	c #2E332D",
+"2.	c #C9B46B",
+"3.	c #8D7E4A",
+"4.	c #3D4D34",
+"5.	c #394930",
+"6.	c #2F3B28",
+"7.	c #3E4E34",
+"8.	c #252E1E",
+"9.	c #303D27",
+"0.	c #8B9286",
+"a.	c #809B76",
+"b.	c #586E51",
+"c.	c #616C4D",
+"d.	c #545B42",
+"e.	c #4F553D",
+"f.	c #4C513A",
+"g.	c #494E38",
+"h.	c #484D37",
+"i.	c #3A3D2B",
+"j.	c #0C0C09",
+"k.	c #080A07",
+"l.	c #454C35",
+"m.	c #566244",
+"n.	c #506242",
+"o.	c #616C4B",
+"p.	c #556142",
+"q.	c #5E6646",
+"r.	c #38472D",
+"s.	c #8B9186",
+"t.	c #7E9A74",
+"u.	c #7B8562",
+"v.	c #58684A",
+"w.	c #43543C",
+"x.	c #5B6548",
+"y.	c #3C4C35",
+"z.	c #5A6346",
+"A.	c #3C4C34",
+"B.	c #686E4E",
+"C.	c #5A6446",
+"D.	c #5F6A4A",
+"E.	c #64704E",
+"F.	c #687451",
+"G.	c #687551",
+"H.	c #6E7C5E",
+"I.	c #9FA194",
+"J.	c #959595",
+"K.	c #2D2D2D",
+"L.	c #7C9671",
+"M.	c #A0A086",
+"N.	c #766E52",
+"O.	c #888B76",
+"P.	c #868874",
+"Q.	c #858772",
+"R.	c #545C41",
+"S.	c #44563A",
+"T.	c #4D6141",
+"U.	c #79825A",
+"V.	c #506442",
+"W.	c #5C6E50",
+"X.	c #7F867B",
+"Y.	c #545454",
+"Z.	c #909090",
+"`.	c #56534E",
+" +	c #B6B6B6",
+".+	c #939393",
+"++	c #878787",
+"@+	c #77906D",
+"#+	c #80805C",
+"$+	c #323124",
+"%+	c #5B593E",
+"&+	c #343325",
+"*+	c #626245",
+"=+	c #5A583E",
+"-+	c #302E22",
+";+	c #5F6246",
+">+	c #677450",
+",+	c #77805A",
+"'+	c #4F6442",
+")+	c #5F7153",
+"!+	c #7E8479",
+"~+	c #4F4F4F",
+"{+	c #575757",
+"]+	c #505050",
+"^+	c #AAAAAA",
+"/+	c #4E4E4E",
+"(+	c #383838",
+"_+	c #738C69",
+":+	c #556A4C",
+"<+	c #646B4D",
+"[+	c #575F44",
+"}+	c #404D36",
+"|+	c #606648",
+"1+	c #575F43",
+"2+	c #3D4832",
+"3+	c #5B6044",
+"4+	c #545F42",
+"5+	c #566645",
+"6+	c #707A55",
+"7+	c #757E57",
+"8+	c #646F4C",
+"9+	c #565F48",
+"0+	c #171D12",
+"a+	c #10150D",
+"b+	c #7A7C79",
+"c+	c #060606",
+"d+	c #41503C",
+"e+	c #637D58",
+"f+	c #808660",
+"g+	c #606E4E",
+"h+	c #6A7553",
+"i+	c #7D835E",
+"j+	c #5C6A4A",
+"k+	c #687351",
+"l+	c #7A7F5A",
+"m+	c #5B6A49",
+"n+	c #6C7752",
+"o+	c #7E845D",
+"p+	c #5B6C48",
+"q+	c #69744F",
+"r+	c #293422",
+"s+	c #181F14",
+"t+	c #14180F",
+"u+	c #0F130C",
+"v+	c #3A4833",
+"w+	c #C8BA89",
+"x+	c #8C9068",
+"y+	c #8C8F67",
+"z+	c #C8B988",
+"A+	c #8B8E66",
+"B+	c #8A8E65",
+"C+	c #C7B888",
+"D+	c #8A8C64",
+"E+	c #8A8D64",
+"F+	c #898B62",
+"G+	c #868760",
+"H+	c #161C12",
+"I+	c #2E3B29",
+"J+	c #C6B888",
+"K+	c #898B64",
+"L+	c #888A63",
+"M+	c #C6B887",
+"N+	c #888A62",
+"O+	c #878A62",
+"P+	c #C6B786",
+"Q+	c #878861",
+"R+	c #868860",
+"S+	c #83845D",
+"T+	c #181E13",
+"U+	c #3A3A3A",
+"            .                                   ",
+"          . .                           . .     ",
+"        . + .                         @ # $ %   ",
+"      . & * . . . .                   = .       ",
+"    - ; * * > , ' ) . .               ! .       ",
+"  . ~ { * * * * * * ] . .             ! .       ",
+". ^ { * * * * * * * * / .             ( .       ",
+"  . _ : : : : : : < * [ . } | 1 2 3 4 5 .       ",
+". 6 . 7 : : : : : : 8 * 9 . 0 a b c d e .       ",
+". f g . h : . . . i : j k . l m n o p q r       ",
+". s t u . v . w x . y z * . A B C D E F x       ",
+". G H u I . . J K L . : * . M N O P Q F R       ",
+". S H w T U . V W X . Y Z `  ...+.@.#.F $.      ",
+". s %.&.*.=.-.;.>.,.. '.. ).!.~.{.].^./.(.      ",
+". _.:.<.[.}.}.|.1.. 2.3.. 4.5.6.7.8.9.0..       ",
+". a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s..       ",
+". t.u.v.w.x.y.z.A.B.C.D.E.F.G.H.I.].].J.K.= (.  ",
+". L.M.N.O.N.P.N.Q.N.R.S.T.U.V.W.X.Y.Y.Z.`. +.+++",
+". @+#+$+%+&+*+&+=+-+;+D.>+,+'+)+!+~+{+Z.]+^+/+(+",
+". _+:+<+[+}+|+1+2+3+4+5+6+'+7+8+9+0+a+b+c+.     ",
+"  d+e+f+g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+! .       ",
+"    v+w+x+y+z+A+B+C+D+E+C+F+G+H+      ! .       ",
+"    I+J+K+L+M+N+O+P+Q+R+P+R+S+T+      ! .       ",
+"      . . . . . . . . . . . .         U+        "};
diff --git a/image/toolbar/capture_start_24.xpm b/image/toolbar/capture_start_24.xpm
new file mode 100644
index 0000000000..b511cdb6f5
--- /dev/null
+++ b/image/toolbar/capture_start_24.xpm
@@ -0,0 +1,268 @@
+/* XPM */
+static char * capture_start_24_xpm[] = {
+"24 24 241 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #FEFEFE",
+"@ 	c #FDFDFD",
+"# 	c #E0E0E0",
+"$ 	c #C1C1C1",
+"% 	c #7C7C7C",
+"& 	c #6A6A6A",
+"* 	c #606060",
+"= 	c #353535",
+"- 	c #F1F1F1",
+"; 	c #C3C3C3",
+"> 	c #FBFBFB",
+", 	c #A8A8A8",
+"' 	c #656565",
+") 	c #ADADAD",
+"! 	c #767676",
+"~ 	c #5D5D5D",
+"{ 	c #404040",
+"] 	c #CFCFCF",
+"^ 	c #A4A4A4",
+"/ 	c #666666",
+"( 	c #494947",
+"_ 	c #161616",
+": 	c #CFCECA",
+"< 	c #B7B7B7",
+"[ 	c #C5C5C5",
+"} 	c #EFEFEF",
+"| 	c #E1E1E0",
+"1 	c #97958F",
+"2 	c #898781",
+"3 	c #8E8C85",
+"4 	c #838078",
+"5 	c #B5B5B5",
+"6 	c #C4C4C4",
+"7 	c #4C503C",
+"8 	c #474C38",
+"9 	c #4C4F3A",
+"0 	c #464B37",
+"a 	c #333E2D",
+"b 	c #90948E",
+"c 	c #7B7973",
+"d 	c #67655F",
+"e 	c #403F3B",
+"f 	c #686661",
+"g 	c #7C7A72",
+"h 	c #64745B",
+"i 	c #566447",
+"j 	c #68795E",
+"k 	c #505C41",
+"l 	c #4E6043",
+"m 	c #91988C",
+"n 	c #DDDCDB",
+"o 	c #9A9992",
+"p 	c #53524E",
+"q 	c #171614",
+"r 	c #767573",
+"s 	c #9B9993",
+"t 	c #54524C",
+"u 	c #757C71",
+"v 	c #495742",
+"w 	c #6F7C68",
+"x 	c #4C5449",
+"y 	c #435438",
+"z 	c #8E968A",
+"A 	c #313131",
+"B 	c #7C7B76",
+"C 	c #86847D",
+"D 	c #9A9996",
+"E 	c #B7B6B3",
+"F 	c #7D7B75",
+"G 	c #C0C0C0",
+"H 	c #BBB49C",
+"I 	c #424936",
+"J 	c #868E7B",
+"K 	c #736C54",
+"L 	c #3C4C32",
+"M 	c #8D9488",
+"N 	c #5F5F5F",
+"O 	c #EAEAEA",
+"P 	c #8E8C87",
+"Q 	c #6C6A66",
+"R 	c #78756C",
+"S 	c #5F5D56",
+"T 	c #54534D",
+"U 	c #9D9D9D",
+"V 	c #BFBFBF",
+"W 	c #BFB9A2",
+"X 	c #3E4431",
+"Y 	c #878E7C",
+"Z 	c #746E56",
+"` 	c #303D28",
+" .	c #515151",
+"..	c #E8E8E8",
+"+.	c #44433F",
+"@.	c #BEBEBE",
+"#.	c #C67461",
+"$.	c #3C2B1B",
+"%.	c #887E6C",
+"&.	c #7A2310",
+"*.	c #303C27",
+"=.	c #474747",
+"-.	c #E7E7E7",
+";.	c #E6E6E6",
+">.	c #E4E4E4",
+",.	c #BDBDBD",
+"'.	c #9C9C9C",
+").	c #3B4237",
+"!.	c #747C70",
+"~.	c #2E3B26",
+"{.	c #8C9387",
+"].	c #373737",
+"^.	c #E5E5E5",
+"/.	c #E3E3E3",
+"(.	c #BBBBBB",
+"_.	c #394930",
+":.	c #2F3B28",
+"<.	c #3E4E34",
+"[.	c #252E1E",
+"}.	c #303D27",
+"|.	c #8B9286",
+"1.	c #C2C2C2",
+"2.	c #BCBCBC",
+"3.	c #A0A0A0",
+"4.	c #0E100B",
+"5.	c #506242",
+"6.	c #616C4B",
+"7.	c #556142",
+"8.	c #5E6646",
+"9.	c #38472D",
+"0.	c #8B9186",
+"a.	c #495943",
+"b.	c #3F4631",
+"c.	c #687551",
+"d.	c #6E7C5E",
+"e.	c #9FA194",
+"f.	c #959595",
+"g.	c #2D2D2D",
+"h.	c #7C9671",
+"i.	c #A0A086",
+"j.	c #766E52",
+"k.	c #888B76",
+"l.	c #868874",
+"m.	c #858772",
+"n.	c #545C41",
+"o.	c #44563A",
+"p.	c #4D6141",
+"q.	c #79825A",
+"r.	c #506442",
+"s.	c #5C6E50",
+"t.	c #7F867B",
+"u.	c #545454",
+"v.	c #909090",
+"w.	c #56534E",
+"x.	c #B6B6B6",
+"y.	c #939393",
+"z.	c #878787",
+"A.	c #77906D",
+"B.	c #80805C",
+"C.	c #323124",
+"D.	c #5B593E",
+"E.	c #343325",
+"F.	c #626245",
+"G.	c #5A583E",
+"H.	c #302E22",
+"I.	c #5F6246",
+"J.	c #5F6A4A",
+"K.	c #677450",
+"L.	c #77805A",
+"M.	c #4F6442",
+"N.	c #5F7153",
+"O.	c #7E8479",
+"P.	c #4F4F4F",
+"Q.	c #575757",
+"R.	c #505050",
+"S.	c #AAAAAA",
+"T.	c #4E4E4E",
+"U.	c #383838",
+"V.	c #738C69",
+"W.	c #556A4C",
+"X.	c #646B4D",
+"Y.	c #575F44",
+"Z.	c #404D36",
+"`.	c #606648",
+" +	c #575F43",
+".+	c #3D4832",
+"++	c #5B6044",
+"@+	c #545F42",
+"#+	c #566645",
+"$+	c #707A55",
+"%+	c #757E57",
+"&+	c #646F4C",
+"*+	c #565F48",
+"=+	c #171D12",
+"-+	c #10150D",
+";+	c #7A7C79",
+">+	c #060606",
+",+	c #41503C",
+"'+	c #637D58",
+")+	c #808660",
+"!+	c #606E4E",
+"~+	c #6A7553",
+"{+	c #7D835E",
+"]+	c #5C6A4A",
+"^+	c #687351",
+"/+	c #7A7F5A",
+"(+	c #5B6A49",
+"_+	c #6C7752",
+":+	c #7E845D",
+"<+	c #5B6C48",
+"[+	c #69744F",
+"}+	c #293422",
+"|+	c #181F14",
+"1+	c #14180F",
+"2+	c #0F130C",
+"3+	c #3A4833",
+"4+	c #C8BA89",
+"5+	c #8C9068",
+"6+	c #8C8F67",
+"7+	c #C8B988",
+"8+	c #8B8E66",
+"9+	c #8A8E65",
+"0+	c #C7B888",
+"a+	c #8A8C64",
+"b+	c #8A8D64",
+"c+	c #898B62",
+"d+	c #868760",
+"e+	c #161C12",
+"f+	c #2E3B29",
+"g+	c #C6B888",
+"h+	c #898B64",
+"i+	c #888A63",
+"j+	c #C6B887",
+"k+	c #888A62",
+"l+	c #878A62",
+"m+	c #C6B786",
+"n+	c #878861",
+"o+	c #868860",
+"p+	c #83845D",
+"q+	c #181E13",
+"r+	c #3A3A3A",
+"                                                ",
+"    . . . . . . . . .                   . .     ",
+"  . + + + + + + @ # $ .               % & * =   ",
+"  . + - - - - - - ; > , .             ' .       ",
+"  . + - - - - - - ) ! ~ { .           ~ .       ",
+"  . + - ] ^ . . . ) / ( _ .           ~ .       ",
+"  . + - . . . : . . . < [ .           ; .       ",
+"  . + } . | 1 2 3 4 . 5 6 . 7 8 9 0 a b .       ",
+". . @ . . c d e f g . . ; . h i j k l m .       ",
+". . @ . n o p q r s t . $ . u v w x y z A       ",
+". . @ . . B C D E F . . G . H I J K L M N       ",
+". . @ O . P Q R S T . U V . W X Y Z ` M  .      ",
+". . @ ... . . +.. . . [ @.. #.$.%.&.*.M =.      ",
+". . @ -.-.;.. . . [ >.>.,.. '.).!./ ~.{.].      ",
+". . @ ;.^.^.^.>.>./././.(.. _.:.<.[.}.|..       ",
+". . 1.,.,.,.2.2.(.(.(.(.3.4.5.6.7.8.9.0..       ",
+". a.. . . . . . . . . . . b.c.d.e./ / f.g.' ].  ",
+". h.i.j.k.j.l.j.m.j.n.o.p.q.r.s.t.u.u.v.w.x.y.z.",
+". A.B.C.D.E.F.E.G.H.I.J.K.L.M.N.O.P.Q.v.R.S.T.U.",
+". V.W.X.Y.Z.`. +.+++@+#+$+M.%+&+*+=+-+;+>+.     ",
+"  ,+'+)+!+~+{+]+^+/+(+_+:+<+[+}+|+1+2+~ .       ",
+"    3+4+5+6+7+8+9+0+a+b+0+c+d+e+      ~ .       ",
+"    f+g+h+i+j+k+l+m+n+o+m+o+p+q+      ~ .       ",
+"      . . . . . . . . . . . .         r+        "};
diff --git a/image/toolbar/capture_stop_24.xpm b/image/toolbar/capture_stop_24.xpm
new file mode 100644
index 0000000000..e33bf5739f
--- /dev/null
+++ b/image/toolbar/capture_stop_24.xpm
@@ -0,0 +1,364 @@
+/* XPM */
+static char * capture_stop_24_xpm[] = {
+"24 24 337 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #67331A",
+"@ 	c #B14F1F",
+"# 	c #D35213",
+"$ 	c #CC4C10",
+"% 	c #A03B0B",
+"& 	c #571F06",
+"* 	c #7C7C7C",
+"= 	c #6A6A6A",
+"- 	c #606060",
+"; 	c #353535",
+"> 	c #180B04",
+", 	c #B75727",
+"' 	c #E75D17",
+") 	c #E55913",
+"! 	c #E05713",
+"~ 	c #D75112",
+"{ 	c #CE4D10",
+"] 	c #C4480F",
+"^ 	c #95360B",
+"/ 	c #130601",
+"( 	c #656565",
+"_ 	c #B45525",
+": 	c #E15914",
+"< 	c #CE4F21",
+"[ 	c #CA4B1E",
+"} 	c #DD4D17",
+"| 	c #DB4B17",
+"1 	c #CD4C1F",
+"2 	c #C64B23",
+"3 	c #BB4512",
+"4 	c #8F320B",
+"5 	c #5D5D5D",
+"6 	c #643119",
+"7 	c #E15B19",
+"8 	c #D85323",
+"9 	c #EEE6E2",
+"0 	c #EFE5E0",
+"a 	c #CF5328",
+"b 	c #CE5023",
+"c 	c #EAE1DC",
+"d 	c #F8F3F1",
+"e 	c #D64F2A",
+"f 	c #B43F0E",
+"g 	c #4E1A05",
+"h 	c #AA4516",
+"i 	c #DD4D16",
+"j 	c #D65320",
+"k 	c #F0E3DD",
+"l 	c #FFFFFF",
+"m 	c #F5EAE5",
+"n 	c #F0EBE8",
+"o 	c #FCFCFC",
+"p 	c #FAF3EF",
+"q 	c #D9522D",
+"r 	c #B33F0D",
+"s 	c #882E0A",
+"t 	c #C3C3C3",
+"u 	c #010101",
+"v 	c #CA4B0F",
+"w 	c #D84D14",
+"x 	c #D65223",
+"y 	c #F5F0EE",
+"z 	c #F5DED3",
+"A 	c #D95C37",
+"B 	c #D5461F",
+"C 	c #B13D0D",
+"D 	c #A5370B",
+"E 	c #474C38",
+"F 	c #4C4F3A",
+"G 	c #464B37",
+"H 	c #333E2D",
+"I 	c #90948E",
+"J 	c #020302",
+"K 	c #C3470E",
+"L 	c #CD4C10",
+"M 	c #CE4E11",
+"N 	c #D25225",
+"O 	c #F2EDEA",
+"P 	c #F6E3DB",
+"Q 	c #D15C35",
+"R 	c #C64115",
+"S 	c #AD3B0D",
+"T 	c #A1360B",
+"U 	c #010201",
+"V 	c #566447",
+"W 	c #68795E",
+"X 	c #505C41",
+"Y 	c #4E6043",
+"Z 	c #91988C",
+"` 	c #151812",
+" .	c #99370B",
+"..	c #C6480F",
+"+.	c #CD461E",
+"@.	c #EADDD7",
+"#.	c #FDFDFD",
+"$.	c #F4DDD3",
+"%.	c #F8EEEA",
+"&.	c #D44A25",
+"*.	c #A9390D",
+"=.	c #7A2807",
+"-.	c #141513",
+";.	c #495742",
+">.	c #6F7C68",
+",.	c #4C5449",
+"'.	c #435438",
+").	c #8E968A",
+"!.	c #313131",
+"~.	c #333B2D",
+"{.	c #54200A",
+"].	c #BC440F",
+"^.	c #C8441F",
+"/.	c #F2D9D2",
+"(.	c #F5E5DE",
+"_.	c #D25E36",
+":.	c #C96A41",
+"<.	c #F5E8E2",
+"[.	c #F7EDE9",
+"}.	c #D84723",
+"|.	c #9F350B",
+"1.	c #3A1303",
+"2.	c #575448",
+"3.	c #424936",
+"4.	c #868E7B",
+"5.	c #736C54",
+"6.	c #3C4C32",
+"7.	c #8D9488",
+"8.	c #5F5F5F",
+"9.	c #617055",
+"0.	c #923A13",
+"a.	c #C24014",
+"b.	c #D24A25",
+"c.	c #D64B25",
+"d.	c #C74316",
+"e.	c #BF471B",
+"f.	c #D04F2A",
+"g.	c #D24C28",
+"h.	c #CD421C",
+"i.	c #712407",
+"j.	c #A9A38F",
+"k.	c #3E4431",
+"l.	c #878E7C",
+"m.	c #746E56",
+"n.	c #303D28",
+"o.	c #515151",
+"p.	c #6B8263",
+"q.	c #5B6159",
+"r.	c #120703",
+"s.	c #8E3A17",
+"t.	c #AF3E0F",
+"u.	c #AE3C0D",
+"v.	c #A93A0D",
+"w.	c #A6380C",
+"x.	c #9E350B",
+"y.	c #6D2307",
+"z.	c #0C0300",
+"A.	c #242E1F",
+"B.	c #C67461",
+"C.	c #3C2B1B",
+"D.	c #887E6C",
+"E.	c #7A2310",
+"F.	c #303C27",
+"G.	c #474747",
+"H.	c #6E7F61",
+"I.	c #3D4B37",
+"J.	c #454744",
+"K.	c #4B1906",
+"L.	c #842C09",
+"M.	c #9E340A",
+"N.	c #752707",
+"O.	c #361103",
+"P.	c #192015",
+"Q.	c #596245",
+"R.	c #9C9C9C",
+"S.	c #3B4237",
+"T.	c #747C70",
+"U.	c #666666",
+"V.	c #2E3B26",
+"W.	c #8C9387",
+"X.	c #373737",
+"Y.	c #7E9A75",
+"Z.	c #4B5E44",
+"`.	c #3E473B",
+" +	c #2F362E",
+".+	c #171A16",
+"++	c #080908",
+"@+	c #000100",
+"#+	c #070807",
+"$+	c #151614",
+"%+	c #12170F",
+"&+	c #4C5139",
+"*+	c #3D4D34",
+"=+	c #394930",
+"-+	c #2F3B28",
+";+	c #3E4E34",
+">+	c #252E1E",
+",+	c #303D27",
+"'+	c #8B9286",
+")+	c #809B76",
+"!+	c #586E51",
+"~+	c #616C4D",
+"{+	c #545B42",
+"]+	c #4F553D",
+"^+	c #4C513A",
+"/+	c #494E38",
+"(+	c #484D37",
+"_+	c #484C36",
+":+	c #2B3624",
+"<+	c #565E42",
+"[+	c #566244",
+"}+	c #506242",
+"|+	c #616C4B",
+"1+	c #556142",
+"2+	c #5E6646",
+"3+	c #38472D",
+"4+	c #8B9186",
+"5+	c #7E9A74",
+"6+	c #7B8562",
+"7+	c #58684A",
+"8+	c #43543C",
+"9+	c #5B6548",
+"0+	c #3C4C35",
+"a+	c #5A6346",
+"b+	c #3C4C34",
+"c+	c #686E4E",
+"d+	c #5A6446",
+"e+	c #5F6A4A",
+"f+	c #64704E",
+"g+	c #687451",
+"h+	c #687551",
+"i+	c #6E7C5E",
+"j+	c #9FA194",
+"k+	c #959595",
+"l+	c #2D2D2D",
+"m+	c #7C9671",
+"n+	c #A0A086",
+"o+	c #766E52",
+"p+	c #888B76",
+"q+	c #868874",
+"r+	c #858772",
+"s+	c #545C41",
+"t+	c #44563A",
+"u+	c #4D6141",
+"v+	c #79825A",
+"w+	c #506442",
+"x+	c #5C6E50",
+"y+	c #7F867B",
+"z+	c #545454",
+"A+	c #909090",
+"B+	c #56534E",
+"C+	c #B6B6B6",
+"D+	c #939393",
+"E+	c #878787",
+"F+	c #77906D",
+"G+	c #80805C",
+"H+	c #323124",
+"I+	c #5B593E",
+"J+	c #343325",
+"K+	c #626245",
+"L+	c #5A583E",
+"M+	c #302E22",
+"N+	c #5F6246",
+"O+	c #677450",
+"P+	c #77805A",
+"Q+	c #4F6442",
+"R+	c #5F7153",
+"S+	c #7E8479",
+"T+	c #4F4F4F",
+"U+	c #575757",
+"V+	c #505050",
+"W+	c #AAAAAA",
+"X+	c #4E4E4E",
+"Y+	c #383838",
+"Z+	c #738C69",
+"`+	c #556A4C",
+" @	c #646B4D",
+".@	c #575F44",
+"+@	c #404D36",
+"@@	c #606648",
+"#@	c #575F43",
+"$@	c #3D4832",
+"%@	c #5B6044",
+"&@	c #545F42",
+"*@	c #566645",
+"=@	c #707A55",
+"-@	c #757E57",
+";@	c #646F4C",
+">@	c #565F48",
+",@	c #171D12",
+"'@	c #10150D",
+")@	c #7A7C79",
+"!@	c #060606",
+"~@	c #41503C",
+"{@	c #637D58",
+"]@	c #808660",
+"^@	c #606E4E",
+"/@	c #6A7553",
+"(@	c #7D835E",
+"_@	c #5C6A4A",
+":@	c #687351",
+"<@	c #7A7F5A",
+"[@	c #5B6A49",
+"}@	c #6C7752",
+"|@	c #7E845D",
+"1@	c #5B6C48",
+"2@	c #69744F",
+"3@	c #293422",
+"4@	c #181F14",
+"5@	c #14180F",
+"6@	c #0F130C",
+"7@	c #3A4833",
+"8@	c #C8BA89",
+"9@	c #8C9068",
+"0@	c #8C8F67",
+"a@	c #C8B988",
+"b@	c #8B8E66",
+"c@	c #8A8E65",
+"d@	c #C7B888",
+"e@	c #8A8C64",
+"f@	c #8A8D64",
+"g@	c #898B62",
+"h@	c #868760",
+"i@	c #161C12",
+"j@	c #2E3B29",
+"k@	c #C6B888",
+"l@	c #898B64",
+"m@	c #888A63",
+"n@	c #C6B887",
+"o@	c #888A62",
+"p@	c #878A62",
+"q@	c #C6B786",
+"r@	c #878861",
+"s@	c #868860",
+"t@	c #83845D",
+"u@	c #181E13",
+"v@	c #3A3A3A",
+"                                                ",
+"          . . . . . .                   . .     ",
+"        . + @ # $ % & .               * = - ;   ",
+"      > , ' ) ! ~ { ] ^ /             ( .       ",
+"    . _ : < [ } | 1 2 3 4 .           5 .       ",
+"  . 6 7 8 9 0 a b c d e f g .         5 .       ",
+"  . h i j k l m n o p q r s .         t .       ",
+"  u v w | x y l l z A B C D u E F G H I .       ",
+". J K L M N O l l P Q R S T U V W X Y Z .       ",
+". `  ...+.@.#.$.$.l %.&.*.=.-.;.>.,.'.).!.      ",
+". ~.{.].^./.(._.:.<.[.}.|.1.2.3.4.5.6.7.8.      ",
+". 9.J 0.a.b.c.d.e.f.g.h.i.u j.k.l.m.n.7.o.      ",
+". p.q.r.s.t.u.S v.w.x.y.z.A.B.C.D.E.F.7.G.      ",
+". H.I.J.U K.L.T M.N.O.. P.Q.R.S.T.U.V.W.X.      ",
+". Y.Z.`. +.+++@+@+#+$+%+&+*+=+-+;+>+,+'+.       ",
+". )+!+~+{+]+^+/+(+_+_+:+<+[+}+|+1+2+3+4+.       ",
+". 5+6+7+8+9+0+a+b+c+d+e+f+g+h+i+j+U.U.k+l+( X.  ",
+". m+n+o+p+o+q+o+r+o+s+t+u+v+w+x+y+z+z+A+B+C+D+E+",
+". F+G+H+I+J+K+J+L+M+N+e+O+P+Q+R+S+T+U+A+V+W+X+Y+",
+". Z+`+ @.@+@@@#@$@%@&@*@=@Q+-@;@>@,@'@)@!@.     ",
+"  ~@{@]@^@/@(@_@:@<@[@}@|@1@2@3@4@5@6@5 .       ",
+"    7@8@9@0@a@b@c@d@e@f@d@g@h@i@      5 .       ",
+"    j@k@l@m@n@o@p@q@r@s@q@s@t@u@      5 .       ",
+"      . . . . . . . . . . . .         v@        "};
diff --git a/image/toolbar/cfilter_24.xpm b/image/toolbar/cfilter_24.xpm
deleted file mode 100644
index b35c749233..0000000000
--- a/image/toolbar/cfilter_24.xpm
+++ /dev/null
@@ -1,98 +0,0 @@
-/* XPM */
-static char * cfilter_24_xpm[] = {
-"24 24 71 1",
-" 	c None",
-".	c #000000",
-"+	c #DDDCDA",
-"@	c #F8F0EE",
-"#	c #E5B9BB",
-"$	c #895F63",
-"%	c #EEEEEE",
-"&	c #B2B2B0",
-"*	c #484641",
-"=	c #9F9D96",
-"-	c #888781",
-";	c #E7BDBC",
-">	c #C14B35",
-",	c #922B34",
-"'	c #9D9C98",
-")	c #91908A",
-"!	c #908E86",
-"~	c #97958E",
-"{	c #807D74",
-"]	c #C24F3C",
-"^	c #942B32",
-"/	c #595854",
-"(	c #605E57",
-"_	c #898883",
-":	c #76746B",
-"<	c #E8BFBE",
-"[	c #43423F",
-"}	c #282724",
-"|	c #363430",
-"1	c #6D6B63",
-"2	c #E8C2BF",
-"3	c #C34E3B",
-"4	c #EEEEED",
-"5	c #B6B5AF",
-"6	c #21201E",
-"7	c #0A0908",
-"8	c #181816",
-"9	c #E6E6E4",
-"0	c #65635C",
-"a	c #161614",
-"b	c #8C8B89",
-"c	c #DFDEDC",
-"d	c #B0AFA9",
-"e	c #D5D4D1",
-"f	c #93918B",
-"g	c #C24F3A",
-"h	c #ABA9A3",
-"i	c #5D5C55",
-"j	c #C24D38",
-"k	c #494943",
-"l	c #E5B8B9",
-"m	c #C24F38",
-"n	c #42413C",
-"o	c #E2B1AA",
-"p	c #CC6B5A",
-"q	c #643C3E",
-"r	c #E3B5AC",
-"s	c #E3B3A9",
-"t	c #D07868",
-"u	c #982E19",
-"v	c #7E261F",
-"w	c #120C0F",
-"x	c #2B1D1F",
-"y	c #DFAA9E",
-"z	c #D28575",
-"A	c #7D2617",
-"B	c #321C23",
-"C	c #3B262E",
-"D	c #D68A7A",
-"E	c #321C21",
-"F	c #3F2A35",
-"                        ",
-"                        ",
-"                ...     ",
-"     .....   .. .+. ..  ",
-"     .@#$.  .%&.*=*.-.. ",
-"     .;>,.  .')===!~{*. ",
-"     .;]^.   .==/(_{:.  ",
-"     .<]^. ..*=([}|=1*..",
-"     .23^. .45=/6789{0(.",
-"     .;]^. ..*=_|abc0*..",
-"     .;]^.   .d{59ef0.  ",
-"     .;g^.  .5h={{::i*. ",
-"     .;j^.  ../.*:*.k.. ",
-"     .lm^.   .. .n. ..  ",
-"   ...op^...    ...     ",
-"   .qrstuvw.            ",
-"    .xyzAB.             ",
-"     .CDE.              ",
-"      .F.               ",
-"       .                ",
-"                        ",
-"                        ",
-"                        ",
-"                        "};
diff --git a/image/toolbar/dfilter_24.xpm b/image/toolbar/dfilter_24.xpm
deleted file mode 100644
index 29b7749cf9..0000000000
--- a/image/toolbar/dfilter_24.xpm
+++ /dev/null
@@ -1,183 +0,0 @@
-/* XPM */
-static char * dfilter_24_xpm[] = {
-"24 24 156 2",
-"  	c None",
-". 	c #000000",
-"+ 	c #D3D3D3",
-"@ 	c #F6F6F6",
-"# 	c #FFFFFF",
-"$ 	c #F9F9F9",
-"% 	c #DADADA",
-"& 	c #585858",
-"* 	c #C7C7C7",
-"= 	c #D1D1D1",
-"- 	c #D6D6D6",
-"; 	c #FAFAFA",
-"> 	c #DDDFD2",
-", 	c #8B8E7C",
-"' 	c #FEFEFE",
-") 	c #FDFDFD",
-"! 	c #C0C0C0",
-"~ 	c #E1E1E1",
-"{ 	c #F0F0F0",
-"] 	c #9B9B9B",
-"^ 	c #E5E7DD",
-"/ 	c #84A77E",
-"( 	c #586546",
-"_ 	c #FCFCFB",
-": 	c #FBFBFB",
-"< 	c #AFAFAE",
-"[ 	c #E9E9E9",
-"} 	c #DFDFDF",
-"| 	c #8F8F8F",
-"1 	c #81A57C",
-"2 	c #FAFAF9",
-"3 	c #F9F9F8",
-"4 	c #A4A4A3",
-"5 	c #F4F4F4",
-"6 	c #CFCFCF",
-"7 	c #A2A2A2",
-"8 	c #EDEEE8",
-"9 	c #81A57B",
-"0 	c #F8F8F7",
-"a 	c #F8F7F6",
-"b 	c #9E9E9E",
-"c 	c #ECEDE6",
-"d 	c #F7F6F5",
-"e 	c #F6F6F4",
-"f 	c #F4F3F2",
-"g 	c #DEDDDC",
-"h 	c #D3D2D0",
-"i 	c #B7B7B5",
-"j 	c #9F9E9D",
-"k 	c #706F6F",
-"l 	c #65625A",
-"m 	c #F5F4F3",
-"n 	c #F2F2F0",
-"o 	c #E4E4E2",
-"p 	c #DAD9D7",
-"q 	c #D8D8D6",
-"r 	c #CDCCCA",
-"s 	c #AFAEAC",
-"t 	c #88847B",
-"u 	c #F3F3F1",
-"v 	c #EFEFED",
-"w 	c #EEEDEB",
-"x 	c #EDECEA",
-"y 	c #E9E8E6",
-"z 	c #D5D4D3",
-"A 	c #C4C3C2",
-"B 	c #8F8A81",
-"C 	c #F6F5F4",
-"D 	c #F5F5F3",
-"E 	c #7EA379",
-"F 	c #F1F1EF",
-"G 	c #F1F0EE",
-"H 	c #ECEBE9",
-"I 	c #EAE9E7",
-"J 	c #E5E4E2",
-"K 	c #E4E3E0",
-"L 	c #D2D1CE",
-"M 	c #8D887E",
-"N 	c #F3F2F1",
-"O 	c #7DA377",
-"P 	c #F0EFED",
-"Q 	c #EFEEEC",
-"R 	c #E8E7E5",
-"S 	c #E5E4E1",
-"T 	c #E2E1DE",
-"U 	c #E1DFDC",
-"V 	c #979288",
-"W 	c #DDDFD3",
-"X 	c #7DA378",
-"Y 	c #A49E93",
-"Z 	c #C9D5C4",
-"` 	c #7EA378",
-" .	c #E8E7E4",
-"..	c #E7E6E3",
-"+.	c #E3E2DF",
-"@.	c #E2E0DD",
-"#.	c #E1E0DC",
-"$.	c #E0DFDB",
-"%.	c #A19C90",
-"&.	c #7C7E73",
-"*.	c #DFE7DE",
-"=.	c #CCDACA",
-"-.	c #90B08C",
-";.	c #76986D",
-">.	c #6C855E",
-",.	c #22231E",
-"'.	c #E9E8E5",
-").	c #E6E4E1",
-"!.	c #E3E2DE",
-"~.	c #DFDEDA",
-"{.	c #DEDDD9",
-"].	c #DDDCD8",
-"^.	c #A19B90",
-"/.	c #EBEAE8",
-"(.	c #3F443B",
-"_.	c #C8D8C7",
-":.	c #9DB89A",
-"<.	c #76966B",
-"[.	c #3D4237",
-"}.	c #E7E5E2",
-"|.	c #E4E3DF",
-"1.	c #DCDBD7",
-"2.	c #E6E5E2",
-"3.	c #565B4E",
-"4.	c #9EBA9A",
-"5.	c #3C4237",
-"6.	c #E5E4E0",
-"7.	c #E2E1DD",
-"8.	c #DBD9D5",
-"9.	c #D9D7D3",
-"0.	c #9F998D",
-"a.	c #5E6154",
-"b.	c #DDDBD7",
-"c.	c #DCDAD6",
-"d.	c #D8D6D2",
-"e.	c #9E988D",
-"f.	c #EDEDED",
-"g.	c #E1E0DD",
-"h.	c #E0DEDA",
-"i.	c #D8D6D1",
-"j.	c #D7D5D1",
-"k.	c #9D978B",
-"l.	c #E1DFDB",
-"m.	c #DEDCD8",
-"n.	c #D7D6D1",
-"o.	c #D5D3CE",
-"p.	c #9B958A",
-"q.	c #999891",
-"r.	c #A39E92",
-"s.	c #A39D92",
-"t.	c #A39D91",
-"u.	c #A29C90",
-"v.	c #A19B8F",
-"w.	c #9D978C",
-"x.	c #9B968A",
-"y.	c #676359",
-"                                                ",
-"      . . . . . . . . . . . . .                 ",
-"    . + @ # # # # # # # # $ % & .               ",
-"    . @ # # . . . . . # # # * = - .             ",
-"    . # # # . ; > , . # ' ) ! ~ { ] .           ",
-"    . # # # . ^ / ( . ) _ : < [ # } | .         ",
-"    . # # # . ^ 1 ( . : 2 3 4 { # 5 6 7 .       ",
-"    . # ' ) . 8 9 ( . 3 0 a b . . . . . . .     ",
-"    . # _ : . c 9 ( . a d e f g h i j k l .     ",
-"    . # 2 3 . ^ 1 ( . e m f n o p q r s t .     ",
-"    . # 0 a . ^ 1 ( . f u n v w x y z A B .     ",
-"    . # C D . ^ E ( . n F G w H I J K L M .     ",
-"    . # f N . ^ O ( . G P Q H R S K T U V .     ",
-"    . # f N . W X ( . G P Q H R S K T U Y .     ",
-"    . # . . . Z ` ( . . . H  ...+.@.#.$.%..     ",
-"    . # . &.*.=.-.;.>.,.. '.S ).!.~.{.].^..     ",
-"    . # /.. (._.:.<.[.. ..}.|.!.$.{.].1.^..     ",
-"    . # ..2.. 3.4.5.. ).6.|.7.$.{.1.8.9.0..     ",
-"    . $ K +.!.. a.. !.7.!.#.#.{.b.c.9.d.e..     ",
-"    . f.g.U #.$.. $.#.$.#.~.h.b.c.9.i.j.k..     ",
-"    . = l.h.~.{.$.{.h.{.h.m.m.c.c.d.n.o.p..     ",
-"    . q.r.Y s.t.s.%.u.%.u.v.^.0.0.w.w.x.y..     ",
-"      . . . . . . . . . . . . . . . . . .       ",
-"                                                "};
diff --git a/image/toolbar/display_filter_24.xpm b/image/toolbar/display_filter_24.xpm
new file mode 100644
index 0000000000..c782ae0154
--- /dev/null
+++ b/image/toolbar/display_filter_24.xpm
@@ -0,0 +1,137 @@
+/* XPM */
+static char * display_filter_24_xpm[] = {
+"24 24 110 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #E2E2E2",
+"@ 	c #FFFFFF",
+"# 	c #C3D3E4",
+"$ 	c #F4F4F4",
+"% 	c #DBDBDB",
+"& 	c #F0F0F0",
+"* 	c #BECFE1",
+"= 	c #D8E2ED",
+"- 	c #E6ECF3",
+"; 	c #F2F5F9",
+"> 	c #E2E9F1",
+", 	c #CCD9E7",
+"' 	c #BACCDF",
+") 	c #AFC4DA",
+"! 	c #AEC3D9",
+"~ 	c #9EB8D3",
+"{ 	c #8EACCB",
+"] 	c #86A6C7",
+"^ 	c #5D88B4",
+"/ 	c #EFEFEF",
+"( 	c #EDEDED",
+"_ 	c #F2F2F2",
+": 	c #BBBBBB",
+"< 	c #C5D4E4",
+"[ 	c #DFE7F0",
+"} 	c #EBF0F6",
+"| 	c #F8F9FB",
+"1 	c #D0DCE9",
+"2 	c #B3C7DC",
+"3 	c #A4BCD5",
+"4 	c #93B0CE",
+"5 	c #8AA9C9",
+"6 	c #5E89B5",
+"7 	c #767676",
+"8 	c #F1F1F1",
+"9 	c #BCBCBC",
+"0 	c #CAD8E7",
+"a 	c #FDFDFE",
+"b 	c #E9EEF4",
+"c 	c #B0C5DB",
+"d 	c #9AB5D1",
+"e 	c #8BAACA",
+"f 	c #C6C6C6",
+"g 	c #F3F3F3",
+"h 	c #E3E3E3",
+"i 	c #878787",
+"j 	c #717171",
+"k 	c #F4F6F9",
+"l 	c #ACC2D9",
+"m 	c #95B1CE",
+"n 	c #5F8AB6",
+"o 	c #8F8F8F",
+"p 	c #E4E4E4",
+"q 	c #E5E5E5",
+"r 	c #E6E6E6",
+"s 	c #C0C0C0",
+"t 	c #D7E1EC",
+"u 	c #EDF1F6",
+"v 	c #EAEFF5",
+"w 	c #B7CADE",
+"x 	c #A5BDD6",
+"y 	c #6A92BB",
+"z 	c #898989",
+"A 	c #8A8A8A",
+"B 	c #727272",
+"C 	c #D9E3EE",
+"D 	c #CEDBE9",
+"E 	c #B4C8DD",
+"F 	c #789CC1",
+"G 	c #909090",
+"H 	c #F5F5F5",
+"I 	c #E7E7E7",
+"J 	c #E8E8E8",
+"K 	c #E9E9E9",
+"L 	c #EAEAEA",
+"M 	c #C2C2C2",
+"N 	c #D5E0EC",
+"O 	c #C7C7C7",
+"P 	c #F6F6F6",
+"Q 	c #8B8B8B",
+"R 	c #8C8C8C",
+"S 	c #747474",
+"T 	c #919191",
+"U 	c #929292",
+"V 	c #F7F7F7",
+"W 	c #EBEBEB",
+"X 	c #ECECEC",
+"Y 	c #EEEEEE",
+"Z 	c #F8F8F8",
+"` 	c #8D8D8D",
+" .	c #8E8E8E",
+"..	c #C2D2E3",
+"+.	c #939393",
+"@.	c #F9F9F9",
+"#.	c #C1D1E2",
+"$.	c #FAFAFA",
+"%.	c #8DABCA",
+"&.	c #949494",
+"*.	c #959595",
+"=.	c #FBFBFB",
+"-.	c #FCFCFC",
+";.	c #FDFDFD",
+">.	c #969696",
+",.	c #FEFEFE",
+"'.	c #979797",
+").	c #989898",
+"!.	c #C9C9C9",
+"~.	c #BDBDBD",
+"  . . . . . . . . . . . . . . . . . . . .       ",
+". + . @ @ @ @ @ @ @ @ @ @ @ @ @ @ # . $ % .     ",
+". & . * = - ; @ ; > , ' ) ! ~ { ] ^ . / ( .     ",
+". _ : . < [ } | | - 1 * 2 3 4 5 6 . 7 & 8 .     ",
+". _ + 9 . 0 - ; a b 1 * c d e 6 . f & 8 _ .     ",
+". g h i j . 1 } k - 0 * l m n . 7 o o _ g .     ",
+". g p q r s . t u v 0 w x y . f & 8 _ g $ .     ",
+". g q z z A B . C v D E F . 7 o o G G $ H .     ",
+". $ r I J K L M . C N ] . O 8 _ g g $ H P .     ",
+". $ I A A Q R R S . 0 . 7 o G G T U U P V .     ",
+". H J K L W X ( Y . # . 8 _ g $ H P V V Z .     ",
+". H K Q R R ` `  .. ... G G T U U +.+.Z @..     ",
+". H L W X ( Y / & . #.. g $ H P V Z @.$.$..     ",
+". P W R ` `  .o o . %.. T U U +.+.&.*.=.-..     ",
+". V ( ( Y / & 8 _ . . . H P V Z @.$.=.-.;..     ",
+". V Y  . .o o G G T U U +.+.+.&.*.*.>.;.,..     ",
+". Z & 8 _ _ g $ H P V Z @.$.=.=.-.;.,.@ @ .     ",
+". Z 8 G G T T U U +.+.&.*.*.>.>.>.'.).@ @ .     ",
+". _ _ g $ H P P V Z @.$.=.-.;.,.@ @ @ @ X .     ",
+". !.( Z H P V Z Z @.$.=.-.;.,.@ @ @ @ Y ~..     ",
+"  . . . . . . . . . . . . . . . . . . . .       ",
+"                                                ",
+"                                                ",
+"                                                "};