diff --git a/IVPNClient.xcodeproj/project.pbxproj b/IVPNClient.xcodeproj/project.pbxproj
index 41af2a7fa..0e58ec935 100644
--- a/IVPNClient.xcodeproj/project.pbxproj
+++ b/IVPNClient.xcodeproj/project.pbxproj
@@ -106,6 +106,7 @@
 		825E834F25A327EB00938240 /* CaptchaViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 825E834E25A327EB00938240 /* CaptchaViewController.swift */; };
 		825E836325A4834200938240 /* APIPublicKeyPin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 825E836225A4834200938240 /* APIPublicKeyPin.swift */; };
 		825E836425A4834200938240 /* APIPublicKeyPin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 825E836225A4834200938240 /* APIPublicKeyPin.swift */; };
+		825ECB2C2A5582570032E986 /* AntiTrackerDns.swift in Sources */ = {isa = PBXBuildFile; fileRef = 825ECB2B2A5582570032E986 /* AntiTrackerDns.swift */; };
 		826470C42446F67100403A14 /* Signup.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 826470C32446F67100403A14 /* Signup.storyboard */; };
 		8264CFFC22422F6700E1721E /* Date+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82D90470216C7DAF0032F3BE /* Date+Ext.swift */; };
 		8269CAC32264962F00CF488A /* AntiTrackerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8269CAC22264962F00CF488A /* AntiTrackerViewController.swift */; };
@@ -163,6 +164,10 @@
 		829DF27D2497949A000DC2DB /* PlanLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 829DF27B2497949A000DC2DB /* PlanLabel.swift */; };
 		829DF27E2497949A000DC2DB /* SelectPlanView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 829DF27C2497949A000DC2DB /* SelectPlanView.swift */; };
 		829DF2822497953C000DC2DB /* UIButton+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 829DF2812497953C000DC2DB /* UIButton+Ext.swift */; };
+		829F5EAF2A56E067005919AF /* AntiTrackerListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 829F5EAE2A56E067005919AF /* AntiTrackerListViewController.swift */; };
+		829F5EB02A570322005919AF /* AntiTrackerDns.swift in Sources */ = {isa = PBXBuildFile; fileRef = 825ECB2B2A5582570032E986 /* AntiTrackerDns.swift */; };
+		829F5EB12A570323005919AF /* AntiTrackerDns.swift in Sources */ = {isa = PBXBuildFile; fileRef = 825ECB2B2A5582570032E986 /* AntiTrackerDns.swift */; };
+		829F5EB22A570323005919AF /* AntiTrackerDns.swift in Sources */ = {isa = PBXBuildFile; fileRef = 825ECB2B2A5582570032E986 /* AntiTrackerDns.swift */; };
 		829F5FC729A13CAE009E1AD3 /* KeychainAccess in Frameworks */ = {isa = PBXBuildFile; productRef = 829F5FC629A13CAE009E1AD3 /* KeychainAccess */; };
 		829F5FC929A13CEA009E1AD3 /* KeychainAccess in Frameworks */ = {isa = PBXBuildFile; productRef = 829F5FC829A13CEA009E1AD3 /* KeychainAccess */; };
 		829F5FCB29A13CF2009E1AD3 /* KeychainAccess in Frameworks */ = {isa = PBXBuildFile; productRef = 829F5FCA29A13CF2009E1AD3 /* KeychainAccess */; };
@@ -526,6 +531,7 @@
 		825A43FC215CCFE70076131F /* UserDefaults+Ext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UserDefaults+Ext.swift"; sourceTree = "<group>"; };
 		825E834E25A327EB00938240 /* CaptchaViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CaptchaViewController.swift; sourceTree = "<group>"; };
 		825E836225A4834200938240 /* APIPublicKeyPin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIPublicKeyPin.swift; sourceTree = "<group>"; };
+		825ECB2B2A5582570032E986 /* AntiTrackerDns.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AntiTrackerDns.swift; sourceTree = "<group>"; };
 		826470C32446F67100403A14 /* Signup.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Signup.storyboard; sourceTree = "<group>"; };
 		8269CAC22264962F00CF488A /* AntiTrackerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AntiTrackerViewController.swift; sourceTree = "<group>"; };
 		8269CD8E2164A8C700D083A1 /* servers-dev.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "servers-dev.json"; sourceTree = "<group>"; };
@@ -571,6 +577,7 @@
 		829DF27B2497949A000DC2DB /* PlanLabel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PlanLabel.swift; sourceTree = "<group>"; };
 		829DF27C2497949A000DC2DB /* SelectPlanView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SelectPlanView.swift; sourceTree = "<group>"; };
 		829DF2812497953C000DC2DB /* UIButton+Ext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIButton+Ext.swift"; sourceTree = "<group>"; };
+		829F5EAE2A56E067005919AF /* AntiTrackerListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AntiTrackerListViewController.swift; sourceTree = "<group>"; };
 		82A160B8221C4E2000730577 /* Server+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Server+CoreDataClass.swift"; sourceTree = "<group>"; };
 		82A160B9221C4E2000730577 /* Server+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Server+CoreDataProperties.swift"; sourceTree = "<group>"; };
 		82A3422224AB660C00761AB0 /* ApplicationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApplicationTests.swift; sourceTree = "<group>"; };
@@ -987,6 +994,7 @@
 				8243587025DBB73E005FDEBB /* SecureDNS.swift */,
 				827694F2263C04C40058B4DC /* LoginConfirmation.swift */,
 				821CA2DE288143470067F70D /* PortRange.swift */,
+				825ECB2B2A5582570032E986 /* AntiTrackerDns.swift */,
 			);
 			path = Models;
 			sourceTree = "<group>";
@@ -1222,6 +1230,7 @@
 				821CA2D6287C5AB20067F70D /* PortViewController.swift */,
 				82AB0874291A6B5F0084625A /* AddCustomPortViewController.swift */,
 				82052E5529C1D83700227CF9 /* MTUViewController.swift */,
+				829F5EAE2A56E067005919AF /* AntiTrackerListViewController.swift */,
 			);
 			path = ViewControllers;
 			sourceTree = "<group>";
@@ -2066,6 +2075,7 @@
 				82EEB6CD25F9422900915837 /* DNSProtocolType.swift in Sources */,
 				820EA86C2322430700E16B2D /* Result.swift in Sources */,
 				823FFB092338E09A00F91A5D /* Capability.swift in Sources */,
