An optical device includes an optical component (e.g., a polarization volume hologram, a geometric phase device, or a polarization-insensitive diffractive optical element) having a uniform thickness and configured to modify a wavefront of a light beam that includes light in two or more wavelengths visible to human eyes, where the optical component has a chromatic aberration between the two or more wavelengths. The optical device also includes a metasurface on the optical component. The metasurface includes a plurality of nanostructures configured to modify respective phases of incident light at a plurality of regions of the metasurface, where the plurality of nanostructures is configured to, at each region of the plurality of regions, add a respective phase delay for each of the two or more wavelengths to correct the chromatic aberration between the two or more wavelengths.