SwitchResX can save your desktop icons and windows, and replace them of course.
No icons at the wrong place any more...