An optical cross-connect including two deflector arrays optically separated by an angle-to-offset (ATO) element, wherein each deflector array includes a plurality of deflectors aligned in an array direction, each deflector array having a switching direction substantially perpendicular to the corresponding array direction, the array direction of the two deflector arrays being substantially perpendicular. Beam shaping optics convert light transmitted towards the first deflector array to have an elliptical cross-section at the first deflector array, thus providing a relatively simple and compact optical cross-connect.