diff --git a/WireFoundation/Sources/WireFoundation/Design/WireTextStyle/WireTextStyle.swift b/WireFoundation/Sources/WireFoundation/Design/WireTextStyle/WireTextStyle.swift
index fd1a3671bec..3f74e3c0f52 100644
--- a/WireFoundation/Sources/WireFoundation/Design/WireTextStyle/WireTextStyle.swift
+++ b/WireFoundation/Sources/WireFoundation/Design/WireTextStyle/WireTextStyle.swift
@@ -30,6 +30,7 @@ public enum WireTextStyle: CaseIterable, Sendable {
     case body2
     case body3
     case subline1
+    case subline2
     case buttonSmall
     case buttonBig
 }
diff --git a/WireMessaging/Sources/WireMessagingUI/Resources/Localization/en.lproj/Localizable.strings b/WireMessaging/Sources/WireMessagingUI/Resources/Localization/en.lproj/Localizable.strings
index 4ce8ee36f2f..854c5e03ad3 100644
--- a/WireMessaging/Sources/WireMessagingUI/Resources/Localization/en.lproj/Localizable.strings
+++ b/WireMessaging/Sources/WireMessagingUI/Resources/Localization/en.lproj/Localizable.strings
@@ -137,3 +137,5 @@
 // MARK: - Conversation
 "conversation.message.attachment.notAvailable" = "File not available";
 "conversation.message.attachment.previewNotAvailable" = "Unable to display preview";
