diff --git a/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue b/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue
index 43b5377f7..cb75991a6 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue
@@ -340,7 +340,6 @@ onMounted(async () => {
       flat
       color="primary"
       icon="add"
-      size="16px"
       @click="
         dialogStatus = 'create';
         clearForm();
diff --git a/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue b/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue
index e5e2dd0fc..fe13d0da0 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue
@@ -497,7 +497,6 @@ onMounted(async () => {
       flat
       color="primary"
       icon="add"
-      size="16px"
       @click="
         () => {
           dialogStatus = 'create';
diff --git a/src/modules/04_registryNew/components/detail/GovernmentInformation/01_Info.vue b/src/modules/04_registryNew/components/detail/GovernmentInformation/01_Info.vue
index 360c007b7..bcb0df7ac 100644
--- a/src/modules/04_registryNew/components/detail/GovernmentInformation/01_Info.vue
+++ b/src/modules/04_registryNew/components/detail/GovernmentInformation/01_Info.vue
@@ -461,15 +461,15 @@ onMounted(() => {
     <q-space />
     <div class="q-gutter-x-sm">
       <q-btn
-        color="teal-5"
+        color="primary"
         icon="mdi-pencil-outline"
         flat
         round
         @click="openDialogEdit()"
-        ><q-tooltip>แก้ไข</q-tooltip></q-btn
+        ><q-tooltip>แก้ไขข้อมูล</q-tooltip></q-btn
       >
       <q-btn
-        color="edit"
+        color="info"
         icon="mdi-history"
         flat
         round
diff --git a/src/modules/04_registryNew/components/detail/GovernmentInformation/02_Discipline.vue b/src/modules/04_registryNew/components/detail/GovernmentInformation/02_Discipline.vue
index 974e81f78..fc7b7a7db 100644
--- a/src/modules/04_registryNew/components/detail/GovernmentInformation/02_Discipline.vue
+++ b/src/modules/04_registryNew/components/detail/GovernmentInformation/02_Discipline.vue
@@ -331,7 +331,7 @@ onMounted(async () => {
 </script>
 <template>
   <div class="row items-center q-gutter-x-sm q-py-sm">
-    <q-btn color="teal-5" icon="add" flat round @click="openDialogAdd()"
+    <q-btn color="primary" icon="add" flat round @click="openDialogAdd()"
       ><q-tooltip>เพิ่มข้อมูล</q-tooltip></q-btn
     >
 
@@ -490,7 +490,7 @@ onMounted(async () => {
             <q-space />
             <div class="q-gutter-x-sm">
               <q-btn
-                color="teal-5"
+                color="primary"
                 icon="mdi-pencil-outline"
                 flat
                 round
@@ -498,7 +498,7 @@ onMounted(async () => {
                 ><q-tooltip>แก้ไข</q-tooltip></q-btn
               >
               <q-btn
-                color="edit"
+                color="info"
                 icon="mdi-history"
                 flat
                 round
diff --git a/src/modules/04_registryNew/components/detail/GovernmentInformation/03_Leave.vue b/src/modules/04_registryNew/components/detail/GovernmentInformation/03_Leave.vue
index 45f9d29ef..5fccf2728 100644
--- a/src/modules/04_registryNew/components/detail/GovernmentInformation/03_Leave.vue
+++ b/src/modules/04_registryNew/components/detail/GovernmentInformation/03_Leave.vue
@@ -445,7 +445,7 @@ onMounted(() => {
 </script>
 <template>
   <div class="row items-center q-gutter-x-sm q-py-sm">
-    <q-btn color="teal-5" icon="add" flat round @click="openDialogAdd()"
+    <q-btn color="primary" icon="add" flat round @click="openDialogAdd()"
       ><q-tooltip>เพิ่มข้อมูล</q-tooltip></q-btn
     >
 
@@ -589,7 +589,7 @@ onMounted(() => {
             <q-space />
             <div class="q-gutter-x-sm">
               <q-btn
-                color="teal-5"
+                color="primary"
                 icon="mdi-pencil-outline"
                 flat
                 round
@@ -597,7 +597,7 @@ onMounted(() => {
                 ><q-tooltip>แก้ไข</q-tooltip></q-btn
               >
               <q-btn
-                color="edit"
+                color="info"
                 icon="mdi-history"
                 flat
                 round
diff --git a/src/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWork.vue b/src/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWork.vue
index 8ce8c9cc3..d298b9830 100644
--- a/src/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWork.vue
+++ b/src/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWork.vue
@@ -284,7 +284,7 @@ onMounted(async () => {
 </script>
 <template>
   <div class="row items-center q-gutter-x-sm q-py-sm">
-    <q-btn color="teal-5" icon="add" flat round @click="openDialogAdd()"
+    <q-btn color="primary" icon="add" flat round @click="openDialogAdd()"
       ><q-tooltip>เพิ่มข้อมูล</q-tooltip></q-btn
     >
 
@@ -444,15 +444,15 @@ onMounted(async () => {
             <q-space />
             <div class="q-gutter-x-sm">
               <q-btn
-                color="teal-5"
+                color="primary"
                 icon="mdi-pencil-outline"
                 flat
                 round
                 @click="openDialogEdit(props.row)"
-                ><q-tooltip>แก้ไข</q-tooltip></q-btn
+                ><q-tooltip>แก้ไขข้อมูล</q-tooltip></q-btn
               >
               <q-btn
-                color="edit"
+                color="info"
                 icon="mdi-history"
                 flat
                 round
diff --git a/src/modules/04_registryNew/components/detail/Other/01_OtherInformation.vue b/src/modules/04_registryNew/components/detail/Other/01_OtherInformation.vue
index 6c9c4751d..f638aa4f3 100644
--- a/src/modules/04_registryNew/components/detail/Other/01_OtherInformation.vue
+++ b/src/modules/04_registryNew/components/detail/Other/01_OtherInformation.vue
@@ -200,29 +200,13 @@ async function getData() {
     });
 }
 
-// async function deleteData(id: string) {
-//   showLoader();
-//   await http
-//     .delete(config.API.profileNewOtherById(id))
-//     .then((res) => {
-//       success($q, "ลบข้อมูลสำเร็จ");
-//       getData();
-//     })
-//     .catch((e) => {
-//       messageError($q, e);
-//     })
-//     .finally(() => {
-//       hideLoader();
-//     });
-// }
-
 onMounted(() => {
   getData();
 });
 </script>
 <template>
   <div class="row items-center q-gutter-x-sm q-py-sm">
-    <q-btn color="teal-5" icon="add" flat round @click="openDialogAdd()"
+    <q-btn color="primary" icon="add" flat round @click="openDialogAdd()"
       ><q-tooltip>เพิ่มข้อมูล</q-tooltip></q-btn
     >
 
@@ -350,19 +334,6 @@ onMounted(() => {
           >
             <q-tooltip>ประวัติแก้ไขอื่นๆ</q-tooltip>
           </q-btn>
-          <!-- <q-btn
-            flat
-            dense
-            round
-            size="14px"
-            color="red"
-            icon="mdi-delete"
-            @click="
-              dialogRemove($q, async () => await deleteData(props.row.id))
-            "
-          >
-            <q-tooltip>ลบข้อมูล</q-tooltip>
-          </q-btn> -->
         </q-td>
       </q-tr>
     </template>
@@ -373,7 +344,7 @@ onMounted(() => {
             <q-space />
             <div class="q-gutter-x-sm">
               <q-btn
-                color="teal-5"
+                color="primary"
                 icon="mdi-pencil-outline"
                 flat
                 round
diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/02_NameChangeHistory.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/02_NameChangeHistory.vue
index 3bc2c0643..1f25b4837 100644
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/02_NameChangeHistory.vue
+++ b/src/modules/04_registryNew/components/detail/PersonalInformation/02_NameChangeHistory.vue
@@ -504,7 +504,6 @@ function filterSelector(val: string, update: Function, refData: string) {
       flat
       color="primary"
       icon="add"
-      size="16px"
       @click="
         () => {
           changeNameData.prefix = profileInfo.prefix;
diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/04_Family.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/04_Family.vue
index b79e3f85e..7bd548b97 100644
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/04_Family.vue
+++ b/src/modules/04_registryNew/components/detail/PersonalInformation/04_Family.vue
@@ -269,7 +269,7 @@ onMounted(async () => {
         <q-btn
           round
           flat
-          color="blue"
+          color="info"
           icon="mdi-history"
           size="14px"
           @click="
@@ -278,7 +278,7 @@ onMounted(async () => {
             }
           "
         >
-          <q-tooltip>ประวัติการแก้ไข</q-tooltip></q-btn
+          <q-tooltip>ประวัติการแก้ไขข้อมูลครอบครัว</q-tooltip></q-btn
         >
       </div>
     </div>
diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue
index 39cdc6528..829696289 100644
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue
+++ b/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue
@@ -691,7 +691,6 @@ onMounted(async () => {
       flat
       color="primary"
       icon="add"
-      size="16px"
       @click="
         () => {
           dialogStatus = 'create';
diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/06_SpecialSkill.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/06_SpecialSkill.vue
index 9ff6d10c0..0905a188a 100644
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/06_SpecialSkill.vue
+++ b/src/modules/04_registryNew/components/detail/PersonalInformation/06_SpecialSkill.vue
@@ -317,7 +317,7 @@ onMounted(async () => {
       icon="add"
       @click="() => ((dialogStatus = 'create'), clearForm(), (dialog = true))"
     >
-      <q-tooltip>เพิ่ม</q-tooltip>
+      <q-tooltip>เพิ่มข้อมูล</q-tooltip>
     </q-btn>
     <q-space />
     <q-input dense outlined v-model="keyword" label="ค้นหา" class="q-mr-sm">
diff --git a/src/modules/04_registryNew/components/detail/Salary/01_PositionSalary.vue b/src/modules/04_registryNew/components/detail/Salary/01_PositionSalary.vue
index 5996f9043..891148418 100644
--- a/src/modules/04_registryNew/components/detail/Salary/01_PositionSalary.vue
+++ b/src/modules/04_registryNew/components/detail/Salary/01_PositionSalary.vue
@@ -398,7 +398,7 @@ onMounted(() => {
 <template>
   <q-toolbar style="padding: 0px" class="text-primary q-mb-xs">
     <q-btn flat round dense icon="add" @click="onClickOpenDialog()">
-      <q-tooltip>เพิ่ม</q-tooltip>
+      <q-tooltip>เพิ่มข้อมูล</q-tooltip>
     </q-btn>
     <q-space />
     <q-input
diff --git a/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalary.vue b/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalary.vue
index 13df498b3..7fbf4750d 100644
--- a/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalary.vue
+++ b/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalary.vue
@@ -224,25 +224,38 @@ onMounted(() => {
 });
 </script>
 <template>
-  <q-toolbar style="padding: 0px" class="text-primary">
-    <q-btn flat round dense icon="add" @click="onClickOpenDialog()">
-      <q-tooltip>เพิ่ม</q-tooltip>
-    </q-btn>
+  <div class="row items-center q-gutter-x-sm q-py-sm">
+    <q-btn color="teal-5" icon="add" flat round @click="onClickOpenDialog()"
+      ><q-tooltip>เพิ่มข้อมูล</q-tooltip></q-btn
+    >
+
     <q-space />
     <q-input
+      standout
       dense
-      outlined
       v-model="formFilter.keyword"
-      label="ค้นหา"
-      class="q-mr-sm"
+      ref="filterRef"
+      outlined
+      placeholder="ค้นหา"
+      debounce="300"
     >
       <template v-slot:append>
-        <q-icon name="search" />
+        <q-icon
+          v-if="formFilter.keyword == ''"
+          name="search"
+          @click.stop.prevent="formFilter.keyword = ''"
+          class="cursor-pointer"
+        />
+        <q-icon
+          v-if="formFilter.keyword"
+          name="cancel"
+          @click.stop.prevent="formFilter.keyword = ''"
+          class="cursor-pointer"
+        />
       </template>
     </q-input>
-
     <q-select
-      v-if="modelView === 'table'"
+      v-if="modelView == 'table'"
       v-model="visibleColumns"
       multiple
       outlined
@@ -255,14 +268,12 @@ onMounted(() => {
       option-value="name"
       options-cover
       style="min-width: 150px"
-      class="q-mr-sm"
     />
-
     <q-btn-toggle
-      dense
       v-model="modelView"
-      toggle-color="grey-4"
+      dense
       class="no-shadow toggle-borderd"
+      toggle-color="grey-4"
       :options="[
         { value: 'table', slot: 'table' },
         { value: 'card', slot: 'card' },
@@ -271,23 +282,24 @@ onMounted(() => {
       <template v-slot:table>
         <q-icon
           name="format_list_bulleted"
-          size="sm"
+          size="24px"
           :style="{
             color: modelView === 'table' ? '#787B7C' : '#C9D3DB',
           }"
         />
       </template>
+
       <template v-slot:card>
         <q-icon
           name="mdi-view-grid-outline"
-          size="sm"
+          size="24px"
           :style="{
             color: modelView === 'card' ? '#787B7C' : '#C9D3DB',
           }"
         />
       </template>
     </q-btn-toggle>
-  </q-toolbar>
+  </div>
 
   <d-table
     ref="table"
@@ -414,6 +426,26 @@ onMounted(() => {
         direction-links
       ></q-pagination>
     </template>
+    <template v-slot:no-data="{ icon, message, filter }">
+      <div class="full-width row flex-center text-accent q-gutter-sm">
+        <span
+          ><div
+            style="
+              height: 50vh;
+              display: flex;
+              flex-direction: column;
+              justify-content: center;
+              align-items: center;
+            "
+            class="text-grey-5"
+          >
+            <q-icon name="search" size="4rem" />
+
+            <span>ไม่พบข้อมูล</span>
+          </div>
+        </span>
+      </div>
+    </template>
   </d-table>
 
   <q-dialog v-model="modalDialog" persistent>
@@ -516,6 +548,7 @@ onMounted(() => {
                   </div>
                   <div class="col-xs-6 col-sm-6 col-md-6">
                     <datepicker
+                      menu-class-name="modalfix"
                       v-model="formData.refCommandDate"
                       :locale="'th'"
                       autoApply