fix icons and rearranged recttool