diff --git a/frontend/app/app.vue b/frontend/app/app.vue
index 107dffe..f39a835 100644
--- a/frontend/app/app.vue
+++ b/frontend/app/app.vue
@@ -1,7 +1,7 @@
 
 
 <template>
-  <div>
+  <div class="app-root" :class="{ 'zh': locale === 'zh' }" :data-lang="locale">
     <NuxtRouteAnnouncer />
     <div class="container">
       <NuxtPage />
@@ -16,7 +16,7 @@ const { locale } = useI18n()
 useHead({
   htmlAttrs: {
     lang: computed(() => {
-      const map: Record<string, string> = { en: 'en-US', es: 'es-ES', ca: 'ca-ES' }
+      const map: Record<string, string> = { en: 'en-US', es: 'es-ES', ca: 'ca-ES', zh: 'zh-CN' }
       return map[locale.value] || 'en-US'
     })
   },
diff --git a/frontend/app/assets/css/fonts.scss b/frontend/app/assets/css/fonts.scss
index e0c361f..7195773 100644
--- a/frontend/app/assets/css/fonts.scss
+++ b/frontend/app/assets/css/fonts.scss
@@ -1,8 +1,27 @@
-@import url('https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:wght@400;700&family=Noto+Sans+SC:wght@400;700&display=swap');
-
 @font-face {
   font-family: 'Hurmit';
   src: url('@/assets/fonts/Hermit/Hermit-Regular.woff2') format('woff2');
   font-weight: normal;
   font-style: normal;
 }
+
+@font-face {
+  font-family: 'Noroshi Code';
+  src: url('@/assets/fonts/NoroshiCode/NoroshiCode-Light.woff2') format('woff2');
+  font-weight: 300;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'Noroshi Code';
+  src: url('@/assets/fonts/NoroshiCode/NoroshiCode-Regular.woff2') format('woff2');
+  font-weight: 400;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'Noroshi Code';
+  src: url('@/assets/fonts/NoroshiCode/NoroshiCode-Bold.woff2') format('woff2');
+  font-weight: 700;
+  font-style: normal;
+}
diff --git a/frontend/app/assets/css/main.scss b/frontend/app/assets/css/main.scss
index 4705ea5..77c85f6 100644
--- a/frontend/app/assets/css/main.scss
+++ b/frontend/app/assets/css/main.scss
@@ -23,10 +23,18 @@ body {
 
 * {
   color: var(--color-text);
-  font-family: 'Hurmit', 'IBM Plex Mono', 'Noto Sans SC', monospace;
+  font-family: 'Hurmit', 'Noroshi Code', monospace;
   cursor: default;
 }
 
+.app-root.zh {
+  font-family: 'Noroshi Code', monospace;
+}
+
+.app-root.zh *, .app-root [lang|="zh"], :lang(zh) * {
+  font-family: 'Noroshi Code', monospace !important;
+}
+
 .pixelated {
   image-rendering: pixelated; /* good for pixel art or low-res images */
   /* OR for standard crisp images */
@@ -55,7 +63,7 @@ li::before {
     top: 0px;
     left: 0px;
     color: var(--color-border-color);
-    font-family: 'Hurmit', 'IBM Plex Mono', 'Noto Sans SC', monospace;
+    font-family: 'Hurmit', 'Noroshi Code', monospace;
     font-size: 0.9em;
 }
 
@@ -83,7 +91,7 @@ blockquote::before {
 
 /* TUI-style code blocks */
 pre, code {
-  font-family: 'Hurmit', 'IBM Plex Mono', monospace;
+  font-family: 'Hurmit', 'Noroshi Code', monospace;
   background-color: var(--color-background-line);
   border: 1px solid var(--color-border-color);
 }
@@ -128,7 +136,7 @@ hr {
     background-color: var(--color-background);
     padding: 0 8px;
     color: var(--color-border-color);
-    font-family: 'Hurmit', 'IBM Plex Mono', monospace;
+   font-family: 'Hurmit', 'Noroshi Code', monospace;
     font-size: 0.7rem;
     letter-spacing: 2px;
   }
diff --git a/frontend/app/assets/fonts/NoroshiCode/NoroshiCode-Bold.woff2 b/frontend/app/assets/fonts/NoroshiCode/NoroshiCode-Bold.woff2
new file mode 100644
index 0000000..77784bc
Binary files /dev/null and b/frontend/app/assets/fonts/NoroshiCode/NoroshiCode-Bold.woff2 differ
diff --git a/frontend/app/assets/fonts/NoroshiCode/NoroshiCode-Light.woff2 b/frontend/app/assets/fonts/NoroshiCode/NoroshiCode-Light.woff2
new file mode 100644
index 0000000..7b6cdf5
Binary files /dev/null and b/frontend/app/assets/fonts/NoroshiCode/NoroshiCode-Light.woff2 differ
diff --git a/frontend/app/assets/fonts/NoroshiCode/NoroshiCode-Regular.woff2 b/frontend/app/assets/fonts/NoroshiCode/NoroshiCode-Regular.woff2
new file mode 100644
index 0000000..7e8c2bb
Binary files /dev/null and b/frontend/app/assets/fonts/NoroshiCode/NoroshiCode-Regular.woff2 differ
diff --git a/frontend/app/components/parts/site_options/LanguageSelector.vue b/frontend/app/components/parts/site_options/LanguageSelector.vue
index 257b5eb..41cad23 100644
--- a/frontend/app/components/parts/site_options/LanguageSelector.vue
+++ b/frontend/app/components/parts/site_options/LanguageSelector.vue
@@ -31,6 +31,16 @@ const changeLocale = (lang) => {
   setLocale(lang.code);
   dropdownVisible.value = false
 }
+
+const localeIcon = (code) => {
+  const icons = {
+    en: 'EN',
+    es: 'ES',
+    ca: 'CA',
+    zh: 'ZH'
+  }
+  return icons[code] || code.toUpperCase()
+}
 </script>
 
 <template>
@@ -39,10 +49,10 @@ const changeLocale = (lang) => {
 
   <Transition name="dropdown">
     <div class="dropdown" v-show="dropdownVisible">
-      <div class="section">
+     <div class="section">
         <div :class="{'menu-item': true, 'active': locale === loc.code}"
-         v-for="loc in locales" @click="changeLocale(loc)">
-          {{ $t('locales.' + loc.code) }}
+             v-for="loc in locales" @click="changeLocale(loc)">
+          <span class="locale-icon">{{ localeIcon(loc.code) }}</span>{{ $t('locales.' + loc.code) }}
         </div>
       </div>
     </div>
@@ -102,6 +112,17 @@ border: 1px solid var(--color-border-color);
 }
 
 /* Items */
+.locale-icon {
+  font-family: 'Hermit', 'Hurmit', monospace;
+  background: var(--color-border-color);
+  color: var(--color-text);
+  padding: 2px 6px;
+  font-size: 0.75em;
+  letter-spacing: 1px;
+  min-width: 32px;
+  text-align: center;
+}
+
 .menu-item {
   padding: 8px 16px;
   color: var(--color-text);
diff --git a/frontend/i18n/locales/ca.json b/frontend/i18n/locales/ca.json
index 376ea91..165a032 100644
--- a/frontend/i18n/locales/ca.json
+++ b/frontend/i18n/locales/ca.json
@@ -1,9 +1,9 @@
 {
     "locales": {
-        "en": "🇺🇸 Anglès",
-        "es": "🇪🇸 Espanyol",
-        "ca": "🇦🇩 Català",
-        "zh": "🇨🇳 中文"
+        "en": "Anglès",
+        "es": "Espanyol",
+        "ca": "Català",
+        "zh": "中文"
     },
     "themes": {
         "light": "Clar",
diff --git a/frontend/i18n/locales/en.json b/frontend/i18n/locales/en.json
index fd94b9b..07398f5 100644
--- a/frontend/i18n/locales/en.json
+++ b/frontend/i18n/locales/en.json
@@ -1,9 +1,9 @@
 {
     "locales": {
-        "en": "🇺🇸 English",
-        "es": "🇪🇸 Spanish",
-        "ca": "🇦🇩 Catalan",
-        "zh": "🇨🇳 中文"
+        "en": "English",
+        "es": "Spanish",
+        "ca": "Catalan",
+        "zh": "中文"
     },
     "themes": {
         "light": "Light",
diff --git a/frontend/i18n/locales/es.json b/frontend/i18n/locales/es.json
index d2e0531..70639d1 100644
--- a/frontend/i18n/locales/es.json
+++ b/frontend/i18n/locales/es.json
@@ -1,9 +1,9 @@
 {
     "locales": {
-        "en": "🇺🇸 Ingles",
-        "es": "🇪🇸 Español",
-        "ca": "🇦🇩 Catalán",
-        "zh": "🇨🇳 中文"
+        "en": "Inglés",
+        "es": "Español",
+        "ca": "Catalán",
+        "zh": "中文"
     },
     "themes": {
         "light": "Claro",
diff --git a/frontend/i18n/locales/zh.json b/frontend/i18n/locales/zh.json
index cc447a0..2fe4fcd 100644
--- a/frontend/i18n/locales/zh.json
+++ b/frontend/i18n/locales/zh.json
@@ -1,9 +1,9 @@
 {
     "locales": {
-        "en": "🇺🇸 English",
-        "es": "🇪🇸 西班牙语",
-        "ca": "🇦🇩 加泰罗尼亚语",
-        "zh": "🇨🇳 中文"
+        "en": "English",
+        "es": "西班牙语",
+        "ca": "加泰罗尼亚语",
+        "zh": "中文"
     },
     "themes": {
         "light": "浅色",
diff --git a/frontend/nuxt.config.ts b/frontend/nuxt.config.ts
index 26c5764..298abc5 100644
--- a/frontend/nuxt.config.ts
+++ b/frontend/nuxt.config.ts
@@ -39,7 +39,8 @@ export default defineNuxtConfig({
         { name: 'description', content: 'Personal website of Aran Roig — developer, artist, and designer. Explore projects, blog posts, art gallery, and more.' },
         { name: 'author', content: 'Aran Roig' },
         { name: 'robots', content: 'index, follow' }
-      ]
+      ],
+      link: []
     }
   },