Improve locked indicator