diff --git a/clusters/cl01tl/applications/homepage/values.yaml b/clusters/cl01tl/applications/homepage/values.yaml
index 5283e9e9b..7134f79a2 100644
--- a/clusters/cl01tl/applications/homepage/values.yaml
+++ b/clusters/cl01tl/applications/homepage/values.yaml
@@ -45,25 +45,25 @@ homepage:
                 icon: mdi-multimedia-#ffffff
             - Public:
                 tab: Applications
-                icon: mdi-application-#ffffff
+                icon: mdi-earth-#ffffff
             - Internal:
                 tab: Applications
-                icon: mdi-application-#ffffff
+                icon: mdi-security-network-#ffffff
             - Code:
                 tab: Tools
-                icon: mdi-code-braces-box-#ffffff
+                icon: mdi-code-block-braces-#ffffff
             - Monitoring:
                 tab: Tools
-                icon: mdi-chart-bar-#ffffff
+                icon: mdi-chart-line-#ffffff
             - Services:
                 tab: Services
-                icon: mdi-server-network-#ffffff
+                icon: mdi-toolbox-outline-#ffffff
             - Hardware:
                 tab: Services
-                icon: mdi-lan-connect-#ffffff
+                icon: mdi-server-network-#ffffff
             - Storage:
                 tab: Services
-                icon: mdi-harddisk-#ffffff
+                icon: mdi-database-#ffffff
             - Sonarr:
                 tab: Servarr
                 icon: mdi-television-#ffffff
@@ -112,37 +112,37 @@ homepage:
         services.yaml: |
           - Media:
               - Plex:
-                  icon: plex.png
+                  icon: sh-plex.svg
                   description: Media server
                   href: https://plex-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://plex.plex:32400
                   statusStyle: dot
               - Media Requests:
-                  icon: overseerr.png
+                  icon: sh-overseerr.svg
                   description: Overseer
                   href: https://overseerr-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://overseerr.overseerr:80
                   statusStyle: dot
               - Jellyfin:
-                  icon: jellyfin.png
+                  icon: sh-jellyfin.svg
                   description: Media server
                   href: https://jellyfin-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://jellyfin-main.jellyfin:80
                   statusStyle: dot
               - Jellyfin Vue:
-                  icon: jellyfin.png
+                  icon: sh-jellyfin.svg
                   description: Media server ( alternative interface )
                   href: https://jellyfin-vue-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://jellyfin-vue.jellyfin:80
                   statusStyle: dot
               - Kyoo:
-                  icon: https://raw.githubusercontent.com/zoriya/Kyoo/master/icons/icon-256x256.png
+                  icon: sh-kyoo.svg
                   description: Media server
                   href: https://kyoo-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://kyoo-front.kyoo:8901
                   statusStyle: dot
               - Youtube Archive:
-                  icon: tube-archivist.png
+                  icon: sh-tube-archivist-light.svg
                   description: TubeAchivist
                   href: https://tubearchivist-cl01tl.boreal-beaufort.ts.net/login
                   siteMonitor: http://tubearchivist.tubearchivist:80
@@ -154,26 +154,26 @@ homepage:
                   siteMonitor: http://koel.koel:80
                   statusStyle: dot
               - Photos:
-                  icon: immich.png
+                  icon: sh-immich.svg
                   description: Immich
                   href: https://immich-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://immich-main.immich:3001
                   statusStyle: dot
               - Podcasts and Audiobooks:
-                  icon: audiobookshelf.png
+                  icon: sh-audiobookshelf.svg
                   description: Audiobookshelf
                   href: https://audiobookshelf-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://audiobookshelf.audiobookshelf:80
                   statusStyle: dot
               - Books:
-                  icon: calibre-web.png
+                  icon: sh-calibre-web-light.svg
                   description: Calibre Web Automated
                   href: https://calibre-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://calibre-web-automated.calibre-web-automated:80
                   statusStyle: dot
           - Public:
               - Passwords:
-                  icon: vaultwarden.png
+                  icon: sh-vaultwarden-light.svg
                   description: Vaultwarden
                   href: https://passwords.alexlebens.dev
                   siteMonitor: https://passwords.alexlebens.dev
@@ -185,38 +185,38 @@ homepage:
                   siteMonitor: https://www.alexlebens.dev
                   statusStyle: dot
               - Chat:
-                  icon: element.svg
+                  icon: sh-element.svg
                   description: Matrix
                   href: https://chat.alexlebens.dev
                   siteMonitor: https://chat.alexlebens.dev
                   statusStyle: dot
               - Wiki:
