diff --git a/Signal/src/ViewControllers/MessageReactionPicker.swift b/Signal/src/ViewControllers/MessageReactionPicker.swift
index 3851b319c6..7c4143ae21 100644
--- a/Signal/src/ViewControllers/MessageReactionPicker.swift
+++ b/Signal/src/ViewControllers/MessageReactionPicker.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
@@ -9,7 +9,8 @@ protocol MessageReactionPickerDelegate: class {
 }
 
 class MessageReactionPicker: UIStackView {
-    let pickerDiameter: CGFloat = 56
+    let pickerDiameter: CGFloat = UIDevice.current.isNarrowerThanIPhone6 ? 50 : 56
+    let reactionFontSize: CGFloat = UIDevice.current.isNarrowerThanIPhone6 ? 30 : 32
     let pickerPadding: CGFloat = 6
     var reactionHeight: CGFloat { return pickerDiameter - (pickerPadding * 2) }
     var selectedBackgroundHeight: CGFloat { return pickerDiameter - 4 }
@@ -50,7 +51,7 @@ class MessageReactionPicker: UIStackView {
         for emoji in ReactionManager.emojiSet {
             let button = OWSFlatButton()
             button.autoSetDimensions(to: CGSize(square: reactionHeight))
-            button.setTitle(title: emoji, font: .systemFont(ofSize: 32), titleColor: Theme.primaryTextColor)
+            button.setTitle(title: emoji, font: .systemFont(ofSize: reactionFontSize), titleColor: Theme.primaryTextColor)
             button.setPressedBlock { [weak self] in
                 self?.delegate?.didSelectReaction(reaction: emoji, isRemoving: emoji == self?.selectedEmoji)
             }
diff --git a/SignalMessaging/categories/UIDevice+featureSupport.swift b/SignalMessaging/categories/UIDevice+featureSupport.swift
index 8a13bf7a7a..880b15156a 100644
--- a/SignalMessaging/categories/UIDevice+featureSupport.swift
+++ b/SignalMessaging/categories/UIDevice+featureSupport.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
@@ -43,6 +43,10 @@ public extension UIDevice {
         }
     }
 
+    var isNarrowerThanIPhone6: Bool {
+        return CurrentAppContext().frame.width < 375
+    }
+
     var isShorterThanIPhone5: Bool {
         return CurrentAppContext().frame.height < 568
     }