diff --git a/argocd/manifests/argocd/service-tailscale.yaml b/argocd/manifests/argocd/service-tailscale.yaml
index 8722670..fa12f0b 100644
--- a/argocd/manifests/argocd/service-tailscale.yaml
+++ b/argocd/manifests/argocd/service-tailscale.yaml
@@ -14,7 +14,7 @@ metadata:
     gethomepage.dev/enabled: "true"
     gethomepage.dev/name: "ArgoCD"
     gethomepage.dev/group: "Infrastructure"
-    gethomepage.dev/icon: "si-argo"
+    gethomepage.dev/icon: "si-argo-#EF7B4D"
     gethomepage.dev/description: "GitOps CD"
     gethomepage.dev/href: "https://argocd.ops.eblu.me"
     gethomepage.dev/pod-selector: "app.kubernetes.io/name=argocd-server"
diff --git a/argocd/manifests/devpi/ingress-tailscale.yaml b/argocd/manifests/devpi/ingress-tailscale.yaml
index 00ed337..0a8e9de 100644
--- a/argocd/manifests/devpi/ingress-tailscale.yaml
+++ b/argocd/manifests/devpi/ingress-tailscale.yaml
@@ -8,7 +8,7 @@ metadata:
     gethomepage.dev/enabled: "true"
     gethomepage.dev/name: "PyPI"
     gethomepage.dev/group: "Infrastructure"
-    gethomepage.dev/icon: "si-pypi"
+    gethomepage.dev/icon: "si-pypi-#3775A9"
     gethomepage.dev/description: "PyPI cache"
     gethomepage.dev/href: "https://pypi.ops.eblu.me"
     gethomepage.dev/pod-selector: "app=devpi"
diff --git a/argocd/manifests/grafana-config/ingress-tailscale.yaml b/argocd/manifests/grafana-config/ingress-tailscale.yaml
index 8a0c3fd..c1f06ef 100644
--- a/argocd/manifests/grafana-config/ingress-tailscale.yaml
+++ b/argocd/manifests/grafana-config/ingress-tailscale.yaml
@@ -12,7 +12,7 @@ metadata:
     gethomepage.dev/enabled: "true"
     gethomepage.dev/name: "Grafana"
     gethomepage.dev/group: "Observability"
-    gethomepage.dev/icon: "si-grafana"
+    gethomepage.dev/icon: "si-grafana-#F46800"
     gethomepage.dev/description: "Metrics dashboards"
     gethomepage.dev/href: "https://grafana.ops.eblu.me"
     gethomepage.dev/pod-selector: "app.kubernetes.io/name=grafana"
diff --git a/argocd/manifests/homepage/values.yaml b/argocd/manifests/homepage/values.yaml
index 09e9c47..0c2f170 100644
--- a/argocd/manifests/homepage/values.yaml
+++ b/argocd/manifests/homepage/values.yaml
@@ -90,6 +90,12 @@ config:
       Host Services:
         style: row
         columns: 3
-      Admin:
+      Apps:
+        style: row
+        columns: 4
+      Observability:
         style: row
         columns: 3
+      Infrastructure:
+        style: row
+        columns: 2
diff --git a/argocd/manifests/immich/ingress-tailscale.yaml b/argocd/manifests/immich/ingress-tailscale.yaml
index a826928..dc2b2b8 100644
--- a/argocd/manifests/immich/ingress-tailscale.yaml
+++ b/argocd/manifests/immich/ingress-tailscale.yaml
@@ -11,7 +11,7 @@ metadata:
     gethomepage.dev/enabled: "true"
     gethomepage.dev/name: "Immich"
     gethomepage.dev/group: "Apps"
-    gethomepage.dev/icon: "si-immich"
+    gethomepage.dev/icon: "si-immich-#4250AF"
     gethomepage.dev/description: "Photo management"
     gethomepage.dev/href: "https://photos.ops.eblu.me"
     gethomepage.dev/pod-selector: "app.kubernetes.io/name=server"
diff --git a/argocd/manifests/prometheus/ingress-tailscale.yaml b/argocd/manifests/prometheus/ingress-tailscale.yaml
index 91a0a92..3bc6ee8 100644
--- a/argocd/manifests/prometheus/ingress-tailscale.yaml
+++ b/argocd/manifests/prometheus/ingress-tailscale.yaml
@@ -10,7 +10,7 @@ metadata:
     gethomepage.dev/enabled: "true"
     gethomepage.dev/name: "Prometheus"
     gethomepage.dev/group: "Observability"
-    gethomepage.dev/icon: "si-prometheus"
+    gethomepage.dev/icon: "si-prometheus-#E6522C"
     gethomepage.dev/description: "Metrics storage"
     gethomepage.dev/href: "https://prometheus.ops.eblu.me"
     gethomepage.dev/pod-selector: "app=prometheus"
diff --git a/argocd/manifests/teslamate/ingress-tailscale.yaml b/argocd/manifests/teslamate/ingress-tailscale.yaml
index 34e6f73..755459f 100644
--- a/argocd/manifests/teslamate/ingress-tailscale.yaml
+++ b/argocd/manifests/teslamate/ingress-tailscale.yaml
@@ -8,7 +8,7 @@ metadata:
     gethomepage.dev/enabled: "true"
     gethomepage.dev/name: "TeslaMate"
     gethomepage.dev/group: "Apps"
-    gethomepage.dev/icon: "si-tesla"
+    gethomepage.dev/icon: "si-tesla-#CC0000"
     gethomepage.dev/description: "Tesla data logger"
     gethomepage.dev/href: "https://tesla.ops.eblu.me"
     gethomepage.dev/pod-selector: "app=teslamate"