diff --git a/docs/content/admin/config/commands.md b/docs/content/admin/config/commands.md
index a305fe5e0..1d8b86bce 100644
--- a/docs/content/admin/config/commands.md
+++ b/docs/content/admin/config/commands.md
@@ -4,7 +4,7 @@ tags:
   - admin-guide
   - configuration
   - commands
-icon: lucide/command
+icon: lucide/square-terminal
 ---
 
 # Commands Configuration
diff --git a/docs/content/admin/config/index.md b/docs/content/admin/config/index.md
index 2e7aa8475..d1dca8cc2 100644
--- a/docs/content/admin/config/index.md
+++ b/docs/content/admin/config/index.md
@@ -3,6 +3,7 @@ title: Admin Configuration
 tags:
   - admin-guide
   - configuration
+icon: lucide/cog
 ---
 
 # Admin Configuration
diff --git a/docs/content/changelog/index.md b/docs/content/changelog/index.md
index 02c5c1b89..c2f147192 100644
--- a/docs/content/changelog/index.md
+++ b/docs/content/changelog/index.md
@@ -1,6 +1,6 @@
 ---
 title: Changelog
-icon: material/script-text-outline
+icon: lucide/history
 ---
 
 --8<-- "CHANGELOG.md"
diff --git a/docs/content/developer/best-practices/async.md b/docs/content/developer/best-practices/async.md
index 21b832492..fea983012 100644
--- a/docs/content/developer/best-practices/async.md
+++ b/docs/content/developer/best-practices/async.md
@@ -5,6 +5,7 @@ tags:
   - developer-guide
   - best-practices
   - async
+icon: lucide/refresh-cw
 ---
 
 # Async Best Practices
diff --git a/docs/content/developer/best-practices/branch-naming.md b/docs/content/developer/best-practices/branch-naming.md
index 4111da877..6c8d45e8e 100644
--- a/docs/content/developer/best-practices/branch-naming.md
+++ b/docs/content/developer/best-practices/branch-naming.md
@@ -4,6 +4,7 @@ tags:
   - developer-guide
   - best-practices
   - git
+icon: lucide/git-branch
 ---
 
 # Branch Naming Conventions
diff --git a/docs/content/developer/best-practices/caching.md b/docs/content/developer/best-practices/caching.md
index 0fdf9820a..d0ae76d37 100644
--- a/docs/content/developer/best-practices/caching.md
+++ b/docs/content/developer/best-practices/caching.md
@@ -5,6 +5,7 @@ tags:
   - developer-guide
   - best-practices
   - caching
+icon: lucide/database
 ---
 
 # Caching Best Practices
diff --git a/docs/content/developer/best-practices/ci-cd.md b/docs/content/developer/best-practices/ci-cd.md
index 16f2f9eed..07c81fbaf 100644
--- a/docs/content/developer/best-practices/ci-cd.md
+++ b/docs/content/developer/best-practices/ci-cd.md
@@ -5,6 +5,7 @@ tags:
   - developer-guide
   - best-practices
   - ci-cd
+icon: lucide/infinity
 ---
 
 # CI/CD Best Practices
diff --git a/docs/content/developer/best-practices/code-review.md b/docs/content/developer/best-practices/code-review.md
index 10083c4d4..b18b836b1 100644
--- a/docs/content/developer/best-practices/code-review.md
+++ b/docs/content/developer/best-practices/code-review.md
@@ -5,6 +5,7 @@ tags:
   - developer-guide
   - best-practices
   - code-review
+icon: lucide/message-square-code
 ---
 
 # Code Review Best Practices
diff --git a/docs/content/developer/best-practices/debugging.md b/docs/content/developer/best-practices/debugging.md
index 60ab1bc2e..9381067b1 100644
--- a/docs/content/developer/best-practices/debugging.md
+++ b/docs/content/developer/best-practices/debugging.md
@@ -5,6 +5,7 @@ tags:
   - developer-guide
   - best-practices
   - debugging
+icon: lucide/bug-off
 ---
 
 # Debugging Best Practices
diff --git a/docs/content/developer/best-practices/docs.md b/docs/content/developer/best-practices/docs.md
index 977e4450c..862851344 100644
--- a/docs/content/developer/best-practices/docs.md
+++ b/docs/content/developer/best-practices/docs.md
@@ -5,6 +5,7 @@ tags:
   - developer-guide
   - best-practices
   - documentation
+icon: lucide/book-marked
 ---
 
 # Documentation Best Practices
diff --git a/docs/content/developer/best-practices/error-handling.md b/docs/content/developer/best-practices/error-handling.md
index 5971bc20d..494cc23b3 100644
--- a/docs/content/developer/best-practices/error-handling.md
+++ b/docs/content/developer/best-practices/error-handling.md
@@ -5,6 +5,7 @@ tags:
   - developer-guide
   - best-practices
   - error-handling
+icon: lucide/circle-alert
 ---
 
 # Error Handling Best Practices
diff --git a/docs/content/developer/best-practices/git.md b/docs/content/developer/best-practices/git.md
index 20f5cf3b8..0ddad4f95 100644
--- a/docs/content/developer/best-practices/git.md
+++ b/docs/content/developer/best-practices/git.md
@@ -5,6 +5,7 @@ tags:
   - developer-guide
   - best-practices
   - git
+icon: lucide/github
 ---
 
 # Git Best Practices
diff --git a/docs/content/developer/best-practices/index.md b/docs/content/developer/best-practices/index.md
index c4067fd2d..e063153d5 100644
--- a/docs/content/developer/best-practices/index.md
+++ b/docs/content/developer/best-practices/index.md
@@ -3,6 +3,7 @@ title: Developer Best Practices
 tags:
   - developer-guide
   - best-practices
+icon: lucide/award
 ---
 
 # Developer Best Practices
diff --git a/docs/content/developer/best-practices/logging.md b/docs/content/developer/best-practices/logging.md
index 9603bed6b..ae52bfda6 100644
--- a/docs/content/developer/best-practices/logging.md
+++ b/docs/content/developer/best-practices/logging.md
@@ -5,6 +5,7 @@ tags:
   - developer-guide
   - best-practices
   - logging
+icon: lucide/logs
 ---
 
 # Logging Best Practices
diff --git a/docs/content/developer/best-practices/namespace.md b/docs/content/developer/best-practices/namespace.md
index 356a163e6..48ca329f3 100644
--- a/docs/content/developer/best-practices/namespace.md
+++ b/docs/content/developer/best-practices/namespace.md
@@ -4,6 +4,7 @@ tags:
   - developer-guide
   - best-practices
   - namespace
+icon: lucide/tag
 ---
 
 # Namespace Best Practices
