diff --git a/resources/scripts/admin/components/modal-components/CustomerModal.vue b/resources/scripts/admin/components/modal-components/CustomerModal.vue
index 04e1c441..a03aee11 100644
--- a/resources/scripts/admin/components/modal-components/CustomerModal.vue
+++ b/resources/scripts/admin/components/modal-components/CustomerModal.vue
@@ -167,18 +167,12 @@
                 >
                   <template #right>
                     <BaseIcon
-                      v-if="isShowPassword"
-                      name="EyeOffIcon"
-                      class="w-5 h-5 mr-1 text-gray-500 cursor-pointer"
+                      :name="isShowPassword ? 'EyeIcon' : 'EyeOffIcon'"
+                      class="mr-1 text-gray-500 cursor-pointer"
                       @click="isShowPassword = !isShowPassword"
                     />
-                    <BaseIcon
-                      v-else
-                      name="EyeIcon"
-                      class="w-5 h-5 mr-1 text-gray-500 cursor-pointer"
-                      @click="isShowPassword = !isShowPassword"
-                    /> </template
-                ></BaseInput>
+                  </template>
+                </BaseInput>
               </BaseInputGroup>
               <BaseInputGroup
                 v-if="customerStore.currentCustomer.enable_portal"
@@ -199,18 +193,12 @@
                 >
                   <template #right>
                     <BaseIcon
-                      v-if="isShowConfirmPassword"
-                      name="EyeOffIcon"
-                      class="w-5 h-5 mr-1 text-gray-500 cursor-pointer"
+                      :name="isShowConfirmPassword ? 'EyeIcon' : 'EyeOffIcon'"
+                      class="mr-1 text-gray-500 cursor-pointer"
                       @click="isShowConfirmPassword = !isShowConfirmPassword"
                     />
-                    <BaseIcon
-                      v-else
-                      name="EyeIcon"
-                      class="w-5 h-5 mr-1 text-gray-500 cursor-pointer"
-                      @click="isShowConfirmPassword = !isShowConfirmPassword"
-                    /> </template
-                ></BaseInput>
+                  </template>
+                </BaseInput>
               </BaseInputGroup>
             </BaseInputGrid>
           </BaseTab>
diff --git a/resources/scripts/admin/views/auth/Login.vue b/resources/scripts/admin/views/auth/Login.vue
index d3b9686f..4b9429e6 100644
--- a/resources/scripts/admin/views/auth/Login.vue
+++ b/resources/scripts/admin/views/auth/Login.vue
@@ -31,18 +31,12 @@
       >
         <template #right>
           <BaseIcon
-            v-if="isShowPassword"
-            name="EyeOffIcon"
-            class="w-5 h-5 mr-1 text-gray-500 cursor-pointer"
+            :name="isShowPassword ? 'EyeIcon' : 'EyeOffIcon'"
+            class="mr-1 text-gray-500 cursor-pointer"
             @click="isShowPassword = !isShowPassword"
           />
-          <BaseIcon
-            v-else
-            name="EyeIcon"
-            class="w-5 h-5 mr-1 text-gray-500 cursor-pointer"
-            @click="isShowPassword = !isShowPassword"
-          /> </template
-      ></BaseInput>
+        </template>
+      </BaseInput>
     </BaseInputGroup>
 
     <div class="mt-5 mb-8">
diff --git a/resources/scripts/admin/views/customers/Create.vue b/resources/scripts/admin/views/customers/Create.vue
index b06c93be..14643aab 100644
--- a/resources/scripts/admin/views/customers/Create.vue
+++ b/resources/scripts/admin/views/customers/Create.vue
@@ -223,18 +223,12 @@
               >
                 <template #right>
                   <BaseIcon
-                    v-if="isShowPassword"
-                    name="EyeOffIcon"
-                    class="w-5 h-5 mr-1 text-gray-500 cursor-pointer"
+                    :name="isShowPassword ? 'EyeIcon' : 'EyeOffIcon'"
+                    class="mr-1 text-gray-500 cursor-pointer"
                     @click="isShowPassword = !isShowPassword"
                   />
-                  <BaseIcon
-                    v-else
-                    name="EyeIcon"
-                    class="w-5 h-5 mr-1 text-gray-500 cursor-pointer"
-                    @click="isShowPassword = !isShowPassword"
-                  /> </template
-              ></BaseInput>
+                </template>
+              </BaseInput>
             </BaseInputGroup>
 
             <BaseInputGroup
