diff --git a/frontend/public/json/babybuddy.json b/frontend/public/json/babybuddy.json
index ee4f3e7..2524e08 100644
--- a/frontend/public/json/babybuddy.json
+++ b/frontend/public/json/babybuddy.json
@@ -11,7 +11,7 @@
   "interface_port": 80,
   "documentation": "https://docs.baby-buddy.net/",
   "website": "https://github.com/babybuddy/babybuddy",
-  "logo": "https://raw.githubusercontent.com/selfhst/icons/refs/heads/main/svg/baby-buddy.svg",
+  "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/webp/baby-buddy.webp",
   "config_path": "/opt/babybuddy/babybuddy/production.py",
   "description": "Baby Buddy is an open-source web application designed to assist caregivers in tracking various aspects of a baby's daily routine, including sleep, feedings, diaper changes, tummy time, and more. By recording this data, caregivers can better understand and anticipate their baby's needs, reducing guesswork in daily care. The application offers a user-friendly dashboard for data entry and visualization, supports multiple users, and provides features like timers and reminders. Additionally, Baby Buddy can be integrated with platforms like Home Assistant and Grafana for enhanced functionality.",
   "install_methods": [
diff --git a/frontend/public/json/backrest.json b/frontend/public/json/backrest.json
index a3e643d..bd3dc64 100644
--- a/frontend/public/json/backrest.json
+++ b/frontend/public/json/backrest.json
@@ -1,40 +1,40 @@
 {
-    "name": "Backrest",
-    "slug": "backrest",
-    "categories": [
-        7
-    ],
-    "date_created": "2025-05-11",
-    "type": "ct",
-    "updateable": true,
-    "privileged": false,
-    "interface_port": 9898,
-    "documentation": "https://garethgeorge.github.io/backrest/introduction/getting-started",
-    "website": "https://garethgeorge.github.io/backrest",
-    "logo": "https://raw.githubusercontent.com/selfhst/icons/refs/heads/main/svg/backrest-light.svg",
-    "config_path": "/opt/backrest/config/config.json",
-    "description": "Backrest is a web-accessible backup solution built on top of restic and providing a WebUI which wraps the restic CLI and makes it easy to create repos, browse snapshots, and restore files. Additionally, Backrest can run in the background and take an opinionated approach to scheduling snapshots and orchestrating repo health operations.",
-    "install_methods": [
-        {
-            "type": "default",
-            "script": "ct/backrest.sh",
-            "resources": {
-                "cpu": 1,
-                "ram": 512,
-                "hdd": 8,
-                "os": "debian",
-                "version": "12"
-            }
-        }
-    ],
-    "default_credentials": {
-        "username": null,
-        "password": null
-    },
-    "notes": [
-        {
-            "type": "info",
-            "text": "`cat ~/.ssh/id_ed25519.pub` to view ssh public key. This key is used to authenticate with sftp targets. You can add this key on the sftp server."
-        }
-    ]
-}
\ No newline at end of file
+  "name": "Backrest",
+  "slug": "backrest",
+  "categories": [
+    7
+  ],
+  "date_created": "2025-05-11",
+  "type": "ct",
+  "updateable": true,
+  "privileged": false,
+  "interface_port": 9898,
+  "documentation": "https://garethgeorge.github.io/backrest/introduction/getting-started",
+  "website": "https://garethgeorge.github.io/backrest",
+  "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/webp/backrest.webp",
+  "config_path": "/opt/backrest/config/config.json",
+  "description": "Backrest is a web-accessible backup solution built on top of restic and providing a WebUI which wraps the restic CLI and makes it easy to create repos, browse snapshots, and restore files. Additionally, Backrest can run in the background and take an opinionated approach to scheduling snapshots and orchestrating repo health operations.",
+  "install_methods": [
+    {
+      "type": "default",
+      "script": "ct/backrest.sh",
+      "resources": {
+        "cpu": 1,
+        "ram": 512,
+        "hdd": 8,
+        "os": "debian",
+        "version": "12"
+      }
+    }
+  ],
+  "default_credentials": {
+    "username": null,
+    "password": null
+  },
+  "notes": [
+    {
+      "type": "info",
+      "text": "`cat ~/.ssh/id_ed25519.pub` to view ssh public key. This key is used to authenticate with sftp targets. You can add this key on the sftp server."
+    }
+  ]
+}
diff --git a/frontend/public/json/cloudflare-ddns.json b/frontend/public/json/cloudflare-ddns.json
index 55e0acd..1b4488e 100644
--- a/frontend/public/json/cloudflare-ddns.json
+++ b/frontend/public/json/cloudflare-ddns.json
@@ -12,7 +12,7 @@
   "documentation": "https://github.com/favonia/cloudflare-ddns/blob/main/README.markdown",
   "config_path": "/etc/systemd/system/cloudflare-ddns.service",
   "website": "https://github.com/favonia/cloudflare-ddns",
