diff --git a/app/pom.xml b/app/pom.xml
index e127402c0d..5d375b79f7 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -58,6 +58,8 @@ limitations under the License.
7.0.67.1.16.1.0
+ 5.3.8
+ 1.13.12.4.11.0.23.1.3
@@ -246,7 +248,6 @@ limitations under the License.
${struts.version}
-
@@ -255,12 +256,19 @@ limitations under the License.
${struts-bootstrap.version}
+
org.webjarsbootstrap
- 3.4.1
+ ${bootstrap.version}
+
+
+
+ org.webjars.npm
+ bootstrap-icons
+ ${bootstrap-icons.version}
diff --git a/app/src/main/resources/ApplicationResources.properties b/app/src/main/resources/ApplicationResources.properties
index 5041ab909a..5d8865556b 100644
--- a/app/src/main/resources/ApplicationResources.properties
+++ b/app/src/main/resources/ApplicationResources.properties
@@ -1348,6 +1348,10 @@ userSettings.email=Email
userSettings.locale=Locale
userSettings.timeZone=Timezone
userSettings.openIdUrl=Federated Identity
+userSettings.oidcIssuer=OIDC Issuer
+userSettings.oidcSubject=OIDC Subject
+userSettings.tip.oidcIssuer=The identity provider that authenticated you. Assigned at login and cannot be changed here.
+userSettings.tip.oidcSubject=Your unique identifier at that identity provider. Assigned at login and cannot be changed here.
userSettings.tip.username=Usernames can''t be changed.
# ----------------------------------------------------------------- Your profile (profile.jsp)
diff --git a/app/src/main/resources/template/bootstrap/tooltip.ftl b/app/src/main/resources/template/bootstrap/tooltip.ftl
new file mode 100644
index 0000000000..90f72298cb
--- /dev/null
+++ b/app/src/main/resources/template/bootstrap/tooltip.ftl
@@ -0,0 +1,24 @@
+<#--
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. The ASF licenses this file to You
+ * under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License. For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
+ *
+ * Overrides the struts2-bootstrap-plugin template, which still emits the
+ * pre-Bootstrap-5 "data-toggle" attribute. Bootstrap 5 reads "data-bs-toggle"
+ * and tooltips are opt-in, so roller.js initialises these.
+-->
+<#if attributes.tooltip?? && attributes.tooltip?has_content>
+
+<#t/>
diff --git a/app/src/main/webapp/WEB-INF/jsps/admin/CacheInfo.jsp b/app/src/main/webapp/WEB-INF/jsps/admin/CacheInfo.jsp
index 5e7e2ea5cc..a3fbda361c 100644
--- a/app/src/main/webapp/WEB-INF/jsps/admin/CacheInfo.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/admin/CacheInfo.jsp
@@ -40,7 +40,7 @@
-
+
diff --git a/app/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp b/app/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp
index fc3494608e..957cd65a58 100644
--- a/app/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp
@@ -69,8 +69,8 @@
<%-- "integer" use input type number --%>
-