@@ -256,18 +250,12 @@
               >
                 <template #right>
                   <BaseIcon
-                    v-if="isShowConfirmPassword"
-                    name="EyeOffIcon"
-                    class="w-5 h-5 mr-1 text-gray-500 cursor-pointer"
+                    :name="isShowConfirmPassword ? 'EyeIcon' : 'EyeOffIcon'"
+                    class="mr-1 text-gray-500 cursor-pointer"
                     @click="isShowConfirmPassword = !isShowConfirmPassword"
                   />
-                  <BaseIcon
-                    v-else
-                    name="EyeIcon"
-                    class="w-5 h-5 mr-1 text-gray-500 cursor-pointer"
-                    @click="isShowConfirmPassword = !isShowConfirmPassword"
-                  /> </template
-              ></BaseInput>
+                </template>
+              </BaseInput>
             </BaseInputGroup>
           </BaseInputGrid>
         </div>
diff --git a/resources/scripts/admin/views/installation/Step6AccountSettings.vue b/resources/scripts/admin/views/installation/Step6AccountSettings.vue
index aa217c5b..d7a51656 100644
--- a/resources/scripts/admin/views/installation/Step6AccountSettings.vue
+++ b/resources/scripts/admin/views/installation/Step6AccountSettings.vue
@@ -69,15 +69,8 @@
           >
             <template #right>
               <BaseIcon
-                v-if="isShowPassword"
-                name="EyeOffIcon"
-                class="w-5 h-5 mr-1 text-gray-500 cursor-pointer"
-                @click="isShowPassword = !isShowPassword"
-              />
-              <BaseIcon
-                v-else
-                name="EyeIcon"
-                class="w-5 h-5 mr-1 text-gray-500 cursor-pointer"
+                :name="isShowPassword ? 'EyeIcon' : 'EyeOffIcon'"
+                class="mr-1 text-gray-500 cursor-pointer"
                 @click="isShowPassword = !isShowPassword"
               />
             </template>
@@ -101,15 +94,8 @@
           >
             <template #right>
               <BaseIcon
-                v-if="isShowConfirmPassword"
-                name="EyeOffIcon"
-                class="w-5 h-5 mr-1 text-gray-500 cursor-pointer"
-                @click="isShowConfirmPassword = !isShowConfirmPassword"
-              />
-              <BaseIcon
-                v-else
-                name="EyeIcon"
-                class="w-5 h-5 mr-1 text-gray-500 cursor-pointer"
+                :name="isShowConfirmPassword ? 'EyeIcon' : 'EyeOffIcon'"
+                class="mr-1 text-gray-500 cursor-pointer"
                 @click="isShowConfirmPassword = !isShowConfirmPassword"
               />
             </template>
diff --git a/resources/scripts/admin/views/installation/mail-driver/MailgunMailDriver.vue b/resources/scripts/admin/views/installation/mail-driver/MailgunMailDriver.vue
index 536b8254..13f00fab 100644
--- a/resources/scripts/admin/views/installation/mail-driver/MailgunMailDriver.vue
+++ b/resources/scripts/admin/views/installation/mail-driver/MailgunMailDriver.vue
@@ -62,15 +62,8 @@
         >
           <template #right>
             <BaseIcon
-              v-if="isShowPassword"
-              name="EyeOffIcon"
-              class="w-5 h-5 mr-1 text-gray-500 cursor-pointer"
-              @click="isShowPassword = !isShowPassword"
-            />
-            <BaseIcon
-              v-else
-              name="EyeIcon"
-              class="w-5 h-5 mr-1 text-gray-500 cursor-pointer"
+              :name="isShowPassword ? 'EyeIcon' : 'EyeOffIcon'"
+              class="mr-1 text-gray-500 cursor-pointer"
               @click="isShowPassword = !isShowPassword"
             />
           </template>
diff --git a/resources/scripts/admin/views/installation/mail-driver/SesMailDriver.vue b/resources/scripts/admin/views/installation/mail-driver/SesMailDriver.vue
index a50e7c8c..df18069b 100644
--- a/resources/scripts/admin/views/installation/mail-driver/SesMailDriver.vue
+++ b/resources/scripts/admin/views/installation/mail-driver/SesMailDriver.vue
@@ -160,15 +160,8 @@
         >
           <template #right>
             <BaseIcon