-                  icon: outline.png
+                  icon: sh-outline.svg
                   description: Outline
                   href: https://wiki.alexlebens.dev
                   siteMonitor: https://wiki.alexlebens.dev
                   statusStyle: dot
               - RSS:
-                  icon: freshrss.svg
+                  icon: sh-freshrss.svg
                   description: FreshRSS
                   href: https://rss.alexlebens.dev
                   siteMonitor: https://rss.alexlebens.dev
                   statusStyle: dot
               - Bookmarks:
-                  icon: linkwarden.png
+                  icon: sh-linkwarden.png
                   description: Linkwarden
                   href: https://bookmarks.alexlebens.dev
                   siteMonitor: https://bookmarks.alexlebens.dev
                   statusStyle: dot
               - Tasks:
-                  icon: vikunja.png
+                  icon: sh-vikunja.svg
                   description: Vikunja
                   href: https://vikunja.alexlebens.dev
                   siteMonitor: https://vikunja.alexlebens.dev
                   statusStyle: dot
           - Internal:
               - Home Automation:
-                  icon: home-assistant.png
+                  icon: sh-home-assistant.svg
                   description: Home Assistant
                   href: https://home-assistant-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://home-assistant.home-assistant:8123
@@ -228,76 +228,76 @@ homepage:
                   siteMonitor: http://directus.directus:80
                   statusStyle: dot
               - Email:
-                  icon: roundcube.svg
+                  icon: sh-roundcube.svg
                   description: Roundcube
                   href: https://mail-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://roundcube.roundcube:80
                   statusStyle: dot
               - Project Planning:
-                  icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/plane.png
+                  icon: sh-plane.svg
                   description: Plane
                   href: https://plane-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://plane-web.plane:3000
                   statusStyle: dot
               - Web Design:
-                  icon: https://raw.githubusercontent.com/penpot/penpot/362d4ea47f06d169dd6e0a34cb9d141200e646e6/frontend/resources/images/icons/penpot-logo-icon.svg
+                  icon: sh-penpot-light.svg
                   description: Penpot
                   href: https://penpot-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://penpot-frontend.penpot:80
                   statusStyle: dot
               - Media Tracker:
-                  icon: https://raw.githubusercontent.com/IgnisDa/ryot/main/docs/logo.png
+                  icon: sh-ryot.png
                   description: Ryot
                   href: https://ryot-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://ryot.ryot:80
                   statusStyle: dot
               - Calibre Server:
-                  icon: calibre.png
+                  icon: sh-calibre.svg
                   description: Calibre Content Server
                   href: https://calibre-server-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://calibre-server-web.calibre-server:80
                   statusStyle: dot
           - Code:
               - Code (Public):
-                  icon: gitea.png
+                  icon: sh-gitea.svg
                   description: Gitea
                   href: https://gitea.alexlebens.dev
                   siteMonitor: https://gitea.alexlebens.dev
                   statusStyle: dot
               - Code (ps10rp):
-                  icon: gitea.png
+                  icon: sh-gitea.svg
                   description: Gitea
                   href: https://gitea.lebens-home.net
                   siteMonitor: https://gitea.lebens-home.net
                   statusStyle: dot
               - IDE (Public):
-                  icon: code-server.png
+                  icon: sh-visual-studio-code.svg
                   description: VS Code
                   href: https://codeserver.alexlebens.dev
                   siteMonitor: https://codeserver.alexlebens.dev
                   statusStyle: dot
               - IDE (Home Assistant):
-                  icon: code-server.png
+                  icon: sh-visual-studio-code.svg
                   description: Edit config for Home Assistant
                   href: https://home-assistant-codeserver-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://home-assistant.home-assistant:8443
                   statusStyle: dot
               - Continuous Deployment:
-                  icon: argocd.png
+                  icon: sh-argo-cd.svg
                   description: ArgoCD
                   href: https://argocd-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://argocd-server.argocd:80
                   statusStyle: dot
                   namespace: argocd
               - Deployment Management:
-                  icon: argocd.png
+                  icon: sh-argo-cd.svg
                   description: Argo Rollouts
                   href: https://argo-rollouts-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://argo-rollouts-dashboard.argo-rollouts:3100
                   statusStyle: dot
                   namespace: argocd
               - Workflows:
-                  icon: argocd.png
+                  icon: sh-argo-cd.svg
                   description: Argo Workflows
                   href: https://argo-workflows-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://argo-workflows-server.argo-workflows:2746
