diff --git a/pics/toolbar/Makefile.am b/pics/toolbar/Makefile.am
index 54235003c8..933d260544 100644
--- a/pics/toolbar/Makefile.am
+++ b/pics/toolbar/Makefile.am
@@ -1,13 +1,13 @@
 
-toolbar_DATA = alignBlock.xpm alignCenter.xpm alignRight.xpm bold.xpm \
-	cancel.xpm clipart-from-file.xpm clipart.xpm delete-table-col.xpm \
-	delete-table-row.xpm insert-table-col.xpm insert-table-row.xpm \
-	neonpen.xpm ok.xpm part-kchart.xpm part-kformula.xpm \
-	part-killustrator.xpm part-kimage.xpm part-kspread.xpm part-kword.xpm \
-	part-unspecif.xpm text-bold.xpm \
-	text-italic.xpm text-underlined.xpm \
-	picture.xpm clipart.xpm parts.xpm \
-	italic.xpm underl.xpm alignLeft.xpm
+toolbar_DATA = alignBlock.png alignCenter.png alignRight.png bold.png \
+	cancel.png clipart-from-file.png clipart.png delete-table-col.png \
+	delete-table-row.png insert-table-col.png insert-table-row.png \
+	neonpen.png ok.png part-kchart.png part-kformula.png \
+	part-killustrator.png part-kimage.png part-kspread.png part-kword.png \
+	part-unspecif.png text-bold.png \
+	text-italic.png text-underlined.png \
+	picture.png clipart.png parts.png \
+	italic.png underl.png alignLeft.png
 
 toolbardir = $(kde_datadir)/koffice/toolbar
 
