I used Iconoid, which saves icon setup on the desktop. It avoids MOST problems, though I have never encountered the one you had!