diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
index 48d5f8e1f..c93dd744e 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
@@ -258,7 +258,7 @@ NS_ASSUME_NONNULL_BEGIN
         NSString *dateString = [DateUtil formatDateForConversationDateBreaks:date];
 
         self.dateHeaderLabel.font = self.dateHeaderFont;
-        self.dateHeaderLabel.textColor = UIColor.lightGrayColor;
+        self.dateHeaderLabel.textColor = self.conversationStyle.dateBreakTextColor;
 
         self.dateHeaderLabel.text = dateString;
 
@@ -289,7 +289,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (UIFont *)dateHeaderFont
 {
-    return UIFont.ows_dynamicTypeCaption1Font;
+    return UIFont.ows_dynamicTypeCalloutFont;
 }
 
 #pragma mark - Avatar
diff --git a/SignalMessaging/categories/UIFont+OWS.h b/SignalMessaging/categories/UIFont+OWS.h
index 9d73f4453..8d9ac97ae 100644
--- a/SignalMessaging/categories/UIFont+OWS.h
+++ b/SignalMessaging/categories/UIFont+OWS.h
@@ -30,8 +30,9 @@ NS_ASSUME_NONNULL_BEGIN
 @property (class, readonly, nonatomic) UIFont *ows_dynamicTypeTitle2Font;
 @property (class, readonly, nonatomic) UIFont *ows_dynamicTypeTitle3Font;
 @property (class, readonly, nonatomic) UIFont *ows_dynamicTypeHeadlineFont;
-@property (class, readonly, nonatomic) UIFont *ows_dynamicTypeSubheadlineFont;
 @property (class, readonly, nonatomic) UIFont *ows_dynamicTypeBodyFont;
+@property (class, readonly, nonatomic) UIFont *ows_dynamicTypeCalloutFont;
+@property (class, readonly, nonatomic) UIFont *ows_dynamicTypeSubheadlineFont;
 @property (class, readonly, nonatomic) UIFont *ows_dynamicTypeFootnoteFont;
 @property (class, readonly, nonatomic) UIFont *ows_dynamicTypeCaption1Font;
 @property (class, readonly, nonatomic) UIFont *ows_dynamicTypeCaption2Font;
diff --git a/SignalMessaging/categories/UIFont+OWS.m b/SignalMessaging/categories/UIFont+OWS.m
index 4a114031a..cfc40377b 100644
--- a/SignalMessaging/categories/UIFont+OWS.m
+++ b/SignalMessaging/categories/UIFont+OWS.m
@@ -72,14 +72,19 @@ NS_ASSUME_NONNULL_BEGIN
     return [UIFont preferredFontForTextStyle:UIFontTextStyleHeadline];
 }
 
-+ (UIFont *)ows_dynamicTypeSubheadlineFont
++ (UIFont *)ows_dynamicTypeBodyFont
 {
-    return [UIFont preferredFontForTextStyle:UIFontTextStyleSubheadline];
+    return [UIFont preferredFontForTextStyle:UIFontTextStyleBody];
 }
 
-+ (UIFont *)ows_dynamicTypeBodyFont
++ (UIFont *)ows_dynamicTypeCalloutFont
 {
-    return [UIFont preferredFontForTextStyle:UIFontTextStyleBody];
+    return [UIFont preferredFontForTextStyle:UIFontTextStyleCallout];
+}
+
++ (UIFont *)ows_dynamicTypeSubheadlineFont
+{
+    return [UIFont preferredFontForTextStyle:UIFontTextStyleSubheadline];
 }
 
 + (UIFont *)ows_dynamicTypeFootnoteFont
diff --git a/SignalMessaging/utils/ConversationStyle.swift b/SignalMessaging/utils/ConversationStyle.swift
index 0a55b85c6..97ccc9009 100644
--- a/SignalMessaging/utils/ConversationStyle.swift
+++ b/SignalMessaging/utils/ConversationStyle.swift
@@ -145,6 +145,9 @@ public class ConversationStyle: NSObject {
     @objc
     public let bubbleColorOutgoingSent = UIColor.ows_darkSkyBlue
 
+    @objc
+    public let dateBreakTextColor = UIColor.ows_light60
+
     @objc
     public var primaryColor: UIColor