@@ -324,13 +324,13 @@ homepage:
                   siteMonitor: http://hubble-ui.kube-system:80
                   statusStyle: dot
               - Dashboard:
-                  icon: grafana.png
+                  icon: sh-grafana.svg
                   description: Grafana
                   href: https://grafana-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: https://grafana.grafana:80
                   statusStyle: dot
               - Metrics:
-                  icon: prometheus.png
+                  icon: sh-prometheus.svg
                   description: Prometheus
                   href: https://prometheus-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://kube-prometheus-stack-prometheus.kube-prometheus-stack:9090
@@ -339,44 +339,44 @@ homepage:
                     type: prometheus
                     url: http://kube-prometheus-stack-prometheus.kube-prometheus-stack:9090
               - Alerts:
-                  icon: alertmanager.png
+                  icon: sh-prometheus.svg
                   description: Alertmanager
                   href: https://alertmanager-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://kube-prometheus-stack-alertmanager.kube-prometheus-stack:9093
                   statusStyle: dot
               - Tautulli:
-                  icon: tautulli.png
+                  icon: sh-tautulli.svg
                   description: Plex Monitoring
                   href: https://tautulli-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://tautulli.tautulli:80
                   statusStyle: dot
               - Jellystat:
-                  icon: jellystat.png
+                  icon: sh-jellystat.png
                   description: Jellyfin Monitoring
                   href: http://jellystat-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://jellystat.jellystat:80
                   statusStyle: dot
           - Services:
               - Auth (Public):
-                  icon: authentik.png
+                  icon: sh-authentik.svg
                   description: Authentik
                   href: https://auth.alexlebens.dev
                   siteMonitor: https://auth.alexlebens.dev
                   statusStyle: dot
               - Auth (Internal):
-                  icon: authentik.png
+                  icon: sh-authentik.svg
                   description: Authentik
                   href: https://auth-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://authentik-server.authentik:80
                   statusStyle: dot
               - Email:
-                  icon: https://raw.githubusercontent.com/stalwartlabs/website/main/static/img/logo.png
+                  icon: sh-stalwart-mail-server.svg
                   description: Stalwart
                   href: https://stalwart-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://stalwart.stalwart:80
                   statusStyle: dot
               - Reverse Proxy (cl01tl):
-                  icon: traefik.png
+                  icon: sh-traefik.svg
                   description: Traefik
                   href: https://traefik-cl01tl.alexlebens.net/dashboard/#/
                   siteMonitor: https://traefik-cl01tl.alexlebens.net/dashboard/#/
@@ -385,32 +385,32 @@ homepage:
                     type: traefik
                     url: https://traefik-cl01tl.alexlebens.net
               - Reverse Proxy (ps10rp):
-                  icon: traefik.png
+                  icon: sh-traefik.svg
                   description: Traefik
                   href: https://traefik-ps10rp.lebens-home.net/dashboard/#/
                   siteMonitor: https://traefik-ps10rp.lebens-home.net/dashboard/#/
                   statusStyle: dot
           - Hardware:
               - Network Management (alexlebens.net):
-                  icon: unifi.png
+                  icon: sh-ubiquiti-unifi.svg
                   description: Unifi
                   href: https://unifi.alexlebens.net
                   siteMonitor: https://unifi.alexlebens.net
                   statusStyle: dot
               - Network Management (lebens-home.net):
-                  icon: unifi.png
+                  icon: sh-ubiquiti-unifi.svg
                   description: Unifi
                   href: https://unifi.lebens-home.net
                   siteMonitor: https://unifi.lebens-home.net
                   statusStyle: dot
               - Host Management (ps10rp):
-                  icon: cockpit.png
+                  icon: sh-cockpit-light.svg
                   description: Cockpit
                   href: https://cockpit-ps10rp.lebens-home.net:9090
                   siteMonitor: https://cockpit-ps10rp.lebens-home.net:9090
                   statusStyle: dot
               - Network Attached Storage:
-                  icon: synology.png
+                  icon: sh-synology-light.svg
                   description: Synology
                   href: https://synology.alexlebens.net
                   siteMonitor: https://synology.alexlebens.net
@@ -422,7 +422,7 @@ homepage:
                     password: {{ "{{HOMEPAGE_VAR_SYNOLOGY_PASSWORD}}" }}
                     volume: volume_2
               - TV Tuner:
