diff --git a/src/modules/02_organizationalNew/components/DialogHistoryPos.vue b/src/modules/02_organizationalNew/components/DialogHistoryPos.vue
index 8b43743da..6a69a3504 100644
--- a/src/modules/02_organizationalNew/components/DialogHistoryPos.vue
+++ b/src/modules/02_organizationalNew/components/DialogHistoryPos.vue
@@ -121,7 +121,7 @@ watch(
         "
       />
       <q-separator />
-      <q-card-section class="q-pt-none q-pa-sm">
+      <q-card-section>
         <d-table
           flat
           bordered
diff --git a/src/modules/02_organizationalNew/components/DialogSortAgency.vue b/src/modules/02_organizationalNew/components/DialogSortAgency.vue
index fbc2f1829..eab3648bc 100644
--- a/src/modules/02_organizationalNew/components/DialogSortAgency.vue
+++ b/src/modules/02_organizationalNew/components/DialogSortAgency.vue
@@ -95,14 +95,13 @@ watch(
   <template>
     <q-dialog v-model="modal" persistent>
       <q-card style="min-width: 50vw">
-        <!-- <form @submit.prevent="validateForm"> -->
         <DialogHeader
           :tittle="`จัดลำดับ${type == 0 ? 'หน่วยงาน' : 'ส่วนราชการ'}`"
           :close="() => (modal = false)"
         />
         <q-separator />
 
-        <q-card-section>
+        <q-card-section style="max-height: 70vh" class="scroll">
           <q-table
             v-draggable-table="{
               options: {
@@ -124,10 +123,11 @@ watch(
           />
         </q-card-section>
         <q-separator />
-        <q-card-actions align="right" class="bg-white text-teal">
-          <q-btn type="submit" :label="`บันทึก`" color="public" @click="save" />
+        <q-card-actions align="right">
+          <q-btn type="submit" :label="`บันทึก`" color="public" @click="save" >
+            <q-tooltip>บันทึกข้อมูล</q-tooltip>
+          </q-btn>
         </q-card-actions>
-        <!-- </form> -->
       </q-card>
     </q-dialog>
   </template>
diff --git a/src/modules/02_organizationalNew/components/DialogSuccession.vue b/src/modules/02_organizationalNew/components/DialogSuccession.vue
index d6fca2c21..6180f17fa 100644
--- a/src/modules/02_organizationalNew/components/DialogSuccession.vue
+++ b/src/modules/02_organizationalNew/components/DialogSuccession.vue
@@ -396,8 +396,10 @@ function clearForm() {
 
       <q-separator />
 
-      <q-card-actions align="right" class="bg-white text-teal">
-        <q-btn label="สืบทอดตำแหน่ง" color="public" @click="onClickConfirm" />
+      <q-card-actions align="right">
+        <q-btn label="สืบทอดตำแหน่ง" color="public" @click="onClickConfirm">
+          <q-tooltip>สืบทอดตำแหน่ง</q-tooltip></q-btn
+        >
       </q-card-actions>
     </q-card>
   </q-dialog>
diff --git a/src/modules/16_positionEmployee/components/DialogSuccession.vue b/src/modules/16_positionEmployee/components/DialogSuccession.vue
index 3334c340b..60e79ace5 100644
--- a/src/modules/16_positionEmployee/components/DialogSuccession.vue
+++ b/src/modules/16_positionEmployee/components/DialogSuccession.vue
@@ -393,8 +393,10 @@ function clearForm() {
 
       <q-separator />
 
-      <q-card-actions align="right" class="bg-white text-teal">
-        <q-btn label="สืบทอดตำแหน่ง" color="public" @click="onClickConfirm" />
+      <q-card-actions align="right">
+        <q-btn label="สืบทอดตำแหน่ง" color="public" @click="onClickConfirm">
+          <q-tooltip>สืบทอดตำแหน่ง</q-tooltip>
+        </q-btn>
       </q-card-actions>
     </q-card>
   </q-dialog>