I just upgraded to 2.2 and now I have the lock icon back. I can't figure out how to get rid of it. On 2.1 I had no problem getting rid of it. I have set my password so when it wakes up it used to go to the unlock screen, now it goes to that lock icon, then I slide that to the right and get the lock screen. Where did they hide the place to get rid of the lock icon?