-  "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/svg/cloudflare.svg",
+  "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/webp/cloudflare.webp",
   "description": "A feature-rich and robust Cloudflare DDNS updater with a small footprint. The program will detect your machine’s public IP addresses and update DNS records using the Cloudflare API",
   "install_methods": [
     {
@@ -41,4 +41,4 @@
       "type": "info"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/frontend/public/json/configarr.json b/frontend/public/json/configarr.json
index 964c974..7046142 100644
--- a/frontend/public/json/configarr.json
+++ b/frontend/public/json/configarr.json
@@ -1,40 +1,40 @@
 {
-    "name": "Configarr",
-    "slug": "configarr",
-    "categories": [
-        14
-    ],
-    "date_created": "2025-05-06",
-    "type": "ct",
-    "updateable": true,
-    "privileged": false,
-    "interface_port": null,
-    "documentation": "https://configarr.raydak.de/docs/intro",
-    "config_path": "/opt/configarr/config.yml",
-    "website": "https://configarr.raydak.de/",
-    "logo": "https://github.com/raydak-labs/configarr/blob/main/docs/static/img/logo.webp",
-    "description": "Configarr is an open-source tool designed to simplify configuration and synchronization for Sonarr and Radarr (and other experimental). It integrates with TRaSH Guides to automate updates of custom formats, quality profiles, and other settings, while also supporting user-defined configurations.",
-    "install_methods": [
-        {
-            "type": "default",
-            "script": "ct/configarr.sh",
-            "resources": {
-                "cpu": 1,
-                "ram": 512,
-                "hdd": 4,
-                "os": "Debian",
-                "version": "12"
-            }
-        }
-    ],
-    "default_credentials": {
-        "username": null,
-        "password": null
-    },
-    "notes": [
-        {
-            "text": "change secrets file /opt/configarr/secrets.yml",
-            "type": "info"
-        }
-    ]
+  "name": "Configarr",
+  "slug": "configarr",
+  "categories": [
+    14
+  ],
+  "date_created": "2025-05-06",
+  "type": "ct",
+  "updateable": true,
+  "privileged": false,
+  "interface_port": 8989,
+  "documentation": "https://configarr.raydak.de/docs/intro",
+  "config_path": "/opt/configarr/config.yml",
+  "website": "https://configarr.raydak.de/",
+  "logo": "https://github.com/raydak-labs/configarr/blob/main/docs/static/img/logo.webp",
+  "description": "Configarr is an open-source tool designed to simplify configuration and synchronization for Sonarr and Radarr (and other experimental). It integrates with TRaSH Guides to automate updates of custom formats, quality profiles, and other settings, while also supporting user-defined configurations.",
+  "install_methods": [
+    {
+      "type": "default",
+      "script": "ct/configarr.sh",
+      "resources": {
+        "cpu": 1,
+        "ram": 512,
+        "hdd": 4,
+        "os": "Debian",
+        "version": "12"
+      }
+    }
+  ],
+  "default_credentials": {
+    "username": null,
+    "password": null
+  },
+  "notes": [
+    {
+      "text": "change secrets file /opt/configarr/secrets.yml",
+      "type": "info"
+    }
+  ]
 }
diff --git a/frontend/public/json/garmin-grafana.json b/frontend/public/json/garmin-grafana.json
index d9a9283..eae4ed0 100644
--- a/frontend/public/json/garmin-grafana.json
+++ b/frontend/public/json/garmin-grafana.json
@@ -1,44 +1,44 @@
 {
-    "name": "garmin-grafana",
-    "slug": "garmin-grafana",
-    "categories": [
-        24
-    ],
-    "date_created": "2025-05-08",
-    "type": "ct",
-    "updateable": true,
-    "privileged": false,
-    "interface_port": 3000,
-    "documentation": "https://github.com/arpanghosh8453/garmin-grafana",
-    "config_path": "",
-    "website": "https://github.com/arpanghosh8453/garmin-grafana",
-    "logo": "https://github.com/arpanghosh8453/garmin-grafana/raw/refs/heads/main/Extra/Garmin-Grafana-Logo.svg",
-    "description": "A docker container to fetch data from Garmin servers and store the data in a local influxdb database for appealing visualization with Grafana.",
-    "install_methods": [
-        {
-            "type": "default",
-            "script": "ct/garmin-grafana.sh",
-            "resources": {
-                "cpu": 2,
-                "ram": 2,
-                "hdd": 8,
-                "os": "Debian",
-                "version": "12"
-            }
-        }
-    ],
-    "default_credentials": {
-        "username": null,
-        "password": null
+  "name": "garmin-grafana",
+  "slug": "garmin-grafana",
+  "categories": [
+    24
+  ],
+  "date_created": "2025-05-08",
+  "type": "ct",
+  "updateable": true,
+  "privileged": false,
+  "interface_port": 3000,
+  "documentation": "https://github.com/arpanghosh8453/garmin-grafana",
+  "config_path": "",
+  "website": "https://github.com/arpanghosh8453/garmin-grafana",
+  "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/webp/garmin-grafana.webp",
+  "description": "A docker container to fetch data from Garmin servers and store the data in a local influxdb database for appealing visualization with Grafana.",
+  "install_methods": [
+    {
+      "type": "default",
+      "script": "ct/garmin-grafana.sh",
+      "resources": {
+        "cpu": 2,
+        "ram": 2,
+        "hdd": 8,
+        "os": "Debian",
+        "version": "12"
+      }
+    }
+  ],
+  "default_credentials": {
+    "username": null,
+    "password": null
+  },
+  "notes": [
+    {
+      "text": "Show login and database credentials:  `cat ~/.garmin-grafana.creds`",
+      "type": "info"
     },
-    "notes": [
-        {
-            "text": "Show login and database credentials:  `cat ~/.garmin-grafana.creds`",
-            "type": "info"
-        },
-        {
-            "text": "`garmin-grafana` only imports the past 7 days by default. To import historical data, use the `~/bulk-import.sh` script after installation.",
-            "type": "info"
-        }
-    ]
+    {
+      "text": "`garmin-grafana` only imports the past 7 days by default. To import historical data, use the `~/bulk-import.sh` script after installation.",
+      "type": "info"
+    }
+  ]
 }
diff --git a/frontend/public/json/homarr.json b/frontend/public/json/homarr.json
deleted file mode 100644
index 323153b..0000000
--- a/frontend/public/json/homarr.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "name": "Homarr",
-  "slug": "homarr",
-  "categories": [
-    10
-  ],
-  "date_created": "2025-05-08",
-  "type": "ct",
-  "updateable": true,
-  "privileged": false,
-  "interface_port": 7575,
-  "documentation": null,
-  "website": "https://homarr.dev/",
-  "logo": "https://raw.githubusercontent.com/loganmarchione/homelab-svg-assets/main/assets/homarr.svg",
-  "config_path": "/opt/homarr/.env",
-  "description": "Homarr is a sleek, modern dashboard that puts all of your apps and services at your fingertips.",
-  "install_methods": [
-    {
-      "type": "default",
-      "script": "ct/homarr.sh",
-      "resources": {
-        "cpu": 2,
-        "ram": 4096,
-        "hdd": 8,
-        "os": "debian",
-        "version": "12"
-      }
-    }
-  ],
-  "default_credentials": {
-    "username": null,
-    "password": null
-  },
-  "notes": []
-}
diff --git a/frontend/public/json/immich.json b/frontend/public/json/immich.json
index 1a07752..2a5245f 100644
--- a/frontend/public/json/immich.json
+++ b/frontend/public/json/immich.json
@@ -11,7 +11,7 @@
   "interface_port": 2283,
   "documentation": "https://immich.app/docs/overview/introduction",
   "website": "https://immich.app",
-  "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/png/immich.png",
+  "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/webp/immich.webp",
   "config_path": "/opt/immich/.env",
   "description": "High performance self-hosted photo and video management solution.",
   "install_methods": [
@@ -38,4 +38,3 @@
     }
   ]
 }
