diff --git a/Makefile b/Makefile
index d23dfdd1eb..4064ddf4fa 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@ SHELL=/bin/bash -o pipefail -o errexit
 
 WORKING_DIR = ./
 SCHEME = Signal
+XCODE_BUILD = xcrun xcodebuild -workspace $(SCHEME).xcworkspace -scheme $(SCHEME) -sdk iphonesimulator
 
 .PHONY: build test retest clean dependencies
 
@@ -32,6 +33,8 @@ test:
 clean:
 	cd $(WORKING_DIR) && \
 		rm -fr Carthage/Build && \
-		$(XCODE_BUILD) \
-			clean | xcpretty
+		$(XCODE_BUILD) clean | xcpretty
 
+# Migrating across swift versions requires me to run this sometimes
+clean_carthage_cache:
+	rm -fr ~/Library/Caches/org.carthage.CarthageKit/
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index 3a5ee04f64..097e766271 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -3278,6 +3278,11 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
         [UIUtil applySignalAppearence];
     }
 
+    if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(11, 0)) {
+        // post iOS11, document picker has no blue header.
+        [UIUtil applySignalAppearence];
+    }
+
     NSString *type;
     NSError *typeError;
     [url getResourceValue:&type forKey:NSURLTypeIdentifierKey error:&typeError];