diff --git a/public/images/customer-CORP-avartar-female.png b/public/images/customer-CORP-avartar-female.png
new file mode 100644
index 00000000..446ef866
Binary files /dev/null and b/public/images/customer-CORP-avartar-female.png differ
diff --git a/public/images/customer-CORP-avartar-male.png b/public/images/customer-CORP-avartar-male.png
new file mode 100644
index 00000000..6ad95d7d
Binary files /dev/null and b/public/images/customer-CORP-avartar-male.png differ
diff --git a/public/images/customer-CORP-avartar.png b/public/images/customer-CORP-avartar.png
deleted file mode 100644
index 1c2f0dab..00000000
Binary files a/public/images/customer-CORP-avartar.png and /dev/null differ
diff --git a/public/images/customer-PERS-avartar-female.png b/public/images/customer-PERS-avartar-female.png
new file mode 100644
index 00000000..ca0a2bf1
Binary files /dev/null and b/public/images/customer-PERS-avartar-female.png differ
diff --git a/public/images/customer-PERS-avartar-male.png b/public/images/customer-PERS-avartar-male.png
new file mode 100644
index 00000000..e9fd15fe
Binary files /dev/null and b/public/images/customer-PERS-avartar-male.png differ
diff --git a/public/images/customer-PERS-avartar.png b/public/images/customer-PERS-avartar.png
deleted file mode 100644
index 18f65135..00000000
Binary files a/public/images/customer-PERS-avartar.png and /dev/null differ
diff --git a/public/images/employee-avatar.png b/public/images/employee-avatar.png
index a68cc4d7..66ace3a0 100644
Binary files a/public/images/employee-avatar.png and b/public/images/employee-avatar.png differ
diff --git a/src/pages/03_customer-management/MainPage.vue b/src/pages/03_customer-management/MainPage.vue
index 8da96458..8c0160c5 100644
--- a/src/pages/03_customer-management/MainPage.vue
+++ b/src/pages/03_customer-management/MainPage.vue
@@ -1164,7 +1164,7 @@ const emptyCreateDialog = ref(false);
                                     >
                                       <template #error>
                                         <q-img
-                                          :src="`${props.row.customerType === 'CORP' ? '/images/customer-CORP-avartar.png' : '/images/customer-PERS-avartar.png'}`"
+                                          :src="`${props.row.customerType === 'CORP' ? `/images/customer-CORP-avartar-${props.row.gender}.png` : `/images/customer-PERS-avartar-${props.row.gender}.png`}`"
                                         />
                                       </template>
                                     </q-img>
@@ -1735,11 +1735,16 @@ const emptyCreateDialog = ref(false);
         :fallback-cover="`/images/customer-${customerFormData.customerType}-banner-bg.jpg`"
         :img="
           customerFormState.customerImageUrl ||
-          `/images/customer-${customerFormData.customerType}-avartar.png`
+          `/images/customer-${customerFormData.customerType}-avartar-${customerFormData.gender}.png`
+        "
+        :fallbackImg="`/images/customer-${customerFormData.customerType}-avartar-${customerFormData.gender}.png`"
+        :color="`hsla(var(--${customerFormData.customerType === 'PERS' ? 'teal-10-hsl' : 'violet-11-hsl'})/1)`"
+        :bg-color="`hsla(var(--${customerFormData.customerType === 'PERS' ? 'teal-10-hsl' : 'violet-11-hsl'})/0.1)`"
+        :icon="
+          customerFormData.customerType === 'PERS'
+            ? 'mdi-account-plus-outline'
+            : 'mdi-office-building-outline'
         "
-        :fallbackImg="`/images/customer-${customerFormData.customerType}-avartar.png`"
-        color="hsla(var(--pink-6-hsl)/1)"
-        bg-color="hsla(var(--pink-6-hsl)/0.15)"
         @view="customerFormState.imageDialog = true"
         @edit="dialogCustomerImageUpload?.browse()"
       />
@@ -2635,13 +2640,35 @@ const emptyCreateDialog = ref(false);
       <div class="full-height full-width" style="background: white">
         <div
           class="full-height full-width flex justify-center items-center"
-          :style="`background: ${customerFormData.customerType === 'CORP' ? '#5f1775' : '#347454'}`"
+          :style="`background: ${
+            customerFormData.gender
+              ? customerFormData.customerType === 'CORP'
+                ? '#5f1775'
+                : '#347454'
+              : `hsla(var(--${customerFormData.customerType === 'PERS' ? 'teal-10-hsl' : 'violet-11-hsl'})/0.1)`
+          }`"
         >
           <q-img
-            :src="`/images/customer-${customerFormData.customerType}-avartar.png`"
+            :src="`/images/customer-${customerFormData.customerType}-avartar-${customerFormData.gender}.png`"
             fit="contain"
             style="height: 100%"
-          />
+          >
+            <template #error>
+              <span
+                class="full-width full-height column items-center justify-center"
+              >
+                <q-icon
+                  size="7vw"
+                  :name="
+                    customerFormData.customerType === 'PERS'
+                      ? 'mdi-account-plus-outline'
+                      : 'mdi-office-building-outline'
+                  "
+                  :style="`color: hsla(var(--${customerFormData.customerType === 'PERS' ? 'teal-10-hsl' : 'violet-11-hsl'})/1)`"
+                />
+              </span>
+            </template>
+          </q-img>
         </div>
       </div>
     </template>
@@ -2735,11 +2762,16 @@ const emptyCreateDialog = ref(false);
           :fallback-cover="`/images/customer-${customerFormData.customerType}-banner-bg.jpg`"
           :img="
             customerFormState.customerImageUrl ||
-            `/images/customer-${customerFormData.customerType}-avartar.png`
+            `/images/customer-${customerFormData.customerType}-avartar-${customerFormData.gender}.png`
+          "
+          :fallbackImg="`/images/customer-${customerFormData.customerType}-avartar-${customerFormData.gender}.png`"
+          :color="`hsla(var(--${customerFormData.customerType === 'PERS' ? 'teal-10-hsl' : 'violet-11-hsl'})/1)`"
+          :bg-color="`hsla(var(--${customerFormData.customerType === 'PERS' ? 'teal-10-hsl' : 'violet-11-hsl'})/0.1)`"
+          :icon="
+            customerFormData.customerType === 'PERS'
+              ? 'mdi-account-plus-outline'
+              : 'mdi-office-building-outline'
           "
-          :fallbackImg="`/images/customer-${customerFormData.customerType}-avartar.png`"
-          color="hsla(var(--pink-6-hsl)/1)"
-          bg-color="hsla(var(--pink-6-hsl)/0.15)"
           @view="customerFormState.imageDialog = true"
           @edit="dialogCustomerImageUpload?.browse()"
         />