-
diff --git a/frontend/public/json/kasm.json b/frontend/public/json/kasm.json
index 6a2e7f8..5f37de4 100644
--- a/frontend/public/json/kasm.json
+++ b/frontend/public/json/kasm.json
@@ -1,44 +1,44 @@
 {
-    "name": "Kasm",
-    "slug": "kasm",
-    "categories": [
-        9
-    ],
-    "date_created": "2025-03-24",
-    "type": "ct",
-    "updateable": false,
-    "privileged": true,
-    "config_path": "",
-    "interface_port": 443,
-    "documentation": "https://www.kasmweb.com/docs/",
-    "website": "https://www.kasmweb.com/",
-    "logo": "https://raw.githubusercontent.com/selfhst/icons/refs/heads/main/svg/kasm.svg",
-    "description": "Kasm Workspaces is a container streaming platform that delivers browser-based access to desktops, applications, and web services with enhanced security and scalability.",
-    "install_methods": [
-        {
-            "type": "default",
-            "script": "ct/kasm.sh",
-            "resources": {
-                "cpu": 2,
-                "ram": 4096,
-                "hdd": 50,
-                "os": "Debian",
-                "version": "12"
-            }
-        }
-    ],
-    "default_credentials": {
-        "username": null,
-        "password": null
+  "name": "Kasm",
+  "slug": "kasm",
+  "categories": [
+    9
+  ],
+  "date_created": "2025-03-24",
+  "type": "ct",
+  "updateable": false,
+  "privileged": true,
+  "config_path": "",
+  "interface_port": 443,
+  "documentation": "https://www.kasmweb.com/docs/",
+  "website": "https://www.kasmweb.com/",
+  "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/webp/kasm-workspaces.webp",
+  "description": "Kasm Workspaces is a container streaming platform that delivers browser-based access to desktops, applications, and web services with enhanced security and scalability.",
+  "install_methods": [
+    {
+      "type": "default",
+      "script": "ct/kasm.sh",
+      "resources": {
+        "cpu": 2,
+        "ram": 4096,
+        "hdd": 50,
+        "os": "Debian",
+        "version": "12"
+      }
+    }
+  ],
+  "default_credentials": {
+    "username": null,
+    "password": null
+  },
+  "notes": [
+    {
+      "text": "WARNING: Installation sources scripts outside of Community Scripts repo. Please check the source before installing.",
+      "type": "warning"
     },
-    "notes": [
-        {
-            "text": "WARNING: Installation sources scripts outside of Community Scripts repo. Please check the source before installing.",
-            "type": "warning"
-        },
-        {
-            "text": "Show password: `cat ~/kasm.creds`",
-            "type": "info"
-        }
-    ]
+    {
+      "text": "Show password: `cat ~/kasm.creds`",
+      "type": "info"
+    }
+  ]
 }
diff --git a/frontend/public/json/librenms.json b/frontend/public/json/librenms.json
index ae373b6..39f738c 100644
--- a/frontend/public/json/librenms.json
+++ b/frontend/public/json/librenms.json
@@ -11,7 +11,7 @@
   "interface_port": 80,
   "documentation": "https://docs.librenms.org/",
   "website": "https://librenms.org/",
-  "logo": "https://raw.githubusercontent.com/selfhst/icons/refs/heads/main/svg/librenms.svg",
+  "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/webp/librenms.webp",
   "config_path": "/opt/librenms/config.php and /opt/librenms/.env",
   "description": "LibreNMS is an open-source, community-driven network monitoring system that provides automatic discovery, alerting, and performance tracking for network devices. It supports a wide range of hardware and integrates with various notification and logging platforms.",
   "install_methods": [
@@ -33,4 +33,3 @@
   },
   "notes": []
 }