+				829F5EB12A570323005919AF /* AntiTrackerDns.swift in Sources */,
 				82DC75BD22B7647500D3C73C /* APIClient.swift in Sources */,
 				825E836425A4834200938240 /* APIPublicKeyPin.swift in Sources */,
 				823BD9E4231D4C8F002E631D /* ErrorResult.swift in Sources */,
@@ -2117,6 +2127,7 @@
 				82C61DA929E6C53C00AF972A /* Array+Ext.swift in Sources */,
 				82A38A1029E2D46000C88372 /* StatusViewModel.swift in Sources */,
 				8206BAFC29ED6C9600F916B7 /* Notification.swift in Sources */,
+				829F5EB22A570323005919AF /* AntiTrackerDns.swift in Sources */,
 				82A38A1B29E3201F00C88372 /* UserDefaults.swift in Sources */,
 				82C61D9929E6B4C600AF972A /* LocationView.swift in Sources */,
 				82E3B21E29DDD32B00998F67 /* MainView.swift in Sources */,
@@ -2141,6 +2152,7 @@
 				82E716932181E90500D6B7C2 /* ConnectionSettings.swift in Sources */,
 				82ED17592A1262F800E7926D /* Data+Ext.swift in Sources */,
 				823FFB082338E09900F91A5D /* Capability.swift in Sources */,
+				829F5EB02A570322005919AF /* AntiTrackerDns.swift in Sources */,
 				82ED17482A125C9100E7926D /* TimerManager.swift in Sources */,
 				826F7F4323A7AAD200777DB9 /* Array+Ext.swift in Sources */,
 				82ED17542A1261A000E7926D /* x25519.c in Sources */,
@@ -2248,6 +2260,7 @@
 				9CC29DF81E1D59E90080F799 /* Alerts+Ext.swift in Sources */,
 				9CB2CE1F1DAA5258007A4D2D /* Authentication.swift in Sources */,
 				82DAB37B2457013900302F4C /* Service.swift in Sources */,
+				825ECB2C2A5582570032E986 /* AntiTrackerDns.swift in Sources */,
 				82C2E5DF21620FF100C5A09F /* UIDevice+Ext.swift in Sources */,
 				8208525823FD5EB20008C112 /* MainViewController.swift in Sources */,
 				825E836325A4834200938240 /* APIPublicKeyPin.swift in Sources */,
@@ -2294,6 +2307,7 @@
 				82C293BF21CCD49A000B74EC /* NavigationController.swift in Sources */,
 				82061F67238D2730009DDF4D /* PingManager.swift in Sources */,
 				9CDDD5AF1D9D2F9F00D39924 /* AppDelegate.swift in Sources */,
+				829F5EAF2A56E067005919AF /* AntiTrackerListViewController.swift in Sources */,
 				82CE59A725ED491B0078099D /* DNSResolver.swift in Sources */,
 				82BBF26121AD213500589766 /* Theme.swift in Sources */,
 				829AA4732267372A00037198 /* Designable+Ext.swift in Sources */,
diff --git a/IVPNClient/Managers/VPNManager.swift b/IVPNClient/Managers/VPNManager.swift
index 5b2086284..097f06cbb 100644
--- a/IVPNClient/Managers/VPNManager.swift
+++ b/IVPNClient/Managers/VPNManager.swift
@@ -132,7 +132,9 @@ class VPNManager {
             if let error = error, error.code == 5 {
                 manager.isOnDemandEnabled = false
                 if #available(iOS 15.1, *) {
-                    manager.protocolConfiguration?.includeAllNetworks = false
+                    if #available(iOS 16, *) { } else {
+                        manager.protocolConfiguration?.includeAllNetworks = false
+                    }
                 }
                 NotificationCenter.default.post(name: Notification.Name.VPNConfigurationDisabled, object: nil)
                 return
@@ -261,7 +263,9 @@ class VPNManager {
             manager.onDemandRules = [NEOnDemandRule]()
             manager.isOnDemandEnabled = false
             if #available(iOS 15.1, *) {
-                manager.protocolConfiguration?.includeAllNetworks = false
+                if #available(iOS 16, *) { } else {
+                    manager.protocolConfiguration?.includeAllNetworks = false
+                }
             }
             manager.saveToPreferences { _ in }
         }
@@ -316,7 +320,9 @@ class VPNManager {
                 manager.onDemandRules = [NEOnDemandRule]()
                 manager.isOnDemandEnabled = false
                 if #available(iOS 15.1, *) {
-                    manager.protocolConfiguration?.includeAllNetworks = false
+                    if #available(iOS 16, *) { } else {
+                        manager.protocolConfiguration?.includeAllNetworks = false
+                    }
                 }
                 manager.saveToPreferences(completionHandler: completion)
             }
diff --git a/IVPNClient/Models/AntiTrackerDns.swift b/IVPNClient/Models/AntiTrackerDns.swift
new file mode 100644
index 000000000..97c33d530
--- /dev/null
+++ b/IVPNClient/Models/AntiTrackerDns.swift
@@ -0,0 +1,67 @@
+//
+//  AntiTrackerDns.swift
+//  IVPN iOS app
+//  https://github.com/ivpn/ios-app
+//
+//  Created by Juraj Hilje on 2023-07-05.
+//  Copyright (c) 2023 Privatus Limited.
+//
+//  This file is part of the IVPN iOS app.
+//
+//  The IVPN iOS app is free software: you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License as published by the Free
+//  Software Foundation, either version 3 of the License, or (at your option) any later version.
+//
+//  The IVPN iOS app is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+//  or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+//  details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with the IVPN iOS app. If not, see <https://www.gnu.org/licenses/>.
+//
+
+import Foundation
+
+struct AntiTrackerDns: Codable {
+    
+    let name: String
+    let description: String
+    let normal: String
+    let hardcore: String
+    
+    static let basicLists = ["Basic", "Comprehensive", "Restrictive"]
+    static let basicList = "Basic"
+    static let oisdbigList = "Oisdbig"
+    
+    func save() {
+        if let encoded = try? JSONEncoder().encode(self) {
+            UserDefaults.shared.set(encoded, forKey: UserDefaults.Key.antiTrackerDns)
+        }
+    }
+    
+    static func load() -> AntiTrackerDns? {
+        if let saved = UserDefaults.shared.object(forKey: UserDefaults.Key.antiTrackerDns) as? Data {
+            if let loaded = try? JSONDecoder().decode(AntiTrackerDns.self, from: saved) {
+                return loaded
+            }
+        }
+        
+        return nil
+    }
+    
+    static func == (lhs: AntiTrackerDns, rhs: AntiTrackerDns) -> Bool {
+        return lhs.name == rhs.name && lhs.normal == rhs.normal
+    }
+    
+    static func defaultList(lists: [AntiTrackerDns]) -> AntiTrackerDns? {
+        if !(KeyChain.sessionToken ?? "").isEmpty || UserDefaults.shared.isAntiTracker || UserDefaults.shared.isAntiTrackerHardcore {
+            let filteredList = lists.filter { $0.name == oisdbigList }
+            return filteredList.first
+        }
+        
+        let filteredList = lists.filter { $0.name == basicList }
+        return filteredList.first
+    }
+    
+}
diff --git a/IVPNClient/Models/Authentication.swift b/IVPNClient/Models/Authentication.swift
index f0d33b010..fc5057c41 100644
--- a/IVPNClient/Models/Authentication.swift
+++ b/IVPNClient/Models/Authentication.swift
@@ -67,6 +67,7 @@ class Authentication {
             UserDefaults.clearSession()
             Application.shared.settings.connectionProtocol = Config.defaultProtocol
             Application.shared.settings.saveConnectionProtocol()
+            Application.shared.settings.saveDefaultAntiTrackerDns()
         }
     }
     
