diff --git a/src/components/Dialogs/PopupReason.vue b/src/components/Dialogs/PopupReason.vue
index d151fe55a..e7916fffe 100644
--- a/src/components/Dialogs/PopupReason.vue
+++ b/src/components/Dialogs/PopupReason.vue
@@ -47,7 +47,7 @@ const submit = () => {
 };
 
 function closeModal() {
-  modal.value = false
+  modal.value = false;
 }
 </script>
 
@@ -57,7 +57,7 @@ function closeModal() {
       <q-form ref="myForm">
         <DialogHeader :tittle="props.title" :close="closeModal" />
         <q-separator />
-        <q-card-section class="q-pa-sm bg-grey-1">
+        <q-card-section class="q-pa-sm">
           <div class="row col-12 q-col-gutter-sm">
             <div class="col-xs-12">
               <div class="col-12 row q-py-sm items-center q-col-gutter-sm">
@@ -77,9 +77,8 @@ function closeModal() {
           </div>
         </q-card-section>
         <q-separator />
-        <q-card-actions align="right">
+        <q-card-actions align="right" class="bg-white text-teal">
           <q-btn
-            dense
             unelevated
             label="บันทึก"
             color="public"
diff --git a/src/modules/06_retirement/components/ListRetirement/TableList.vue b/src/modules/06_retirement/components/ListRetirement/TableList.vue
index 4b07eaf48..0246e9f10 100644
--- a/src/modules/06_retirement/components/ListRetirement/TableList.vue
+++ b/src/modules/06_retirement/components/ListRetirement/TableList.vue
@@ -740,13 +740,14 @@ function updatemodalPersonal(modal: boolean) {
     <q-card style="width: 50vw">
       <DialogHeader tittle="กรอกเหตุผล" :close="closeDialog" />
       <q-separator />
-      <q-card-section class="q-pt-none bg-grey-1">
+      <q-card-section>
         <div class="row q-col-gutter-sm">
           <div class="col-12">
             <q-input
               outlined
               dense
               lazy-rules
+              hide-bottom-space
               v-model="note"
               :rules="[(val) => !!val || 'กรุณากรอกเหตุผล']"
               :label="`${'กรอกเหตุผล'}`"
@@ -756,9 +757,12 @@ function updatemodalPersonal(modal: boolean) {
         </div>
       </q-card-section>
 
+      <q-separator />
+
       <q-card-actions align="right">
         <q-btn
           v-if="action === 'delete'"
+          unelevated
           label="บันทึก"
           color="secondary"
           :disable="visibleNote"
@@ -766,6 +770,7 @@ function updatemodalPersonal(modal: boolean) {
         />
         <q-btn
           v-else
+          unelevated
           label="บักทึก"
           color="secondary"
           @click="saveNote"
@@ -782,9 +787,10 @@ function updatemodalPersonal(modal: boolean) {
       <q-separator />
       <q-card-section>
         <q-form ref="myForm">
-          <div class="row q-pa-md q-gutter-md">
-            <div class="col-12">
+          <div class="row q-gutter-md">
+            <div class="col-12 q-pr-md">
               <q-file
+                hide-bottom-space
                 bg-color="white"
                 clearable
                 outlined
@@ -801,7 +807,7 @@ function updatemodalPersonal(modal: boolean) {
                 </template>
               </q-file>
             </div>
-            <div class="col-12">
+            <div class="col-12 q-pr-md">
               <datepicker
                 menu-class-name="modalfix"
                 v-model="signDate"
@@ -836,13 +842,14 @@ function updatemodalPersonal(modal: boolean) {
           </div>
         </q-form>
       </q-card-section>
+
       <q-separator />
+
       <q-card-actions align="right">
         <q-btn
-          flat
-          round
+          unelevated
+          label="บันทึก"
           color="public"
-          icon="mdi-content-save-outline"
           @click="uploadFile(fileUpload, signDate)"
         >
           <q-tooltip>บันทึก</q-tooltip>
diff --git a/src/modules/06_retirement/components/ListRetirement/popupAdd.vue b/src/modules/06_retirement/components/ListRetirement/popupAdd.vue
index 7ed7d8542..fbebbe5cd 100644
--- a/src/modules/06_retirement/components/ListRetirement/popupAdd.vue
+++ b/src/modules/06_retirement/components/ListRetirement/popupAdd.vue
@@ -114,12 +114,10 @@ const cerateRetirement = async (data: object) => {
   <q-dialog v-model="modal">
     <q-card style="width: 450px; max-width: 80vw">
       <q-card-section>
-        <div class="text-h6">เพิ่มประกาศ</div>
+        <h6 class="q-ma-none">เพิ่มประกาศ</h6>
+        <p class="q-mb-none">เลือกประกาศที่ต้องการเพิ่มข้อมูล</p>
       </q-card-section>
 
-      <q-card-section class="q-pt-none">
-        เลือกประกาศที่ต้องการเพิ่มข้อมูล
-      </q-card-section>
       <q-separator />
       <div class="q-pa-md">
         <q-list>
@@ -196,7 +194,8 @@ const cerateRetirement = async (data: object) => {
       <q-card-actions align="right" class="bg-white text-teal">
         <q-btn flat label="ยกเลิก" color="red" v-close-popup />
         <q-btn
-          flat
+          unelevated
+          color="teal"
           label="ตกลง"
           @click="clickSelect(action)"
           :disable="radio === '' || (action === '' && radio !== 'ADD')"