diff --git a/Signal/src/Storyboard/Storyboard.storyboard b/Signal/src/Storyboard/Storyboard.storyboard
index c3b089b03..f2a23abd8 100755
--- a/Signal/src/Storyboard/Storyboard.storyboard
+++ b/Signal/src/Storyboard/Storyboard.storyboard
@@ -1213,11 +1213,11 @@ A0 09 9A FF A8 8A 09 99</string>
                             <constraint firstItem="RQS-Iz-2vV" firstAttribute="top" secondItem="a9b-kU-125" secondAttribute="bottom" constant="145" id="Rvg-Br-JhL">
                                 <variation key="heightClass=regular-widthClass=compact" constant="20"/>
                             </constraint>
-                            <constraint firstItem="pSv-Dm-f1R" firstAttribute="top" secondItem="91B-iw-6Q2" secondAttribute="bottom" constant="45" id="TXe-eX-lw8"/>
+                            <constraint firstItem="pSv-Dm-f1R" firstAttribute="top" secondItem="91B-iw-6Q2" secondAttribute="bottom" constant="25" id="TXe-eX-lw8"/>
                             <constraint firstItem="vW6-pP-9vd" firstAttribute="top" secondItem="XvA-gQ-BvT" secondAttribute="bottom" constant="31" id="Whv-CV-znA"/>
                             <constraint firstItem="Mof-iB-rK4" firstAttribute="top" secondItem="sBS-MF-j0u" secondAttribute="bottom" constant="18" id="YIO-Kg-5LJ"/>
                             <constraint firstItem="8e0-BB-J7K" firstAttribute="top" secondItem="SBQ-kY-h2a" secondAttribute="bottom" constant="36" id="Z0C-6N-HnE"/>
-                            <constraint firstItem="SBQ-kY-h2a" firstAttribute="top" secondItem="91B-iw-6Q2" secondAttribute="bottom" constant="45" id="Z96-LX-bJp"/>
+                            <constraint firstItem="SBQ-kY-h2a" firstAttribute="top" secondItem="91B-iw-6Q2" secondAttribute="bottom" constant="25" id="Z96-LX-bJp"/>
                             <constraint firstItem="91B-iw-6Q2" firstAttribute="leading" secondItem="sqD-R1-bDb" secondAttribute="leadingMargin" constant="24" id="aLd-65-HKk"/>
                             <constraint firstAttribute="centerX" secondItem="91B-iw-6Q2" secondAttribute="centerX" constant="-0.5" id="bng-yH-By6"/>
                             <constraint firstAttribute="trailingMargin" secondItem="vW6-pP-9vd" secondAttribute="trailing" constant="-4" id="cLa-Bf-WM5"/>
