diff --git a/ReadingList/Storyboards/SearchOnline.storyboard b/ReadingList/Storyboards/SearchOnline.storyboard
index 58997025..6ae071a0 100644
--- a/ReadingList/Storyboards/SearchOnline.storyboard
+++ b/ReadingList/Storyboards/SearchOnline.storyboard
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="u1U-1R-a4c">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="u1U-1R-a4c">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15509"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -38,10 +39,7 @@
                     </tableView>
                     <toolbarItems>
                         <barButtonItem title=" Select Many " id="iHn-by-0Xb" customClass="TogglableUIBarButtonItem" customModule="ReadingList_Foundation">
-                            <color key="tintColor" systemColor="systemBlueColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                            <connections>
-                                <action selector="changeSelectMode:" destination="jSD-sd-NlC" id="Em4-eZ-dPO"/>
-                            </connections>
+                            <color key="tintColor" systemColor="systemBlueColor"/>
                         </barButtonItem>
                         <barButtonItem style="plain" systemItem="flexibleSpace" id="XxW-oV-0qE"/>
                         <barButtonItem enabled="NO" title="Add Books" style="done" id="iO7-e0-41f">
@@ -68,4 +66,9 @@
             <point key="canvasLocation" x="-1458" y="705"/>
         </scene>
     </scenes>
+    <resources>
+        <systemColor name="systemBlueColor">
+            <color red="0.0" green="0.47843137254901963" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
+    </resources>
 </document>
diff --git a/ReadingList/ViewControllers/Edit/EditBookMetadata.swift b/ReadingList/ViewControllers/Edit/EditBookMetadata.swift
index c4fcac3b..0eecd4ba 100644
--- a/ReadingList/ViewControllers/Edit/EditBookMetadata.swift
+++ b/ReadingList/ViewControllers/Edit/EditBookMetadata.swift
@@ -385,7 +385,12 @@ final class EditBookMetadata: FormViewController {
                 self.dismiss(animated: true)
             })
             confirmExit.addAction(UIAlertAction(title: "Cancel", style: .cancel, handler: nil))
-            confirmExit.popoverPresentationController?.barButtonItem = navigationItem.leftBarButtonItem
+            if let popover = confirmExit.popoverPresentationController {
+                guard let barButtonItem = navigationItem.leftBarButtonItem ?? navigationItem.rightBarButtonItem else {
+                    preconditionFailure("Missing navigation bar button item")
+                }
+                popover.barButtonItem = barButtonItem
+            }
             present(confirmExit, animated: true, completion: nil)
             return
         }
diff --git a/ReadingList/ViewControllers/Edit/EditBookNotes.swift b/ReadingList/ViewControllers/Edit/EditBookNotes.swift
index ab1f1b6d..f22fec90 100644
--- a/ReadingList/ViewControllers/Edit/EditBookNotes.swift
+++ b/ReadingList/ViewControllers/Edit/EditBookNotes.swift
@@ -72,7 +72,12 @@ class EditBookNotes: FormViewController {
                 self.dismiss(animated: true)
             })
             confirmExit.addAction(UIAlertAction(title: "Cancel", style: .cancel, handler: nil))
-            confirmExit.popoverPresentationController?.barButtonItem = navigationItem.leftBarButtonItem
+            if let popover = confirmExit.popoverPresentationController {
+                guard let barButtonItem = navigationItem.leftBarButtonItem ?? navigationItem.rightBarButtonItem else {
+                    preconditionFailure("Missing navigation bar button item")
+                }
+                popover.barButtonItem = barButtonItem
+            }
             present(confirmExit, animated: true, completion: nil)
             return
         }
diff --git a/ReadingList/ViewControllers/Edit/EditBookReadState.swift b/ReadingList/ViewControllers/Edit/EditBookReadState.swift
index e72d5da7..605d757d 100644
--- a/ReadingList/ViewControllers/Edit/EditBookReadState.swift
+++ b/ReadingList/ViewControllers/Edit/EditBookReadState.swift
@@ -191,7 +191,12 @@ final class EditBookReadState: FormViewController {
                 self.dismiss(animated: true)
             })
             confirmExit.addAction(UIAlertAction(title: "Cancel", style: .cancel, handler: nil))
-            confirmExit.popoverPresentationController?.barButtonItem = navigationItem.leftBarButtonItem
+            if let popover = confirmExit.popoverPresentationController {
+                guard let barButtonItem = navigationItem.leftBarButtonItem ?? navigationItem.rightBarButtonItem else {
+                    preconditionFailure("Missing navigation bar button item")
+                }
+                popover.barButtonItem = barButtonItem
+            }
             present(confirmExit, animated: true, completion: nil)
             return
         }