diff --git a/package.json b/package.json
index c8794b55e..73e4a2a53 100644
--- a/package.json
+++ b/package.json
@@ -47,6 +47,7 @@
     "js-base64": "^3.7.2",
     "json-to-avro": "^1.1.1",
     "lodash": "^4.17.21",
+    "lucide-vue-next": "^0.553.0",
     "marked": "^4.0.9",
     "monaco-editor": "^0.30.0",
     "mqtt": "^4.2.8",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 86383e6ac..7a3280bef 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -92,6 +92,9 @@ importers:
       lodash:
         specifier: ^4.17.21
         version: 4.17.21
+      lucide-vue-next:
+        specifier: ^0.553.0
+        version: 0.553.0(vue@3.5.4(typescript@5.5.4))
       marked:
         specifier: ^4.0.9
         version: 4.3.0
@@ -2729,6 +2732,11 @@ packages:
     resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==}
     engines: {node: '>=10'}
 
+  lucide-vue-next@0.553.0:
+    resolution: {integrity: sha512-0tg9XT+VCElTT+7EXXbBRhWe1nU7Doa32Xv/dHP5/LCleFVgV6cAqziM3C7AetqmsYIsfAtNwRYdtvs4Ds7aUg==}
+    peerDependencies:
+      vue: '>=3.0.1'
+
   magic-string@0.30.11:
     resolution: {integrity: sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==}
 
@@ -6671,6 +6679,10 @@ snapshots:
     dependencies:
       yallist: 4.0.0
 
+  lucide-vue-next@0.553.0(vue@3.5.4(typescript@5.5.4)):
+    dependencies:
+      vue: 3.5.4(typescript@5.5.4)
+
   magic-string@0.30.11:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.5.0