diff --git a/pics/toolbar/alignBlock.png b/pics/toolbar/alignBlock.png
new file mode 100644
index 0000000000..a1bd47077d
Binary files /dev/null and b/pics/toolbar/alignBlock.png differ
diff --git a/pics/toolbar/alignBlock.xpm b/pics/toolbar/alignBlock.xpm
deleted file mode 100644
index b9648fdf21..0000000000
--- a/pics/toolbar/alignBlock.xpm
+++ /dev/null
@@ -1,66 +0,0 @@
-/* XPM */
-static char * justify_xpm[] = {
-"20 20 43 1",
-" 	c None",
-".	c #000000",
-"+	c #303030",
-"@	c #585858",
-"#	c #808080",
-"$	c #A0A0A0",
-"%	c #C3C3C3",
-"&	c #DCDCDC",
-"*	c #400000",
-"=	c #800000",
-"-	c #C00000",
-";	c #FF0000",
-">	c #FFC0C0",
-",	c #004000",
-"'	c #008000",
-")	c #00C000",
-"!	c #00FF00",
-"~	c #C0FFC0",
-"{	c #000000",
-"]	c #000080",
-"^	c #0000C0",
-"/	c #0000FF",
-"(	c #C0C0FF",
-"_	c #404000",
-":	c #808000",
-"<	c #C0C000",
-"[	c #FFFF00",
-"}	c #FFFFC0",
-"|	c #004040",
-"1	c #008080",
-"2	c #00C0C0",
-"3	c #00FFFF",
-"4	c #C0FFFF",
-"5	c #000000",
-"6	c #800080",
-"7	c #C000C0",
-"8	c #FF00FF",
-"9	c #FFC0FF",
-"0	c #FF8000",
-"a	c #C05800",
-"b	c #FFA858",
-"c	c #FFDCA8",
-"d	c #FFFFFF",
-"                    ",
-"                    ",
-"                    ",
-" .................. ",
-"                    ",
-"                    ",
-" .................. ",
-"                    ",
-"                    ",
-" .................. ",
-"                    ",
-"                    ",
-" .................. ",
-"                    ",
-"                    ",
-" .................. ",
-"                    ",
-"                    ",
-"                    ",
-"                    "};
diff --git a/pics/toolbar/alignCenter.png b/pics/toolbar/alignCenter.png
new file mode 100644
index 0000000000..7a168abe17
Binary files /dev/null and b/pics/toolbar/alignCenter.png differ
diff --git a/pics/toolbar/alignCenter.xpm b/pics/toolbar/alignCenter.xpm
deleted file mode 100644
index b26c68c609..0000000000
--- a/pics/toolbar/alignCenter.xpm
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char * center_xpm[] = {
-"21 19 2 1",
-" 	c None",
-".	c #000000000000",
-"                     ",
-"                     ",
-"                     ",
-"                     ",
-"                     ",
-"   ..............    ",
-"                     ",
-"     ..........      ",
-"                     ",
-"   ..............    ",
-"                     ",
-"     ..........      ",
-"                     ",
-"   ..............    ",
-"                     ",
-"     ..........      ",
-"                     ",
-"                     ",
-"                     "};
diff --git a/pics/toolbar/alignLeft.png b/pics/toolbar/alignLeft.png
new file mode 100644
index 0000000000..a244c5e1b6
Binary files /dev/null and b/pics/toolbar/alignLeft.png differ
diff --git a/pics/toolbar/alignLeft.xpm b/pics/toolbar/alignLeft.xpm
deleted file mode 100644
index 4d5ad2c86b..0000000000
--- a/pics/toolbar/alignLeft.xpm
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char * left_xpm[] = {
-"21 19 2 1",
-" 	c None",
-".	c #000000000000",
-"                     ",
-"                     ",
-"                     ",
-"                     ",
-"                     ",
-"   ..............    ",
-"                     ",
-"   ..........        ",
-"                     ",
-"   ..............    ",
-"                     ",
-"   ..........        ",
-"                     ",
-"   ..............    ",
-"                     ",
-"   ..........        ",
-"                     ",
-"                     ",
-"                     "};
diff --git a/pics/toolbar/alignRight.png b/pics/toolbar/alignRight.png
new file mode 100644
index 0000000000..0264538aea
Binary files /dev/null and b/pics/toolbar/alignRight.png differ
diff --git a/pics/toolbar/alignRight.xpm b/pics/toolbar/alignRight.xpm
deleted file mode 100644
index 8c2d7b471e..0000000000
--- a/pics/toolbar/alignRight.xpm
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char * right_xpm[] = {
-"21 19 2 1",
-" 	c None",
-".	c #000000000000",
-"                     ",
-"                     ",
-"                     ",
-"                     ",
-"                     ",
-"   ..............    ",
-"                     ",
-"       ..........    ",
-"                     ",
-"   ..............    ",
-"                     ",
-"       ..........    ",
-"                     ",
-"   ..............    ",
-"                     ",
-"       ..........    ",
-"                     ",
-"                     ",
-"                     "};
diff --git a/pics/toolbar/bold.png b/pics/toolbar/bold.png
new file mode 100644
index 0000000000..1e98f16a4e
Binary files /dev/null and b/pics/toolbar/bold.png differ
diff --git a/pics/toolbar/bold.xpm b/pics/toolbar/bold.xpm
deleted file mode 100644
index 0bc0cc57f1..0000000000
--- a/pics/toolbar/bold.xpm
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * bold_xpm[] = {
-"20 20 2 1",
-" 	c None",
-".	c #000000000000",
-"                    ",
-"                    ",
-"                    ",
-"                    ",
-"                    ",
-"      .......       ",
-"       ..  ...      ",
-"       ..   ..      ",
-"       ..  ..       ",
-"       .....        ",
-"       ..  ...      ",
-"       ..   ..      ",
-"       ..  ...      ",
-"      .......       ",
-"                    ",
-"                    ",
-"                    ",
-"                    ",
-"                    ",
-"                    "};
diff --git a/pics/toolbar/cancel.png b/pics/toolbar/cancel.png
new file mode 100644
index 0000000000..dffa5dfca2
Binary files /dev/null and b/pics/toolbar/cancel.png differ
diff --git a/pics/toolbar/cancel.xpm b/pics/toolbar/cancel.xpm
deleted file mode 100644
index 1ca888b347..0000000000
--- a/pics/toolbar/cancel.xpm
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static char*cancel[]={
-"20 20 4 1",
-"# c #000000",
-". c None",
-"b c #c00000",
-"a c #ff0000",
-"....................",
-"....................",
-"....................",
-"....................",
-".....##......##.....",
-"....#a#.....#aa#....",
-"....#aa#...#abb#....",
-"....#aba#.#ab##.....",
-"....#abbb#ab#.......",
-".....#bbbab#........",
-"......#bbbb#........",
-"......#abbbb#.......",
-".....#ab#bbbb#......",
-"....#ab#.#bbbb##....",
-"....#a#...#bbbb#....",
-"....#b#....####.....",
-".....#..............",
-"....................",
-"....................",
-"...................."};
diff --git a/pics/toolbar/clipart-from-file.png b/pics/toolbar/clipart-from-file.png
new file mode 100644
index 0000000000..08a864db30
Binary files /dev/null and b/pics/toolbar/clipart-from-file.png differ
diff --git a/pics/toolbar/clipart-from-file.xpm b/pics/toolbar/clipart-from-file.xpm
deleted file mode 100644
index 5f441457cc..0000000000
--- a/pics/toolbar/clipart-from-file.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char*clipart[]={
-"20 20 7 1",
-"e c #ffa858",
-"c c #c5c2ff",
-"b c #ffaa5a",
-"# c #000000",
-"a c #c5ffc5",
-". c None",
-"d c #ffdca8",
-"....................",
-".......#####........",
-"......#aaaaa#.......",
-".....#aaaaaaa#......",
-"....#aaaaaaaaa#.....",
-"....#aaaaa#########.",
-"....#aaa#aa#bbbbbb#.",
-"....#a##c#aa#bbbbb#.",
-"....##ccc#aaa#bbbb#.",
-"..##cccccc#aa##bbb#.",
-".#cccccccc..........",
-".#cccccccc.#####....",
-"..#cccccc.#dddd###..",
-"..#cccccc.#eeeeee#..",
-"...#ccccc.#e########",
-"...#cccc#.#e#dddddd#",
-"....#c##..#e#eddddd#",
-".....#....##eeeedd#.",
-"..........##eeeeee#.",
-"..........########.."};
diff --git a/pics/toolbar/clipart.png b/pics/toolbar/clipart.png
new file mode 100644
index 0000000000..6927bc5310
Binary files /dev/null and b/pics/toolbar/clipart.png differ
diff --git a/pics/toolbar/clipart.xpm b/pics/toolbar/clipart.xpm
deleted file mode 100644
index e577612a79..0000000000
--- a/pics/toolbar/clipart.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char*clipart[]={
-"20 20 7 1",
-"c c #c5c2ff",
-"b c #ffaa5a",
-"d c #c0c0ff",
-"# c #000000",
-"a c #c5ffc5",
-". c None",
-"e c #ffff00",
-"....................",
-".......#####........",
-"......#aaaaa#.......",
-".....#aaaaaaa#......",
-"....#aaaaaaaaa#.....",
-"....#aaaaa#########.",
-"....#aaa#aa#bbbbbb#.",
-"....#a##c#aa#bbbbb#.",
-"....##ccc#aaa#bbbb#.",
-"..##cccccc#aa##bbb#.",
-".#cccccccc#.........",
-".#ccccccccd....#....",
-"..#ccccccdd.e..e..e.",
-"..#ccccccdd..e#e#e..",
-"...#cccccd...#eee#..",
-"...#cccc##.#eee#eee#",
-"....#c##.....#eee#..",
-".....#.......e#e#e..",
-"............e..e..e.",
-"...............#...."};
diff --git a/pics/toolbar/delete-table-col.png b/pics/toolbar/delete-table-col.png
new file mode 100644
index 0000000000..500ab836a1
Binary files /dev/null and b/pics/toolbar/delete-table-col.png differ
diff --git a/pics/toolbar/delete-table-col.xpm b/pics/toolbar/delete-table-col.xpm
deleted file mode 100644
index 09832345e2..0000000000
--- a/pics/toolbar/delete-table-col.xpm
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static char*colout[]={
-"20 20 4 1",
-"# c #000000",
-". c None",
-"a c #ffffff",
-"b c #ff0000",
-"....................",
-"....................",
-"..#aaa#bbb#aaa#.....",
-"..#aaa#bbb#aaa#.....",
-"..#aaa#bbb#aaa#.....",
-"..#aaa#bbb#aaa#.....",
-"..#aaa#bbb#aaa#.....",
-"..#aaa#bbb#aaa#.....",
-"..#aaa#bbb#aaa#.....",
-"..#############.....",
-"....................",
-"............bb..bb..",
-"............bb.bbb..",
-".............bbbb...",
-"..............bb....",
-".............bbb....",
-"............bb..b...",
-"............b...b...",
-"....................",
-"...................."};
diff --git a/pics/toolbar/delete-table-row.png b/pics/toolbar/delete-table-row.png
new file mode 100644
index 0000000000..f2e52ce51e
Binary files /dev/null and b/pics/toolbar/delete-table-row.png differ
diff --git a/pics/toolbar/delete-table-row.xpm b/pics/toolbar/delete-table-row.xpm
deleted file mode 100644
index fcfbe8f6f4..0000000000
--- a/pics/toolbar/delete-table-row.xpm
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static char*rowout[]={
-"20 20 4 1",
-"# c #000000",
-". c None",
-"a c #ffffff",
-"b c #ff0000",
-"....................",
-"....................",
-"..#########.........",
-"..aaaaaaaa#.........",
-"..aaaaaaaa#.........",
-"..aaaaaaaa#.........",
-"..#########.........",
-"..bbbbbbbb#.........",
-"..bbbbbbbb#.........",
-"..bbbbbbbb#.........",
-"..#########.........",
-"..aaaaaaaa#.bb..bb..",
-"..aaaaaaaa#.bb.bbb..",
-"..aaaaaaaa#..bbbb...",
-"..#########...bb....",
-".............bbb....",
-"............bb..b...",
-"............b...b...",
-"....................",
-"...................."};
diff --git a/pics/toolbar/insert-table-col.png b/pics/toolbar/insert-table-col.png
new file mode 100644
index 0000000000..d2194a7724
Binary files /dev/null and b/pics/toolbar/insert-table-col.png differ
diff --git a/pics/toolbar/insert-table-col.xpm b/pics/toolbar/insert-table-col.xpm
deleted file mode 100644
index e02fc16800..0000000000
--- a/pics/toolbar/insert-table-col.xpm
+++ /dev/null
@@ -1,28 +0,0 @@
-/* XPM */
-static char*colin[]={
-"20 20 5 1",
-"# c #000000",
-". c None",
-"c c #ffff00",
-"b c #00c200",
-"a c #ffffff",
-"....................",
-"....................",
-"..#aaa#bbb#aaa#.....",
-"..#aaa#bbb#aaa#.....",
-"..#aaa#bbb#aaa#.....",
-"..#aaa#bbb#aaa#.....",
-"..#aaa#bbb#aaa#.....",
-"..#aaa#bbb#aaa#.....",
-"..#aaa#bbb#aaa#.....",
-"..#############.....",
-"..........c..c..c...",
-"...........c#c#c....",
-"...........#ccc#....",
-".........#ccc#ccc#..",
-"...........#ccc#....",
-"...........c#c#c....",
-"..........c..c..c...",
-".............#......",
-"....................",
-"...................."};
diff --git a/pics/toolbar/insert-table-row.png b/pics/toolbar/insert-table-row.png
new file mode 100644
index 0000000000..2f6ae89cb6
Binary files /dev/null and b/pics/toolbar/insert-table-row.png differ
diff --git a/pics/toolbar/insert-table-row.xpm b/pics/toolbar/insert-table-row.xpm
deleted file mode 100644
index 0a606dd8bd..0000000000
--- a/pics/toolbar/insert-table-row.xpm
+++ /dev/null
@@ -1,28 +0,0 @@
-/* XPM */
-static char*rowin[]={
-"20 20 5 1",
-"# c #000000",
-". c None",
-"c c #ffff00",
-"b c #00c200",
-"a c #ffffff",
-"....................",
-"....................",
-"..#########.........",
-"..aaaaaaaa#.........",
-"..aaaaaaaa#.........",
-"..aaaaaaaa#.........",
-"..#########.........",
-"..bbbbbbbb#.........",
-"..bbbbbbbb#.........",
-"..bbbbbbbb#..#......",
-"..########c..c..c...",
-"..aaaaaaaa#c#c#c....",
-"..aaaaaaaa##ccc#....",
-"..aaaaaaacccc#ccc#..",
-"..##########ccc#....",
-"...........c#c#c....",
-"..........c..c..c...",
-".............#......",
-"....................",
-"...................."};
diff --git a/pics/toolbar/italic.png b/pics/toolbar/italic.png
new file mode 100644
index 0000000000..cd91aa761e
Binary files /dev/null and b/pics/toolbar/italic.png differ
diff --git a/pics/toolbar/italic.xpm b/pics/toolbar/italic.xpm
deleted file mode 100644
index 8a1f2e39fe..0000000000
--- a/pics/toolbar/italic.xpm
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * italic_xpm[] = {
-"20 20 2 1",
-" 	c None",
-".	c #000000000000",
-"                    ",
-"                    ",
-"                    ",
-"                    ",
-"                    ",
-"        ....        ",
-"         ..         ",
-"         ..         ",
-"        ..          ",
-"        ..          ",
-"        ..          ",
-"       ..           ",
-"       ..           ",
-"      ....          ",
-"                    ",
-"                    ",
-"                    ",
-"                    ",
-"                    ",
-"                    "};
diff --git a/pics/toolbar/neonpen.png b/pics/toolbar/neonpen.png
new file mode 100644
index 0000000000..676aca69a3
Binary files /dev/null and b/pics/toolbar/neonpen.png differ
diff --git a/pics/toolbar/neonpen.xpm b/pics/toolbar/neonpen.xpm
deleted file mode 100644
index 0d6db76c69..0000000000
--- a/pics/toolbar/neonpen.xpm
+++ /dev/null
@@ -1,28 +0,0 @@
-/* XPM */
-static char*neonpen[]={
-"20 20 5 1",
-"a c #c0c0ff",
-"# c #000000",
-"c c #ffff00",
-"b c #0000ff",
-". c None",
-"....................",
-"..........###.......",
-".........#aab#......",
-".........#ab#.......",
-"........#abb#.......",
-"........#ab#........",
-".......#abb#........",
-".......#ab#.........",
-"......#abb#.........",
-"......#ab#..........",
-".....#abb#.....cc...",
-".....#ab#....ccccc..",
-"....#abb#..ccccc....",
-"....####.ccccc......",
-"...#cc#ccccc........",
-"...#cc#ccc..........",
-"..#c##cc............",
-".###................",
-"....................",
-"...................."};
diff --git a/pics/toolbar/ok.png b/pics/toolbar/ok.png
new file mode 100644
index 0000000000..2ec681fe65
Binary files /dev/null and b/pics/toolbar/ok.png differ
diff --git a/pics/toolbar/ok.xpm b/pics/toolbar/ok.xpm
deleted file mode 100644
index 0964dbf3c7..0000000000
--- a/pics/toolbar/ok.xpm
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static char*ok[]={
-"20 20 4 1",
-"b c #00ff00",
-"# c #000000",
-". c None",
-"a c #00c000",
-"....................",
-"....................",
-"...............##...",
-"..............#a#...",
-".............#b#....",
-".............#a#....",
-"............#a#.....",
-"...........#ba#.....",
-"....##.....#b#......",
-"...#b#....#ba#......",
-"...#bb#..#ba#.......",
-"...#bab#.#ba#.......",
-"...#baaa#ba#........",
-"....#aaaaaa#........",
-".....#aaaaa#........",
-"......#aaaa#........",
-".......#aa#.........",
-"........##..........",
-"....................",
-"...................."};
diff --git a/pics/toolbar/part-kchart.png b/pics/toolbar/part-kchart.png
new file mode 100644
index 0000000000..e33b424137
Binary files /dev/null and b/pics/toolbar/part-kchart.png differ
diff --git a/pics/toolbar/part-kchart.xpm b/pics/toolbar/part-kchart.xpm
deleted file mode 100644
index 37741fa727..0000000000
--- a/pics/toolbar/part-kchart.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char*part[]={
-"20 20 10 1",
-"g c #808080",
-"h c #a0a0a0",
-"d c #c0c0ff",
-"c c #00ffff",
-"# c #000000",
-". c None",
-"a c #0000c0",
-"b c #0000ff",
-"e c #dcdcdc",
-"f c #ffffff",
-"....................",
-".............#####..",
-".............#aaa#..",
-".............#aaa#..",
-".........#####aaa#..",
-".........#bbb#aaa#..",
-".#####...#bbb#aaa#..",
-".#ccc#...#bbb#aaa#..",
-".#ccc#...#bbb#aaa#..",
-".#ccc#####bb........",
-".#ccc#ddd#..######..",
-".#ccc#ddd..#e#ee#e#.",
-".#ccc#ddd.#eeeeeeee#",
-".#ccc#ddd.##ee##ee##",
-".#ccc#ddd.#eeeeeeee#",
-".########.##e#ee#e##",
-"..........#f######g#",
-"...........#f#hh#g#.",
-"............######..",
-"...................."};
diff --git a/pics/toolbar/part-kformula.png b/pics/toolbar/part-kformula.png
new file mode 100644
index 0000000000..83ded6e093
Binary files /dev/null and b/pics/toolbar/part-kformula.png differ
diff --git a/pics/toolbar/part-kformula.xpm b/pics/toolbar/part-kformula.xpm
deleted file mode 100644
index 8c98b7c0b3..0000000000
--- a/pics/toolbar/part-kformula.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char*formula[]={
-"20 20 7 1",
-"e c #808080",
-"a c #a0a0a0",
-"b c #c3c3c3",
-"# c #000000",
-". c None",
-"c c #dcdcdc",
-"d c #ffffff",
-"....................",
-"......##............",
-".....#.#............",
-".....#..............",
-"....a#..............",
-"...####.........####",
-"....#...#....#......",
-"....#..#......#.####",
-"....#..#.#..#.#.....",
-"...a#.#..#.#..b.....",
-"...#..#...#.######..",
-"...#..#..#.#c#cc#c#.",
-".#.#..#.#.#cccccccc#",
-".##...#.#.##cc##cc##",
-"..........#cccccccc#",
-"..........##c#cc#c##",
-"..........#d######e#",
-"..........##d#aa#e#.",
-"............######..",
-"...................."};
diff --git a/pics/toolbar/part-killustrator.png b/pics/toolbar/part-killustrator.png
new file mode 100644
index 0000000000..4399d3fa8c
Binary files /dev/null and b/pics/toolbar/part-killustrator.png differ
diff --git a/pics/toolbar/part-killustrator.xpm b/pics/toolbar/part-killustrator.xpm
deleted file mode 100644
index 726afacc16..0000000000
--- a/pics/toolbar/part-killustrator.xpm
+++ /dev/null
@@ -1,35 +0,0 @@
-/* XPM */
-static char*part[]={
-"20 20 12 1",
-"j c #808080",
-"g c #ffa858",
-"c c #a0a0a0",
-"h c #c05800",
-"a c #00ffff",
-"# c #000000",
-". c None",
-"e c #303030",
-"f c #ffdca8",
-"b c #c0ffff",
-"i c #dcdcdc",
-"d c #ffffff",
-".....##.............",
-"....#ab##...........",
-"....#acab##.........",
-".....##acab##.......",
-"...##ddd#acab##.....",
-".##dddd##e#acab##...",
-"#ddddd#f#dd##acab##.",
-"#dddd#ff#ddc.##acab#",
-".#ddd#gf#dde...##a#.",
-".#dd#fg#ddddc....##.",
-"..#d#gh#dddd######..",
-"...#fg#dddd#i#ii#i#.",
-"...#gh#ddd#iiiiiiii#",
-"..#fg#dddd##ii##ii##",
-"..#gh#dddd#iiiiiiii#",
-".#fg#ddddj##i#ii#i##",
-".#gh#dd##.#d######j#",
-"..##.##....#d#cc#j#.",
-"............######..",
-"...................."};
diff --git a/pics/toolbar/part-kimage.png b/pics/toolbar/part-kimage.png
new file mode 100644
index 0000000000..8a04e0bd72
Binary files /dev/null and b/pics/toolbar/part-kimage.png differ
diff --git a/pics/toolbar/part-kimage.xpm b/pics/toolbar/part-kimage.xpm
deleted file mode 100644
index 03bd914225..0000000000
--- a/pics/toolbar/part-kimage.xpm
+++ /dev/null
@@ -1,35 +0,0 @@
-/* XPM */
-static char*part[]={
-"20 20 12 1",
-"i c #808080",
-"a c #ffa858",
-"j c #a0a0a0",
-"d c #c0c0ff",
-"e c #00ffff",
-"# c #000000",
-". c None",
-"c c #ffff00",
-"b c #0000ff",
-"f c #00c000",
-"g c #dcdcdc",
-"h c #ffffff",
-"....................",
-".################...",
-".#aaaaaaaaaaaaaa#...",
-".#abbbbbbbbbbbba#...",
-".#abbbbbbbbacaba#...",
-".#abbbbbbbbcccba#...",
-".#adbdbdbdbacaba#...",
-".#adddddddddddda#...",
-".#aededededededa#...",
-".#aeeeeeeee.........",
-".#afffffff..######..",
-".#affffff..#g#gg#g#.",
-".#affffff.#gggggggg#",
-".#affffff.##gg##gg##",
-".#aaaaaaa.#gggggggg#",
-".########.##g#gg#g##",
-"..........#h######i#",
-"...........#h#jj#i#.",
-"............######..",
-"...................."};
diff --git a/pics/toolbar/part-kspread.png b/pics/toolbar/part-kspread.png
new file mode 100644
index 0000000000..5560b07d55
Binary files /dev/null and b/pics/toolbar/part-kspread.png differ
diff --git a/pics/toolbar/part-kspread.xpm b/pics/toolbar/part-kspread.xpm
deleted file mode 100644
index 12894921e4..0000000000
--- a/pics/toolbar/part-kspread.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char*insert[]={
-"20 20 7 1",
-"d c #808080",
-"e c #a0a0a0",
-"a c #00ffff",
-"# c #000000",
-". c None",
-"c c #dcdcdc",
-"b c #ffffff",
-"....................",
-".################...",
-".#aa#aaa#aaa#aaa#...",
-".#aa#aaa#aaa#aaa#...",
-".################...",
-".#aa#bbb#bbb#bbb#...",
-".#aa#bbb#bbb#bbb#...",
-".#aa#bbb#bbb#bbb#...",
-".################...",
-".#aa#bbb#...........",
-".#aa#bbb#...######..",
-".#aa#bbb#..#c#cc#c#.",
-".########.#cccccccc#",
-".#aa#bbb#.##cc##cc##",
-".#aa#bbb#.#cccccccc#",
-".#aa#bbb#.##c#cc#c##",
-".########.#b######d#",
-"...........#b#ee#d#.",
-"............######..",
-"...................."};
diff --git a/pics/toolbar/part-kword.png b/pics/toolbar/part-kword.png
new file mode 100644
index 0000000000..3c03d54102
Binary files /dev/null and b/pics/toolbar/part-kword.png differ
diff --git a/pics/toolbar/part-kword.xpm b/pics/toolbar/part-kword.xpm
deleted file mode 100644
index f402b4ccd1..0000000000
--- a/pics/toolbar/part-kword.xpm
+++ /dev/null
@@ -1,32 +0,0 @@
-/* XPM */
-static char*part[]={
-"20 20 9 1",
-"g c #808080",
-"d c #a0a0a0",
-"f c #c3c3c3",
-"# c #000000",
-". c None",
-"a c #ffff00",
-"c c #0000ff",
-"e c #dcdcdc",
-"b c #ffffff",
-"..#.................",
-".#a#.......##.......",
-".#a#.....##b#.......",
-".#a#...##bb#b#......",
-"..#..##bbbb#b#......",
-".#c##bbbbbb#bb#.....",
-".#c#bbbbbb#bbb#.....",
-"##c#bbbbbb##bbb#....",
-"##c###bbbb#b##b#....",
-".#c#bb####bbbbdd....",
-".#c#bb#bbbbb######..",
-".###b#bbbbb#e#ee#e#.",
-".#c#b#bbbb#eeeeeeee#",
-".#c#bfbb#g##ee##ee##",
-".#c#bb##..#eeeeeeee#",
-".#c###....##e#ee#e##",
-".#c#......#b######g#",
-".#c#.......#b#dd#g#.",
-".#c#........######..",
-"..#................."};
diff --git a/pics/toolbar/part-unspecif.png b/pics/toolbar/part-unspecif.png
new file mode 100644
index 0000000000..e55b76c6d7
Binary files /dev/null and b/pics/toolbar/part-unspecif.png differ
diff --git a/pics/toolbar/part-unspecif.xpm b/pics/toolbar/part-unspecif.xpm
deleted file mode 100644
index d1d1eb3c11..0000000000
--- a/pics/toolbar/part-unspecif.xpm
+++ /dev/null
@@ -1,66 +0,0 @@
-/* XPM */
-static char * insert_object_gear_xpm[] = {
-"20 20 43 1",
-" 	c None",
-".	c #000000",
-"+	c #303030",
-"@	c #585858",
-"#	c #808080",
-"$	c #A0A0A0",
-"%	c #C3C3C3",
-"&	c #DCDCDC",
-"*	c #400000",
-"=	c #800000",
-"-	c #C00000",
-";	c #FF0000",
-">	c #FFC0C0",
-",	c #004000",
-"'	c #008000",
-")	c #00C000",
-"!	c #00FF00",
-"~	c #C0FFC0",
-"{	c #000000",
-"]	c #000080",
-"^	c #0000C0",
-"/	c #0000FF",
-"(	c #C0C0FF",
-"_	c #404000",
-":	c #808000",
-"<	c #C0C000",
-"[	c #FFFF00",
-"}	c #FFFFC0",
-"|	c #004040",
-"1	c #008080",
-"2	c #00C0C0",
-"3	c #00FFFF",
-"4	c #C0FFFF",
-"5	c #000000",
-"6	c #800080",
-"7	c #C000C0",
-"8	c #FF00FF",
-"9	c #FFC0FF",
-"0	c #FF8000",
-"a	c #C05800",
-"b	c #FFA858",
-"c	c #FFDCA8",
-"d	c #FFFFFF",
-"                    ",
-"          ..        ",
-"        ..!!..      ",
-"      ..!!!!!!..    ",
-"     .!!!!!!..'.    ",
-"     ...!!..'''...  ",
-"     .))..'''''.cc..",
-"     .)))''''''...b.",
-"     .)))'''''..bbb.",
-"    ..)))''        .",
-"  ..33..)'  ......  ",
-"..333333.  .&.&&.&..",
-".(..33../ .&&&&&&&&.",
-".(((../// ..&&..&&..",
-".((((//// .&&&&&&&&.",
-".((((//// ..&.&&.&..",
-"..(((///. .d......#.",
-"  ..(/..   .d.$$.#. ",
-"    ..      ......  ",
-"                    "};
diff --git a/pics/toolbar/parts.png b/pics/toolbar/parts.png
new file mode 100644
index 0000000000..e55b76c6d7
Binary files /dev/null and b/pics/toolbar/parts.png differ
diff --git a/pics/toolbar/parts.xpm b/pics/toolbar/parts.xpm
deleted file mode 100644
index d1d1eb3c11..0000000000
--- a/pics/toolbar/parts.xpm
+++ /dev/null
@@ -1,66 +0,0 @@
-/* XPM */
-static char * insert_object_gear_xpm[] = {
-"20 20 43 1",
-" 	c None",
-".	c #000000",
-"+	c #303030",
-"@	c #585858",
-"#	c #808080",
-"$	c #A0A0A0",
-"%	c #C3C3C3",
-"&	c #DCDCDC",
-"*	c #400000",
-"=	c #800000",
-"-	c #C00000",
-";	c #FF0000",
-">	c #FFC0C0",
-",	c #004000",
-"'	c #008000",
-")	c #00C000",
-"!	c #00FF00",
-"~	c #C0FFC0",
-"{	c #000000",
-"]	c #000080",
-"^	c #0000C0",
-"/	c #0000FF",
-"(	c #C0C0FF",
-"_	c #404000",
-":	c #808000",
-"<	c #C0C000",
-"[	c #FFFF00",
-"}	c #FFFFC0",
-"|	c #004040",
-"1	c #008080",
-"2	c #00C0C0",
-"3	c #00FFFF",
-"4	c #C0FFFF",
-"5	c #000000",
-"6	c #800080",
-"7	c #C000C0",
-"8	c #FF00FF",
-"9	c #FFC0FF",
-"0	c #FF8000",
-"a	c #C05800",
-"b	c #FFA858",
-"c	c #FFDCA8",
-"d	c #FFFFFF",
-"                    ",
-"          ..        ",
-"        ..!!..      ",
-"      ..!!!!!!..    ",
-"     .!!!!!!..'.    ",
-"     ...!!..'''...  ",
-"     .))..'''''.cc..",
-"     .)))''''''...b.",
-"     .)))'''''..bbb.",
-"    ..)))''        .",
-"  ..33..)'  ......  ",
-"..333333.  .&.&&.&..",
-".(..33../ .&&&&&&&&.",
-".(((../// ..&&..&&..",
-".((((//// .&&&&&&&&.",
-".((((//// ..&.&&.&..",
-"..(((///. .d......#.",
-"  ..(/..   .d.$$.#. ",
-"    ..      ......  ",
-"                    "};
diff --git a/pics/toolbar/picture.png b/pics/toolbar/picture.png
new file mode 100644
index 0000000000..2690546f9c
Binary files /dev/null and b/pics/toolbar/picture.png differ
diff --git a/pics/toolbar/picture.xpm b/pics/toolbar/picture.xpm
deleted file mode 100644
index 79c3e9468b..0000000000
--- a/pics/toolbar/picture.xpm
+++ /dev/null
@@ -1,32 +0,0 @@
-/* XPM */
-static char*picture[]={
-"20 20 9 1",
-"a c #ffa858",
-"d c #c0c0ff",
-"e c #00ffff",
-"# c #000000",
-". c None",
-"c c #ffff00",
-"g c #ffdca8",
-"b c #0000ff",
-"f c #00c000",
-"....................",
-".################...",
-".#aaaaaaaaaaaaaa#...",
-".#abbbbbbbbbbbba#...",
-".#abbbbbbbbacaba#...",
-".#abbbbbbbbcccba#...",
-".#adbdbdbdbacaba#...",
-".#adddddddddddda#...",
-".#aededededededa#...",
-".#aeeeeeeee.....#...",
-".#afffffff.####.....",
-".#affffff.#gggg###..",
-".#affffff.#aaaaaa#..",
-".#affffff.#a########",
-".#aaaaaaa.#a#gggggg#",
-".########.#a#aggggg#",
-"..........##aaaagg#.",
-"..........##aaaaaa#.",
-"..........########..",
-"...................."};
diff --git a/pics/toolbar/text-bold.png b/pics/toolbar/text-bold.png
new file mode 100644
index 0000000000..1e98f16a4e
Binary files /dev/null and b/pics/toolbar/text-bold.png differ
diff --git a/pics/toolbar/text-bold.xpm b/pics/toolbar/text-bold.xpm
deleted file mode 100644
index 0bc0cc57f1..0000000000
--- a/pics/toolbar/text-bold.xpm
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * bold_xpm[] = {
-"20 20 2 1",
-" 	c None",
-".	c #000000000000",
-"                    ",
-"                    ",
-"                    ",
-"                    ",
-"                    ",
-"      .......       ",
-"       ..  ...      ",
-"       ..   ..      ",
-"       ..  ..       ",
-"       .....        ",
-"       ..  ...      ",
-"       ..   ..      ",
-"       ..  ...      ",
-"      .......       ",
-"                    ",
-"                    ",
-"                    ",
-"                    ",
-"                    ",
-"                    "};
diff --git a/pics/toolbar/text-italic.png b/pics/toolbar/text-italic.png
new file mode 100644
index 0000000000..cd91aa761e
Binary files /dev/null and b/pics/toolbar/text-italic.png differ
diff --git a/pics/toolbar/text-italic.xpm b/pics/toolbar/text-italic.xpm
deleted file mode 100644
index 8a1f2e39fe..0000000000
--- a/pics/toolbar/text-italic.xpm
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * italic_xpm[] = {
-"20 20 2 1",
-" 	c None",
-".	c #000000000000",
-"                    ",
-"                    ",
-"                    ",
-"                    ",
-"                    ",
-"        ....        ",
-"         ..         ",
-"         ..         ",
-"        ..          ",
-"        ..          ",
-"        ..          ",
-"       ..           ",
-"       ..           ",
-"      ....          ",
-"                    ",
-"                    ",
-"                    ",
-"                    ",
-"                    ",
-"                    "};
diff --git a/pics/toolbar/text-underlined.png b/pics/toolbar/text-underlined.png
new file mode 100644
index 0000000000..584c0871bb
Binary files /dev/null and b/pics/toolbar/text-underlined.png differ
diff --git a/pics/toolbar/text-underlined.xpm b/pics/toolbar/text-underlined.xpm
deleted file mode 100644
index 10722860ac..0000000000
--- a/pics/toolbar/text-underlined.xpm
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char*text[]={
-"20 20 2 1",
-"# c #000000",
-". c None",
-"....................",
-"....................",
-"....................",
-"....................",
-"....................",
-".....####..###......",
-"......##....#.......",
-"......##....#.......",
-"......##....#.......",
-"......##....#.......",
-"......##....#.......",
-"......##....#.......",
-"......###..##.......",
-".......#####........",
-"....................",
-".....#########......",
-"....................",
-"....................",
-"....................",
-"...................."};
diff --git a/pics/toolbar/underl.png b/pics/toolbar/underl.png
new file mode 100644
index 0000000000..584c0871bb
Binary files /dev/null and b/pics/toolbar/underl.png differ
diff --git a/pics/toolbar/underl.xpm b/pics/toolbar/underl.xpm
deleted file mode 100644
index 10722860ac..0000000000
--- a/pics/toolbar/underl.xpm
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char*text[]={
-"20 20 2 1",
-"# c #000000",
-". c None",
-"....................",
-"....................",
-"....................",
-"....................",
-"....................",
-".....####..###......",
-"......##....#.......",
-"......##....#.......",
-"......##....#.......",
-"......##....#.......",
-"......##....#.......",
-"......##....#.......",
-"......###..##.......",
-".......#####........",
-"....................",
-".....#########......",
-"....................",
-"....................",
-"....................",
-"...................."};