diff --git a/src/components/LinkItems/Collapsable.vue b/src/components/LinkItems/Collapsable.vue
index e67b0042..0e6dd567 100644
--- a/src/components/LinkItems/Collapsable.vue
+++ b/src/components/LinkItems/Collapsable.vue
@@ -11,7 +11,7 @@
         tabIndex="-1"
     >
     <label :for="`collapsible-${uniqueKey}`" class="lbl-toggle" tabindex="-1">
-      <Icon v-if="icon" :icon="icon" size="small" class="section-icon" />
+      <Icon v-if="icon" :icon="icon" size="small" :url="title" class="section-icon" />
       <h3>{{ title }}</h3>
     </label>
     <div class="collapsible-content">
diff --git a/src/components/LinkItems/ItemIcon.vue b/src/components/LinkItems/ItemIcon.vue
index 8dfd1a7d..fe2a756b 100644
--- a/src/components/LinkItems/ItemIcon.vue
+++ b/src/components/LinkItems/ItemIcon.vue
@@ -11,9 +11,11 @@
 <script>
 import BrokenImage from '@/assets/interface-icons/broken-icon.svg';
 import ErrorHandler from '@/utils/ErrorHandler';
+import { faviconApi as defaultFaviconApi, faviconApiEndpoints } from '@/utils/defaults';
 
 export default {
   name: 'Icon',
+  inject: ['config'],
   props: {
     icon: String, // Path to icon asset
     url: String, // Used for fetching the favicon
@@ -33,6 +35,7 @@ export default {
   data() {
     return {
       broken: false,
+      // faviconApi: this.config.appConfig.faviconApi || defaultFaviconApi,
     };
   },
   methods: {
@@ -51,26 +54,36 @@ export default {
     },
     /* Get favicon URL, for items which use the favicon as their icon */
     getFavicon(fullUrl) {
-      const isLocalIP = /(127\.)|(192\.168\.)|(10\.)|(172\.1[6-9]\.)|(172\.2[0-9]\.)|(172\.3[0-1]\.)|(::1$)|([fF][cCdD])|(localhost)/;
-      if (isLocalIP.test(fullUrl)) { // Check if using a local IP format or localhost
+      if (this.shouldUseDefaultFavicon(fullUrl)) { // Check if we should use local icon
         const urlParts = fullUrl.split('/');
-        // For locally running services, use the default path for favicon
         if (urlParts.length >= 2) return `${urlParts[0]}/${urlParts[1]}/${urlParts[2]}/favicon.ico`;
-      } else if (fullUrl.includes('http')) {
-        // For publicly accessible sites, a more reliable method is using Google's API
-        return `https://s2.googleusercontent.com/s2/favicons?domain=${fullUrl}`;
+      } else if (fullUrl.includes('http')) { // Service is running publicly
+        const host = this.getHostName(fullUrl);
+        const faviconApi = this.config.appConfig.faviconApi || defaultFaviconApi;
+        const endpoint = faviconApiEndpoints[faviconApi];
+        return endpoint.replace('$URL', host);
       }
       return '';
     },
+    /* If using favicon for icon, and if service is running locally (determined by local IP) */
+    /* or if user prefers local favicon, then return true */
+    shouldUseDefaultFavicon(fullUrl) {
+      const isLocalIP = /(127\.)|(192\.168\.)|(10\.)|(172\.1[6-9]\.)|(172\.2[0-9]\.)|(172\.3[0-1]\.)|(::1$)|([fF][cCdD])|(localhost)/;
+      return (isLocalIP.test(fullUrl) || this.config.appConfig.faviconApi === 'local');
+    },
     getLocalImagePath(img) {
       return `/item-icons/${img}`;
     },
+    getGenerativeIcon(url) {
+      return `https://ipsicon.io/${this.getHostName(url)}.svg`;
+    },
     /* Checks if the icon is from a local image, remote URL, SVG or font-awesome */
     getIconPath(img, url) {
       switch (this.determineImageType(img)) {
         case 'url': return img;
         case 'img': return this.getLocalImagePath(img);
         case 'favicon': return this.getFavicon(url);
+        case 'generative': return this.getGenerativeIcon(url);
         case 'svg': return img;
         default: return '';
       }
@@ -84,9 +97,13 @@ export default {
       else if (this.isImage(img)) imgType = 'img';
       else if (img.includes('fa-')) imgType = 'font-awesome';
       else if (img === 'favicon') imgType = 'favicon';
+      else if (img === 'generative') imgType = 'generative';
       else imgType = 'none';
       return imgType;
     },
+    getHostName(url) {
+      try { return new URL(url).hostname; } catch (e) { return url; }
+    },
     /* Called when the path to the image cannot be resolved */
     imageNotFound() {
       this.broken = true;