diff --git a/src/assets/img/aws_timestream.png b/src/assets/img/aws_timestream.png
new file mode 100644
index 000000000..42ad154d2
Binary files /dev/null and b/src/assets/img/aws_timestream.png differ
diff --git a/src/auto-imports.d.ts b/src/auto-imports.d.ts
index 124d16cf5..5e90c7473 100644
--- a/src/auto-imports.d.ts
+++ b/src/auto-imports.d.ts
@@ -24,6 +24,7 @@ declare global {
   const BACKGROUND_CIRCLE_RADIUS: typeof import('./hooks/Overview/useNodesGraph')['BACKGROUND_CIRCLE_RADIUS']
   const BANNED_NEVER_EXPIRE_VALUE: typeof import('./common/constants')['BANNED_NEVER_EXPIRE_VALUE']
   const BATCH_UPLOAD_CSV_MAX_ROWS: typeof import('./common/constants')['BATCH_UPLOAD_CSV_MAX_ROWS']
+  const BRIDGE_TYPES_LIKE_INFLUXDB: typeof import('./common/constants')['BRIDGE_TYPES_LIKE_INFLUXDB']
   const BRIDGE_TYPES_NOT_USE_SCHEMA: typeof import('./common/constants')['BRIDGE_TYPES_NOT_USE_SCHEMA']
   const CER_FILE_ACCEPTS: typeof import('./common/constants')['CER_FILE_ACCEPTS']
   const COMMON_ID_REG: typeof import('./common/constants')['COMMON_ID_REG']
@@ -610,6 +611,7 @@ declare module 'vue' {
     readonly BACKGROUND_CIRCLE_RADIUS: UnwrapRef<typeof import('./hooks/Overview/useNodesGraph')['BACKGROUND_CIRCLE_RADIUS']>
     readonly BANNED_NEVER_EXPIRE_VALUE: UnwrapRef<typeof import('./common/constants')['BANNED_NEVER_EXPIRE_VALUE']>
     readonly BATCH_UPLOAD_CSV_MAX_ROWS: UnwrapRef<typeof import('./common/constants')['BATCH_UPLOAD_CSV_MAX_ROWS']>
+    readonly BRIDGE_TYPES_LIKE_INFLUXDB: UnwrapRef<typeof import('./common/constants')['BRIDGE_TYPES_LIKE_INFLUXDB']>
     readonly BRIDGE_TYPES_NOT_USE_SCHEMA: UnwrapRef<typeof import('./common/constants')['BRIDGE_TYPES_NOT_USE_SCHEMA']>
     readonly CER_FILE_ACCEPTS: UnwrapRef<typeof import('./common/constants')['CER_FILE_ACCEPTS']>
     readonly COMMON_ID_REG: UnwrapRef<typeof import('./common/constants')['COMMON_ID_REG']>
diff --git a/src/common/constants.ts b/src/common/constants.ts
index 20076a1e6..3292b73b7 100644
--- a/src/common/constants.ts
+++ b/src/common/constants.ts
@@ -281,7 +281,12 @@ export const ADMIN_USERNAMES = ['admin', 'root', 'administrator']
 const { VITE_APP_VERSION } = import.meta.env
 export const IS_ENTERPRISE = VITE_APP_VERSION === 'enterprise'
 
-export const BRIDGE_TYPES_NOT_USE_SCHEMA = [BridgeType.InfluxDB, BridgeType.Datalayers]
+export const BRIDGE_TYPES_LIKE_INFLUXDB = [
+  BridgeType.InfluxDB,
+  BridgeType.Datalayers,
+  BridgeType.AWSTimestream,
+]
+export const BRIDGE_TYPES_NOT_USE_SCHEMA = [...BRIDGE_TYPES_LIKE_INFLUXDB]
 
 export const CONNECTOR_TYPES_WITH_TWO_DIRECTIONS = [BridgeType.MQTT, BridgeType.RabbitMQ]
 
diff --git a/src/components/AdvancedSettingsBtn.vue b/src/components/AdvancedSettingsBtn.vue
index 67fabf4b2..95596bdd0 100644
--- a/src/components/AdvancedSettingsBtn.vue
+++ b/src/components/AdvancedSettingsBtn.vue
@@ -8,11 +8,13 @@
     @click="toggle"
   >
     {{ buttonText ?? tl('advancedSettings') }}
-    <Icon icon="lucide:chevron-right" :class="{ 'is-rotate': modelValue }" class="icon-arrow" />
+    <ChevronRight :class="{ 'is-rotate': modelValue }" class="icon-arrow" />
   </div>
 </template>
 
 <script setup lang="ts">
+import { ChevronRight } from 'lucide-vue-next'
+
 const props = defineProps({
   modelValue: {
     type: Boolean,
diff --git a/src/components/Buttons/CreateButton.vue b/src/components/Buttons/CreateButton.vue
index bf4a03ecd..3ba45873c 100644
--- a/src/components/Buttons/CreateButton.vue
+++ b/src/components/Buttons/CreateButton.vue
@@ -1,15 +1,17 @@
 <template>
   <el-button type="primary" v-if="noText" :disabled="!$hasPermission('post')">
-    <Icon icon="lucide:plus" />
+    <Plus />
   </el-button>
   <el-button type="primary" v-else :disabled="!$hasPermission('post')">
-    <Icon icon="lucide:plus" class="mr-2" />
+    <Plus class="mr-2" />
     <template v-if="!$slots.default">{{ t('Base.create') }}</template>
     <slot />
   </el-button>
 </template>
 
 <script setup lang="ts">
+import { Plus } from 'lucide-vue-next'
+
 defineProps<{
   noText?: boolean
 }>()
diff --git a/src/components/Buttons/DeleteButton.vue b/src/components/Buttons/DeleteButton.vue
index fb9ff08f2..156d2a7d3 100644
--- a/src/components/Buttons/DeleteButton.vue
+++ b/src/components/Buttons/DeleteButton.vue
@@ -1,12 +1,14 @@
 <template>
   <el-tooltip :content="tooltipCon" placement="top" :hide-after="0">
     <el-button class="icon-button delete-button" plain :disabled="disableButton" v-bind="$attrs">
-      <Icon icon="lucide:trash-2" />
+      <Trash2 />
     </el-button>
   </el-tooltip>
 </template>
 
 <script setup lang="ts">
+import { Trash2 } from 'lucide-vue-next'
+
 const props = defineProps<{
   disabled?: boolean
   tooltipContent?: string
diff --git a/src/components/Buttons/RefreshButton.vue b/src/components/Buttons/RefreshButton.vue
index 8beb0d873..13c174488 100644
--- a/src/components/Buttons/RefreshButton.vue
+++ b/src/components/Buttons/RefreshButton.vue
@@ -1,14 +1,12 @@
 <template>
   <el-button v-if="noText" @click="handleClick">
-    <Icon
-      icon="lucide:refresh-cw"
+    <RefreshCw
       :class="isSpinning ? 'animate-spin' : ''"
       class="transition-transform duration-600"
     />
   </el-button>
   <el-button v-else @click="handleClick">
-    <Icon
-      icon="lucide:refresh-cw"
+    <RefreshCw
       :class="isSpinning ? 'animate-spin' : ''"
       class="mr-2 transition-transform duration-600"
     />
@@ -20,6 +18,8 @@
 </template>
 
 <script setup lang="ts">
+import { RefreshCw } from 'lucide-vue-next'
+
 defineProps<{
   noText?: boolean
 }>()
diff --git a/src/components/Buttons/ResetButton.vue b/src/components/Buttons/ResetButton.vue
index 9cf9b2a3d..f92cc66db 100644
--- a/src/components/Buttons/ResetButton.vue
+++ b/src/components/Buttons/ResetButton.vue
@@ -1,11 +1,13 @@
 <template>
   <el-tooltip :content="t('Base.reset')" placement="top" :hide-after="0">
     <el-button class="icon-button" plain v-bind="$attrs">
-      <Icon icon="lucide:rotate-ccw" />
+      <RotateCcw />
     </el-button>
   </el-tooltip>
 </template>
 
 <script lang="ts" setup>
+import { RotateCcw } from 'lucide-vue-next'
+
 const { t } = useI18n()
 </script>
diff --git a/src/components/Buttons/SearchButton.vue b/src/components/Buttons/SearchButton.vue
index 277dbf997..6007090ca 100644
--- a/src/components/Buttons/SearchButton.vue
+++ b/src/components/Buttons/SearchButton.vue
@@ -1,11 +1,13 @@
 <template>
   <el-tooltip :content="tl('search')" placement="top" :hide-after="0">
     <el-button class="icon-button" plain v-bind="$attrs">
-      <Icon icon="lucide:search" />
+      <Search />
     </el-button>
   </el-tooltip>
 </template>
 
 <script setup lang="ts">
+import { Search } from 'lucide-vue-next'
+
 const { tl } = useI18nTl('Base')
 </script>
diff --git a/src/components/Buttons/SettingsButton.vue b/src/components/Buttons/SettingsButton.vue
index 03782d1cd..d89c173bf 100644
--- a/src/components/Buttons/SettingsButton.vue
+++ b/src/components/Buttons/SettingsButton.vue
@@ -1,10 +1,12 @@
 <template>
   <el-button :disabled="!$hasPermission('put')">
-    <Icon icon="lucide:settings" class="mr-2" />
+    <Settings class="mr-2" />
     {{ tl('setting') }}
   </el-button>
 </template>
 
 <script setup lang="ts">
+import { Settings } from 'lucide-vue-next'
+
 const { tl } = useI18nTl('Base')
 </script>
diff --git a/src/components/KeyAndValueEditor.vue b/src/components/KeyAndValueEditor.vue
index f0ef89747..a346669e2 100644
--- a/src/components/KeyAndValueEditor.vue
+++ b/src/components/KeyAndValueEditor.vue
@@ -76,12 +76,12 @@
           @input="atInputChange"
         />
         <el-button class="btn-del" link @click="deleteItem(item)">
-          <el-icon :size="16"><Icon icon="lucide:trash-2" /></el-icon>
+          <el-icon :size="16"><Trash2 /></el-icon>
         </el-button>
       </li>
     </ul>
     <el-button link type="primary" @click="addColumn">
-      <Icon icon="lucide:plus" class="mr-2" />
+      <Plus class="mr-2" />
       {{ t('Base.add') }}
     </el-button>
   </div>
@@ -102,6 +102,7 @@
 </template>
 
 <script lang="ts" setup>
+import { Plus, Trash2 } from 'lucide-vue-next'
 import InputWithPlaceholderSelect from './InputWithPlaceholderSelect.vue'
 
 enum State {
diff --git a/src/components/LicensePromotion.vue b/src/components/LicensePromotion.vue
index 89f12e268..3d6b54587 100644
--- a/src/components/LicensePromotion.vue
+++ b/src/components/LicensePromotion.vue
@@ -10,14 +10,17 @@
       {{ t('Base.promoOrTry') }}
       <a :href="cloudServiceUrl" target="_blank" class="chip-link" rel="noopener noreferrer">
         {{ t('Base.promoManagedServiceText') }}
-      </a> </span
-    ><button class="chip-close" type="button" @click="dismiss" aria-label="Dismiss promotion">
-      <Icon icon="lucide:x" class="chip-close-icon" aria-hidden="true" />
+      </a>
+    </span>
+    <button class="chip-close" type="button" @click="dismiss" aria-label="Dismiss promotion">
+      <X class="chip-close-icon" aria-hidden="true" />
     </button>
   </div>
 </template>
 
 <script lang="ts" setup>
+import { X } from 'lucide-vue-next'
+
 const { t } = useI18n()
 const store = useStore()
 const { docMap } = useDocLink()
diff --git a/src/components/Metrics/OverviewMetrics.vue b/src/components/Metrics/OverviewMetrics.vue
index 2a02967e9..a5a7f9680 100644
--- a/src/components/Metrics/OverviewMetrics.vue
+++ b/src/components/Metrics/OverviewMetrics.vue
@@ -21,7 +21,7 @@
               :disabled="!$hasPermission('put')"
               @click="resetStatistics"
             >
-              <Icon icon="lucide:x" class="w-4 h-4" />
+              <X class="w-4 h-4" />
             </el-button>
           </el-tooltip>
         </div>
@@ -181,6 +181,7 @@ import {
   useRateChart,
 } from '@/hooks/useMetrics'
 import { Metrics, MetricsDataWithExtraData, SetItem } from '@/types/common'
+import { X } from 'lucide-vue-next'
 import TypeMetrics from './TypeMetrics.vue'
 
 type MetricsData = MetricsDataWithExtraData<unknown>
diff --git a/src/hooks/Flow/useNodeForm.ts b/src/hooks/Flow/useNodeForm.ts
index 7d2a46127..5ede5e4d7 100644
--- a/src/hooks/Flow/useNodeForm.ts
+++ b/src/hooks/Flow/useNodeForm.ts
@@ -71,7 +71,8 @@ export default (): {
   isUsingSchemaBridgeType: (type: string) => boolean
   checkFormIsEmpty: (type: string, form: Record<string, any>) => boolean
 } => {
-  const { createRawInfluxDBForm, createRawDataLayersForm } = useBridgeFormCreator()
+  const { createRawInfluxDBForm, createRawDataLayersForm, createRawAWSTimestreamForm } =
+    useBridgeFormCreator()
   /**
    *  If you are using a schema bridge, create an empty object directly
    */
@@ -94,6 +95,7 @@ export default (): {
     [SinkType.Console]: () => getCommonFormDataByType(SinkType.Console),
     [SinkType.InfluxDB]: createRawInfluxDBForm,
     [SinkType.Datalayers]: createRawDataLayersForm,
+    [SinkType.AWSTimestream]: createRawAWSTimestreamForm,
     [SinkType.Pulsar]: emptyCreator,
   }
   const getFormDataByType = (type: string) => {
diff --git a/src/hooks/Rule/bridge/useBridgeFormCreator.ts b/src/hooks/Rule/bridge/useBridgeFormCreator.ts
index 6ee1c2001..dd8ca648b 100644
--- a/src/hooks/Rule/bridge/useBridgeFormCreator.ts
+++ b/src/hooks/Rule/bridge/useBridgeFormCreator.ts
@@ -4,6 +4,7 @@ import { OtherBridge } from '@/types/rule'
 export default (): {
   createRawInfluxDBForm: () => OtherBridge
   createRawDataLayersForm: () => OtherBridge
+  createRawAWSTimestreamForm: () => OtherBridge
 } => {
   const { createDefaultResourceOptsForm } = useResourceOpt()
 
@@ -29,8 +30,14 @@ export default (): {
     type: BridgeType.Datalayers,
   })
 
+  const createRawAWSTimestreamForm = () => ({
+    ...createRawInfluxDBForm(),
+    type: BridgeType.AWSTimestream,
+  })
+
   return {
     createRawInfluxDBForm,
     createRawDataLayersForm,
+    createRawAWSTimestreamForm,
   }
 }
diff --git a/src/hooks/Rule/bridge/useBridgeTypeValue.ts b/src/hooks/Rule/bridge/useBridgeTypeValue.ts
index 3ad171f00..8f68a3cf5 100644
--- a/src/hooks/Rule/bridge/useBridgeTypeValue.ts
+++ b/src/hooks/Rule/bridge/useBridgeTypeValue.ts
@@ -107,6 +107,7 @@ export const useBridgeTypeValue = (): {
     { value: BridgeType.AlloyDB, label: 'AlloyDB' },
     { value: BridgeType.CockroachDB, label: 'CockroachDB' },
     { value: BridgeType.Redshift, label: 'Redshift' },
+    { value: BridgeType.AWSTimestream, label: 'Amazon Timestream' },
   ].sort((a, b) => (bridgeOrderIndex[a.value] ?? 99) - (bridgeOrderIndex[b.value] ?? 99))
 
   /**
@@ -347,6 +348,7 @@ export const useConnectorSchema = (): {
     [BridgeType.AlloyDB, getRef(BridgeType.AlloyDB, 'connector_')],
     [BridgeType.CockroachDB, getRef(BridgeType.CockroachDB, 'connector_')],
     [BridgeType.Redshift, getRef(BridgeType.Redshift, 'connector_')],
+    [BridgeType.AWSTimestream, getRef(BridgeType.AWSTimestream, 'connector_')],
   ])
 
   const typeWithMultipleRefKeyMap: Map<BridgeType, Array<string>> = new Map([
@@ -413,6 +415,7 @@ export const useActionSchema = (): {
     [BridgeType.AlloyDB, getRef(BridgeType.AlloyDB, 'action_')],
     [BridgeType.CockroachDB, getRef(BridgeType.CockroachDB, 'action_')],
     [BridgeType.Redshift, getRef(BridgeType.Redshift, 'action_')],
+    [BridgeType.AWSTimestream, getRef(BridgeType.AWSTimestream, 'action_')],
   ])
   const getSchemaRefByType = (type: string) => {
     const ref = specialActionTypeRefKeyMap.get(type)
diff --git a/src/hooks/Rule/connector/useConnectorComponentsHandlers.ts b/src/hooks/Rule/connector/useConnectorComponentsHandlers.ts
index 8919179c1..318ee88e0 100644
--- a/src/hooks/Rule/connector/useConnectorComponentsHandlers.ts
+++ b/src/hooks/Rule/connector/useConnectorComponentsHandlers.ts
@@ -451,6 +451,7 @@ export default (
     [BridgeType.MongoDB, mongoHandler],
     [BridgeType.Redis, redisHandler],
     [BridgeType.InfluxDB, influxDbHandler],
+    [BridgeType.AWSTimestream, influxDbHandler],
     [BridgeType.AmazonKinesis, amazonKinesisHandler],
     [BridgeType.GreptimeDB, greptimeDBHandler],
     [BridgeType.Pulsar, pulsarHandler],
diff --git a/src/hooks/Rule/connector/useSchemaConnectorPropsLayout.ts b/src/hooks/Rule/connector/useSchemaConnectorPropsLayout.ts
index 4cda0ec9f..7f75d09d1 100644
--- a/src/hooks/Rule/connector/useSchemaConnectorPropsLayout.ts
+++ b/src/hooks/Rule/connector/useSchemaConnectorPropsLayout.ts
@@ -229,6 +229,17 @@ export default (
       ['server', 'parameters', 'token', 'org', 'bucket', 'database', 'username', 'password', 'ssl'],
       fieldStartIndex,
     ),
+    [BridgeType.AWSTimestream]: createOrderObj(
+      [
+        'server',
+        'parameters.influxdb_type',
+        'parameters.token',
+        'parameters.org',
+        'parameters.bucket',
+        'parameters.ssl',
+      ],
+      fieldStartIndex,
+    ),
     [BridgeType.IoTDB]: IoTDBOrderMap,
     [BridgeType.Elasticsearch]: IoTDBOrderMap,
     [BridgeType.AmazonKinesis]: createOrderObj(
diff --git a/src/hooks/useMenus.ts b/src/hooks/useMenus.ts
index d0ae05883..8997221ac 100644
--- a/src/hooks/useMenus.ts
+++ b/src/hooks/useMenus.ts
@@ -1,3 +1,14 @@
+import {
+  Database,
+  Gauge,
+  MessagesSquare,
+  Server,
+  Settings,
+  ShieldCheck,
+  Stethoscope,
+  Workflow,
+} from 'lucide-vue-next'
+
 export interface Menu {
   title: string
   path?: string
@@ -92,42 +103,42 @@ const useMenus = (): {
   const totalMenuList = [
     {
       title: 'monitoring',
-      icon: 'lucide:gauge',
+      icon: Gauge,
       children: monitoring,
     },
     {
       title: 'auth',
-      icon: 'lucide:shield-check',
+      icon: ShieldCheck,
       children: accessControl,
     },
     {
       title: 'ruleengine',
-      icon: 'lucide:workflow',
+      icon: Workflow,
       children: integration,
     },
     {
       title: 'smart-data-hub',
-      icon: 'lucide:database',
+      icon: Database,
       children: smartDataHub,
     },
     {
       title: 'message-queue',
-      icon: 'lucide:messages-square',
+      icon: MessagesSquare,
       path: '/message-queue',
     },
     {
       title: 'management',
-      icon: 'lucide:settings',
+      icon: Settings,
       children: management,
     },
     {
       title: 'diagnose',
-      icon: 'lucide:stethoscope',
+      icon: Stethoscope,
       children: diagnose,
     },
     {
       title: 'system',
-      icon: 'lucide:server',
+      icon: Server,
       children: system,
     },
   ]
diff --git a/src/i18n/Auth.ts b/src/i18n/Auth.ts
index fb003bc72..f3793a09c 100644
--- a/src/i18n/Auth.ts
+++ b/src/i18n/Auth.ts
@@ -407,6 +407,14 @@ export default {
     zh: '拒绝时执行',
     en: 'Deny Action',
   },
+  includeMountpoint: {
+    zh: '授权检查时包含挂载点',
+    en: 'Mount Prefix for Authorization',
+  },
+  includeMountpointDesc: {
+    zh: '启用后，在进行授权检查前，目标主题和主题过滤器会被加上监听器配置的挂载点前缀。',
+    en: "When enabled, the target topics and topic filters are prefixed by the listener's configured mountpoint before being checked by authorization backends.",
+  },
   disableAuthnTip: {
     zh: '停用该认证器后，将影响客户端的安全连接，是否继续？',
     en: 'Disabling this authenticator will affect the security connection of the client, continue?',
diff --git a/src/style/normalize.scss b/src/style/normalize.scss
index 4bb04f07b..d8b57abe4 100644
--- a/src/style/normalize.scss
+++ b/src/style/normalize.scss
@@ -477,6 +477,10 @@
   & + .el-dropdown {
     margin-left: 10px;
   }
+  .lucide {
+    width: 1em;
+    height: 1em;
+  }
 }
 .el-button.is-link:hover {
   --el-button-hover-link-text-color: var(--color-primary);
diff --git a/src/types/auth.d.ts b/src/types/auth.d.ts
index 182a60b30..322871b39 100644
--- a/src/types/auth.d.ts
+++ b/src/types/auth.d.ts
@@ -5,6 +5,7 @@ import { AuthzRuleAction, AuthzRulePermission } from './typeAlias'
 export interface AuthzSetting {
   deny_action: 'ignore' | 'disconnect'
   no_match: 'allow' | 'deny'
+  include_mountpoint: boolean
   cache: {
     enable: boolean
     excludes: string[]
diff --git a/src/types/enum.ts b/src/types/enum.ts
index ce6c717fd..a558967fe 100644
--- a/src/types/enum.ts
+++ b/src/types/enum.ts
@@ -158,6 +158,7 @@ export enum BridgeType {
   AlloyDB = 'alloydb',
   CockroachDB = 'cockroachdb',
   Redshift = 'redshift',
+  AWSTimestream = 'aws_timestream',
 }
 
 export enum PulsarType {
diff --git a/src/views/Alarm/CurrentAlarm.vue b/src/views/Alarm/CurrentAlarm.vue
index 5017dc39f..483026c38 100644
--- a/src/views/Alarm/CurrentAlarm.vue
+++ b/src/views/Alarm/CurrentAlarm.vue
@@ -11,7 +11,7 @@
         </LinkButton>
       </el-tooltip>
       <LinkButton :to="{ name: 'alarm-settings' }" :disabled="!$hasPermission('put')">
-        <Icon icon="lucide:settings" class="mr-2" />
+        <Settings class="mr-2" />
         {{ $t('Base.setting') }}
       </LinkButton>
       <RefreshButton :disabled="!$hasPermission('get')" @click="loadData({ page: 1 })" />
@@ -73,6 +73,7 @@ export default defineComponent({
 
 <script lang="ts" setup>
 import { deactivateAlarm, loadAlarm } from '@/api/common'
+import { Settings } from 'lucide-vue-next'
 import commonPagination from '../../components/commonPagination.vue'
 
 const { tl } = useI18nTl('Alarm')
diff --git a/src/views/Auth/components/AuthzSettingDrawer.vue b/src/views/Auth/components/AuthzSettingDrawer.vue
index b771dd602..b972e8c7c 100644
--- a/src/views/Auth/components/AuthzSettingDrawer.vue
+++ b/src/views/Auth/components/AuthzSettingDrawer.vue
@@ -43,6 +43,15 @@
                   <el-option value="disconnect" />
                 </el-select>
               </el-form-item>
+              <el-form-item :label="t('Auth.includeMountpoint')">
+                <template #label>
+                  <FormItemLabel
+                    :label="t('Auth.includeMountpoint')"
+                    :desc="t('Auth.includeMountpointDesc')"
+                  />
+                </template>
+                <el-switch v-model="record.include_mountpoint" />
+              </el-form-item>
             </section>
           </el-form>
           <CancelButton @click="showDrawer = false" />
diff --git a/src/views/Auth/components/TableDropdown.vue b/src/views/Auth/components/TableDropdown.vue
index 5608500b0..17a298576 100644
--- a/src/views/Auth/components/TableDropdown.vue
+++ b/src/views/Auth/components/TableDropdown.vue
@@ -19,28 +19,28 @@
       <template #dropdown>
         <el-dropdown-menu>
           <el-dropdown-item command="moveUp" :disabled="position === 0 || !$hasPermission('put')">
-            <Icon icon="lucide:chevron-up" class="w-4 h-4 mr-2" />
+            <ChevronUp class="w-4 h-4 mr-2" />
             {{ $t('Base.up') }}
           </el-dropdown-item>
           <el-dropdown-item
             command="moveDown"
             :disabled="position === tableDataLen - 1 || !$hasPermission('put')"
           >
-            <Icon icon="lucide:chevron-down" class="w-4 h-4 mr-2" />
+            <ChevronDown class="w-4 h-4 mr-2" />
             {{ $t('Base.down') }}
           </el-dropdown-item>
           <el-dropdown-item
             command="moveToTop"
             :disabled="position === 0 || !$hasPermission('put')"
           >
-            <Icon icon="lucide:chevrons-up" class="w-4 h-4 mr-2" />
+            <ChevronsUp class="w-4 h-4 mr-2" />
             {{ $t('Base.moveToTop') }}
           </el-dropdown-item>
           <el-dropdown-item
             command="moveToBottom"
             :disabled="position === tableDataLen - 1 || !$hasPermission('put')"
           >
-            <Icon icon="lucide:chevrons-down" class="w-4 h-4 mr-2" />
+            <ChevronsDown class="w-4 h-4 mr-2" />
             {{ $t('Base.moveToBottom') }}
           </el-dropdown-item>
           <el-dropdown-item
@@ -48,7 +48,7 @@
             command="delete"
             v-if="isAuthItem"
           >
-            <Icon icon="lucide:trash-2" class="w-4 h-4 mr-2" />
+            <Trash2 class="w-4 h-4 mr-2" />
             {{ $t('Base.delete') }}
           </el-dropdown-item>
         </el-dropdown-menu>
@@ -58,12 +58,13 @@
 </template>
 
 <script lang="ts">
-import { CaretBottom } from '@element-plus/icons-vue'
 import { AuthnItem } from '@/types/auth'
+import { CaretBottom } from '@element-plus/icons-vue'
+import { ChevronDown, ChevronsDown, ChevronsUp, ChevronUp, Trash2 } from 'lucide-vue-next'
 
 export default defineComponent({
   name: 'TableDropdown',
-  components: { CaretBottom },
+  components: { CaretBottom, ChevronUp, ChevronDown, ChevronsUp, ChevronsDown, Trash2 },
   props: {
     tableDataLen: {
       required: true,
diff --git a/src/views/Base/LeftBar.vue b/src/views/Base/LeftBar.vue
index 662826120..825b0be16 100644
--- a/src/views/Base/LeftBar.vue
+++ b/src/views/Base/LeftBar.vue
@@ -15,7 +15,7 @@
             :popper-class="needFixedHeight(menu) ? 'sub-menu-popper' : ''"
           >
             <template #title>
-              <Icon :icon="menu.icon" class="menu-icon" />
+              <component v-if="menu.icon" :is="menu.icon" class="menu-icon" />
               <p class="menu-item-title first-level">
                 {{ $t(`components.${menu.title}`) }}
               </p>
@@ -49,7 +49,7 @@
             </el-scrollbar>
           </el-sub-menu>
           <el-menu-item v-else :key="menu.title" :index="menu.path">
-            <Icon :icon="menu.icon" class="menu-icon" />
+            <component v-if="menu.icon" :is="menu.icon" class="menu-icon" />
             <p class="menu-item-title first-level">
               {{ $t(`components.${menu.title}`) }}
             </p>
diff --git a/src/views/Base/NavHeader.vue b/src/views/Base/NavHeader.vue
index b0df75a05..58887f524 100644
--- a/src/views/Base/NavHeader.vue
+++ b/src/views/Base/NavHeader.vue
@@ -27,13 +27,13 @@
             <span v-else class="cluster-desc-placeholder">-</span>
           </div>
           <LinkButton class="is-link cluster-desc-edit" :to="{ name: 'cluster' }">
-            <Icon icon="lucide:square-pen" class="w-4 h-4" />
+            <SquarePen class="w-4 h-4" />
           </LinkButton>
         </div>
       </el-tooltip>
       <div class="quick-panel-enter" @click="openQuickPanel">
         <div class="flex items-center gap-2">
-          <Icon icon="lucide:search" :width="16" :height="16" class="text-gray-400" />
+          <Search :size="16" class="text-gray-400" />
           <span class="text-sm">{{ t('Base.quickFind') }}</span>
         </div>
         <div class="flex items-center gap-1">
@@ -44,13 +44,13 @@
       </div>
 
       <el-button class="go-link" v-if="isEvaluationLicense" @click="routeToContactUs">
-        {{ $t('Base.contactUs') }}<Icon icon="lucide:arrow-right" class="arrow-icon" />
+        {{ $t('Base.contactUs') }}<ArrowRight class="arrow-icon" />
       </el-button>
       <el-tooltip effect="dark" :content="alertText" placement="bottom" :show-arrow="false">
         <div class="func-item">
           <el-badge :is-dot="!!alertCount">
             <router-link class="link-alarm" to="/alarm">
-              <Icon icon="lucide:bell" class="bell" />
+              <Bell class="bell" />
             </router-link>
           </el-badge>
         </div>
@@ -64,7 +64,7 @@
       >
         <div class="func-item">
           <a href="javascript:;" @click="handleShowHelp" class="link-help">
-            <Icon icon="lucide:help-circle" class="icon-question" />
+            <HelpCircle class="icon-question" />
           </a>
         </div>
       </el-tooltip>
@@ -77,7 +77,7 @@
       >
         <el-dropdown trigger="click" :hide-on-click="false">
           <div class="func-item settings-trigger">
-            <Icon icon="lucide:settings" class="settings" />
+            <SettingsIcon class="settings" />
           </div>
           <template #dropdown>
             <el-dropdown-menu class="settings-dropdown-menu">
@@ -90,7 +90,7 @@
       <el-dropdown placement="bottom" @command="handleDropdownCommand" popper-class="user-dropdown">
         <div class="func-item user-menu-trigger">
           <span class="user-avatar">{{ user.username?.substr(0, 1).toUpperCase() }}</span>
-          <Icon icon="lucide:chevron-down" class="w-4 h-4" />
+          <ChevronDown class="w-4 h-4" />
         </div>
 
         <template #dropdown>
@@ -104,11 +104,11 @@
               </div>
             </el-dropdown-item>
             <el-dropdown-item divided command="users">
-              <Icon icon="lucide:users" class="w-4 h-4 mr-2" />
+              <Users class="w-4 h-4 mr-2" />
               {{ $t('components.usersManagement') }}
             </el-dropdown-item>
             <el-dropdown-item command="logout">
-              <Icon icon="lucide:log-out" class="w-4 h-4 mr-2" />
+              <LogOut class="w-4 h-4 mr-2" />
               {{ $t('components.logOut') }}
             </el-dropdown-item>
           </el-dropdown-menu>
@@ -122,6 +122,17 @@
 <script lang="ts" setup>
 import { getClusterNodes, loadAlarm } from '@/api/common'
 import Settings from '../Settings/Settings.vue'
+import {
+  SquarePen,
+  Search,
+  ArrowRight,
+  Bell,
+  HelpCircle,
+  Settings as SettingsIcon,
+  ChevronDown,
+  Users,
+  LogOut,
+} from 'lucide-vue-next'
 import Help from '../Settings/Help.vue'
 import LicensePromotion from '@/components/LicensePromotion.vue'
 import Breadcrumb from './Breadcrumb.vue'
diff --git a/src/views/Base/QuickPanel.vue b/src/views/Base/QuickPanel.vue
index d4bf44f21..190fa06f9 100644
--- a/src/views/Base/QuickPanel.vue
+++ b/src/views/Base/QuickPanel.vue
@@ -15,14 +15,14 @@
       @select="handleSelect"
     >
       <template #prefix>
-        <Icon icon="lucide:search" :width="20" :height="20" />
+        <Search :width="20" :height="20" />
       </template>
       <template #default="{ item }">
         <div class="space-between quick-result-item">
           <div class="value vertical-align-center">
-            <div v-show="item.parentLabel">
+            <div v-show="item.parentLabel" class="flex items-center">
               <span>{{ item.parentLabel }}</span>
-              <Icon icon="lucide:arrow-right" class="icon-arrow" />
+              <ArrowRight class="icon-arrow" :size="14" />
             </div>
             <span>{{ item.label }}</span>
           </div>
@@ -36,6 +36,7 @@
 <script lang="ts" setup>
 import { usePathInMenu } from '@/hooks/useMenus'
 import { routes } from '@/router'
+import { ArrowRight, Search } from 'lucide-vue-next'
 
 interface MenuItem {
   path: string
diff --git a/src/views/Clients/ClientDetails.vue b/src/views/Clients/ClientDetails.vue
index d4077c4d6..a5dca6907 100644
--- a/src/views/Clients/ClientDetails.vue
+++ b/src/views/Clients/ClientDetails.vue
@@ -33,7 +33,7 @@
           :hide-after="0"
         >
           <el-button class="icon-button delete-button" plain @click="handleDisconnect">
-            <Icon icon="lucide:user-x" />
+            <UserX />
           </el-button>
         </el-tooltip>
       </div>
@@ -202,7 +202,7 @@
       />
     </template>
     <div class="client-does-not-exist" v-else>
-      <Icon icon="lucide:triangle-alert" class="warning-icon" />
+      <TriangleAlert class="warning-icon" />
       <span>{{ tl('clientDoesNotExist') }}</span>
     </div>
   </div>
@@ -228,9 +228,10 @@ import { Client } from '@/types/client'
 import { GatewayName } from '@/types/enum'
 import { Subscription } from '@/types/subscription'
 import ClientInfoItem from '@/views/Clients/components/ClientInfoItem.vue'
+import { TriangleAlert, UserX } from 'lucide-vue-next'
+import ClientAttrsDialog from './components/ClientAttrsDialog.vue'
 import CreateSubscribe from './components/CreateSubscribe.vue'
 import MessageListDialog from './components/MessageListDialog.vue'
-import ClientAttrsDialog from './components/ClientAttrsDialog.vue'
 
 const props = defineProps({
   gateway: {
diff --git a/src/views/Clients/Clients.vue b/src/views/Clients/Clients.vue
index 05320a9a5..c48a6966d 100644
--- a/src/views/Clients/Clients.vue
+++ b/src/views/Clients/Clients.vue
@@ -83,7 +83,7 @@
         <div></div>
         <ClientFieldSelect :selected="tableColumnFields" @change="handleSelectedColumnChanged" />
         <el-button class="export-btn" @click="handleExport">
-          <Icon icon="lucide:download" class="mr-2" />
+          <Download class="mr-2" />
           {{ tl('export') }}
         </el-button>
         <DangerButton
@@ -92,7 +92,7 @@
           :disabled="selectedClients.length === 0 || !$hasPermission('delete')"
           @click="cleanBatchClients"
         >
-          <Icon icon="lucide:user-x" class="mr-2" />
+          <UserX class="mr-2" />
           {{ tl('kickOut') }}
         </DangerButton>
         <RefreshButton @click="loadNodeClients" />
@@ -195,9 +195,10 @@ import {
 import { Client } from '@/types/client'
 import { CheckStatus, ClientsExportFormat } from '@/types/enum'
 import { isEmptyObj } from '@emqx/shared-ui-utils'
+import dayjs from 'dayjs'
+import { Download, UserX } from 'lucide-vue-next'
 import ClientFieldSelect from './components/ClientFieldSelect.vue'
 import ClientInfoItem from './components/ClientInfoItem.vue'
-import dayjs from 'dayjs'
 
 enum Comparator {
   After = 'gte',
diff --git a/src/views/Config/ClusterLinking/components/ClusterLinkingForm.vue b/src/views/Config/ClusterLinking/components/ClusterLinkingForm.vue
index b28db71a2..1c72aacae 100644
--- a/src/views/Config/ClusterLinking/components/ClusterLinkingForm.vue
+++ b/src/views/Config/ClusterLinking/components/ClusterLinkingForm.vue
@@ -67,7 +67,7 @@
                       :disabled="disabledEditTopic($index) || !$hasPermission('delete')"
                       @click="delTopic($index)"
                     >
-                      <Icon icon="lucide:trash-2" class="w-4 h-4" />
+                      <Trash2 class="w-4 h-4" />
                     </el-button>
                   </el-tooltip>
                   <el-button
@@ -76,7 +76,7 @@
                     :disabled="!$hasPermission('post')"
                     @click="addTopic"
                   >
-                    <Icon icon="lucide:plus" class="w-4 h-4" />
+                    <Plus class="w-4 h-4" />
                   </el-button>
                 </div>
               </el-form-item>
@@ -88,7 +88,7 @@
             :disabled="!$hasPermission('post')"
             @click="addTopic"
           >
-            <Icon icon="lucide:plus" class="w-4 h-4" />
+            <Plus class="w-4 h-4" />
           </el-button>
         </el-form-item>
       </el-col>
@@ -166,6 +166,7 @@
 
 <script setup lang="ts">
 import { ClusterLinkingForm } from '@/types/typeAlias'
+import { Plus, Trash2 } from 'lucide-vue-next'
 
 const props = defineProps<{
   modelValue: ClusterLinkingForm
diff --git a/src/views/Dashboard/Overview.vue b/src/views/Dashboard/Overview.vue
index 9fbc40b49..27605dcc1 100644
--- a/src/views/Dashboard/Overview.vue
+++ b/src/views/Dashboard/Overview.vue
@@ -7,7 +7,7 @@
             <!-- Rate Cards -->
             <div class="stat-card rate-card-in">
               <div class="stat-header">
-                <Icon icon="lucide:arrow-down" class="stat-icon" />
+                <ArrowDown class="stat-icon" />
                 <span class="stat-label">{{ $t('Dashboard.currentMessageInRate') }}</span>
               </div>
               <div class="stat-value">
@@ -27,7 +27,7 @@
 
             <div class="stat-card rate-card-out">
               <div class="stat-header">
-                <Icon icon="lucide:arrow-up" class="stat-icon" />
+                <ArrowUp class="stat-icon" />
                 <span class="stat-label">{{ $t('Dashboard.currentMessageOutRate') }}</span>
               </div>
               <div class="stat-value">
@@ -43,7 +43,7 @@
             <div class="stat-card combined-card">
               <router-link class="stat-item" :to="{ name: 'clients' }">
                 <div class="stat-header">
-                  <Icon icon="lucide:link" class="stat-icon" />
+                  <Link class="stat-icon" />
                   <span class="stat-label">{{ $t('Dashboard.allConnections') }}</span>
                 </div>
                 <div class="stat-value">
@@ -58,7 +58,7 @@
                 :to="{ name: 'clients', query: { conn_state: 'connected' } }"
               >
                 <div class="stat-header">
-                  <Icon icon="lucide:activity" class="stat-icon" />
+                  <Activity class="stat-icon" />
                   <span class="stat-label">{{ $t('Dashboard.liveConnections') }}</span>
                 </div>
                 <div class="stat-value">
@@ -73,7 +73,7 @@
             <div class="stat-card combined-card">
               <router-link class="stat-item" :to="{ name: 'subscription' }">
                 <div class="stat-header">
-                  <Icon icon="lucide:bell" class="stat-icon" />
+                  <Bell class="stat-icon" />
                   <span class="stat-label">{{ $t('Dashboard.subscriptionNumber') }}</span>
                 </div>
                 <div class="stat-value">
@@ -85,7 +85,7 @@
 
               <div class="stat-item">
                 <div class="stat-header">
-                  <Icon icon="lucide:share-2" class="stat-icon" />
+                  <Share2 class="stat-icon" />
                   <span class="stat-label">{{ $t('Dashboard.shareSubscription') }}</span>
                 </div>
                 <div class="stat-value">
@@ -99,7 +99,7 @@
             <!-- Topics -->
             <router-link class="stat-card" :to="{ name: 'topics' }">
               <div class="stat-header">
-                <Icon icon="lucide:hash" class="stat-icon" />
+                <Hash class="stat-icon" />
                 <span class="stat-label">{{ $t('Dashboard.topics') }}</span>
               </div>
               <div class="stat-value">
@@ -110,7 +110,7 @@
             <!-- Retained -->
             <router-link class="stat-card" :to="{ name: 'retained' }">
               <div class="stat-header">
-                <Icon icon="lucide:archive" class="stat-icon" />
+                <Archive class="stat-icon" />
                 <span class="stat-label">{{ $t('Dashboard.retained') }}</span>
               </div>
               <div class="stat-value">
@@ -141,6 +141,7 @@ import RateChart from './components/RateChart.vue'
 import PolylineCards from './components/PolylineCards.vue'
 import NodesGraphCard from './components/NodesGraphCard.vue'
 import dayjs from 'dayjs'
+import { ArrowDown, ArrowUp, Link, Activity, Bell, Share2, Hash, Archive } from 'lucide-vue-next'
 import { loadCurrentMetrics } from '@/api/common'
 
 interface MetricData {
diff --git a/src/views/Dashboard/components/PolylineCards.vue b/src/views/Dashboard/components/PolylineCards.vue
index be9e1e74e..a2035afc1 100644
--- a/src/views/Dashboard/components/PolylineCards.vue
+++ b/src/views/Dashboard/components/PolylineCards.vue
@@ -11,7 +11,7 @@
       </el-select>
       <el-tooltip :content="tl('resetMonitorData')" placement="top">
         <el-button class="icon-button" @click="resetMetrics">
-          <Icon icon="lucide:rotate-ccw" />
+          <RotateCcw />
         </el-button>
       </el-tooltip>
     </div>
@@ -23,13 +23,12 @@
               <div class="card-title">
                 <span>{{ item.text }}</span>
                 <div class="icons-container">
-                  <Icon
+                  <ChartNoAxesCombined
                     v-if="item.value === ChartType.Dropped"
-                    icon="lucide:chart-no-axes-combined"
                     @click="openDropDetailDialog"
                     class="icon-btn"
                   />
-                  <Icon icon="lucide:maximize-2" @click="showChartDetails(item)" class="icon-btn" />
+                  <Maximize2 @click="showChartDetails(item)" class="icon-btn" />
                 </div>
               </div>
               <polyline-chart
@@ -52,7 +51,7 @@
               <div class="card-title">
                 <span>{{ item.text }}</span>
                 <div class="icons-container">
-                  <Icon icon="lucide:maximize-2" @click="showChartDetails(item)" class="icon-btn" />
+                  <Maximize2 @click="showChartDetails(item)" class="icon-btn" />
                 </div>
               </div>
               <polyline-chart
@@ -136,6 +135,7 @@ import { loadChartData, loadMetrics as loadDroppedDetail, resetMonitorData } fro
 import { ChartType } from '@/types/enum'
 import { ChartDataItem } from '@/types/dashboard'
 import DroppedDetailDialog from './DroppedDetailDialog.vue'
+import { RotateCcw, ChartNoAxesCombined, Maximize2 } from 'lucide-vue-next'
 
 const POLLING_INTERVAL = 60000
 
diff --git a/src/views/Exhook/components/TableItemDropdown.vue b/src/views/Exhook/components/TableItemDropdown.vue
index e646f3204..9636df118 100644
--- a/src/views/Exhook/components/TableItemDropdown.vue
+++ b/src/views/Exhook/components/TableItemDropdown.vue
@@ -14,29 +14,29 @@
     <template #dropdown>
       <el-dropdown-menu>
         <el-dropdown-item command="up" :disabled="rowIndex === 0 || !$hasPermission('put')">
-          <Icon icon="lucide:chevron-up" class="w-4 h-4 mr-2" />
+          <ChevronUp class="w-4 h-4 mr-2" />
           {{ $t('Base.up') }}
         </el-dropdown-item>
         <el-dropdown-item
           command="down"
           :disabled="rowIndex === tableLen - 1 || !$hasPermission('put')"
         >
-          <Icon icon="lucide:chevron-down" class="w-4 h-4 mr-2" />
+          <ChevronDown class="w-4 h-4 mr-2" />
           <span>{{ $t('Base.down') }}</span>
         </el-dropdown-item>
         <el-dropdown-item command="top" :disabled="rowIndex === 0 || !$hasPermission('put')">
-          <Icon icon="lucide:chevrons-up" class="w-4 h-4 mr-2" />
+          <ChevronsUp class="w-4 h-4 mr-2" />
           <span>{{ $t('Plugins.moveToTop') }}</span>
         </el-dropdown-item>
         <el-dropdown-item
           command="bottom"
           :disabled="rowIndex === tableLen - 1 || !$hasPermission('put')"
         >
-          <Icon icon="lucide:chevrons-down" class="w-4 h-4 mr-2" />
+          <ChevronsDown class="w-4 h-4 mr-2" />
           <span>{{ $t('Plugins.moveToBottom') }}</span>
         </el-dropdown-item>
         <el-dropdown-item :disabled="!$hasPermission('delete')" command="delete">
-          <Icon icon="lucide:trash-2" class="w-4 h-4 mr-2" />
+          <Trash2 class="w-4 h-4 mr-2" />
           <span>{{ $t('Base.delete') }}</span>
         </el-dropdown-item>
       </el-dropdown-menu>
@@ -53,6 +53,7 @@ export default defineComponent({
 <script setup lang="ts">
 import { Exhook } from '@/types/systemModule'
 import { CaretBottom } from '@element-plus/icons-vue'
+import { ChevronDown, ChevronsDown, ChevronsUp, ChevronUp, Trash2 } from 'lucide-vue-next'
 
 defineProps({
   rowData: {
diff --git a/src/views/General/Backup.vue b/src/views/General/Backup.vue
index 9eece0837..8259ce472 100644
--- a/src/views/General/Backup.vue
+++ b/src/views/General/Backup.vue
@@ -13,7 +13,7 @@
         :http-request="customUploadRequest"
       >
         <el-button plain :disabled="!$hasPermission('post')" :loading="uploading">
-          <Icon icon="lucide:upload" class="mr-2" />
+          <Upload class="mr-2" />
           {{ tl('upload') }}
         </el-button>
       </el-upload>
@@ -64,6 +64,7 @@ import {
 import { PageData } from '@/types/common'
 import { EmqxMgmtApiDataBackupBackupFileInfo } from '@/types/schemas/dataBackup.schemas'
 import { createDownloadBlobLink, formatSizeUnit } from '@emqx/shared-ui-utils'
+import dayjs from 'dayjs'
 import {
   ElMessage,
   ElMessageBox,
@@ -71,7 +72,7 @@ import {
   UploadRequestHandler,
   UploadRequestOptions,
 } from 'element-plus'
-import dayjs from 'dayjs'
+import { Upload } from 'lucide-vue-next'
 
 interface BackupItem extends EmqxMgmtApiDataBackupBackupFileInfo {
   size: number
diff --git a/src/views/MessageQueue/MessageQueue.vue b/src/views/MessageQueue/MessageQueue.vue
index 0a7050821..71ec5270f 100644
--- a/src/views/MessageQueue/MessageQueue.vue
+++ b/src/views/MessageQueue/MessageQueue.vue
@@ -6,7 +6,7 @@
         <div class="section-header">
           <div></div>
           <LinkButton :disabled="!$hasPermission('put')" :to="{ name: 'mqtt-message-queue' }">
-            <Icon icon="lucide:settings" class="mr-2" />
+            <Settings class="mr-2" />
             {{ t('Base.setting') }}
           </LinkButton>
           <CreateButton @click="handleCreate" />
@@ -79,6 +79,7 @@ import { deleteMessageQueue, getMessageQueues } from '@/api/messageQueue'
 import { DEFAULT_PAGE_SIZE_OPT as defaultPageSizeOpt } from '@/common/constants'
 import useMessageQueue from '@/hooks/MessageQueue/useMessageQueue'
 import { MessageQueue } from '@/types/typeAlias'
+import { Settings } from 'lucide-vue-next'
 import MessageQueueDialog from './components/MessageQueueDialog.vue'
 import MQGuidance from './components/MQGuidance.vue'
 
diff --git a/src/views/Plugins/components/TableItemDropdown.vue b/src/views/Plugins/components/TableItemDropdown.vue
index 6a862d01e..b88347021 100644
--- a/src/views/Plugins/components/TableItemDropdown.vue
+++ b/src/views/Plugins/components/TableItemDropdown.vue
@@ -15,14 +15,14 @@
     <template #dropdown>
       <el-dropdown-menu>
         <el-dropdown-item command="up" :disabled="rowIndex === 0 || !$hasPermission('put')">
-          <Icon icon="lucide:chevron-up" class="w-4 h-4 mr-2" />
+          <ChevronUp class="w-4 h-4 mr-2" />
           <span>{{ $t('Base.up') }}</span>
         </el-dropdown-item>
         <el-dropdown-item
           command="down"
           :disabled="rowIndex === tableLen - 1 || !$hasPermission('put')"
         >
-          <Icon icon="lucide:chevron-down" class="w-4 h-4 mr-2" />
+          <ChevronDown class="w-4 h-4 mr-2" />
           <span>{{ $t('Base.down') }}</span>
         </el-dropdown-item>
         <el-dropdown-item
@@ -30,7 +30,7 @@
           :class="{ disabled: filtered }"
           :disabled="rowIndex === 0 || !$hasPermission('put')"
         >
-          <Icon icon="lucide:chevrons-up" class="w-4 h-4 mr-2" />
+          <ChevronsUp class="w-4 h-4 mr-2" />
           <span>{{ $t('Plugins.moveToTop') }}</span>
         </el-dropdown-item>
         <el-dropdown-item
@@ -38,11 +38,11 @@
           :class="{ disabled: filtered }"
           :disabled="rowIndex === tableLen - 1 || !$hasPermission('put')"
         >
-          <Icon icon="lucide:chevrons-down" class="w-4 h-4 mr-2" />
+          <ChevronsDown class="w-4 h-4 mr-2" />
           <span>{{ $t('Plugins.moveToBottom') }}</span>
         </el-dropdown-item>
         <el-dropdown-item :disabled="!$hasPermission('delete')" command="uninstall">
-          <Icon icon="lucide:trash-2" class="w-4 h-4 mr-2" />
+          <Trash2 class="w-4 h-4 mr-2" />
           <span>{{ $t('Plugins.uninstall') }}</span>
         </el-dropdown-item>
       </el-dropdown-menu>
@@ -59,6 +59,7 @@ export default defineComponent({
 <script setup lang="ts">
 import { PluginItem } from '@/types/plugin'
 import { CaretBottom } from '@element-plus/icons-vue'
+import { ChevronDown, ChevronsDown, ChevronsUp, ChevronUp, Trash2 } from 'lucide-vue-next'
 
 const props = defineProps({
   rowData: {
diff --git a/src/views/Retained/Retained.vue b/src/views/Retained/Retained.vue
index cf66bb5cd..a629aca6b 100644
--- a/src/views/Retained/Retained.vue
+++ b/src/views/Retained/Retained.vue
@@ -20,7 +20,7 @@
       <div class="section-header">
         <div></div>
         <LinkButton :disabled="!$hasPermission('put')" :to="{ name: 'mqtt-retainer' }">
-          <Icon icon="lucide:settings" class="mr-2" />
+          <Settings class="mr-2" />
           {{ t('Base.setting') }}
         </LinkButton>
         <DangerButton
@@ -89,6 +89,7 @@ import {
 import { RetainerMessage } from '@/types/extension'
 import { Remove } from '@element-plus/icons-vue'
 import { ElMessageBox as MB } from 'element-plus'
+import { Settings } from 'lucide-vue-next'
 
 const { tl, t } = useI18nTl('Extension')
 const { pageMeta, pageParams, initPageMeta, setPageMeta } = usePaginationWithHasNext()
diff --git a/src/views/RuleEngine/Bridge/BridgeCreate.vue b/src/views/RuleEngine/Bridge/BridgeCreate.vue
index 07aa78048..a8b10c6a6 100644
--- a/src/views/RuleEngine/Bridge/BridgeCreate.vue
+++ b/src/views/RuleEngine/Bridge/BridgeCreate.vue
@@ -98,7 +98,7 @@
     <!-- In the Create/Settings Rule page -->
     <div v-else>
       <bridge-influxdb-config
-        v-if="[BridgeType.InfluxDB, BridgeType.Datalayers].includes(chosenBridgeType)"
+        v-if="BRIDGE_TYPES_LIKE_INFLUXDB.includes(chosenBridgeType)"
         v-model="bridgeData"
         ref="formCom"
         :type="chosenBridgeType"
diff --git a/src/views/RuleEngine/Bridge/BridgeDetail.vue b/src/views/RuleEngine/Bridge/BridgeDetail.vue
index 5ca0645ba..180c553d2 100644
--- a/src/views/RuleEngine/Bridge/BridgeDetail.vue
+++ b/src/views/RuleEngine/Bridge/BridgeDetail.vue
@@ -95,7 +95,7 @@
             </el-alert>
             <div class="setting-area" :style="{ width: inDrawer ? '100%' : '75%' }">
               <bridge-influxdb-config
-                v-if="[BridgeType.InfluxDB, BridgeType.Datalayers].includes(bridgeType)"
+                v-if="BRIDGE_TYPES_LIKE_INFLUXDB.includes(bridgeType)"
                 ref="formCom"
                 v-model="bridgeInfo"
                 edit
@@ -153,7 +153,7 @@
 </template>
 
 <script lang="ts" setup>
-import { BridgeType, DetailTab } from '@/types/enum'
+import { DetailTab } from '@/types/enum'
 import { BridgeItem } from '@/types/rule'
 import { Share } from '@element-plus/icons-vue'
 import TargetItemStatus from '../components/TargetItemStatus.vue'
diff --git a/src/views/RuleEngine/Bridge/Components/BridgeConfig/BridgeInfluxdbConfig.vue b/src/views/RuleEngine/Bridge/Components/BridgeConfig/BridgeInfluxdbConfig.vue
index 406123b73..40a55a7a3 100644
--- a/src/views/RuleEngine/Bridge/Components/BridgeConfig/BridgeInfluxdbConfig.vue
+++ b/src/views/RuleEngine/Bridge/Components/BridgeConfig/BridgeInfluxdbConfig.vue
@@ -165,12 +165,9 @@ const { components } = useSchemaForm(getAPIPath(`/schemas/actions`), {
 })
 const { getPropItem } = useGetInfoFromComponents(components)
 
-const { createRawInfluxDBForm, createRawDataLayersForm } = useBridgeFormCreator()
+const { createRawInfluxDBForm } = useBridgeFormCreator()
 const createDefaultValue = () => {
-  if (props.type === BridgeType.Datalayers) {
-    return createRawDataLayersForm()
-  }
-  return createRawInfluxDBForm()
+  return { ...createRawInfluxDBForm(), type: props.type ?? BridgeType.InfluxDB }
 }
 
 const formData: Ref<OtherBridge> = ref(createDefaultValue())
diff --git a/src/views/RuleEngine/Bridge/Components/ConnectorSelect.vue b/src/views/RuleEngine/Bridge/Components/ConnectorSelect.vue
index 305239ee3..f5a6c720a 100644
--- a/src/views/RuleEngine/Bridge/Components/ConnectorSelect.vue
+++ b/src/views/RuleEngine/Bridge/Components/ConnectorSelect.vue
@@ -11,7 +11,7 @@
     </el-select>
     <el-tooltip :content="tl('createConnector')" placement="top">
       <el-button class="btn-add" :disabled="!$hasPermission('post')" @click="addConnector">
-        <Icon icon="lucide:plus" class="w-4 h-4" />
+        <Plus class="w-4 h-4" />
       </el-button>
     </el-tooltip>
     <ConnectorCreateDrawer
@@ -26,6 +26,7 @@
 import { getConnectors } from '@/api/connector'
 import { BridgeType } from '@/types/enum'
 import { Connector } from '@/types/rule'
+import { Plus } from 'lucide-vue-next'
 import ConnectorCreateDrawer from '../../Connector/components/ConnectorCreateDrawer.vue'
 
 const props = withDefaults(
diff --git a/src/views/RuleEngine/MessageTransform/components/OperationsTable.vue b/src/views/RuleEngine/MessageTransform/components/OperationsTable.vue
index b733cbd99..bb33ab417 100644
--- a/src/views/RuleEngine/MessageTransform/components/OperationsTable.vue
+++ b/src/views/RuleEngine/MessageTransform/components/OperationsTable.vue
@@ -30,7 +30,7 @@
             :disabled="!$hasPermission('post')"
             @click="addSubOperation(row)"
           >
-            <Icon icon="lucide:plus" class="w-4 h-4" />
+            <Plus class="w-4 h-4" />
           </el-button>
         </div>
         <!-- CHILD -->
@@ -44,7 +44,7 @@
         <div class="target-value-header">
           <label :class="required ? 'mock-required-label' : ''">{{ tl('targetValue') }}</label>
           <el-button type="primary" :disabled="!$hasPermission('post')" @click="addOperation">
-            <Icon icon="lucide:plus" class="w-4 h-4" />
+            <Plus class="w-4 h-4" />
           </el-button>
         </div>
       </template>
@@ -57,7 +57,7 @@
             :disabled="!$hasPermission('delete')"
             @click="deleteOperation(data.$index)"
           >
-            <Icon icon="lucide:trash-2" class="w-4 h-4" />
+            <Trash2 class="w-4 h-4" />
           </el-button>
         </template>
         <!-- CHILD -->
@@ -68,7 +68,7 @@
             :disabled="!$hasPermission('delete')"
             @click="deleteSubOperation(data.$index)"
           >
-            <Icon icon="lucide:trash-2" class="w-4 h-4" />
+            <Trash2 class="w-4 h-4" />
           </el-button>
         </template>
       </template>
@@ -84,6 +84,7 @@ import {
 } from '@/hooks/Rule/transform/useMessageTransform'
 import { MessageTransform, MessageTransformOperation } from '@/types/typeAlias'
 import TargetValue from './TargetValue.vue'
+import { Plus, Trash2 } from 'lucide-vue-next'
 
 interface SubOperation {
   propValue: string
diff --git a/src/views/RuleEngine/Schema/components/TableItemDropdown.vue b/src/views/RuleEngine/Schema/components/TableItemDropdown.vue
index 313d4dc86..f84bd2d10 100644
--- a/src/views/RuleEngine/Schema/components/TableItemDropdown.vue
+++ b/src/views/RuleEngine/Schema/components/TableItemDropdown.vue
@@ -14,11 +14,11 @@
     <template #dropdown>
       <el-dropdown-menu>
         <el-dropdown-item v-if="!hideDuplicate" :disabled="!$hasPermission('post')" command="copy">
-          <Icon icon="lucide:copy" class="w-4 h-4 mr-2" />
+          <Copy class="w-4 h-4 mr-2" />
           <span>{{ tl('duplicate') }}</span>
         </el-dropdown-item>
         <el-dropdown-item :disabled="!$hasPermission('delete')" command="delete">
-          <Icon icon="lucide:trash-2" class="w-4 h-4 mr-2" />
+          <Trash2 class="w-4 h-4 mr-2" />
           <span>{{ t('Base.delete') }}</span>
         </el-dropdown-item>
       </el-dropdown-menu>
@@ -35,6 +35,7 @@ export default defineComponent({
 <script setup lang="ts">
 import { SchemaRegistry } from '@/types/rule'
 import { CaretBottom } from '@element-plus/icons-vue'
+import { Copy, Trash2 } from 'lucide-vue-next'
 
 defineProps({
   rowData: {
diff --git a/src/views/RuleEngine/SchemaValidation/components/SchemaValidationForm.vue b/src/views/RuleEngine/SchemaValidation/components/SchemaValidationForm.vue
index 01e00625c..a402fa0da 100644
--- a/src/views/RuleEngine/SchemaValidation/components/SchemaValidationForm.vue
+++ b/src/views/RuleEngine/SchemaValidation/components/SchemaValidationForm.vue
@@ -120,7 +120,7 @@
                       :disabled="!$hasPermission('delete')"
                       @click="deleteValidationItem($index)"
                     >
-                      <Icon icon="lucide:trash-2" class="w-4 h-4" />
+                      <Trash2 class="w-4 h-4" />
                     </el-button>
                     <template
                       v-if="
@@ -134,7 +134,7 @@
                           :disabled="!$hasPermission('post')"
                           @click="addSchema($index)"
                         >
-                          <Icon icon="lucide:plus" class="w-4 h-4" />
+                          <Plus class="w-4 h-4" />
                         </el-button>
                       </el-tooltip>
                     </template>
@@ -209,6 +209,7 @@ import { SchemaRegistryType } from '@/types/enum'
 import { SchemaRegistry } from '@/types/rule'
 import type { SchemaValidation, SchemaValidationCheckItem } from '@/types/typeAlias'
 import { SchemaValidationLogLevel } from '@/types/typeAlias'
+import { Plus, Trash2 } from 'lucide-vue-next'
 import {
   PropType,
   WritableComputedRef,
diff --git a/src/views/RuleEngine/components/MockDataDrawer.vue b/src/views/RuleEngine/components/MockDataDrawer.vue
index 5c187ba99..9ad5a9b2a 100644
--- a/src/views/RuleEngine/components/MockDataDrawer.vue
+++ b/src/views/RuleEngine/components/MockDataDrawer.vue
@@ -36,7 +36,7 @@
     </div>
     <template #footer>
       <el-button v-if="isFormModified" plain @click="resetContext">
-        <Icon icon="lucide:rotate-ccw" class="mr-2" />
+        <RotateCcw class="mr-2" />
         {{ t('Base.reset') }}
       </el-button>
       <CancelButton @click="showDrawer = false" :disabled="isSubmitting" />
@@ -50,6 +50,7 @@
 <script setup lang="ts">
 import { BridgeItem } from '@/types/rule'
 import { CaretRight } from '@element-plus/icons-vue'
+import { RotateCcw } from 'lucide-vue-next'
 import FromSelect from '../components/FromSelect.vue'
 import TestSQLContextForm from './TestSQLContextForm.vue'
 
diff --git a/src/views/RuleEngine/components/MovableItemTableItemDrop.vue b/src/views/RuleEngine/components/MovableItemTableItemDrop.vue
index c12df1df3..93ff0a339 100644
--- a/src/views/RuleEngine/components/MovableItemTableItemDrop.vue
+++ b/src/views/RuleEngine/components/MovableItemTableItemDrop.vue
@@ -15,29 +15,29 @@
     <template #dropdown>
       <el-dropdown-menu>
         <el-dropdown-item command="moveUp" :disabled="rowIndex === 0 || !$hasPermission('put')">
-          <Icon icon="lucide:chevron-up" class="w-4 h-4 mr-2" />
+          <ChevronUp class="w-4 h-4 mr-2" />
           {{ $t('Base.up') }}
         </el-dropdown-item>
         <el-dropdown-item
           command="moveDown"
           :disabled="rowIndex === tableDataLen - 1 || !$hasPermission('put')"
         >
-          <Icon icon="lucide:chevron-down" class="w-4 h-4 mr-2" />
+          <ChevronDown class="w-4 h-4 mr-2" />
           {{ $t('Base.down') }}
         </el-dropdown-item>
         <el-dropdown-item command="moveToTop" :disabled="rowIndex === 0 || !$hasPermission('put')">
-          <Icon icon="lucide:chevrons-up" class="w-4 h-4 mr-2" />
+          <ChevronsUp class="w-4 h-4 mr-2" />
           {{ $t('Base.moveToTop') }}
         </el-dropdown-item>
         <el-dropdown-item
           command="moveToBottom"
           :disabled="rowIndex === tableDataLen - 1 || !$hasPermission('put')"
         >
-          <Icon icon="lucide:chevrons-down" class="w-4 h-4 mr-2" />
+          <ChevronsDown class="w-4 h-4 mr-2" />
           {{ $t('Base.moveToBottom') }}
         </el-dropdown-item>
         <el-dropdown-item :disabled="!$hasPermission('delete')" command="delete">
-          <Icon icon="lucide:trash-2" class="w-4 h-4 mr-2" />
+          <Trash2 class="w-4 h-4 mr-2" />
           {{ $t('Base.delete') }}
         </el-dropdown-item>
       </el-dropdown-menu>
@@ -47,6 +47,7 @@
 
 <script setup lang="ts">
 import { CaretBottom } from '@element-plus/icons-vue'
+import { ChevronDown, ChevronsDown, ChevronsUp, ChevronUp, Trash2 } from 'lucide-vue-next'
 
 defineProps({
   rowIndex: {
diff --git a/src/views/RuleEngine/components/SQLTest.vue b/src/views/RuleEngine/components/SQLTest.vue
index ac61d9bc5..33db91224 100644
--- a/src/views/RuleEngine/components/SQLTest.vue
+++ b/src/views/RuleEngine/components/SQLTest.vue
@@ -75,7 +75,7 @@
                   {{ tl('testsql') }}
                 </el-button>
                 <el-button plain @click="resetContext">
-                  <Icon icon="lucide:rotate-ccw" class="mr-2" />
+                  <RotateCcw class="mr-2" />
                   {{ t('Base.reset') }}
                 </el-button>
               </div>
@@ -108,6 +108,7 @@ import FromSelect from '../components/FromSelect.vue'
 import RuleTest from './RuleTest.vue'
 import TestSQLContextForm from './TestSQLContextForm.vue'
 import { jsonBigIntParse, jsonBigIntStringify } from '@emqx/shared-ui-utils'
+import { RotateCcw } from 'lucide-vue-next'
 
 const { tl, t } = useI18nTl('RuleEngine')
 
diff --git a/src/views/RuleEngine/components/TableItemDropDown.vue b/src/views/RuleEngine/components/TableItemDropDown.vue
index 81f930a65..563b5cce5 100644
--- a/src/views/RuleEngine/components/TableItemDropDown.vue
+++ b/src/views/RuleEngine/components/TableItemDropDown.vue
@@ -20,15 +20,15 @@
           v-if="canCreateRule"
           :disabled="!$hasPermission('post')"
         >
-          <Icon icon="lucide:file-plus" class="w-4 h-4 mr-2" />
+          <FilePlus class="w-4 h-4 mr-2" />
           <span>{{ tl('createRule') }}</span>
         </el-dropdown-item>
         <el-dropdown-item command="copy" :disabled="!$hasPermission('post')" v-if="canCopy">
-          <Icon icon="lucide:copy" class="w-4 h-4 mr-2" />
+          <Copy class="w-4 h-4 mr-2" />
           <span>{{ tl('duplicate') }}</span>
         </el-dropdown-item>
         <el-dropdown-item :disabled="!$hasPermission('post') || disableDel" command="delete">
-          <Icon icon="lucide:trash-2" class="w-4 h-4 mr-2" />
+          <Trash2 class="w-4 h-4 mr-2" />
           <span>{{ tl('delete', 'Base') }}</span>
         </el-dropdown-item>
       </el-dropdown-menu>
@@ -45,6 +45,7 @@ export default defineComponent({
 <script setup lang="ts">
 import { PluginItem } from '@/types/plugin'
 import { CaretBottom } from '@element-plus/icons-vue'
+import { Copy, FilePlus, Trash2 } from 'lucide-vue-next'
 
 const { t } = useI18n()
 const tl = (key: string, moduleName = 'RuleEngine') => t(`${moduleName}.${key}`)
diff --git a/src/views/Settings/Help.vue b/src/views/Settings/Help.vue
index cdc234473..f918c9c68 100644
--- a/src/views/Settings/Help.vue
+++ b/src/views/Settings/Help.vue
@@ -11,7 +11,7 @@
         <a :href="link" target="_blank">
           <el-card class="card-link" shadow="never">
             <div class="card-icon">
-              <Icon :icon="icon" class="icon-platform" />
+              <component :is="icon" class="icon-platform" />
             </div>
             <p class="text-title">{{ title }}</p>
           </el-card>
@@ -89,6 +89,7 @@ export default defineComponent({
 import cloudIcon from '@/assets/img/cloud.png'
 import emqxEnterpriseIcon from '@/assets/img/emqx-enterprise-icon.png'
 import { Right } from '@element-plus/icons-vue'
+import { BookOpen, MessageCircle, Newspaper } from 'lucide-vue-next'
 import DocListCard from './components/DocListCard.vue'
 
 const props = defineProps({
@@ -112,17 +113,17 @@ const { docMap } = useDocLink()
 const platformList = [
   {
     link: docMap.documentation,
-    icon: 'lucide:book-open',
+    icon: BookOpen,
     title: tl('documentation'),
   },
   {
     link: docMap.forum,
-    icon: 'lucide:message-circle',
+    icon: MessageCircle,
     title: tl('forum'),
   },
   {
     link: docMap.blog,
-    icon: 'lucide:newspaper',
+    icon: Newspaper,
     title: tl('blog'),
   },
 ]
diff --git a/src/views/Webhook/components/Trigger.vue b/src/views/Webhook/components/Trigger.vue
index 5c841f063..1344a8011 100644
--- a/src/views/Webhook/components/Trigger.vue
+++ b/src/views/Webhook/components/Trigger.vue
@@ -23,19 +23,19 @@
                       />
                     </el-form-item>
                     <el-button class="btn-del" link @click="delTopic($index)">
-                      <el-icon :size="16"><Icon icon="lucide:trash-2" /></el-icon>
+                      <el-icon :size="16"><Trash2 /></el-icon>
                     </el-button>
                   </li>
                 </ul>
                 <el-button link type="primary" @click="addTopic">
-                  <Icon icon="lucide:plus" class="mr-2" />
+                  <Plus class="mr-2" />
                   {{ tl('addTopic') }}
                 </el-button>
               </div>
             </div>
           </div>
           <el-button v-else plain type="primary" @click="addTopic">
-            <Icon icon="lucide:plus" class="mr-2" />
+            <Plus class="mr-2" />
             {{ tl('addTopic') }}
           </el-button>
         </div>
@@ -62,6 +62,7 @@ import {
 } from '@/common/constants'
 import { EventForRule } from '@/types/enum'
 import { RuleEvent } from '@/types/rule'
+import { Plus, Trash2 } from 'lucide-vue-next'
 
 const enum TriggerType {
   Messages,