This uses the "post action toggle button" macro for Lock and Remove as well, which is now most of them.