diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertConvergesController.java b/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertConvergesController.java
index b89c25e49d2..a3d9dbb964a 100644
--- a/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertConvergesController.java
+++ b/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertConvergesController.java
@@ -29,6 +29,7 @@
 import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.http.ResponseEntity;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.persistence.criteria.CriteriaBuilder;
@@ -58,6 +59,7 @@ public class AlertConvergesController {
             description = "You can obtain the list of alarm converge by querying filter items ｜ 根据查询过滤项获取告警收敛信息列表")
     public ResponseEntity<Message<Page<AlertConverge>>> getAlertConverges(
             @Parameter(description = "Alarm Converge ID ｜ 告警收敛ID", example = "6565463543") @RequestParam(required = false) List<Long> ids,
+            @Parameter(description = "Search Name ｜ 模糊查询-名称", example = "x") @RequestParam(required = false) String search,
             @Parameter(description = "Sort field, default id ｜ 排序字段，默认id", example = "id") @RequestParam(defaultValue = "id") String sort,
             @Parameter(description = "Sort mode: asc: ascending, desc: descending ｜ 排序方式，asc:升序，desc:降序", example = "desc") @RequestParam(defaultValue = "desc") String order,
             @Parameter(description = "List current page ｜ 列表当前分页", example = "0") @RequestParam(defaultValue = "0") int pageIndex,
@@ -72,6 +74,15 @@ public ResponseEntity<Message<Page<AlertConverge>>> getAlertConverges(
                 }
                 andList.add(inPredicate);
             }
+            if (StringUtils.hasText(search)) {
+                Predicate predicate = criteriaBuilder.or(
+                        criteriaBuilder.like(
+                                criteriaBuilder.lower(root.get("name")),
+                                "%" + search.toLowerCase() + "%"
+                        )
+                );
+                andList.add(predicate);
+            }
             Predicate[] predicates = new Predicate[andList.size()];
             return criteriaBuilder.and(andList.toArray(predicates));
         };
diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertDefinesController.java b/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertDefinesController.java
index ecb74999313..bcc8930cee6 100644
--- a/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertDefinesController.java
+++ b/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertDefinesController.java
@@ -63,7 +63,7 @@ public class AlertDefinesController {
             description = "You can obtain the list of alarm definitions by querying filter items ｜ 根据查询过滤项获取告警定义信息列表")
     public ResponseEntity<Message<Page<AlertDefine>>> getAlertDefines(
             @Parameter(description = "Alarm Definition ID ｜ 告警定义ID", example = "6565463543") @RequestParam(required = false) List<Long> ids,
-            @Parameter(description = "Alarm Definition app ｜ 告警定义名称", example = "6565463543") @RequestParam(required = false) String search,
+            @Parameter(description = "Search-Target Expr Template ｜ 模糊查询-指标对象 表达式 通知模版", example = "x") @RequestParam(required = false) String search,
             @Parameter(description = "Alarm Definition Severity ｜ 告警定义级别", example = "6565463543") @RequestParam(required = false) Byte priority,
             @Parameter(description = "Sort field, default id ｜ 排序字段，默认id", example = "id") @RequestParam(defaultValue = "id") String sort,
             @Parameter(description = "Sort mode: asc: ascending, desc: descending ｜ 排序方式，asc:升序，desc:降序", example = "desc") @RequestParam(defaultValue = "desc") String order,
@@ -87,11 +87,19 @@ public ResponseEntity<Message<Page<AlertDefine>>> getAlertDefines(
                         ),
                         criteriaBuilder.like(
                                 criteriaBuilder.lower(root.get("metric")),
-                                "%" + search.toUpperCase() + "%"
+                                "%" + search.toLowerCase() + "%"
                         ),
                         criteriaBuilder.like(
                                 criteriaBuilder.lower(root.get("field")),
-                                "%" + search.toUpperCase() + "%"
+                                "%" + search.toLowerCase() + "%"
+                        ),
+                        criteriaBuilder.like(
+                                criteriaBuilder.lower(root.get("expr")),
+                                "%" + search.toLowerCase() + "%"
+                        ),
+                        criteriaBuilder.like(
+                                criteriaBuilder.lower(root.get("template")),
+                                "%" + search.toLowerCase() + "%"
                         )
                 );
                 andList.add(predicate);
diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertSilencesController.java b/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertSilencesController.java
index c2ae18719d3..b9d18211100 100644
--- a/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertSilencesController.java
+++ b/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertSilencesController.java
@@ -29,6 +29,7 @@
 import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.http.ResponseEntity;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.persistence.criteria.CriteriaBuilder;
@@ -58,6 +59,7 @@ public class AlertSilencesController {
             description = "You can obtain the list of alarm silence by querying filter items ｜ 根据查询过滤项获取告警静默信息列表")
     public ResponseEntity<Message<Page<AlertSilence>>> getAlertSilences(
             @Parameter(description = "Alarm Silence ID ｜ 告警静默ID", example = "6565463543") @RequestParam(required = false) List<Long> ids,
+            @Parameter(description = "Search Name ｜ 模糊查询-名称", example = "x") @RequestParam(required = false) String search,
             @Parameter(description = "Sort field, default id ｜ 排序字段，默认id", example = "id") @RequestParam(defaultValue = "id") String sort,
             @Parameter(description = "Sort mode: asc: ascending, desc: descending ｜ 排序方式，asc:升序，desc:降序", example = "desc") @RequestParam(defaultValue = "desc") String order,
             @Parameter(description = "List current page ｜ 列表当前分页", example = "0") @RequestParam(defaultValue = "0") int pageIndex,
@@ -72,6 +74,15 @@ public ResponseEntity<Message<Page<AlertSilence>>> getAlertSilences(
                 }
                 andList.add(inPredicate);
             }
+            if (StringUtils.hasText(search)) {
+                Predicate predicate = criteriaBuilder.or(
+                        criteriaBuilder.like(
+                                criteriaBuilder.lower(root.get("name")),
+                                "%" + search.toLowerCase() + "%"
+                        )
+                );
+                andList.add(predicate);
+            }
             Predicate[] predicates = new Predicate[andList.size()];
             return criteriaBuilder.and(andList.toArray(predicates));
         };
