diff --git a/Nos/Views/Components/FlagOptionPicker.swift b/Nos/Views/Components/FlagOptionPicker.swift
index 9cc0e7590..cce3c3694 100644
--- a/Nos/Views/Components/FlagOptionPicker.swift
+++ b/Nos/Views/Components/FlagOptionPicker.swift
@@ -114,12 +114,12 @@ private struct FlagPickerRow: View {
             VStack(alignment: .leading, spacing: 8) {
                 Text(flag.title)
                     .foregroundColor(.primaryTxt)
-                    .font(.clarity(.regular))
+                    .font(.body)
 
                 if let description = flag.description {
                     Text(description)
                         .foregroundColor(.secondaryTxt)
-                        .font(.clarity(.regular, textStyle: .footnote))
+                        .font(.footnote)
                         .lineSpacing(8)
                         .multilineTextAlignment(.leading)
                         .fixedSize(horizontal: false, vertical: true) // this enables the text view expand as needed
@@ -141,7 +141,7 @@ private struct FlagPickerRow: View {
             VStack {
                 Text(text)
                     .foregroundColor(.primaryTxt)
-                    .font(.clarity(.regular, textStyle: .subheadline))
+                    .font(.subheadline)
                     .multilineTextAlignment(.leading)
                     .padding(EdgeInsets(
                         top: 13,
@@ -165,7 +165,8 @@ private struct HeaderView: View {
         Text(text)
             .lineSpacing(5)
             .foregroundColor(.primaryTxt)
-            .font(.clarity(.bold))
+            .font(.headline)
+            .fontWeight(.semibold)
             .padding(.bottom, 10)
     }
 }
diff --git a/Nos/Views/Components/NosNavigationBar.swift b/Nos/Views/Components/NosNavigationBar.swift
index c3edd612f..fb37ffa01 100644
--- a/Nos/Views/Components/NosNavigationBar.swift
+++ b/Nos/Views/Components/NosNavigationBar.swift
@@ -10,7 +10,8 @@ struct NosNavigationBarModifier: ViewModifier {
             .toolbar {
                 ToolbarItem(placement: .principal) {
                     Text(title)
-                        .font(.clarity(.bold, textStyle: .title3))
+                        .font(.title3)
+                        .fontWeight(.bold)
                         .foregroundColor(.primaryTxt)
                         .tint(.primaryTxt)
                         .allowsHitTesting(false)
diff --git a/Nos/Views/Moderation/FlagSuccessView.swift b/Nos/Views/Moderation/FlagSuccessView.swift
index 882414480..ba7d70b81 100644
--- a/Nos/Views/Moderation/FlagSuccessView.swift
+++ b/Nos/Views/Moderation/FlagSuccessView.swift
@@ -11,7 +11,7 @@ struct FlagSuccessView: View {
 
             Text(String(localized: .localizable.thanksForTag))
                 .foregroundColor(.primaryTxt)
-                .font(.clarity(.regular, textStyle: .title2))
+                .font(.title2)
                 .padding(.horizontal, 25)
 
             Text(String(localized: .localizable.keepOnHelpingUs))
@@ -19,7 +19,7 @@ struct FlagSuccessView: View {
                 .foregroundColor(.secondaryTxt)
                 .multilineTextAlignment(.center)
                 .lineSpacing(6)
-                .font(.clarity(.regular, textStyle: .subheadline))
+                .font(.body)
         }
     }
 }