diff --git a/assets/lightcones/22009-full.webp b/assets/lightcones/22009-full.webp
new file mode 100644
index 0000000..1dd374f
Binary files /dev/null and b/assets/lightcones/22009-full.webp differ
diff --git a/assets/lightcones/22009-icon.webp b/assets/lightcones/22009-icon.webp
new file mode 100644
index 0000000..22eb6d5
Binary files /dev/null and b/assets/lightcones/22009-icon.webp differ
diff --git a/assets/relics/329-5.webp b/assets/relics/329-5.webp
new file mode 100644
index 0000000..9a80fe2
Binary files /dev/null and b/assets/relics/329-5.webp differ
diff --git a/assets/relics/329-6.webp b/assets/relics/329-6.webp
new file mode 100644
index 0000000..62b7012
Binary files /dev/null and b/assets/relics/329-6.webp differ
diff --git a/assets/relics/330-5.webp b/assets/relics/330-5.webp
new file mode 100644
index 0000000..c5b5a2a
Binary files /dev/null and b/assets/relics/330-5.webp differ
diff --git a/assets/relics/330-6.webp b/assets/relics/330-6.webp
new file mode 100644
index 0000000..bd16a57
Binary files /dev/null and b/assets/relics/330-6.webp differ
diff --git a/css/styles.css b/css/styles.css
index ce42390..7709082 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -3835,3 +3835,15 @@ input:checked + .slider:before {
   }
   .showcase-splash-col { max-width: none; }
 }
+
+/* Keep Light Cone art legible in selection and detail views. */
+.lc-picker-thumb, .add-lc-card-thumb { width: 96px; height: 132px; object-fit: contain; }
+.eq-inspector-hero .eq-inspector-thumb { width: 120px; height: 170px; object-fit: contain; }
+.lc-art-wrapper { width: min(300px, 100%); height: auto; aspect-ratio: 3 / 4; }
+.lc-full-img { object-fit: contain; }
+.lc-art-wrapper:hover .lc-full-img { transform: none; }
+.btn-substat-preset .showcase-stat-icon { vertical-align: middle; margin-right: 3px; }
+@media (max-width: 600px) {
+  #add-lc-preview-thumb { width: 80px !important; height: 112px !important; }
+  .lc-picker-thumb, .add-lc-card-thumb { width: 76px; height: 106px; }
+}
diff --git a/index.html b/index.html
index 75745eb..1dd39e3 100644
--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>GaCy-Srtool</title>
-  <link rel="stylesheet" href="css/styles.css?v=2.22">
+  <link rel="stylesheet" href="css/styles.css?v=2.23">
   <link rel="stylesheet" href="css/item-catalog.css?v=2">
   <link rel="icon" type="image/png" href="assets/logo.png">
   <script src="https://cdnjs.cloudflare.com/ajax/libs/html2canvas/1.4.1/html2canvas.min.js"></script>
@@ -1016,7 +1016,7 @@
                   <span style="color: var(--accent-cyan); font-size: 0.7rem;" data-i18n="btnManage">จัดการ ➔</span>
                 </div>
                 <div style="display: flex; gap: 0.65rem; align-items: center;">
-                  <img id="overview-lc-thumb" src="" alt="" style="width: 44px; height: 60px; border-radius: 4px; object-fit: cover; border: 1px solid var(--border-color);">
+                  <img id="overview-lc-thumb" src="" alt="" style="width: 44px; height: 60px; border-radius: 4px; object-fit: contain; border: 1px solid var(--border-color);">
                   <div style="min-width: 0; flex: 1;">
                     <div id="overview-lc-name" style="font-weight: 700; font-size: 0.85rem; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;">-</div>
                     <div id="overview-lc-rank" style="font-size: 0.75rem; color: var(--accent-gold); margin-top: 0.2rem;">S5 • Lv.80</div>
@@ -1443,7 +1443,7 @@
 
   <!-- Party Member Picker Modal -->
   <div class="modal-overlay" id="modal-lineup-picker">
