diff --git a/options/locale/locale_en-US.json b/options/locale/locale_en-US.json
index ba4bb55cdc..1c332a8337 100644
--- a/options/locale/locale_en-US.json
+++ b/options/locale/locale_en-US.json
@@ -2149,15 +2149,15 @@
   "repo.settings.unit_visibility_private": "Private (follow repo visibility)",
   "repo.settings.unit_visibility_public": "Public (anyone can read)",
   "repo.settings.unit_visibility_releases_help": "Controls whether the releases page is visible to anonymous visitors.",
-  "repo.settings.licensing_section": "Licensing & Updates",
-  "repo.settings.licensing_section_desc": "Manage commercial license keys and gated update feeds for this repository. When enabled, the Licenses tab appears and release tags must follow update stream naming.",
+  "repo.settings.licensing_section": "Update Server",
+  "repo.settings.licensing_section_desc": "Manage update feeds and optional license key gating for this repository. When enabled, the Licenses tab appears and release tags are served via update feeds.",
   "repo.settings.update_platform": "Update Feed Format",
   "repo.settings.update_platform_both": "Both (Joomla + Dolibarr)",
   "repo.settings.update_platform_help": "Choose which update feed format to generate. All formats support license key validation.",
   "repo.settings.require_update_key": "Require license key for update feeds",
   "repo.settings.require_update_key_help": "When enabled, update feeds return empty results unless a valid license key is provided. Joomla clients will see a Download Key field in Update Sites.",
-  "repo.settings.enable_licensing": "Enable licensing for this repository",
-  "repo.settings.enable_licensing_help": "Show the Licenses tab and enable license key management for this repository.",
+  "repo.settings.enable_licensing": "Enable Update Server for this repository",
+  "repo.settings.enable_licensing_help": "Serve update feeds from releases and show the Licenses tab for optional key management.",
   "repo.settings.packages_desc": "Enable Repository Packages Registry",
   "repo.settings.projects_desc": "Enable Projects",
   "repo.settings.projects_mode_desc": "Projects Mode (which kinds of projects to show)",
@@ -2894,11 +2894,11 @@
   "org.form.create_org_not_allowed": "You are not allowed to create an organization.",
   "org.settings": "Settings",
   "org.settings.options": "Organization",
-  "org.settings.update_streams": "Licensing & Update Streams",
-  "org.settings.licensing": "Licensing",
-  "org.settings.licensing_desc": "Control commercial license key management and gated update feeds across all repositories in this organization.",
-  "org.settings.enable_licensing": "Enable licensing for this organization",
-  "org.settings.enable_licensing_help": "Show the Licenses page in the org menu and enable license key management. Individual repos can also enable licensing independently.",
+  "org.settings.update_streams": "Update Server",
+  "org.settings.licensing": "Update Server",
+  "org.settings.licensing_desc": "Manage update feeds and optional license key gating across all repositories in this organization.",
+  "org.settings.enable_licensing": "Enable Update Server for this organization",
+  "org.settings.enable_licensing_help": "Show the Licenses page in the org menu and serve update feeds. Individual repos can also enable this independently.",
   "org.settings.require_key": "Require license key for all update feeds",
   "org.settings.require_key_help": "Update feeds return empty results unless a valid key is provided. Joomla clients will see a Download Key field. Individual repos can override this.",
   "org.settings.feed_visibility": "Update Feed Visibility",
diff --git a/templates/org/settings/navbar.tmpl b/templates/org/settings/navbar.tmpl
index 7f7590d0b8..e71dcaf4a2 100644
--- a/templates/org/settings/navbar.tmpl
+++ b/templates/org/settings/navbar.tmpl
@@ -26,7 +26,7 @@
 		</a>
 		{{end}}
 		<a class="{{if .PageIsSettingsUpdateStreams}}active {{end}}item" href="{{.OrgLink}}/settings/update-streams">
-			{{svg "octicon-key"}} {{ctx.Locale.Tr "org.settings.update_streams"}}
+			{{svg "octicon-broadcast"}} {{ctx.Locale.Tr "org.settings.update_streams"}}
 		</a>
 		{{if .EnableActions}}
 		<details class="item toggleable-item" {{if or .PageIsOrgSettingsActionsGeneral .PageIsSharedSettingsRunners .PageIsSharedSettingsSecrets .PageIsSharedSettingsVariables}}open{{end}}>
diff --git a/templates/repo/settings/advanced.tmpl b/templates/repo/settings/advanced.tmpl
index f96337a3d5..55017cca3c 100644
--- a/templates/repo/settings/advanced.tmpl
+++ b/templates/repo/settings/advanced.tmpl
@@ -228,7 +228,7 @@
 				</div>
 
 				{{/* ── Licensing ── */}}
-				<h5 class="ui dividing header tw-flex tw-items-center tw-gap-2">{{svg "octicon-key" 16}} {{ctx.Locale.Tr "repo.settings.licensing_section"}}</h5>
+				<h5 class="ui dividing header tw-flex tw-items-center tw-gap-2">{{svg "octicon-broadcast" 16}} {{ctx.Locale.Tr "repo.settings.licensing_section"}}</h5>
 				<div class="inline field">
 					<div class="ui checkbox">
 						<input name="enable_licensing" type="checkbox" {{if .LicensingEnabled}}checked{{end}}>
diff --git a/templates/repo/settings/licensing.tmpl b/templates/repo/settings/licensing.tmpl
index da748d5644..f85d6a5173 100644
--- a/templates/repo/settings/licensing.tmpl
+++ b/templates/repo/settings/licensing.tmpl
@@ -1,7 +1,7 @@
 {{template "repo/settings/layout_head" (dict "pageClass" "repository settings licensing")}}
 	<div class="user-main-content twelve wide column">
 		<h4 class="ui top attached header">
-			{{svg "octicon-key" 16}} {{ctx.Locale.Tr "repo.settings.licensing_section"}}
+			{{svg "octicon-broadcast" 16}} {{ctx.Locale.Tr "repo.settings.licensing_section"}}
 		</h4>
 		<div class="ui attached segment">
 			<form class="ui form" method="post" action="{{.Link}}">
diff --git a/templates/repo/settings/navbar.tmpl b/templates/repo/settings/navbar.tmpl
index ca126fea69..85645c6fcf 100644
--- a/templates/repo/settings/navbar.tmpl
+++ b/templates/repo/settings/navbar.tmpl
@@ -9,7 +9,7 @@
 		</a>
 		{{if .LicensingEnabled}}
 		<a class="{{if .PageIsSettingsLicensing}}active {{end}}item" href="{{.RepoLink}}/settings/licensing">
-			{{svg "octicon-key"}} {{ctx.Locale.Tr "repo.settings.licensing_section"}}
+			{{svg "octicon-broadcast"}} {{ctx.Locale.Tr "repo.settings.licensing_section"}}
 		</a>
 		{{end}}
 		<a class="{{if .PageIsSettingsCustomFields}}active {{end}}item" href="{{.RepoLink}}/settings/custom-fields">