An optical waveguide including an input-coupler, a first intermediate-component, a second intermediate-component and an output-coupler is described herein. The input-coupler couples, into the waveguide, light corresponding to an image associated with an input-pupil and directs the light toward the first intermediate-component. The first intermediate-component performs horizontal or vertical pupil expansion and redirects the light corresponding to the image toward the output-coupler. The second intermediate-component is a diffractive component located between the first-intermediate component and the output-coupler and performs pupil redistribution on a portion of the light corresponding to the image before the portion reaches the output-coupler. The output-coupler performs the other one of horizontal or vertical pupil expansion and couples, out of the waveguide, the light corresponding to the image. Related methods and systems are also described.