diff --git a/IVPNClient/Models/Settings.swift b/IVPNClient/Models/Settings.swift
index 778ed4637..71905a7bb 100644
--- a/IVPNClient/Models/Settings.swift
+++ b/IVPNClient/Models/Settings.swift
@@ -152,4 +152,9 @@ class Settings {
         UserDefaults.shared.set(connectionProtocol.formatSave(), forKey: UserDefaults.Key.selectedProtocol)
     }
     
+    func saveDefaultAntiTrackerDns() {
+        let defaultDns = AntiTrackerDns.defaultList(lists: Application.shared.serverList.antiTrackerList)
+        defaultDns?.save()
+    }
+    
 }
diff --git a/IVPNClient/Models/VPNServerList.swift b/IVPNClient/Models/VPNServerList.swift
index 9a349b98e..1e4cd7248 100644
--- a/IVPNClient/Models/VPNServerList.swift
+++ b/IVPNClient/Models/VPNServerList.swift
@@ -33,6 +33,7 @@ class VPNServerList {
     open private(set) var servers: [VPNServer]
     open private(set) var ports: [ConnectionSettings]
     open private(set) var portRanges: [PortRange]
+    open private(set) var antiTrackerList: [AntiTrackerDns]
     
     var filteredFastestServers: [VPNServer] {
         if UserDefaults.standard.bool(forKey: UserDefaults.Key.fastestServerConfigured) {
@@ -47,6 +48,14 @@ class VPNServerList {
         return serversWithPing.isEmpty
     }
     
+    var antiTrackerBasicList: [AntiTrackerDns] {
+        return antiTrackerList.filter { AntiTrackerDns.basicLists.contains($0.name) }
+    }
+    
+    var antiTrackerIndividualList: [AntiTrackerDns] {
+        return antiTrackerList.filter { !AntiTrackerDns.basicLists.contains($0.name) }
+    }
+    
     // MARK: - Initialize -
     
     // This initializer without parameters will try to load either cached servers.json file
@@ -85,6 +94,7 @@ class VPNServerList {
         servers = [VPNServer]()
         ports = [ConnectionSettings]()
         portRanges = [PortRange]()
+        antiTrackerList = [AntiTrackerDns]()
         
         if let jsonData = data {
             var serversList: [[String: Any]]?
@@ -119,15 +129,22 @@ class VPNServerList {
             }
             
             if let config = config {
-                if let antitracker = config["antitracker"] as? [String: Any] {
-                    if let defaultObj = antitracker["default"] as? [String: Any] {
-                        if let ipAddress = defaultObj["ip"] as? String {
-                            UserDefaults.shared.set(ipAddress, forKey: UserDefaults.Key.antiTrackerDNS)
+                if let antiTrackerPlus = config["antitracker_plus"] as? [String: Any] {
+                    if let jsonList = antiTrackerPlus["DnsServers"] as? [[String: Any]] {
+                        var list = [AntiTrackerDns]()
+                        for dns in jsonList {
+                            list.append(AntiTrackerDns(
+                                name: dns["Name"] as? String ?? "",
+                                description: dns["Description"] as? String ?? "",
+                                normal: dns["Normal"] as? String ?? "",
+                                hardcore: dns["Hardcore"] as? String ?? ""
+                            ))
                         }
-                    }
-                    if let hardcore = antitracker["hardcore"] as? [String: Any] {
-                        if let ipAddress = hardcore["ip"] as? String {
-                            UserDefaults.shared.set(ipAddress, forKey: UserDefaults.Key.antiTrackerHardcoreDNS)
+                        antiTrackerList = list
+                        
+                        if AntiTrackerDns.load() == nil {
+                            let defaultDns = AntiTrackerDns.defaultList(lists: antiTrackerList)
+                            defaultDns?.save()
                         }
                     }
                 }
diff --git a/IVPNClient/Scenes/Base.lproj/Main.storyboard b/IVPNClient/Scenes/Base.lproj/Main.storyboard
index 37c5fb016..1fb8c854c 100644
--- a/IVPNClient/Scenes/Base.lproj/Main.storyboard
+++ b/IVPNClient/Scenes/Base.lproj/Main.storyboard
@@ -21,7 +21,7 @@
                         <color key="backgroundColor" systemColor="groupTableViewBackgroundColor"/>
                         <color key="sectionIndexBackgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <view key="tableFooterView" contentMode="scaleToFill" id="zK0-8u-72W">
-                            <rect key="frame" x="0.0" y="1609.5" width="414" height="65"/>
+                            <rect key="frame" x="0.0" y="1428.5" width="414" height="65"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="VERSION 0.0.0 (0)" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gBW-V1-BW0">
@@ -399,7 +399,7 @@
                                             </constraints>
                                         </tableViewCellContentView>
                                         <connections>
-                                            <segue destination="dcq-sZ-1Jx" kind="show" identifier="AntiTracker" id="aIr-He-1uf"/>
+                                            <segue destination="dcq-sZ-1Jx" kind="show" identifier="AntiTracker" id="ai1-08-AGB"/>
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" rowHeight="80" id="SJt-iu-O9l">
@@ -1628,7 +1628,7 @@
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="ztW-fk-tmt" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="7179.7101449275369" y="-735.26785714285711"/>
+            <point key="canvasLocation" x="8038" y="-735"/>
         </scene>
         <!--Network Protection Rules-->
         <scene sceneID="VeL-oj-dpX">
@@ -2753,27 +2753,27 @@
                                         </tableViewCellContentView>
                                         <color key="backgroundColor" name="ivpnBackgroundPrimary"/>
                                     </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" rowHeight="85" id="wEd-NG-hu6">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" rowHeight="85" id="wEd-NG-hu6">
                                         <rect key="frame" x="0.0" y="364.00000011920929" width="414" height="85"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="wEd-NG-hu6" id="P3v-IR-MHl">
-                                            <rect key="frame" x="0.0" y="0.0" width="414" height="85"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="383.5" height="85"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <stackView opaque="NO" contentMode="scaleToFill" distribution="equalCentering" alignment="center" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="CRU-5b-DFa">
-                                                    <rect key="frame" x="30" y="24" width="290" height="37"/>
+                                                    <rect key="frame" x="30" y="24" width="269.5" height="37"/>
                                                     <subviews>
                                                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="3" translatesAutoresizingMaskIntoConstraints="NO" id="NdK-IB-dFc">
-                                                            <rect key="frame" x="0.0" y="0.0" width="290" height="37"/>
+                                                            <rect key="frame" x="0.0" y="0.0" width="269.5" height="37"/>
                                                             <subviews>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="AntiTracker" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="THp-3k-ikZ">
-                                                                    <rect key="frame" x="0.0" y="0.0" width="290" height="19.5"/>
+                                                                    <rect key="frame" x="0.0" y="0.0" width="269.5" height="19.5"/>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                                     <color key="textColor" name="ivpnLabelPrimary"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="AntiTracker is disabled" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Mrr-72-e3Z">
-                                                                    <rect key="frame" x="0.0" y="22.5" width="290" height="14.5"/>
+                                                                    <rect key="frame" x="0.0" y="22.5" width="269.5" height="14.5"/>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                                     <color key="textColor" name="ivpnLabel5"/>
                                                                     <nil key="highlightedColor"/>
@@ -2783,7 +2783,7 @@
                                                     </subviews>
                                                 </stackView>
                                                 <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="wvL-pi-gS0">
-                                                    <rect key="frame" x="335" y="27" width="51" height="31"/>
+                                                    <rect key="frame" x="314.5" y="27" width="51" height="31"/>
                                                     <color key="onTintColor" name="ivpnBlue"/>
                                                     <connections>
                                                         <action selector="toggleAntiTracker:" destination="NB7-vL-gwX" eventType="valueChanged" id="tQU-QG-Vga"/>
@@ -2794,7 +2794,7 @@
                                                 <constraint firstItem="wvL-pi-gS0" firstAttribute="leading" secondItem="CRU-5b-DFa" secondAttribute="trailing" constant="15" id="SWO-E0-eqn"/>
                                                 <constraint firstItem="CRU-5b-DFa" firstAttribute="top" secondItem="P3v-IR-MHl" secondAttribute="top" constant="24" id="Z1o-TD-hXG"/>
                                                 <constraint firstItem="CRU-5b-DFa" firstAttribute="leading" secondItem="P3v-IR-MHl" secondAttribute="leading" constant="30" id="jd5-Tk-cwu"/>
-                                                <constraint firstAttribute="trailing" secondItem="wvL-pi-gS0" secondAttribute="trailing" constant="30" id="qGM-pm-OQ9"/>
+                                                <constraint firstAttribute="trailing" secondItem="wvL-pi-gS0" secondAttribute="trailing" constant="20" id="qGM-pm-OQ9"/>
                                                 <constraint firstItem="wvL-pi-gS0" firstAttribute="centerY" secondItem="P3v-IR-MHl" secondAttribute="centerY" id="sYe-PQ-ogF"/>
                                             </constraints>
                                         </tableViewCellContentView>
@@ -2874,13 +2874,13 @@
                                                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="3" translatesAutoresizingMaskIntoConstraints="NO" id="E3R-Ez-ZjT">
                                                             <rect key="frame" x="0.0" y="0.0" width="338.5" height="34.5"/>
                                                             <subviews>
-                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Protocol, Port" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rBm-y5-gNO">
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Protocol, Port" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rBm-y5-gNO">
                                                                     <rect key="frame" x="0.0" y="0.0" width="338.5" height="14.5"/>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                                     <color key="textColor" name="ivpnLabel5"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
-                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" " textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mfE-oo-iTV">
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text=" " textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mfE-oo-iTV">
                                                                     <rect key="frame" x="0.0" y="17.5" width="338.5" height="17"/>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                     <color key="textColor" name="ivpnLabelPrimary"/>
@@ -3435,6 +3435,7 @@
                         <segue destination="OOw-15-c1e" kind="show" identifier="ControlPanelSelectServer" id="s0z-do-bnX"/>
                         <segue destination="OOw-15-c1e" kind="show" identifier="ControlPanelSelectExitServer" id="fnd-go-o5i"/>
                         <segue destination="IeW-p4-xm9" kind="show" identifier="MainScreenSelectProtocol" id="yv9-Ml-p11"/>
+                        <segue destination="dkF-gx-3Dz" kind="show" identifier="MainScreenAntiTracker" id="FD2-E1-hz9"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dPo-yL-uiu" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
@@ -3845,55 +3846,100 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" systemColor="groupTableViewBackgroundColor"/>
                         <sections>
-                            <tableViewSection id="e8G-su-I9T">
-                                <string key="footerTitle">AntiTracker uses our private DNS to block ads, malicious website and third-party trackers such as Google Analytics. Supported only for OpenVPN and WireGuard protocols. Learn more</string>
+                            <tableViewSection id="8lf-qE-iVa">
+                                <string key="footerTitle">When AntiTracker is enabled, IVPN blocks ads, malicious websites, and third-party trackers using our private DNS servers. Learn more</string>
                                 <cells>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" id="2xI-KL-qZa">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" id="oQ6-LO-0ny">
                                         <rect key="frame" x="0.0" y="18" width="414" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="2xI-KL-qZa" id="5gM-fr-R3A">
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="oQ6-LO-0ny" id="8jN-s9-Sb0">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Enable" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eQP-fm-TuE">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Enable" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Bzi-q8-leQ">
                                                     <rect key="frame" x="16" y="11.5" width="325" height="21"/>
                                                     <constraints>
-                                                        <constraint firstAttribute="height" constant="21" id="LcZ-y9-P6J"/>
+                                                        <constraint firstAttribute="height" constant="21" id="7dK-RO-1JI"/>
                                                     </constraints>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" name="ivpnLabelPrimary"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="ayn-kr-8Ii">
+                                                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="ylN-Yn-ypd">
                                                     <rect key="frame" x="349" y="6.5" width="51" height="31"/>
                                                     <color key="onTintColor" name="ivpnBlue"/>
                                                     <connections>
-                                                        <action selector="toggleAntiTracker:" destination="dcq-sZ-1Jx" eventType="valueChanged" id="Rvx-72-OmR"/>
+                                                        <action selector="toggleAntiTracker:" destination="dcq-sZ-1Jx" eventType="valueChanged" id="uBq-cu-8C8"/>
                                                     </connections>
                                                 </switch>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstItem="eQP-fm-TuE" firstAttribute="leading" secondItem="5gM-fr-R3A" secondAttribute="leading" constant="16" id="D7d-J5-7V0"/>
-                                                <constraint firstItem="eQP-fm-TuE" firstAttribute="centerY" secondItem="5gM-fr-R3A" secondAttribute="centerY" id="GVo-nM-m0e"/>
-                                                <constraint firstAttribute="trailing" secondItem="ayn-kr-8Ii" secondAttribute="trailing" constant="16" id="JET-GR-TDk"/>
-                                                <constraint firstItem="ayn-kr-8Ii" firstAttribute="leading" secondItem="eQP-fm-TuE" secondAttribute="trailing" constant="8" id="aBp-gs-MDB"/>
-                                                <constraint firstItem="ayn-kr-8Ii" firstAttribute="centerY" secondItem="5gM-fr-R3A" secondAttribute="centerY" id="wbK-bg-Kaj"/>
+                                                <constraint firstItem="ylN-Yn-ypd" firstAttribute="centerY" secondItem="8jN-s9-Sb0" secondAttribute="centerY" id="0uc-75-1XM"/>
+                                                <constraint firstItem="Bzi-q8-leQ" firstAttribute="leading" secondItem="8jN-s9-Sb0" secondAttribute="leading" constant="16" id="Ktb-Sz-hZR"/>
+                                                <constraint firstItem="ylN-Yn-ypd" firstAttribute="leading" secondItem="Bzi-q8-leQ" secondAttribute="trailing" constant="8" id="RYe-yb-Xhz"/>
+                                                <constraint firstItem="Bzi-q8-leQ" firstAttribute="centerY" secondItem="8jN-s9-Sb0" secondAttribute="centerY" id="U5F-Wm-Lr7"/>
+                                                <constraint firstAttribute="trailing" secondItem="ylN-Yn-ypd" secondAttribute="trailing" constant="16" id="fcQ-LR-cDH"/>
                                             </constraints>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                 </cells>
                             </tableViewSection>
-                            <tableViewSection headerTitle="Hardcore Mode" id="sDr-JP-6yn">
-                                <string key="footerTitle">Hardcore mode blocks the leading companies with business models relying on user surveillance (currently: Google and Facebook). Learn more</string>
+                            <tableViewSection id="e8G-su-I9T">
+                                <string key="footerTitle">Block lists refer to DNS blocking lists used by our AntiTracker. The 'Basic', 'Comprehensive', and 'Restrictive' options are combinations of individual lists, each offering a different level of protection. You also have the freedom to select from individual lists for a more tailored AntiTracker experience. Learn more</string>
+                                <cells>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" rowHeight="60" id="pV2-j0-rNo">
+                                        <rect key="frame" x="0.0" y="141.5" width="414" height="60"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="pV2-j0-rNo" id="VLJ-pv-Adf">
+                                            <rect key="frame" x="0.0" y="0.0" width="383.5" height="60"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Basic" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gCj-fS-NVi">
+                                                    <rect key="frame" x="16" y="34" width="351.5" height="16"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="height" constant="16" id="ryb-zO-vRB"/>
+                                                    </constraints>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                                                    <color key="textColor" name="ivpnLabel5"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Block List" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DhI-Q0-eDe">
+                                                    <rect key="frame" x="16" y="10" width="351.5" height="21"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="height" constant="21" id="Y07-Ut-tgS"/>
+                                                    </constraints>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                    <color key="textColor" name="ivpnLabelPrimary"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstAttribute="trailing" secondItem="gCj-fS-NVi" secondAttribute="trailing" constant="16" id="3yX-Y2-jP7"/>
+                                                <constraint firstItem="gCj-fS-NVi" firstAttribute="top" secondItem="DhI-Q0-eDe" secondAttribute="bottom" constant="3" id="7VH-87-jLh"/>
+                                                <constraint firstItem="gCj-fS-NVi" firstAttribute="leading" secondItem="VLJ-pv-Adf" secondAttribute="leading" constant="16" id="dnm-T2-U35"/>
+                                                <constraint firstItem="DhI-Q0-eDe" firstAttribute="top" secondItem="VLJ-pv-Adf" secondAttribute="top" constant="10" id="gkw-7U-Xiq"/>
+                                                <constraint firstItem="DhI-Q0-eDe" firstAttribute="leading" secondItem="VLJ-pv-Adf" secondAttribute="leading" constant="16" id="rVa-it-bnh"/>
+                                                <constraint firstAttribute="trailing" secondItem="DhI-Q0-eDe" secondAttribute="trailing" constant="16" id="zBy-we-jwH"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                        <color key="tintColor" name="ivpnBlue"/>
+                                        <connections>
+                                            <segue destination="GhF-xv-sZq" kind="show" id="3KH-OL-zkE"/>
+                                        </connections>
+                                    </tableViewCell>
+                                </cells>
+                            </tableViewSection>
+                            <tableViewSection id="sDr-JP-6yn">
+                                <string key="footerTitle">Adding Hardcore mode will block the leading companies with business models relying on user surveillance (currently: Google and Facebook). Learn more</string>
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" id="UYO-Vy-onE">
-                                        <rect key="frame" x="0.0" y="185" width="414" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="329.5" width="414" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="UYO-Vy-onE" id="yDV-X9-eO8">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Hardcore mode" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MSe-dn-Ms4">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Hardcore Mode" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MSe-dn-Ms4">
                                                     <rect key="frame" x="16" y="11.5" width="325" height="21"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="21" id="7zj-bJ-dJO"/>
@@ -3930,12 +3976,42 @@
                     <navigationItem key="navigationItem" title="AntiTracker" id="q6l-3A-LwN"/>
                     <connections>
                         <outlet property="antiTrackerHardcoreSwitch" destination="xlE-hr-FAs" id="fRD-Q0-aZu"/>
-                        <outlet property="antiTrackerSwitch" destination="ayn-kr-8Ii" id="1yv-C5-IN0"/>
+                        <outlet property="antiTrackerList" destination="gCj-fS-NVi" id="nJc-7N-Wu3"/>
+                        <outlet property="antiTrackerSwitch" destination="ylN-Yn-ypd" id="QSG-5X-bHZ"/>
                     </connections>
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="lKI-3X-0iV" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="6295.1999999999998" y="-734.48275862068965"/>
+            <point key="canvasLocation" x="6293" y="-1468"/>
+        </scene>
+        <!--Block List-->
+        <scene sceneID="WDU-Qr-yfE">
+            <objects>
+                <tableViewController id="GhF-xv-sZq" customClass="AntiTrackerListViewController" customModule="IVPNClient" customModuleProvider="target" sceneMemberID="viewController">
+                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="30" estimatedSectionHeaderHeight="-1" sectionFooterHeight="18" estimatedSectionFooterHeight="-1" id="pXz-DV-J8m">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <prototypes>
+                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="AntiTrackerListCell" rowHeight="46" id="Rb9-wV-p76">
+                                <rect key="frame" x="0.0" y="55.5" width="414" height="46"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Rb9-wV-p76" id="fhN-8V-wLA">
+                                    <rect key="frame" x="0.0" y="0.0" width="414" height="46"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                </tableViewCellContentView>
+                            </tableViewCell>
+                        </prototypes>
+                        <connections>
+                            <outlet property="dataSource" destination="GhF-xv-sZq" id="GAO-fV-gpE"/>
+                            <outlet property="delegate" destination="GhF-xv-sZq" id="7ch-pR-bwi"/>
+                        </connections>
+                    </tableView>
+                    <navigationItem key="navigationItem" title="Block List" id="Xp0-An-u2T"/>
+                </tableViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="K3q-H0-kyv" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="7180" y="-1468"/>
         </scene>
         <!--Switch to IVPN Pro-->
         <scene sceneID="fZQ-ut-wkh">
@@ -4605,9 +4681,29 @@
             </objects>
             <point key="canvasLocation" x="7180" y="13"/>
         </scene>
+        <!--Navigation Controller-->
+        <scene sceneID="EPO-MU-jc9">
+            <objects>
+                <navigationController automaticallyAdjustsScrollViewInsets="NO" id="dkF-gx-3Dz" customClass="NavigationController" customModule="IVPNClient" customModuleProvider="target" sceneMemberID="viewController">
+                    <toolbarItems/>
+                    <navigationItem key="navigationItem" id="hLF-et-JhJ"/>
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="MUi-YY-dSA">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="56"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                    </navigationBar>
+                    <nil name="viewControllers"/>
+                    <connections>
+                        <segue destination="dcq-sZ-1Jx" kind="relationship" relationship="rootViewController" id="fCt-Id-3nf"/>
+                    </connections>
+                </navigationController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="EEi-76-D4e" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="5413" y="-1468"/>
+        </scene>
     </scenes>
     <inferredMetricsTieBreakers>
         <segue reference="s0z-do-bnX"/>
+        <segue reference="ai1-08-AGB"/>
         <segue reference="oZ9-fT-UYA"/>
         <segue reference="bcT-Xg-B45"/>
     </inferredMetricsTieBreakers>
diff --git a/IVPNClient/Scenes/MainScreen/ControlPanel/ControlPanelViewController+Ext.swift b/IVPNClient/Scenes/MainScreen/ControlPanel/ControlPanelViewController+Ext.swift
index 62939c19b..35d6fa8f2 100644
--- a/IVPNClient/Scenes/MainScreen/ControlPanel/ControlPanelViewController+Ext.swift
+++ b/IVPNClient/Scenes/MainScreen/ControlPanel/ControlPanelViewController+Ext.swift
@@ -78,6 +78,10 @@ extension ControlPanelViewController {
             }
         }
         
+        if indexPath.row == 5 {
+            presentAntiTracker()
+        }
+        
         if indexPath.row == 7 {
             guard evaluateIsLoggedIn() else {
                 return
diff --git a/IVPNClient/Scenes/MainScreen/ControlPanel/ControlPanelViewController.swift b/IVPNClient/Scenes/MainScreen/ControlPanel/ControlPanelViewController.swift
index b3f8e670e..15b55047e 100644
--- a/IVPNClient/Scenes/MainScreen/ControlPanel/ControlPanelViewController.swift
+++ b/IVPNClient/Scenes/MainScreen/ControlPanel/ControlPanelViewController.swift
@@ -336,6 +336,12 @@ class ControlPanelViewController: UITableViewController {
         })
     }
     
+    func presentAntiTracker() {
+        if let topViewController = UIApplication.topViewController() as? MainViewController {
+            topViewController.performSegue(withIdentifier: "MainScreenAntiTracker", sender: nil)
+        }
+    }
+    
     func presentSelectProtocol() {
         if let topViewController = UIApplication.topViewController() as? MainViewController {
             topViewController.performSegue(withIdentifier: "MainScreenSelectProtocol", sender: nil)
diff --git a/IVPNClient/Scenes/ViewControllers/AntiTrackerListViewController.swift b/IVPNClient/Scenes/ViewControllers/AntiTrackerListViewController.swift
new file mode 100644
index 000000000..0f6bdbd40
--- /dev/null
+++ b/IVPNClient/Scenes/ViewControllers/AntiTrackerListViewController.swift
@@ -0,0 +1,117 @@
+//
+//  AntiTrackerListViewController.swift
+//  IVPN iOS app
+//  https://github.com/ivpn/ios-app
+//
+//  Created by Juraj Hilje on 2023-07-06.
+//  Copyright (c) 2023 Privatus Limited.
+//
+//  This file is part of the IVPN iOS app.
+//
+//  The IVPN iOS app is free software: you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License as published by the Free
+//  Software Foundation, either version 3 of the License, or (at your option) any later version.
+//
+//  The IVPN iOS app is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+//  or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+//  details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with the IVPN iOS app. If not, see <https://www.gnu.org/licenses/>.
+//
+
+import UIKit
+
+class AntiTrackerListViewController: UITableViewController {
+    
+    private var collection = [
+        Application.shared.serverList.antiTrackerBasicList,
+        Application.shared.serverList.antiTrackerIndividualList
+    ]
+    
+    private var selectedDns = AntiTrackerDns.load()
+    
+    // MARK: - View Lifecycle -
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        setupView()
+    }
+    
+    // MARK: - Private methods -
+    
+    private func setupView() {
+        tableView.backgroundColor = UIColor.init(named: Theme.ivpnBackgroundQuaternary)
+        tableView.contentInset = UIEdgeInsets(top: 16, left: 0, bottom: 0, right: 0)
+    }
+
+}
+
+// MARK: - UITableViewDatasource -
+
+extension AntiTrackerListViewController {
+    
+    override func numberOfSections(in tableView: UITableView) -> Int {
+        return collection.count
+    }
+
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return collection[section].count
+    }
+    
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let cell = tableView.dequeueReusableCell(withIdentifier: "AntiTrackerListCell", for: indexPath)
+        let dns = collection[indexPath.section][indexPath.row]
+        cell.textLabel?.text = dns.description
+        cell.accessoryType = .none
+        
+        if let selectedDns = selectedDns, dns == selectedDns {
+            cell.accessoryType = .checkmark
+        }
+        
+        return cell
+    }
+    
+    override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
+        switch section {
+        case 1:
+            return "Individual lists"
+        default:
+            return "Pre-defined lists"
+        }
+    }
+    
+}
+
+// MARK: - UITableViewDelegate -
+
+extension AntiTrackerListViewController {
+    
+    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        let dns = collection[indexPath.section][indexPath.row]
+        selectedDns = dns
+        selectedDns?.save()
+        tableView.reloadData()
+        navigationController?.popViewController(animated: true) {
+            NotificationCenter.default.post(name: Notification.Name.AntiTrackerListUpdated, object: nil)
+        }
+    }
+    
+    override func tableView(_ tableView: UITableView, willDisplayHeaderView view: UIView, forSection section: Int) {
+        if let header = view as? UITableViewHeaderFooterView {
+            header.textLabel?.textColor = UIColor.init(named: Theme.ivpnLabel6)
+        }
+    }
+    
+    override func tableView(_ tableView: UITableView, willDisplayFooterView view: UIView, forSection section: Int) {
+        if let footer = view as? UITableViewHeaderFooterView {
+            footer.textLabel?.textColor = UIColor.init(named: Theme.ivpnLabel6)
+        }
+    }
+    
+    override func tableView(_ tableView: UITableView, willDisplay cell: UITableViewCell, forRowAt indexPath: IndexPath) {
+        cell.backgroundColor = UIColor.init(named: Theme.ivpnBackgroundPrimary)
+    }
+    
+}
diff --git a/IVPNClient/Scenes/ViewControllers/AntiTrackerViewController.swift b/IVPNClient/Scenes/ViewControllers/AntiTrackerViewController.swift
index 59b8a9f4b..9fe08074b 100644
--- a/IVPNClient/Scenes/ViewControllers/AntiTrackerViewController.swift
+++ b/IVPNClient/Scenes/ViewControllers/AntiTrackerViewController.swift
@@ -29,6 +29,7 @@ class AntiTrackerViewController: UITableViewController {
     
     @IBOutlet weak var antiTrackerSwitch: UISwitch!
     @IBOutlet weak var antiTrackerHardcoreSwitch: UISwitch!
+    @IBOutlet weak var antiTrackerList: UILabel!
     
     // MARK: - @IBActions -
     
@@ -44,6 +45,7 @@ class AntiTrackerViewController: UITableViewController {
         WidgetCenter.shared.reloadTimelines(ofKind: "IVPNWidget")
         antiTrackerHardcoreSwitch.isEnabled = sender.isOn
         evaluateReconnect(sender: sender as UIView)
+        NotificationCenter.default.post(name: Notification.Name.UpdateControlPanel, object: nil)
         
         if sender.isOn {
             registerUserActivity(type: UserActivityType.AntiTrackerEnable, title: UserActivityTitle.AntiTrackerEnable)
@@ -55,6 +57,7 @@ class AntiTrackerViewController: UITableViewController {
     @IBAction func toggleAntiTrackerHardcore(_ sender: UISwitch) {
         UserDefaults.shared.set(sender.isOn, forKey: UserDefaults.Key.isAntiTrackerHardcore)
         evaluateReconnect(sender: sender as UIView)
+        NotificationCenter.default.post(name: Notification.Name.UpdateControlPanel, object: nil)
     }
     
     // MARK: - View Lifecycle -
@@ -62,13 +65,26 @@ class AntiTrackerViewController: UITableViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         setupView()
+        initNavigationBar()
         addObservers()
     }
     
+    override func viewWillAppear(_ animated: Bool) {
+        tableView.deselectRow(at: IndexPath(row: 0, section: 1), animated: true)
+        setupView()
+    }
+    
     // MARK: - Private methods -
     
+    private func initNavigationBar() {
+        if isPresentedModally {
+            navigationItem.leftBarButtonItem = UIBarButtonItem(title: "Done", style: .plain, target: self, action: #selector(dismissViewController(_:)))
+        }
+    }
+    
     private func addObservers() {
         NotificationCenter.default.addObserver(self, selector: #selector(setupView), name: Notification.Name.AntiTrackerUpdated, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(listUpdated), name: Notification.Name.AntiTrackerListUpdated, object: nil)
     }
     
     @objc private func setupView() {
@@ -76,6 +92,11 @@ class AntiTrackerViewController: UITableViewController {
         antiTrackerSwitch.setOn(UserDefaults.shared.isAntiTracker, animated: false)
         antiTrackerHardcoreSwitch.setOn(UserDefaults.shared.isAntiTrackerHardcore, animated: false)
         antiTrackerHardcoreSwitch.isEnabled = UserDefaults.shared.isAntiTracker
+        antiTrackerList.text = AntiTrackerDns.load()?.description
+    }
+    
+    @objc private func listUpdated() {
+        evaluateReconnect(sender: antiTrackerList)
     }
 
 }
@@ -88,7 +109,15 @@ extension AntiTrackerViewController {
         let footer = view as! UITableViewHeaderFooterView
         footer.textLabel?.textColor = UIColor.init(named: Theme.ivpnLabel6)
         
-        let urlString = section > 0 ? "https://www.ivpn.net/antitracker/hardcore" : "https://www.ivpn.net/antitracker"
+        var urlString = ""
+        switch section {
+        case 1:
+            urlString = "https://www.ivpn.net/knowledgebase/general/antitracker-plus-lists-explained/"
+        case 2:
+            urlString = "https://www.ivpn.net/knowledgebase/general/antitracker-faq/"
+        default:
+            urlString = "https://www.ivpn.net/antitracker/"
+        }
         
         let label = ActiveLabel(frame: .zero)
         let customType = ActiveType.custom(pattern: "Learn more")
diff --git a/IVPNClient/Scenes/ViewControllers/SettingsViewController.swift b/IVPNClient/Scenes/ViewControllers/SettingsViewController.swift
index bf6ef28a0..5dcc2f5c0 100644
--- a/IVPNClient/Scenes/ViewControllers/SettingsViewController.swift
+++ b/IVPNClient/Scenes/ViewControllers/SettingsViewController.swift
@@ -472,10 +472,11 @@ extension SettingsViewController {
         // Kill Switch
         if indexPath.section == 3 && indexPath.row == 4 {
             if #available(iOS 15.1, *) {
-                return UITableView.automaticDimension
-            } else {
-                return 0
+                if #available(iOS 16, *) { } else {
+                    return UITableView.automaticDimension
+                }
             }
+            return 0
         }
         
         return UITableView.automaticDimension
diff --git a/IVPNClient/Utilities/Extensions/NETunnelProviderProtocol+Ext.swift b/IVPNClient/Utilities/Extensions/NETunnelProviderProtocol+Ext.swift
index 47ec4fdf7..c08efb078 100644
--- a/IVPNClient/Utilities/Extensions/NETunnelProviderProtocol+Ext.swift
+++ b/IVPNClient/Utilities/Extensions/NETunnelProviderProtocol+Ext.swift
@@ -54,6 +54,7 @@ extension NETunnelProviderProtocol {
         
         if let dnsServers = openVPNdnsServers(), !dnsServers.isEmpty, dnsServers != [""] {
             sessionBuilder.dnsServers = dnsServers
+            log(.info, message: "DNS server: \(dnsServers)")
             
             switch DNSProtocolType.preferred() {
             case .doh:
@@ -83,7 +84,9 @@ extension NETunnelProviderProtocol {
         )
         proto.disconnectOnSleep = !UserDefaults.shared.keepAlive
         if #available(iOS 15.1, *) {
-            proto.includeAllNetworks = UserDefaults.shared.killSwitch
+            if #available(iOS 16, *) { } else {
+                proto.includeAllNetworks = UserDefaults.shared.killSwitch
+            }
         }
         
         return proto
@@ -157,7 +160,9 @@ extension NETunnelProviderProtocol {
         configuration.providerConfiguration = tunnel.generateProviderConfiguration()
         configuration.disconnectOnSleep = !UserDefaults.shared.keepAlive
         if #available(iOS 15.1, *) {
-            configuration.includeAllNetworks = UserDefaults.shared.killSwitch
+            if #available(iOS 16, *) { } else {
+                configuration.includeAllNetworks = UserDefaults.shared.killSwitch
+            }
         }
         
         return configuration
diff --git a/IVPNClient/Utilities/Extensions/NotificationName+Ext.swift b/IVPNClient/Utilities/Extensions/NotificationName+Ext.swift
index 1aaf9ddb2..206676733 100644
--- a/IVPNClient/Utilities/Extensions/NotificationName+Ext.swift
+++ b/IVPNClient/Utilities/Extensions/NotificationName+Ext.swift
@@ -53,7 +53,8 @@ extension Notification.Name {
     public static let UpdateResolvedDNSInsideVPN = Notification.Name("updateResolvedDNSInsideVPN")
     public static let ResolvedDNSError = Notification.Name("resolvedDNSError")
     public static let ServersListUpdated = Notification.Name("serversListUpdated")
-    public static let AntiTrackerUpdated = Notification.Name("antiTrackerUpdatedUpdated")
+    public static let AntiTrackerUpdated = Notification.Name("antiTrackerUpdated")
+    public static let AntiTrackerListUpdated = Notification.Name("antiTrackerListUpdated")
     public static let CustomDNSUpdated = Notification.Name("customDNSUpdatedUpdated")
     public static let EvaluateReconnect = Notification.Name("evaluateReconnect")
     public static let EvaluatePlanUpdate = Notification.Name("evaluatePlanUpdate")
diff --git a/IVPNClient/Utilities/Extensions/UserDefaults+Ext.swift b/IVPNClient/Utilities/Extensions/UserDefaults+Ext.swift
index 8841dbd24..05c290883 100644
--- a/IVPNClient/Utilities/Extensions/UserDefaults+Ext.swift
+++ b/IVPNClient/Utilities/Extensions/UserDefaults+Ext.swift
@@ -88,6 +88,7 @@ extension UserDefaults {
         static let killSwitch = "killSwitch"
         static let selectHost = "selectHost"
         static let isLoggedIn = "isLoggedIn"
+        static let antiTrackerDns = "antiTrackerDns"
     }
     
     @objc dynamic var wireguardTunnelProviderError: String {
@@ -143,11 +144,11 @@ extension UserDefaults {
     }
     
     @objc dynamic var antiTrackerDNS: String {
-        return string(forKey: Key.antiTrackerDNS) ?? ""
+        return AntiTrackerDns.load()?.normal ?? ""
     }
     
     @objc dynamic var antiTrackerHardcoreDNS: String {
-        return string(forKey: Key.antiTrackerHardcoreDNS) ?? ""
+        return AntiTrackerDns.load()?.hardcore ?? ""
     }
     
     @objc dynamic var wgKeyTimestamp: Date {
@@ -268,6 +269,7 @@ extension UserDefaults {
         shared.removeObject(forKey: Key.killSwitch)
         shared.removeObject(forKey: Key.selectHost)
         shared.removeObject(forKey: Key.isLoggedIn)
+        shared.removeObject(forKey: Key.antiTrackerDns)
         standard.removeObject(forKey: Key.serviceStatus)
         standard.removeObject(forKey: Key.selectedHost)
         standard.removeObject(forKey: Key.selectedExitHost)
diff --git a/wireguard-tunnel-provider/PacketTunnelProvider.swift b/wireguard-tunnel-provider/PacketTunnelProvider.swift
index 540b38c4a..fd47fad84 100644
--- a/wireguard-tunnel-provider/PacketTunnelProvider.swift
+++ b/wireguard-tunnel-provider/PacketTunnelProvider.swift
@@ -250,6 +250,10 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
             }
         }
         
+        if let dnsSettings = newSettings.dnsSettings {
+            wg_log(.info, message: "DNS server: \(String(describing: dnsSettings.servers))")
+        }
+        
         if let mtu = self.config.providerConfiguration![PCKeys.mtu.rawValue] as? NSNumber, mtu.intValue > 0 {
             newSettings.mtu = mtu
             wg_log(.info, message: "MTU: \(mtu)")