Desktop changes on Lion login.

I arrange several folders on my desktop according to catagory. Since loading Lion, each time I restart my iMac, the folders have moved randomly all over my desktop.

I tried setting the View / Sort By drop down menu to "None" but that has not solved the issue.

Rearranging the folders is very time consuming, any help would be appreciated.

Thanks in advance,

Lenny.