Merge "New lock iconography"