-                  icon: hdhomerun.png
+                  icon: sh-hdhomerun.svg
                   description: HD Homerun
                   href: http://hdhr.alexlebens.net
                   siteMonitor: http://hdhr.alexlebens.net
@@ -459,32 +459,32 @@ homepage:
                   siteMonitor: http://vault.vault:8200
                   statusStyle: dot
               - Object Storage (Outline):
-                  icon: minio.png
+                  icon: sh-minio.svg
                   description: Minio Tenant
                   href: https://minio-outline-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://minio-outline-console.outline:9090
                   statusStyle: dot
               - Object Storage (Penpot):
-                  icon: minio.png
+                  icon: sh-minio.svg
                   description: Minio Tenant
                   href: https://minio-penpot-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://minio-penpot-console.penpot:9090
                   statusStyle: dot
               - Object Storage (Directus):
-                  icon: minio.png
+                  icon: sh-minio.svg
                   description: Minio Tenant
                   href: https://minio-directus-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://minio-directus-console.directus:9090
                   statusStyle: dot
               - Object Storage (Ryot):
-                  icon: minio.png
+                  icon: sh-minio.svg
                   description: Minio Tenant
                   href: https://minio-ryot-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://minio-ryot-console.ryot:9090
                   statusStyle: dot
           - Sonarr:
               - Sonarr:
-                  icon: sonarr.png
+                  icon: sh-sonarr.svg
                   description: TV Shows
                   href: https://sonarr-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://sonarr4.sonarr4:80
@@ -496,7 +496,7 @@ homepage:
                     fields: ["wanted", "queued", "series"]
                     enableQueue: false
               - Sonarr 4K:
-                  icon: sonarr.png
+                  icon: sh-sonarr.svg
                   description: TV Shows 4K
                   href: https://sonarr-4k-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://sonarr4-4k.sonarr4-4k:80
@@ -509,7 +509,7 @@ homepage:
                     enableQueue: false
           - Radarr:
               - Radarr:
-                  icon: radarr.png
+                  icon: sh-radarr.svg
                   description: Movies
                   href: https://radarr-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://radarr5.radarr5:80
@@ -521,7 +521,7 @@ homepage:
                     fields: ["wanted", "queued", "movies"]
                     enableQueue: false
               - Radarr 4K:
-                  icon: radarr.png
+                  icon: sh-radarr.svg
                   description: Movies 4K
                   href: https://radarr-4k-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://radarr5-4k.radarr5-4k:80
@@ -534,7 +534,7 @@ homepage:
                     enableQueue: false
           - Other:
               - Lidarr:
-                  icon: lidarr.png
+                  icon: sh-lidarr.svg
                   description: Music
                   href: https://lidarr-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://lidarr2.lidarr2:80
@@ -545,7 +545,7 @@ homepage:
                     key: {{ "{{HOMEPAGE_VAR_LIDARR2_KEY}}" }}
                     fields: ["wanted", "queued", "artists"]
               - Readarr Books:
-                  icon: readarr.png
+                  icon: sh-readarr.svg
                   description: Books
                   href: https://readarr-books-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://readarr-books.readarr-books:80
@@ -557,14 +557,14 @@ homepage:
                     fields: ["wanted", "queued", "books"]
                     enableQueue: false
               - Readarr Audiobooks:
-                  icon: readarr.png
+                  icon: sh-readarr.svg
                   description: Audiobooks
                   href: https://readarr-audiobooks-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://readarr-audiobooks.readarr-audiobooks:80
                   statusStyle: dot
           - Services (Servarr):
               - qBittorrent:
-                  icon: qbittorrent.png
+                  icon: sh-qbittorrent.svg
                   description: P2P Downloads
                   href: https://qbittorrent-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://qbittorrent.qbittorrent:8080
@@ -573,7 +573,7 @@ homepage:
                     type: qbittorrent
                     url: http://qbittorrent.qbittorrent:8080
               - Tdarr:
-                  icon: tdarr.png
+                  icon: sh-tdarr.png
                   description: Media transcoding and health checks
                   href: https://tdarr-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://tdarr-web.tdarr:8265
@@ -582,7 +582,7 @@ homepage:
                     type: tdarr
                     url: http://tdarr-web.tdarr:8265
               - Prowlarr:
-                  icon: prowlarr.png
+                  icon: prowlarr.svg
                   description: Indexers
                   href: https://prowlarr-cl01tl.boreal-beaufort.ts.net
                   siteMonitor: http://prowlarr.prowlarr:80