diff --git a/docs/content/developer/best-practices/sentry/choosing-instrumentation.md b/docs/content/developer/best-practices/sentry/choosing-instrumentation.md
index 846b38ffb..f2fcbb95c 100644
--- a/docs/content/developer/best-practices/sentry/choosing-instrumentation.md
+++ b/docs/content/developer/best-practices/sentry/choosing-instrumentation.md
@@ -5,6 +5,7 @@ tags:
   - developer-guide
   - best-practices
   - sentry
+icon: lucide/pencil-ruler
 ---
 
 # Choosing Instrumentation - Decision Guide
diff --git a/docs/content/developer/best-practices/sentry/context-data.md b/docs/content/developer/best-practices/sentry/context-data.md
index 029b01d2f..1c9e35415 100644
--- a/docs/content/developer/best-practices/sentry/context-data.md
+++ b/docs/content/developer/best-practices/sentry/context-data.md
@@ -5,6 +5,7 @@ tags:
   - developer-guide
   - best-practices
   - sentry
+icon: lucide/chart-bar-stacked
 ---
 
 # Context and Data
diff --git a/docs/content/developer/best-practices/sentry/index.md b/docs/content/developer/best-practices/sentry/index.md
index 0d77465cd..8c0ee7d25 100644
--- a/docs/content/developer/best-practices/sentry/index.md
+++ b/docs/content/developer/best-practices/sentry/index.md
@@ -5,6 +5,7 @@ tags:
   - developer-guide
   - best-practices
   - sentry
+icon: lucide/shield-alert
 ---
 
 # Sentry Integration
diff --git a/docs/content/developer/best-practices/sentry/metrics.md b/docs/content/developer/best-practices/sentry/metrics.md
index ed85ed36c..ddc9ed1c2 100644
--- a/docs/content/developer/best-practices/sentry/metrics.md
+++ b/docs/content/developer/best-practices/sentry/metrics.md
@@ -5,6 +5,7 @@ tags:
   - developer-guide
   - best-practices
   - sentry
+icon: lucide/circle-gauge
 ---
 
 # Sentry Metrics
diff --git a/docs/content/developer/best-practices/sentry/sampling.md b/docs/content/developer/best-practices/sentry/sampling.md
index 053344e5e..317b5813e 100644
--- a/docs/content/developer/best-practices/sentry/sampling.md
+++ b/docs/content/developer/best-practices/sentry/sampling.md
@@ -5,6 +5,7 @@ tags:
   - developer-guide
   - best-practices
   - sentry
+icon: lucide/shield-check
 ---
 
 # Sampling
diff --git a/docs/content/developer/best-practices/sentry/transactions-spans.md b/docs/content/developer/best-practices/sentry/transactions-spans.md
index 4c8b66c30..282b068d8 100644
--- a/docs/content/developer/best-practices/sentry/transactions-spans.md
+++ b/docs/content/developer/best-practices/sentry/transactions-spans.md
@@ -5,6 +5,7 @@ tags:
   - developer-guide
   - best-practices
   - sentry
+icon: lucide/activity
 ---
 
 # Transactions and Spans
diff --git a/docs/content/developer/best-practices/testing/e2e.md b/docs/content/developer/best-practices/testing/e2e.md
index 4f7158c7e..4f752f500 100644
--- a/docs/content/developer/best-practices/testing/e2e.md
+++ b/docs/content/developer/best-practices/testing/e2e.md
@@ -4,6 +4,7 @@ tags:
   - developer-guide
   - best-practices
   - testing
+icon: lucide/shield-user
 ---
 
 # E2E Testing
diff --git a/docs/content/developer/best-practices/testing/fixtures.md b/docs/content/developer/best-practices/testing/fixtures.md
index 0ee2bec3b..ad3c4199c 100644
--- a/docs/content/developer/best-practices/testing/fixtures.md
+++ b/docs/content/developer/best-practices/testing/fixtures.md
@@ -4,6 +4,7 @@ tags:
   - developer-guide
   - best-practices
   - testing
+icon: lucide/book-open-check
 ---
 
 # Test Fixtures
diff --git a/docs/content/developer/best-practices/testing/index.md b/docs/content/developer/best-practices/testing/index.md
index 7fc9975a1..fe4e7f612 100644
--- a/docs/content/developer/best-practices/testing/index.md
+++ b/docs/content/developer/best-practices/testing/index.md
@@ -4,6 +4,7 @@ tags:
   - developer-guide
   - best-practices
   - testing
+icon: lucide/flask-conical
 ---
 
 # Testing
diff --git a/docs/content/developer/best-practices/testing/integration.md b/docs/content/developer/best-practices/testing/integration.md
index c058c4fd7..df9f6f527 100644
--- a/docs/content/developer/best-practices/testing/integration.md
+++ b/docs/content/developer/best-practices/testing/integration.md
@@ -4,6 +4,7 @@ tags:
   - developer-guide
   - best-practices
   - testing
+icon: lucide/blocks
 ---
 
 # Integration Testing
diff --git a/docs/content/developer/best-practices/testing/unit.md b/docs/content/developer/best-practices/testing/unit.md
index 729a360c7..9ba479f7c 100644
--- a/docs/content/developer/best-practices/testing/unit.md
+++ b/docs/content/developer/best-practices/testing/unit.md
@@ -4,6 +4,7 @@ tags:
   - developer-guide
   - best-practices
   - testing
+icon: lucide/parentheses
 ---
 
 # Unit Testing
diff --git a/docs/content/developer/concepts/core/app.md b/docs/content/developer/concepts/core/app.md
index 0cffe61d1..e726c78bb 100644
--- a/docs/content/developer/concepts/core/app.md
+++ b/docs/content/developer/concepts/core/app.md
@@ -6,6 +6,7 @@ tags:
   - concepts
   - core
   - architecture
+icon: lucide/monitor-check
 ---
 
 # Application Layer
diff --git a/docs/content/developer/concepts/core/base-cog.md b/docs/content/developer/concepts/core/base-cog.md
index 34ed9dfb9..4473ea246 100644
--- a/docs/content/developer/concepts/core/base-cog.md
+++ b/docs/content/developer/concepts/core/base-cog.md
@@ -6,6 +6,7 @@ tags:
   - concepts
   - core
   - cogs
+icon: lucide/settings
 ---
 
 # Base Cog
diff --git a/docs/content/developer/concepts/core/bot.md b/docs/content/developer/concepts/core/bot.md
index 0ab129aba..4b35e445a 100644
--- a/docs/content/developer/concepts/core/bot.md
+++ b/docs/content/developer/concepts/core/bot.md
@@ -5,6 +5,7 @@ tags:
   - developer-guide
   - concepts
   - core
+icon: lucide/bot
 ---
 
 # Bot Core
diff --git a/docs/content/developer/concepts/core/cog-loader.md b/docs/content/developer/concepts/core/cog-loader.md
index a13fec820..2ea536191 100644
--- a/docs/content/developer/concepts/core/cog-loader.md
+++ b/docs/content/developer/concepts/core/cog-loader.md
@@ -6,6 +6,7 @@ tags:
   - concepts
   - core
   - cogs