-              v-if="isShowPassword"
-              name="EyeOffIcon"
-              class="w-5 h-5 mr-1 text-gray-500 cursor-pointer"
-              @click="isShowPassword = !isShowPassword"
-            />
-            <BaseIcon
-              v-else
-              name="EyeIcon"
-              class="w-5 h-5 mr-1 text-gray-500 cursor-pointer"
+              :name="isShowPassword ? 'EyeIcon' : 'EyeOffIcon'"
+              class="mr-1 text-gray-500 cursor-pointer"
               @click="isShowPassword = !isShowPassword"
             />
           </template>
diff --git a/resources/scripts/admin/views/installation/mail-driver/SmtpMailDriver.vue b/resources/scripts/admin/views/installation/mail-driver/SmtpMailDriver.vue
index 0833a0a3..be4ccfea 100644
--- a/resources/scripts/admin/views/installation/mail-driver/SmtpMailDriver.vue
+++ b/resources/scripts/admin/views/installation/mail-driver/SmtpMailDriver.vue
@@ -67,15 +67,8 @@
         >
           <template #right>
             <BaseIcon
-              v-if="isShowPassword"
-              name="EyeOffIcon"
-              class="w-5 h-5 mr-1 text-gray-500 cursor-pointer"
-              @click="isShowPassword = !isShowPassword"
-            />
-            <BaseIcon
-              v-else
-              name="EyeIcon"
-              class="w-5 h-5 mr-1 text-gray-500 cursor-pointer"
+              :name="isShowPassword ? 'EyeIcon' : 'EyeOffIcon'"
+              class="mr-1 text-gray-500 cursor-pointer"
               @click="isShowPassword = !isShowPassword"
             />
           </template>
diff --git a/resources/scripts/admin/views/settings/mail-driver/MailgunMailDriver.vue b/resources/scripts/admin/views/settings/mail-driver/MailgunMailDriver.vue
index fa2ebbcf..75d2ae08 100644
--- a/resources/scripts/admin/views/settings/mail-driver/MailgunMailDriver.vue
+++ b/resources/scripts/admin/views/settings/mail-driver/MailgunMailDriver.vue
@@ -59,15 +59,8 @@
         >
           <template #right>
             <BaseIcon
-              v-if="isShowPassword"
+              :name="isShowPassword ? 'EyeIcon' : 'EyeOffIcon'"
               class="mr-1 text-gray-500 cursor-pointer"
-              name="EyeOffIcon"
-              @click="isShowPassword = !isShowPassword"
-            />
-            <BaseIcon
-              v-else
-              class="mr-1 text-gray-500 cursor-pointer"
-              name="EyeIcon"
               @click="isShowPassword = !isShowPassword"
             />
           </template>
diff --git a/resources/scripts/admin/views/settings/mail-driver/SesMailDriver.vue b/resources/scripts/admin/views/settings/mail-driver/SesMailDriver.vue
index 5eae5a07..91f47419 100644
--- a/resources/scripts/admin/views/settings/mail-driver/SesMailDriver.vue
+++ b/resources/scripts/admin/views/settings/mail-driver/SesMailDriver.vue
@@ -154,15 +154,8 @@
         >
           <template #right>
             <BaseIcon
-              v-if="isShowPassword"
+              :name="isShowPassword ? 'EyeIcon' : 'EyeOffIcon'"
               class="mr-1 text-gray-500 cursor-pointer"
-              name="EyeOffIcon"
-              @click="isShowPassword = !isShowPassword"
-            />
-            <BaseIcon
-              v-else
-              class="mr-1 text-gray-500 cursor-pointer"
-              name="EyeIcon"
               @click="isShowPassword = !isShowPassword"
             />
           </template>
diff --git a/resources/scripts/admin/views/settings/mail-driver/SmtpMailDriver.vue b/resources/scripts/admin/views/settings/mail-driver/SmtpMailDriver.vue
index d781aed9..953de385 100644
--- a/resources/scripts/admin/views/settings/mail-driver/SmtpMailDriver.vue
+++ b/resources/scripts/admin/views/settings/mail-driver/SmtpMailDriver.vue
@@ -63,15 +63,8 @@
         >
           <template #right>
             <BaseIcon
-              v-if="isShowPassword"
+              :name="isShowPassword ? 'EyeIcon' : 'EyeOffIcon'"
               class="mr-1 text-gray-500 cursor-pointer"
