         switch sections[indexPath.section] {
         case .privacy:
             if indexPath.row == 0 {
-                let trackingCell = SettingsTableViewAccessoryCell(style: .subtitle, reuseIdentifier: "trackingCell")
-                trackingCell.textLabel?.text = String(format: UIConstants.strings.trackingProtectionLabel)
+                let trackingCell = SettingsTableViewAccessoryCell(style: .value1, reuseIdentifier: "trackingCell")
+                trackingCell.labelText = String(format: UIConstants.strings.trackingProtectionLabel)
                 trackingCell.accessibilityIdentifier = "settingsViewController.trackingCell"
-                trackingCell.accessoryType = .disclosureIndicator
                 trackingCell.accessoryLabelText = Settings.getToggle(.trackingProtection) ?
                     UIConstants.strings.settingsTrackingProtectionOn :
                     UIConstants.strings.settingsTrackingProtectionOff

            cell = setupToggleCell(indexPath: indexPath, navigationController: navigationController)
        case .search:
            if indexPath.row < 2 {
                guard let searchCell = tableView.dequeueReusableCell(withIdentifier: "accessoryCell") as? SettingsTableViewAccessoryCell else { fatalError("Accessory cells do not exist") }
                let autocompleteLabel = Settings.getToggle(.enableDomainAutocomplete) || Settings.getToggle(.enableCustomDomainAutocomplete) ? UIConstants.strings.autocompleteCustomEnabled : UIConstants.strings.autocompleteCustomDisabled
                let labels : (label: String, accessoryLabel: String, identifier: String) = indexPath.row == 0 ?
                    (UIConstants.strings.settingsSearchLabel, searchEngineManager.activeEngine.name, "SettingsViewController.searchCell")


    func numberOfSections(in tableView: UITableView) -> Int {
        return sections.count
    }

    private func heightForLabel(_ label: UILabel, width: CGFloat, text: String) -> CGFloat {
