Merge "Change security status icons."