diff --git a/iOS/Account/Account.storyboard b/iOS/Account/Account.storyboard
index 52982af01..b68e2fc00 100644
--- a/iOS/Account/Account.storyboard
+++ b/iOS/Account/Account.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -57,7 +57,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Email" textAlignment="natural" adjustsFontForContentSizeCategory="YES" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="o06-fe-i3S">
-                                                    <rect key="frame" x="20" y="11.5" width="334" height="21"/>
+                                                    <rect key="frame" x="20" y="11" width="334" height="22"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <textInputTraits key="textInputTraits" spellCheckingType="no" keyboardType="emailAddress" textContentType="username"/>
                                                 </textField>
@@ -206,7 +206,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Name" textAlignment="natural" adjustsFontForContentSizeCategory="YES" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Yl1-R6-xZi">
-                                                    <rect key="frame" x="20" y="11.5" width="334" height="21"/>
+                                                    <rect key="frame" x="20" y="11" width="334" height="22"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <textInputTraits key="textInputTraits" autocapitalizationType="words"/>
                                                 </textField>
@@ -291,7 +291,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Email" textAlignment="natural" adjustsFontForContentSizeCategory="YES" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="vJa-NN-yjR">
-                                                    <rect key="frame" x="20" y="11.5" width="334" height="21"/>
+                                                    <rect key="frame" x="20" y="11" width="334" height="22"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <textInputTraits key="textInputTraits" spellCheckingType="no" keyboardType="emailAddress" textContentType="username"/>
                                                 </textField>
@@ -315,7 +315,7 @@
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <textInputTraits key="textInputTraits" secureTextEntry="YES" textContentType="password"/>
                                                 </textField>
-                                                <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="TfW-wf-V06">
+                                                <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" pointerInteraction="YES" translatesAutoresizingMaskIntoConstraints="NO" id="TfW-wf-V06">
                                                     <rect key="frame" x="311" y="5.5" width="43" height="33"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <state key="normal" title="Show"/>
