diff --git a/assets/icons/README.md b/assets/icons/README.md
new file mode 100644
index 0000000..dde6ae7
--- /dev/null
+++ b/assets/icons/README.md
@@ -0,0 +1,3 @@
+# About these icons.
+
+Theses icons are mostly from Iconmonstr, but some of them are made by myself. They are used in the "omegicons" font bundle, and are not directly used by Hugo in order NOT to be shipped with the website.
diff --git a/static/icons/about.svg b/assets/icons/about.svg
similarity index 100%
rename from static/icons/about.svg
rename to assets/icons/about.svg
diff --git a/static/icons/apps.svg b/assets/icons/apps.svg
similarity index 100%
rename from static/icons/apps.svg
rename to assets/icons/apps.svg
diff --git a/static/icons/bug.svg b/assets/icons/bug.svg
similarity index 100%
rename from static/icons/bug.svg
rename to assets/icons/bug.svg
diff --git a/static/icons/code.svg b/assets/icons/code.svg
similarity index 100%
rename from static/icons/code.svg
rename to assets/icons/code.svg
diff --git a/static/icons/documentation.svg b/assets/icons/documentation.svg
similarity index 100%
rename from static/icons/documentation.svg
rename to assets/icons/documentation.svg
diff --git a/static/icons/download.svg b/assets/icons/download.svg
similarity index 100%
rename from static/icons/download.svg
rename to assets/icons/download.svg
diff --git a/static/icons/frameworks.svg b/assets/icons/frameworks.svg
similarity index 100%
rename from static/icons/frameworks.svg
rename to assets/icons/frameworks.svg
diff --git a/static/icons/free.svg b/assets/icons/free.svg
similarity index 100%
rename from static/icons/free.svg
rename to assets/icons/free.svg
diff --git a/static/icons/git.svg b/assets/icons/git.svg
similarity index 100%
rename from static/icons/git.svg
rename to assets/icons/git.svg
diff --git a/static/icons/keyboard.svg b/assets/icons/keyboard.svg
similarity index 100%
rename from static/icons/keyboard.svg
rename to assets/icons/keyboard.svg
diff --git a/static/icons/lang.svg b/assets/icons/lang.svg
similarity index 100%
rename from static/icons/lang.svg
rename to assets/icons/lang.svg
diff --git a/static/icons/license.svg b/assets/icons/license.svg
similarity index 100%
rename from static/icons/license.svg
rename to assets/icons/license.svg
diff --git a/static/icons/lookup.svg b/assets/icons/lookup.svg
similarity index 100%
rename from static/icons/lookup.svg
rename to assets/icons/lookup.svg
diff --git a/static/icons/menu.svg b/assets/icons/menu.svg
similarity index 100%
rename from static/icons/menu.svg
rename to assets/icons/menu.svg
diff --git a/static/icons/open-external.svg b/assets/icons/open-external.svg
similarity index 100%
rename from static/icons/open-external.svg
rename to assets/icons/open-external.svg
diff --git a/static/icons/person.svg b/assets/icons/person.svg
similarity index 100%
rename from static/icons/person.svg
rename to assets/icons/person.svg
diff --git a/static/icons/platform/Firefox.svg b/assets/icons/platform/Firefox.svg
similarity index 100%
rename from static/icons/platform/Firefox.svg
rename to assets/icons/platform/Firefox.svg
diff --git a/static/icons/platform/Linux.svg b/assets/icons/platform/Linux.svg
similarity index 100%
rename from static/icons/platform/Linux.svg
rename to assets/icons/platform/Linux.svg
diff --git a/static/icons/platform/MacOSX.svg b/assets/icons/platform/MacOSX.svg
similarity index 100%
rename from static/icons/platform/MacOSX.svg
rename to assets/icons/platform/MacOSX.svg
diff --git a/static/icons/platform/Universal.svg b/assets/icons/platform/Universal.svg
similarity index 100%
rename from static/icons/platform/Universal.svg
rename to assets/icons/platform/Universal.svg
diff --git a/static/icons/platform/Web.svg b/assets/icons/platform/Web.svg
similarity index 100%
rename from static/icons/platform/Web.svg
rename to assets/icons/platform/Web.svg
diff --git a/static/icons/platform/Windows.svg b/assets/icons/platform/Windows.svg
similarity index 100%
rename from static/icons/platform/Windows.svg
rename to assets/icons/platform/Windows.svg
diff --git a/static/icons/platforms.svg b/assets/icons/platforms.svg
similarity index 100%
rename from static/icons/platforms.svg
rename to assets/icons/platforms.svg
diff --git a/static/icons/privacy.svg b/assets/icons/privacy.svg
similarity index 100%
rename from static/icons/privacy.svg
rename to assets/icons/privacy.svg
diff --git a/static/icons/social/docker.svg b/assets/icons/social/docker.svg
similarity index 100%
rename from static/icons/social/docker.svg
rename to assets/icons/social/docker.svg
diff --git a/static/icons/social/git.svg b/assets/icons/social/git.svg
similarity index 100%
rename from static/icons/social/git.svg
rename to assets/icons/social/git.svg
diff --git a/static/icons/social/github.svg b/assets/icons/social/github.svg
similarity index 100%
rename from static/icons/social/github.svg
rename to assets/icons/social/github.svg
diff --git a/static/icons/social/mail.svg b/assets/icons/social/mail.svg
similarity index 100%
rename from static/icons/social/mail.svg
rename to assets/icons/social/mail.svg
diff --git a/static/icons/social/mastodon.svg b/assets/icons/social/mastodon.svg
similarity index 100%
rename from static/icons/social/mastodon.svg
rename to assets/icons/social/mastodon.svg
diff --git a/static/icons/social/stackoverflow.svg b/assets/icons/social/stackoverflow.svg
similarity index 100%
rename from static/icons/social/stackoverflow.svg
rename to assets/icons/social/stackoverflow.svg
diff --git a/static/icons/social/twitter.svg b/assets/icons/social/twitter.svg
similarity index 100%
rename from static/icons/social/twitter.svg
rename to assets/icons/social/twitter.svg
diff --git a/static/icons/touch.svg b/assets/icons/touch.svg
similarity index 100%
rename from static/icons/touch.svg
rename to assets/icons/touch.svg
diff --git a/static/icons/transparent.svg b/assets/icons/transparent.svg
similarity index 100%
rename from static/icons/transparent.svg
rename to assets/icons/transparent.svg
diff --git a/static/icons/wrench.svg b/assets/icons/wrench.svg
similarity index 100%
rename from static/icons/wrench.svg
rename to assets/icons/wrench.svg
diff --git a/static/img/badges/en/amo-text.svg b/assets/img/badges/en/amo-text.svg
similarity index 100%
rename from static/img/badges/en/amo-text.svg
rename to assets/img/badges/en/amo-text.svg
diff --git a/static/img/badges/en/amo.svg b/assets/img/badges/en/amo.svg
similarity index 100%
rename from static/img/badges/en/amo.svg
rename to assets/img/badges/en/amo.svg
diff --git a/static/img/badges/en/export.sh b/assets/img/badges/en/export.sh
similarity index 100%
rename from static/img/badges/en/export.sh
rename to assets/img/badges/en/export.sh
diff --git a/static/img/badges/en/flathub-text.svg b/assets/img/badges/en/flathub-text.svg
similarity index 100%
rename from static/img/badges/en/flathub-text.svg
rename to assets/img/badges/en/flathub-text.svg
diff --git a/static/img/badges/en/flathub.svg b/assets/img/badges/en/flathub.svg
similarity index 100%
rename from static/img/badges/en/flathub.svg
rename to assets/img/badges/en/flathub.svg
diff --git a/static/img/badges/en/launchpad-text.svg b/assets/img/badges/en/launchpad-text.svg
similarity index 100%
rename from static/img/badges/en/launchpad-text.svg
rename to assets/img/badges/en/launchpad-text.svg
diff --git a/static/img/badges/en/launchpad.svg b/assets/img/badges/en/launchpad.svg
similarity index 100%
rename from static/img/badges/en/launchpad.svg
rename to assets/img/badges/en/launchpad.svg
diff --git a/static/img/badges/en/snapcraft-text.svg b/assets/img/badges/en/snapcraft-text.svg
similarity index 100%
rename from static/img/badges/en/snapcraft-text.svg
rename to assets/img/badges/en/snapcraft-text.svg
diff --git a/static/img/badges/en/snapcraft.svg b/assets/img/badges/en/snapcraft.svg
similarity index 100%
rename from static/img/badges/en/snapcraft.svg
rename to assets/img/badges/en/snapcraft.svg
diff --git a/static/img/badges/fr/amo-text.svg b/assets/img/badges/fr/amo-text.svg
similarity index 100%
rename from static/img/badges/fr/amo-text.svg
rename to assets/img/badges/fr/amo-text.svg
diff --git a/static/img/badges/fr/amo.svg b/assets/img/badges/fr/amo.svg
similarity index 100%
rename from static/img/badges/fr/amo.svg
rename to assets/img/badges/fr/amo.svg
diff --git a/static/img/badges/fr/export.sh b/assets/img/badges/fr/export.sh
similarity index 100%
rename from static/img/badges/fr/export.sh
rename to assets/img/badges/fr/export.sh
diff --git a/static/img/badges/fr/flathub-text.svg b/assets/img/badges/fr/flathub-text.svg
similarity index 100%
rename from static/img/badges/fr/flathub-text.svg
rename to assets/img/badges/fr/flathub-text.svg
diff --git a/static/img/badges/fr/flathub.svg b/assets/img/badges/fr/flathub.svg
similarity index 100%
rename from static/img/badges/fr/flathub.svg
rename to assets/img/badges/fr/flathub.svg
diff --git a/static/img/badges/fr/launchpad-text.svg b/assets/img/badges/fr/launchpad-text.svg
similarity index 100%
rename from static/img/badges/fr/launchpad-text.svg
rename to assets/img/badges/fr/launchpad-text.svg
diff --git a/static/img/badges/fr/launchpad.svg b/assets/img/badges/fr/launchpad.svg
similarity index 100%
rename from static/img/badges/fr/launchpad.svg
rename to assets/img/badges/fr/launchpad.svg
diff --git a/static/img/badges/fr/snapcraft-text.svg b/assets/img/badges/fr/snapcraft-text.svg
similarity index 100%
rename from static/img/badges/fr/snapcraft-text.svg
rename to assets/img/badges/fr/snapcraft-text.svg
diff --git a/static/img/badges/fr/snapcraft.svg b/assets/img/badges/fr/snapcraft.svg
similarity index 100%
rename from static/img/badges/fr/snapcraft.svg
rename to assets/img/badges/fr/snapcraft.svg
diff --git a/layouts/partials/badge.html b/layouts/partials/badge.html
index 0c0907c..597ed18 100644
--- a/layouts/partials/badge.html
+++ b/layouts/partials/badge.html
@@ -1,2 +1,11 @@
-
+{{/* Fetch a new badge from assets. TODO: Convertion from the -text version when hugo implements it.*/}}
+{{ $scratch := newScratch }}
+{{ $scratch.Set "badge" "/img/badges/" }}
+{{ $scratch.Add "badge" .Lang }}
+{{ $scratch.Add "badge" "/" }}
+{{ $scratch.Add "badge" .Icon }}
+{{ $scratch.Add "badge" ".svg" }}
+{{ $badgeimg := resources.Get ($scratch.Get "badge") }}
+
+
diff --git a/static/fonts/metropolis/Metropolis-Black.otf b/static/fonts/metropolis/Metropolis-Black.otf
deleted file mode 100644
index 3abd623..0000000
Binary files a/static/fonts/metropolis/Metropolis-Black.otf and /dev/null differ
diff --git a/static/fonts/metropolis/Metropolis-BlackItalic.otf b/static/fonts/metropolis/Metropolis-BlackItalic.otf
deleted file mode 100644
index 3d6a9e4..0000000
Binary files a/static/fonts/metropolis/Metropolis-BlackItalic.otf and /dev/null differ
diff --git a/static/fonts/metropolis/Metropolis-ExtraBold.otf b/static/fonts/metropolis/Metropolis-ExtraBold.otf
deleted file mode 100644
index ca0b9ec..0000000
Binary files a/static/fonts/metropolis/Metropolis-ExtraBold.otf and /dev/null differ
diff --git a/static/fonts/metropolis/Metropolis-ExtraBoldItalic.otf b/static/fonts/metropolis/Metropolis-ExtraBoldItalic.otf
deleted file mode 100644
index 667c708..0000000
Binary files a/static/fonts/metropolis/Metropolis-ExtraBoldItalic.otf and /dev/null differ
diff --git a/static/fonts/metropolis/Metropolis-ExtraLight.otf b/static/fonts/metropolis/Metropolis-ExtraLight.otf
deleted file mode 100644
index b02e041..0000000
Binary files a/static/fonts/metropolis/Metropolis-ExtraLight.otf and /dev/null differ
diff --git a/static/fonts/metropolis/Metropolis-ExtraLightItalic.otf b/static/fonts/metropolis/Metropolis-ExtraLightItalic.otf
deleted file mode 100644
index 2740b28..0000000
Binary files a/static/fonts/metropolis/Metropolis-ExtraLightItalic.otf and /dev/null differ
diff --git a/static/fonts/metropolis/Metropolis-Medium.otf b/static/fonts/metropolis/Metropolis-Medium.otf
deleted file mode 100644
index 239d69d..0000000
Binary files a/static/fonts/metropolis/Metropolis-Medium.otf and /dev/null differ
diff --git a/static/fonts/metropolis/Metropolis-MediumItalic.otf b/static/fonts/metropolis/Metropolis-MediumItalic.otf
deleted file mode 100644
index dc30091..0000000
Binary files a/static/fonts/metropolis/Metropolis-MediumItalic.otf and /dev/null differ
diff --git a/static/fonts/metropolis/Metropolis-SemiBold.otf b/static/fonts/metropolis/Metropolis-SemiBold.otf
deleted file mode 100644
index f9889d0..0000000
Binary files a/static/fonts/metropolis/Metropolis-SemiBold.otf and /dev/null differ
diff --git a/static/fonts/metropolis/Metropolis-SemiBoldItalic.otf b/static/fonts/metropolis/Metropolis-SemiBoldItalic.otf
deleted file mode 100644
index fdbd016..0000000
Binary files a/static/fonts/metropolis/Metropolis-SemiBoldItalic.otf and /dev/null differ
diff --git a/static/fonts/metropolis/Metropolis-Thin.otf b/static/fonts/metropolis/Metropolis-Thin.otf
deleted file mode 100644
index f969dcc..0000000
Binary files a/static/fonts/metropolis/Metropolis-Thin.otf and /dev/null differ
diff --git a/static/fonts/metropolis/Metropolis-ThinItalic.otf b/static/fonts/metropolis/Metropolis-ThinItalic.otf
deleted file mode 100644
index 248bd94..0000000
Binary files a/static/fonts/metropolis/Metropolis-ThinItalic.otf and /dev/null differ