Close swapped overlay

The swapped overlays have no “X” icon which closes the overlay - only the initial one has it. I think it’s nor logic, nor consistent and in most flows the overlay won’t come back to the initial state.