-
diff --git a/frontend/public/json/librespeed.json b/frontend/public/json/librespeed.json
index f651f2c..713b2fe 100644
--- a/frontend/public/json/librespeed.json
+++ b/frontend/public/json/librespeed.json
@@ -1,35 +1,35 @@
 {
-    "name": "Librespeed",
-    "slug": "librespeed",
-    "categories": [
-        4
-    ],
-    "date_created": "2025-04-26",
-    "type": "ct",
-    "updateable": true,
-    "privileged": false,
-    "interface_port": 80,
-    "documentation": "https://github.com/librespeed/speedtest/blob/master/doc.md",
-    "config_path": "",
-    "website": "https://librespeed.org",
-    "logo": "https://raw.githubusercontent.com/selfhst/icons/refs/heads/main/svg/librespeed.svg",
-    "description": "No Flash, No Java, No Websocket, No Bullshit. This is a very lightweight speed test implemented in Javascript, using XMLHttpRequest and Web Workers.",
-    "install_methods": [
-        {
-            "type": "default",
-            "script": "ct/librespeed.sh",
-            "resources": {
-                "cpu": 1,
-                "ram": 512,
-                "hdd": 4,
-                "os": "Debian",
-                "version": "12"
-            }
-        }
-    ],
-    "default_credentials": {
-        "username": "root",
-        "password": null
-    },
-    "notes": []
+  "name": "Librespeed",
+  "slug": "librespeed",
+  "categories": [
+    4
+  ],
+  "date_created": "2025-04-26",
+  "type": "ct",
+  "updateable": true,
+  "privileged": false,
+  "interface_port": 80,
+  "documentation": "https://github.com/librespeed/speedtest/blob/master/doc.md",
+  "config_path": "",
+  "website": "https://librespeed.org",
+  "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/webp/librespeed.webp",
+  "description": "No Flash, No Java, No Websocket, No Bullshit. This is a very lightweight speed test implemented in Javascript, using XMLHttpRequest and Web Workers.",
+  "install_methods": [
+    {
+      "type": "default",
+      "script": "ct/librespeed.sh",
+      "resources": {
+        "cpu": 1,
+        "ram": 512,
+        "hdd": 4,
+        "os": "Debian",
+        "version": "12"
+      }
+    }
+  ],
+  "default_credentials": {
+    "username": "root",
+    "password": null
+  },
+  "notes": []
 }