-    <div class="modal-content" style="max-width: 720px; max-height: 85vh; display: flex; flex-direction: column;">
+    <div class="modal-content" style="width: min(1100px, 96vw); max-width: 1100px; max-height: 92vh; display: flex; flex-direction: column;">
       <div class="modal-header">
         <h3 id="modal-picker-title" style="font-weight: 800;" data-i18n="pickerTitle">เลือกตัวละครเข้าทีม</h3>
         <button class="btn btn-sm btn-secondary" id="btn-close-picker-modal">✕</button>
@@ -1477,7 +1477,7 @@
 
   <!-- Add Light Cone Modal -->
   <div class="modal-overlay" id="modal-add-lc">
-    <div class="modal-content" style="max-width: 760px; max-height: 88vh; display: flex; flex-direction: column;">
+    <div class="modal-content" style="width: min(1100px, 96vw); max-width: 1100px; max-height: 92vh; display: flex; flex-direction: column;">
       <div class="modal-header" style="padding-bottom: 0.75rem; border-bottom: 1px solid var(--border-color); margin-bottom: 0.75rem;">
         <h3 style="font-weight: 800; margin: 0; display: flex; align-items: center; gap: 0.5rem;" data-i18n="modalAddLcTitle">
           🗡️ เพิ่มกรวยแสงลง FreeSR
@@ -1488,7 +1488,7 @@
       <form id="form-add-lc" style="display: flex; flex-direction: column; flex: 1; min-height: 0;">
         <!-- 1. Selected Lightcone Preview Strip -->
         <div id="add-lc-preview-banner" style="display: flex; gap: 0.85rem; align-items: center; background: rgba(251, 191, 36, 0.08); border: 1.5px solid var(--accent-gold); border-radius: var(--radius-sm); padding: 0.6rem 0.85rem; margin-bottom: 0.75rem;">
-          <img id="add-lc-preview-thumb" src="" alt="" style="width: 44px; height: 60px; border-radius: 4px; object-fit: cover; border: 1px solid var(--accent-gold); background: #0b0d14; flex-shrink: 0;">
+          <img id="add-lc-preview-thumb" src="" alt="" style="width: clamp(90px, 15vw, 150px); height: 190px; border-radius: 4px; object-fit: contain; border: 1px solid var(--accent-gold); background: #0b0d14; flex-shrink: 0;">
           <div style="flex: 1; min-width: 0;">
             <div style="font-size: 0.7rem; color: var(--accent-gold); font-weight: 800; text-transform: uppercase;">
               <span data-i18n="selectedLightConeLabel">✓ กรวยแสงที่เลือก (Selected)</span>
@@ -1526,7 +1526,7 @@
         </div>
 
         <!-- 3. Visual Grid Container -->
-        <div id="add-lc-visual-grid" class="add-lc-grid-container" style="flex: 1; min-height: 180px; max-height: 280px; overflow-y: auto; display: grid; grid-template-columns: repeat(auto-fill, minmax(210px, 1fr)); gap: 0.5rem; padding: 0.35rem; background: rgba(0, 0, 0, 0.25); border: 1px solid var(--border-color); border-radius: var(--radius-sm); margin-bottom: 0.75rem;">
+        <div id="add-lc-visual-grid" class="add-lc-grid-container" style="flex: 1; min-height: 220px; max-height: 45vh; overflow-y: auto; display: grid; grid-template-columns: repeat(auto-fill, minmax(210px, 1fr)); gap: 0.5rem; padding: 0.35rem; background: rgba(0, 0, 0, 0.25); border: 1px solid var(--border-color); border-radius: var(--radius-sm); margin-bottom: 0.75rem;">
           <!-- Dynamically populated by JS -->
         </div>
 
@@ -1723,7 +1723,7 @@
 
   <!-- Modal: Select Lightcone for Avatar -->
   <div class="modal-overlay" id="modal-select-lightcone">
