Pin Unlock Fixes
Icon Fixes TRDS

Change-Id: Ibf33528d913ee9870f1a7476b51053bdac165a32