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 6b0a5cec4..f7b88efdf 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue
@@ -522,13 +522,13 @@ onMounted(async () => {
         </q-td>
         <q-td auto-width>
           <q-btn
-            color="edit"
+            color="primary"
             flat
             dense
             round
             class="q-mr-xs"
             size="14px"
-            icon="edit"
+            icon="mdi-pencil-outline"
             clickable
             @click="
               () => {
@@ -571,7 +571,7 @@ onMounted(async () => {
             flat
             dense
             round
-            size="12px"
+            size="14px"
             icon="mdi-delete"
             clickable
             @click.stop="
@@ -593,8 +593,9 @@ onMounted(async () => {
             <q-btn
               flat
               round
+              size="14px"
               color="primary"
-              icon="edit"
+              icon="mdi-pencil-outline"
               @click="
                 dialogStatus = 'edit';
                 editId = props.row.id;
@@ -619,7 +620,8 @@ onMounted(async () => {
             <q-btn
               flat
               round
-              color="blue"
+              size="14px"
+              color="info"
               icon="history"
               @click="historyDialog = true"
             >
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 58d905d23..b149e169f 100644
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue
+++ b/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue
@@ -621,13 +621,13 @@ onMounted(async () => {
         </q-td>
         <q-td auto-width>
           <q-btn
-            color="edit"
+            color="primary"
             flat
             dense
             round
             class="q-mr-xs"
             size="14px"
-            icon="edit"
+            icon="mdi-pencil-outline"
             clickable
             @click="
               () => {
@@ -698,7 +698,8 @@ onMounted(async () => {
               flat
               round
               color="primary"
-              icon="edit"
+              size="14px"
+              icon="mdi-pencil-outline"
               @click="
                 dialogStatus = 'edit';
                 editId = props.row.id;
@@ -728,7 +729,8 @@ onMounted(async () => {
             <q-btn
               flat
               round
-              color="blue"
+              color="info"
+              size="14px"
               icon="history"
               @click="
                 () => (fetchHistoryData(props.row.id), (historyDialog = true))
@@ -1273,23 +1275,7 @@ onMounted(async () => {
             <template v-slot:body="props">
               <q-tr :props="props" class="cursor-pointer">
                 <q-td v-for="col in props.cols" :key="col.id">
-                  <div
-                    v-if="col.name === 'startDate' || col.name === 'endDate'"
-                  >
-                    <div v-if="props.row.isDate">
-                      {{ date2Thai(col.value) }}
-                    </div>
-                    <div v-else>
-                      {{ +col.value.slice(0, 4) + 543 }}
-                    </div>
-                  </div>
-                  <div v-else-if="col.name === 'finishDate'">
-                    {{ col.value ? date2Thai(col.value) : "-" }}
-                  </div>
-                  <div v-else-if="col.name === 'isEducation'">
-                    {{ col.value === true ? "ใช่" : "ไม่ใช่" }}
-                  </div>
-                  <div v-else>
+                  <div>
                     {{ col.value === "" ? "-" : col.value }}
                   </div>
                 </q-td>
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 1c9025ccc..a66ce06a4 100644
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/06_SpecialSkill.vue
+++ b/src/modules/04_registryNew/components/detail/PersonalInformation/06_SpecialSkill.vue
@@ -349,13 +349,13 @@ onMounted(async () => {
         </q-td>
         <q-td auto-width>
           <q-btn
-            color="edit"
+            color="primary"
             flat
             dense
             round
             class="q-mr-xs"
             size="14px"
-            icon="edit"
+            icon="mdi-pencil-outline"
             clickable
             @click="
               () => {
@@ -390,7 +390,7 @@ onMounted(async () => {
             flat
             dense
             round
-            size="12px"
+            size="14px"
             icon="mdi-delete"
             clickable
             @click.stop="
@@ -413,7 +413,8 @@ onMounted(async () => {
               flat
               round
               color="primary"
-              icon="edit"
+              icon="mdi-pencil-outline"
+              size="14px"
               @click="
                 () => {
                   dialogStatus = 'edit';
@@ -432,7 +433,8 @@ onMounted(async () => {
               flat
               class="no-shadow toggle-borderd"
               round
-              color="blue"
+              size="14px"
+              color="info"
               icon="mdi-history"
               @click="
                 fetchHistoryData(props.row.id);