Merge "Remove unnecessary VPN icons."