diff --git a/common-docs/hugo.toml b/common-docs/hugo.toml
index fc91cd24a..0849ab71b 100644
--- a/common-docs/hugo.toml
+++ b/common-docs/hugo.toml
@@ -44,7 +44,7 @@ title = "The longed for documentation"
         url = "https://codeyourfuture.io/donate"    
 
 [params]
-googleFonts="https://fonts.googleapis.com/css2?family=Oswald:wght@400;700&display=swap"
+googleFonts="https://fonts.googleapis.com/css2?family=Noto+Color+Emoji&family=Oswald:wght@400;700&display=swap"
 description = "A free and open source technical curriculum platform."
 main_website = "https://curriculum.codeyourfuture.io/"
 main_org_name = "Code Your Future"
diff --git a/common-theme/assets/styles/02-variables/fonts.scss b/common-theme/assets/styles/02-variables/fonts.scss
index dc3bbdae9..60b05376a 100644
--- a/common-theme/assets/styles/02-variables/fonts.scss
+++ b/common-theme/assets/styles/02-variables/fonts.scss
@@ -4,6 +4,6 @@
     "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue",
     sans-serif;
   --theme-font--system: 100 100%/2 "Monaco", "Menlo", "Space Grotesk", monospace;
-  --theme-font--emoji: Apple Color Emoji, "Segoe UI Emoji", "Noto Color Emoji",
-    "EmojiOne Color", "Twemoji Mozilla";
+  --theme-font--emoji: "Fluent UI Emoji", Apple Color Emoji, "Noto Color Emoji",
+    "Segoe UI Emoji", "EmojiOne Color", "Twemoji Mozilla";
 }
diff --git a/org-cyf-theme/hugo.toml b/org-cyf-theme/hugo.toml
index 7dfc3556a..c359466ba 100644
--- a/org-cyf-theme/hugo.toml
+++ b/org-cyf-theme/hugo.toml
@@ -48,7 +48,7 @@ org = "https://github.com/CodeYourFuture"
 repo = "https://github.com/CodeYourFuture/curriculum/"
 pdrepo = "CYF-PD"
 root = "curriculum"
-googleFonts="https://fonts.googleapis.com/css2?family=Raleway:wght@300;600;800;900&family=Lato:wght@500;800&display=swap"
+googleFonts="https://fonts.googleapis.com/css2?family=Noto+Color+Emoji&family=Raleway:wght@300;600;800;900&family=Lato:wght@500;800&display=swap"
 
 # We use a proxy which concatenates paginated responses, otherwise we miss results.
 # Daniel is currently hosting this code https://github.com/illicitonion/github-issue-proxy but we should work out a long-term maintainable solution to this problem.