-    <div class="modal-content" style="max-width: 720px; max-height: 85vh; display: flex; flex-direction: column;">
+    <div class="modal-content" style="width: min(1100px, 96vw); max-width: 1100px; max-height: 92vh; display: flex; flex-direction: column;">
       <div class="modal-header">
         <h3 id="modal-lc-picker-title" style="font-weight: 800;" data-i18n="lcPickerTitle">
           🗡️ เลือกสวมใส่กรวยแสง (Light Cone)
@@ -1823,6 +1823,6 @@
   <div class="toast-container" id="toast-container"></div>
 
   <!-- Script Modules -->
-  <script type="module" src="js/app.js?v=3.14"></script>
+  <script type="module" src="js/app.js?v=3.15"></script>
 </body>
 </html>
diff --git a/js/app.js b/js/app.js
index 9c121cb..887c4bb 100644
--- a/js/app.js
+++ b/js/app.js
@@ -1,6 +1,6 @@
 import { COMMANDS, usage, inspectCommand, completeCommand, setCommandLanguage, describeCommand } from './command-assistant.mjs';
 import { AVATAR_METADATA, getAvatarInfo } from './avatars-data.js';
-import { LIGHTCONE_METADATA, RELIC_SET_METADATA, getLightconeInfo, getRelicSetInfo } from './equipment-data.js';
+import { LIGHTCONE_METADATA, RELIC_SET_METADATA, getLightconeInfo, getRelicSetInfo } from './equipment-data.js?v=2.23';
 import { initializeItemCatalog } from './item-catalog.js?v=2';
 import { initializeUnstuck } from './unstuck.js?v=1';
 import { PRYDWEN_BUILD_GUIDES } from './build-guides-data.js';
@@ -552,6 +552,13 @@ function getElementIconHtml(element, size = 20) {
 }
 
 // Official in-game property icons (same set used by the overview tab)
