diff --git a/charts/stable/code-server/Chart.yaml b/charts/stable/code-server/Chart.yaml
index 7e2c0d013a2..02dddee65ad 100644
--- a/charts/stable/code-server/Chart.yaml
+++ b/charts/stable/code-server/Chart.yaml
@@ -6,7 +6,7 @@ dependencies:
   version: 8.9.26
 description: Run VS Code on any machine anywhere and access it in the browser.
 home: https://github.com/truecharts/apps/tree/master/charts/stable/code-server
-icon: https://truecharts.org/_static/img/appicons/code-server-icon.png
+icon: https://truecharts.org/_static/img/appicons/codeserver-icon.png
 keywords:
 - code
 - vs
diff --git a/charts/stable/collabora-online/Chart.yaml b/charts/stable/collabora-online/Chart.yaml
index d9fcc7f2383..bc539b03d24 100644
--- a/charts/stable/collabora-online/Chart.yaml
+++ b/charts/stable/collabora-online/Chart.yaml
@@ -8,7 +8,7 @@ deprecated: false
 description: "Collabora Online Development Edition \u2013 an awesome, Online Office\
   \ suite image suitable for home use."
 home: https://github.com/truecharts/apps/tree/master/charts/stable/collabora-online
-icon: https://truecharts.org/_static/img/appicons/collabora-online-icon.png
+icon: https://truecharts.org/_static/img/appicons/collabora-icon.png
 keywords:
 - collabora-online
 kubeVersion: '>=1.16.0-0'
