diff --git a/lib/music_library/artists.ex b/lib/music_library/artists.ex
index 4f1da4c9..3628ac99 100644
--- a/lib/music_library/artists.ex
+++ b/lib/music_library/artists.ex
@@ -3,7 +3,6 @@ defmodule MusicLibrary.Artists do
 
   alias MusicLibrary.Artists.ArtistInfo
   alias MusicLibrary.Assets
-  alias MusicLibrary.Favicon
   alias MusicLibrary.Records.{ArtistRecord, Record}
   alias MusicLibrary.Repo
   alias MusicLibrary.{BackgroundRepo, Worker}
@@ -179,7 +178,6 @@ defmodule MusicLibrary.Artists do
     end)
   end
 
-  def favicon_url(external_link), do: Favicon.favicon_url(external_link.url)
 
   defp get_collected_artist_ids do
     q =
diff --git a/lib/music_library/favicon.ex b/lib/music_library/favicon.ex
deleted file mode 100644
index b36b18dd..00000000
--- a/lib/music_library/favicon.ex
+++ /dev/null
@@ -1,6 +0,0 @@
-defmodule MusicLibrary.Favicon do
-  def favicon_url(url) do
-    uri = URI.parse(url)
-    "https://www.google.com/s2/favicons?domain=#{uri.host}&sz=16"
-  end
-end
diff --git a/lib/music_library/online_store_templates.ex b/lib/music_library/online_store_templates.ex
index 59d268da..d7509f2c 100644
--- a/lib/music_library/online_store_templates.ex
+++ b/lib/music_library/online_store_templates.ex
@@ -5,7 +5,7 @@ defmodule MusicLibrary.OnlineStoreTemplates do
 
   import Ecto.Query, warn: false
   alias MusicLibrary.OnlineStoreTemplates.OnlineStoreTemplate
-  alias MusicLibrary.{Favicon, Repo}
+  alias MusicLibrary.Repo
 
   @doc """
   Returns the list of enabled online store templates ordered by name.
@@ -75,6 +75,4 @@ defmodule MusicLibrary.OnlineStoreTemplates do
     |> String.replace("{title}", URI.encode_www_form(record.title))
     |> String.replace("{format}", URI.encode_www_form(format_string))
   end
-
-  def favicon_url(template), do: Favicon.favicon_url(template.url_template)
 end
diff --git a/lib/music_library_web/components/core_components.ex b/lib/music_library_web/components/core_components.ex
index 4022f4b6..64fecfe6 100644
--- a/lib/music_library_web/components/core_components.ex
+++ b/lib/music_library_web/components/core_components.ex
@@ -136,6 +136,11 @@ defmodule MusicLibraryWeb.CoreComponents do
     """
   end
 
+  def favicon_url(url) do
+    uri = URI.parse(url)
+    "https://www.google.com/s2/favicons?domain=#{uri.host}&sz=16"
+  end
+
   ## JS Commands
 
   def show(js \\ %JS{}, selector) do
diff --git a/lib/music_library_web/live/artist_live/show.html.heex b/lib/music_library_web/live/artist_live/show.html.heex
index 36fa7fc1..b8f8f392 100644
--- a/lib/music_library_web/live/artist_live/show.html.heex
+++ b/lib/music_library_web/live/artist_live/show.html.heex
@@ -191,7 +191,7 @@
           >
             <img
               class="mr-2"
-              src={MusicLibrary.Artists.favicon_url(external_link)}
+              src={favicon_url(external_link.url)}
               alt={external_link.name}
               loading="lazy"
             />
diff --git a/lib/music_library_web/live/online_store_template_live/index.html.heex b/lib/music_library_web/live/online_store_template_live/index.html.heex
index 0ba94780..a46a03cc 100644
--- a/lib/music_library_web/live/online_store_template_live/index.html.heex
+++ b/lib/music_library_web/live/online_store_template_live/index.html.heex
@@ -30,7 +30,7 @@
         <div class="min-w-0">
           <div class="flex items-center gap-x-2">
             <img
-              src={MusicLibrary.OnlineStoreTemplates.favicon_url(template)}
+              src={favicon_url(template.url_template)}
               alt={template.name}
             />
             <p class="text-sm font-semibold text-gray-900 dark:text-white">
diff --git a/lib/music_library_web/live/wishlist_live/show.html.heex b/lib/music_library_web/live/wishlist_live/show.html.heex
index 8367aacd..39909deb 100644
--- a/lib/music_library_web/live/wishlist_live/show.html.heex
+++ b/lib/music_library_web/live/wishlist_live/show.html.heex
@@ -290,7 +290,7 @@
         >
           <img
             class="mr-2"
-            src={MusicLibrary.OnlineStoreTemplates.favicon_url(template)}
+            src={favicon_url(template.url_template)}
             alt={template.name}
             loading="lazy"
           />