diff --git a/docs/assets/img/legacy_svg/3rd-party/kolab_now-dark.svg b/docs/assets/img/email/kolab_now-dark.svg
similarity index 100%
rename from docs/assets/img/legacy_svg/3rd-party/kolab_now-dark.svg
rename to docs/assets/img/email/kolab_now-dark.svg
diff --git a/docs/assets/img/legacy_svg/3rd-party/kolab_now.svg b/docs/assets/img/email/kolab_now.svg
similarity index 100%
rename from docs/assets/img/legacy_svg/3rd-party/kolab_now.svg
rename to docs/assets/img/email/kolab_now.svg
diff --git a/docs/assets/img/legacy_svg/3rd-party/mailfence-dark.svg b/docs/assets/img/email/mailfence-dark.svg
similarity index 100%
rename from docs/assets/img/legacy_svg/3rd-party/mailfence-dark.svg
rename to docs/assets/img/email/mailfence-dark.svg
diff --git a/docs/assets/img/legacy_svg/3rd-party/mailfence.svg b/docs/assets/img/email/mailfence.svg
similarity index 100%
rename from docs/assets/img/legacy_svg/3rd-party/mailfence.svg
rename to docs/assets/img/email/mailfence.svg
diff --git a/docs/assets/img/legacy_png/3rd-party/claws_mail.png b/docs/assets/img/legacy_png/3rd-party/claws_mail.png
deleted file mode 100644
index 548e0d40..00000000
Binary files a/docs/assets/img/legacy_png/3rd-party/claws_mail.png and /dev/null differ
diff --git a/docs/assets/img/legacy_png/3rd-party/datacell.png b/docs/assets/img/legacy_png/3rd-party/datacell.png
deleted file mode 100644
index a9c987d2..00000000
Binary files a/docs/assets/img/legacy_png/3rd-party/datacell.png and /dev/null differ
diff --git a/docs/assets/img/legacy_png/3rd-party/orange_website.png b/docs/assets/img/legacy_png/3rd-party/orange_website.png
deleted file mode 100644
index c2e73a79..00000000
Binary files a/docs/assets/img/legacy_png/3rd-party/orange_website.png and /dev/null differ
diff --git a/docs/assets/img/legacy_png/3rd-party/raddle.png b/docs/assets/img/legacy_png/3rd-party/raddle.png
deleted file mode 100644
index daa78ae0..00000000
Binary files a/docs/assets/img/legacy_png/3rd-party/raddle.png and /dev/null differ
diff --git a/docs/assets/img/legacy_png/3rd-party/runbox-dark.png b/docs/assets/img/legacy_png/3rd-party/runbox-dark.png
deleted file mode 100644
index c4c06a5d..00000000
Binary files a/docs/assets/img/legacy_png/3rd-party/runbox-dark.png and /dev/null differ
diff --git a/docs/assets/img/legacy_png/3rd-party/runbox.png b/docs/assets/img/legacy_png/3rd-party/runbox.png
deleted file mode 100644
index 797a398c..00000000
Binary files a/docs/assets/img/legacy_png/3rd-party/runbox.png and /dev/null differ
diff --git a/docs/assets/img/legacy_png/3rd-party/sponsors/awesomeresources.png b/docs/assets/img/legacy_png/3rd-party/sponsors/awesomeresources.png
deleted file mode 100644
index cf8d43b8..00000000
Binary files a/docs/assets/img/legacy_png/3rd-party/sponsors/awesomeresources.png and /dev/null differ
diff --git a/docs/assets/img/legacy_png/3rd-party/sponsors/deleteme.png b/docs/assets/img/legacy_png/3rd-party/sponsors/deleteme.png
deleted file mode 100644
index e0f50614..00000000
Binary files a/docs/assets/img/legacy_png/3rd-party/sponsors/deleteme.png and /dev/null differ
diff --git a/docs/assets/img/legacy_png/3rd-party/sponsors/insurgo.png b/docs/assets/img/legacy_png/3rd-party/sponsors/insurgo.png
deleted file mode 100644
index 6602c4b6..00000000
Binary files a/docs/assets/img/legacy_png/3rd-party/sponsors/insurgo.png and /dev/null differ
diff --git a/docs/assets/img/legacy_png/3rd-party/sponsors/looktotheright.png b/docs/assets/img/legacy_png/3rd-party/sponsors/looktotheright.png
deleted file mode 100644
index 77126b11..00000000
Binary files a/docs/assets/img/legacy_png/3rd-party/sponsors/looktotheright.png and /dev/null differ
diff --git a/docs/assets/img/legacy_png/3rd-party/sponsors/oeck-dark.png b/docs/assets/img/legacy_png/3rd-party/sponsors/oeck-dark.png
deleted file mode 100644
index 001f2100..00000000
Binary files a/docs/assets/img/legacy_png/3rd-party/sponsors/oeck-dark.png and /dev/null differ
diff --git a/docs/assets/img/legacy_png/3rd-party/sponsors/oeck.png b/docs/assets/img/legacy_png/3rd-party/sponsors/oeck.png
deleted file mode 100644
index 5ee99ca5..00000000
Binary files a/docs/assets/img/legacy_png/3rd-party/sponsors/oeck.png and /dev/null differ
diff --git a/docs/assets/img/legacy_png/3rd-party/sponsors/scamsinfo.png b/docs/assets/img/legacy_png/3rd-party/sponsors/scamsinfo.png
deleted file mode 100644
index 91607c11..00000000
Binary files a/docs/assets/img/legacy_png/3rd-party/sponsors/scamsinfo.png and /dev/null differ
diff --git a/docs/assets/img/legacy_png/3rd-party/umatrix.png b/docs/assets/img/legacy_png/3rd-party/umatrix.png
deleted file mode 100644
index 4d0389ad..00000000
Binary files a/docs/assets/img/legacy_png/3rd-party/umatrix.png and /dev/null differ
diff --git a/docs/assets/img/legacy_png/favicons/android-chrome-192x192.png b/docs/assets/img/legacy_png/favicons/android-chrome-192x192.png
deleted file mode 100644
index 7e823479..00000000
Binary files a/docs/assets/img/legacy_png/favicons/android-chrome-192x192.png and /dev/null differ
diff --git a/docs/assets/img/legacy_png/favicons/android-chrome-512x512.png b/docs/assets/img/legacy_png/favicons/android-chrome-512x512.png
deleted file mode 100644
index 3545ac49..00000000
Binary files a/docs/assets/img/legacy_png/favicons/android-chrome-512x512.png and /dev/null differ
diff --git a/docs/assets/img/legacy_png/favicons/apple-touch-icon.png b/docs/assets/img/legacy_png/favicons/apple-touch-icon.png
deleted file mode 100644
index a357e465..00000000
Binary files a/docs/assets/img/legacy_png/favicons/apple-touch-icon.png and /dev/null differ
diff --git a/docs/assets/img/legacy_png/favicons/browserconfig.xml b/docs/assets/img/legacy_png/favicons/browserconfig.xml
deleted file mode 100644
index aff3f9ce..00000000
--- a/docs/assets/img/legacy_png/favicons/browserconfig.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
- #3498db
-
-
-
diff --git a/docs/assets/img/legacy_png/favicons/favicon-16x16.png b/docs/assets/img/legacy_png/favicons/favicon-16x16.png
deleted file mode 100644
index e3070229..00000000
Binary files a/docs/assets/img/legacy_png/favicons/favicon-16x16.png and /dev/null differ
diff --git a/docs/assets/img/legacy_png/favicons/favicon-32x32.png b/docs/assets/img/legacy_png/favicons/favicon-32x32.png
deleted file mode 100644
index e371e820..00000000
Binary files a/docs/assets/img/legacy_png/favicons/favicon-32x32.png and /dev/null differ
diff --git a/docs/assets/img/legacy_png/favicons/favicon.ico b/docs/assets/img/legacy_png/favicons/favicon.ico
deleted file mode 100644
index 19ff8546..00000000
Binary files a/docs/assets/img/legacy_png/favicons/favicon.ico and /dev/null differ
diff --git a/docs/assets/img/legacy_png/favicons/mstile-144x144.png b/docs/assets/img/legacy_png/favicons/mstile-144x144.png
deleted file mode 100644
index 5f6ae3d0..00000000
Binary files a/docs/assets/img/legacy_png/favicons/mstile-144x144.png and /dev/null differ
diff --git a/docs/assets/img/legacy_png/favicons/mstile-150x150.png b/docs/assets/img/legacy_png/favicons/mstile-150x150.png
deleted file mode 100644
index b56efe6f..00000000
Binary files a/docs/assets/img/legacy_png/favicons/mstile-150x150.png and /dev/null differ
diff --git a/docs/assets/img/legacy_png/favicons/mstile-310x150.png b/docs/assets/img/legacy_png/favicons/mstile-310x150.png
deleted file mode 100644
index 6174fb01..00000000
Binary files a/docs/assets/img/legacy_png/favicons/mstile-310x150.png and /dev/null differ
diff --git a/docs/assets/img/legacy_png/favicons/mstile-310x310.png b/docs/assets/img/legacy_png/favicons/mstile-310x310.png
deleted file mode 100644
index 0fa1e9a5..00000000
Binary files a/docs/assets/img/legacy_png/favicons/mstile-310x310.png and /dev/null differ
diff --git a/docs/assets/img/legacy_png/favicons/mstile-70x70.png b/docs/assets/img/legacy_png/favicons/mstile-70x70.png
deleted file mode 100644
index bdd35b8b..00000000
Binary files a/docs/assets/img/legacy_png/favicons/mstile-70x70.png and /dev/null differ
diff --git a/docs/assets/img/legacy_png/favicons/safari-pinned-tab.svg b/docs/assets/img/legacy_png/favicons/safari-pinned-tab.svg
deleted file mode 100644
index 5bf104ab..00000000
--- a/docs/assets/img/legacy_png/favicons/safari-pinned-tab.svg
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
diff --git a/docs/assets/img/legacy_png/favicons/site.webmanifest b/docs/assets/img/legacy_png/favicons/site.webmanifest
deleted file mode 100644
index d518ca27..00000000
--- a/docs/assets/img/legacy_png/favicons/site.webmanifest
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "",
- "short_name": "",
- "icons": [
- {
- "src": "/assets/img/png/favicons/android-chrome-192x192.png",
- "sizes": "192x192",
- "type": "image/png"
- },
- {
- "src": "/assets/img/png/favicons/android-chrome-512x512.png",
- "sizes": "512x512",
- "type": "image/png"
- }
- ],
- "theme_color": "#ffffff",
- "background_color": "#ffffff",
- "display": "standalone"
-}
diff --git a/docs/assets/img/legacy_png/layout/glenn_greenwald.png b/docs/assets/img/legacy_png/layout/glenn_greenwald.png
deleted file mode 100644
index d35f53fc..00000000
Binary files a/docs/assets/img/legacy_png/layout/glenn_greenwald.png and /dev/null differ
diff --git a/docs/assets/img/legacy_png/layout/logo.png b/docs/assets/img/legacy_png/layout/logo.png
deleted file mode 100644
index c1437c1c..00000000
Binary files a/docs/assets/img/legacy_png/layout/logo.png and /dev/null differ
diff --git a/docs/assets/img/legacy_png/layout/logo_smaller.png b/docs/assets/img/legacy_png/layout/logo_smaller.png
deleted file mode 100644
index c1047aa6..00000000
Binary files a/docs/assets/img/legacy_png/layout/logo_smaller.png and /dev/null differ
diff --git a/docs/assets/img/legacy_png/layout/shield.png b/docs/assets/img/legacy_png/layout/shield.png
deleted file mode 100644
index c9fd51bc..00000000
Binary files a/docs/assets/img/legacy_png/layout/shield.png and /dev/null differ
diff --git a/docs/assets/img/legacy_png/layout/this-video-is-sponsored-by-vpn.png b/docs/assets/img/legacy_png/layout/this-video-is-sponsored-by-vpn.png
deleted file mode 100644
index 37f2e9b4..00000000
Binary files a/docs/assets/img/legacy_png/layout/this-video-is-sponsored-by-vpn.png and /dev/null differ
diff --git a/docs/assets/img/legacy_svg/3rd-party/discourse.svg b/docs/assets/img/legacy_svg/3rd-party/discourse.svg
deleted file mode 100644
index 58c799f3..00000000
--- a/docs/assets/img/legacy_svg/3rd-party/discourse.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/docs/assets/img/legacy_svg/3rd-party/duckduckgo.svg b/docs/assets/img/legacy_svg/3rd-party/duckduckgo.svg
deleted file mode 100644
index dda3c896..00000000
--- a/docs/assets/img/legacy_svg/3rd-party/duckduckgo.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/docs/assets/img/legacy_svg/3rd-party/etag_stoppa.svg b/docs/assets/img/legacy_svg/3rd-party/etag_stoppa.svg
deleted file mode 100644
index 69cf0ce6..00000000
--- a/docs/assets/img/legacy_svg/3rd-party/etag_stoppa.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/docs/assets/img/legacy_svg/3rd-party/firefox_browser.svg b/docs/assets/img/legacy_svg/3rd-party/firefox_browser.svg
deleted file mode 100644
index 8f823fa7..00000000
--- a/docs/assets/img/legacy_svg/3rd-party/firefox_browser.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/docs/assets/img/legacy_svg/3rd-party/firefox_send.svg b/docs/assets/img/legacy_svg/3rd-party/firefox_send.svg
deleted file mode 100644
index 883f2534..00000000
--- a/docs/assets/img/legacy_svg/3rd-party/firefox_send.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/docs/assets/img/legacy_svg/3rd-party/lbrytv.svg b/docs/assets/img/legacy_svg/3rd-party/lbrytv.svg
deleted file mode 100644
index 5e10da6e..00000000
--- a/docs/assets/img/legacy_svg/3rd-party/lbrytv.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/docs/assets/img/legacy_svg/3rd-party/lesspass.svg b/docs/assets/img/legacy_svg/3rd-party/lesspass.svg
deleted file mode 100644
index ac35a565..00000000
--- a/docs/assets/img/legacy_svg/3rd-party/lesspass.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/docs/assets/img/legacy_svg/3rd-party/matrix-dark.svg b/docs/assets/img/legacy_svg/3rd-party/matrix-dark.svg
deleted file mode 100644
index 1a9a19be..00000000
--- a/docs/assets/img/legacy_svg/3rd-party/matrix-dark.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/docs/assets/img/legacy_svg/3rd-party/matrix.svg b/docs/assets/img/legacy_svg/3rd-party/matrix.svg
deleted file mode 100644
index 790020f4..00000000
--- a/docs/assets/img/legacy_svg/3rd-party/matrix.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/docs/assets/img/legacy_svg/3rd-party/mumble.svg b/docs/assets/img/legacy_svg/3rd-party/mumble.svg
deleted file mode 100644
index dde70536..00000000
--- a/docs/assets/img/legacy_svg/3rd-party/mumble.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/docs/assets/img/legacy_svg/3rd-party/qwant.svg b/docs/assets/img/legacy_svg/3rd-party/qwant.svg
deleted file mode 100644
index 63dd8818..00000000
--- a/docs/assets/img/legacy_svg/3rd-party/qwant.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/docs/assets/img/legacy_svg/3rd-party/retroshare.svg b/docs/assets/img/legacy_svg/3rd-party/retroshare.svg
deleted file mode 100644
index 39e9e60d..00000000
--- a/docs/assets/img/legacy_svg/3rd-party/retroshare.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/docs/assets/img/legacy_svg/3rd-party/rocketchat.svg b/docs/assets/img/legacy_svg/3rd-party/rocketchat.svg
deleted file mode 100644
index 27ac8773..00000000
--- a/docs/assets/img/legacy_svg/3rd-party/rocketchat.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/docs/assets/img/legacy_svg/3rd-party/sparkleshare.svg b/docs/assets/img/legacy_svg/3rd-party/sparkleshare.svg
deleted file mode 100644
index 5430f42e..00000000
--- a/docs/assets/img/legacy_svg/3rd-party/sparkleshare.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/docs/assets/img/legacy_svg/3rd-party/sponsors/safing-dark.svg b/docs/assets/img/legacy_svg/3rd-party/sponsors/safing-dark.svg
deleted file mode 100644
index 29843484..00000000
--- a/docs/assets/img/legacy_svg/3rd-party/sponsors/safing-dark.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/docs/assets/img/legacy_svg/3rd-party/sponsors/safing.svg b/docs/assets/img/legacy_svg/3rd-party/sponsors/safing.svg
deleted file mode 100644
index aefaf14d..00000000
--- a/docs/assets/img/legacy_svg/3rd-party/sponsors/safing.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/docs/assets/img/legacy_svg/3rd-party/sponsors/techlore.svg b/docs/assets/img/legacy_svg/3rd-party/sponsors/techlore.svg
deleted file mode 100644
index 6ece1041..00000000
--- a/docs/assets/img/legacy_svg/3rd-party/sponsors/techlore.svg
+++ /dev/null
@@ -1,9706 +0,0 @@
-
-
-
diff --git a/docs/assets/img/legacy_svg/3rd-party/writeas-dark.svg b/docs/assets/img/legacy_svg/3rd-party/writeas-dark.svg
deleted file mode 100644
index 530ae094..00000000
--- a/docs/assets/img/legacy_svg/3rd-party/writeas-dark.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/docs/assets/img/legacy_svg/layout/brand/horizontal.svg b/docs/assets/img/legacy_svg/layout/brand/horizontal.svg
deleted file mode 100644
index 40e0beb2..00000000
--- a/docs/assets/img/legacy_svg/layout/brand/horizontal.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/docs/assets/img/legacy_svg/layout/brand/square-transparent.svg b/docs/assets/img/legacy_svg/layout/brand/square-transparent.svg
deleted file mode 100644
index f9abdd92..00000000
--- a/docs/assets/img/legacy_svg/layout/brand/square-transparent.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/docs/assets/img/legacy_svg/layout/brand/vertical.svg b/docs/assets/img/legacy_svg/layout/brand/vertical.svg
deleted file mode 100644
index e1918230..00000000
--- a/docs/assets/img/legacy_svg/layout/brand/vertical.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/docs/assets/img/legacy_svg/layout/email.svg b/docs/assets/img/legacy_svg/layout/email.svg
deleted file mode 100644
index 916b87db..00000000
--- a/docs/assets/img/legacy_svg/layout/email.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/docs/assets/img/legacy_svg/qr/bch.svg b/docs/assets/img/legacy_svg/qr/bch.svg
deleted file mode 100644
index 24cfb7d2..00000000
--- a/docs/assets/img/legacy_svg/qr/bch.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/docs/assets/img/legacy_svg/qr/btc.svg b/docs/assets/img/legacy_svg/qr/btc.svg
deleted file mode 100644
index be0c84b1..00000000
--- a/docs/assets/img/legacy_svg/qr/btc.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/docs/assets/img/legacy_svg/qr/eth.svg b/docs/assets/img/legacy_svg/qr/eth.svg
deleted file mode 100644
index 8ebab869..00000000
--- a/docs/assets/img/legacy_svg/qr/eth.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/docs/assets/img/legacy_svg/qr/ltc.svg b/docs/assets/img/legacy_svg/qr/ltc.svg
deleted file mode 100644
index d7574615..00000000
--- a/docs/assets/img/legacy_svg/qr/ltc.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/docs/assets/img/legacy_svg/qr/xlm.svg b/docs/assets/img/legacy_svg/qr/xlm.svg
deleted file mode 100644
index fabdfd35..00000000
--- a/docs/assets/img/legacy_svg/qr/xlm.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/docs/assets/img/legacy_svg/qr/xmr.svg b/docs/assets/img/legacy_svg/qr/xmr.svg
deleted file mode 100644
index 652e4e9e..00000000
--- a/docs/assets/img/legacy_svg/qr/xmr.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/docs/assets/img/legacy_svg/qr/zec.svg b/docs/assets/img/legacy_svg/qr/zec.svg
deleted file mode 100644
index 627c7ddc..00000000
--- a/docs/assets/img/legacy_svg/qr/zec.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/docs/assets/img/legacy_svg/3rd-party/jami.svg b/docs/assets/img/messengers/jami.svg
similarity index 100%
rename from docs/assets/img/legacy_svg/3rd-party/jami.svg
rename to docs/assets/img/messengers/jami.svg
diff --git a/docs/assets/img/legacy_svg/3rd-party/i2p-dark.svg b/docs/assets/img/self-contained-networks/i2p-dark.svg
similarity index 100%
rename from docs/assets/img/legacy_svg/3rd-party/i2p-dark.svg
rename to docs/assets/img/self-contained-networks/i2p-dark.svg
diff --git a/docs/self-contained-networks.md b/docs/self-contained-networks.md
index d032d8cd..9d52f4a9 100644
--- a/docs/self-contained-networks.md
+++ b/docs/self-contained-networks.md
@@ -32,7 +32,8 @@ If you are currently browsing clearnet and want to access the dark web, this sec
!!! recommendation
- { align=right }
+ { align=right }
+ { align=right }
The Invisible Internet Project (I2P) is a computer network layer that allows applications to send messages to each other pseudonymously and securely. Uses include anonymous Web surfing, chatting, blogging, and file transfers. The software that implements this layer is called an I2P router and a computer running I2P is called an I2P node. The software is free and open-source and is published under multiple licenses.
diff --git a/docs/tools.md b/docs/tools.md
index f6f1380e..2b296085 100644
--- a/docs/tools.md
+++ b/docs/tools.md
@@ -363,7 +363,7 @@ We [recommend](dns.md#why-should-i-use-encrypted-dns) a number of encrypted DNS
- { .twemoji } [Tor](https://www.torproject.org/)
-- { .twemoji } [I2P](https://geti2p.net/)
+- { .twemoji } { .twemoji } [I2P](https://geti2p.net/)
- { .twemoji } [Freenet](https://freenetproject.org/)