Index: trunk/src/tool.h
===================================================================
--- trunk/src/tool.h	(revision 24963)
+++ trunk/src/tool.h	(revision 24964)
@@ -60,6 +60,7 @@
 	const char *name;             /* textual name of the tool */
 	const char *cookie;           /* plugin cookie _pointer_ of the registrar (comparision is pointer based, not strcmp) */
 	unsigned int priority;        /* lower values are higher priorities; escaping mode will try to select the highest prio tool */
+	const char **icon;            /* XPM for the tool buttons */
 
 	/* tool implementation */
 	void     (*init)(void);
Index: trunk/src/tool_arc.c
===================================================================
--- trunk/src/tool_arc.c	(revision 24963)
+++ trunk/src/tool_arc.c	(revision 24964)
@@ -188,7 +188,7 @@
 }
 
 pcb_tool_t pcb_tool_arc = {
-	"arc", NULL, 100,
+	"arc", NULL, 100, NULL,
 	pcb_tool_arc_init,
 	pcb_tool_arc_uninit,
 	pcb_tool_arc_notify_mode,
Index: trunk/src/tool_arrow.c
===================================================================
--- trunk/src/tool_arrow.c	(revision 24963)
+++ trunk/src/tool_arrow.c	(revision 24964)
@@ -216,7 +216,7 @@
 }
 
 pcb_tool_t pcb_tool_arrow = {
-	"arrow", NULL, 10,
+	"arrow", NULL, 10, NULL,
 	NULL,
 	pcb_tool_arrow_uninit,
 	pcb_tool_arrow_notify_mode,
Index: trunk/src/tool_buffer.c
===================================================================
--- trunk/src/tool_buffer.c	(revision 24963)
+++ trunk/src/tool_buffer.c	(revision 24964)
@@ -92,7 +92,7 @@
 }
 
 pcb_tool_t pcb_tool_buffer = {
-	"buffer", NULL, 100,
+	"buffer", NULL, 100, NULL,
 	pcb_tool_buffer_init,
 	pcb_tool_buffer_uninit,
 	pcb_tool_buffer_notify_mode,
Index: trunk/src/tool_copy.c
===================================================================
--- trunk/src/tool_copy.c	(revision 24963)
+++ trunk/src/tool_copy.c	(revision 24964)
@@ -115,7 +115,7 @@
 }
 
 pcb_tool_t pcb_tool_copy = {
-	"copy", NULL, 100,
+	"copy", NULL, 100, NULL,
 	NULL,
 	pcb_tool_copy_uninit,
 	pcb_tool_copy_notify_mode,
Index: trunk/src/tool_insert.c
===================================================================
--- trunk/src/tool_insert.c	(revision 24963)
+++ trunk/src/tool_insert.c	(revision 24964)
@@ -132,7 +132,7 @@
 }
 
 pcb_tool_t pcb_tool_insert = {
-	"insert", NULL, 100,
+	"insert", NULL, 100, NULL,
 	NULL,
 	pcb_tool_insert_uninit,
 	pcb_tool_insert_notify_mode,
Index: trunk/src/tool_line.c
===================================================================
--- trunk/src/tool_line.c	(revision 24963)
+++ trunk/src/tool_line.c	(revision 24964)
@@ -461,7 +461,7 @@
 }
 
 pcb_tool_t pcb_tool_line = {
-	"line", NULL, 100,
+	"line", NULL, 100, NULL,
 	pcb_tool_line_init,
 	pcb_tool_line_uninit,
 	pcb_tool_line_notify_mode,
Index: trunk/src/tool_lock.c
===================================================================
--- trunk/src/tool_lock.c	(revision 24963)
+++ trunk/src/tool_lock.c	(revision 24964)
@@ -75,7 +75,7 @@
 }
 
 pcb_tool_t pcb_tool_lock = {
-	"lock", NULL, 100,
+	"lock", NULL, 100, NULL,
 	NULL,
 	NULL,
 	pcb_tool_lock_notify_mode,
Index: trunk/src/tool_move.c
===================================================================
--- trunk/src/tool_move.c	(revision 24963)
+++ trunk/src/tool_move.c	(revision 24964)
@@ -121,7 +121,7 @@
 }
 
 pcb_tool_t pcb_tool_move = {
-	"move", NULL, 100,
+	"move", NULL, 100, NULL,
 	NULL,
 	pcb_tool_move_uninit,
 	pcb_tool_move_notify_mode,
Index: trunk/src/tool_poly.c
===================================================================
--- trunk/src/tool_poly.c	(revision 24963)
+++ trunk/src/tool_poly.c	(revision 24964)
@@ -146,7 +146,7 @@
 }
 
 pcb_tool_t pcb_tool_poly = {
-	"poly", NULL, 100,
+	"poly", NULL, 100, NULL,
 	NULL,
 	pcb_tool_poly_uninit,
 	pcb_tool_poly_notify_mode,
Index: trunk/src/tool_polyhole.c
===================================================================
--- trunk/src/tool_polyhole.c	(revision 24963)
+++ trunk/src/tool_polyhole.c	(revision 24964)
@@ -175,7 +175,7 @@
 }
 
 pcb_tool_t pcb_tool_polyhole = {
-	"polyhole", NULL, 100,
+	"polyhole", NULL, 100, NULL,
 	NULL,
 	pcb_tool_polyhole_uninit,
 	pcb_tool_polyhole_notify_mode,
Index: trunk/src/tool_rectangle.c
===================================================================
--- trunk/src/tool_rectangle.c	(revision 24963)
+++ trunk/src/tool_rectangle.c	(revision 24964)
@@ -113,7 +113,7 @@
 }
 
 pcb_tool_t pcb_tool_rectangle = {
-	"rectangle", NULL, 100,
+	"rectangle", NULL, 100, NULL,
 	NULL,
 	pcb_tool_rectangle_uninit,
 	pcb_tool_rectangle_notify_mode,
Index: trunk/src/tool_remove.c
===================================================================
--- trunk/src/tool_remove.c	(revision 24963)
+++ trunk/src/tool_remove.c	(revision 24964)
@@ -82,7 +82,7 @@
 }
 
 pcb_tool_t pcb_tool_remove = {
-	"remove", NULL, 100,
+	"remove", NULL, 100, NULL,
 	NULL,
 	NULL,
 	pcb_tool_remove_notify_mode,
Index: trunk/src/tool_rotate.c
===================================================================
--- trunk/src/tool_rotate.c	(revision 24963)
+++ trunk/src/tool_rotate.c	(revision 24964)
@@ -49,7 +49,7 @@
 }
 
 pcb_tool_t pcb_tool_rotate = {
-	"rotate", NULL, 100,
+	"rotate", NULL, 100, NULL,
 	NULL,
 	NULL,
 	pcb_tool_rotate_notify_mode,
Index: trunk/src/tool_text.c
===================================================================
--- trunk/src/tool_text.c	(revision 24963)
+++ trunk/src/tool_text.c	(revision 24964)
@@ -92,7 +92,7 @@
 }
 
 pcb_tool_t pcb_tool_text = {
-	"text", NULL, 100,
+	"text", NULL, 100, NULL,
 	NULL,
 	NULL,
 	pcb_tool_text_notify_mode,
Index: trunk/src/tool_thermal.c
===================================================================
--- trunk/src/tool_thermal.c	(revision 24963)
+++ trunk/src/tool_thermal.c	(revision 24964)
@@ -102,7 +102,7 @@
 }
 
 pcb_tool_t pcb_tool_thermal = {
-	"thermal", NULL, 100,
+	"thermal", NULL, 100, NULL,
 	NULL,
 	NULL,
 	pcb_tool_thermal_notify_mode,
Index: trunk/src/tool_via.c
===================================================================
--- trunk/src/tool_via.c	(revision 24963)
+++ trunk/src/tool_via.c	(revision 24964)
@@ -102,7 +102,7 @@
 }
 
 pcb_tool_t pcb_tool_via = {
-	"via", NULL, 100,
+	"via", NULL, 100, NULL,
 	NULL,
 	NULL,
 	pcb_tool_via_notify_mode,
Index: trunk/src_plugins/sketch_route/sketch_route.c
===================================================================
--- trunk/src_plugins/sketch_route/sketch_route.c	(revision 24963)
+++ trunk/src_plugins/sketch_route/sketch_route.c	(revision 24964)
@@ -1095,7 +1095,7 @@
 }
 
 static pcb_tool_t tool_skline = {
-	"skline", NULL, 100,
+	"skline", NULL, 100, NULL,
 	tool_skline_init,
 	tool_skline_uninit,
 	tool_skline_notify_mode,