diff --git a/Signal/src/view controllers/FingerprintViewController.m b/Signal/src/view controllers/FingerprintViewController.m
index 3d7cf4343..171b3cecf 100644
--- a/Signal/src/view controllers/FingerprintViewController.m	
+++ b/Signal/src/view controllers/FingerprintViewController.m	
@@ -146,7 +146,7 @@
 - (IBAction)shredAndDelete:(id)sender
 {
     [DJWActionSheet showInView:self.view withTitle:@"Are you sure wou want to shred the following? This action is irreversible."
-             cancelButtonTitle:@"Cancel" destructiveButtonTitle:nil otherButtonTitles:@[@"Shred all keying material", @"Shred all keying material & communications history"]
+             cancelButtonTitle:@"Cancel" destructiveButtonTitle:nil otherButtonTitles:@[@"Shred all keying material", @"Also shred communications"]
                       tapBlock:^(DJWActionSheet *actionSheet, NSInteger tappedButtonIndex) {
                           if (tappedButtonIndex == actionSheet.cancelButtonIndex) {
                               NSLog(@"User Cancelled");
diff --git a/Signal/src/view controllers/InboxTableViewCell.xib b/Signal/src/view controllers/InboxTableViewCell.xib
index c1703caee..fdf893e04 100644
--- a/Signal/src/view controllers/InboxTableViewCell.xib	
+++ b/Signal/src/view controllers/InboxTableViewCell.xib	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6250" systemVersion="14C68k" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6254" systemVersion="14C68k" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6247"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
     </dependencies>
     <objects>
@@ -15,7 +15,7 @@
                 <autoresizingMask key="autoresizingMask" flexibleMaxY="YES"/>
                 <subviews>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3rD-4i-EKG" userLabel="Delete View">
-                        <rect key="frame" x="299" y="0.0" width="102" height="71"/>
+                        <rect key="frame" x="299" y="0.0" width="102" height="72"/>
                         <subviews>
                             <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="delete.png" translatesAutoresizingMaskIntoConstraints="NO" id="TBw-ud-Ysk">
                                 <rect key="frame" x="50" y="23" width="19" height="25"/>
@@ -27,7 +27,7 @@
                         </constraints>
                     </view>
                     <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="yBY-TS-2tI" userLabel="Archive View">
-                        <rect key="frame" x="0.0" y="0.0" width="102" height="71"/>
+                        <rect key="frame" x="0.0" y="0.0" width="102" height="72"/>
                         <subviews>
                             <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="archive.png" translatesAutoresizingMaskIntoConstraints="NO" id="WyX-Hb-Mpn">
                                 <rect key="frame" x="40" y="25" width="22" height="22"/>
@@ -121,7 +121,7 @@
                     <constraint firstItem="bG5-iK-ql3" firstAttribute="leading" secondItem="BRG-hJ-lRa" secondAttribute="leadingMargin" constant="-8" id="Dmq-W5-Xkr"/>
                     <constraint firstAttribute="centerY" secondItem="bG5-iK-ql3" secondAttribute="centerY" constant="-0.25" id="IQe-4d-baG"/>
                     <constraint firstAttribute="trailingMargin" secondItem="3rD-4i-EKG" secondAttribute="trailing" constant="23" id="LCr-QP-vla"/>
-                    <constraint firstAttribute="bottomMargin" secondItem="3rD-4i-EKG" secondAttribute="bottom" constant="-7.5" id="SPU-lp-rQv"/>
+                    <constraint firstAttribute="bottomMargin" secondItem="3rD-4i-EKG" secondAttribute="bottom" constant="-8.5" id="SPU-lp-rQv"/>
                     <constraint firstAttribute="trailingMargin" secondItem="3rD-4i-EKG" secondAttribute="trailing" constant="-9" id="SbS-PB-jL2"/>
                     <constraint firstAttribute="trailingMargin" secondItem="bG5-iK-ql3" secondAttribute="trailing" constant="-8" id="ikW-Es-Ngp"/>
                     <constraint firstItem="3rD-4i-EKG" firstAttribute="top" secondItem="BRG-hJ-lRa" secondAttribute="topMargin" constant="-8" id="yxg-lB-7gK"/>
diff --git a/Signal/src/view controllers/MessagesViewController.m b/Signal/src/view controllers/MessagesViewController.m
index 758577813..e84c28e92 100644
--- a/Signal/src/view controllers/MessagesViewController.m	
+++ b/Signal/src/view controllers/MessagesViewController.m	
@@ -755,9 +755,9 @@ typedef enum : NSUInteger {
 {
     UIImagePickerController *picker = [[UIImagePickerController alloc] init];
     picker.delegate = self;
-    picker.sourceType = UIImagePickerControllerSourceTypeSavedPhotosAlbum;
+    picker.sourceType = UIImagePickerControllerSourceTypePhotoLibrary;
     
-    if ([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeSavedPhotosAlbum])
+    if ([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypePhotoLibrary])
     {
         NSArray* pictureTypeArray = [[NSArray alloc] initWithObjects:(NSString *)kUTTypeImage, nil];
         
diff --git a/Signal/src/view controllers/UITests/SignalsViewController.m b/Signal/src/view controllers/UITests/SignalsViewController.m
index ae72fcc45..b5bbb8a26 100644
--- a/Signal/src/view controllers/UITests/SignalsViewController.m	
+++ b/Signal/src/view controllers/UITests/SignalsViewController.m	
@@ -27,7 +27,7 @@
 #import "YapDatabaseFullTextSearch.h"
 #import "YapDatabase.h"
 
-#define CELL_HEIGHT 71.0f
+#define CELL_HEIGHT 72.0f
 #define HEADER_HEIGHT 44.0f