From 70cba11fb73ed57a5db82d2a215836a5134b5650 Mon Sep 17 00:00:00 2001
From: unknown <kate522@88.com>
Date: Sun, 6 Sep 2026 14:27:49 +0800
Subject: [PATCH] feat(icons): wire the universal picker into tabbar/floating
 settings and keep customsvg through their save paths
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

手机底部Tab and 右侧悬浮按钮 settings pages swap their icon text inputs
for the shared FaIconPicker (with a new IconValue preview component that
renders FA/sprite/custom SVG values in lists and previews). footer.php
tabbar/floating/sub-item icons and the VIP float render through
aksrt_icon_markup so every stored format displays; GlobalControllerPart1
and the VIP helper drop the FA-only regex gate and sanitize icon values
through aksrt_sanitize_icon_value. The picker popover tabs now wrap
instead of overflowing, and FA grid previews use style-only classes.
---
 .../src/components/form/FaIconPicker.vue      | 28 ++++-------
 .../admin/src/components/form/IconValue.vue   | 48 +++++++++++++++++++
 .../pages/content/FloatingButtonsSettings.vue | 18 +++----
 .../pages/content/FooterTabbarSettings.vue    | 15 +++---
 assets/js/admin-icon-picker.js                |  3 +-
 footer.php                                    | 20 ++++----
 inc/helpers/aksrt-runtime-win.php             | 10 ++--
 src/Admin/GlobalControllerPart1.php           | 17 +++----
 8 files changed, 96 insertions(+), 63 deletions(-)
 create mode 100644 assets/admin/src/components/form/IconValue.vue

diff --git a/assets/admin/src/components/form/FaIconPicker.vue b/assets/admin/src/components/form/FaIconPicker.vue
index 436d01ff..57bfd1ec 100644
--- a/assets/admin/src/components/form/FaIconPicker.vue
+++ b/assets/admin/src/components/form/FaIconPicker.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="aksrt-fa-icon-picker">
-    <n-popover trigger="click" placement="bottom-start" :width="400" :style="{ padding: 0 }">
+    <n-popover trigger="click" placement="bottom-start" :width="460" :style="{ padding: 0 }">
       <template #trigger>
         <n-input
           :value="modelValue"
@@ -10,20 +10,8 @@
           @clear="$emit('update:modelValue', '')"
         >
           <template #prefix>
-            <!-- FA value -->
-            <FaIcon v-if="isFaValue(modelValue)" :icon="modelValue" />
-            <!-- Built-in sprite value -->
-            <span
-              v-else-if="isZibsvgValue(modelValue)"
-              class="aksrt-icon-picker__preview-svg"
-              v-html="zibsvgMarkup(modelValue)"
-            ></span>
-            <!-- Inline custom SVG value -->
-            <span
-              v-else-if="isCustomSvgValue(modelValue)"
-              class="aksrt-icon-picker__preview-svg"
-              v-html="cleanSvg(modelValue.slice(10))"
-            ></span>
+            <IconValue v-if="modelValue" :value="modelValue" />
+            <template v-else></template>
           </template>
           <template #suffix>
             <FaIcon icon="fa fas fa-chevron-down" :size="12" />
@@ -80,7 +68,7 @@
             :title="icon"
             @click="selectIcon(icon)"
           >
-            <i v-if="activeGroup.type === 'fa'" :class="['fa', activeTab, icon]"></i>
+            <i v-if="activeGroup.type === 'fa'" :class="[activeTab, icon]"></i>
             <span
               v-else
               class="aksrt-icon-picker__preview-svg"
@@ -104,12 +92,10 @@
  */
 import { ref, computed, onMounted } from 'vue'
 import FaIcon from './FaIcon.vue'
+import IconValue from './IconValue.vue'
 import api from '@/api/index.js'
 import {
   cleanSvg,
-  isFaValue,
-  isZibsvgValue,
-  isCustomSvgValue,
   zibsvgMarkup,
   composeIconValue,
 } from '@/utils/icons.js'
