diff --git a/browser/base/content/browser-siteIdentity.js b/browser/base/content/browser-siteIdentity.js
index 4d4518de7142..868e066c0190 100644
--- a/browser/base/content/browser-siteIdentity.js
+++ b/browser/base/content/browser-siteIdentity.js
@@ -166,7 +166,6 @@ var gIdentityHandler = {
_popupInitialized: false,
_initializePopup() {
- window.ensureCustomElements("moz-support-link");
if (!this._popupInitialized) {
let wrapper = document.getElementById("template-identity-popup");
wrapper.replaceWith(wrapper.content);
@@ -933,6 +932,11 @@ var gIdentityHandler = {
e.setAttribute("href", baseURL + "mixed-content")
);
+ this._identityPopupCustomRootLearnMore.setAttribute(
+ "href",
+ baseURL + "enterprise-roots"
+ );
+
let customRoot = false;
// Determine connection security information.
diff --git a/browser/components/controlcenter/content/identityPanel.inc.xhtml b/browser/components/controlcenter/content/identityPanel.inc.xhtml
index c4df64a699de..3a8e689e579c 100644
--- a/browser/components/controlcenter/content/identityPanel.inc.xhtml
+++ b/browser/components/controlcenter/content/identityPanel.inc.xhtml
@@ -125,9 +125,9 @@
when-connection="secure secure-ev secure-cert-user-overridden"/>
-
-
+ when-customroot="true"
+ data-l10n-id="identity-description-custom-root">
+
diff --git a/browser/locales/en-US/browser/browser.ftl b/browser/locales/en-US/browser/browser.ftl
index 2e7d6261fa2b..710e52485579 100644
--- a/browser/locales/en-US/browser/browser.ftl
+++ b/browser/locales/en-US/browser/browser.ftl
@@ -400,7 +400,7 @@ identity-clear-site-data =
identity-connection-not-secure-security-view = You are not securely connected to this site.
identity-connection-verified = You are securely connected to this site.
identity-ev-owner-label = Certificate issued to:
-identity-description-custom-root2 = Mozilla does not recognize this certificate issuer. It may have been added from your operating system or by an administrator.
+identity-description-custom-root = Mozilla does not recognize this certificate issuer. It may have been added from your operating system or by an administrator.
identity-remove-cert-exception =
.label = Remove Exception
.accesskey = R
diff --git a/browser/themes/shared/controlcenter/panel.css b/browser/themes/shared/controlcenter/panel.css
index 7ba95f10f134..8392040e3c4d 100644
--- a/browser/themes/shared/controlcenter/panel.css
+++ b/browser/themes/shared/controlcenter/panel.css
@@ -282,10 +282,6 @@
}
}
-#identity-popup-content-verifier-unknown > label {
- display: inline;
-}
-
/* CONTENT BLOCKING / TRACKING PROTECTION */
#protections-popup-sendReportView-heading,
diff --git a/python/l10n/fluent_migrations/bug_1814266_identity_custom_root.py b/python/l10n/fluent_migrations/bug_1814266_identity_custom_root.py
deleted file mode 100644
index 7eb144230d02..000000000000
--- a/python/l10n/fluent_migrations/bug_1814266_identity_custom_root.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Any copyright is dedicated to the Public Domain.
-# http://creativecommons.org/publicdomain/zero/1.0/
-
-import fluent.syntax.ast as FTL
-
-from fluent.migrate.transforms import TransformPattern
-
-
-class STRIP_LEARNMORE(TransformPattern):
- # Used to remove `SOME TEXT` from a string
- def visit_TextElement(self, node):
- link_start = node.value.find('