diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageStickerView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageStickerView.m
index d804074027..267076d341 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageStickerView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageStickerView.m
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2020 Open Whisper Systems. All rights reserved.
 //
 
 #import "OWSMessageStickerView.h"
@@ -243,6 +243,7 @@ NS_ASSUME_NONNULL_BEGIN
 
     TSAttachmentStream *stickerAttachment = self.viewItem.stickerAttachment;
     YYAnimatedImageView *stickerView = [YYAnimatedImageView new];
+    stickerView.contentMode = UIViewContentModeScaleAspectFit;
 
     stickerView.accessibilityLabel =
         [OWSMessageView accessibilityLabelWithDescription:NSLocalizedString(@"ACCESSIBILITY_LABEL_STICKER",
diff --git a/SignalMessaging/ViewControllers/Stickers/ManageStickersViewController.swift b/SignalMessaging/ViewControllers/Stickers/ManageStickersViewController.swift
index d98137da64..b81800f088 100644
--- a/SignalMessaging/ViewControllers/Stickers/ManageStickersViewController.swift
+++ b/SignalMessaging/ViewControllers/Stickers/ManageStickersViewController.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2020 Open Whisper Systems. All rights reserved.
 //
 
 import Foundation
@@ -429,6 +429,7 @@ public class ManageStickersViewController: OWSTableViewController {
         }
 
         let stickerView = YYAnimatedImageView()
+        stickerView.contentMode = .scaleAspectFit
         stickerView.image = stickerImage
         return stickerView
     }
diff --git a/SignalMessaging/ViewControllers/Stickers/StickerPackCollectionView.swift b/SignalMessaging/ViewControllers/Stickers/StickerPackCollectionView.swift
index c931c66f36..a9719cdf03 100644
--- a/SignalMessaging/ViewControllers/Stickers/StickerPackCollectionView.swift
+++ b/SignalMessaging/ViewControllers/Stickers/StickerPackCollectionView.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2020 Open Whisper Systems. All rights reserved.
 //
 
 import Foundation
@@ -235,6 +235,7 @@ public class StickerPackCollectionView: UICollectionView {
 
         let stickerView = YYAnimatedImageView()
         stickerView.image = stickerImage
+        stickerView.contentMode = .scaleAspectFit
         return stickerView
     }
 }
diff --git a/SignalMessaging/ViewControllers/Stickers/StickerView.swift b/SignalMessaging/ViewControllers/Stickers/StickerView.swift
index 95ae673202..19de1557e5 100644
--- a/SignalMessaging/ViewControllers/Stickers/StickerView.swift
+++ b/SignalMessaging/ViewControllers/Stickers/StickerView.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2020 Open Whisper Systems. All rights reserved.
 //
 
 import Foundation
@@ -27,6 +27,7 @@ public class StickerView: YYAnimatedImageView {
         }
 
         loadSticker()
+        contentMode = .scaleAspectFit
     }
 
     // MARK: -
diff --git a/SignalMessaging/Views/Tooltips/StickerTooltip.swift b/SignalMessaging/Views/Tooltips/StickerTooltip.swift
index 400db16a93..5d95891024 100644
--- a/SignalMessaging/Views/Tooltips/StickerTooltip.swift
+++ b/SignalMessaging/Views/Tooltips/StickerTooltip.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2020 Open Whisper Systems. All rights reserved.
 //
 
 import Foundation
@@ -55,7 +55,11 @@ public class StickerTooltip: UIView {
     private let tailWidth: CGFloat = 16
     private let bubbleRounding: CGFloat = 8
 
-    private let iconView = YYAnimatedImageView()
+    private let iconView: YYAnimatedImageView = {
+        let stickerView = YYAnimatedImageView()
+        stickerView.contentMode = .scaleAspectFit
+        return stickerView
+    }()
 
     private func createContents(fromView: UIView,
                                 widthReferenceView: UIView,