+icon: lucide/folder-cog
 ---
 
 # Cog Loader
diff --git a/docs/content/developer/concepts/core/index.md b/docs/content/developer/concepts/core/index.md
index f30520ec2..d8782d406 100644
--- a/docs/content/developer/concepts/core/index.md
+++ b/docs/content/developer/concepts/core/index.md
@@ -4,6 +4,7 @@ tags:
   - developer-guide
   - concepts
   - core
+icon: lucide/cpu
 ---
 
 # Core Concepts
diff --git a/docs/content/developer/concepts/core/lifecycle.md b/docs/content/developer/concepts/core/lifecycle.md
index 1ba0f60db..72c7cc2e5 100644
--- a/docs/content/developer/concepts/core/lifecycle.md
+++ b/docs/content/developer/concepts/core/lifecycle.md
@@ -6,6 +6,7 @@ tags:
   - concepts
   - core
   - lifecycle
+icon: lucide/refresh-ccw
 ---
 
 # Lifecycle Orchestration
diff --git a/docs/content/developer/concepts/core/logging.md b/docs/content/developer/concepts/core/logging.md
index b44d26397..d59beaffb 100644
--- a/docs/content/developer/concepts/core/logging.md
+++ b/docs/content/developer/concepts/core/logging.md
@@ -6,6 +6,7 @@ tags:
   - concepts
   - core
   - logging
+icon: lucide/scroll-text
 ---
 
 # Logging System
diff --git a/docs/content/developer/concepts/core/main.md b/docs/content/developer/concepts/core/main.md
index 731be9883..15f546f10 100644
--- a/docs/content/developer/concepts/core/main.md
+++ b/docs/content/developer/concepts/core/main.md
@@ -5,6 +5,7 @@ tags:
   - developer-guide
   - concepts
   - core
+icon: lucide/cpu
 ---
 
 # Main Entry Point
diff --git a/docs/content/developer/concepts/core/modules.md b/docs/content/developer/concepts/core/modules.md
index 4bff6bffe..5af26e789 100644
--- a/docs/content/developer/concepts/core/modules.md
+++ b/docs/content/developer/concepts/core/modules.md
@@ -6,6 +6,7 @@ tags:
   - concepts
   - core
   - modules
+icon: lucide/component
 ---
 
 # Modules
diff --git a/docs/content/developer/concepts/core/permission-system.md b/docs/content/developer/concepts/core/permission-system.md
index 90e2b003a..529d02cf7 100644
--- a/docs/content/developer/concepts/core/permission-system.md
+++ b/docs/content/developer/concepts/core/permission-system.md
@@ -6,6 +6,7 @@ tags:
   - concepts
   - core
   - permissions
+icon: lucide/key-round
 ---
 
 # Permission System
diff --git a/docs/content/developer/concepts/core/plugins.md b/docs/content/developer/concepts/core/plugins.md
index 8e647a046..dec8731d4 100644
--- a/docs/content/developer/concepts/core/plugins.md
+++ b/docs/content/developer/concepts/core/plugins.md
@@ -6,6 +6,7 @@ tags:
   - concepts
   - core
   - plugins
+icon: lucide/unplug
 ---
 
 # Plugin System
diff --git a/docs/content/developer/concepts/database/architecture.md b/docs/content/developer/concepts/database/architecture.md
index 9602949e0..e3ed77e03 100644
--- a/docs/content/developer/concepts/database/architecture.md
+++ b/docs/content/developer/concepts/database/architecture.md
@@ -5,6 +5,7 @@ tags:
   - concepts
   - database
   - architecture
+icon: lucide/rows-3
 ---
 
 # Database Architecture
diff --git a/docs/content/developer/concepts/database/controllers.md b/docs/content/developer/concepts/database/controllers.md
index fcc30975c..48a635c7a 100644
--- a/docs/content/developer/concepts/database/controllers.md
+++ b/docs/content/developer/concepts/database/controllers.md
@@ -5,6 +5,7 @@ tags:
   - concepts
   - database
   - controllers
+icon: lucide/gamepad-directional
 ---
 
 # Database Controllers
diff --git a/docs/content/developer/concepts/database/index.md b/docs/content/developer/concepts/database/index.md
index bb99fb90f..a787314ac 100644
--- a/docs/content/developer/concepts/database/index.md
+++ b/docs/content/developer/concepts/database/index.md
@@ -4,6 +4,7 @@ tags:
   - developer-guide
   - concepts
   - database
+icon: lucide/database
 ---
 
 # Database Concepts
diff --git a/docs/content/developer/concepts/database/migrations.md b/docs/content/developer/concepts/database/migrations.md
index b255d58d0..dc748d9a7 100644
--- a/docs/content/developer/concepts/database/migrations.md
+++ b/docs/content/developer/concepts/database/migrations.md
@@ -5,6 +5,7 @@ tags:
   - concepts
   - database
   - migrations
+icon: lucide/arrow-left-right
 ---
 
 # Database Migrations
diff --git a/docs/content/developer/concepts/database/models.md b/docs/content/developer/concepts/database/models.md
index 788fbbf9d..798d2be22 100644
--- a/docs/content/developer/concepts/database/models.md
+++ b/docs/content/developer/concepts/database/models.md
@@ -5,6 +5,7 @@ tags:
   - concepts
   - database
   - models
+icon: lucide/database
 ---
 
 # Database Models
diff --git a/docs/content/developer/concepts/database/service.md b/docs/content/developer/concepts/database/service.md
index cd536c7e5..020c0e3f5 100644
--- a/docs/content/developer/concepts/database/service.md
+++ b/docs/content/developer/concepts/database/service.md
@@ -5,6 +5,7 @@ tags:
   - concepts
   - database
   - service
+icon: lucide/database-backup
 ---
 
 # Database Service
diff --git a/docs/content/developer/concepts/database/testing.md b/docs/content/developer/concepts/database/testing.md
index 3852ae5b4..03a7cc9ce 100644
--- a/docs/content/developer/concepts/database/testing.md
+++ b/docs/content/developer/concepts/database/testing.md
@@ -5,6 +5,7 @@ tags:
   - concepts
   - database
   - testing
+icon: lucide/test-tube-diagonal
 ---
 
 # Database Testing
diff --git a/docs/content/developer/concepts/database/utilities.md b/docs/content/developer/concepts/database/utilities.md
index abacd5b6b..a9f256075 100644
--- a/docs/content/developer/concepts/database/utilities.md
+++ b/docs/content/developer/concepts/database/utilities.md
@@ -5,6 +5,7 @@ tags:
   - concepts
   - database
   - utilities
+icon: lucide/wrench
 ---
 
 # Database Utilities
