diff --git a/index.js b/index.js
index 8b7b5a2..4a669dd 100644
--- a/index.js
+++ b/index.js
@@ -81,42 +81,13 @@ app.use((req, res, next) => {
 });
 app.use("/custom-favicon", async (req, res) => {
   try {
-    const { url, contentType } = req.query;
-    const urlExt = url.split(".").pop();
-    const response = await fetch(url);
-    const arrayBuffer = await response.arrayBuffer();
-    const buffer = Buffer.from(arrayBuffer);
-    console.log(contentType);
-    if (contentType || !contentType == "") {
-      res.setHeader("Content-Type", contentType);
-    } else {
-      switch (urlExt) {
-        case "png":
-          res.setHeader("Content-Type", "image/png");
-          break;
-        case "jpg":
-          res.setHeader("Content-Type", "image/jpeg");
-          break;
-        case "jpeg":
-          res.setHeader("Content-Type", "image/jpeg");
-          break;
-        case "gif":
-          res.setHeader("Content-Type", "image/gif");
-          break;
-        case "svg":
-          res.setHeader("Content-Type", "image/svg+xml");
-          break;
-        case "ico":
-          res.setHeader("Content-Type", "image/x-icon");
-          break;
-        default:
-          res.setHeader("Content-Type", "image/png");
-          break;
-      }
-    }
+    const { url } = req.query;
+    const response = await fetch(`https://www.google.com/s2/favicons?domain=${url}&sz=128`);
+    const buffer = new Buffer.from(await response.arrayBuffer());
+    res.set("Content-Type", "image/png");
     res.send(buffer);
-  } catch (err) {
-    res.send(`Error: ${err}`);
+  } catch {
+    
   }
 });
 app.use("/", express.static("dist/client/"));
diff --git a/src/components/ProxyRegistrar.astro b/src/components/ProxyRegistrar.astro
index 2908fc0..1b08311 100644
--- a/src/components/ProxyRegistrar.astro
+++ b/src/components/ProxyRegistrar.astro
@@ -47,6 +47,12 @@
     }
   }
 
+  function getUVProxyURL(frame: HTMLIFrameElement) {
+    return window.__uv$config.decodeUrl(
+      frame.contentWindow!.location.href.split("/service/")[1]
+    )
+  }
+
   async function loadContent() {
     await initTransport();
     // The setTimeout is because service workers are a little silly and can take a while longer to register despite .then being called, which causes a bug on the first load.
@@ -129,29 +135,29 @@
         iframe.classList.add("active");
       }
 
-      function loadExtensionScripts() {
-        try {
-          let db = indexedDB.open("AluDB", 1);
-          db.onsuccess = () => {
-            let transaction = db.result.transaction("InstalledExtensions", "readonly");
-            let store = transaction.objectStore("InstalledExtensions");
-            let request = store.getAll();
-            request.onsuccess = () => {
-              let extensions = request.result;
-              extensions.forEach((extension: any) => {
-                // Eval the extension script inside of the iframe
-                if (extension.serviceWorkerExtension) return;
-                if (iframe.contentWindow) {
-                  console.log(`Evaluating extension "${extension.title}" inside of the iframe.`);
-                  (iframe.contentWindow as any).eval(atob(extension.script));
-                }
-              });
-            };
-          };
-        } catch (err) {
-          console.error(`Failed load extension scripts: ${err}`);
-        }
-      }
+      // function loadExtensionScripts() {
+      //   try {
+      //     let db = indexedDB.open("AluDB", 1);
+      //     db.onsuccess = () => {
+      //       let transaction = db.result.transaction("InstalledExtensions", "readonly");
+      //       let store = transaction.objectStore("InstalledExtensions");
+      //       let request = store.getAll();
+      //       request.onsuccess = () => {
+      //         let extensions = request.result;
+      //         extensions.forEach((extension: any) => {
+      //           // Eval the extension script inside of the iframe
+      //           if (extension.serviceWorkerExtension) return;
+      //           if (iframe.contentWindow) {
+      //             console.log(`Evaluating extension "${extension.title}" inside of the iframe.`);
+      //             (iframe.contentWindow as any).eval(atob(extension.script));
+      //           }
+      //         });
+      //       };
+      //     };
+      //   } catch (err) {
+      //     console.error(`Failed load extension scripts: ${err}`);
+      //   }
+      // }
 
       function iframeLoad(
         iframe: HTMLIFrameElement,
@@ -204,9 +210,7 @@
             );
           } else {
             navigator.clipboard.writeText(
-              window.__uv$config.decodeUrl(
-                proxyFrame.contentWindow!.location.href.split("/service/")[1]
-              )
+              getUVProxyURL(proxyFrame) 
             );
           }
           new Notyf({
@@ -303,34 +307,13 @@
         let favicon =
           (iframe.contentDocument.querySelector("link[rel='icon']") as HTMLLinkElement) ||
           (iframe.contentDocument.querySelector("link[rel*='icon']") as HTMLLinkElement);
-        if (favicon && favicon.href) {
-          let encodedHREF = encodeURIComponent(favicon.href);
-          if (favicon.href.includes("data:image")) {
-            proxiedFavicon.src = favicon.href;
-            return;
-          }
-          if (
-            proxiedFavicon.src ==
-            `${window.location.origin}/custom-favicon?url=${encodedHREF}&contentType=${favicon.type ? encodeURIComponent(favicon.type) : ""}`
-          )
-            return;
+        if (favicon && favicon.href.includes("data:image")) {
+          proxiedFavicon.src = favicon.href;
+          return;
         }
-        if (favicon) {
-          let encodedHREF = encodeURIComponent(favicon.href);
-          if (favicon.href.includes("data:image")) {
-            proxiedFavicon.src = favicon.href;
-            return;
-          }
-          proxiedFavicon.src = `/custom-favicon?url=${encodedHREF}&contentType=${favicon.type ? encodeURIComponent(favicon.type) : ""}`;
-          proxiedFavicon.addEventListener("error", () => {
-            proxiedFavicon.src = "/favicon.ico";
-          });
-        } else {
-          if (proxiedFavicon.src != window.location.origin + "/favicon.ico") {
-            proxiedFavicon.src = "/favicon.ico";
-          }
-        }
-        return;
+        let UVURL = getUVProxyURL(iframe);
+        if (proxiedFavicon.src == `${window.location.origin}/custom-favicon?url=${UVURL}`) return;
+        proxiedFavicon.src = `/custom-favicon?url=${UVURL}`;
       }
     }
   }