In this contribution we present our recent results in the field of diffractive optics for both soft and hard x-ray radiation, and for laboratory sources to x-ray free electron lasers (XFEL). We developed a laboratory soft x-ray microscope that uses in-house produced zone plate optics as high-resolution objectives. We continuously try to improve these optics, both in terms of efficiency and resolution. Our latest development is the manufacturing of tungsten soft x-ray zone plates with outermost zone widths of 12 nm and 90 nm high structures. For hard x-rays, we investigated the possibility to use metal zone plates on a diamond substrate for nano-focusing of the European X-ray Free Electron Laser. The simulations show that the heat conduction is efficient enough to keep a zone plate well below melting temperature. However, metal zone plates will experience large and rapid temperature fluctuations of several hundred Kelvin that might prove fatal. To test this, we manufactured tungsten on diamond prototype zone plates and exposed them to radiation from the LCLS XFEL. Results show that metal zone plates can survive the XFEL beam.