diff --git a/spring-boot-project/spring-boot-docs/src/docs/antora/antora.yml b/spring-boot-project/spring-boot-docs/src/docs/antora/antora.yml
index 86bca20476..a57f4076b7 100644
--- a/spring-boot-project/spring-boot-docs/src/docs/antora/antora.yml
+++ b/spring-boot-project/spring-boot-docs/src/docs/antora/antora.yml
@@ -9,3 +9,22 @@ ext:
       classifier: catalog-content
       module: api
       destination: content-catalog
+  nav-attributes:
+  - path: "Overview"
+    attributes: { icon: home }
+  - path: "Documentation"
+    attributes: { icon: book }
+  - path: "Community":
+    attributes: { icon: question }
+  - path: "System Requirements"
+    attributes: { icon: server }
+  - path: "Installing Spring Boot"
+    attributes: { icon: gift }
+  - path: "Upgrading Spring Boot"
+    attributes: { icon: rocket }
+  - path: [ "Java APIs", "Spring Boot" ]
+    attributes: { external: true }
+  - path: [ "Java APIs", "Maven Plugin" ]
+    attributes: { external: true}
+  - path: [ "Java APIs", "Gradle Plugin" ]
+    attributes: { external: true }
diff --git a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/ROOT/pages/community.adoc b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/ROOT/pages/community.adoc
index bdb31a90c1..801f1c9ac6 100644
--- a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/ROOT/pages/community.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/ROOT/pages/community.adoc
@@ -1,4 +1,3 @@
-:navicon: question
 [[community]]
 = Community
 
diff --git a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/ROOT/pages/documentation.adoc b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/ROOT/pages/documentation.adoc
index f3573fb456..c662df948d 100644
--- a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/ROOT/pages/documentation.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/ROOT/pages/documentation.adoc
@@ -1,5 +1,4 @@
 :navtitle: Documentation
-:navicon: book
 [[documentation]]
 = Documentation Overview
 
diff --git a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/ROOT/pages/index.adoc b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/ROOT/pages/index.adoc
index 7cafb5cfaa..d5822cab14 100644
--- a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/ROOT/pages/index.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/ROOT/pages/index.adoc
@@ -1,5 +1,4 @@
 :navtitle: Overview
-:navicon: home
 = Spring Boot
 
 Spring Boot helps you to create stand-alone, production-grade Spring-based applications that you can run.
diff --git a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/ROOT/pages/installing.adoc b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/ROOT/pages/installing.adoc
index 5f85b42b08..da678cd055 100644
--- a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/ROOT/pages/installing.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/ROOT/pages/installing.adoc
@@ -1,4 +1,3 @@
-:navicon: gift
 [[getting-started.installing]]
 = Installing Spring Boot
 
diff --git a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/ROOT/pages/system-requirements.adoc b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/ROOT/pages/system-requirements.adoc
index a7d9194225..34ba91601b 100644
--- a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/ROOT/pages/system-requirements.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/ROOT/pages/system-requirements.adoc
@@ -1,4 +1,3 @@
-:navicon: server
 [[getting-started.system-requirements]]
 = System Requirements
 
diff --git a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/ROOT/pages/upgrading.adoc b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/ROOT/pages/upgrading.adoc
index 30874a2748..28ae98ac45 100644
--- a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/ROOT/pages/upgrading.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/ROOT/pages/upgrading.adoc
@@ -1,4 +1,3 @@
-:navicon: rocket
 [[upgrading]]
 = Upgrading Spring Boot
 
diff --git a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/index.adoc b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/index.adoc
index 554ad1d5bb..cefd9b6eed 100644
--- a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/index.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/index.adoc
@@ -1,3 +1,3 @@
-= Reference Guides
+= Reference
 
 This section provides information on using the feature and capabilities of Spring Boot.