diff --git a/argocd/manifests/argocd/service-tailscale.yaml b/argocd/manifests/argocd/service-tailscale.yaml
index fa12f0b..d75b326 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-#EF7B4D"
+    gethomepage.dev/icon: "argocd.png"
     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 0a8e9de..08a13ed 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-#3775A9"
+    gethomepage.dev/icon: "pypi.png"
     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 c1f06ef..23603ba 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-#F46800"
+    gethomepage.dev/icon: "grafana.png"
     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 0c2f170..147fa06 100644
--- a/argocd/manifests/homepage/values.yaml
+++ b/argocd/manifests/homepage/values.yaml
@@ -88,14 +88,10 @@ config:
     headerStyle: boxed
     layout:
       Host Services:
-        style: row
-        columns: 3
+        style: column
       Apps:
-        style: row
-        columns: 4
+        style: column
       Observability:
-        style: row
-        columns: 3
+        style: column
       Infrastructure:
-        style: row
-        columns: 2
+        style: column
diff --git a/argocd/manifests/immich/ingress-tailscale.yaml b/argocd/manifests/immich/ingress-tailscale.yaml
index dc2b2b8..31c7858 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-#4250AF"
+    gethomepage.dev/icon: "immich.png"
     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/kiwix/ingress-tailscale.yaml b/argocd/manifests/kiwix/ingress-tailscale.yaml
index 1b05405..c3aeb4c 100644
--- a/argocd/manifests/kiwix/ingress-tailscale.yaml
+++ b/argocd/manifests/kiwix/ingress-tailscale.yaml
@@ -9,7 +9,7 @@ metadata:
     gethomepage.dev/enabled: "true"
     gethomepage.dev/name: "Kiwix"
     gethomepage.dev/group: "Apps"
-    gethomepage.dev/icon: "mdi-wikipedia"
+    gethomepage.dev/icon: "kiwix.png"
     gethomepage.dev/description: "Offline Wikipedia"
     gethomepage.dev/href: "https://kiwix.ops.eblu.me"
     gethomepage.dev/pod-selector: "app=kiwix"
diff --git a/argocd/manifests/miniflux/ingress-tailscale.yaml b/argocd/manifests/miniflux/ingress-tailscale.yaml
index c67cdc5..ad7de3f 100644
--- a/argocd/manifests/miniflux/ingress-tailscale.yaml
+++ b/argocd/manifests/miniflux/ingress-tailscale.yaml
@@ -8,7 +8,7 @@ metadata:
     gethomepage.dev/enabled: "true"
     gethomepage.dev/name: "Miniflux"
     gethomepage.dev/group: "Apps"
-    gethomepage.dev/icon: "mdi-rss"
+    gethomepage.dev/icon: "miniflux.png"
     gethomepage.dev/description: "RSS reader"
     gethomepage.dev/href: "https://feed.ops.eblu.me"
     gethomepage.dev/pod-selector: "app=miniflux"
diff --git a/argocd/manifests/prometheus/ingress-tailscale.yaml b/argocd/manifests/prometheus/ingress-tailscale.yaml
index 3bc6ee8..45b88a7 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-#E6522C"
+    gethomepage.dev/icon: "prometheus.png"
     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 755459f..2f10f2d 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-#CC0000"
+    gethomepage.dev/icon: "teslamate.png"
     gethomepage.dev/description: "Tesla data logger"
     gethomepage.dev/href: "https://tesla.ops.eblu.me"
     gethomepage.dev/pod-selector: "app=teslamate"
diff --git a/argocd/manifests/torrent/ingress-tailscale.yaml b/argocd/manifests/torrent/ingress-tailscale.yaml
index c8bcba7..ac77e9c 100644
--- a/argocd/manifests/torrent/ingress-tailscale.yaml
+++ b/argocd/manifests/torrent/ingress-tailscale.yaml
@@ -9,7 +9,7 @@ metadata:
     gethomepage.dev/enabled: "true"
     gethomepage.dev/name: "Transmission"
     gethomepage.dev/group: "Apps"
-    gethomepage.dev/icon: "mdi-download"
+    gethomepage.dev/icon: "transmission.png"
     gethomepage.dev/description: "Torrent client"
     gethomepage.dev/href: "https://torrent.ops.eblu.me"
     gethomepage.dev/pod-selector: "app=transmission"