diff --git a/frontend/public/json/manyfold.json b/frontend/public/json/manyfold.json
index 512963b..bb23266 100644
--- a/frontend/public/json/manyfold.json
+++ b/frontend/public/json/manyfold.json
@@ -1,36 +1,35 @@
 {
-    "name": "Manyfold",
-    "slug": "manyfold",
-    "categories": [
-        24
-    ],
-    "date_created": "2025-03-18",
-    "type": "ct",
-    "updateable": false,
-    "privileged": false,
-    "interface_port": 80,
-    "documentation": "https://manyfold.app/sysadmin/",
-    "website": "https://manyfold.app/",
-    "logo": "https://raw.githubusercontent.com/selfhst/icons/refs/heads/main/webp/manyfold.webp",
-    "config_path": "",
-    "description": "Manyfold is an open source, self-hosted web application for managing a collection of 3d models, particularly focused on 3d printing.",
-    "install_methods": [
-        {
-            "type": "default",
-            "script": "ct/manyfold.sh",
-            "resources": {
-                "cpu": 2,
-                "ram": 1024,
-                "hdd": 15,
-                "os": "debian",
-                "version": "12"
-            }
-        }
-    ],
-    "default_credentials": {
-        "username": null,
-        "password": null
-    },
-    "notes": []
+  "name": "Manyfold",
+  "slug": "manyfold",
+  "categories": [
+    24
+  ],
+  "date_created": "2025-03-18",
+  "type": "ct",
+  "updateable": false,
+  "privileged": false,
+  "interface_port": 80,
+  "documentation": "https://manyfold.app/sysadmin/",
+  "website": "https://manyfold.app/",
+  "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/webp/manyfold.webp",
+  "config_path": "",
+  "description": "Manyfold is an open source, self-hosted web application for managing a collection of 3d models, particularly focused on 3d printing.",
+  "install_methods": [
+    {
+      "type": "default",
+      "script": "ct/manyfold.sh",
+      "resources": {
+        "cpu": 2,
+        "ram": 1024,
+        "hdd": 15,
+        "os": "debian",
+        "version": "12"
+      }
+    }
+  ],
+  "default_credentials": {
+    "username": null,
+    "password": null
+  },
+  "notes": []
 }
