I would expect it the other way around too.
Windows 7 has the same lock / unlock icon behavior as you describe.
Although it's a minor issue, I'm not sure whether it's a good idea to change the behavior of icons, but it certainly would look more consistent.