diff --git a/docs/content/developer/concepts/handlers/hot-reload.md b/docs/content/developer/concepts/handlers/hot-reload.md
index 54e936deb..a49766637 100644
--- a/docs/content/developer/concepts/handlers/hot-reload.md
+++ b/docs/content/developer/concepts/handlers/hot-reload.md
@@ -5,6 +5,7 @@ tags:
   - concepts
   - handlers
   - development
+icon: lucide/list-restart
 ---
 
 # Hot Reload
diff --git a/docs/content/developer/concepts/handlers/index.md b/docs/content/developer/concepts/handlers/index.md
index 7c46a1e89..fd4a13c9e 100644
--- a/docs/content/developer/concepts/handlers/index.md
+++ b/docs/content/developer/concepts/handlers/index.md
@@ -4,6 +4,7 @@ tags:
   - developer-guide
   - concepts
   - handlers
+icon: lucide/zap
 ---
 
 # Handlers
diff --git a/docs/content/developer/concepts/index.md b/docs/content/developer/concepts/index.md
index c961b9915..b4c31665c 100644
--- a/docs/content/developer/concepts/index.md
+++ b/docs/content/developer/concepts/index.md
@@ -3,6 +3,7 @@ title: Developer Concepts
 tags:
   - developer-guide
   - concepts
+icon: lucide/layers
 ---
 
 # Developer Concepts
diff --git a/docs/content/developer/concepts/services/index.md b/docs/content/developer/concepts/services/index.md
index 8f763d293..2ffb76429 100644
--- a/docs/content/developer/concepts/services/index.md
+++ b/docs/content/developer/concepts/services/index.md
@@ -4,6 +4,7 @@ tags:
   - developer-guide
   - concepts
   - services
+icon: lucide/server
 ---
 
 # Services
diff --git a/docs/content/developer/concepts/shared/index.md b/docs/content/developer/concepts/shared/index.md
index 8345fc7ee..1ec1291c4 100644
--- a/docs/content/developer/concepts/shared/index.md
+++ b/docs/content/developer/concepts/shared/index.md
@@ -4,6 +4,7 @@ tags:
   - developer-guide
   - concepts
   - shared
+icon: lucide/share-2
 ---
 
 # Shared
diff --git a/docs/content/developer/concepts/tasks/index.md b/docs/content/developer/concepts/tasks/index.md
index fde33e9b4..c9b5e4b69 100644
--- a/docs/content/developer/concepts/tasks/index.md
+++ b/docs/content/developer/concepts/tasks/index.md
@@ -4,6 +4,7 @@ tags:
   - developer-guide
   - concepts
   - tasks
+icon: lucide/list-todo
 ---
 
 # Tasks
diff --git a/docs/content/developer/concepts/tasks/task-monitor.md b/docs/content/developer/concepts/tasks/task-monitor.md
index 968dee063..2a72cf37b 100644
--- a/docs/content/developer/concepts/tasks/task-monitor.md
+++ b/docs/content/developer/concepts/tasks/task-monitor.md
@@ -4,6 +4,7 @@ tags:
   - developer-guide
   - concepts
   - tasks
+icon: lucide/list-todo
 ---
 
 # Task Monitor
diff --git a/docs/content/developer/concepts/ui/buttons.md b/docs/content/developer/concepts/ui/buttons.md
index af4b85056..fd84720a3 100644
--- a/docs/content/developer/concepts/ui/buttons.md
+++ b/docs/content/developer/concepts/ui/buttons.md
@@ -5,6 +5,7 @@ tags:
   - concepts
   - ui
   - components
+icon: lucide/arrow-big-up-dash
 ---
 
 # Buttons
diff --git a/docs/content/developer/concepts/ui/components.md b/docs/content/developer/concepts/ui/components.md
index 1000276e4..f275fdaf5 100644
--- a/docs/content/developer/concepts/ui/components.md
+++ b/docs/content/developer/concepts/ui/components.md
@@ -5,6 +5,7 @@ tags:
   - concepts
   - ui
   - components
+icon: lucide/puzzle
 ---
 
 # Components
diff --git a/docs/content/developer/concepts/ui/embeds.md b/docs/content/developer/concepts/ui/embeds.md
index 407ae7b10..2ee2bad7c 100644
--- a/docs/content/developer/concepts/ui/embeds.md
+++ b/docs/content/developer/concepts/ui/embeds.md
@@ -5,6 +5,7 @@ tags:
   - concepts
   - ui
   - embeds
+icon: lucide/between-horizontal-start
 ---
 
 # Embeds
diff --git a/docs/content/developer/concepts/ui/index.md b/docs/content/developer/concepts/ui/index.md
index 893a298f3..347be26d6 100644
--- a/docs/content/developer/concepts/ui/index.md
+++ b/docs/content/developer/concepts/ui/index.md
@@ -4,6 +4,7 @@ tags:
   - developer-guide
   - concepts
   - ui
+icon: lucide/layout
 ---
 
 # UI Concepts
diff --git a/docs/content/developer/concepts/ui/modals.md b/docs/content/developer/concepts/ui/modals.md
index d32597745..f0da406c5 100644
--- a/docs/content/developer/concepts/ui/modals.md
+++ b/docs/content/developer/concepts/ui/modals.md
@@ -5,6 +5,7 @@ tags:
   - concepts
   - ui
   - components
+icon: lucide/blend
 ---
 
 # Modals
diff --git a/docs/content/developer/concepts/ui/views.md b/docs/content/developer/concepts/ui/views.md
index 23b91aec5..6d52c82d8 100644
--- a/docs/content/developer/concepts/ui/views.md
+++ b/docs/content/developer/concepts/ui/views.md
@@ -5,6 +5,7 @@ tags:
   - concepts
   - ui
   - components
+icon: lucide/eye
 ---
 
 # Views
diff --git a/docs/content/developer/concepts/wrappers/index.md b/docs/content/developer/concepts/wrappers/index.md
index 1a7a0ef59..1149adf81 100644
--- a/docs/content/developer/concepts/wrappers/index.md
+++ b/docs/content/developer/concepts/wrappers/index.md
@@ -4,6 +4,7 @@ tags:
   - developer-guide
   - concepts
   - wrappers
+icon: lucide/package
 ---
 
 # Wrappers
diff --git a/docs/content/developer/contributing.md b/docs/content/developer/contributing.md
index c0a71bc96..1d74c1c8f 100644
--- a/docs/content/developer/contributing.md
+++ b/docs/content/developer/contributing.md
@@ -4,6 +4,7 @@ description: How to contribute to Tux—setup, workflow, pull requests, and wher
 tags:
   - developer-guide
   - contributing
+icon: lucide/git-pull-request-arrow
 ---
 
 # Contributing to Tux
diff --git a/docs/content/developer/guides/components-v2.md b/docs/content/developer/guides/components-v2.md
index 1088864e1..042a3e169 100644
--- a/docs/content/developer/guides/components-v2.md
+++ b/docs/content/developer/guides/components-v2.md
@@ -6,6 +6,7 @@ tags:
   - guides
   - ui
   - components
