I will give a survey of recent work on the description of the explicit shape of the reductions of two-dimensional local Galois representations, concentrating on our recent proof of the zig-zag conjecture.