+"conversation.message.attachment.unableToDownload" = "Unable to download file";
+"conversation.message.attachment.loadingContent" = "Loading content";
diff --git a/WireMessaging/Sources/WireMessagingUI/WireCells/Components/AttachmentsPreviewView/WireCellsAttachmentsPreviewItemView.swift b/WireMessaging/Sources/WireMessagingUI/WireCells/Components/AttachmentsPreviewView/WireCellsAttachmentsPreviewItemView.swift
index 6141b2a08d9..6c77a16470f 100644
--- a/WireMessaging/Sources/WireMessagingUI/WireCells/Components/AttachmentsPreviewView/WireCellsAttachmentsPreviewItemView.swift
+++ b/WireMessaging/Sources/WireMessagingUI/WireCells/Components/AttachmentsPreviewView/WireCellsAttachmentsPreviewItemView.swift
@@ -92,14 +92,14 @@ struct WireCellsAttachmentsPreviewItemView: View {
                 .frame(height: 74)
                 .frame(idealWidth: 288)
             case (.document, .large):
-                WireCellsDocumentAttachmentPreview(
+                WireCellsLargeDocumentPreviewView(
                     headerIcon: Image(viewModel.icon),
                     headerText: viewModel.headerText,
                     labelText: viewModel.fileName,
                     progress: viewModel.progress,
-                    isError: viewModel.isAssetDownloadError,
+                    downloadError: viewModel.isAssetDownloadError,
+                    url: viewModel.imagePreviewURL,
                 )
-                .frame(height: 74)
                 .frame(idealWidth: 288)
             case (.audio, .small), (.audio, .large):
                 WireCellsDocumentAttachmentPreview(
diff --git a/WireMessaging/Sources/WireMessagingUI/WireCells/Components/AttachmentsPreviewView/WireCellsLargeDocumentPreviewView.swift b/WireMessaging/Sources/WireMessagingUI/WireCells/Components/AttachmentsPreviewView/WireCellsLargeDocumentPreviewView.swift
new file mode 100644
index 00000000000..775671a997b
--- /dev/null
+++ b/WireMessaging/Sources/WireMessagingUI/WireCells/Components/AttachmentsPreviewView/WireCellsLargeDocumentPreviewView.swift
@@ -0,0 +1,138 @@
+//
+// Wire
+// Copyright (C) 2025 Wire Swiss GmbH
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see http://www.gnu.org/licenses/.
+//
+
+import SwiftUI
+import WireDesign
+import WireFoundation
+
+struct WireCellsLargeDocumentPreviewView: View {
+    private static let imageAspectRatio = CGFloat(8.0 / 3.0)
+    private static let errorMessage = L10n.Localizable.Conversation.Message.Attachment.previewNotAvailable
+    private static let downloadErrorMessage = L10n.Localizable.Conversation.Message.Attachment.unableToDownload
+    private static let loadingMessage = L10n.Localizable.Conversation.Message.Attachment.loadingContent
+
+    let headerIcon: Image
+    let headerText: String
+    let labelText: String
+    let progress: Double?
+    let downloadError: Bool
+    let url: URL?
+
+    var body: some View {
+        WireCellsAttachmentPreview(
+            progress: progress,
+            progressColor: downloadError
+                ? ColorTheme.Base.error.color : ColorTheme.Base.primary.color
+        ) {
+            VStack {
+                WireCellsDocumentHeaderView(
+                    headerIcon: headerIcon,
+                    headerText: headerText,
+                    labelText: labelText,
+                    progress: progress,
+                    isError: downloadError
+                )
+                .background(ColorTheme.Backgrounds.surfaceVariant.color)
+                .frame(height: 74) // This might break the UI if text font is too big
+                .frame(maxWidth: .infinity)
+
+                previewContainer {
+                    if downloadError {
+                        errorView(text: Self.downloadErrorMessage)
+                    } else {
+                        if let url {
+                            asyncImage(url: url)
+                        } else {
+                            errorView(text: Self.errorMessage)
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    @ViewBuilder
+    private func asyncImage(url: URL) -> some View {
+        AsyncImage(url: url) { phase in
+            switch phase {
+            case .empty:
+                loadingView(text: Self.loadingMessage)
+            case let .success(image):
+                image
+                    .resizable()
+                    .scaledToFill()
+            case .failure:
+                errorView(text: Self.errorMessage)
+            @unknown default:
+                EmptyView()
+            }
+        }
+    }
+
+    @ViewBuilder
+    private func previewContainer(@ViewBuilder content: () -> some View)
+        -> some View {
+        Color.clear
+            .aspectRatio(Self.imageAspectRatio, contentMode: .fit)
+            .background(alignment: .top) {
+                content()
+            }
+            .clipped()
+    }
+
+    @ViewBuilder
+    private func loadingView(text: String) -> some View {
+        ZStack {
+            Color(ColorTheme.Backdrop.background)
+            VStack {
+                ProgressView()
+                    .tint(ColorTheme.Backgrounds.onTransparentDark.color)
+                Text(text)
+                    .wireTextStyle(.subline2)
+                    .foregroundColor(ColorTheme.Backgrounds.onTransparentDark.color)
+            }
+        }
+    }
+
+    @ViewBuilder
+    private func errorView(text: String) -> some View {
+        ZStack {
+            Color(ColorTheme.Backdrop.background)
+            Text(text)
+                .wireTextStyle(.subline2)
+                .foregroundColor(ColorTheme.Backgrounds.onTransparentDark.color)
+                .multilineTextAlignment(.center)
+                .padding()
+        }
+    }
+}
+
+#Preview {
+    WireCellsLargeDocumentPreviewView(
+        headerIcon: Image(FileIcon.pdf.resource),
+        headerText: "PDF (336 KB)",
+        labelText: "CDR_20220120 Accessibility Review Reviewed Final Plus",
+        progress: 0.7,
+        downloadError: false,
+        url: URL(
+            string:
+            "https://i.kym-cdn.com/entries/icons/facebook/000/018/012/this_is_fine.jpg"
+        )
+    )
+    .environment(\.wireTextStyleMapping, WireTextStyleMapping())
+}
diff --git a/WireMessaging/Sources/WireMessagingUI/WireCells/Components/Previews/WireCellsDocumentAttachmentPreview.swift b/WireMessaging/Sources/WireMessagingUI/WireCells/Components/Previews/WireCellsDocumentAttachmentPreview.swift
index 946d5d0c207..de166db29a0 100644
--- a/WireMessaging/Sources/WireMessagingUI/WireCells/Components/Previews/WireCellsDocumentAttachmentPreview.swift
+++ b/WireMessaging/Sources/WireMessagingUI/WireCells/Components/Previews/WireCellsDocumentAttachmentPreview.swift
@@ -41,38 +41,13 @@ struct WireCellsDocumentAttachmentPreview: View {
             progress: progress,
             progressColor: isError ? Constants.errorColor : ColorTheme.Base.primary.color
         ) {
-            VStack(alignment: .leading) {
-                HStack(spacing: 4) {
-                    if isError {
-                        Image(systemName: "exclamationmark.triangle")
-                            .fontWeight(.semibold)
-                            .font(.system(size: 14 * scale))
-                            .foregroundStyle(Constants.errorColor)
-                    } else {
-                        headerIcon
-                            .resizable()
-                            .aspectRatio(contentMode: .fit)
-                            .frame(height: 16 * scale)
-                    }
-
-                    Text(headerText)
-                        .foregroundStyle(ColorTheme.Base.secondaryText.color)
-                        .wireTextStyle(.subline1)
-                        .lineLimit(1)
-
-                    Spacer()
-                }
-                .padding([.horizontal, .top], 8)
-
-                Spacer(minLength: 0)
-
-                Text(labelText)
-                    .foregroundStyle(ColorTheme.Backgrounds.onSurfaceVariant.color)
-                    .wireTextStyle(.h5)
-                    .lineLimit(2)
-                    .frame(maxWidth: .infinity, alignment: .leading)
-                    .padding([.horizontal, .bottom], 8)
-            }
+            WireCellsDocumentHeaderView(
+                headerIcon: headerIcon,
+                headerText: headerText,
+                labelText: labelText,
+                progress: progress,
+                isError: isError,
+            )
             .background(ColorTheme.Backgrounds.surfaceVariant.color)
             .frame(maxWidth: .infinity, maxHeight: .infinity)
         }
diff --git a/WireMessaging/Sources/WireMessagingUI/WireCells/Components/Previews/WireCellsDocumentHeaderView.swift b/WireMessaging/Sources/WireMessagingUI/WireCells/Components/Previews/WireCellsDocumentHeaderView.swift
new file mode 100644
index 00000000000..f09e4414778
--- /dev/null
+++ b/WireMessaging/Sources/WireMessagingUI/WireCells/Components/Previews/WireCellsDocumentHeaderView.swift
@@ -0,0 +1,87 @@
+//
+// Wire
+// Copyright (C) 2025 Wire Swiss GmbH
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see http://www.gnu.org/licenses/.
+//
+
+import SwiftUI
+import WireDesign
+import WireFoundation
+
+struct WireCellsDocumentHeaderView: View {
+    enum Constants {
+        static let errorColor = ColorTheme.Base.error.color
+    }
+
+    @ScaledMetric private var scale: CGFloat = 1
+
+    let headerIcon: Image
+    let headerText: String
+    let labelText: String
+    let progress: Double?
+    let isError: Bool
+
+    var body: some View {
+        header()
+    }
+
+    @ViewBuilder
+    private func header() -> some View {
+        VStack(alignment: .leading) {
+            HStack(spacing: 4) {
+                if isError {
+                    Image(systemName: "exclamationmark.triangle")
+                        .fontWeight(.semibold)
+                        .font(.system(size: 14 * scale))
+                        .foregroundStyle(Constants.errorColor)
+                } else {
+                    headerIcon
+                        .resizable()
+                        .aspectRatio(contentMode: .fit)
+                        .frame(height: 16 * scale)
+                }
+
+                Text(headerText)
+                    .foregroundStyle(ColorTheme.Base.secondaryText.color)
+                    .wireTextStyle(.subline1)
+                    .lineLimit(1)
+
+                Spacer()
+            }
+            .padding([.horizontal, .top], 8)
+
+            Spacer(minLength: 0)
+
+            Text(labelText)
+                .foregroundStyle(ColorTheme.Backgrounds.onSurfaceVariant.color)
+                .wireTextStyle(.h5)
+                .lineLimit(2)
+                .frame(maxWidth: .infinity, alignment: .leading)
+                .padding([.horizontal, .bottom], 8)
+        }
+    }
+}
+
+#Preview {
+    WireCellsDocumentHeaderView(
+        headerIcon: Image(FileIcon.pdf.resource),
+        headerText: "PDF (336 KB)",
+        labelText: "CDR_20220120 Accessibility Review Reviewed Final Plus",
+        progress: 0.7,
+        isError: false
+    )
+    .frame(width: 222, height: 74)
+    .environment(\.wireTextStyleMapping, WireTextStyleMapping())
+}
diff --git a/WireUI/Sources/WireDesign/Colors/ColorTheme.swift b/WireUI/Sources/WireDesign/Colors/ColorTheme.swift
index fb6da8523f5..41d0d4f4395 100644
--- a/WireUI/Sources/WireDesign/Colors/ColorTheme.swift
+++ b/WireUI/Sources/WireDesign/Colors/ColorTheme.swift
@@ -67,6 +67,8 @@ public enum ColorTheme {
 
         public static let inverted = UIColor(light: .black, dark: .white)
         public static let onInverted = UIColor(light: .white, dark: .black)
+        
+        public static let onTransparentDark = UIColor(light: .white, dark: .white)
     }
 
     public enum Banners {
diff --git a/WireUI/Sources/WireDesign/Typography/Font+WireTextStyle.swift b/WireUI/Sources/WireDesign/Typography/Font+WireTextStyle.swift
index abc23aebe9a..b771ed765b9 100644
--- a/WireUI/Sources/WireDesign/Typography/Font+WireTextStyle.swift
+++ b/WireUI/Sources/WireDesign/Typography/Font+WireTextStyle.swift
@@ -48,6 +48,8 @@ public extension Font {
             .callout.bold()
         case .subline1:
             .caption
+        case .subline2:
+            .caption.weight(.semibold)
         case .buttonSmall:
             .system(size: 14, weight: .semibold)
         case .buttonBig:
diff --git a/WireUI/Sources/WireDesign/Typography/UIFont+WireTextStyle.swift b/WireUI/Sources/WireDesign/Typography/UIFont+WireTextStyle.swift
index 3da7d6b92cc..1c31c8a6e6a 100644
--- a/WireUI/Sources/WireDesign/Typography/UIFont+WireTextStyle.swift
+++ b/WireUI/Sources/WireDesign/Typography/UIFont+WireTextStyle.swift
@@ -59,6 +59,9 @@ extension UIFont {
         case .subline1:
             return .preferredFont(forTextStyle: .caption1)
 
+        case .subline2:
+            return .preferredFont(forTextStyle: .caption1).withWeight(.semibold)
+
         case .buttonSmall:
             let baseFont = UIFont.systemFont(ofSize: 14)
             return UIFontMetrics.default.scaledFont(for: baseFont.withWeight(.semibold))
diff --git a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDarkUserInterfaceStyle.1.png b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDarkUserInterfaceStyle.1.png
index 8627fe4e209..17573864973 100644
--- a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDarkUserInterfaceStyle.1.png
+++ b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDarkUserInterfaceStyle.1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2f8d649bb9cf3b73847979bdf6817593d9a60b2001a79495e984a27bc90c989d
-size 125132
+oid sha256:7062420acbb888531d9c980b182270f0681dfb93df679ea4ae2323badc9b4d40
+size 128374
diff --git a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.accessibility1.png b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.accessibility1.png
index b96972dae17..cd395e26302 100644
--- a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.accessibility1.png
+++ b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.accessibility1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d10aae3f3ea428d4712967f107319012cf7f16ae2661d5962323c9adb0b0fc5c
-size 171415
+oid sha256:b74b52ba33a3c1de965cf847c83c20c849088f575e8b856356f4475471aa20c3
+size 176407
diff --git a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.accessibility2.png b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.accessibility2.png
index f2c396b3e52..4da2648d357 100644
--- a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.accessibility2.png
+++ b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.accessibility2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c4658615edaa082783bc0b23e22a0eaf1943882e85f602b4bfa495702348b892
-size 184351
+oid sha256:d443053a2b16a31f5763192bd952bf74f48bc146a4b6de3bffa41bb001f1b166
+size 190569
diff --git a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.accessibility3.png b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.accessibility3.png
index ec5d6f50567..3dce723667d 100644
--- a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.accessibility3.png
+++ b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.accessibility3.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:07fc82e1a2b4847b9d8556e577bb1ca1158bc7632214c660c59cbda8928c0655
-size 199572
+oid sha256:d42f3169dc96a25be560e852b82df07b1db5cb0046d04e3a40d0e6d0c91b9249
+size 207516
diff --git a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.accessibility4.png b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.accessibility4.png
index e38be8aa071..7efab4e9012 100644
--- a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.accessibility4.png
+++ b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.accessibility4.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8aeca278c2c1afa0526fbd47dd0da3fd369a4a5b3f05a3f628d64bedffa09b20
-size 214478
+oid sha256:8202e88d1cb04aef5700490cfbb09d9da5118c1453d03805897093673e9dfc9f
+size 224061
diff --git a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.accessibility5.png b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.accessibility5.png
index 5447d9b1bd2..30706677ef6 100644
--- a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.accessibility5.png
+++ b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.accessibility5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1383370ee7be76e385cc5f992071008b9f9756a75d7275f5179b6772a1084a1f
-size 228560
+oid sha256:4c7b4048162a1c71c51a529b0224f72b6fd26d5937ddb0f47f7ae04e687753c0
+size 239996
diff --git a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.large.png b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.large.png
index 2919b3bd0e6..369c91e079c 100644
--- a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.large.png
+++ b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ace01b8805a9b09c0de445e70d03852cf878f1f122636d0db1307d33a6521908
-size 143474
+oid sha256:f5f98fc38f33022be739b1174ac43c09f5147bf9e4f9012f64710e4979d5a358
+size 146280
diff --git a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.medium.png b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.medium.png
index 7e24cb9c291..387398bd73a 100644
--- a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.medium.png
+++ b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.medium.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c8fc199645394024cf2cc8b9d13aa5ac8693c9aeabba4c4ecc37198660619221
-size 140860
+oid sha256:fb16fea1044cbd1cbb367ac79f6fcc612b6bb8ae90dfaef9713a4ca58e424677
+size 143521
diff --git a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.small.png b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.small.png
index da6853be4cc..7c9025de70a 100644
--- a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.small.png
+++ b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.small.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0c576e5ea971c0d969daaa0fe43c658506380df5d002a033686a675ac4c11376
-size 139047
+oid sha256:f91b918e199f404580c7b7eae5e57f29267f9608f54e23c28c404d83247bb64c
+size 141793
diff --git a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.xLarge.png b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.xLarge.png
index 35c717d0c62..f7757aea93f 100644
--- a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.xLarge.png
+++ b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.xLarge.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2e2d455be2b3659b7a4a398ae8be83e3d075d0cc2a96656bea9f03436f82e0ba
-size 149142
+oid sha256:2b1ff45e44ebf158010b68e3877d67cca5a24724118424bf8de61e5ce9628851
+size 152344
diff --git a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.xSmall.png b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.xSmall.png
index 4f18b377619..babef4016c2 100644
--- a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.xSmall.png
+++ b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.xSmall.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e88ee22b138a07525a7ead6b20c425ed1af6202956d704c90262ff166ed4e1da
-size 136974
+oid sha256:8fb9e6b2fd6576e6c2682ee0de5e69d8e2343bfdcbb47146927aced01bc27995
+size 139763
diff --git a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.xxLarge.png b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.xxLarge.png
index c4e3fbe75e3..f3e73f99f3e 100644
--- a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.xxLarge.png
+++ b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.xxLarge.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:312959241501f83390bc62468585eb437a120d60ea749769b7d75d9a2a85a268
-size 153911
+oid sha256:9f54fe307fa6de3cb37e8ff6f6f93586bb94356d94baa28b7dec8f60a623edfa
+size 158093
diff --git a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.xxxLarge.png b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.xxxLarge.png
index ff34b19f1cd..29122fbbb2b 100644
--- a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.xxxLarge.png
+++ b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testFontDynamicTypeVariants.xxxLarge.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3e323e68292d05ba57be69087e52243a33c6831d9650f9092b36feb76ae43112
-size 158649
+oid sha256:55e9a1656fcf7c7d03f9ac95dc02312f5902da484ee165c5f3ce9d32b8291559
+size 165467
diff --git a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.accessibilityExtraExtraExtraLarge.png b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.accessibilityExtraExtraExtraLarge.png
index b96881b7dd5..6754aa754ae 100644
--- a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.accessibilityExtraExtraExtraLarge.png
+++ b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.accessibilityExtraExtraExtraLarge.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5dfa043e58458a0132853a604a9af3e6dce48c95313aa337edea5296984b42fa
-size 172828
+oid sha256:43ca3da4a00b4466175abfe4ebd3cc927dfa90d6c36d0633c973b1ad3cb38b88
+size 173412
diff --git a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.accessibilityExtraExtraLarge.png b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.accessibilityExtraExtraLarge.png
index 259076ec15c..50e110e6b9c 100644
--- a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.accessibilityExtraExtraLarge.png
+++ b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.accessibilityExtraExtraLarge.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fa389aaafcf529767a8ffc785d2833b8ad0fec02b66a55b1b92f556c54f00fdb
-size 167957
+oid sha256:347634e53504c1109a9d15872e45178e8bd2655cd0527e2b583c1e05c5767b14
+size 176348
diff --git a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.accessibilityExtraLarge.png b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.accessibilityExtraLarge.png
index 90f53d0f6e7..902d5ec9a68 100644
--- a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.accessibilityExtraLarge.png
+++ b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.accessibilityExtraLarge.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dfdf918a2257366fddda447428cd52603d284dd0b9a0d3b5507b081e1b79b4a8
-size 156074
+oid sha256:0160ba15548dfc843ef793c8647bcf3c7ca6e71d39e685e4c04c8b8f1d358704
+size 163292
diff --git a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.accessibilityLarge.png b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.accessibilityLarge.png
index 5936ce6440b..72e831d3d9f 100644
--- a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.accessibilityLarge.png
+++ b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.accessibilityLarge.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c7f4ebd05084ed5f8d52072169ea3e1f7e29efee12ded064b6446f3fcb6b89b4
-size 142089
+oid sha256:925745885f0fb4599f3200833f2f9694fbc2c0683eaec9e202129e4250812380
+size 148651
diff --git a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.accessibilityMedium.png b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.accessibilityMedium.png
index 0e5410072a5..c2a48d82fce 100644
--- a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.accessibilityMedium.png
+++ b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.accessibilityMedium.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a62ef8fa0a18b7fd20767df187354e775bbb859790392ca1bfd42ba3744eb7a2
-size 133254
+oid sha256:1d840fdf19466f95c7abf78f850078b4c92ab22e4ade0981c742de004fe1eee4
+size 138485
diff --git a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.extraExtraExtraLarge.png b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.extraExtraExtraLarge.png
index 93b6538d690..c907669e37c 100644
--- a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.extraExtraExtraLarge.png
+++ b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.extraExtraExtraLarge.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f09fd1dedab8952f56b9dac194f3a3869f8e83f20dc14b160685da549e98a70e
-size 123727
+oid sha256:fef8e953a669fa117c52b57eb6c8aa5cba2e4e92ea5787d0bd39831b46f41f07
+size 127869
diff --git a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.extraExtraLarge.png b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.extraExtraLarge.png
index c8340db9a43..a6f65a4b123 100644
--- a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.extraExtraLarge.png
+++ b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.extraExtraLarge.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9de673ce4e3ac06573a2e9e70e6f41fd1bee87e819d4f9c2e9b097f9922548fb
-size 120741
+oid sha256:e9cd75e184a354268716792751b284ad8e3c4307131c1fa1cca6b2f0a128cf06
+size 124605
diff --git a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.extraLarge.png b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.extraLarge.png
index 34258e6061f..9d24bafe594 100644
--- a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.extraLarge.png
+++ b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.extraLarge.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:db530f2a845c765f6211efce41dc8366437677a605b8efc23d56c3150bf0b2ac
-size 115217
+oid sha256:6d75e51bc0373bd087f2003e1bf060f1df3dfbf50097a3dedb4f8fcf61b0f50a
+size 118651
diff --git a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.extraSmall.png b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.extraSmall.png
index 4b85ee7c342..1d1aaf2ef2d 100644
--- a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.extraSmall.png
+++ b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.extraSmall.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:111406e0f7523ec966ec7acb907fa7172130c795291c089817b9e28d9534f241
-size 104188
+oid sha256:b4a8c20f6b1fc43381ab7d626a8aca9e104667d9c6061755870938a1835f80b9
+size 106769
diff --git a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.large.png b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.large.png
index 6bac8bf608e..11aac9d234e 100644
--- a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.large.png
+++ b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.large.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c7c397d196c9684017d95587cdcfd2120bccaed5f4fd7e2d6ecd75bab24e97ef
-size 109048
+oid sha256:39192bf402111d78e6c0488df2c000470a69400f723e16954894be23698a968e
+size 113338
diff --git a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.medium.png b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.medium.png
index 55fd2839dc7..0b696a1bae6 100644
--- a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.medium.png
+++ b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.medium.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0f0c0f34618485764a39c5ac1e4924feefcc7729bb0618ea5042c019996a874e
-size 107001
+oid sha256:efd1851fa7dde7d1f2dffbadff4d74210e4e3b534054a6f24e712dec9a28bae6
+size 109458
diff --git a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.small.png b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.small.png
index 8dd8b995d3f..3e64e0d2524 100644
--- a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.small.png
+++ b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.small.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b18a8d128d85772797bad5e01808c48ec7aeb852e256f1c08bda6acccf930800
-size 105806
+oid sha256:06570e219f9d561d3761dfdf4133b33ec748c1338df6909622e637188a312a7e
+size 108215
diff --git a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.unspecified.png b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.unspecified.png
index 6bac8bf608e..11aac9d234e 100644
--- a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.unspecified.png
+++ b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontContentSizeCategories.unspecified.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c7c397d196c9684017d95587cdcfd2120bccaed5f4fd7e2d6ecd75bab24e97ef
-size 109048
+oid sha256:39192bf402111d78e6c0488df2c000470a69400f723e16954894be23698a968e
+size 113338
diff --git a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontDarkUserInterfaceStyle.1.png b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontDarkUserInterfaceStyle.1.png
index 389bd89e56b..0070c1d2127 100644
--- a/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontDarkUserInterfaceStyle.1.png
+++ b/WireUI/Tests/WireDesignTests/Resources/ReferenceImages/WireTextStyleMappingTests/testUIFontDarkUserInterfaceStyle.1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c0da90447c6e8f4d55d33c618759e1bfe48ccd129b901d31a8cd961309fee8ad
-size 118511
+oid sha256:d211d8a17d14b2aacb92034792d3aa5caa47824b542b65c58b90a6fcdbd9fb55
+size 122938