-
diff --git a/frontend/public/json/polaris.json b/frontend/public/json/polaris.json
index 11edceb..8f63da5 100644
--- a/frontend/public/json/polaris.json
+++ b/frontend/public/json/polaris.json
@@ -11,7 +11,7 @@
   "interface_port": 80,
   "documentation": "https://github.com/agersant/polaris/blob/master/docs/SETUP.md",
   "website": "https://github.com/agersant/polaris",
-  "logo": "https://raw.githubusercontent.com/agersant/polaris/refs/heads/master/res/branding/logo/sticker_print.svg",
+  "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/webp/polaris.webp",
   "config_path": "",
   "description": "Polaris is a self-hosted music streaming server that allows you to enjoy your personal music collection from any computer or mobile device. It is a free and open-source application with no premium version. Polaris is highly performant and responsive, supporting large music libraries with over 100,000 tracks. It features an intuitive user interface and supports various audio formats, including FLAC, MP3, MP4, OGG, and WAV. There is an Android client available through the Google Play Store, F-Droid, or GitHub Releases.",
   "install_methods": [
diff --git a/frontend/public/json/rclone.json b/frontend/public/json/rclone.json
deleted file mode 100644
index 7ddf697..0000000
--- a/frontend/public/json/rclone.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "name": "Rclone",
-  "slug": "rclone",
-  "categories": [
-    11
-  ],
-  "date_created": "2025-05-06",
-  "type": "ct",
-  "updateable": true,
-  "privileged": false,
-  "interface_port": 3000,
-  "documentation": "https://rclone.org/docs/",
-  "website": "https://rclone.org/",
-  "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/svg/rclone.svg",
-  "config_path": "~/.config/rclone/rclone.conf",
-  "description": "Rclone is a command-line program to manage files on cloud storage. It is a feature-rich alternative to cloud vendors' web storage interfaces",
-  "install_methods": [
-    {
-      "type": "default",
-      "script": "ct/rclone.sh",
-      "resources": {
-        "cpu": 1,
-        "ram": 256,
-        "hdd": 1,
-        "os": "debian",
-        "version": "12"
-      }
-    }
-  ],
-  "default_credentials": {
-    "username": null,
-    "password": null
-  },
-  "notes": [
-    {
-      "type": "info",
-      "text": "`cat ~/rclone.creds` to view login credentials"
-    },
-    {
-      "type": "info",
-      "text": "`htpasswd -b -B /opt/login.pwd newuser newuserpassword` to add more users."
-    }
-  ]
-}