diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
index 441ce2836..777858eb5 100644
--- a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
@@ -586,7 +586,7 @@ watch(props.data, async () => {
         <div
           class="col-xs-12 col-sm-12 text-weight-medium bg-grey-1 q-py-xs q-px-md"
         >
-          อัปโหลดหลักฐานสนับสนุนข้อกล่าวหา
+          อัปโหลดไฟล์เอกสารหลักฐาน
         </div>
         <div class="col-12"><q-separator /></div>
         <div class="col-xs-12 q-pa-sm row">
@@ -606,9 +606,18 @@ watch(props.data, async () => {
               <q-icon name="attach_file" color="primary" />
             </template>
           </q-file>
-          <q-btn class="col q-mt-sm" flat round color="primary" icon="upload">
-            <q-tooltip>อัปโหลดเอกสารหลักฐาน</q-tooltip></q-btn
-          >
+          <div class="col-1 self-center" v-if="formData.evidenceFiles">
+            <q-btn
+              size="14px"
+              flat
+              round
+              dense
+              color="add"
+              class="q-ml-sm q-mt-sm"
+              icon="mdi-upload"
+              ><q-tooltip>อัปโหลดไฟล์</q-tooltip></q-btn
+            >
+          </div>
         </div>
         <div class="col-xs-12 q-pa-sm row">
           <q-list bordered separator class="full-width">
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
index 616a15263..dcf09d33e 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
@@ -704,15 +704,18 @@ onMounted(async () => {
                     <q-icon name="attach_file" />
                   </template>
                 </q-file>
-                <q-btn
-                  class="col q-mt-sm"
-                  flat
-                  round
-                  color="primary"
-                  icon="upload"
-                >
-                  <q-tooltip>อัปโหลดเอกสารหลักฐาน</q-tooltip></q-btn
-                >
+                <div class="col-1 self-center" v-if="formData.filesEvidence">
+                  <q-btn
+                    size="14px"
+                    flat
+                    round
+                    dense
+                    color="add"
+                    class="q-ml-sm q-mt-sm"
+                    icon="mdi-upload"
+                    ><q-tooltip>อัปโหลดไฟล์</q-tooltip></q-btn
+                  >
+                </div>
               </div>
               <div class="col-xs-12 q-pa-sm row">
                 <q-list bordered separator class="full-width">
@@ -788,15 +791,21 @@ onMounted(async () => {
                     <q-icon name="attach_file" />
                   </template>
                 </q-file>
-                <q-btn
-                  class="col q-mt-sm"
-                  flat
-                  round
-                  color="primary"
-                  icon="upload"
-                >
-                  <q-tooltip>อัปโหลดเอกสารหลักฐาน</q-tooltip></q-btn
+                <div
+                  class="col-1 self-center"
+                  v-if="formData.filesRecordAccuser"
                 >
+                  <q-btn
+                    size="14px"
+                    flat
+                    round
+                    dense
+                    color="add"
+                    class="q-ml-sm q-mt-sm"
+                    icon="mdi-upload"
+                    ><q-tooltip>อัปโหลดไฟล์</q-tooltip></q-btn
+                  >
+                </div>
               </div>
               <div class="col-xs-12 q-pa-sm row">
                 <q-list bordered separator class="full-width">
@@ -872,15 +881,18 @@ onMounted(async () => {
                     <q-icon name="attach_file" />
                   </template>
                 </q-file>
-                <q-btn
-                  class="col q-mt-sm"
-                  flat
-                  round
-                  color="primary"
-                  icon="upload"
-                >
-                  <q-tooltip>อัปโหลดเอกสารหลักฐาน</q-tooltip></q-btn
-                >
+                <div class="col-1 self-center" v-if="formData.filesWitnesses">
+                  <q-btn
+                    size="14px"
+                    flat
+                    round
+                    dense
+                    color="add"
+                    class="q-ml-sm q-mt-sm"
+                    icon="mdi-upload"
+                    ><q-tooltip>อัปโหลดไฟล์</q-tooltip></q-btn
+                  >
+                </div>
               </div>
               <div class="col-xs-12 q-pa-sm row">
                 <q-list bordered separator class="full-width">
@@ -956,15 +968,18 @@ onMounted(async () => {
                     <q-icon name="attach_file" />
                   </template>
                 </q-file>
-                <q-btn
-                  class="col q-mt-sm"
-                  flat
-                  round
-                  color="primary"
-                  icon="upload"
-                >
-                  <q-tooltip>อัปโหลดเอกสารหลักฐาน</q-tooltip></q-btn
-                >
+                <div class="col-1 self-center" v-if="formData.filesEtc">
+                  <q-btn
+                    size="14px"
+                    flat
+                    round
+                    dense
+                    color="add"
+                    class="q-ml-sm q-mt-sm"
+                    icon="mdi-upload"
+                    ><q-tooltip>อัปโหลดไฟล์</q-tooltip></q-btn
+                  >
+                </div>
               </div>
               <div class="col-xs-12 q-pa-sm row">
                 <q-list bordered separator class="full-width">