diff --git a/users/gandalf/modules/gui/programs/chromium.nix b/users/gandalf/modules/gui/programs/chromium/default.nix
similarity index 51%
rename from users/gandalf/modules/gui/programs/chromium.nix
rename to users/gandalf/modules/gui/programs/chromium/default.nix
index a2c3e89..e4095ce 100644
--- a/users/gandalf/modules/gui/programs/chromium.nix
+++ b/users/gandalf/modules/gui/programs/chromium/default.nix
@@ -1,32 +1,12 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, ... }:
 let
 
   icons = {
-    chromium = pkgs.fetchurl {
-      url = "https://upload.wikimedia.org/wikipedia/commons/thumb/2/28/Chromium_Logo.svg/240px-Chromium_Logo.svg.png";
-      sha256 = "df526fa1ba625bd619a7a938aeb504e8e3d9d7e55adc63f9802d8eadb4a3fb58";
-      meta.licenses = lib.licenses.publicDomain;
-    };
-    spotify = pkgs.fetchurl {
-      url = "https://upload.wikimedia.org/wikipedia/commons/thumb/8/84/Spotify_icon.svg/232px-Spotify_icon.svg.png";
-      sha256 = "4251a663072b97fe5434638d9c58bbe20c2aea6da44e8d614f664b324ffe9e73";
-      meta.licenses = lib.licenses.publicDomain;
-    };
-    teams = pkgs.fetchurl {
-      url = "https://upload.wikimedia.org/wikipedia/commons/thumb/c/c9/Microsoft_Office_Teams_%282018%E2%80%93present%29.svg/258px-Microsoft_Office_Teams_%282018%E2%80%93present%29.svg.png";
-      sha256 = "3a7caf6bdc2f03833cb4273774af6859b29676c42844bb8f9743074768316a1f";
-      meta.licenses = lib.licenses.publicDomain;
-    };
-    outlook = pkgs.fetchurl {
-      url = "https://upload.wikimedia.org/wikipedia/commons/thumb/d/df/Microsoft_Office_Outlook_%282018%E2%80%93present%29.svg/258px-Microsoft_Office_Outlook_%282018%E2%80%93present%29.svg.png";
-      sha256 = "06d3265352f03ac7ac65c230eae019a9a1e2bc94aeb8b24247a5484c4f3e15a1";
-      meta.licenses = lib.licenses.publicDomain;
-    };
-    whatsapp = pkgs.fetchurl {
-      url = "https://upload.wikimedia.org/wikipedia/commons/thumb/6/6b/WhatsApp.svg/240px-WhatsApp.svg.png";
-      sha256 = "44ce29edaaba4fcd515702cef2f08ac6c1289f33c1d5c8983761db9d7ad8061d";
-      meta.licenses = lib.licenses.publicDomain;
-    };
+    chromium = ./icons/chromium.png;
+    spotify = ./icons/spotify.png;
+    teams = ./icons/teams.png;
+    outlook = ./icons/outlook.png;
+    whatsapp = ./icons/whatsapp.png;
   };
 
 in
diff --git a/users/gandalf/modules/gui/programs/chromium/icons/LICENSE.md b/users/gandalf/modules/gui/programs/chromium/icons/LICENSE.md
new file mode 100644
index 0000000..b9f1e7a
--- /dev/null
+++ b/users/gandalf/modules/gui/programs/chromium/icons/LICENSE.md
@@ -0,0 +1,21 @@
+### `chromium.png`
+- Source: [https://commons.wikimedia.org/wiki/File:Chromium_Logo.svg](https://commons.wikimedia.org/wiki/File:Chromium_Logo.svg)
+- Licensing
+> The Chromium project is published under Creative Commons attribution 2.5 and BSD. The logo is in the public domain, as it does not meet the threshold of originality.
+
+### `outlook.png`
+- Source: [https://developer.microsoft.com/en-us/fluentui#/styles/web/m365-product-icons](https://developer.microsoft.com/en-us/fluentui#/styles/web/m365-product-icons)
+- Microsoft Fabric Assets License Agreement: [https://aka.ms/fluentui-assets-license](https://aka.ms/fluentui-assets-license)
+
+### `spotify.png`
+- Source: [https://commons.wikimedia.org/wiki/File:Spotify_icon.svg](https://commons.wikimedia.org/wiki/File:Spotify_icon.svg)
+- Attribution: [https://developer.spotify.com/documentation/design#attribution](https://developer.spotify.com/documentation/design#attribution)
+
+### `teams.png`
+- Source: [https://developer.microsoft.com/en-us/fluentui#/styles/web/m365-product-icons](https://developer.microsoft.com/en-us/fluentui#/styles/web/m365-product-icons)
+- Attribution: [https://developer.spotify.com/documentation/design#attribution](https://developer.spotify.com/documentation/design#attribution)
+
+### `whatsapp.png`
+- Source: [https://commons.wikimedia.org/wiki/File:WhatsApp_logo.svg](https://commons.wikimedia.org/wiki/File:WhatsApp_logo.svg)
+- WhatsApp brand assets and guidelines: [https://about.meta.com/brand/resources/whatsapp/whatsapp-brand/](https://about.meta.com/brand/resources/whatsapp/whatsapp-brand/)
+
diff --git a/users/gandalf/modules/gui/programs/chromium/icons/chromium.png b/users/gandalf/modules/gui/programs/chromium/icons/chromium.png
new file mode 100644
index 0000000..b4ec32d
Binary files /dev/null and b/users/gandalf/modules/gui/programs/chromium/icons/chromium.png differ
diff --git a/users/gandalf/modules/gui/programs/chromium/icons/outlook.png b/users/gandalf/modules/gui/programs/chromium/icons/outlook.png
new file mode 100644
index 0000000..6fe6b5c
Binary files /dev/null and b/users/gandalf/modules/gui/programs/chromium/icons/outlook.png differ
diff --git a/users/gandalf/modules/gui/programs/chromium/icons/spotify.png b/users/gandalf/modules/gui/programs/chromium/icons/spotify.png
new file mode 100644
index 0000000..abe747d
Binary files /dev/null and b/users/gandalf/modules/gui/programs/chromium/icons/spotify.png differ
diff --git a/users/gandalf/modules/gui/programs/chromium/icons/teams.png b/users/gandalf/modules/gui/programs/chromium/icons/teams.png
new file mode 100644
index 0000000..0f37174
Binary files /dev/null and b/users/gandalf/modules/gui/programs/chromium/icons/teams.png differ
diff --git a/users/gandalf/modules/gui/programs/chromium/icons/whatsapp.png b/users/gandalf/modules/gui/programs/chromium/icons/whatsapp.png
new file mode 100644
index 0000000..77b7099
Binary files /dev/null and b/users/gandalf/modules/gui/programs/chromium/icons/whatsapp.png differ
diff --git a/users/gandalf/modules/gui/programs/default.nix b/users/gandalf/modules/gui/programs/default.nix
index e6cd9b2..8a80fdd 100644
--- a/users/gandalf/modules/gui/programs/default.nix
+++ b/users/gandalf/modules/gui/programs/default.nix
@@ -2,7 +2,7 @@
 
   imports = [
     ./alacritty.nix
-    ./chromium.nix
+    ./chromium
     ./discord.nix
     ./keyring.nix
     ./obs.nix