Fix button layout (square got swapped with circle by the layout editor code)