diff --git a/src/modules/01_metadataNew/components/insignia/InsigniaList.vue b/src/modules/01_metadataNew/components/insignia/InsigniaList.vue
index 776016ea9..a0d3d5c0d 100644
--- a/src/modules/01_metadataNew/components/insignia/InsigniaList.vue
+++ b/src/modules/01_metadataNew/components/insignia/InsigniaList.vue
@@ -332,56 +332,42 @@ const dialogOrder = ref<boolean>(false);
           </q-td>
           <q-td auto-width>
             <q-btn
-              color="grey"
+              color="edit"
               flat
               dense
               round
-              size="14px"
-              icon="more_vert"
-              @click.stop
+              class="q-mr-xs"
+              size="12px"
+              icon="edit"
+              clickable
+              @click.stop="
+                () => {
+                  dialogStatus = 'edit';
+                  dialog = true;
+                  editId = props.row.id;
+                  name = props.row.name;
+                  shortName = props.row.shortName;
+                  note = props.row.note;
+                  isActive = props.row.isActive;
+                }
+              "
             >
-              <q-menu>
-                <q-list dense>
-                  <q-item
-                    v-close-popup
-                    clickable
-                    @click.stop="
-                      () => {
-                        dialogStatus = 'edit';
-                        dialog = true;
-                        editId = props.row.id;
-                        name = props.row.name;
-                        shortName = props.row.shortName;
-                        note = props.row.note;
-                        isActive = props.row.isActive;
-                      }
-                    "
-                  >
-                    <q-item-section>
-                      <div class="row items-center white">
-                        <q-icon name="o_edit" color="positive" />
-                        <span class="q-ml-sm">แก้ไข</span>
-                      </div>
-                    </q-item-section>
-                  </q-item>
-                  <q-item clickable>
-                    <q-item-section
-                      @click="
-                        dialogRemove(
-                          $q,
-                          async () => await deleteData(props.row.id)
-                        )
-                      "
-                      v-close-popup
-                    >
-                      <div class="row items-center white">
-                        <q-icon name="mdi-trash-can-outline" color="negative" />
-                        <span class="q-ml-sm">ลบ</span>
-                      </div>
-                    </q-item-section>
-                  </q-item>
-                </q-list>
-              </q-menu>
+              <q-tooltip>แก้ไขข้อมูล</q-tooltip>
+            </q-btn>
+            <q-btn
+              color="red"
+              flat
+              dense
+              round
+              size="12px"
+              icon="mdi-delete"
+              clickable
+              @click.stop="
+                dialogRemove($q, async () => await deleteData(props.row.id))
+              "
+              v-close-popup
+            >
+              <q-tooltip>ลบข้อมูล</q-tooltip>
             </q-btn>
           </q-td>
         </q-tr>
