* fixed memory leaks * moved some of the brush icon code around * the update of the icon after a change is more responsive