Merge "Larger lock icon"