diff --git a/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift b/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift
index 1bed941f6..4e6e4513e 100644
--- a/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift
+++ b/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift
@@ -12,7 +12,7 @@ import Account
 import RSTree
 
 protocol MasterFeedTableViewCellDelegate: class {
-	func disclosureSelected(_ sender: MasterFeedTableViewCell, expanding: Bool)
+	func masterFeedTableViewCellDisclosureDidToggle(_ sender: MasterFeedTableViewCell, expanding: Bool)
 }
 
 class MasterFeedTableViewCell : VibrantTableViewCell {
@@ -149,7 +149,7 @@ class MasterFeedTableViewCell : VibrantTableViewCell {
 	@objc func buttonPressed(_ sender: UIButton) {
 		if isDisclosureAvailable {
 			setDisclosure(isExpanded: !isDisclosureExpanded, animated: true)
-			delegate?.disclosureSelected(self, expanding: isDisclosureExpanded)
+			delegate?.masterFeedTableViewCellDisclosureDidToggle(self, expanding: isDisclosureExpanded)
 		}
 	}
 	
@@ -181,6 +181,9 @@ private extension MasterFeedTableViewCell {
 		disclosureButton?.tintColor = AppAssets.controlBackgroundColor
 		disclosureButton?.imageView?.contentMode = .center
 		disclosureButton?.imageView?.clipsToBounds = false
+		if #available(iOS 13.4, *) {
+			disclosureButton?.isPointerInteractionEnabled = true
+		}
 		addSubviewAtInit(disclosureButton!)
 	}
 	
diff --git a/iOS/MasterFeed/Cell/MasterFeedTableViewSectionHeader.swift b/iOS/MasterFeed/Cell/MasterFeedTableViewSectionHeader.swift
index 0227184bf..56082ab3c 100644
--- a/iOS/MasterFeed/Cell/MasterFeedTableViewSectionHeader.swift
+++ b/iOS/MasterFeed/Cell/MasterFeedTableViewSectionHeader.swift
@@ -8,8 +8,14 @@
 
 import UIKit
 
+protocol MasterFeedTableViewSectionHeaderDelegate {
+	func masterFeedTableViewSectionHeaderDisclosureDidToggle(_ sender: MasterFeedTableViewSectionHeader)
+}
+
 class MasterFeedTableViewSectionHeader: UITableViewHeaderFooterView {
 	
+	var delegate: MasterFeedTableViewSectionHeaderDelegate?
+	
 	override var accessibilityLabel: String? {
 		set {}
 		get {
@@ -66,12 +72,16 @@ class MasterFeedTableViewSectionHeader: UITableViewHeaderFooterView {
 	}()
 	
 	private let unreadCountView = MasterFeedUnreadCountView(frame: CGRect.zero)
-	private var disclosureView: UIImageView = {
-		let iView = NonIntrinsicImageView()
-		iView.tintColor = UIColor.tertiaryLabel
-		iView.image = AppAssets.disclosureImage
-		iView.contentMode = .center
-		return iView
+	private lazy var disclosureButton: UIButton = {
+		let button = NonIntrinsicButton()
+		button.tintColor = UIColor.tertiaryLabel
+		button.setImage(AppAssets.disclosureImage, for: .normal)
+		button.contentMode = .center
+		if #available(iOS 13.4, *) {
+			button.isPointerInteractionEnabled = true
+		}
+		button.addTarget(self, action: #selector(toggleDisclosure), for: .touchUpInside)
+		return button
 	}()
 
 	private let topSeparatorView: UIView = {
@@ -115,10 +125,14 @@ class MasterFeedTableViewSectionHeader: UITableViewHeaderFooterView {
 
 private extension MasterFeedTableViewSectionHeader {
 	
+	@objc func toggleDisclosure() {
+		delegate?.masterFeedTableViewSectionHeaderDisclosureDidToggle(self)
+	}
+	
 	func commonInit() {
 		addSubviewAtInit(unreadCountView)
 		addSubviewAtInit(titleView)
-		addSubviewAtInit(disclosureView)
+		addSubviewAtInit(disclosureButton)
 		updateExpandedState(animate: false)
 		addBackgroundView()
 		addSubviewAtInit(topSeparatorView)
@@ -136,9 +150,9 @@ private extension MasterFeedTableViewSectionHeader {
 			withDuration: duration,
 			animations: {
 				if self.disclosureExpanded {
-					self.disclosureView.transform = CGAffineTransform(rotationAngle: 1.570796)
+					self.disclosureButton.transform = CGAffineTransform(rotationAngle: 1.570796)
 				} else {
-					self.disclosureView.transform = CGAffineTransform(rotationAngle: 0)
+					self.disclosureButton.transform = CGAffineTransform(rotationAngle: 0)
 				}
 			}, completion: { _ in
 				if !self.isLastSection && !self.disclosureExpanded {
@@ -167,7 +181,7 @@ private extension MasterFeedTableViewSectionHeader {
 	func layoutWith(_ layout: MasterFeedTableViewSectionHeaderLayout) {
 		titleView.setFrameIfNotEqual(layout.titleRect)
 		unreadCountView.setFrameIfNotEqual(layout.unreadCountRect)
-		disclosureView.setFrameIfNotEqual(layout.disclosureButtonRect)
+		disclosureButton.setFrameIfNotEqual(layout.disclosureButtonRect)
 		
 		let top = CGRect(x: safeAreaInsets.left, y: 0, width: frame.width - safeAreaInsets.right - safeAreaInsets.left, height: 0.33)
 		topSeparatorView.setFrameIfNotEqual(top)
diff --git a/iOS/MasterFeed/MasterFeedViewController.swift b/iOS/MasterFeed/MasterFeedViewController.swift
index 5432c72a0..d8f99402f 100644
--- a/iOS/MasterFeed/MasterFeedViewController.swift
+++ b/iOS/MasterFeed/MasterFeedViewController.swift
@@ -158,6 +158,7 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner {
 		}
 		
 		let headerView = tableView.dequeueReusableHeaderFooterView(withIdentifier: "SectionHeader") as! MasterFeedTableViewSectionHeader
+		headerView.delegate = self
 		headerView.name = nameProvider.nameForDisplay
 		
 		guard let sectionNode = coordinator.rootNode.childAtIndex(section) else {
@@ -386,24 +387,10 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner {
 	}
 	
 	@objc func toggleSectionHeader(_ sender: UITapGestureRecognizer) {
-		
-		guard let sectionIndex = sender.view?.tag,
-			let sectionNode = coordinator.rootNode.childAtIndex(sectionIndex),
-			let headerView = sender.view as? MasterFeedTableViewSectionHeader
-				else {
-					return
+		guard let headerView = sender.view as? MasterFeedTableViewSectionHeader else {
+			return
 		}
-		
-		if coordinator.isExpanded(sectionNode) {
-			headerView.disclosureExpanded = false
-			coordinator.collapse(sectionNode)
-			self.applyChanges(animated: true)
-		} else {
-			headerView.disclosureExpanded = true
-			coordinator.expand(sectionNode)
-			self.applyChanges(animated: true)
-		}
-		
+		toggle(headerView)
 	}
 	
 	@objc func refreshAccounts(_ sender: Any) {
@@ -556,11 +543,21 @@ extension MasterFeedViewController: UIContextMenuInteractionDelegate {
 	}
 }
 
+// MARK: MasterFeedTableViewSectionHeaderDelegate
+
+extension MasterFeedViewController: MasterFeedTableViewSectionHeaderDelegate {
+	
+	func masterFeedTableViewSectionHeaderDisclosureDidToggle(_ sender: MasterFeedTableViewSectionHeader) {
+		toggle(sender)
+	}
+	
+}
+
 // MARK: MasterTableViewCellDelegate
 
 extension MasterFeedViewController: MasterFeedTableViewCellDelegate {
 	
-	func disclosureSelected(_ sender: MasterFeedTableViewCell, expanding: Bool) {
+	func masterFeedTableViewCellDisclosureDidToggle(_ sender: MasterFeedTableViewCell, expanding: Bool) {
 		if expanding {
 			expand(sender)
 		} else {
@@ -753,6 +750,22 @@ private extension MasterFeedViewController {
 		return nil
 	}
 
+	func toggle(_ headerView: MasterFeedTableViewSectionHeader) {
+		guard let sectionNode = coordinator.rootNode.childAtIndex(headerView.tag) else {
+			return
+		}
+		
+		if coordinator.isExpanded(sectionNode) {
+			headerView.disclosureExpanded = false
+			coordinator.collapse(sectionNode)
+			self.applyChanges(animated: true)
+		} else {
+			headerView.disclosureExpanded = true
+			coordinator.expand(sectionNode)
+			self.applyChanges(animated: true)
+		}
+	}
+
 	func expand(_ cell: MasterFeedTableViewCell) {
 		guard let indexPath = tableView.indexPath(for: cell), let node = dataSource.itemIdentifier(for: indexPath) else {
 			return