diff --git a/docs/_static/img/appicons/beets-icon.png b/docs/_static/img/appicons/beets-icon.png
index 91f821df116..5ffa0fa9343 100644
Binary files a/docs/_static/img/appicons/beets-icon.png and b/docs/_static/img/appicons/beets-icon.png differ
diff --git a/docs/_static/img/appicons/code-server-icon.png b/docs/_static/img/appicons/code-server-icon.png
deleted file mode 100644
index 76691fc64a6..00000000000
Binary files a/docs/_static/img/appicons/code-server-icon.png and /dev/null differ
diff --git a/docs/_static/img/codeserver-icon.png b/docs/_static/img/appicons/codeserver-icon.png
similarity index 100%
rename from docs/_static/img/codeserver-icon.png
rename to docs/_static/img/appicons/codeserver-icon.png
diff --git a/docs/_static/img/collabora-icon.png b/docs/_static/img/appicons/collabora-icon.png
similarity index 100%
rename from docs/_static/img/collabora-icon.png
rename to docs/_static/img/appicons/collabora-icon.png
diff --git a/docs/_static/img/appicons/collabora-online-icon.png b/docs/_static/img/appicons/collabora-online-icon.png
deleted file mode 100644
index ebab7350cc9..00000000000
Binary files a/docs/_static/img/appicons/collabora-online-icon.png and /dev/null differ
diff --git a/docs/_static/img/appicons/custom-app-icon.png b/docs/_static/img/appicons/custom-app-icon.png
index e4ffb8bd3ff..7c6d1d7ab58 100644
Binary files a/docs/_static/img/appicons/custom-app-icon.png and b/docs/_static/img/appicons/custom-app-icon.png differ
diff --git a/docs/_static/img/appicons/emby-icon.png b/docs/_static/img/appicons/emby-icon.png
index 799144b00b5..1f4a9f19c5b 100644
Binary files a/docs/_static/img/appicons/emby-icon.png and b/docs/_static/img/appicons/emby-icon.png differ
diff --git a/docs/_static/img/appicons/etherpad-icon.png b/docs/_static/img/appicons/etherpad-icon.png
index bef86f9f870..086022d6041 100644
Binary files a/docs/_static/img/appicons/etherpad-icon.png and b/docs/_static/img/appicons/etherpad-icon.png differ
diff --git a/docs/_static/img/appicons/external-service-icon.png b/docs/_static/img/appicons/external-service-icon.png
index 9f230490ccf..e34878f4998 100644
Binary files a/docs/_static/img/appicons/external-service-icon.png and b/docs/_static/img/appicons/external-service-icon.png differ
diff --git a/docs/_static/img/appicons/jackett-icon.png b/docs/_static/img/appicons/jackett-icon.png
index 298fca19ebe..6cd3bc3bbae 100644
Binary files a/docs/_static/img/appicons/jackett-icon.png and b/docs/_static/img/appicons/jackett-icon.png differ
diff --git a/docs/_static/img/appicons/jellyfin-icon.png b/docs/_static/img/appicons/jellyfin-icon.png
index c63731e5894..79c61d18576 100644
Binary files a/docs/_static/img/appicons/jellyfin-icon.png and b/docs/_static/img/appicons/jellyfin-icon.png differ
diff --git a/docs/_static/img/appicons/novnc-icon.png b/docs/_static/img/appicons/novnc-icon.png
index a87a0a77376..aac8b0f3bad 100644
Binary files a/docs/_static/img/appicons/novnc-icon.png and b/docs/_static/img/appicons/novnc-icon.png differ
diff --git a/docs/_static/img/postgres-operator-icon.png b/docs/_static/img/appicons/postgres-operator-icon.png
similarity index 100%
rename from docs/_static/img/postgres-operator-icon.png
rename to docs/_static/img/appicons/postgres-operator-icon.png
diff --git a/docs/_static/img/appicons/shorturl-icon.png b/docs/_static/img/appicons/shorturl-icon.png
index 7225f11445a..2e389355f5e 100644
Binary files a/docs/_static/img/appicons/shorturl-icon.png and b/docs/_static/img/appicons/shorturl-icon.png differ
diff --git a/docs/_static/img/appicons/smokeping-icon.png b/docs/_static/img/appicons/smokeping-icon.png
index f1541356f1b..40da13d5295 100644
Binary files a/docs/_static/img/appicons/smokeping-icon.png and b/docs/_static/img/appicons/smokeping-icon.png differ
diff --git a/docs/_static/img/sogo-icon.png b/docs/_static/img/appicons/sogo-icon.png
similarity index 100%
rename from docs/_static/img/sogo-icon.png
rename to docs/_static/img/appicons/sogo-icon.png
diff --git a/docs/_static/img/youtubedl-material-icon.png b/docs/_static/img/appicons/youtubedl-material-icon.png
similarity index 100%
rename from docs/_static/img/youtubedl-material-icon.png
rename to docs/_static/img/appicons/youtubedl-material-icon.png
diff --git a/docs/_static/img/beets-icon.png b/docs/_static/img/beets-icon.png
deleted file mode 100644
index 5ffa0fa9343..00000000000
Binary files a/docs/_static/img/beets-icon.png and /dev/null differ
diff --git a/docs/_static/img/custom-app-icon.png b/docs/_static/img/custom-app-icon.png
deleted file mode 100644
index 7c6d1d7ab58..00000000000
Binary files a/docs/_static/img/custom-app-icon.png and /dev/null differ
diff --git a/docs/_static/img/emby-icon.png b/docs/_static/img/emby-icon.png
deleted file mode 100644
index 1f4a9f19c5b..00000000000
Binary files a/docs/_static/img/emby-icon.png and /dev/null differ
diff --git a/docs/_static/img/etherpad-icon.png b/docs/_static/img/etherpad-icon.png
deleted file mode 100644
index 086022d6041..00000000000
Binary files a/docs/_static/img/etherpad-icon.png and /dev/null differ
diff --git a/docs/_static/img/external-service-icon.png b/docs/_static/img/external-service-icon.png
deleted file mode 100644
index e34878f4998..00000000000
Binary files a/docs/_static/img/external-service-icon.png and /dev/null differ
diff --git a/docs/_static/img/golinks-icon.png b/docs/_static/img/golinks-icon.png
deleted file mode 100644
index 429e9c14e87..00000000000
Binary files a/docs/_static/img/golinks-icon.png and /dev/null differ
diff --git a/docs/_static/img/jackett-icon.png b/docs/_static/img/jackett-icon.png
deleted file mode 100644
index 6cd3bc3bbae..00000000000
Binary files a/docs/_static/img/jackett-icon.png and /dev/null differ
diff --git a/docs/_static/img/jellyfin-icon.png b/docs/_static/img/jellyfin-icon.png
deleted file mode 100644
index 79c61d18576..00000000000
Binary files a/docs/_static/img/jellyfin-icon.png and /dev/null differ
diff --git a/docs/_static/img/kms-icon.jpg b/docs/_static/img/kms-icon.jpg
deleted file mode 100644
index af7791e1320..00000000000
Binary files a/docs/_static/img/kms-icon.jpg and /dev/null differ
diff --git a/docs/_static/img/novnc-icon.png b/docs/_static/img/novnc-icon.png
deleted file mode 100644
index aac8b0f3bad..00000000000
Binary files a/docs/_static/img/novnc-icon.png and /dev/null differ
diff --git a/docs/_static/img/photoprism-icon.png b/docs/_static/img/photoprism-icon.png
deleted file mode 100644
index 605ad1df070..00000000000
Binary files a/docs/_static/img/photoprism-icon.png and /dev/null differ
diff --git a/docs/_static/img/pretend-your-xyzzy-icon.png b/docs/_static/img/pretend-your-xyzzy-icon.png
deleted file mode 100644
index 18fec8dc8f2..00000000000
Binary files a/docs/_static/img/pretend-your-xyzzy-icon.png and /dev/null differ
diff --git a/docs/_static/img/shorturl-icon.png b/docs/_static/img/shorturl-icon.png
deleted file mode 100644
index 2e389355f5e..00000000000
Binary files a/docs/_static/img/shorturl-icon.png and /dev/null differ
diff --git a/docs/_static/img/smokeping-icon.png b/docs/_static/img/smokeping-icon.png
deleted file mode 100644
index 40da13d5295..00000000000
Binary files a/docs/_static/img/smokeping-icon.png and /dev/null differ
diff --git a/docs/_static/img/zigbee2mqtt-icon.png b/docs/_static/img/zigbee2mqtt-icon.png
deleted file mode 100644
index 4683943ff67..00000000000
Binary files a/docs/_static/img/zigbee2mqtt-icon.png and /dev/null differ