new tool icons, clean up sweep limits