PIN unlock layout perfection and fix orange icon

Change-Id: Ie0c9507a76112cf2694c1a35b76769e094e2f852