+icon: lucide/component
 ---
 
 # Components V2 Guide
diff --git a/docs/content/developer/guides/creating-cursor-commands.md b/docs/content/developer/guides/creating-cursor-commands.md
index 5f038a3b1..e38915559 100644
--- a/docs/content/developer/guides/creating-cursor-commands.md
+++ b/docs/content/developer/guides/creating-cursor-commands.md
@@ -5,6 +5,7 @@ tags:
   - commands
   - development
   - guide
+icon: lucide/mouse-pointer-2
 ---
 
 # Guide: Creating Cursor Commands
diff --git a/docs/content/developer/guides/creating-cursor-rules.md b/docs/content/developer/guides/creating-cursor-rules.md
index d0ade64b0..c804c4147 100644
--- a/docs/content/developer/guides/creating-cursor-rules.md
+++ b/docs/content/developer/guides/creating-cursor-rules.md
@@ -5,6 +5,7 @@ tags:
   - rules
   - development
   - guide
+icon: lucide/mouse-pointer-2
 ---
 
 <!-- markdownlint-disable MD024 -->
diff --git a/docs/content/developer/guides/docker-images.md b/docs/content/developer/guides/docker-images.md
index c51ca025b..e4ada0936 100644
--- a/docs/content/developer/guides/docker-images.md
+++ b/docs/content/developer/guides/docker-images.md
@@ -4,6 +4,7 @@ tags:
   - developer
   - docker
   - guides
+icon: lucide/vault
 ---
 
 # Building Docker Images
diff --git a/docs/content/developer/guides/extending-cli.md b/docs/content/developer/guides/extending-cli.md
index 9b9c1a9eb..d06f6556d 100644
--- a/docs/content/developer/guides/extending-cli.md
+++ b/docs/content/developer/guides/extending-cli.md
@@ -5,6 +5,7 @@ tags:
   - developer-guide
   - guides
   - cli
+icon: lucide/square-terminal
 ---
 
 # Extending CLI
diff --git a/docs/content/developer/guides/index.md b/docs/content/developer/guides/index.md
index 84056df3c..8cbbbc281 100644
--- a/docs/content/developer/guides/index.md
+++ b/docs/content/developer/guides/index.md
@@ -3,6 +3,7 @@ title: Developer Guides
 tags:
   - developer-guide
   - guides
+icon: lucide/book-open
 ---
 
 # Developer Guides
diff --git a/docs/content/developer/index.md b/docs/content/developer/index.md
index d8927620f..5fd35c3e8 100644
--- a/docs/content/developer/index.md
+++ b/docs/content/developer/index.md
@@ -1,9 +1,9 @@
 ---
 title: Developer Guide
-icon: material/folder-search-outline
 description: Index of developer documentation—contributing, tutorials, concepts, best practices, and reference.
 tags:
   - developer-guide
+icon: lucide/code-2
 ---
 
 # Developer Guide
diff --git a/docs/content/developer/tutorials/creating-first-cog.md b/docs/content/developer/tutorials/creating-first-cog.md
index 85eae2002..ec95c6bd4 100644
--- a/docs/content/developer/tutorials/creating-first-cog.md
+++ b/docs/content/developer/tutorials/creating-first-cog.md
@@ -5,6 +5,7 @@ tags:
   - developer-guide
   - tutorials
   - cogs
+icon: lucide/settings
 ---
 
 # Creating Your First Cog
diff --git a/docs/content/developer/tutorials/creating-first-command.md b/docs/content/developer/tutorials/creating-first-command.md
index d3ac3119b..5d5a32088 100644
--- a/docs/content/developer/tutorials/creating-first-command.md
+++ b/docs/content/developer/tutorials/creating-first-command.md
@@ -5,6 +5,7 @@ tags:
   - developer-guide
   - tutorials
   - commands
+icon: lucide/square-terminal
 ---
 
 # Creating Your First Command
diff --git a/docs/content/developer/tutorials/creating-first-migration.md b/docs/content/developer/tutorials/creating-first-migration.md
index d139ad333..ad12eb10e 100644
--- a/docs/content/developer/tutorials/creating-first-migration.md
+++ b/docs/content/developer/tutorials/creating-first-migration.md
@@ -5,6 +5,7 @@ tags:
   - tutorials
   - database
   - migrations
+icon: lucide/arrow-up-down
 ---
 
 # Creating Your First Migration
diff --git a/docs/content/developer/tutorials/database-integration.md b/docs/content/developer/tutorials/database-integration.md
index d1fa11097..8d6849d5a 100644
--- a/docs/content/developer/tutorials/database-integration.md
+++ b/docs/content/developer/tutorials/database-integration.md
@@ -4,6 +4,7 @@ tags:
   - developer-guide
   - tutorials
   - database
+icon: lucide/database
 ---
 
 # Database Integration
diff --git a/docs/content/developer/tutorials/development-setup.md b/docs/content/developer/tutorials/development-setup.md
index 24273c3ea..854b68745 100644
--- a/docs/content/developer/tutorials/development-setup.md
+++ b/docs/content/developer/tutorials/development-setup.md
@@ -4,6 +4,7 @@ tags:
   - developer-guide
   - tutorials
   - setup
+icon: lucide/rocket
 ---
 
 # Development Setup
diff --git a/docs/content/developer/tutorials/first-contribution.md b/docs/content/developer/tutorials/first-contribution.md
index c99d8f7f9..b7b9ffff1 100644
--- a/docs/content/developer/tutorials/first-contribution.md
+++ b/docs/content/developer/tutorials/first-contribution.md
@@ -5,6 +5,7 @@ tags:
   - developer-guide
   - tutorials
   - contributing
+icon: lucide/merge
 ---
 
 # First Contribution
diff --git a/docs/content/developer/tutorials/index.md b/docs/content/developer/tutorials/index.md
index bdecbb9ea..814748ac4 100644
--- a/docs/content/developer/tutorials/index.md
+++ b/docs/content/developer/tutorials/index.md
@@ -3,6 +3,7 @@ title: Developer Tutorials
 tags:
   - developer-guide
   - tutorials
+icon: lucide/graduation-cap
 ---
 
 # Developer Tutorials
diff --git a/docs/content/developer/tutorials/project-structure.md b/docs/content/developer/tutorials/project-structure.md
index 2aae16320..673884e5d 100644
--- a/docs/content/developer/tutorials/project-structure.md
+++ b/docs/content/developer/tutorials/project-structure.md
@@ -4,6 +4,7 @@ tags:
   - developer-guide
   - tutorials
   - architecture
+icon: lucide/table-of-contents
 ---
 
 # Project Structure
diff --git a/docs/content/developer/tutorials/testing-setup.md b/docs/content/developer/tutorials/testing-setup.md
index 85a6c0578..c35e015c0 100644
--- a/docs/content/developer/tutorials/testing-setup.md
+++ b/docs/content/developer/tutorials/testing-setup.md
@@ -4,6 +4,7 @@ tags:
   - developer-guide
   - tutorials
   - testing
