diff --git a/WooCommerce/Classes/Authentication/Navigation Exceptions/ULAccountMismatchViewController.swift b/WooCommerce/Classes/Authentication/Navigation Exceptions/ULAccountMismatchViewController.swift
index b2994470c8f..492b21122d9 100644
--- a/WooCommerce/Classes/Authentication/Navigation Exceptions/ULAccountMismatchViewController.swift	
+++ b/WooCommerce/Classes/Authentication/Navigation Exceptions/ULAccountMismatchViewController.swift	
@@ -140,7 +140,7 @@ private extension ULAccountMismatchViewController {
     func configureTermsLabel() {
         let linkAttributes: [NSAttributedString.Key: Any] = [
             NSAttributedString.Key.foregroundColor: UIColor.accent,
-            NSAttributedString.Key.underlineColor: UIColor.accent,
+            NSAttributedString.Key.underlineColor: UIColor.clear,
             NSAttributedString.Key.underlineStyle: NSUnderlineStyle.single.rawValue
         ]
         termsLabel.linkTextAttributes = linkAttributes
diff --git a/WooCommerce/Classes/Authentication/Navigation Exceptions/ULErrorViewController.swift b/WooCommerce/Classes/Authentication/Navigation Exceptions/ULErrorViewController.swift
index aafefeeb361..23511e2a871 100644
--- a/WooCommerce/Classes/Authentication/Navigation Exceptions/ULErrorViewController.swift	
+++ b/WooCommerce/Classes/Authentication/Navigation Exceptions/ULErrorViewController.swift	
@@ -140,7 +140,7 @@ private extension ULErrorViewController {
     func configureTermsLabel() {
         let linkAttributes: [NSAttributedString.Key: Any] = [
             NSAttributedString.Key.foregroundColor: UIColor.accent,
-            NSAttributedString.Key.underlineColor: UIColor.accent,
+            NSAttributedString.Key.underlineColor: UIColor.clear,
             NSAttributedString.Key.underlineStyle: NSUnderlineStyle.single.rawValue
         ]
         termsLabel.linkTextAttributes = linkAttributes
diff --git a/WooCommerce/Classes/POS/Presentation/Reusable Views/POSProgressViewStyle.swift b/WooCommerce/Classes/POS/Presentation/Reusable Views/POSProgressViewStyle.swift
index dd0a2b69807..45640387a5a 100644
--- a/WooCommerce/Classes/POS/Presentation/Reusable Views/POSProgressViewStyle.swift	
+++ b/WooCommerce/Classes/POS/Presentation/Reusable Views/POSProgressViewStyle.swift	
@@ -17,7 +17,7 @@ struct POSProgressViewStyle: ProgressViewStyle {
                 lineWidth: lineWidth,
                 lineCap: .butt,
                 circleColor: Color(.wooCommercePurple(.shade10)),
-                fillColor: Color.accent
+                fillColor: Color.posAccent
             ))
     }
 }
diff --git a/WooCommerce/Classes/POS/Utils/Color+WooCommercePOS.swift b/WooCommerce/Classes/POS/Utils/Color+WooCommercePOS.swift
index 7fd9b6e6bd7..62093586586 100644
--- a/WooCommerce/Classes/POS/Utils/Color+WooCommercePOS.swift
+++ b/WooCommerce/Classes/POS/Utils/Color+WooCommercePOS.swift
@@ -2,7 +2,7 @@ import SwiftUI
 
 extension Color {
 
-    static var accent: Color {
+    static var posAccent: Color {
         return Color(
             UIColor(
                 light: .withColorStudio(.wooCommercePurple, shade: .shade40),
@@ -107,11 +107,11 @@ extension Color {
 
     // MARK: - Buttons
 
-    static var posPrimaryButtonBackground: Color = .accent
+    static var posPrimaryButtonBackground: Color = .posAccent
 
-    static var posSecondaryButtonForeground: Color = .accent
+    static var posSecondaryButtonForeground: Color = .posAccent
 
-    static var posTextButtonForeground: Color = .accent
+    static var posTextButtonForeground: Color = .posAccent
 
     static var posTextButtonForegroundPressed: Color {
         return Color(
diff --git a/WooCommerce/Classes/Tools/Notices/PermanentNotice/PermanentNoticeView.swift b/WooCommerce/Classes/Tools/Notices/PermanentNotice/PermanentNoticeView.swift
index bd453ed05d3..4857c1bc2ee 100644
--- a/WooCommerce/Classes/Tools/Notices/PermanentNotice/PermanentNoticeView.swift
+++ b/WooCommerce/Classes/Tools/Notices/PermanentNotice/PermanentNoticeView.swift
@@ -29,7 +29,6 @@ private struct PermanentNoticeContentView: View {
                     .bodyStyle()
                 Button(action: notice.callToActionHandler, label: {
                     Text(notice.callToActionTitle)
-                        .underline()
                         .font(.body)
                         .foregroundColor(Color(.accent))
                 })
diff --git a/WooCommerce/Classes/ViewRelated/Authentication/AccountCreationForm.swift b/WooCommerce/Classes/ViewRelated/Authentication/AccountCreationForm.swift
index 99a6718d7e3..a54e763d6ca 100644
--- a/WooCommerce/Classes/ViewRelated/Authentication/AccountCreationForm.swift
+++ b/WooCommerce/Classes/ViewRelated/Authentication/AccountCreationForm.swift
@@ -92,7 +92,7 @@ struct AccountCreationForm: View {
                     .renderedIf(viewModel.currentField == .password)
 
                     // Terms of Service link.
-                    AttributedText(tosAttributedText, enablesLinkUnderline: true)
+                    AttributedText(tosAttributedText)
                         .attributedTextLinkColor(Color(.secondaryLabel))
                         .environment(\.customOpenURL) { url in
                             tosURL = url
diff --git a/WooCommerce/Classes/ViewRelated/Dashboard/Onboarding/LaunchStore/StoreOnboardingLaunchStoreViewModel.swift b/WooCommerce/Classes/ViewRelated/Dashboard/Onboarding/LaunchStore/StoreOnboardingLaunchStoreViewModel.swift
index fc1d323855b..ae87c8ce497 100644
--- a/WooCommerce/Classes/ViewRelated/Dashboard/Onboarding/LaunchStore/StoreOnboardingLaunchStoreViewModel.swift
+++ b/WooCommerce/Classes/ViewRelated/Dashboard/Onboarding/LaunchStore/StoreOnboardingLaunchStoreViewModel.swift
@@ -37,9 +37,9 @@ final class StoreOnboardingLaunchStoreViewModel: ObservableObject {
                         ]
         )
         let upgradeLink = NSAttributedString(string: linkContent, attributes: [.font: font,
-                                                                                      .foregroundColor: linkColor,
-                                                                                      .underlineStyle: NSUnderlineStyle.single.rawValue,
-                                                                                      .underlineColor: UIColor.textLink])
+                                                                               .foregroundColor: linkColor,
+                                                                               .underlineStyle: NSUnderlineStyle.single.rawValue,
+                                                                               .underlineColor: UIColor.clear])
         attributedString.replaceFirstOccurrence(of: linkContent, with: upgradeLink)
         return attributedString
     }()
diff --git a/WooCommerce/Classes/ViewRelated/Dashboard/Settings/Privacy/PrivacySettingsViewController.swift b/WooCommerce/Classes/ViewRelated/Dashboard/Settings/Privacy/PrivacySettingsViewController.swift
index 43ed97c35bb..50ce3b3dc62 100644
--- a/WooCommerce/Classes/ViewRelated/Dashboard/Settings/Privacy/PrivacySettingsViewController.swift
+++ b/WooCommerce/Classes/ViewRelated/Dashboard/Settings/Privacy/PrivacySettingsViewController.swift
@@ -273,7 +273,7 @@ private extension PrivacySettingsViewController {
         textView.delegate = self
 
         var linkTextAttributes = textView.linkTextAttributes ?? [:]
-        linkTextAttributes[.underlineColor] = UIColor.primary
+        linkTextAttributes[.underlineColor] = UIColor.clear
         linkTextAttributes[.foregroundColor] = UIColor.primary
         textView.linkTextAttributes = linkTextAttributes
 
diff --git a/WooCommerce/Classes/ViewRelated/Products/Add Product/AddProductWithAI/EntryPoint/AddProductWithAIActionSheet.swift b/WooCommerce/Classes/ViewRelated/Products/Add Product/AddProductWithAI/EntryPoint/AddProductWithAIActionSheet.swift
index de7738b23f9..1747659f574 100644
--- a/WooCommerce/Classes/ViewRelated/Products/Add Product/AddProductWithAI/EntryPoint/AddProductWithAIActionSheet.swift	
+++ b/WooCommerce/Classes/ViewRelated/Products/Add Product/AddProductWithAI/EntryPoint/AddProductWithAIActionSheet.swift	
@@ -74,7 +74,7 @@ struct AddProductWithAIActionSheet: View {
                             .subheadlineStyle()
                         AdaptiveStack(horizontalAlignment: .leading) {
                             Text(Localization.CreateProductWithAI.legalText)
-                            Text(.init(Localization.CreateProductWithAI.learnMore)).underline()
+                            Text(.init(Localization.CreateProductWithAI.learnMore))
                         }
                         .environment(\.openURL, OpenURLAction { url in
                             legalURL = url
diff --git a/WooCommerce/Classes/ViewRelated/Products/Edit Product/ProductFormTableViewDataSource.swift b/WooCommerce/Classes/ViewRelated/Products/Edit Product/ProductFormTableViewDataSource.swift
index 00907c290d8..cb19137ac51 100644
--- a/WooCommerce/Classes/ViewRelated/Products/Edit Product/ProductFormTableViewDataSource.swift	
+++ b/WooCommerce/Classes/ViewRelated/Products/Edit Product/ProductFormTableViewDataSource.swift	
@@ -293,7 +293,7 @@ private extension ProductFormTableViewDataSource {
                                                attributes: [.font: font,
                                                             .foregroundColor: linkColor,
                                                             .underlineStyle: NSUnderlineStyle.single.rawValue,
-                                                            .underlineColor: linkColor,
+                                                            .underlineColor: UIColor.clear,
                                                             .link: Constants.legalURL])
             attributedString.replaceFirstOccurrence(of: linkContent, with: legalLink)
             return attributedString