A follow up question:
I got the Lock Screen icon setup properly but now suddenly the icon is gone. It is still clickable but the icon itself look horrible. It's like placeholder. A square with some circles and lines inside of it (would provide a screenshot but seems the forum doesn't support uploading photos).
Any idea what may have happened?