gfx: Clean up on/off buttons