Merge "Changed VPN add icon to white." into lmp-dev