+icon: lucide/flask-conical
 ---
 
 # Testing Setup
diff --git a/docs/content/faq/admins.md b/docs/content/faq/admins.md
index 17601b602..f0cc7a767 100644
--- a/docs/content/faq/admins.md
+++ b/docs/content/faq/admins.md
@@ -2,7 +2,7 @@
 title: For Admins
 description: Frequently asked questions for server admins.
 parent: FAQ
-icon: material/help-circle-outline
+icon: lucide/user-star
 ---
 
 # For Admins
diff --git a/docs/content/faq/developers.md b/docs/content/faq/developers.md
index e691524d2..f64d751f8 100644
--- a/docs/content/faq/developers.md
+++ b/docs/content/faq/developers.md
@@ -2,7 +2,7 @@
 title: For Developers
 description: Frequently asked questions for Tux developers.
 parent: FAQ
-icon: material/help-circle-outline
+icon: lucide/code-2
 ---
 
 # For Developers
diff --git a/docs/content/faq/general.md b/docs/content/faq/general.md
index 3f8f03df6..9ebc20921 100644
--- a/docs/content/faq/general.md
+++ b/docs/content/faq/general.md
@@ -2,7 +2,7 @@
 title: General
 description: General frequently asked questions about Tux.
 parent: FAQ
-icon: material/help-circle-outline
+icon: lucide/info
 ---
 
 # General
diff --git a/docs/content/faq/index.md b/docs/content/faq/index.md
index 9b0fabd21..dbc6851f5 100644
--- a/docs/content/faq/index.md
+++ b/docs/content/faq/index.md
@@ -3,6 +3,7 @@ title: FAQ
 description: Frequently asked questions about Tux.
 hide:
   - toc
+icon: lucide/circle-help
 ---
 
 # Frequently Asked Questions
diff --git a/docs/content/faq/other.md b/docs/content/faq/other.md
index 87a30844f..70f582d8f 100644
--- a/docs/content/faq/other.md
+++ b/docs/content/faq/other.md
@@ -2,7 +2,7 @@
 title: Other
 description: Other frequently asked questions about Tux.
 parent: FAQ
-icon: material/help-circle-outline
+icon: lucide/circle-help
 ---
 
 # Other
diff --git a/docs/content/faq/self-hosters.md b/docs/content/faq/self-hosters.md
index 39be9f193..6d440f487 100644
--- a/docs/content/faq/self-hosters.md
+++ b/docs/content/faq/self-hosters.md
@@ -2,7 +2,7 @@
 title: For Self-Hosters
 description: Frequently asked questions for self-hosting Tux.
 parent: FAQ
-icon: material/help-circle-outline
+icon: lucide/server
 ---
 
 # For Self-Hosters
diff --git a/docs/content/faq/users.md b/docs/content/faq/users.md
index 77009a7a5..b914df69a 100644
--- a/docs/content/faq/users.md
+++ b/docs/content/faq/users.md
@@ -2,7 +2,7 @@
 title: For Users
 description: Frequently asked questions for Tux users.
 parent: FAQ
-icon: material/help-circle-outline
+icon: lucide/users
 ---
 
 # For Users
diff --git a/docs/content/reference/cli.md b/docs/content/reference/cli.md
index d3d56f091..ad742fe71 100644
--- a/docs/content/reference/cli.md
+++ b/docs/content/reference/cli.md
@@ -6,6 +6,7 @@ tags:
   - typer
   - commands
   - terminal
+icon: lucide/square-terminal
 ---
 
 # CLI Reference
diff --git a/docs/content/reference/coverage.md b/docs/content/reference/coverage.md
index 46e03741d..0039a8b7e 100644
--- a/docs/content/reference/coverage.md
+++ b/docs/content/reference/coverage.md
@@ -8,6 +8,7 @@ tags:
   - codecov
   - pytest
   - coverage
+icon: lucide/chart-bar
 ---
 
 # Coverage
diff --git a/docs/content/reference/docker-production.md b/docs/content/reference/docker-production.md
index ab70f0cfa..062c8045e 100644
--- a/docs/content/reference/docker-production.md
+++ b/docs/content/reference/docker-production.md
@@ -4,6 +4,7 @@ tags:
   - reference
   - docker
   - production
+icon: lucide/container
 ---
 
 # Docker Production Deployment
diff --git a/docs/content/reference/docs/index.md b/docs/content/reference/docs/index.md
index 9416c0d57..8de65bd4b 100644
--- a/docs/content/reference/docs/index.md
+++ b/docs/content/reference/docs/index.md
@@ -5,6 +5,7 @@ tags:
   - reference
   - docs
   - documentation
+icon: lucide/notepad-text-dashed
 ---
 
 # Documentation
diff --git a/docs/content/reference/docs/templates/command-group-template.md b/docs/content/reference/docs/templates/command-group-template.md
index 6bd58bb8b..1cbda836d 100644
--- a/docs/content/reference/docs/templates/command-group-template.md
+++ b/docs/content/reference/docs/templates/command-group-template.md
@@ -6,6 +6,7 @@ tags:
   - commands
   - command-groups
   - COMMAND_GROUP_TAG
+icon: lucide/folder-tree
 ---
 
 # {COMMAND_GROUP_NAME}
diff --git a/docs/content/reference/docs/templates/command-template.md b/docs/content/reference/docs/templates/command-template.md
index 00c07c59a..75f5fe258 100644
--- a/docs/content/reference/docs/templates/command-template.md
+++ b/docs/content/reference/docs/templates/command-template.md
@@ -5,6 +5,7 @@ tags:
   - user-guide
   - commands
   - COMMAND_TAG
+icon: lucide/terminal
 ---
 
 # {COMMAND_NAME}
diff --git a/docs/content/reference/docs/templates/feature-template.md b/docs/content/reference/docs/templates/feature-template.md
index 462cd36c2..db03815c4 100644
--- a/docs/content/reference/docs/templates/feature-template.md
+++ b/docs/content/reference/docs/templates/feature-template.md
@@ -5,6 +5,7 @@ tags:
   - user-guide
   - features
   - FEATURE_TAG
+icon: lucide/sparkles
 ---
 
 # FEATURE_NAME
diff --git a/docs/content/reference/docs/templates/index.md b/docs/content/reference/docs/templates/index.md
index 069255b1d..5313d4272 100644
--- a/docs/content/reference/docs/templates/index.md
+++ b/docs/content/reference/docs/templates/index.md
@@ -5,6 +5,7 @@ tags:
   - documentation
   - templates
   - developer
+icon: lucide/layout-template
 ---
 
 # Documentation Templates
