Merge "Update icon for security settings." into pi-dev