diff --git a/src/components/BaseKey.vue b/src/components/BaseKey.vue
index caa018f166..c0b96e6c4c 100644
--- a/src/components/BaseKey.vue
+++ b/src/components/BaseKey.vue
@@ -5,6 +5,7 @@
     @dragover.prevent="dragover" @dragenter.prevent="dragenter">{{ displayName }}<font-awesome-icon v-if="icon"
       size="2x" :icon="icon" /><template v-if="visible">
       <div v-if="visible" class="remove" @click.stop="remove">x</div>
+      <span v-if="visible" class="language">{{ displayLanguage }}</span>
     </template></div>
 </template>
 <script>
@@ -118,6 +119,11 @@ export default {
     visible() {
       return this.meta ? this.meta.code !== 'KC_NO' : false;
     },
+    displayLanguage() {
+      // The language label is only relevant for keymap legends
+      if (this.legends !== 'keymap') return;
+      return this.meta.language_prefix;
+    },
     displayName() {
       switch (this.legends) {
         case 'size': {
diff --git a/src/components/ContainerKey.vue b/src/components/ContainerKey.vue
index e992fb59e7..1d3ca1ea36 100644
--- a/src/components/ContainerKey.vue
+++ b/src/components/ContainerKey.vue
@@ -20,7 +20,12 @@
     @dragenter.prevent="dragenterContents"
     @dragleave.prevent="dragleaveContents"
     @click.prevent.stop="clickContents"
-    >{{ contents }}</div></div><div
+    >{{ contents }}</div>
+    <span
+        v-if="visible"
+        class="language"
+      >{{ displayLanguage }}</span>
+    </div><div
         v-if="visible"
         class="remove"
         @click.stop="remove"
@@ -46,6 +51,11 @@ export default {
       }
       return '';
     },
+    displayLanguage() {
+      // The language label is only relevant for keymap legends
+      if (this.legends !== 'keymap') return;
+      return this.meta.contents.language_prefix;
+    },
     contentClasses() {
       let classes = [];
       if (this.contentsInHover) {
diff --git a/src/scss/style.scss b/src/scss/style.scss
index cad2fb95cb..d208447f6f 100644
--- a/src/scss/style.scss
+++ b/src/scss/style.scss
@@ -552,6 +552,23 @@ button {
   cursor: pointer;
 }
 
+.key .language {
+  position: absolute;
+  right: 0px;
+  bottom: 0px;
+  padding-right: 3px;
+  font-size: 7px;
+  opacity: 0.7;
+}
+.key.key-container div .language {
+  padding-right: 8px;
+  padding-bottom: 1px;
+}
+.key.smaller .language {
+  padding-right: 2px;
+  padding-bottom: 2px;
+}
+
 .key:hover .remove {
   width: unset;
   height: unset;
diff --git a/src/store/keycodes.js b/src/store/keycodes.js
index 06debb098c..8409d1fa8d 100644
--- a/src/store/keycodes.js
+++ b/src/store/keycodes.js
@@ -13,7 +13,41 @@ import steno from './modules/keycodes/steno';
 const keycodePickerTabLayout = {
   ANSI_ISO: [...ansi, ...iso_jis],
   ISO_ANSI: [...iso_jis, ...ansi],
-  special: [...quantum, ...settings, ...media]
+  special: [...quantum, ...settings, ...media],
+  extra: Object.fromEntries(
+    Object.entries(keymapExtras).map(([keymap, { keycodeLUT, prefix }]) => {
+      const keycodes = [];
+
+      Object.entries(keycodeLUT).forEach(([code, { name, title }]) => {
+        if (title === undefined) {
+          return;
+        }
+
+        let start = title.search(prefix + '_');
+        if (start < 0) {
+          return;
+        }
+
+        let end = start + prefix.length + 1;
+        while (
+          end < title.length &&
+          ((title.charCodeAt(end) >= 65 && title.charCodeAt(end) <= 90) ||
+            (title.charCodeAt(end) >= 48 && title.charCodeAt(end) <= 57))
+        ) {
+          end++;
+        }
+
+        keycodes.push({
+          code: title.substring(start, end),
+          name,
+          language_prefix: prefix,
+          title: code
+        });
+      });
+
+      return [keymap, keycodes];
+    })
+  )
 };
 
 /**
@@ -77,9 +111,12 @@ function generateKeycodes(osKeyboardLayout, isSteno = false) {
     ...(isSteno ? steno : [])
   ];
   const { keycodeLUT } = keymapExtras[getOSKeyboardLayout()];
-  return keycodes.map((keycodeObject) =>
-    toLocaleKeycode(keycodeLUT, keycodeObject)
-  );
+  return [
+    ...keycodes.map((keycodeObject) =>
+      toLocaleKeycode(keycodeLUT, keycodeObject)
+    ),
+    ...keycodePickerTabLayout.extra[getOSKeyboardLayout()]
+  ];
 }
 
 /**
diff --git a/src/store/modules/parse.js b/src/store/modules/parse.js
index 8386412cb5..916e4388db 100644
--- a/src/store/modules/parse.js
+++ b/src/store/modules/parse.js
@@ -133,7 +133,8 @@ function newKey(metadata, keycode, obj) {
   var key = {
     name: metadata.name,
     code: keycode,
-    type: metadata.type
+    type: metadata.type,
+    language_prefix: metadata.language_prefix
   };
 
   if (obj !== undefined) {
@@ -181,6 +182,7 @@ function parseKeycode(keycodesStore, keycode, stats) {
     }
     let internal = splitcode[1];
     internal = internal.split(')')[0];
+    metadata = keycodesStore.lookupKeycode(internal);
 
     // check for an OSM keycode
     if (maincode === 'OSM') {
@@ -189,13 +191,12 @@ function parseKeycode(keycodesStore, keycode, stats) {
     }
 
     //Check whether it is a layer switching code, mod-tap, or combo keycode
-    if (internal.includes('KC')) {
+    if (internal.includes('KC') || metadata?.language_prefix !== undefined) {
       // Layer Tap keycode
       if (maincode === 'LT') {
         return newLayerContainerKey(keycodesStore, maincode, internal);
       }
       internal = longFormKeycodes[internal] || internal;
-      metadata = keycodesStore.lookupKeycode(internal);
       if (metadata === undefined) {
         stats.any += 1;
         return newAnyKey(keycodesStore, keycode);