@@ -184,6 +170,10 @@ onMounted(async () => {
   margin-bottom: 10px;
 }
 
+.aksrt-icon-picker__tabs :deep(.n-radio-group) {
+  flex-wrap: wrap;
+}
+
 .aksrt-icon-picker__grid {
   display: grid;
   grid-template-columns: repeat(8, 1fr);
diff --git a/assets/admin/src/components/form/IconValue.vue b/assets/admin/src/components/form/IconValue.vue
new file mode 100644
index 00000000..bb59cfd3
--- /dev/null
+++ b/assets/admin/src/components/form/IconValue.vue
@@ -0,0 +1,48 @@
+<template>
+  <!-- FA class value -->
+  <i v-if="isFaValue(value)" :class="faClass" aria-hidden="true"></i>
+  <!-- Built-in sprite value -->
+  <span
+    v-else-if="isZibsvgValue(value)"
+    class="aksrt-icon-value__svg"
+    v-html="zibsvgMarkup(value)"
+  ></span>
+  <!-- Inline custom SVG value -->
+  <span
+    v-else-if="isCustomSvgValue(value)"
+    class="aksrt-icon-value__svg"
+    v-html="cleanSvg(value.slice(10))"
+  ></span>
+</template>
+
+<script setup>
+/**
+ * IconValue — renders any icon-picker value ("fa fas fa-x", "zibsvg-key",
+ * "customsvg-<svg>") as inline preview markup.
+ */
+import { computed } from 'vue'
+import { cleanSvg, isFaValue, isZibsvgValue, isCustomSvgValue, zibsvgMarkup } from '@/utils/icons.js'
+
+const props = defineProps({
+  value: { type: String, default: '' },
+})
+
+const faClass = computed(() => {
+  const raw = String(props.value || '').trim()
+  if (raw.startsWith('fa-')) return `fa fas ${raw}`
+  return raw
+})
+</script>
+
+<style scoped>
+.aksrt-icon-value__svg {
+  display: inline-flex;
+}
+
+.aksrt-icon-value__svg :deep(svg),
+.aksrt-icon-value__svg svg {
+  width: 1em;
+  height: 1em;
+  fill: currentColor;
+}
+</style>
diff --git a/assets/admin/src/pages/content/FloatingButtonsSettings.vue b/assets/admin/src/pages/content/FloatingButtonsSettings.vue
index 4fced9b9..9520d025 100644
--- a/assets/admin/src/pages/content/FloatingButtonsSettings.vue
+++ b/assets/admin/src/pages/content/FloatingButtonsSettings.vue
@@ -90,7 +90,7 @@
                   <i class="fa fas fa-bars"></i>
                 </button>
                 <span class="float-btn-sort__icon">
-                  <i v-if="element.icon" :class="element.icon"></i>
+                  <IconValue v-if="element.icon" :value="element.icon" />
                 </span>
                 <div class="float-btn-sort__meta">
                   <div class="float-btn-sort__title-row">
@@ -140,7 +140,7 @@
             <n-select v-model:value="editingItem.type" :options="typeOptions" placeholder="选择按钮类型" @update:value="handleTypeChange" />
           </n-form-item-gi>
           <n-form-item-gi v-if="editingItem.type !== 'theme_mode'" label="主图标 (Font Awesome)">
-            <n-input v-model:value="editingItem.icon" placeholder="例如: fa fas fa-home" />
+            <FaIconPicker v-model:value="editingItem.icon" placeholder="选择图标" />
           </n-form-item-gi>
           <n-form-item-gi v-else label="主题图标">
             <div class="theme-icon-preview">
@@ -155,7 +155,7 @@
           <template v-if="editingItem.type === 'theme_mode'">
             <span class="theme-icon-preview-inline"><i class="fa fas fa-sun"></i> / <i class="fa fas fa-moon"></i></span>
           </template>
-          <i v-else-if="editingItem.icon" :class="editingItem.icon" style="font-size: 18px;"></i>
+          <IconValue v-else-if="editingItem.icon" :value="editingItem.icon" style="font-size: 18px;" />
           <span v-else class="muted-text">未设置图标</span>
           <a href="https://fontawesome.com/search?m=free" target="_blank" rel="noopener">
             <i class="fa fas fa-external-link-alt"></i>
@@ -254,7 +254,7 @@
                     <i class="fa fas fa-bars"></i>
                   </button>
                   <n-input v-model:value="element.label" placeholder="名称，例如: 写文章" />
-                  <n-input v-model:value="element.icon" placeholder="图标，例如: fa fas fa-pen" />
+                  <FaIconPicker v-model:value="element.icon" placeholder="选择图标" />
                   <n-input v-model:value="element.url" placeholder="链接，例如: /submit" />
                   <n-button quaternary type="error" @click="removeAddItem(subIndex)">
                     <template #icon><i class="fa fas fa-trash-alt" /></template>
@@ -270,7 +270,7 @@
             <div class="add-items-preview__panel add-items-preview__panel--light">
               <div class="add-items-preview__mode">亮色</div>
               <div class="add-items-preview__trigger">
-                <i :class="editingItem.icon || 'fa fas fa-plus'"></i>
+                <IconValue :value="editingItem.icon || 'fa fas fa-plus'" />
               </div>
               <div class="add-items-preview__menu">
                 <div v-if="editingItem.add_items.length" class="add-items-preview__list">
@@ -280,7 +280,7 @@
                     href="javascript:void(0)"
                     class="add-items-preview__item"
                   >
-                    <i :class="subItem.icon || 'fa fas fa-pen'"></i>
+                    <IconValue :value="subItem.icon || 'fa fas fa-pen'" />
                     <span>{{ subItem.label || '未命名子项' }}</span>
                   </a>
                 </div>
@@ -290,7 +290,7 @@
             <div class="add-items-preview__panel add-items-preview__panel--dark">
               <div class="add-items-preview__mode">暗色</div>
               <div class="add-items-preview__trigger add-items-preview__trigger--dark">
-                <i :class="editingItem.icon || 'fa fas fa-plus'"></i>
+                <IconValue :value="editingItem.icon || 'fa fas fa-plus'" />
               </div>
               <div class="add-items-preview__menu add-items-preview__menu--dark">
                 <div v-if="editingItem.add_items.length" class="add-items-preview__list">
@@ -300,7 +300,7 @@
                     href="javascript:void(0)"
                     class="add-items-preview__item add-items-preview__item--dark"
                   >
-                    <i :class="subItem.icon || 'fa fas fa-pen'"></i>
+                    <IconValue :value="subItem.icon || 'fa fas fa-pen'" />
                     <span>{{ subItem.label || '未命名子项' }}</span>
                   </a>
                 </div>
@@ -344,6 +344,8 @@ import { NButton, NTag, useDialog, useMessage } from 'naive-ui'
 import draggable from 'vuedraggable'
 import api from '@/api'
 import PageHeader from '@/components/PageHeader.vue'
+import FaIconPicker from '@/components/form/FaIconPicker.vue'
+import IconValue from '@/components/form/IconValue.vue'
 
 const message = useMessage()
 const dialog = useDialog()
diff --git a/assets/admin/src/pages/content/FooterTabbarSettings.vue b/assets/admin/src/pages/content/FooterTabbarSettings.vue
index b171f3d4..9638c014 100644
--- a/assets/admin/src/pages/content/FooterTabbarSettings.vue
+++ b/assets/admin/src/pages/content/FooterTabbarSettings.vue
@@ -75,7 +75,7 @@
                   <i class="fa fas fa-bars"></i>
                 </button>
                 <span class="tabbar-sort__icon">
-                  <i v-if="element.icon" :class="element.icon"></i>
+                  <IconValue v-if="element.icon" :value="element.icon" />
                 </span>
                 <div class="tabbar-sort__meta">
                   <div class="tabbar-sort__title-row">
@@ -128,16 +128,13 @@
           />
         </n-form-item>
 
-        <n-form-item label="图标 (Font Awesome)">
-          <n-input v-model:value="editingItem.icon" placeholder="例如: fa fas fa-home" />
+        <n-form-item label="图标 (Font Awesome / 内置 SVG)">
+          <FaIconPicker v-model:value="editingItem.icon" placeholder="选择图标" />
           <template #feedback>
             <div class="icon-preview-row">
               <span>预览：</span>
-              <i v-if="editingItem.icon" :class="editingItem.icon" style="font-size: 20px;"></i>
+              <IconValue v-if="editingItem.icon" :value="editingItem.icon" style="font-size: 20px;" />
               <span v-else class="muted-text">无图标</span>
-              <a href="https://fontawesome.com/search?m=free" target="_blank" rel="noopener" style="margin-left: 12px;">
-                <i class="fa fas fa-external-link-alt"></i> Font Awesome 图标库
-              </a>
             </div>
           </template>
         </n-form-item>
@@ -230,7 +227,7 @@
                     <i class="fa fas fa-bars"></i>
                   </button>
                   <n-input v-model:value="element.label" placeholder="名称，例如：写文章" />
-                  <n-input v-model:value="element.icon" placeholder="图标，例如：fa fas fa-pen" />
+                  <FaIconPicker v-model:value="element.icon" placeholder="选择图标" />
                   <n-input v-model:value="element.url" placeholder="链接，例如：/wp-admin/post-new.php" />
                   <n-button quaternary type="error" @click="removeAddItem(subIndex)">
                     <template #icon><i class="fa fas fa-trash-alt" /></template>
@@ -268,6 +265,8 @@ import { NButton, NTag, useDialog, useMessage } from 'naive-ui'
 import draggable from 'vuedraggable'
 import api from '@/api'
 import PageHeader from '@/components/PageHeader.vue'
+import FaIconPicker from '@/components/form/FaIconPicker.vue'
+import IconValue from '@/components/form/IconValue.vue'
 
 const message = useMessage()
 const dialog = useDialog()
diff --git a/assets/js/admin-icon-picker.js b/assets/js/admin-icon-picker.js
index fa3edaa6..b0582f94 100644
--- a/assets/js/admin-icon-picker.js
+++ b/assets/js/admin-icon-picker.js
@@ -98,7 +98,8 @@
       (group.icons || []).forEach((name) => {
         if (group.type === 'fa') {
           const value = `fa ${group.id} fa-${name}`;
-          $grid.append(itemButton(value, name, `<i class="fa ${group.id} fa-${escapeText(name)}" aria-hidden="true"></i>`));
+          // Style-class-only preview: immune to the .fa family override in FA5's css.
+          $grid.append(itemButton(value, name, `<i class="${group.id} fa-${escapeText(name)}" aria-hidden="true"></i>`));
         } else if (group.type === 'svg') {
           const value = `zibsvg-${name}`;
           const key = escapeText(name).replace(/[^a-zA-Z0-9_-]/g, '');
diff --git a/footer.php b/footer.php
index 1eb7116b..a517305c 100644
--- a/footer.php
+++ b/footer.php
@@ -132,9 +132,7 @@ $_footer_conter = wp_kses_post(trim((string) $footer_customize_code));
 						$m_url  = (string) ($more_item['link'] ?? '');
                         $m_text = (string) ($more_item['desc'] ?? '');
                         $m_icon = (string) ($more_item['icon'] ?? '');
-                        $m_icon_html = ($m_icon !== '' && function_exists('aksrt_brand_icon'))
-                            ? aksrt_brand_icon($m_icon)
-                            : '';
+                        $m_icon_html = $m_icon !== '' ? aksrt_icon_markup($m_icon) : '';
                         if ($m_icon_html === '') {
                             $m_icon_html = '<i class="fa fas fa-heart" aria-hidden="true"></i>';
                         }
@@ -262,7 +260,7 @@ if ($floating_enabled) :
             $item_class .= ' ontop';
             ?>
 	<a href="#" class="<?php echo esc_attr($item_class); ?>" id="float-back-to-top" role="button" aria-label="<?php echo esc_attr($item_text ?: __('返回顶部', 'aksrt')); ?>"<?php echo $style_attr; ?>>
-		<i class="<?php echo esc_attr($item_icon); ?>" aria-hidden="true"></i>
+		<?php echo aksrt_icon_markup((string) $item_icon); // pre-escaped ?>
 	</a>
 	<?php elseif ($item_type === 'theme_mode') :
             $item_class .= ' theme-toggle-btn';
@@ -282,7 +280,7 @@ if ($floating_enabled) :
             $wechat_img = $item['wechat_img'] ?? ($item['qrcode_img'] ?? '');
             ?>
 	<a href="#" class="<?php echo esc_attr($item_class); ?>" role="button" aria-label="<?php echo esc_attr($item_text ?: __('微信', 'aksrt')); ?>"<?php echo $style_attr; ?>>
-		<i class="<?php echo esc_attr($item_icon); ?>" aria-hidden="true"></i>
+		<?php echo aksrt_icon_markup((string) $item_icon); // pre-escaped ?>
 		<?php if ($wechat_img) : ?>
 		<div class="hover-show-con">
 			<img src="<?php echo esc_url($wechat_img); ?>" alt="<?php esc_attr_e('微信二维码', 'aksrt'); ?>">
@@ -296,7 +294,7 @@ if ($floating_enabled) :
             $qq_img    = $item['qrcode_img'] ?? '';
             ?>
 	<a href="<?php echo $qq_number ? esc_url('https://wpa.qq.com/msgrd?v=3&uin=' . $qq_number . '&site=qq&menu=yes') : '#'; ?>" class="<?php echo esc_attr($item_class); ?>" role="button"<?php echo $qq_number ? ' target="_blank" rel="noopener noreferrer"' : ''; ?> aria-label="<?php echo esc_attr($item_text ?: 'QQ'); ?>"<?php echo $style_attr; ?>>
-		<i class="<?php echo esc_attr($item_icon); ?>" aria-hidden="true"></i>
+		<?php echo aksrt_icon_markup((string) $item_icon); // pre-escaped ?>
 		<?php if ($qq_img || $qq_number) : ?>
 		<div class="hover-show-con">
 			<?php if ($qq_img) : ?>
@@ -311,7 +309,7 @@ if ($floating_enabled) :
             $add_items = is_array($item['add_items'] ?? null) ? $item['add_items'] : [];
             ?>
 	<a href="#" class="<?php echo esc_attr($item_class); ?>" role="button" aria-label="<?php echo esc_attr($item_text ?: __('发布', 'aksrt')); ?>"<?php echo $style_attr; ?>>
-		<i class="<?php echo esc_attr($item_icon); ?>" aria-hidden="true"></i>
+		<?php echo aksrt_icon_markup((string) $item_icon); // pre-escaped ?>
 		<?php if (!empty($add_items)) : ?>
 		<div class="hover-show-con">
 			<div class="float-add-menu">
@@ -321,7 +319,7 @@ if ($floating_enabled) :
                     $sub_text = $sub['text'] ?? '';
                     ?>
 				<a href="<?php echo esc_url($sub_url); ?>" class="float-add-menu__item">
-					<i class="<?php echo esc_attr($sub_icon); ?>" aria-hidden="true"></i>
+					<?php echo aksrt_icon_markup((string) $sub_icon); // pre-escaped ?>
 					<span><?php echo esc_html($sub_text); ?></span>
 				</a>
 				<?php endforeach; ?>
@@ -333,7 +331,7 @@ if ($floating_enabled) :
             $item_class .= ' qrcode-btn';
             ?>
 	<a href="#" class="<?php echo esc_attr($item_class); ?>" role="button" aria-label="<?php echo esc_attr($item_text ?: __('二维码', 'aksrt')); ?>"<?php echo $style_attr; ?>>
-		<i class="<?php echo esc_attr($item_icon); ?>" aria-hidden="true"></i>
+		<?php echo aksrt_icon_markup((string) $item_icon); // pre-escaped ?>
 			<div class="hover-show-con">
 				<div
 					class="qrcode float-btn-qrcode"
@@ -348,7 +346,7 @@ if ($floating_enabled) :
             $hover_width = (int) ($item['hover_width'] ?? 200);
             ?>
 	<a href="<?php echo esc_url($item_url ?: '#'); ?>" class="<?php echo esc_attr($item_class); ?>"<?php echo $item_target; echo $style_attr; ?>>
-		<i class="<?php echo esc_attr($item_icon); ?>" aria-hidden="true"></i>
+		<?php echo aksrt_icon_markup((string) $item_icon); // pre-escaped ?>
 		<?php if ($hover_html !== '') : ?>
 		<div class="hover-show-con"<?php echo $hover_width !== 200 ? ' style="min-width:' . (int) $hover_width . 'px"' : ''; ?>>
 			<div class="float-right__html"><?php echo wp_kses_post($hover_html); ?></div>
@@ -390,7 +388,7 @@ if ($floating_enabled) :
 			}
 			?>
 	<a href="<?php echo esc_url($tab_href); ?>" class="tabbar-item" data-type="<?php echo esc_attr($tab_type); ?>">
-		<i class="<?php echo esc_attr($tab_icon); ?>" aria-hidden="true"></i>
+		<?php echo aksrt_icon_markup((string) $tab_icon); // pre-escaped ?>
 		<?php if (!empty($tabbar_settings['show_text'])) : ?><span><?php echo esc_html($tab_text); ?></span><?php endif; ?>
 	</a>
 		<?php endforeach;
diff --git a/inc/helpers/aksrt-runtime-win.php b/inc/helpers/aksrt-runtime-win.php
index b1b36b2c..0f21b517 100644
--- a/inc/helpers/aksrt-runtime-win.php
+++ b/inc/helpers/aksrt-runtime-win.php
@@ -43,11 +43,9 @@ if (!function_exists('aksrt_get_float_pay_vip_html')) :
 		}
 
 		$icon = trim((string) ($item['icon'] ?? ''));
-		if ($icon === '') {
-			$icon = 'fa fas fa-gem';
-		}
-		if (!preg_match('/^fa\s+(?:fas|far|fab)\s+fa-[a-z0-9-]+(?:\s+fa-[a-z0-9-]+)*$/i', $icon)) {
-			$icon = 'fa fas fa-gem';
+		$icon_html = aksrt_icon_markup($icon);
+		if ($icon_html === '') {
+			$icon_html = aksrt_icon_markup('fa fas fa-gem');
 		}
 
 		// Logged-in: open modal. Guest: open login.
@@ -72,7 +70,7 @@ if (!function_exists('aksrt_get_float_pay_vip_html')) :
 			: '';
 
 		return '<a class="' . esc_attr($cls) . '" href="javascript:;" role="button" aria-label="' . esc_attr($title) . '" title="' . esc_attr($title) . '"' . $style_attr . $vip_level_attr . '>'
-			. '<i class="' . esc_attr($icon) . '" aria-hidden="true"></i>'
+			. $icon_html
 			. '</a>';
 	}
 endif;
diff --git a/src/Admin/GlobalControllerPart1.php b/src/Admin/GlobalControllerPart1.php
index 84bc92e9..204b12e4 100644
--- a/src/Admin/GlobalControllerPart1.php
+++ b/src/Admin/GlobalControllerPart1.php
@@ -56,7 +56,7 @@ trait GlobalControllerPart1 {
         if (!empty($item['add_items']) && is_array($item['add_items'])) {
             foreach ($item['add_items'] as $sub_item) {
                 $label = sanitize_text_field($sub_item['label'] ?? '');
-                $icon = sanitize_text_field($sub_item['icon'] ?? 'fa fas fa-pen');
+                $icon = aksrt_sanitize_icon_value((string) ($sub_item['icon'] ?? 'fa fas fa-pen'));
                 $url = esc_url_raw($sub_item['url'] ?? '');
                 if ($label === '') {
                     continue;
@@ -73,7 +73,7 @@ trait GlobalControllerPart1 {
         return [
             'id'                  => sanitize_text_field($item['id'] ?? uniqid('tab_')),
             'type'                => $type,
-            'icon'                => sanitize_text_field($item['icon'] ?? ''),
+            'icon'                => aksrt_sanitize_icon_value((string) ($item['icon'] ?? '')),
             'text'                => sanitize_text_field($item['text'] ?? ''),
             'link'                => esc_url_raw($item['link'] ?? ''),
             'badge'               => sanitize_text_field($item['badge'] ?? ''),
@@ -220,7 +220,7 @@ trait GlobalControllerPart1 {
                 }
                 $label = sanitize_text_field($add_item['label'] ?? '');
                 $url = esc_url_raw($add_item['url'] ?? '');
-                $icon_item = sanitize_text_field($add_item['icon'] ?? '');
+                $icon_item = aksrt_sanitize_icon_value((string) ($add_item['icon'] ?? ''));
                 if ($label === '' && $url === '') {
                     continue;
                 }
@@ -233,9 +233,9 @@ trait GlobalControllerPart1 {
             }
         }
 
-        $icon = sanitize_text_field($item['icon'] ?? '');
-        $icon_dark = sanitize_text_field($item['icon_dark'] ?? '');
-        $icon_light = sanitize_text_field($item['icon_light'] ?? '');
+        $icon = aksrt_sanitize_icon_value((string) ($item['icon'] ?? ''));
+        $icon_dark = aksrt_sanitize_icon_value((string) ($item['icon_dark'] ?? ''));
+        $icon_light = aksrt_sanitize_icon_value((string) ($item['icon_light'] ?? ''));
         if ($type === 'theme_mode') {
             $icon = 'fa fas fa-sun';
             $icon_dark = '';
@@ -247,12 +247,9 @@ trait GlobalControllerPart1 {
         if ($type === 'pay_vip') {
             $link = '';
             $hover = '';
-            if ($icon === '' || str_contains($icon, 'fa-gem') || $icon === 'fa fas fa-gem') {
+            if ($icon === '' || str_contains($icon, 'fa-gem')) {
                 $icon = 'fa fas fa-gem';
             }
-			if (!preg_match('/^fa\s+(?:fas|far|fab)\s+fa-[a-z0-9-]+(?:\s+fa-[a-z0-9-]+)*$/i', $icon)) {
-				$icon = 'fa fas fa-gem';
-			}
         }
 
         return [