diff --git a/Signal/src/ViewControllers/PhotoLibrary/ImagePickerController.swift b/Signal/src/ViewControllers/PhotoLibrary/ImagePickerController.swift
index 4ab7e5203..c9cc525d6 100644
--- a/Signal/src/ViewControllers/PhotoLibrary/ImagePickerController.swift
+++ b/Signal/src/ViewControllers/PhotoLibrary/ImagePickerController.swift
@@ -416,13 +416,13 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat
         // Initially position offscreen, we'll animate it in.
         collectionPickerView.frame = collectionPickerView.frame.offsetBy(dx: 0, dy: collectionPickerView.frame.height)
 
-        UIView.animate(.promise, duration: 0.3, delay: 0, options: .curveEaseInOut) {
+        UIView.animate(.promise, duration: 0.25, delay: 0, options: .curveEaseInOut) {
             collectionPickerView.superview?.layoutIfNeeded()
 
             self.updateSelectButton()
 
             // *slightly* more than `pi` to ensure the chevron animates counter-clockwise
-            let chevronRotationAngle = CGFloat.pi.nextUp
+            let chevronRotationAngle = CGFloat.pi + 0.001
             self.titleIconView.transform = CGAffineTransform(rotationAngle: chevronRotationAngle)
         }.retainUntilComplete()
     }
@@ -435,7 +435,7 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat
         }
         self.collectionPickerController = nil
 
-        UIView.animate(.promise, duration: 0.3, delay: 0, options: .curveEaseInOut) {
+        UIView.animate(.promise, duration: 0.25, delay: 0, options: .curveEaseInOut) {
             collectionPickerController.view.frame = self.view.frame.offsetBy(dx: 0, dy: self.view.frame.height)
 
             self.updateSelectButton()
diff --git a/Signal/src/ViewControllers/PhotoLibrary/PhotoCollectionPickerController.swift b/Signal/src/ViewControllers/PhotoLibrary/PhotoCollectionPickerController.swift
index 60977e1f7..c0b79e506 100644
--- a/Signal/src/ViewControllers/PhotoLibrary/PhotoCollectionPickerController.swift
+++ b/Signal/src/ViewControllers/PhotoLibrary/PhotoCollectionPickerController.swift
@@ -93,6 +93,8 @@ class PhotoCollectionPickerController: OWSTableViewController, PhotoLibraryDeleg
         textStack.spacing = 2
 
         let imageView = UIImageView()
+        imageView.contentMode = .scaleAspectFill
+        imageView.clipsToBounds = true
         let kImageSize = 80
         imageView.autoSetDimensions(to: CGSize(width: kImageSize, height: kImageSize))