diff --git a/core/branding/irc/icon.png b/core/branding/irc/icon.png
new file mode 100644
index 0000000..653816c
Binary files /dev/null and b/core/branding/irc/icon.png differ
diff --git a/core/branding/irc/logo.png b/core/branding/irc/logo.png
new file mode 100644
index 0000000..84bab2d
Binary files /dev/null and b/core/branding/irc/logo.png differ
diff --git a/core/logos/icon/traveler.png b/core/branding/traveler/icon.png
similarity index 100%
rename from core/logos/icon/traveler.png
rename to core/branding/traveler/icon.png
diff --git a/core/branding/wiki-icon.svg b/core/branding/wiki/icon.svg
similarity index 100%
rename from core/branding/wiki-icon.svg
rename to core/branding/wiki/icon.svg
diff --git a/core/branding/worlds/icon.png b/core/branding/worlds/icon.png
new file mode 100644
index 0000000..abb8dc2
Binary files /dev/null and b/core/branding/worlds/icon.png differ
diff --git a/core/branding/worlds/logo.png b/core/branding/worlds/logo.png
new file mode 100644
index 0000000..7703e04
Binary files /dev/null and b/core/branding/worlds/logo.png differ
diff --git a/core/external/icons/activitypub.png b/core/external/icons/activitypub.png
new file mode 100644
index 0000000..e738b55
Binary files /dev/null and b/core/external/icons/activitypub.png differ
diff --git a/core/icons/editor/embeds/flash.png b/core/external/icons/flash.png
similarity index 100%
rename from core/icons/editor/embeds/flash.png
rename to core/external/icons/flash.png
diff --git a/core/external/icons/git.png b/core/external/icons/git.png
new file mode 100644
index 0000000..b0b4012
Binary files /dev/null and b/core/external/icons/git.png differ
diff --git a/core/logos/icon/mumble.svg b/core/external/icons/mumble.svg
similarity index 100%
rename from core/logos/icon/mumble.svg
rename to core/external/icons/mumble.svg
diff --git a/core/icons/editor/embeds/odysee.png b/core/external/icons/odysee.png
similarity index 100%
rename from core/icons/editor/embeds/odysee.png
rename to core/external/icons/odysee.png
diff --git a/core/icons/editor/embeds/peertube.png b/core/external/icons/peertube.png
similarity index 100%
rename from core/icons/editor/embeds/peertube.png
rename to core/external/icons/peertube.png
diff --git a/core/icons/editor/embeds/rumble.png b/core/external/icons/rumble.png
similarity index 100%
rename from core/icons/editor/embeds/rumble.png
rename to core/external/icons/rumble.png
diff --git a/core/icons/editor/embeds/soundcloud.png b/core/external/icons/soundcloud.png
similarity index 100%
rename from core/icons/editor/embeds/soundcloud.png
rename to core/external/icons/soundcloud.png
diff --git a/core/icons/editor/embeds/twitch.png b/core/external/icons/twitch.png
similarity index 100%
rename from core/icons/editor/embeds/twitch.png
rename to core/external/icons/twitch.png
diff --git a/core/icons/editor/embeds/twitter.png b/core/external/icons/twitter.png
similarity index 100%
rename from core/icons/editor/embeds/twitter.png
rename to core/external/icons/twitter.png
diff --git a/core/logos/icon/xmpp.svg b/core/external/icons/xmpp.svg
similarity index 100%
rename from core/logos/icon/xmpp.svg
rename to core/external/icons/xmpp.svg
diff --git a/core/external/icons/youtube.png b/core/external/icons/youtube.png
new file mode 100644
index 0000000..7ab78a7
Binary files /dev/null and b/core/external/icons/youtube.png differ
diff --git a/core/icons/editor/embeds/youtube.png b/core/icons/editor/embeds/youtube.png
deleted file mode 100644
index 571890d..0000000
Binary files a/core/icons/editor/embeds/youtube.png and /dev/null differ
diff --git a/core/logos/full/activeworlds.png b/core/logos/full/activeworlds.png
deleted file mode 100644
index 545c5bb..0000000
Binary files a/core/logos/full/activeworlds.png and /dev/null differ
diff --git a/core/logos/full/adobeflash.png b/core/logos/full/adobeflash.png
deleted file mode 100644
index d6b2f2a..0000000
Binary files a/core/logos/full/adobeflash.png and /dev/null differ
diff --git a/core/logos/full/aol.png b/core/logos/full/aol.png
deleted file mode 100644
index c455f3e..0000000
Binary files a/core/logos/full/aol.png and /dev/null differ
diff --git a/core/logos/full/dungeonkeeper.png b/core/logos/full/dungeonkeeper.png
deleted file mode 100644
index 26f0874..0000000
Binary files a/core/logos/full/dungeonkeeper.png and /dev/null differ
diff --git a/core/logos/full/frantech.png b/core/logos/full/frantech.png
deleted file mode 100644
index caf724f..0000000
Binary files a/core/logos/full/frantech.png and /dev/null differ
diff --git a/core/logos/full/glively.png b/core/logos/full/glively.png
deleted file mode 100644
index c70f13e..0000000
Binary files a/core/logos/full/glively.png and /dev/null differ
diff --git a/core/logos/full/macromediashockwave.png b/core/logos/full/macromediashockwave.png
deleted file mode 100644
index db3b2b0..0000000
Binary files a/core/logos/full/macromediashockwave.png and /dev/null differ
diff --git a/core/logos/full/msvchat.png b/core/logos/full/msvchat.png
deleted file mode 100644
index e3b909a..0000000
Binary files a/core/logos/full/msvchat.png and /dev/null differ
diff --git a/core/logos/full/pown.it.png b/core/logos/full/pown.it.png
deleted file mode 100644
index a5fbeb1..0000000
Binary files a/core/logos/full/pown.it.png and /dev/null differ
diff --git a/core/logos/full/re-aol.png b/core/logos/full/re-aol.png
deleted file mode 100644
index 35f2f86..0000000
Binary files a/core/logos/full/re-aol.png and /dev/null differ
diff --git a/core/logos/full/roblox.png b/core/logos/full/roblox.png
deleted file mode 100644
index ec3c5ea..0000000
Binary files a/core/logos/full/roblox.png and /dev/null differ
diff --git a/core/logos/full/screenmates.png b/core/logos/full/screenmates.png
deleted file mode 100644
index 95df8e1..0000000
Binary files a/core/logos/full/screenmates.png and /dev/null differ
diff --git a/core/logos/full/secondlife.png b/core/logos/full/secondlife.png
deleted file mode 100644
index 741316b..0000000
Binary files a/core/logos/full/secondlife.png and /dev/null differ
diff --git a/core/logos/full/traveler.png b/core/logos/full/traveler.png
deleted file mode 100644
index bd7ad72..0000000
Binary files a/core/logos/full/traveler.png and /dev/null differ
diff --git a/core/logos/full/vrml.png b/core/logos/full/vrml.png
deleted file mode 100644
index 8fbc707..0000000
Binary files a/core/logos/full/vrml.png and /dev/null differ
diff --git a/core/logos/full/worldschat.png b/core/logos/full/worldschat.png
deleted file mode 100644
index 886b62b..0000000
Binary files a/core/logos/full/worldschat.png and /dev/null differ
diff --git a/core/logos/full/worldschatjapan.png b/core/logos/full/worldschatjapan.png
deleted file mode 100644
index 74015ad..0000000
Binary files a/core/logos/full/worldschatjapan.png and /dev/null differ
diff --git a/core/logos/full/worldsplayer.png b/core/logos/full/worldsplayer.png
deleted file mode 100644
index 252580e..0000000
Binary files a/core/logos/full/worldsplayer.png and /dev/null differ
diff --git a/core/logos/full/xmpp.svg b/core/logos/full/xmpp.svg
deleted file mode 100644
index 1b7f0fb..0000000
--- a/core/logos/full/xmpp.svg
+++ /dev/null
@@ -1,136 +0,0 @@
-
-
-
-
diff --git a/core/logos/icon/activeworlds.png b/core/logos/icon/activeworlds.png
deleted file mode 100644
index 84f3eef..0000000
Binary files a/core/logos/icon/activeworlds.png and /dev/null differ
diff --git a/core/logos/icon/adobeflash.png b/core/logos/icon/adobeflash.png
deleted file mode 100644
index e50fc45..0000000
Binary files a/core/logos/icon/adobeflash.png and /dev/null differ
diff --git a/core/logos/icon/aol.png b/core/logos/icon/aol.png
deleted file mode 100644
index 114a59e..0000000
Binary files a/core/logos/icon/aol.png and /dev/null differ
diff --git a/core/logos/icon/bertisevil.png b/core/logos/icon/bertisevil.png
deleted file mode 100644
index c9ab8ea..0000000
Binary files a/core/logos/icon/bertisevil.png and /dev/null differ
diff --git a/core/logos/icon/community_place.png b/core/logos/icon/community_place.png
deleted file mode 100644
index 90a4131..0000000
Binary files a/core/logos/icon/community_place.png and /dev/null differ
diff --git a/core/logos/icon/glively.png b/core/logos/icon/glively.png
deleted file mode 100644
index 08fcbce..0000000
Binary files a/core/logos/icon/glively.png and /dev/null differ
diff --git a/core/logos/icon/modstuff.png b/core/logos/icon/modstuff.png
deleted file mode 100644
index 6935084..0000000
Binary files a/core/logos/icon/modstuff.png and /dev/null differ
diff --git a/core/logos/icon/ms-vchat.png b/core/logos/icon/ms-vchat.png
deleted file mode 100644
index 3b6455f..0000000
Binary files a/core/logos/icon/ms-vchat.png and /dev/null differ
diff --git a/core/logos/icon/ms-vworlds.png b/core/logos/icon/ms-vworlds.png
deleted file mode 100644
index a983049..0000000
Binary files a/core/logos/icon/ms-vworlds.png and /dev/null differ
diff --git a/core/logos/icon/onlive.png b/core/logos/icon/onlive.png
deleted file mode 100644
index ca877e0..0000000
Binary files a/core/logos/icon/onlive.png and /dev/null differ
diff --git a/core/logos/icon/pown.it.png b/core/logos/icon/pown.it.png
deleted file mode 100644
index 06b9ed1..0000000
Binary files a/core/logos/icon/pown.it.png and /dev/null differ
diff --git a/core/logos/icon/reaol.png b/core/logos/icon/reaol.png
deleted file mode 100644
index 5f1846d..0000000
Binary files a/core/logos/icon/reaol.png and /dev/null differ
diff --git a/core/logos/icon/roblox.png b/core/logos/icon/roblox.png
deleted file mode 100644
index 8bd423b..0000000
Binary files a/core/logos/icon/roblox.png and /dev/null differ
diff --git a/core/logos/icon/sapari.png b/core/logos/icon/sapari.png
deleted file mode 100644
index 3b2bfd5..0000000
Binary files a/core/logos/icon/sapari.png and /dev/null differ
diff --git a/core/logos/icon/screenmates.png b/core/logos/icon/screenmates.png
deleted file mode 100644
index 84bf11c..0000000
Binary files a/core/logos/icon/screenmates.png and /dev/null differ
diff --git a/core/logos/icon/secondlife.png b/core/logos/icon/secondlife.png
deleted file mode 100644
index e7d21c5..0000000
Binary files a/core/logos/icon/secondlife.png and /dev/null differ
diff --git a/core/logos/icon/traveler.svg b/core/logos/icon/traveler.svg
deleted file mode 100644
index 940e031..0000000
--- a/core/logos/icon/traveler.svg
+++ /dev/null
@@ -1,164 +0,0 @@
-
-
-
-
diff --git a/core/logos/icon/vrml.png b/core/logos/icon/vrml.png
deleted file mode 100644
index be9d847..0000000
Binary files a/core/logos/icon/vrml.png and /dev/null differ
diff --git a/core/logos/icon/worldschat.png b/core/logos/icon/worldschat.png
deleted file mode 100644
index f521ef9..0000000
Binary files a/core/logos/icon/worldschat.png and /dev/null differ
diff --git a/core/logos/icon/worldschatj.gif b/core/logos/icon/worldschatj.gif
deleted file mode 100644
index b7b3261..0000000
Binary files a/core/logos/icon/worldschatj.gif and /dev/null differ
diff --git a/core/logos/icon/worldsplayer.png b/core/logos/icon/worldsplayer.png
deleted file mode 100644
index cd183b0..0000000
Binary files a/core/logos/icon/worldsplayer.png and /dev/null differ