diff --git a/manager/src/main/resources/templates/0-mailAlarm.html b/manager/src/main/resources/templates/1-emailTemplate.html
similarity index 100%
rename from manager/src/main/resources/templates/0-mailAlarm.html
rename to manager/src/main/resources/templates/1-emailTemplate.html
diff --git a/manager/src/main/resources/templates/10-alertNotifyWeWorkApp.txt b/manager/src/main/resources/templates/10-weWorkAppTemplate.txt
similarity index 100%
rename from manager/src/main/resources/templates/10-alertNotifyWeWorkApp.txt
rename to manager/src/main/resources/templates/10-weWorkAppTemplate.txt
diff --git a/manager/src/main/resources/templates/11-alertNotifySmn.txt b/manager/src/main/resources/templates/11-smnTemplate.txt
similarity index 100%
rename from manager/src/main/resources/templates/11-alertNotifySmn.txt
rename to manager/src/main/resources/templates/11-smnTemplate.txt
diff --git a/manager/src/main/resources/templates/12-alertNotifyServerChan.txt b/manager/src/main/resources/templates/12-serverChanTemplate.txt
similarity index 100%
rename from manager/src/main/resources/templates/12-alertNotifyServerChan.txt
rename to manager/src/main/resources/templates/12-serverChanTemplate.txt
diff --git a/manager/src/main/resources/templates/4-alertNotifyWeWorkRobot.txt b/manager/src/main/resources/templates/4-weWorkRobotTemplate.txt
similarity index 100%
rename from manager/src/main/resources/templates/4-alertNotifyWeWorkRobot.txt
rename to manager/src/main/resources/templates/4-weWorkRobotTemplate.txt
diff --git a/manager/src/main/resources/templates/5-alertNotifyDingTalkRobot.txt b/manager/src/main/resources/templates/5-dingTalkRobotTemplate.txt
similarity index 100%
rename from manager/src/main/resources/templates/5-alertNotifyDingTalkRobot.txt
rename to manager/src/main/resources/templates/5-dingTalkRobotTemplate.txt
diff --git a/manager/src/main/resources/templates/6-alertNotifyFlyBook.txt b/manager/src/main/resources/templates/6-flyBookRobotTemplate.txt
similarity index 100%
rename from manager/src/main/resources/templates/6-alertNotifyFlyBook.txt
rename to manager/src/main/resources/templates/6-flyBookRobotTemplate.txt
diff --git a/manager/src/main/resources/templates/7-alertNotifyTelegramBot.txt b/manager/src/main/resources/templates/7-telegramBotTemplate.txt
similarity index 100%
rename from manager/src/main/resources/templates/7-alertNotifyTelegramBot.txt
rename to manager/src/main/resources/templates/7-telegramBotTemplate.txt
diff --git a/manager/src/main/resources/templates/8-alertNotifySlack.txt b/manager/src/main/resources/templates/8-slackTemplate.txt
similarity index 100%
rename from manager/src/main/resources/templates/8-alertNotifySlack.txt
rename to manager/src/main/resources/templates/8-slackTemplate.txt
diff --git a/manager/src/main/resources/templates/9-alertNotifyDiscordBot.txt b/manager/src/main/resources/templates/9-discordBotTemplate.txt
similarity index 100%
rename from manager/src/main/resources/templates/9-alertNotifyDiscordBot.txt
rename to manager/src/main/resources/templates/9-discordBotTemplate.txt
diff --git a/web-app/src/app/core/startup/startup.service.ts b/web-app/src/app/core/startup/startup.service.ts
index e016f1d76a0..732a98abb27 100644
--- a/web-app/src/app/core/startup/startup.service.ts
+++ b/web-app/src/app/core/startup/startup.service.ts
@@ -60,7 +60,7 @@ export class StartupService {
         // Application information: including site name, description, year
         this.settingService.setApp(appData.app);
         // https://ng-alain.com/theme/settings/zh
-        this.settingService.setLayout('collapsed', true);
+        // this.settingService.setLayout('collapsed', true);
         // ACL: Set the permissions to full, https://ng-alain.com/acl/getting-started
         this.aclService.setFull(true);
         // Menu data, https://ng-alain.com/theme/menu
diff --git a/web-app/src/app/layout/basic/widgets/user.component.ts b/web-app/src/app/layout/basic/widgets/user.component.ts
index 28e1d3ccc45..9b2721e1477 100644
--- a/web-app/src/app/layout/basic/widgets/user.component.ts
+++ b/web-app/src/app/layout/basic/widgets/user.component.ts
@@ -34,7 +34,7 @@ import { CONSTANTS } from '../../../shared/constants';
       [nzFooter]="null"
       (nzOnCancel)="disAboutModal()"
       nzClosable="false"
-      nzWidth="44%"
+      nzWidth="48%"
     >
       <div *nzModalContent class="-inner-content">
         <div style="text-align: center">
diff --git a/web-app/src/app/pojo/NoticeRule.ts b/web-app/src/app/pojo/NoticeRule.ts
index 3064e6a2faa..569403688fb 100644
--- a/web-app/src/app/pojo/NoticeRule.ts
+++ b/web-app/src/app/pojo/NoticeRule.ts
@@ -3,8 +3,8 @@ export class NoticeRule {
   name!: string;
   receiverId!: number;
   receiverName!: string;
-  templateId!: number;
-  templateName!: string;
+  templateId!: number | null;
+  templateName!: string | null;
   enable: boolean = true;
   // 是否转发所有
   filterAll: boolean = true;
diff --git a/web-app/src/app/routes/alert/alert-converge/alert-converge.component.html b/web-app/src/app/routes/alert/alert-converge/alert-converge.component.html
index a0530f5be76..2ca1bda5eb9 100644
--- a/web-app/src/app/routes/alert/alert-converge/alert-converge.component.html
+++ b/web-app/src/app/routes/alert/alert-converge/alert-converge.component.html
@@ -17,6 +17,18 @@
     <i nz-icon nzType="delete" nzTheme="outline"></i>
     {{ 'alert.converge.delete' | i18n }}
   </button>
+  <button style="margin-right: 25px; float: right" nz-button nzType="primary" (click)="loadAlertConvergeTable()">
+    {{ 'common.search' | i18n }}
+  </button>
+  <input
+    style="margin-right: 5px; float: right; width: 200px; border-radius: 9px; text-align: center; margin-right: 0"
+    nz-input
+    type="text"
+    [placeholder]="'alert.converge.name' | i18n"
+    nzSize="default"
+    (keyup.enter)="loadAlertConvergeTable()"
+    [(ngModel)]="search"
+  />
 </div>
 
 <nz-table
diff --git a/web-app/src/app/routes/alert/alert-converge/alert-converge.component.ts b/web-app/src/app/routes/alert/alert-converge/alert-converge.component.ts
index 894cafd539d..3578f1f339d 100644
--- a/web-app/src/app/routes/alert/alert-converge/alert-converge.component.ts
+++ b/web-app/src/app/routes/alert/alert-converge/alert-converge.component.ts
@@ -29,6 +29,7 @@ export class AlertConvergeComponent implements OnInit {
   pageIndex: number = 1;
   pageSize: number = 8;
   total: number = 0;
+  search!: string;
   converges!: AlertConverge[];
   tableLoading: boolean = true;
   checkedConvergeIds = new Set<number>();
@@ -43,7 +44,7 @@ export class AlertConvergeComponent implements OnInit {
 
   loadAlertConvergeTable() {
     this.tableLoading = true;
-    let alertDefineInit$ = this.alertConvergeService.getAlertConverges(this.pageIndex - 1, this.pageSize).subscribe(
+    let alertDefineInit$ = this.alertConvergeService.getAlertConverges(this.search, this.pageIndex - 1, this.pageSize).subscribe(
       message => {
         this.tableLoading = false;
         this.checkedAll = false;
diff --git a/web-app/src/app/routes/alert/alert-notice/alert-notice.component.html b/web-app/src/app/routes/alert/alert-notice/alert-notice.component.html
index 0bcf420a418..9e567c9a659 100644
--- a/web-app/src/app/routes/alert/alert-notice/alert-notice.component.html
+++ b/web-app/src/app/routes/alert/alert-notice/alert-notice.component.html
@@ -157,12 +157,12 @@
       <thead>
         <tr>
           <th nzAlign="center" nzWidth="15%">{{ 'alert.notice.rule.name' | i18n }}</th>
-          <th nzAlign="center" nzWidth="12%">{{ 'alert.notice.receiver.people' | i18n }}</th>
-          <th nzAlign="center" nzWidth="12%">{{ 'alert.notice.template.name' | i18n }}</th>
-          <th nzAlign="center" nzWidth="12%">{{ 'alert.notice.rule.all' | i18n }}</th>
-          <th nzAlign="center" nzWidth="15%">{{ 'alert.notice.rule.enable' | i18n }}</th>
+          <th nzAlign="center" nzWidth="15%">{{ 'alert.notice.receiver.people' | i18n }}</th>
+          <th nzAlign="center" nzWidth="15%">{{ 'alert.notice.template.name' | i18n }}</th>
+          <th nzAlign="center" nzWidth="10%">{{ 'alert.notice.rule.all' | i18n }}</th>
+          <th nzAlign="center" nzWidth="10%">{{ 'alert.notice.rule.enable' | i18n }}</th>
           <th nzAlign="center" nzWidth="15%">{{ 'common.edit-time' | i18n }}</th>
-          <th nzAlign="center" nzWidth="25%">{{ 'common.edit' | i18n }}</th>
+          <th nzAlign="center" nzWidth="20%">{{ 'common.edit' | i18n }}</th>
         </tr>
       </thead>
       <tbody>
@@ -174,7 +174,10 @@
             <span>{{ data.receiverName }}</span>
           </td>
           <td nzAlign="center">
-            <span>{{ data.templateName }}</span>
+            <span *ngIf="data.templateId">{{ data.templateName }}</span>
+            <nz-tag *ngIf="!data.templateId" nzColor="default">
+              <span>{{ 'alert.notice.template.preset.true' | i18n }}</span>
+            </nz-tag>
           </td>
           <td nzAlign="center">
             <nz-switch [(ngModel)]="data.filterAll" (ngModelChange)="updateNoticeRule(data)"></nz-switch>
@@ -230,8 +233,9 @@
         <tr>
           <th nzAlign="center" nzWidth="25%">{{ 'alert.notice.template.name' | i18n }}</th>
           <th nzAlign="center" nzWidth="15%">{{ 'alert.notice.template.type' | i18n }}</th>
-          <th nzAlign="center" nzWidth="15%">{{ 'common.edit-time' | i18n }}</th>
-          <th nzAlign="center" nzWidth="25%">{{ 'common.edit' | i18n }}</th>
+          <th nzAlign="center" nzWidth="15%">{{ 'alert.notice.template.preset' | i18n }}</th>
+          <th nzAlign="center" nzWidth="20%">{{ 'common.edit-time' | i18n }}</th>
+          <th nzAlign="center" nzWidth="15%">{{ 'common.edit' | i18n }}</th>
         </tr>
       </thead>
       <tbody>
@@ -240,86 +244,55 @@
             <span>{{ data.name }}</span>
           </td>
           <td nzAlign="center">
-            <span *ngIf="!data.preset">
+            <span>
               <nz-tag *ngIf="data.type == 0" nzColor="orange">
-                <span>{{ 'alert.applier.type.sms' | i18n }}</span>
+                <span>{{ 'alert.notice.type.sms' | i18n }}</span>
               </nz-tag>
               <nz-tag *ngIf="data.type == 1" nzColor="orange">
-                <span>{{ 'alert.applier.type.email' | i18n }}</span>
+                <span>{{ 'alert.notice.type.email' | i18n }}</span>
               </nz-tag>
               <nz-tag *ngIf="data.type == 2" nzColor="orange">
                 <span>WebHook</span>
               </nz-tag>
               <nz-tag *ngIf="data.type == 3" nzColor="orange">
-                <span>{{ 'alert.applier.type.wechat' | i18n }}</span>
+                <span>{{ 'alert.notice.type.wechat' | i18n }}</span>
               </nz-tag>
               <nz-tag *ngIf="data.type == 4" nzColor="orange">
-                <span>{{ 'alert.applier.type.wework' | i18n }}</span>
+                <span>{{ 'alert.notice.type.wework' | i18n }}</span>
               </nz-tag>
               <nz-tag *ngIf="data.type == 5" nzColor="orange">
-                <span>{{ 'alert.applier.type.ding' | i18n }}</span>
+                <span>{{ 'alert.notice.type.ding' | i18n }}</span>
               </nz-tag>
               <nz-tag *ngIf="data.type == 6" nzColor="orange">
-                <span>{{ 'alert.applier.type.fei-shu' | i18n }}</span>
+                <span>{{ 'alert.notice.type.fei-shu' | i18n }}</span>
               </nz-tag>
               <nz-tag *ngIf="data.type == 7" nzColor="orange">
-                <span>{{ 'alert.applier.type.telegram' | i18n }}</span>
+                <span>{{ 'alert.notice.type.telegram' | i18n }}</span>
               </nz-tag>
               <nz-tag *ngIf="data.type == 8" nzColor="orange">
-                <span>{{ 'alert.applier.type.slack' | i18n }}</span>
+                <span>{{ 'alert.notice.type.slack' | i18n }}</span>
               </nz-tag>
               <nz-tag *ngIf="data.type == 9" nzColor="orange">
-                <span>{{ 'alert.applier.type.discord' | i18n }}</span>
+                <span>{{ 'alert.notice.type.discord' | i18n }}</span>
               </nz-tag>
               <nz-tag *ngIf="data.type == 10" nzColor="orange">
-                <span>{{ 'alert.applier.type.weChatApp' | i18n }}</span>
+                <span>{{ 'alert.notice.type.weChatApp' | i18n }}</span>
               </nz-tag>
               <nz-tag *ngIf="data.type == 11" nzColor="orange">
-                <span>{{ 'alert.applier.type.smn' | i18n }}</span>
+                <span>{{ 'alert.notice.type.smn' | i18n }}</span>
               </nz-tag>
               <nz-tag *ngIf="data.type == 12" nzColor="orange">
-                <span>{{ 'alert.applier.type.serverchan' | i18n }}</span>
+                <span>{{ 'alert.notice.type.serverchan' | i18n }}</span>
               </nz-tag>
             </span>
-            <span *ngIf="data.preset">
-              <nz-tag *ngIf="data.name == 'sms'" nzColor="orange">
-                <span>{{ 'alert.applier.type.sms' | i18n }}</span>
-              </nz-tag>
-              <nz-tag *ngIf="data.name == 'mailAlarm'" nzColor="orange">
-                <span>{{ 'alert.applier.type.email' | i18n }}</span>
-              </nz-tag>
-              <nz-tag *ngIf="data.name == 'WebHook'" nzColor="orange">
-                <span>WebHook</span>
-              </nz-tag>
-              <nz-tag *ngIf="data.name == 'wechat'" nzColor="orange">
-                <span>{{ 'alert.applier.type.wechat' | i18n }}</span>
-              </nz-tag>
-              <nz-tag *ngIf="data.name == 'alertNotifyWeWorkRobot'" nzColor="orange">
-                <span>{{ 'alert.applier.type.wework' | i18n }}</span>
-              </nz-tag>
-              <nz-tag *ngIf="data.name == 'alertNotifyDingTalkRobot'" nzColor="orange">
-                <span>{{ 'alert.applier.type.ding' | i18n }}</span>
-              </nz-tag>
-              <nz-tag *ngIf="data.name == 'alertNotifyFlyBook'" nzColor="orange">
-                <span>{{ 'alert.applier.type.fei-shu' | i18n }}</span>
-              </nz-tag>
-              <nz-tag *ngIf="data.name == 'alertNotifyTelegramBot'" nzColor="orange">
-                <span>{{ 'alert.applier.type.telegram' | i18n }}</span>
-              </nz-tag>
-              <nz-tag *ngIf="data.name == 'alertNotifySlack'" nzColor="orange">
-                <span>{{ 'alert.applier.type.slack' | i18n }}</span>
-              </nz-tag>
-              <nz-tag *ngIf="data.name == 'alertNotifyDiscordBot'" nzColor="orange">
-                <span>{{ 'alert.applier.type.discord' | i18n }}</span>
-              </nz-tag>
-              <nz-tag *ngIf="data.name == 'alertNotifyWeWorkApp'" nzColor="orange">
-                <span>{{ 'alert.applier.type.weChatApp' | i18n }}</span>
-              </nz-tag>
-              <nz-tag *ngIf="data.name == 'alertNotifySmn'" nzColor="orange">
-                <span>{{ 'alert.applier.type.smn' | i18n }}</span>
+          </td>
+          <td nzAlign="center">
+            <span>
+              <nz-tag *ngIf="data.preset" nzColor="default">
+                <span>{{ 'alert.notice.template.preset.true' | i18n }}</span>
               </nz-tag>
-              <nz-tag *ngIf="data.name == 'alertNotifyServerChan'" nzColor="orange">
-                <span>{{ 'alert.applier.type.serverchan' | i18n }}</span>
+              <nz-tag *ngIf="!data.preset" nzColor="orange">
+                <span>{{ 'alert.notice.template.preset.false' | i18n }}</span>
               </nz-tag>
             </span>
           </td>
@@ -349,7 +322,7 @@
             <span *ngIf="data.preset">
               <button
                 (click)="onShowOneNoticeTemplate(data)"
-                [nzTooltipTitle]="'alert.notice.template.showExample' | i18n"
+                [nzTooltipTitle]="'alert.notice.template.show' | i18n"
                 nz-button
                 nz-tooltip
                 nzType="primary"
@@ -388,10 +361,10 @@
           <nz-select
             (nzOpenChange)="loadReceiversOption()"
             [(ngModel)]="rule.receiverId"
+            (ngModelChange)="onSwitchReceiver()"
             [nzOptions]="receiversOption"
             id="receiver"
             name="receiver"
-            nzAllowClear
             nzPlaceHolder="Select a person"
             nzShowSearch
             required
@@ -408,10 +381,8 @@
             [nzOptions]="templatesOption"
             id="templates"
             name="templates"
-            nzAllowClear
             nzPlaceHolder="Select a template"
             nzShowSearch
-            required
           >
           </nz-select>
         </nz-form-control>
@@ -737,47 +708,47 @@
   [nzOkLoading]="isManageTemplateModalOkLoading"
   [nzTitle]="isManageTemplateModalAdd ? ('alert.notice.template.new' | i18n) : ('alert.notice.template.edit' | i18n)"
   nzMaskClosable="false"
-  nzWidth="40%"
+  nzWidth="45%"
 >
   <div *nzModalContent class="-inner-content">
     <form #templateForm="ngForm" nz-form>
       <nz-form-item>
-        <nz-form-label [nzSpan]="7" nzFor="template_name" nzRequired="true">{{ 'alert.notice.template.name' | i18n }}</nz-form-label>
-        <nz-form-control [nzErrorTip]="'validation.required' | i18n" [nzSpan]="12">
+        <nz-form-label [nzSpan]="4" nzFor="template_name" nzRequired="true">{{ 'alert.notice.template.name' | i18n }}</nz-form-label>
+        <nz-form-control [nzErrorTip]="'validation.required' | i18n" [nzSpan]="18">
           <input [(ngModel)]="template.name" id="template_name" name="template_name" nz-input required type="text" />
         </nz-form-control>
       </nz-form-item>
 
       <nz-form-item>
-        <nz-form-label nzFor="type" nzRequired="true" nzSpan="7">{{ 'alert.notice.receiver.type' | i18n }} </nz-form-label>
-        <nz-form-control [nzErrorTip]="'validation.required' | i18n" nzSpan="12">
+        <nz-form-label nzFor="type" nzRequired="true" nzSpan="4">{{ 'alert.notice.receiver.type' | i18n }} </nz-form-label>
+        <nz-form-control [nzErrorTip]="'validation.required' | i18n" nzSpan="18">
           <nz-select [(ngModel)]="template.type" [nzOptionOverflowSize]="10" id="type1" name="type" nzPlaceHolder="Choose" required>
-            <nz-option [nzLabel]="'alert.applier.type.sms' | i18n" [nzValue]="0"></nz-option>
-            <nz-option [nzLabel]="'alert.applier.type.email' | i18n" [nzValue]="1"></nz-option>
+            <nz-option [nzLabel]="'alert.notice.type.sms' | i18n" [nzValue]="0"></nz-option>
+            <nz-option [nzLabel]="'alert.notice.type.email' | i18n" [nzValue]="1"></nz-option>
             <nz-option [nzValue]="2" nzLabel="WebHook"></nz-option>
-            <nz-option [nzLabel]="'alert.applier.type.discord' | i18n" [nzValue]="9"></nz-option>
-            <nz-option [nzLabel]="'alert.applier.type.slack' | i18n" [nzValue]="8"></nz-option>
-            <nz-option [nzLabel]="'alert.applier.type.wework' | i18n" [nzValue]="4"></nz-option>
-            <nz-option [nzLabel]="'alert.applier.type.ding' | i18n" [nzValue]="5"></nz-option>
-            <nz-option [nzLabel]="'alert.applier.type.fei-shu' | i18n" [nzValue]="6"></nz-option>
-            <nz-option [nzLabel]="'alert.applier.type.telegram' | i18n" [nzValue]="7"></nz-option>
-            <nz-option [nzLabel]="'alert.applier.type.weChatApp' | i18n" [nzValue]="10"></nz-option>
-            <nz-option [nzLabel]="'alert.applier.type.smn' | i18n" [nzValue]="11"></nz-option>
-            <nz-option [nzLabel]="'alert.applier.type.serverchan' | i18n" [nzValue]="12"></nz-option>
+            <nz-option [nzLabel]="'alert.notice.type.discord' | i18n" [nzValue]="9"></nz-option>
+            <nz-option [nzLabel]="'alert.notice.type.slack' | i18n" [nzValue]="8"></nz-option>
+            <nz-option [nzLabel]="'alert.notice.type.wework' | i18n" [nzValue]="4"></nz-option>
+            <nz-option [nzLabel]="'alert.notice.type.ding' | i18n" [nzValue]="5"></nz-option>
+            <nz-option [nzLabel]="'alert.notice.type.fei-shu' | i18n" [nzValue]="6"></nz-option>
+            <nz-option [nzLabel]="'alert.notice.type.telegram' | i18n" [nzValue]="7"></nz-option>
+            <nz-option [nzLabel]="'alert.notice.type.weChatApp' | i18n" [nzValue]="10"></nz-option>
+            <nz-option [nzLabel]="'alert.notice.type.smn' | i18n" [nzValue]="11"></nz-option>
+            <nz-option [nzLabel]="'alert.notice.type.serverchan' | i18n" [nzValue]="12"></nz-option>
           </nz-select>
         </nz-form-control>
       </nz-form-item>
 
       <nz-form-item>
-        <nz-form-label [nzSpan]="7" nzFor="template_content" nzRequired="true">{{ 'alert.notice.template.content' | i18n }}</nz-form-label>
-        <nz-form-control [nzErrorTip]="'validation.required' | i18n" [nzSpan]="12">
+        <nz-form-label [nzSpan]="4" nzFor="template_content" nzRequired="true">{{ 'alert.notice.template.content' | i18n }}</nz-form-label>
+        <nz-form-control [nzErrorTip]="'validation.required' | i18n" [nzSpan]="18">
           <textarea
             [(ngModel)]="template.content"
             id="template_content"
             name="template_content"
             nz-input
             required
-            style="white-space: nowrap; overflow: scroll; height: 120px"
+            style="white-space: nowrap; height: 200px"
             type="textarea"
           ></textarea>
         </nz-form-control>
@@ -790,9 +761,10 @@
 <nz-modal
   (nzOnCancel)="onManageTemplateModalCancel()"
   [(nzVisible)]="isShowTemplateModalVisible"
-  [nzTitle]="'alert.notice.template.example' | i18n"
+  [nzTitle]="'alert.notice.template.content' | i18n"
+  [nzCancelText]="'common.button.return' | i18n"
+  [nzOkText]="null"
   nzMaskClosable="false"
-  nzOkDisabled="true"
   nzWidth="40%"
 >
   <div *nzModalContent class="-inner-content">
diff --git a/web-app/src/app/routes/alert/alert-notice/alert-notice.component.ts b/web-app/src/app/routes/alert/alert-notice/alert-notice.component.ts
index c41740309b3..7de5465917c 100644
--- a/web-app/src/app/routes/alert/alert-notice/alert-notice.component.ts
+++ b/web-app/src/app/routes/alert/alert-notice/alert-notice.component.ts
@@ -44,6 +44,7 @@ export class AlertNoticeComponent implements OnInit {
   isManageRuleModalAdd: boolean = true;
   isManageRuleModalOkLoading: boolean = false;
   rule: NoticeRule = new NoticeRule();
+  switchReceiver!: NoticeReceiver;
   receiversOption: any[] = [];
   searchTag!: string;
   tagsOption: any[] = [];
@@ -403,6 +404,11 @@ export class AlertNoticeComponent implements OnInit {
 
   onNewNoticeRule() {
     this.rule = new NoticeRule();
+    this.rule.templateId = -1;
+    this.templatesOption.push({
+      value: -1,
+      label: this.i18nSvc.fanyi('alert.notice.template.preset.true')
+    });
     this.isLimit = false;
     this.isManageRuleModalVisible = true;
     this.isManageRuleModalAdd = true;
@@ -410,17 +416,27 @@ export class AlertNoticeComponent implements OnInit {
 
   onEditOneNoticeRule(rule: NoticeRule) {
     this.rule = rule;
-    if (this.rule.days == null || this.rule.days.length == 7) {
-      this.isLimit = false;
-    } else {
-      this.isLimit = true;
-    }
+    this.isLimit = !(this.rule.days == null || this.rule.days.length == 7);
     this.isManageRuleModalVisible = true;
     this.isManageRuleModalAdd = false;
+    this.receiversOption = [];
     this.receiversOption.push({
       value: rule.receiverId,
       label: rule.receiverName
     });
+    this.templatesOption = [];
+    if (this.rule.templateId && this.rule.templateName) {
+      this.templatesOption.push({
+        value: rule.templateId,
+        label: rule.templateName
+      });
+    } else {
+      this.rule.templateId = -1;
+      this.templatesOption.push({
+        value: -1,
+        label: this.i18nSvc.fanyi('alert.notice.template.preset.true')
+      });
+    }
     this.filterTags = [];
     if (rule.tags != undefined) {
       rule.tags.forEach(item => {
@@ -449,14 +465,19 @@ export class AlertNoticeComponent implements OnInit {
       this.rule.days = this.dayCheckOptions.map(item => item.value).concat();
     } else {
       this.rule.days = this.dayCheckOptions
-        .filter(item => item.checked == true)
+        .filter(item => item.checked)
         .map(item => item.value)
         .concat();
     }
   }
 
-  loadReciverType(reciverId: number) {
-    return 5;
+  onSwitchReceiver() {
+    this.receiversOption.forEach(option => {
+      if (option.value == this.rule.receiverId) {
+        this.switchReceiver = option.receiver;
+      }
+    });
+    this.rule.templateId = -1;
   }
 
   loadReceiversOption() {
@@ -511,7 +532,8 @@ export class AlertNoticeComponent implements OnInit {
               }
               this.receiversOption.push({
                 value: item.id,
-                label: label
+                label: label,
+                receiver: item
               });
             });
           }
@@ -534,53 +556,21 @@ export class AlertNoticeComponent implements OnInit {
           let data = message.data;
           this.templatesOption = [];
           if (data != undefined) {
+            let index = -1;
             data.forEach(item => {
-              let label = `${item.name}-`;
-              switch (item.type) {
-                case 0:
-                  label = `${label}Phone`;
-                  break;
-                case 1:
-                  label = `${label}Email`;
-                  break;
-                case 2:
-                  label = `${label}WebHook`;
-                  break;
-                case 3:
-                  label = `${label}WeChat`;
-                  break;
-                case 4:
-                  label = `${label}WeWork`;
-                  break;
-                case 5:
-                  label = `${label}DingDing`;
-                  break;
-                case 6:
-                  label = `${label}FeiShu`;
-                  break;
-                case 7:
-                  label = `${label}TelegramBot`;
-                  break;
-                case 8:
-                  label = `${label}SlackWebHook`;
-                  break;
-                case 9:
-                  label = `${label}Discord Bot`;
-                  break;
-                case 10:
-                  label = `${label}weChatApp`;
-                  break;
-                case 11:
-                  label = `${label}smn`;
-                  break;
-                case 12:
-                  label = `${label}ServerChan`;
-                  break;
+              if (this.switchReceiver) {
+                if (this.switchReceiver.type == item.type) {
+                  this.templatesOption.push({
+                    value: item.id == null ? -1 : item.id,
+                    label: item.id == null ? this.i18nSvc.fanyi('alert.notice.template.preset.true') : item.name
+                  });
+                }
+              } else {
+                this.templatesOption.push({
+                  value: item.id == null ? index-- : item.id,
+                  label: item.name
+                });
               }
-              this.templatesOption.push({
-                value: item.id,
-                label: label
-              });
             });
           }
         } else {
@@ -681,12 +671,17 @@ export class AlertNoticeComponent implements OnInit {
         this.rule.receiverName = option.label;
       }
     });
-    // 加上templatemodel
-    this.templatesOption.forEach(option => {
-      if (option.value == this.rule.templateId) {
-        this.rule.templateName = option.label;
-      }
-    });
+    // template model
+    if (this.rule.templateId != null && this.rule.templateId >= 0) {
+      this.templatesOption.forEach(option => {
+        if (option.value == this.rule.templateId) {
+          this.rule.templateName = option.label;
+        }
+      });
+    } else {
+      this.rule.templateId = null;
+      this.rule.templateName = null;
+    }
     this.rule.tags = [];
     this.filterTags.forEach(tag => {
       let tmp: string[] = tag.split(':');
diff --git a/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html b/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html
index 81c17bdcc43..4a218f4c199 100644
--- a/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html
+++ b/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html
@@ -24,13 +24,12 @@
     style="margin-right: 5px; float: right; width: 200px; border-radius: 9px; text-align: center; margin-right: 0"
     nz-input
     type="text"
-    [placeholder]="'alert.setting.target' | i18n"
+    [placeholder]="'alert.setting.search' | i18n"
     nzSize="default"
     (keyup.enter)="loadAlertDefineTable()"
     [(ngModel)]="search"
   />
 </div>
-<div nz-col [nzXs]="{ span: 24 }" class="mobile-hide"> </div>
 
 <nz-table
   #fixedTable
diff --git a/web-app/src/app/routes/alert/alert-silence/alert-silence.component.html b/web-app/src/app/routes/alert/alert-silence/alert-silence.component.html
index a7c80975ef6..a5ebf2c5391 100644
--- a/web-app/src/app/routes/alert/alert-silence/alert-silence.component.html
+++ b/web-app/src/app/routes/alert/alert-silence/alert-silence.component.html
@@ -18,6 +18,18 @@
     <i nz-icon nzType="delete" nzTheme="outline"></i>
     {{ 'alert.silence.delete' | i18n }}
   </button>
+  <button style="margin-right: 25px; float: right" nz-button nzType="primary" (click)="loadAlertSilenceTable()">
+    {{ 'common.search' | i18n }}
+  </button>
+  <input
+    style="margin-right: 5px; float: right; width: 200px; border-radius: 9px; text-align: center; margin-right: 0"
+    nz-input
+    type="text"
+    [placeholder]="'alert.silence.name' | i18n"
+    nzSize="default"
+    (keyup.enter)="loadAlertSilenceTable()"
+    [(ngModel)]="search"
+  />
 </div>
 
 <nz-table
diff --git a/web-app/src/app/routes/alert/alert-silence/alert-silence.component.ts b/web-app/src/app/routes/alert/alert-silence/alert-silence.component.ts
index 9b14a78a327..4f935a56ae6 100644
--- a/web-app/src/app/routes/alert/alert-silence/alert-silence.component.ts
+++ b/web-app/src/app/routes/alert/alert-silence/alert-silence.component.ts
@@ -29,6 +29,7 @@ export class AlertSilenceComponent implements OnInit {
   pageIndex: number = 1;
   pageSize: number = 8;
   total: number = 0;
+  search!: string;
   silences!: AlertSilence[];
   tableLoading: boolean = true;
   checkedSilenceIds = new Set<number>();
@@ -43,7 +44,7 @@ export class AlertSilenceComponent implements OnInit {
 
   loadAlertSilenceTable() {
     this.tableLoading = true;
-    let alertDefineInit$ = this.alertSilenceService.getAlertSilences(this.pageIndex - 1, this.pageSize).subscribe(
+    let alertDefineInit$ = this.alertSilenceService.getAlertSilences(this.search, this.pageIndex - 1, this.pageSize).subscribe(
       message => {
         this.tableLoading = false;
         this.checkedAll = false;
diff --git a/web-app/src/app/routes/monitor/monitor-detail/monitor-detail.component.html b/web-app/src/app/routes/monitor/monitor-detail/monitor-detail.component.html
index b294b13392e..3e86c03ea90 100644
--- a/web-app/src/app/routes/monitor/monitor-detail/monitor-detail.component.html
+++ b/web-app/src/app/routes/monitor/monitor-detail/monitor-detail.component.html
@@ -80,20 +80,16 @@
         >
         <div nz-col nzSpan="16">
           <nz-tag *ngIf="monitor.status == 0" nzColor="default">
-            <i nz-icon nzType="robot" nzTheme="outline"></i>
+            <i nz-icon nzType="meh" nzTheme="outline"></i>
             <span>{{ 'monitor.status.un-manage' | i18n }}</span>
           </nz-tag>
           <nz-tag *ngIf="monitor.status == 1" nzColor="success">
             <i nz-icon nzType="smile" nzTheme="outline"></i>
             <span>{{ 'monitor.status.available' | i18n }}</span>
           </nz-tag>
-          <nz-tag *ngIf="monitor.status == 2" nzColor="warning">
-            <i nz-icon nzType="meh" nzTheme="outline"></i>
-            <span>{{ 'monitor.status.unavailable' | i18n }}</span>
-          </nz-tag>
-          <nz-tag *ngIf="monitor.status == 3" nzColor="error">
+          <nz-tag *ngIf="monitor.status == 2" nzColor="error">
             <i nz-icon nzType="frown" nzTheme="outline"></i>
-            <span>{{ 'monitor.status.unreachable' | i18n }}</span>
+            <span>{{ 'monitor.status.unavailable' | i18n }}</span>
           </nz-tag>
         </div>
       </div>
diff --git a/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html b/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html
index 651d8106f18..2389c5e4479 100644
--- a/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html
+++ b/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html
@@ -125,20 +125,16 @@
       </td>
       <td nzAlign="center">
         <nz-tag *ngIf="data.status == 0" nzColor="default">
-          <i nz-icon nzType="robot" nzTheme="outline"></i>
+          <i nz-icon nzType="meh" nzTheme="outline"></i>
           <span>{{ 'monitor.status.un-manage' | i18n }}</span>
         </nz-tag>
         <nz-tag *ngIf="data.status == 1" nzColor="success">
           <i nz-icon nzType="smile" nzTheme="outline"></i>
           <span>{{ 'monitor.status.available' | i18n }}</span>
         </nz-tag>
-        <nz-tag *ngIf="data.status == 2" nzColor="warning">
-          <i nz-icon nzType="meh" nzTheme="outline"></i>
-          <span>{{ 'monitor.status.unavailable' | i18n }}</span>
-        </nz-tag>
-        <nz-tag *ngIf="data.status == 3" nzColor="error">
+        <nz-tag *ngIf="data.status == 2" nzColor="error">
           <i nz-icon nzType="frown" nzTheme="outline"></i>
-          <span>{{ 'monitor.status.unreachable' | i18n }}</span>
+          <span>{{ 'monitor.status.unavailable' | i18n }}</span>
         </nz-tag>
       </td>
       <td nzAlign="center">
@@ -156,7 +152,7 @@
         </button>
       </td>
       <td nzAlign="center">
-        <a routerLink="/setting/define" [queryParams]="{ app: data.app }">
+        <a routerLink="/monitors" [queryParams]="{ app: data.app }">
           <nz-tag nzColor="processing" class="hoverClass">
             <i nz-icon nzType="cloud"></i>
             <span>{{ 'monitor.app.' + data.app | i18n }}</span>
diff --git a/web-app/src/app/service/alert-converge.service.ts b/web-app/src/app/service/alert-converge.service.ts
index 75cb4ecf5f6..ac7ed0090d9 100644
--- a/web-app/src/app/service/alert-converge.service.ts
+++ b/web-app/src/app/service/alert-converge.service.ts
@@ -38,7 +38,7 @@ export class AlertConvergeService {
     return this.http.delete<Message<any>>(alert_converges_uri, options);
   }
 
-  public getAlertConverges(pageIndex: number, pageSize: number): Observable<Message<Page<AlertConverge>>> {
+  public getAlertConverges(search: string, pageIndex: number, pageSize: number): Observable<Message<Page<AlertConverge>>> {
     pageIndex = pageIndex ? pageIndex : 0;
     pageSize = pageSize ? pageSize : 8;
     // 注意HttpParams是不可变对象 需要保存set后返回的对象为最新对象
@@ -49,6 +49,9 @@ export class AlertConvergeService {
       pageIndex: pageIndex,
       pageSize: pageSize
     });
+    if (search != undefined && search.trim() != '') {
+      httpParams = httpParams.append('search', search.trim());
+    }
     const options = { params: httpParams };
     return this.http.get<Message<Page<AlertConverge>>>(alert_converges_uri, options);
   }
diff --git a/web-app/src/app/service/alert-silence.service.ts b/web-app/src/app/service/alert-silence.service.ts
index a3db21f7cf8..22e07a2c6ab 100644
--- a/web-app/src/app/service/alert-silence.service.ts
+++ b/web-app/src/app/service/alert-silence.service.ts
@@ -38,7 +38,7 @@ export class AlertSilenceService {
     return this.http.delete<Message<any>>(alert_silences_uri, options);
   }
 
-  public getAlertSilences(pageIndex: number, pageSize: number): Observable<Message<Page<AlertSilence>>> {
+  public getAlertSilences(search: string, pageIndex: number, pageSize: number): Observable<Message<Page<AlertSilence>>> {
     pageIndex = pageIndex ? pageIndex : 0;
     pageSize = pageSize ? pageSize : 8;
     // 注意HttpParams是不可变对象 需要保存set后返回的对象为最新对象
@@ -49,6 +49,9 @@ export class AlertSilenceService {
       pageIndex: pageIndex,
       pageSize: pageSize
     });
+    if (search != undefined && search.trim() != '') {
+      httpParams = httpParams.append('search', search.trim());
+    }
     const options = { params: httpParams };
     return this.http.get<Message<Page<AlertSilence>>>(alert_silences_uri, options);
   }
diff --git a/web-app/src/assets/app-data.json b/web-app/src/assets/app-data.json
index b12491a1158..b490b19f91e 100644
--- a/web-app/src/assets/app-data.json
+++ b/web-app/src/assets/app-data.json
@@ -79,7 +79,7 @@
           "key": "custom",
           "text": "自定义",
           "i18n": "menu.monitor.custom",
-          "icon": "anticon-robot"
+          "icon": "anticon-project"
         }
       ]
     },
diff --git a/web-app/src/assets/i18n/en-US.json b/web-app/src/assets/i18n/en-US.json
index 735b33200ed..fe3d8f0b243 100644
--- a/web-app/src/assets/i18n/en-US.json
+++ b/web-app/src/assets/i18n/en-US.json
@@ -164,6 +164,7 @@
   "alert.setting.target.instance": "Instance of the row",
   "alert.setting.target.system_value_row_count": "System-Metrics value row count",
   "alert.setting.operator": "Supported operator functions",
+  "alert.setting.search": "Search Threshold",
   "alert.silence.new": "New Silence Strategy",
   "alert.silence.edit": "Edit Silence Strategy",
   "alert.silence.delete": "Delete Silence Strategy",
@@ -225,11 +226,13 @@
   "alert.notice.template": "Notice Template",
   "alert.notice.template.new": "New Template",
   "alert.notice.template.edit": "Edit Template",
-  "alert.notice.template.showExample": "View a template example",
+  "alert.notice.template.show": "View Template Content",
   "alert.notice.template.delete": "Delete Template",
   "alert.notice.template.name": "Template Name",
-  "alert.notice.template.example": "Template Example",
   "alert.notice.template.type": "Notice Type",
+  "alert.notice.template.preset": "Template Type",
+  "alert.notice.template.preset.true": "System Preset",
+  "alert.notice.template.preset.false": "User Custom",
   "alert.notice.template.content": "Template Content",
   "alert.notice.receiver": "Message Receiver",
   "alert.notice.receiver.new": "New Receiver",
@@ -272,18 +275,6 @@
   "alert.notice.type.smn-topicUrn": "TopicUrn",
   "alert.notice.type.serverchan": "ServerChan",
   "alert.notice.type.serverchan-token": "ServerChanToken",
-  "alert.applier.type.sms": "SMS",
-  "alert.applier.type.email": "Email",
-  "alert.applier.type.wechat": "WeChat",
-  "alert.applier.type.wework": "WeWork",
-  "alert.applier.type.ding": "DingDing",
-  "alert.applier.type.fei-shu": "FeiShu",
-  "alert.applier.type.telegram": "Telegram",
-  "alert.applier.type.slack": "Slack WebHook",
-  "alert.applier.type.discord": "Discord",
-  "alert.applier.type.weChatApp": "WeChatApp",
-  "alert.applier.type.smn": "HuaWei Cloud SMN",
-  "alert.applier.type.serverchan": "ServerChan",
   "alert.notice.rule": "Alert Notice Policy",
   "alert.notice.rule.new": "New Notice Policy",
   "alert.notice.rule.edit": "Edit Notice Policy",
@@ -451,6 +442,7 @@
   "common.notify.copy-success": "Copy Success!",
   "common.button.ok": "OK",
   "common.button.cancel": "Cancel",
+  "common.button.return": "Return",
   "common.button.help": "Help",
   "common.button.edit": "Edit",
   "common.button.setting": "Setting",
@@ -588,10 +580,10 @@
   "about.github": "Github",
   "about.gitee": "Gitee",
   "about.issue": "Feedback",
-  "about.pr": "Contribution",
-  "about.discuss": "Discussion",
+  "about.pr": "Contribute",
+  "about.discuss": "Discuss",
   "about.doc": "Document",
-  "about.upgrade": "Upgrade Guide",
+  "about.upgrade": "Upgrade",
   "about.star": "Star",
   "validation.email.required": "Please enter your email!",
   "validation.email.wrong-format": "The email address is in the wrong format!",
diff --git a/web-app/src/assets/i18n/zh-CN.json b/web-app/src/assets/i18n/zh-CN.json
index 1dd60c04851..e9ffed4e4b2 100644
--- a/web-app/src/assets/i18n/zh-CN.json
+++ b/web-app/src/assets/i18n/zh-CN.json
@@ -164,6 +164,7 @@
   "alert.setting.target.instance": "所属行实例",
   "alert.setting.target.system_value_row_count": "系统-指标值行数量",
   "alert.setting.operator": "支持操作符函数",
+  "alert.setting.search": "搜索阈值",
   "alert.silence.new": "新增静默策略",
   "alert.silence.edit": "编辑静默策略",
   "alert.silence.delete": "删除静默策略",
@@ -225,12 +226,14 @@
   "alert.notice.template": "通知模板",
   "alert.notice.template.new": "新增通知模板",
   "alert.notice.template.edit": "编辑通知模板",
-  "alert.notice.template.showExample": "查看模板示例",
+  "alert.notice.template.show": "查看模板",
   "alert.notice.template.delete": "删除通知模板",
   "alert.notice.template.name": "模板名称",
-  "alert.notice.template.example": "模板示例",
   "alert.notice.template.type": "通知方式",
-  "alert.notice.template.content": "通知模板内容",
+  "alert.notice.template.preset": "模版类型",
+  "alert.notice.template.preset.true": "系统内置模版",
+  "alert.notice.template.preset.false": "用户自定义模版",
+  "alert.notice.template.content": "模板内容",
   "alert.notice.receiver": "消息接收人",
   "alert.notice.receiver.new": "新增接收人",
   "alert.notice.receiver.edit": "编辑接收人",
@@ -267,18 +270,7 @@
   "alert.notice.type.smn": "华为云SMN",
   "alert.notice.type.smn-ak": "AK",
   "alert.notice.type.smn-sk": "SK",
-  "alert.applier.type.sms": "短信",
-  "alert.applier.type.email": "邮箱",
-  "alert.applier.type.wechat": "微信公众号",
-  "alert.applier.type.wework": "企业微信",
-  "alert.applier.type.ding": "钉钉",
-  "alert.applier.type.fei-shu": "飞书",
-  "alert.applier.type.telegram": "Telegram",
-  "alert.applier.type.slack": "Slack WebHook",
-  "alert.applier.type.discord": "Discord",
-  "alert.applier.type.weChatApp": "企业微信应用",
-  "alert.applier.type.smn": "华为云SMN",
-  "alert.applier.type.serverchan": "Server酱(ServerChan)",
+  "alert.notice.type.telegram": "Telegram",
   "alert.notice.type.smn-projectId": "项目ID",
   "alert.notice.type.smn-region": "地域",
   "alert.notice.type.smn-topicUrn": "TopicUrn",
@@ -452,6 +444,7 @@
   "common.button.ok": "确定",
   "common.button.detect": "测试",
   "common.button.cancel": "取消",
+  "common.button.return": "返回",
   "common.button.help": "帮助",
   "common.button.edit": "编辑",
   "common.button.setting": "配置",
@@ -583,8 +576,8 @@
   "about.point.4": "高性能，采集器集群横向扩展，支持多隔离网络监控，云边协同。",
   "about.point.5": "自由的阈值规则，邮件钉钉微信飞书短信等消息及时送达。",
   "about.help": "HertzBeat 的强大自定义，多类型支持，高性能，易扩展，希望能帮助用户快速构建自有监控系统。",
-  "about.github": "Github仓库",
-  "about.gitee": "Gitee仓库",
+  "about.github": "Github",
+  "about.gitee": "Gitee",
   "about.issue": "反馈问题",
   "about.pr": "贡献代码",
   "about.discuss": "讨论交流",
diff --git a/web-app/src/assets/i18n/zh-TW.json b/web-app/src/assets/i18n/zh-TW.json
index bc947c31dcd..e7c596a9fa1 100644
--- a/web-app/src/assets/i18n/zh-TW.json
+++ b/web-app/src/assets/i18n/zh-TW.json
@@ -163,6 +163,7 @@
   "alert.setting.target.instance": "所屬行實例",
   "alert.setting.target.system_value_row_count": "系統-指標值行數量",
   "alert.setting.operator": "支持操作符函數",
+  "alert.setting.search": "搜尋閾值",
   "alert.silence.new": "新增靜默策略",
   "alert.silence.edit": "編輯靜默策略",
   "alert.silence.delete": "刪除靜默策略",
@@ -224,12 +225,14 @@
   "alert.notice.template": "通知模板",
   "alert.notice.template.new": "新增通知模板",
   "alert.notice.template.edit": "編輯通知模板",
-  "alert.notice.template.showExample": "查看模板實例",
+  "alert.notice.template.show": "查看模板",
   "alert.notice.template.delete": "刪除通知模板",
   "alert.notice.template.name": "模板名稱",
-  "alert.notice.template.example": "模板實例",
   "alert.notice.template.type": "通知方式",
-  "alert.notice.template.content": "通知模板内容",
+  "alert.notice.template.preset": "模版類型",
+  "alert.notice.template.preset.true": "系統內建模版",
+  "alert.notice.template.preset.false": "用戶自定義模版",
+  "alert.notice.template.content": "模板内容",
   "alert.notice.receiver": "消息接收人",
   "alert.notice.receiver.new": "新增接收人",
   "alert.notice.receiver.edit": "編輯接收人",
@@ -271,18 +274,7 @@
   "alert.notice.type.smn-topicUrn": "TopicUrn",
   "alert.notice.type.serverchan": "ServerChan",
   "alert.notice.type.serverchan-token": "ServerChanToken",
-  "alert.applier.type.sms": "短信",
-  "alert.applier.type.email": "郵箱",
-  "alert.applier.type.wechat": "微信公衆號",
-  "alert.applier.type.wework": "企業微信",
-  "alert.applier.type.ding": "釘釘",
-  "alert.applier.type.fei-shu": "飛書",
-  "alert.applier.type.telegram": "Telegram",
-  "alert.applier.type.slack": "Slack WebHook",
-  "alert.applier.type.discord": "Discord",
-  "alert.applier.type.weChatApp": "企業微信應用",
-  "alert.applier.type.smn": "華為雲SMN",
-  "alert.applier.type.serverchan": "ServerChan",
+  "alert.notice.type.telegram": "Telegram",
   "alert.notice.rule": "告警通知策略",
   "alert.notice.rule.new": "新增通知策略",
   "alert.notice.rule.edit": "編輯通知策略",
@@ -458,6 +450,7 @@
   "common.button.ok": "確定",
   "common.button.detect": "測試",
   "common.button.cancel": "取消",
+  "common.button.return": "返回",
   "common.button.help": "幫助",
   "common.button.edit": "編輯",
   "common.button.setting": "配置",
@@ -582,8 +575,8 @@
   "about.point.4": "高性能，採集器集群橫向擴展，支持多隔離網絡監控，雲邊協同。",
   "about.point.5": "自由的閾值規則，郵件釘釘微信飛書短信等消息及時送達。",
   "about.help": "HertzBeat 的強大自定義，多類型支持，高性能，易擴展，希望能幫助用戶快速構建自有監控系統。",
-  "about.github": "Github倉庫",
-  "about.gitee": "Gitee倉庫",
+  "about.github": "Github",
+  "about.gitee": "Gitee",
   "about.issue": "反饋問題",
   "about.pr": "貢獻代碼",
   "about.discuss": "討論交流",