A cross-connect switch[100] for switching light signals arriving on N input optical fibers[110] to M out optical fibers[140]. The switch includes NxM mirror elements[121, 123] arranged as N rows and M columns of mirror elements[121, 123]. Each mirror element has a reflecting state and a non-reflecting state. In the reflecting state, each mirror element reflects light from a corresponding one of the input optical fibers[110] to a corresponding one of the out optical fibers[140]. Each mirror element is positioned in the non-reflecting state such that the mirror element does not intercept light from any of the input optical fibers[110]. All of the mirror elements[121, 123] corresponding to a given input optical fiber are located on the same row and all mirror elements[121, 123] corresponding to a given output optical fiber are located in the same column. The switch also includes a plurality of re-collimating lenses[131, 132], one such re-collimating lens[131] is located between two of the mirror elements[121, 123] in each of the rows of mirror elements[121, 123]. Each re-collimating lens collimates light from the input optical fiber[110] corresponding to that row. The switch also includes one such re-collimating lens[132] between two of the mirror elements[121, 123] in each of the columns of mirror elements[121, 123].