diff --git a/theme/zen/default/favicon.ico b/theme/blue/icons/favicon.ico
similarity index 100%
rename from theme/zen/default/favicon.ico
rename to theme/blue/icons/favicon.ico
diff --git a/theme/zen/default/add.png b/theme/default/icons/add.png
similarity index 100%
rename from theme/zen/default/add.png
rename to theme/default/icons/add.png
diff --git a/theme/zen/default/agpl.png b/theme/default/icons/agpl.png
similarity index 100%
rename from theme/zen/default/agpl.png
rename to theme/default/icons/agpl.png
diff --git a/theme/zen/default/avatar_news.png b/theme/default/icons/avatar_news.png
similarity index 100%
rename from theme/zen/default/avatar_news.png
rename to theme/default/icons/avatar_news.png
diff --git a/theme/zen/default/bookmark.png b/theme/default/icons/bookmark.png
similarity index 100%
rename from theme/zen/default/bookmark.png
rename to theme/default/icons/bookmark.png
diff --git a/theme/zen/default/bookmark_inactive.png b/theme/default/icons/bookmark_inactive.png
similarity index 100%
rename from theme/zen/default/bookmark_inactive.png
rename to theme/default/icons/bookmark_inactive.png
diff --git a/theme/zen/default/calendar.png b/theme/default/icons/calendar.png
similarity index 100%
rename from theme/zen/default/calendar.png
rename to theme/default/icons/calendar.png
diff --git a/theme/zen/default/calendar_notify.png b/theme/default/icons/calendar_notify.png
similarity index 100%
rename from theme/zen/default/calendar_notify.png
rename to theme/default/icons/calendar_notify.png
diff --git a/theme/zen/default/delete.png b/theme/default/icons/delete.png
similarity index 100%
rename from theme/zen/default/delete.png
rename to theme/default/icons/delete.png
diff --git a/theme/zen/default/dm.png b/theme/default/icons/dm.png
similarity index 100%
rename from theme/zen/default/dm.png
rename to theme/default/icons/dm.png
diff --git a/theme/zen/default/download.png b/theme/default/icons/download.png
similarity index 100%
rename from theme/zen/default/download.png
rename to theme/default/icons/download.png
diff --git a/theme/zen/default/edit.png b/theme/default/icons/edit.png
similarity index 100%
rename from theme/zen/default/edit.png
rename to theme/default/icons/edit.png
diff --git a/theme/zen/default/edit_notify.png b/theme/default/icons/edit_notify.png
similarity index 100%
rename from theme/zen/default/edit_notify.png
rename to theme/default/icons/edit_notify.png
diff --git a/theme/default/icons/favicon.ico b/theme/default/icons/favicon.ico
new file mode 100644
index 00000000..c7cb1bbb
Binary files /dev/null and b/theme/default/icons/favicon.ico differ
diff --git a/theme/zen/default/favicon.webp b/theme/default/icons/favicon.webp
similarity index 100%
rename from theme/zen/default/favicon.webp
rename to theme/default/icons/favicon.webp
diff --git a/theme/zen/default/like.png b/theme/default/icons/like.png
similarity index 100%
rename from theme/zen/default/like.png
rename to theme/default/icons/like.png
diff --git a/theme/zen/default/like_inactive.png b/theme/default/icons/like_inactive.png
similarity index 100%
rename from theme/zen/default/like_inactive.png
rename to theme/default/icons/like_inactive.png
diff --git a/theme/zen/default/links.png b/theme/default/icons/links.png
similarity index 100%
rename from theme/zen/default/links.png
rename to theme/default/icons/links.png
diff --git a/theme/zen/default/logorss.png b/theme/default/icons/logorss.png
similarity index 100%
rename from theme/zen/default/logorss.png
rename to theme/default/icons/logorss.png
diff --git a/theme/zen/default/logout.png b/theme/default/icons/logout.png
similarity index 100%
rename from theme/zen/default/logout.png
rename to theme/default/icons/logout.png
diff --git a/theme/zen/default/mute.png b/theme/default/icons/mute.png
similarity index 100%
rename from theme/zen/default/mute.png
rename to theme/default/icons/mute.png
diff --git a/theme/zen/default/new.png b/theme/default/icons/new.png
similarity index 100%
rename from theme/zen/default/new.png
rename to theme/default/icons/new.png
diff --git a/theme/zen/default/newpost.png b/theme/default/icons/newpost.png
similarity index 100%
rename from theme/zen/default/newpost.png
rename to theme/default/icons/newpost.png
diff --git a/theme/zen/default/newswire.png b/theme/default/icons/newswire.png
similarity index 100%
rename from theme/zen/default/newswire.png
rename to theme/default/icons/newswire.png
diff --git a/theme/zen/default/pagedown.png b/theme/default/icons/pagedown.png
similarity index 100%
rename from theme/zen/default/pagedown.png
rename to theme/default/icons/pagedown.png
diff --git a/theme/zen/default/pageup.png b/theme/default/icons/pageup.png
similarity index 100%
rename from theme/zen/default/pageup.png
rename to theme/default/icons/pageup.png
diff --git a/theme/zen/default/person.png b/theme/default/icons/person.png
similarity index 100%
rename from theme/zen/default/person.png
rename to theme/default/icons/person.png
diff --git a/theme/zen/default/prev.png b/theme/default/icons/prev.png
similarity index 100%
rename from theme/zen/default/prev.png
rename to theme/default/icons/prev.png
diff --git a/theme/zen/default/publish.png b/theme/default/icons/publish.png
similarity index 100%
rename from theme/zen/default/publish.png
rename to theme/default/icons/publish.png
diff --git a/theme/zen/default/qrcode.png b/theme/default/icons/qrcode.png
similarity index 100%
rename from theme/zen/default/qrcode.png
rename to theme/default/icons/qrcode.png
diff --git a/theme/zen/default/repeat.png b/theme/default/icons/repeat.png
similarity index 100%
rename from theme/zen/default/repeat.png
rename to theme/default/icons/repeat.png
diff --git a/theme/zen/default/repeat_inactive.png b/theme/default/icons/repeat_inactive.png
similarity index 100%
rename from theme/zen/default/repeat_inactive.png
rename to theme/default/icons/repeat_inactive.png
diff --git a/theme/zen/default/reply.png b/theme/default/icons/reply.png
similarity index 100%
rename from theme/zen/default/reply.png
rename to theme/default/icons/reply.png
diff --git a/theme/zen/default/rss3.png b/theme/default/icons/rss3.png
similarity index 100%
rename from theme/zen/default/rss3.png
rename to theme/default/icons/rss3.png
diff --git a/theme/zen/default/scope_blog.png b/theme/default/icons/scope_blog.png
similarity index 100%
rename from theme/zen/default/scope_blog.png
rename to theme/default/icons/scope_blog.png
diff --git a/theme/zen/default/scope_dm.png b/theme/default/icons/scope_dm.png
similarity index 100%
rename from theme/zen/default/scope_dm.png
rename to theme/default/icons/scope_dm.png
diff --git a/theme/zen/default/scope_event.png b/theme/default/icons/scope_event.png
similarity index 100%
rename from theme/zen/default/scope_event.png
rename to theme/default/icons/scope_event.png
diff --git a/theme/zen/default/scope_followers.png b/theme/default/icons/scope_followers.png
similarity index 100%
rename from theme/zen/default/scope_followers.png
rename to theme/default/icons/scope_followers.png
diff --git a/theme/zen/default/scope_public.png b/theme/default/icons/scope_public.png
similarity index 100%
rename from theme/zen/default/scope_public.png
rename to theme/default/icons/scope_public.png
diff --git a/theme/zen/default/scope_question.png b/theme/default/icons/scope_question.png
similarity index 100%
rename from theme/zen/default/scope_question.png
rename to theme/default/icons/scope_question.png
diff --git a/theme/zen/default/scope_reminder.png b/theme/default/icons/scope_reminder.png
similarity index 100%
rename from theme/zen/default/scope_reminder.png
rename to theme/default/icons/scope_reminder.png
diff --git a/theme/zen/default/scope_report.png b/theme/default/icons/scope_report.png
similarity index 100%
rename from theme/zen/default/scope_report.png
rename to theme/default/icons/scope_report.png
diff --git a/theme/zen/default/scope_share.png b/theme/default/icons/scope_share.png
similarity index 100%
rename from theme/zen/default/scope_share.png
rename to theme/default/icons/scope_share.png
diff --git a/theme/zen/default/scope_unlisted.png b/theme/default/icons/scope_unlisted.png
similarity index 100%
rename from theme/zen/default/scope_unlisted.png
rename to theme/default/icons/scope_unlisted.png
diff --git a/theme/zen/default/search.png b/theme/default/icons/search.png
similarity index 100%
rename from theme/zen/default/search.png
rename to theme/default/icons/search.png
diff --git a/theme/zen/default/showhide.png b/theme/default/icons/showhide.png
similarity index 100%
rename from theme/zen/default/showhide.png
rename to theme/default/icons/showhide.png
diff --git a/theme/zen/default/unmute.png b/theme/default/icons/unmute.png
similarity index 100%
rename from theme/zen/default/unmute.png
rename to theme/default/icons/unmute.png
diff --git a/theme/zen/default/vote.png b/theme/default/icons/vote.png
similarity index 100%
rename from theme/zen/default/vote.png
rename to theme/default/icons/vote.png
diff --git a/theme/hacker/icons/favicon.ico b/theme/hacker/icons/favicon.ico
new file mode 100644
index 00000000..c7cb1bbb
Binary files /dev/null and b/theme/hacker/icons/favicon.ico differ
diff --git a/theme/henge/icons/favicon.ico b/theme/henge/icons/favicon.ico
new file mode 100644
index 00000000..c7cb1bbb
Binary files /dev/null and b/theme/henge/icons/favicon.ico differ
diff --git a/theme/indymediaclassic/icons/favicon.ico b/theme/indymediaclassic/icons/favicon.ico
new file mode 100644
index 00000000..c7cb1bbb
Binary files /dev/null and b/theme/indymediaclassic/icons/favicon.ico differ
diff --git a/theme/indymediamodern/icons/favicon.ico b/theme/indymediamodern/icons/favicon.ico
new file mode 100644
index 00000000..c7cb1bbb
Binary files /dev/null and b/theme/indymediamodern/icons/favicon.ico differ
diff --git a/theme/lcd/icons/favicon.ico b/theme/lcd/icons/favicon.ico
new file mode 100644
index 00000000..c7cb1bbb
Binary files /dev/null and b/theme/lcd/icons/favicon.ico differ
diff --git a/theme/light/icons/favicon.ico b/theme/light/icons/favicon.ico
new file mode 100644
index 00000000..c7cb1bbb
Binary files /dev/null and b/theme/light/icons/favicon.ico differ
diff --git a/theme/night/icons/favicon.ico b/theme/night/icons/favicon.ico
new file mode 100644
index 00000000..c7cb1bbb
Binary files /dev/null and b/theme/night/icons/favicon.ico differ
diff --git a/theme/purple/icons/favicon.ico b/theme/purple/icons/favicon.ico
new file mode 100644
index 00000000..c7cb1bbb
Binary files /dev/null and b/theme/purple/icons/favicon.ico differ
diff --git a/theme/solidaric/icons/favicon.ico b/theme/solidaric/icons/favicon.ico
new file mode 100644
index 00000000..c7cb1bbb
Binary files /dev/null and b/theme/solidaric/icons/favicon.ico differ
diff --git a/theme/starlight/icons/favicon.ico b/theme/starlight/icons/favicon.ico
new file mode 100644
index 00000000..c7cb1bbb
Binary files /dev/null and b/theme/starlight/icons/favicon.ico differ
diff --git a/theme/zen/icons/favicon.ico b/theme/zen/icons/favicon.ico
new file mode 100644
index 00000000..c7cb1bbb
Binary files /dev/null and b/theme/zen/icons/favicon.ico differ