It really looks good. Again, great job thp.

I now see what you mean that these icons can have different states. I didn't get that first. I made icons for the shape tool here:

Zip with 4 x 48px icons:
http://castus.dnsalias.com:8080/share/maepad_shapes.zip