An optical modulator includes a waveguide Mach-Zehnder interferometer having a first and a second input and a first and a second output, a feedback waveguide segment connecting the second output with the second input, and a traveling-wave electrode; wherein the Mach-Zehnder interferometer, feedback waveguide segment and traveling-wave electrode are substantially arranged at or adjacent the perimeter of a smooth curve defining a closed geometric figure, the traveling-wave electrode extending along at least 50% of the length of the perimeter of the smooth curve.