Actually swapping the state of the new buttons for now until we figure out some way to make all the buttons in the draw tool and the new stuff act the same.