Unlock indicator, another approach and minor size adjustments.