-              name="EyeOffIcon"
-              @click="isShowPassword = !isShowPassword"
-            />
-            <BaseIcon
-              v-else
-              class="mr-1 text-gray-500 cursor-pointer"
-              name="EyeIcon"
               @click="isShowPassword = !isShowPassword"
             />
           </template>
diff --git a/resources/scripts/customer/views/auth/Login.vue b/resources/scripts/customer/views/auth/Login.vue
index 569ed28e..87a60e23 100644
--- a/resources/scripts/customer/views/auth/Login.vue
+++ b/resources/scripts/customer/views/auth/Login.vue
@@ -38,15 +38,8 @@
       >
         <template #right>
           <BaseIcon
-            v-if="isShowPassword"
-            name="EyeOffIcon"
-            class="w-5 h-5 mr-1 text-gray-500 cursor-pointer"
-            @click="isShowPassword = !isShowPassword"
-          />
-          <BaseIcon
-            v-else
-            name="EyeIcon"
-            class="w-5 h-5 mr-1 text-gray-500 cursor-pointer"
+            :name="isShowPassword ? 'EyeIcon' : 'EyeOffIcon'"
+            class="mr-1 text-gray-500 cursor-pointer"
             @click="isShowPassword = !isShowPassword"
           />
         </template>
diff --git a/resources/scripts/customer/views/auth/ResetPassword.vue b/resources/scripts/customer/views/auth/ResetPassword.vue
index 682a91ad..8e9095d4 100644
--- a/resources/scripts/customer/views/auth/ResetPassword.vue
+++ b/resources/scripts/customer/views/auth/ResetPassword.vue
@@ -30,18 +30,12 @@
       >
         <template #right>
           <BaseIcon
-            v-if="isShowPassword"
-            name="EyeOffIcon"
-            class="w-5 h-5 mr-1 text-gray-500 cursor-pointer"
+            :name="isShowPassword ? 'EyeIcon' : 'EyeOffIcon'"
+            class="mr-1 text-gray-500 cursor-pointer"
             @click="isShowPassword = !isShowPassword"
           />
-          <BaseIcon
-            v-else
-            name="EyeIcon"
-            class="w-5 h-5 mr-1 text-gray-500 cursor-pointer"
-            @click="isShowPassword = !isShowPassword"
-          /> </template
-      ></BaseInput>
+        </template>
+      </BaseInput>
     </BaseInputGroup>
 
     <BaseInputGroup
diff --git a/resources/scripts/customer/views/settings/CustomerSettings.vue b/resources/scripts/customer/views/settings/CustomerSettings.vue
index 7fb78d72..e17bec8c 100644
--- a/resources/scripts/customer/views/settings/CustomerSettings.vue
+++ b/resources/scripts/customer/views/settings/CustomerSettings.vue
@@ -72,18 +72,12 @@
           >
             <template #right>
               <BaseIcon
-                v-if="isShowPassword"
-                name="EyeOffIcon"
-                class="w-5 h-5 mr-1 text-gray-500 cursor-pointer"
+                :name="isShowPassword ? 'EyeIcon' : 'EyeOffIcon'"
+                class="mr-1 text-gray-500 cursor-pointer"
                 @click="isShowPassword = !isShowPassword"
               />
-              <BaseIcon
-                v-else
-                name="EyeIcon"
-                class="w-5 h-5 mr-1 text-gray-500 cursor-pointer"
-                @click="isShowPassword = !isShowPassword"
-              /> </template
-          ></BaseInput>
+            </template>
+          </BaseInput>
         </BaseInputGroup>
 
         <BaseInputGroup
@@ -101,18 +95,12 @@
           >
             <template #right>
               <BaseIcon
-                v-if="isShowConfirmPassword"
-                name="EyeOffIcon"
-                class="w-5 h-5 mr-1 text-gray-500 cursor-pointer"
+                :name="isShowConfirmPassword ? 'EyeIcon' : 'EyeOffIcon'"
+                class="mr-1 text-gray-500 cursor-pointer"
                 @click="isShowConfirmPassword = !isShowConfirmPassword"
               />
-              <BaseIcon
-                v-else
-                name="EyeIcon"
-                class="w-5 h-5 mr-1 text-gray-500 cursor-pointer"
-                @click="isShowConfirmPassword = !isShowConfirmPassword"
-              /> </template
-          ></BaseInput>
+            </template>
+          </BaseInput>
         </BaseInputGroup>
       </div>