diff --git a/docs/content/reference/docs/templates/module-template.md b/docs/content/reference/docs/templates/module-template.md
index 3c7cf526e..56f4c170c 100644
--- a/docs/content/reference/docs/templates/module-template.md
+++ b/docs/content/reference/docs/templates/module-template.md
@@ -5,6 +5,7 @@ tags:
   - user-guide
   - modules
   - MODULE_TAG
+icon: lucide/component
 ---
 
 # {MODULE_NAME}
diff --git a/docs/content/reference/env.md b/docs/content/reference/env.md
index 61c814516..7666c2a02 100644
--- a/docs/content/reference/env.md
+++ b/docs/content/reference/env.md
@@ -10,6 +10,7 @@ tags:
   - pydantic-settings
   - dotenv
   - env-variables
+icon: lucide/variable
 ---
 <!-- region:config -->
 # Environment Variables
diff --git a/docs/content/reference/index.md b/docs/content/reference/index.md
index b12fa93c5..72aee8154 100644
--- a/docs/content/reference/index.md
+++ b/docs/content/reference/index.md
@@ -1,5 +1,6 @@
 ---
 title: Reference
+icon: lucide/book-open
 ---
 
 # Reference
diff --git a/docs/content/reference/listings.md b/docs/content/reference/listings.md
index f1a0e89f0..41a572ef9 100644
--- a/docs/content/reference/listings.md
+++ b/docs/content/reference/listings.md
@@ -5,6 +5,7 @@ hide:
 tags:
   - reference
   - code-snippets
+icon: lucide/list-ordered
 ---
 ---
 
diff --git a/docs/content/reference/renovate.md b/docs/content/reference/renovate.md
index 370fe3cc3..b4ef3ca59 100644
--- a/docs/content/reference/renovate.md
+++ b/docs/content/reference/renovate.md
@@ -4,6 +4,7 @@ tags:
   - renovate
   - dependencies
   - ci-cd
+icon: lucide/refresh-cw
 ---
 
 # Renovate Configuration
diff --git a/docs/content/reference/sbom.md b/docs/content/reference/sbom.md
index a57fb292a..12eb8bae3 100644
--- a/docs/content/reference/sbom.md
+++ b/docs/content/reference/sbom.md
@@ -6,6 +6,7 @@ tags:
   - reference
   - sbom
   - dependencies
+icon: lucide/package
 ---
 ---
 
diff --git a/docs/content/reference/src/tux/index.md b/docs/content/reference/src/tux/index.md
index c80c5915a..0b6d66f8d 100644
--- a/docs/content/reference/src/tux/index.md
+++ b/docs/content/reference/src/tux/index.md
@@ -1,6 +1,6 @@
 ---
 title: API Reference
-icon: material/code-tags
+icon: lucide/code-2
 tags:
   - reference
   - api
diff --git a/docs/content/reference/style-guide.md b/docs/content/reference/style-guide.md
index e4bf2ad00..a3b396543 100644
--- a/docs/content/reference/style-guide.md
+++ b/docs/content/reference/style-guide.md
@@ -4,6 +4,7 @@ tags:
   - style-guide
   - docs
   - css
+icon: lucide/type
 ---
 
 # Style Guide
diff --git a/docs/content/reference/versioning.md b/docs/content/reference/versioning.md
index f32846a59..6338fa655 100644
--- a/docs/content/reference/versioning.md
+++ b/docs/content/reference/versioning.md
@@ -6,6 +6,7 @@ tags:
   - versioning
   - release-process
   - git-tags
+icon: lucide/arrow-up-1-0
 ---
 
 # Versioning System
diff --git a/docs/content/selfhost/config/bot-token.md b/docs/content/selfhost/config/bot-token.md
index de7388686..d7fc5fe25 100644
--- a/docs/content/selfhost/config/bot-token.md
+++ b/docs/content/selfhost/config/bot-token.md
@@ -4,6 +4,7 @@ tags:
   - selfhost
   - configuration
   - bot-token
+icon: lucide/key-round
 ---
 
 # Bot Token Configuration
diff --git a/docs/content/selfhost/config/database.md b/docs/content/selfhost/config/database.md
index 7a2bda51e..58ba20f7c 100644
--- a/docs/content/selfhost/config/database.md
+++ b/docs/content/selfhost/config/database.md
@@ -4,6 +4,7 @@ tags:
   - selfhost
   - configuration
   - database
+icon: lucide/database
 ---
 
 # Database Configuration
diff --git a/docs/content/selfhost/config/environment.md b/docs/content/selfhost/config/environment.md
index 05f525441..302cfe7f2 100644
--- a/docs/content/selfhost/config/environment.md
+++ b/docs/content/selfhost/config/environment.md
@@ -4,6 +4,7 @@ tags:
   - selfhost
   - configuration
   - environment
+icon: lucide/variable
 ---
 
 # Environment Configuration
diff --git a/docs/content/selfhost/config/index.md b/docs/content/selfhost/config/index.md
index 83309f398..2b95238dc 100644
--- a/docs/content/selfhost/config/index.md
+++ b/docs/content/selfhost/config/index.md
@@ -3,6 +3,7 @@ title: Self-Host Configuration
 tags:
   - selfhost
   - configuration
+icon: lucide/cog
 ---
 
 # Self-Host Configuration
diff --git a/docs/content/selfhost/index.md b/docs/content/selfhost/index.md
index a79774f17..8a444d800 100644
--- a/docs/content/selfhost/index.md
+++ b/docs/content/selfhost/index.md
@@ -2,7 +2,7 @@
 title: Self-Hoster Guide
 tags:
   - selfhost
-icon: material/server-outline
+icon: lucide/server
 ---
 
 # Self-Hoster Guide
diff --git a/docs/content/selfhost/install/baremetal.md b/docs/content/selfhost/install/baremetal.md
index 0a999ad63..df8848bd8 100644
--- a/docs/content/selfhost/install/baremetal.md
+++ b/docs/content/selfhost/install/baremetal.md
@@ -6,6 +6,7 @@ tags:
   - baremetal
   - systemd
   - postgresql
+icon: lucide/hard-drive
 ---
 
 # Bare Metal Installation
diff --git a/docs/content/selfhost/install/docker.md b/docs/content/selfhost/install/docker.md
index d207cf739..f30d4ceff 100644
--- a/docs/content/selfhost/install/docker.md
+++ b/docs/content/selfhost/install/docker.md
@@ -4,6 +4,7 @@ tags:
   - selfhost
   - installation
   - docker
+icon: lucide/container
 ---
 
 # Docker Installation
diff --git a/docs/content/selfhost/install/first-run.md b/docs/content/selfhost/install/first-run.md
index 96af76d8e..dbfc7c890 100644
--- a/docs/content/selfhost/install/first-run.md
+++ b/docs/content/selfhost/install/first-run.md
@@ -4,6 +4,7 @@ tags:
   - selfhost
   - installation
   - setup
+icon: lucide/rocket
 ---
 
 # First Run Instructions