+function getRelicImage(setId, slot = 5) {
+  return RELIC_SET_METADATA[setId]?.images?.[slot] || RELIC_SET_METADATA[setId]?.images?.[5] || `https://cdn.jsdelivr.net/gh/Mar-7th/StarRailRes@master/icon/relic/${setId}.png`;
+}
+function getLightconeIconSrc(id) {
+  return LIGHTCONE_METADATA[id]?.images?.thumbnail || `https://static.nanoka.cc/assets/hsr/lightconemediumicon/${id}.webp`;
+}
+
 const STAT_PROPERTY_ICON_CDN = 'https://cdn.jsdelivr.net/gh/Mar-7th/StarRailRes@master/icon/property';
 function getStatIconHtml(iconName, size = 15, alt = '') {
   if (!iconName) return '';
@@ -952,7 +959,13 @@ function applyTranslations() {
   document.querySelectorAll('[data-i18n]').forEach(elem => {
     const key = elem.getAttribute('data-i18n');
     const val = t(key);
-    if (val && val !== key) elem.textContent = val;
+    if (val && val !== key) {
+      const icons = { substatPresetCrit: ['IconCriticalChance', 'IconCriticalDamage'], substatPresetSpeed: ['IconSpeed'], substatPresetBreak: ['IconBreakUp'], substatPresetTank: ['IconMaxHP', 'IconDefence'] }[key];
+      if (icons) {
+        elem.textContent = val.replace(/^[🎯⚡🔨🛡️\s]+/u, '');
+        icons.slice().reverse().forEach(icon => elem.insertAdjacentHTML('afterbegin', getStatIconHtml(icon, 16, '')));
+      } else elem.textContent = val;
+    }
   });
 
   document.querySelectorAll('[data-i18n-placeholder]').forEach(elem => {
@@ -2760,7 +2773,7 @@ function getLightconeArtSrc(lcId) {
   if (id === 23065) {
     return './assets/lightcones/23065.png';
   }
-  return `https://raw.githubusercontent.com/Mar-7th/StarRailRes/master/image/light_cone_preview/${id}.png`;
+  return `https://static.nanoka.cc/assets/hsr/lightconemaxfigures/${id}.webp`;
 }
 
 function getLightconeArtFallback(lcId) {
@@ -2925,6 +2938,10 @@ function getLightconePassiveDesc(lcId, rank = 5) {
   const id = parseInt(lcId, 10);
   const r = Math.max(1, Math.min(5, rank));
   const meta = LIGHTCONE_METADATA[id];
+  if (meta?.passive) {
+    const values = meta.passive.values[r - 1];
+    return (meta.passive[getCurrentLanguage()] || meta.passive.en).replace(/\{(\d+)\}/g, (_, index) => values[Number(index)]);
+  }
 
   // The rank-scaled descriptions below are authored in Thai. Other locales use
   // the localized description shipped with the lightcone metadata instead.
@@ -3112,18 +3129,18 @@ function getRelicSubAffixName(affixId) {
 }
 
 export const RELIC_SUBSTATS_CONFIG = [
-  { id: 8, name: "CRIT Rate%", short: "CRIT Rate", icon: "🎯" },
-  { id: 9, name: "CRIT DMG%", short: "CRIT DMG", icon: "💥" },
-  { id: 7, name: "SPD", short: "SPD", icon: "⚡" },
-  { id: 5, name: "ATK%", short: "ATK%", icon: "⚔️" },
-  { id: 4, name: "HP%", short: "HP%", icon: "❤️" },
-  { id: 6, name: "DEF%", short: "DEF%", icon: "🛡️" },
-  { id: 12, name: "Break Effect%", short: "Break", icon: "🔨" },
-  { id: 10, name: "Effect Hit Rate%", short: "EHR", icon: "🎯" },
-  { id: 11, name: "Effect RES%", short: "RES", icon: "🔰" },
-  { id: 2, name: "ATK (Flat)", short: "ATK", icon: "🗡️" },
-  { id: 1, name: "HP (Flat)", short: "HP", icon: "🩸" },
-  { id: 3, name: "DEF (Flat)", short: "DEF", icon: "🧱" }
+  { id: 8, name: "CRIT Rate%", short: "CRIT Rate", icon: "IconCriticalChance" },
+  { id: 9, name: "CRIT DMG%", short: "CRIT DMG", icon: "IconCriticalDamage" },
+  { id: 7, name: "SPD", short: "SPD", icon: "IconSpeed" },
+  { id: 5, name: "ATK%", short: "ATK%", icon: "IconAttack" },
+  { id: 4, name: "HP%", short: "HP%", icon: "IconMaxHP" },
+  { id: 6, name: "DEF%", short: "DEF%", icon: "IconDefence" },
+  { id: 12, name: "Break Effect%", short: "Break", icon: "IconBreakUp" },
+  { id: 10, name: "Effect Hit Rate%", short: "EHR", icon: "IconStatusProbability" },
+  { id: 11, name: "Effect RES%", short: "RES", icon: "IconStatusResistance" },
+  { id: 2, name: "ATK (Flat)", short: "ATK", icon: "IconAttack" },
+  { id: 1, name: "HP (Flat)", short: "HP", icon: "IconMaxHP" },
+  { id: 3, name: "DEF (Flat)", short: "DEF", icon: "IconDefence" }
 ];
 
 export function formatRelicSubstatValue(affixId, rolls = 1) {
@@ -3270,7 +3287,7 @@ function renderModalOverviewTab(avatarId) {
 
   // Equipped LC Card Glance
   if (el.overviewLcThumb) {
-    el.overviewLcThumb.src = getLightconeArtSrc(lcId);
+    el.overviewLcThumb.src = getLightconeIconSrc(lcId);
     el.overviewLcThumb.onerror = function() {
       handleLcImgError(this, lcId);
     };
@@ -3607,7 +3624,7 @@ function renderModalRelicsTab(avatarId) {
   const lcBox = document.getElementById('relics-equipped-lc-box');
 
   if (lcThumbEl) {
-    lcThumbEl.src = getLightconeArtSrc(lcId);
+    lcThumbEl.src = getLightconeIconSrc(lcId);
     lcThumbEl.onerror = function() {
       handleLcImgError(this, lcId);
     };
@@ -3658,7 +3675,7 @@ function renderModalRelicsTab(avatarId) {
       box.className = 'relic-slot-box equipped';
       box.innerHTML = `
         <div class="relic-slot-icon-wrap">
-          <img src="https://cdn.jsdelivr.net/gh/Mar-7th/StarRailRes@master/icon/relic/${setId}.png"
+          <img src="${getRelicImage(setId, slot)}"
                onerror="this.src='./assets/logo.png'" alt="Relic" style="width: 100%; height: 100%; object-fit: contain;">
           <span class="relic-slot-badge">${slotInfo.icon} ${slotInfo.short}</span>
         </div>
@@ -3806,7 +3823,7 @@ function openSlotPicker(avatarId, slotNum, targetRelicToEdit = null) {
       currentBox.className = 'slot-picker-current-banner';
       currentBox.innerHTML = `
         <div style="display: flex; gap: 0.85rem; align-items: center; min-width: 0; flex: 1;">
-          <img src="https://cdn.jsdelivr.net/gh/Mar-7th/StarRailRes@master/icon/relic/${curSetId}.png"
+          <img src="${getRelicImage(curSetId, slot)}"
                onerror="this.src='./assets/logo.png'" alt="Relic"
                style="width: 48px; height: 48px; object-fit: contain; filter: drop-shadow(0 2px 4px rgba(0,0,0,0.5));">
           <div style="min-width: 0;">
@@ -3898,7 +3915,7 @@ function openSlotPicker(avatarId, slotNum, targetRelicToEdit = null) {
 
     recHighlight.innerHTML = `
       <div style="display: flex; gap: 0.85rem; align-items: center;">
-        <img src="https://cdn.jsdelivr.net/gh/Mar-7th/StarRailRes@master/icon/relic/${recSetId}.png"
+        <img src="${getRelicImage(recSetId, slot)}"
              onerror="this.src='./assets/logo.png'" alt="Relic"
              style="width: 52px; height: 52px; object-fit: contain;">
         <div>
@@ -3991,6 +4008,10 @@ function openSlotPicker(avatarId, slotNum, targetRelicToEdit = null) {
   // Confirm Custom Button
   if (btnConfirmCustom) {
     btnConfirmCustom.onclick = async () => {
+      if (RELIC_SET_METADATA[slotPickerSelectedSetId]?.creationAvailable === false) {
+        showToast('Requires matching server relic and main affix data.', 'warning');
+        return;
+      }
       if (slotPickerTargetRelic) {
         await saveEditedRelicSubstats(slotPickerTargetRelic, slotPickerSelectedSetId, slotPickerSelectedMainAffix, slotPickerSubstats);
       } else {
@@ -4033,7 +4054,7 @@ function renderSlotPickerSubstats(slot, mainAffixId) {
       const isSelected = stat.id === sub.sub_affix_id;
       const disabledAttr = (isConflict || (isChosenElsewhere && !isSelected)) ? 'disabled' : '';
       const conflictTag = isConflict ? t('substatMainConflict') : (isChosenElsewhere && !isSelected ? t('substatAlreadyChosen') : '');
-      optsHtml += `<option value="${stat.id}" ${isSelected ? 'selected' : ''} ${disabledAttr}>${stat.icon} ${stat.name}${conflictTag}</option>`;
+      optsHtml += `<option value="${stat.id}" ${isSelected ? 'selected' : ''} ${disabledAttr}>${stat.name}${conflictTag}</option>`;
     });
 
     card.innerHTML = `
@@ -4042,6 +4063,7 @@ function renderSlotPickerSubstats(slot, mainAffixId) {
         <span class="substat-preview-badge" id="substat-preview-${idx}">${t('substatRolls', { value: sVal, count: sub.count })}</span>
       </div>
       <div class="substat-row-controls">
+        ${getStatIconHtml(RELIC_SUBSTATS_CONFIG.find(stat => stat.id === sub.sub_affix_id)?.icon, 20, "")}
         <select class="form-select substat-select" data-idx="${idx}">
           ${optsHtml}
         </select>
@@ -4206,12 +4228,19 @@ function renderSlotPickerSetGrid(slot, recSetId) {
     const isSelected = sId === slotPickerSelectedSetId;
     card.className = `slot-picker-set-card ${isSelected ? 'selected' : ''}`;
     card.innerHTML = `
-      <img src="https://cdn.jsdelivr.net/gh/Mar-7th/StarRailRes@master/icon/relic/${sId}.png"
+      <img src="${getRelicImage(sId, slot)}"
            onerror="this.src='./assets/logo.png'" alt="${sInfo.name}">
       <span title="${sInfo.name}">${sInfo.name}</span>
       ${sId === recSetId ? `<span style="font-size: 0.65rem; color: var(--accent-gold); font-weight: 800;">⭐ ${t('recommendedBadge')}</span>` : ''}
     `;
 
+    if (RELIC_SET_METADATA[sId].creationAvailable === false) {
+      card.style.opacity = '0.5';
+      card.title = 'Requires matching server relic and main affix data';
+      card.setAttribute('aria-disabled', 'true');
+      grid.appendChild(card);
+      return;
+    }
     card.addEventListener('click', () => {
       slotPickerSelectedSetId = sId;
       grid.querySelectorAll('.slot-picker-set-card').forEach(c => c.classList.remove('selected'));
@@ -4327,7 +4356,7 @@ function renderSlotPickerInventoryGrid(aid, slot) {
     card.innerHTML = `
       <div style="display: flex; justify-content: space-between; align-items: center; gap: 0.5rem;">
         <div style="display: flex; gap: 0.65rem; align-items: center; min-width: 0;">
-          <img src="https://cdn.jsdelivr.net/gh/Mar-7th/StarRailRes@master/icon/relic/${setId}.png"
+          <img src="${getRelicImage(setId, slot)}"
                onerror="this.src='./assets/logo.png'" alt="${rInfo.name}"
                style="width: 40px; height: 40px; object-fit: contain;">
           <div style="min-width: 0;">
@@ -5431,7 +5460,7 @@ function renderShowcaseCard(avatarId) {
     relicsHtml += `
       <div class="showcase-relic-card">
         <div class="showcase-relic-icon-wrap">
-          <img class="showcase-relic-img" src="https://cdn.jsdelivr.net/gh/Mar-7th/StarRailRes@master/icon/relic/${setId}.png" onerror="this.src='./assets/logo.png'" alt="Relic">
+          <img class="showcase-relic-img" src="${getRelicImage(setId, slot)}" onerror="this.src='./assets/logo.png'" alt="Relic">
           <span class="showcase-relic-lvl-tag">+15</span>
         </div>
         <div class="showcase-relic-info">
@@ -5449,7 +5478,7 @@ function renderShowcaseCard(avatarId) {
 
   const primaryPortrait = getAvatarSplashSrc(aid);
   const fallbackPortrait = `https://cdn.jsdelivr.net/gh/Mar-7th/StarRailRes@master/image/character_portrait/${aid}.png`;
-  const lcArtThumb = getLightconeArtSrc(lcId);
+  const lcArtThumb = getLightconeIconSrc(lcId);
 
   // Use the same official property icons as the character overview tab.
   const elemStatIconName = `Icon${canonElem === 'Lightning' ? 'Thunder' : canonElem}AddedRatio`;
@@ -6358,7 +6387,7 @@ function renderLightconesGrid() {
       </div>
     ` : '';
 
-    const primaryImg = getLightconeArtSrc(lc.item_id);
+    const primaryImg = getLightconeIconSrc(lc.item_id);
 
     card.innerHTML = `
       <img class="eq-tile-img" src="${primaryImg}" onerror="handleLcImgError(this, ${lc.item_id})" alt="${meta.name}">
@@ -6425,8 +6454,8 @@ function renderRelicsGrid() {
       </div>
     ` : '';
 
-    const primaryImg = `https://raw.githubusercontent.com/Mar-7th/StarRailRes/master/icon/relic/${setId}.png`;
-    const fallbackImg = `https://cdn.jsdelivr.net/gh/Mar-7th/StarRailRes@master/icon/relic/${setId}.png`;
+    const primaryImg = getRelicImage(setId, slotNum);
+    const fallbackImg = './assets/logo.png';
 
     card.innerHTML = `
       <img class="eq-tile-img" src="${primaryImg}" onerror="if(this.src!=='${fallbackImg}')this.src='${fallbackImg}';else this.src='./assets/logo.png';" alt="${rInfo.name}">
@@ -6491,15 +6520,15 @@ function showLcInspector(lc) {
     <!-- Stats Box -->
     <div class="eq-inspector-stats">
       <div class="eq-inspector-stat-row">
-        <span style="color: var(--text-muted);">❤️ HP</span>
+        <span style="color: var(--text-muted);">${getStatIconHtml('IconMaxHP', 18, '')} HP</span>
         <strong style="color: #fff; font-family: monospace;">+${hp}</strong>
       </div>
       <div class="eq-inspector-stat-row">
-        <span style="color: var(--text-muted);">⚔️ ATK</span>
+        <span style="color: var(--text-muted);">${getStatIconHtml('IconAttack', 18, '')} ATK</span>
         <strong style="color: #fff; font-family: monospace;">+${atk}</strong>
       </div>
       <div class="eq-inspector-stat-row">
-        <span style="color: var(--text-muted);">🛡️ DEF</span>
+        <span style="color: var(--text-muted);">${getStatIconHtml('IconDefence', 18, '')} DEF</span>
         <strong style="color: #fff; font-family: monospace;">+${def}</strong>
       </div>
     </div>
@@ -6507,7 +6536,7 @@ function showLcInspector(lc) {
     <!-- Passive Skill -->
     <div class="eq-inspector-ability">
       <div style="font-weight: 800; color: var(--accent-cyan); margin-bottom: 0.25rem;">${lcMeta.skill_name || t('eqSkillFallbackTitle')}</div>
-      <div>${lcMeta.desc || t('eqSkillFallbackDesc')}</div>
+      <div>${lcMeta.passive ? getLightconePassiveDesc(lc.item_id, lc.rank || 1) : (lcMeta.desc || t('eqSkillFallbackDesc'))}</div>
     </div>
 
     <!-- Wearer Form & Actions -->
@@ -6583,7 +6612,7 @@ function showRelicInspector(relic) {
   el.eqInspectorCard.innerHTML = `
     <div style="display: flex; justify-content: space-between; align-items: flex-start;">
       <div class="eq-inspector-hero">
-        <img class="eq-inspector-thumb" src="https://cdn.jsdelivr.net/gh/Mar-7th/StarRailRes@master/icon/relic/${setId}.png" onerror="this.src='./assets/logo.png'" alt="${rInfo.name}">
+        <img class="eq-inspector-thumb" src="${getRelicImage(setId, slotNum)}" onerror="this.src='./assets/logo.png'" alt="${rInfo.name}">
         <div class="eq-inspector-info">
           <div class="eq-inspector-title">${rInfo.name}</div>
           <div class="eq-inspector-stars">★★★★★</div>
@@ -6847,7 +6876,8 @@ function openAddRelicModal() {
     const meta = getRelicSetInfo(setId);
     const opt = document.createElement('option');
     opt.value = setId;
-    opt.textContent = `${meta.name} (Set ID: ${setId})`;
+    opt.disabled = RELIC_SET_METADATA[setId].creationAvailable === false;
+    opt.textContent = `${meta.name} (Set ID: ${setId})${opt.disabled ? ' — requires server data' : ''}`;
     el.addRelicSet.appendChild(opt);
   });
 
diff --git a/js/equipment-data.js b/js/equipment-data.js
index 59f13c2..b7e3d23 100644
--- a/js/equipment-data.js
+++ b/js/equipment-data.js
@@ -3258,6 +3258,14 @@ export const LIGHTCONE_METADATA = {
   }
 };
 
+// Item data and artwork: nanoka.cc, game data revision 4.6.54.
+LIGHTCONE_METADATA[22009] = {
+  names: { en: "See You at the World's End!" }, rarity: 4, path: 'Elation',
+  hp: 847, atk: 476, def: 397,
+  images: { fullArt: './assets/lightcones/22009-full.webp', thumbnail: './assets/lightcones/22009-icon.webp' },
+  passive: { en: "For every Elation character on the team, increases the wearer's CRIT DMG by {0}%. When Aeon ★ Aha is on the field, the wearer's CRIT DMG additionally increases by {1}%.", values: [[6,12],[7,14],[8,16],[9,18],[10,20]] }
+};
+
 export const RELIC_SET_METADATA = {
   "101": {
     "names": {
@@ -4315,6 +4323,12 @@ export const RELIC_SET_METADATA = {
   }
 };
 
+// Set data and artwork are from the 4.6.54 catalog. Creation needs matching server affix tables.
+Object.assign(RELIC_SET_METADATA, {
+  329: { creationAvailable: false, names: { en: "God's Moment of Joy" }, desc2: "Increases the wearer's SPD by 6%. When the wearer's Elation reaches 40% or higher, the wearer's action advances by 40% immediately when entering combat.", images: { 5: './assets/relics/329-5.webp', 6: './assets/relics/329-6.webp' } },
+  330: { creationAvailable: false, names: { en: 'Subspace ASC Center' }, desc2: "Increases the wearer's SPD by 6%. When the wearer's SPD reaches 145 or higher, increases all allies' Break Effect by 18% after entering combat. This effect cannot stack.", images: { 5: './assets/relics/330-5.webp', 6: './assets/relics/330-6.webp' } }
+});
+
 export function getLightconeInfo(lcId, langOverride = null) {
   const lang = langOverride || getCurrentLanguage();
   const meta = LIGHTCONE_METADATA[lcId];
@@ -4352,6 +4366,8 @@ export function getRelicSetInfo(setIdOrRelicId, langOverride = null) {
   const localizedName = meta.names?.[lang] || meta.names?.en || meta.names?.th || `Relic Set ${setId}`;
   return {
     id: setId,
-    name: localizedName
+    name: localizedName,
+    desc2: meta.desc2,
+    desc4: meta.desc4
   };
 }
diff --git a/tests/equipment-data.test.cjs b/tests/equipment-data.test.cjs
new file mode 100644
index 0000000..1b54a4f
--- /dev/null
+++ b/tests/equipment-data.test.cjs
@@ -0,0 +1,20 @@
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const fs = require('node:fs');
+const path = require('node:path');
+
+test('4.6 equipment metadata and bundled artwork are available', async () => {
+  const { LIGHTCONE_METADATA, RELIC_SET_METADATA, getRelicSetInfo } = await import('../js/equipment-data.js');
+  const lc = LIGHTCONE_METADATA[22009];
+  assert.equal(lc.names.en, "See You at the World's End!");
+  assert.equal(lc.path, 'Elation');
+  assert.deepEqual(lc.passive.values, [[6,12],[7,14],[8,16],[9,18],[10,20]]);
+  for (const file of Object.values(lc.images)) assert.ok(fs.existsSync(path.resolve(__dirname, '..', file)));
+  for (const [id, name] of [[329, "God's Moment of Joy"], [330, 'Subspace ASC Center']]) {
+    const relic = RELIC_SET_METADATA[id];
+    assert.equal(getRelicSetInfo(id, 'en').name, name);
+    assert.ok(getRelicSetInfo(id, 'en').desc2);
+    assert.equal(relic.creationAvailable, false);
+    for (const slot of [5, 6]) assert.ok(fs.existsSync(path.resolve(__dirname, '..', relic.images[slot])));
+  }
+});