diff --git a/src/modules/01_metadataNew/components/insignia/InsigniaType.vue b/src/modules/01_metadataNew/components/insignia/InsigniaType.vue
index 224266e55..2d95029b0 100644
--- a/src/modules/01_metadataNew/components/insignia/InsigniaType.vue
+++ b/src/modules/01_metadataNew/components/insignia/InsigniaType.vue
@@ -246,54 +246,40 @@ async function onSubmit() {
         </q-td>
         <q-td auto-width>
           <q-btn
-            color="grey"
+            color="edit"
             flat
             dense
             round
-            size="14px"
-            icon="more_vert"
-            @click.stop
+            class="q-mr-xs"
+            size="12px"
+            icon="edit"
+            clickable
+            @click.stop="
+              () => {
+                dialogStatus = 'edit';
+                dialog = true;
+                editId = props.row.id;
+                name = props.row.name;
+                isActive = props.row.isActive;
+              }
+            "
           >
-            <q-menu>
-              <q-list dense>
-                <q-item
-                  v-close-popup
-                  clickable
-                  @click.stop="
-                    () => {
-                      dialogStatus = 'edit';
-                      dialog = true;
-                      editId = props.row.id;
-                      name = props.row.name;
-                      isActive = props.row.isActive;
-                    }
-                  "
-                >
-                  <q-item-section>
-                    <div class="row items-center white">
-                      <q-icon name="o_edit" color="positive" />
-                      <span class="q-ml-sm">แก้ไข</span>
-                    </div>
-                  </q-item-section>
-                </q-item>
-                <q-item clickable>
-                  <q-item-section
-                    @click="
-                      dialogRemove(
-                        $q,
-                        async () => await deleteData(props.row.id)
-                      )
-                    "
-                    v-close-popup
-                  >
-                    <div class="row items-center white">
-                      <q-icon name="mdi-trash-can-outline" color="negative" />
-                      <span class="q-ml-sm">ลบ</span>
-                    </div>
-                  </q-item-section>
-                </q-item>
-              </q-list>
-            </q-menu>
+            <q-tooltip>แก้ไขข้อมูล</q-tooltip>
+          </q-btn>
+          <q-btn
+            color="red"
+            flat
+            dense
+            round
+            size="12px"
+            icon="mdi-delete"
+            clickable
+            @click.stop="
+              dialogRemove($q, async () => await deleteData(props.row.id))
+            "
+            v-close-popup
+          >
+            <q-tooltip>ลบข้อมูล</q-tooltip>
           </q-btn>
         </q-td>
       </q-tr>
diff --git a/src/modules/01_metadataNew/components/personal/01ListPrefix.vue b/src/modules/01_metadataNew/components/personal/01ListPrefix.vue
index 2d7f2986c..ac074dfa6 100644
--- a/src/modules/01_metadataNew/components/personal/01ListPrefix.vue
+++ b/src/modules/01_metadataNew/components/personal/01ListPrefix.vue
@@ -200,53 +200,39 @@ onMounted(async () => {
         </q-td>
         <q-td auto-width>
           <q-btn
-            color="grey"
+            color="edit"
             flat
             dense
             round
-            size="14px"
-            icon="more_vert"
-            @click.stop
+            class="q-mr-xs"
+            size="12px"
+            icon="edit"
+            clickable
+            @click.stop="
+              () => {
+                dialogStatus = 'edit';
+                dialog = true;
+                prefix = props.row.name;
+                editId = props.row.id;
+              }
+            "
           >
-            <q-menu>
-              <q-list dense>
-                <q-item
-                  v-close-popup
-                  clickable
-                  @click.stop="
-                    () => {
-                      dialogStatus = 'edit';
-                      dialog = true;
-                      prefix = props.row.name;
-                      editId = props.row.id;
-                    }
-                  "
-                >
-                  <q-item-section>
-                    <div class="row items-center white">
-                      <q-icon name="o_edit" color="positive" />
-                      <span class="q-ml-sm">แก้ไข</span>
-                    </div>
-                  </q-item-section>
-                </q-item>
-                <q-item clickable>
-                  <q-item-section
-                    @click="
-                      dialogRemove(
-                        $q,
-                        async () => await deleteData(props.row.id)
-                      )
-                    "
-                    v-close-popup
-                  >
-                    <div class="row items-center white">
-                      <q-icon name="mdi-trash-can-outline" color="negative" />
-                      <span class="q-ml-sm">ลบ</span>
-                    </div>
-                  </q-item-section>
-                </q-item>
-              </q-list>
-            </q-menu>
+            <q-tooltip>แก้ไขข้อมูล</q-tooltip>
+          </q-btn>
+          <q-btn
+            color="red"
+            flat
+            dense
+            round
+            size="12px"
+            icon="mdi-delete"
+            clickable
+            @click.stop="
+              dialogRemove($q, async () => await deleteData(props.row.id))
+            "
+            v-close-popup
+          >
+            <q-tooltip>ลบข้อมูล</q-tooltip>
           </q-btn>
         </q-td>
       </q-tr>
diff --git a/src/modules/01_metadataNew/components/personal/02ListRank.vue b/src/modules/01_metadataNew/components/personal/02ListRank.vue
index 44645ac22..9463345fa 100644
--- a/src/modules/01_metadataNew/components/personal/02ListRank.vue
+++ b/src/modules/01_metadataNew/components/personal/02ListRank.vue
@@ -182,53 +182,39 @@ onMounted(async () => {
         </q-td>
         <q-td auto-width>
           <q-btn
-            color="grey"
+            color="edit"
             flat
             dense
             round
-            size="14px"
-            icon="more_vert"
-            @click.stop
+            class="q-mr-xs"
+            size="12px"
+            icon="edit"
+            clickable
+            @click.stop="
+              () => {
+                dialogStatus = 'edit';
+                dialog = true;
+                rank = props.row.name;
+                editId = props.row.id;
+              }
+            "
           >
-            <q-menu>
-              <q-list dense>
-                <q-item
-                  v-close-popup
-                  clickable
-                  @click.stop="
-                    () => {
-                      dialogStatus = 'edit';
-                      dialog = true;
-                      rank = props.row.name;
-                      editId = props.row.id;
-                    }
-                  "
-                >
-                  <q-item-section>
-                    <div class="row items-center white">
-                      <q-icon name="o_edit" color="positive" />
-                      <span class="q-ml-sm">แก้ไข</span>
-                    </div>
-                  </q-item-section>
-                </q-item>
-                <q-item clickable>
-                  <q-item-section
-                    @click="
-                      dialogRemove(
-                        $q,
-                        async () => await deleteData(props.row.id)
-                      )
-                    "
-                    v-close-popup
-                  >
-                    <div class="row items-center white">
-                      <q-icon name="mdi-trash-can-outline" color="negative" />
-                      <span class="q-ml-sm">ลบ</span>
-                    </div>
-                  </q-item-section>
-                </q-item>
-              </q-list>
-            </q-menu>
+            <q-tooltip>แก้ไขข้อมูล</q-tooltip>
+          </q-btn>
+          <q-btn
+            color="red"
+            flat
+            dense
+            round
+            size="12px"
+            icon="mdi-delete"
+            clickable
+            @click.stop="
+              dialogRemove($q, async () => await deleteData(props.row.id))
+            "
+            v-close-popup
+          >
+            <q-tooltip>ลบข้อมูล</q-tooltip>
           </q-btn>
         </q-td>
       </q-tr>
diff --git a/src/modules/01_metadataNew/components/personal/03ListBloodGroup.vue b/src/modules/01_metadataNew/components/personal/03ListBloodGroup.vue
index 6e9a5e066..d0d095aec 100644
--- a/src/modules/01_metadataNew/components/personal/03ListBloodGroup.vue
+++ b/src/modules/01_metadataNew/components/personal/03ListBloodGroup.vue
@@ -182,53 +182,39 @@ onMounted(async () => {
         </q-td>
         <q-td auto-width>
           <q-btn
-            color="grey"
+            color="edit"
             flat
             dense
             round
-            size="14px"
-            icon="more_vert"
-            @click.stop
+            class="q-mr-xs"
+            size="12px"
+            icon="edit"
+            clickable
+            @click.stop="
+              () => {
+                dialogStatus = 'edit';
+                dialog = true;
+                bloodGroup = props.row.name;
+                editId = props.row.id;
+              }
+            "
           >
-            <q-menu>
-              <q-list dense>
-                <q-item
-                  v-close-popup
-                  clickable
-                  @click.stop="
-                    () => {
-                      dialogStatus = 'edit';
-                      dialog = true;
-                      bloodGroup = props.row.name;
-                      editId = props.row.id;
-                    }
-                  "
-                >
-                  <q-item-section>
-                    <div class="row items-center white">
-                      <q-icon name="o_edit" color="positive" />
-                      <span class="q-ml-sm">แก้ไข</span>
-                    </div>
-                  </q-item-section>
-                </q-item>
-                <q-item clickable>
-                  <q-item-section
-                    @click="
-                      dialogRemove(
-                        $q,
-                        async () => await deleteData(props.row.id)
-                      )
-                    "
-                    v-close-popup
-                  >
-                    <div class="row items-center white">
-                      <q-icon name="mdi-trash-can-outline" color="negative" />
-                      <span class="q-ml-sm">ลบ</span>
-                    </div>
-                  </q-item-section>
-                </q-item>
-              </q-list>
-            </q-menu>
+            <q-tooltip>แก้ไขข้อมูล</q-tooltip>
+          </q-btn>
+          <q-btn
+            color="red"
+            flat
+            dense
+            round
+            size="12px"
+            icon="mdi-delete"
+            clickable
+            @click.stop="
+              dialogRemove($q, async () => await deleteData(props.row.id))
+            "
+            v-close-popup
+          >
+            <q-tooltip>ลบข้อมูล</q-tooltip>
           </q-btn>
         </q-td>
       </q-tr>
diff --git a/src/modules/01_metadataNew/components/personal/04ListGender.vue b/src/modules/01_metadataNew/components/personal/04ListGender.vue
index 013960c03..a27c46878 100644
--- a/src/modules/01_metadataNew/components/personal/04ListGender.vue
+++ b/src/modules/01_metadataNew/components/personal/04ListGender.vue
@@ -182,53 +182,39 @@ onMounted(async () => {
         </q-td>
         <q-td auto-width>
           <q-btn
-            color="grey"
+            color="edit"
             flat
             dense
             round
-            size="14px"
-            icon="more_vert"
-            @click.stop
+            class="q-mr-xs"
+            size="12px"
+            icon="edit"
+            clickable
+            @click.stop="
+              () => {
+                dialogStatus = 'edit';
+                dialog = true;
+                gender = props.row.name;
+                editId = props.row.id;
+              }
+            "
           >
-            <q-menu>
-              <q-list dense>
-                <q-item
-                  v-close-popup
-                  clickable
-                  @click.stop="
-                    () => {
-                      dialogStatus = 'edit';
-                      dialog = true;
-                      gender = props.row.name;
-                      editId = props.row.id;
-                    }
-                  "
-                >
-                  <q-item-section>
-                    <div class="row items-center white">
-                      <q-icon name="o_edit" color="positive" />
-                      <span class="q-ml-sm">แก้ไข</span>
-                    </div>
-                  </q-item-section>
-                </q-item>
-                <q-item clickable>
-                  <q-item-section
-                    @click="
-                      dialogRemove(
-                        $q,
-                        async () => await deleteData(props.row.id)
-                      )
-                    "
-                    v-close-popup
-                  >
-                    <div class="row items-center white">
-                      <q-icon name="mdi-trash-can-outline" color="negative" />
-                      <span class="q-ml-sm">ลบ</span>
-                    </div>
-                  </q-item-section>
-                </q-item>
-              </q-list>
-            </q-menu>
+            <q-tooltip>แก้ไขข้อมูล</q-tooltip>
+          </q-btn>
+          <q-btn
+            color="red"
+            flat
+            dense
+            round
+            size="12px"
+            icon="mdi-delete"
+            clickable
+            @click.stop="
+              dialogRemove($q, async () => await deleteData(props.row.id))
+            "
+            v-close-popup
+          >
+            <q-tooltip>ลบข้อมูล</q-tooltip>
           </q-btn>
         </q-td>
       </q-tr>
diff --git a/src/modules/01_metadataNew/components/personal/05ListReligion.vue b/src/modules/01_metadataNew/components/personal/05ListReligion.vue
index 04f002454..e6254821c 100644
--- a/src/modules/01_metadataNew/components/personal/05ListReligion.vue
+++ b/src/modules/01_metadataNew/components/personal/05ListReligion.vue
@@ -182,53 +182,39 @@ onMounted(async () => {
         </q-td>
         <q-td auto-width>
           <q-btn
-            color="grey"
+            color="edit"
             flat
             dense
             round
-            size="14px"
-            icon="more_vert"
-            @click.stop
+            class="q-mr-xs"
+            size="12px"
+            icon="edit"
+            clickable
+            @click.stop="
+              () => {
+                dialogStatus = 'edit';
+                dialog = true;
+                religion = props.row.name;
+                editId = props.row.id;
+              }
+            "
           >
-            <q-menu>
-              <q-list dense>
-                <q-item
-                  v-close-popup
-                  clickable
-                  @click.stop="
-                    () => {
-                      dialogStatus = 'edit';
-                      dialog = true;
-                      religion = props.row.name;
-                      editId = props.row.id;
-                    }
-                  "
-                >
-                  <q-item-section>
-                    <div class="row items-center white">
-                      <q-icon name="o_edit" color="positive" />
-                      <span class="q-ml-sm">แก้ไข</span>
-                    </div>
-                  </q-item-section>
-                </q-item>
-                <q-item clickable>
-                  <q-item-section
-                    @click="
-                      dialogRemove(
-                        $q,
-                        async () => await deleteData(props.row.id)
-                      )
-                    "
-                    v-close-popup
-                  >
-                    <div class="row items-center white">
-                      <q-icon name="mdi-trash-can-outline" color="negative" />
-                      <span class="q-ml-sm">ลบ</span>
-                    </div>
-                  </q-item-section>
-                </q-item>
-              </q-list>
-            </q-menu>
+            <q-tooltip>แก้ไขข้อมูล</q-tooltip>
+          </q-btn>
+          <q-btn
+            color="red"
+            flat
+            dense
+            round
+            size="12px"
+            icon="mdi-delete"
+            clickable
+            @click.stop="
+              dialogRemove($q, async () => await deleteData(props.row.id))
+            "
+            v-close-popup
+          >
+            <q-tooltip>ลบข้อมูล</q-tooltip>
           </q-btn>
         </q-td>
       </q-tr>
diff --git a/src/modules/01_metadataNew/components/personal/06ListRelationship.vue b/src/modules/01_metadataNew/components/personal/06ListRelationship.vue
index 36e6a5218..45b691e39 100644
--- a/src/modules/01_metadataNew/components/personal/06ListRelationship.vue
+++ b/src/modules/01_metadataNew/components/personal/06ListRelationship.vue
@@ -211,52 +211,39 @@ onMounted(async () => {
         </q-td>
         <q-td auto-width>
           <q-btn
-            color="grey"
+            color="edit"
             flat
             dense
             round
-            size="14px"
-            icon="more_vert"
-            @click.stop
+            class="q-mr-xs"
+            size="12px"
+            icon="edit"
+            clickable
+            @click.stop="
+              () => {
+                dialogStatus = 'edit';
+                dialog = true;
+                relationship = props.row.name;
+                editId = props.row.id;
+              }
+            "
           >
-            <q-menu>
-              <q-list dense>
-                <q-item
-                  v-close-popup
-                  clickable
-                  @click.stop="
-                    () => {
-                      dialogStatus = 'edit';
-                      dialog = true;
-                      editId = props.row.id;
-                    }
-                  "
-                >
-                  <q-item-section>
-                    <div class="row items-center white">
-                      <q-icon name="o_edit" color="positive" />
-                      <span class="q-ml-sm">แก้ไข</span>
-                    </div>
-                  </q-item-section>
-                </q-item>
-                <q-item clickable>
-                  <q-item-section
-                    @click="
-                      dialogRemove(
-                        $q,
-                        async () => await deleteData(props.row.id)
-                      )
-                    "
-                    v-close-popup
-                  >
-                    <div class="row items-center white">
-                      <q-icon name="mdi-trash-can-outline" color="negative" />
-                      <span class="q-ml-sm">ลบ</span>
-                    </div>
-                  </q-item-section>
-                </q-item>
-              </q-list>
-            </q-menu>
+            <q-tooltip>แก้ไขข้อมูล</q-tooltip>
+          </q-btn>
+          <q-btn
+            color="red"
+            flat
+            dense
+            round
+            size="12px"
+            icon="mdi-delete"
+            clickable
+            @click.stop="
+              dialogRemove($q, async () => await deleteData(props.row.id))
+            "
+            v-close-popup
+          >
+            <q-tooltip>ลบข้อมูล</q-tooltip>
           </q-btn>
         </q-td>
       </q-tr>
diff --git a/src/modules/01_metadataNew/components/personal/07ListEducationLevel.vue b/src/modules/01_metadataNew/components/personal/07ListEducationLevel.vue
index 6b998694f..8a7ebcaba 100644
--- a/src/modules/01_metadataNew/components/personal/07ListEducationLevel.vue
+++ b/src/modules/01_metadataNew/components/personal/07ListEducationLevel.vue
@@ -196,54 +196,40 @@ onMounted(async () => {
         </q-td>
         <q-td auto-width>
           <q-btn
-            color="grey"
+            color="edit"
             flat
             dense
             round
-            size="14px"
-            icon="more_vert"
-            @click.stop
+            class="q-mr-xs"
+            size="12px"
+            icon="edit"
+            clickable
+            @click.stop="
+              () => {
+                dialogStatus = 'edit';
+                dialog = true;
+                editId = props.row.id;
+                educationLevel = props.row.name;
+                educationRank = props.row.rank;
+              }
+            "
           >
-            <q-menu>
-              <q-list dense>
-                <q-item
-                  v-close-popup
-                  clickable
-                  @click.stop="
-                    () => {
-                      dialogStatus = 'edit';
-                      dialog = true;
-                      editId = props.row.id;
-                      educationLevel = props.row.name;
-                      educationRank = props.row.rank;
-                    }
-                  "
-                >
-                  <q-item-section>
-                    <div class="row items-center white">
-                      <q-icon name="o_edit" color="positive" />
-                      <span class="q-ml-sm">แก้ไข</span>
-                    </div>
-                  </q-item-section>
-                </q-item>
-                <q-item clickable>
-                  <q-item-section
-                    @click="
-                      dialogRemove(
-                        $q,
-                        async () => await deleteData(props.row.id)
-                      )
-                    "
-                    v-close-popup
-                  >
-                    <div class="row items-center white">
-                      <q-icon name="mdi-trash-can-outline" color="negative" />
-                      <span class="q-ml-sm">ลบ</span>
-                    </div>
-                  </q-item-section>
-                </q-item>
-              </q-list>
-            </q-menu>
+            <q-tooltip>แก้ไขข้อมูล</q-tooltip>
+          </q-btn>
+          <q-btn
+            color="red"
+            flat
+            dense
+            round
+            size="12px"
+            icon="mdi-delete"
+            clickable
+            @click.stop="
+              dialogRemove($q, async () => await deleteData(props.row.id))
+            "
+            v-close-popup
+          >
+            <q-tooltip>ลบข้อมูล</q-tooltip>
           </q-btn>
         </q-td>
       </q-tr>
diff --git a/src/modules/01_metadataNew/components/position/01ListPosition.vue b/src/modules/01_metadataNew/components/position/01ListPosition.vue
index f5e247e6f..afbb769bf 100644
--- a/src/modules/01_metadataNew/components/position/01ListPosition.vue
+++ b/src/modules/01_metadataNew/components/position/01ListPosition.vue
@@ -360,30 +360,34 @@ onMounted(() => {
           </q-td>
           <q-td auto-width>
             <q-btn
+              color="edit"
               flat
               dense
-              icon="mdi-dots-vertical"
-              class="q-pa-none q-ml-xs"
-              color="grey-13"
+              round
+              class="q-mr-xs"
+              size="12px"
+              icon="mdi-content-copy"
+              clickable
+              @click.stop="
+                () => {
+                  copyDetiail(props.row);
+                }
+              "
             >
-              <q-menu anchor="bottom middle" self="top middle">
-                <q-list dense v-for="(item, index) in listMenu" :key="index">
-                  <q-item
-                    clickable
-                    v-close-popup
-                    @click="
-                      item.type === 'copy'
-                        ? copyDetiail(props.row)
-                        : deletePos(props.row.id)
-                    "
-                  >
-                    <q-item-section avatar>
-                      <q-icon :color="item.color" :name="item.icon" size="sm" />
-                    </q-item-section>
-                    <q-item-section>{{ item.label }}</q-item-section>
-                  </q-item>
-                </q-list>
-              </q-menu>
+              <q-tooltip>คัดลอกข้อมูล</q-tooltip>
+            </q-btn>
+            <q-btn
+              color="red"
+              flat
+              dense
+              round
+              size="12px"
+              icon="mdi-delete"
+              clickable
+              @click.stop="deletePos(props.row.id)"
+              v-close-popup
+            >
+              <q-tooltip>ลบข้อมูล</q-tooltip>
             </q-btn>
           </q-td>
         </q-tr>
diff --git a/src/modules/01_metadataNew/components/position/02ListType.vue b/src/modules/01_metadataNew/components/position/02ListType.vue
index d1550b015..a07693bdf 100644
--- a/src/modules/01_metadataNew/components/position/02ListType.vue
+++ b/src/modules/01_metadataNew/components/position/02ListType.vue
@@ -235,54 +235,40 @@ async function onSubmit() {
         </q-td>
         <q-td auto-width>
           <q-btn
-            color="grey"
+            color="edit"
             flat
             dense
             round
-            size="14px"
-            icon="more_vert"
-            @click.stop
+            class="q-mr-xs"
+            size="12px"
+            icon="edit"
+            clickable
+            @click.stop="
+              () => {
+                dialogStatus = 'edit';
+                dialog = true;
+                editId = props.row.id;
+                posTypeName = props.row.posTypeName;
+                posTypeRank = props.row.posTypeRank;
+              }
+            "
           >
-            <q-menu>
-              <q-list dense>
-                <q-item
-                  v-close-popup
-                  clickable
-                  @click.stop="
-                    () => {
-                      dialogStatus = 'edit';
-                      dialog = true;
-                      editId = props.row.id;
-                      posTypeName = props.row.posTypeName;
-                      posTypeRank = props.row.posTypeRank;
-                    }
-                  "
-                >
-                  <q-item-section>
-                    <div class="row items-center white">
-                      <q-icon name="o_edit" color="positive" />
-                      <span class="q-ml-sm">แก้ไข</span>
-                    </div>
-                  </q-item-section>
-                </q-item>
-                <q-item clickable>
-                  <q-item-section
-                    @click="
-                      dialogRemove(
-                        $q,
-                        async () => await deleteData(props.row.id)
-                      )
-                    "
-                    v-close-popup
-                  >
-                    <div class="row items-center white">
-                      <q-icon name="mdi-trash-can-outline" color="negative" />
-                      <span class="q-ml-sm">ลบ</span>
-                    </div>
-                  </q-item-section>
-                </q-item>
-              </q-list>
-            </q-menu>
+            <q-tooltip>แก้ไขข้อมูล</q-tooltip>
+          </q-btn>
+          <q-btn
+            color="red"
+            flat
+            dense
+            round
+            size="12px"
+            icon="mdi-delete"
+            clickable
+            @click.stop="
+              dialogRemove($q, async () => await deleteData(props.row.id))
+            "
+            v-close-popup
+          >
+            <q-tooltip>ลบข้อมูล</q-tooltip>
           </q-btn>
         </q-td>
       </q-tr>
diff --git a/src/modules/01_metadataNew/components/position/04ListExecutive.vue b/src/modules/01_metadataNew/components/position/04ListExecutive.vue
index d04831bc5..38ba37977 100644
--- a/src/modules/01_metadataNew/components/position/04ListExecutive.vue
+++ b/src/modules/01_metadataNew/components/position/04ListExecutive.vue
@@ -10,10 +10,9 @@ import type {
 import http from "@/plugins/http";
 import config from "@/app.config";
 
-import DialogAdd from '@/modules/01_metadataNew/components/position/DialogAddExecutive.vue'
+import DialogAdd from "@/modules/01_metadataNew/components/position/DialogAddExecutive.vue";
 import { useCounterMixin } from "@/stores/mixin";
 
-
 const $q = useQuasar();
 const mixin = useCounterMixin();
 const {
@@ -113,7 +112,7 @@ function deletePos(id: string) {
       .delete(config.API.orgPosExecutiveById(id))
       .then(() => {
         success($q, "ลบข้อมูลสำเร็จ");
-        getData()
+        getData();
       })
       .catch((err) => {
         messageError($q, err);
@@ -199,30 +198,34 @@ onMounted(() => {
           </q-td>
           <q-td auto-width>
             <q-btn
+              color="edit"
               flat
               dense
-              icon="mdi-dots-vertical"
-              class="q-pa-none q-ml-xs"
-              color="grey-13"
+              round
+              class="q-mr-xs"
+              size="12px"
+              icon="edit"
+              clickable
+              @click.stop="
+                () => {
+                  editPopUp(props.row);
+                }
+              "
             >
-              <q-menu anchor="bottom middle" self="top middle">
-                <q-list dense v-for="(item, index) in listMenu" :key="index">
-                  <q-item
-                    clickable
-                    v-close-popup
-                    @click="
-                      item.type === 'copy'
-                        ? editPopUp(props.row)
-                        : deletePos(props.row.id)
-                    "
-                  >
-                    <q-item-section avatar>
-                      <q-icon :color="item.color" :name="item.icon" size="sm" />
-                    </q-item-section>
-                    <q-item-section>{{ item.label }}</q-item-section>
-                  </q-item>
-                </q-list>
-              </q-menu>
+              <q-tooltip>แก้ไขข้อมูล</q-tooltip>
+            </q-btn>
+            <q-btn
+              color="red"
+              flat
+              dense
+              round
+              size="12px"
+              icon="mdi-delete"
+              clickable
+              @click.stop="deletePos(props.row.id)"
+              v-close-popup
+            >
+              <q-tooltip>ลบข้อมูล</q-tooltip>
             </q-btn>
           </q-td>
         </q-tr>
@@ -231,9 +234,9 @@ onMounted(() => {
   </div>
 
   <DialogAdd
-  v-model:executive="modalAdd"
-  v-model:form-data="dataEdit"
-  v-model:edit="isEdit"
-  :get-data="getData"
+    v-model:executive="modalAdd"
+    v-model:form-data="dataEdit"
+    v-model:edit="isEdit"
+    :get-data="getData"
   />
 </template>
diff --git a/src/modules/01_metadataNew/components/position/05ListLevelDetail.vue b/src/modules/01_metadataNew/components/position/05ListLevelDetail.vue
index d6179002b..8e06eb140 100644
--- a/src/modules/01_metadataNew/components/position/05ListLevelDetail.vue
+++ b/src/modules/01_metadataNew/components/position/05ListLevelDetail.vue
@@ -303,55 +303,41 @@ async function fetchName() {
           </q-td>
           <q-td auto-width>
             <q-btn
-              color="grey"
+              color="edit"
               flat
               dense
               round
-              size="14px"
-              icon="more_vert"
-              @click.stop
+              class="q-mr-xs"
+              size="12px"
+              icon="edit"
+              clickable
+              @click.stop="
+                () => {
+                  dialogStatus = 'edit';
+                  dialog = true;
+                  editId = props.row.id;
+                  posLevelName = props.row.posLevelName;
+                  posLevelRank = props.row.posLevelRank;
+                  posLevelAuthority = props.row.posLevelAuthority;
+                }
+              "
             >
-              <q-menu>
-                <q-list dense>
-                  <q-item
-                    v-close-popup
-                    clickable
-                    @click.stop="
-                      () => {
-                        dialogStatus = 'edit';
-                        dialog = true;
-                        editId = props.row.id;
-                        posLevelName = props.row.posLevelName;
-                        posLevelRank = props.row.posLevelRank;
-                        posLevelAuthority = props.row.posLevelAuthority;
-                      }
-                    "
-                  >
-                    <q-item-section>
-                      <div class="row items-center white">
-                        <q-icon name="o_edit" color="positive" />
-                        <span class="q-ml-sm">แก้ไข</span>
-                      </div>
-                    </q-item-section>
-                  </q-item>
-                  <q-item clickable>
-                    <q-item-section
-                      @click="
-                        dialogRemove(
-                          $q,
-                          async () => await deleteData(props.row.id)
-                        )
-                      "
-                      v-close-popup
-                    >
-                      <div class="row items-center white">
-                        <q-icon name="mdi-trash-can-outline" color="negative" />
-                        <span class="q-ml-sm">ลบ</span>
-                      </div>
-                    </q-item-section>
-                  </q-item>
-                </q-list>
-              </q-menu>
+              <q-tooltip>แก้ไขข้อมูล</q-tooltip>
+            </q-btn>
+            <q-btn
+              color="red"
+              flat
+              dense
+              round
+              size="12px"
+              icon="mdi-delete"
+              clickable
+              @click.stop="
+                dialogRemove($q, async () => await deleteData(props.row.id))
+              "
+              v-close-popup
+            >
+              <q-tooltip>ลบข้อมูล</q-tooltip>
             </q-btn>
           </q-td>
         </q-tr>
diff --git a/src/modules/04_registryNew/components/registry/registry.vue b/src/modules/04_registryNew/components/registry/registry.vue
index 43e689406..e5f797873 100644
--- a/src/modules/04_registryNew/components/registry/registry.vue
+++ b/src/modules/04_registryNew/components/registry/registry.vue
@@ -388,59 +388,45 @@ async function changeCardID(citizenId: string | number | null) {
           </q-td>
           <q-td auto-width>
             <q-btn
-              color="grey"
+              color="edit"
               flat
               dense
               round
-              size="14px"
-              icon="more_vert"
-              @click.stop
+              class="q-mr-xs"
+              size="12px"
+              icon="edit"
+              clickable
+              @click.stop="
+                () => {
+                  dialogStatus = 'edit';
+                  dialog = true;
+                  editId = props.row.id;
+                  prefix = props.row.prefix;
+                  firstName = props.row.firstName;
+                  lastName = props.row.lastName;
+                  citizenId = props.row.citizenId;
+                  position = props.row.position;
+                  posTypeId = props.row.posTypeId;
+                  posLevelId = props.row.posLevelId;
+                }
+              "
             >
-              <q-menu>
-                <q-list dense>
-                  <q-item
-                    v-close-popup
-                    clickable
-                    @click.stop="
-                      () => {
-                        dialogStatus = 'edit';
-                        dialog = true;
-                        editId = props.row.id;
-                        prefix = props.row.prefix;
-                        firstName = props.row.firstName;
-                        lastName = props.row.lastName;
-                        citizenId = props.row.citizenId;
-                        position = props.row.position;
-                        posTypeId = props.row.posTypeId;
-                        posLevelId = props.row.posLevelId;
-                      }
-                    "
-                  >
-                    <q-item-section>
-                      <div class="row items-center white">
-                        <q-icon name="o_edit" color="positive" />
-                        <span class="q-ml-sm">แก้ไข</span>
-                      </div>
-                    </q-item-section>
-                  </q-item>
-                  <q-item clickable>
-                    <q-item-section
-                      @click="
-                        dialogRemove(
-                          $q,
-                          async () => await deleteData(props.row.id)
-                        )
-                      "
-                      v-close-popup
-                    >
-                      <div class="row items-center white">
-                        <q-icon name="mdi-trash-can-outline" color="negative" />
-                        <span class="q-ml-sm">ลบ</span>
-                      </div>
-                    </q-item-section>
-                  </q-item>
-                </q-list>
-              </q-menu>
+              <q-tooltip>แก้ไขข้อมูล</q-tooltip>
+            </q-btn>
+            <q-btn
+              color="red"
+              flat
+              dense
+              round
+              size="12px"
+              icon="mdi-delete"
+              clickable
+              @click.stop="
+                dialogRemove($q, async () => await deleteData(props.row.id))
+              "
+              v-close-popup
+            >
+              <q-tooltip>ลบข้อมูล</q-tooltip>
             </q-btn>
           </q-td>
         </q-tr>