diff --git a/docs/content/selfhost/manage/database.md b/docs/content/selfhost/manage/database.md
index 9026d587a..f1dc7c06a 100644
--- a/docs/content/selfhost/manage/database.md
+++ b/docs/content/selfhost/manage/database.md
@@ -4,6 +4,7 @@ tags:
   - selfhost
   - operations
   - database
+icon: lucide/database
 ---
 
 # Database Management
diff --git a/docs/content/selfhost/manage/docker.md b/docs/content/selfhost/manage/docker.md
index e5f5ce48b..8c24a8b45 100644
--- a/docs/content/selfhost/manage/docker.md
+++ b/docs/content/selfhost/manage/docker.md
@@ -4,6 +4,7 @@ tags:
   - selfhost
   - operations
   - docker
+icon: lucide/container
 ---
 
 # Docker Operations
diff --git a/docs/content/selfhost/manage/index.md b/docs/content/selfhost/manage/index.md
index 6e68521b5..9f9fa37ed 100644
--- a/docs/content/selfhost/manage/index.md
+++ b/docs/content/selfhost/manage/index.md
@@ -3,6 +3,7 @@ title: Self-Host Management
 tags:
   - selfhost
   - operations
+icon: lucide/sliders-horizontal
 ---
 
 # Self-Host Management
diff --git a/docs/content/selfhost/manage/operations.md b/docs/content/selfhost/manage/operations.md
index 455b31544..4eab3bec4 100644
--- a/docs/content/selfhost/manage/operations.md
+++ b/docs/content/selfhost/manage/operations.md
@@ -3,6 +3,7 @@ title: System Operations
 tags:
   - selfhost
   - operations
+icon: lucide/activity
 ---
 
 # System Operations
diff --git a/docs/content/support/index.md b/docs/content/support/index.md
index 2762d7e88..fad9bfa57 100644
--- a/docs/content/support/index.md
+++ b/docs/content/support/index.md
@@ -1,6 +1,6 @@
 ---
 title: Support
-icon: material/forum-outline
+icon: lucide/life-buoy
 tags:
   - support
 ---
diff --git a/docs/content/support/troubleshooting/admin.md b/docs/content/support/troubleshooting/admin.md
index d53ec7730..b43f08ac8 100644
--- a/docs/content/support/troubleshooting/admin.md
+++ b/docs/content/support/troubleshooting/admin.md
@@ -4,6 +4,7 @@ tags:
   - support
   - troubleshooting
   - admin
+icon: lucide/shield
 ---
 
 # Admin Troubleshooting
diff --git a/docs/content/support/troubleshooting/developer.md b/docs/content/support/troubleshooting/developer.md
index 2a2cdff5e..ae79bdaff 100644
--- a/docs/content/support/troubleshooting/developer.md
+++ b/docs/content/support/troubleshooting/developer.md
@@ -4,6 +4,7 @@ tags:
   - support
   - troubleshooting
   - developer
+icon: lucide/bug
 ---
 
 # Developer Troubleshooting
diff --git a/docs/content/support/troubleshooting/docker.md b/docs/content/support/troubleshooting/docker.md
index 2ce0562fa..872f825cd 100644
--- a/docs/content/support/troubleshooting/docker.md
+++ b/docs/content/support/troubleshooting/docker.md
@@ -4,6 +4,7 @@ tags:
   - support
   - troubleshooting
   - docker
+icon: lucide/container
 ---
 
 # Docker Troubleshooting
diff --git a/docs/content/support/troubleshooting/index.md b/docs/content/support/troubleshooting/index.md
index 79963b771..984c325cc 100644
--- a/docs/content/support/troubleshooting/index.md
+++ b/docs/content/support/troubleshooting/index.md
@@ -3,6 +3,7 @@ title: Troubleshooting
 tags:
   - support
   - troubleshooting
+icon: lucide/wrench
 ---
 
 # Troubleshooting
diff --git a/docs/content/support/troubleshooting/selfhost.md b/docs/content/support/troubleshooting/selfhost.md
index cb12f21ae..3ae731398 100644
--- a/docs/content/support/troubleshooting/selfhost.md
+++ b/docs/content/support/troubleshooting/selfhost.md
@@ -4,6 +4,7 @@ tags:
   - support
   - troubleshooting
   - selfhost
+icon: lucide/server
 ---
 
 # Self-Host Troubleshooting
diff --git a/docs/content/support/troubleshooting/user.md b/docs/content/support/troubleshooting/user.md
index 220716d22..c5218eff9 100644
--- a/docs/content/support/troubleshooting/user.md
+++ b/docs/content/support/troubleshooting/user.md
@@ -4,6 +4,7 @@ tags:
   - support
   - troubleshooting
   - user
+icon: lucide/user
 ---
 
 # User Troubleshooting
diff --git a/zensical.toml b/zensical.toml
index 7083f8e60..55c873300 100644
--- a/zensical.toml
+++ b/zensical.toml
@@ -114,21 +114,21 @@ nav = [
     { "Self-Hoster Guide" = [
         "selfhost/index.md",
         { "Installation" = [
-            "selfhost/install/docker.md",
-            "selfhost/install/baremetal.md",
-            "selfhost/install/first-run.md",
+            { "Docker" = "selfhost/install/docker.md" },
+            { "Bare Metal" = "selfhost/install/baremetal.md" },
+            { "First Run" = "selfhost/install/first-run.md" },
         ] },
         { "Configuration" = [
-            "selfhost/config/index.md",
-            "selfhost/config/bot-token.md",
-            "selfhost/config/database.md",
-            "selfhost/config/environment.md",
+            { "Overview" = "selfhost/config/index.md" },
+            { "Bot Token" = "selfhost/config/bot-token.md" },
+            { "Database" = "selfhost/config/database.md" },
+            { "Environment" = "selfhost/config/environment.md" },
         ] },
         { "Management" = [
-            "selfhost/manage/index.md",
-            "selfhost/manage/database.md",
-            "selfhost/manage/docker.md",
-            "selfhost/manage/operations.md",
+            { "Overview" = "selfhost/manage/index.md" },
+            { "Database" = "selfhost/manage/database.md" },
+            { "Docker" = "selfhost/manage/docker.md" },
+            { "Operations" = "selfhost/manage/operations.md" },
         ] },
     ] },
     { "Developer Guide" = [
@@ -210,7 +210,7 @@ nav = [
             { "Overview" = "developer/best-practices/index.md" },
             { "Namespace" = "developer/best-practices/namespace.md" },
             { "Git" = "developer/best-practices/git.md" },
-            "developer/best-practices/branch-naming.md",
+            { "Branching" = "developer/best-practices/branch-naming.md" },
             { "CI/CD" = "developer/best-practices/ci-cd.md" },
             { "Async" = "developer/best-practices/async.md" },
             { "Error Handling" = "developer/best-practices/error-handling.md" },