diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index d24e5a1..935cb2f 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -24,8 +24,20 @@
                                 @endif
                             </div>
                             <div class="col-xs-6 col-xl-6">
-                                <div class="form-group {{ $errors->has('password') ? ' has-danger' : '' }}">
+                                <div class="form-group {{ $errors->has('password') ? ' has-danger' : '' }}" style="position: relative;">
                                     <input type="password" placeholder="Katalaluan" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" id="login-password" name="password" required aria-required="true">
+                                    <span 
+                                        class="input-group-text border-0 position-absolute end-0 top-0 h-100 d-flex align-items-center" 
+                                        style="cursor:pointer; z-index: 3; border-radius: 0 0.375rem 0.375rem 0; border-left: none; border: 1px solid #ced4da; background: transparent; padding: 0 12px; height: 100%; display: flex; align-items: center; box-shadow: none; top: 0; bottom: 0;"
+                                        onclick="togglePasswordVisibility('login-password', 'eyeIcon-login-password')"
+                                        tabindex="0"
+                                        aria-label="Toggle password visibility"
+                                    >
+                                        <svg id="eyeIcon-login-password" xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="#6c757d" class="bi bi-eye" viewBox="0 0 16 16">
+                                            <path d="M16 8s-3-5.5-8-5.5S0 8 0 8s3 5.5 8 5.5S16 8 16 8zM1.173 8a13.133 13.133 0 0 1 1.66-2.043C4.12 4.668 5.88 3.5 8 3.5c2.12 0 3.879 1.168 5.168 2.457A13.133 13.133 0 0 1 14.828 8c-.058.087-.122.183-.195.288-.335.48-.83 1.12-1.465 1.755C11.879 11.332 10.119 12.5 8 12.5c-2.12 0-3.879-1.168-5.168-2.457A13.134 13.134 0 0 1 1.172 8z"/>
+                                            <path d="M8 5.5a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5zM4.5 8a3.5 3.5 0 1 1 7 0 3.5 3.5 0 0 1-7 0z"/>
+                                        </svg>
+                                    </span>
                                 </div>
                                 @if ($errors->has('password'))
                                 <span class="invalid-feedback" style="display: block;margin-top:-10px !important;" role="alert">
@@ -109,5 +121,17 @@
         slides[slideIndex - 1].style.display = "block";
         setTimeout(showSlides, 10000); // Change image every 2 seconds
     }
+
+    function togglePasswordVisibility(inputId, iconId) {
+        const passwordInput = document.getElementById(inputId);
+        const eyeIcon = document.getElementById(iconId);
+        if (passwordInput.type === 'password') {
+            passwordInput.type = 'text';
+            eyeIcon.setAttribute('fill', '#12B652');
+        } else {
+            passwordInput.type = 'password';
+            eyeIcon.setAttribute('fill', '#6c757d');
+        }
+    }
 </script>
 @endsection
\ No newline at end of file
diff --git a/resources/views/auth/loginbackup.blade.php b/resources/views/auth/loginbackup.blade.php
index f0a0741..d9eaca5 100644
--- a/resources/views/auth/loginbackup.blade.php
+++ b/resources/views/auth/loginbackup.blade.php
@@ -45,11 +45,23 @@
                                 @endif
                             </div>
                             <div class="form-group{{ $errors->has('password') ? ' has-danger' : '' }}">
-                                <div class="input-group input-group-alternative">
+                                <div class="input-group input-group-alternative" style="position: relative;">
                                     <div class="input-group-prepend">
                                         <span class="input-group-text"><i class="ni ni-lock-circle-open"></i></span>
                                     </div>
-                                    <input class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" placeholder="{{ __('Password') }}" type="password" value="secret" required>
+                                    <input class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" id="password" name="password" placeholder="{{ __('Password') }}" type="password" value="secret" required>
+                                    <span 
+                                        class="input-group-text border-0 position-absolute end-0 top-0 h-100 d-flex align-items-center" 
+                                        style="cursor:pointer; z-index: 3; border-radius: 0 0.375rem 0.375rem 0; border-left: none; border: 1px solid #ced4da; background: transparent; padding: 0 12px; height: 100%; display: flex; align-items: center; box-shadow: none; top: 0; bottom: 0;"
+                                        onclick="togglePasswordVisibility('password', 'eyeIcon-password')"
+                                        tabindex="0"
+                                        aria-label="Toggle password visibility"
+                                    >
+                                        <svg id="eyeIcon-password" xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="#6c757d" class="bi bi-eye" viewBox="0 0 16 16">
+                                            <path d="M16 8s-3-5.5-8-5.5S0 8 0 8s3 5.5 8 5.5S16 8 16 8zM1.173 8a13.133 13.133 0 0 1 1.66-2.043C4.12 4.668 5.88 3.5 8 3.5c2.12 0 3.879 1.168 5.168 2.457A13.133 13.133 0 0 1 14.828 8c-.058.087-.122.183-.195.288-.335.48-.83 1.12-1.465 1.755C11.879 11.332 10.119 12.5 8 12.5c-2.12 0-3.879-1.168-5.168-2.457A13.134 13.134 0 0 1 1.172 8z"/>
+                                            <path d="M8 5.5a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5zM4.5 8a3.5 3.5 0 1 1 7 0 3.5 3.5 0 0 1-7 0z"/>
+                                        </svg>
+                                    </span>
                                 </div>
                                 @if ($errors->has('password'))
                                     <span class="invalid-feedback" style="display: block;" role="alert">
@@ -86,4 +98,18 @@
             </div>
         </div>
     </div>
+
+<script>
+function togglePasswordVisibility(inputId, iconId) {
+    const passwordInput = document.getElementById(inputId);
+    const eyeIcon = document.getElementById(iconId);
+    if (passwordInput.type === 'password') {
+        passwordInput.type = 'text';
+        eyeIcon.setAttribute('fill', '#12B652');
+    } else {
+        passwordInput.type = 'password';
+        eyeIcon.setAttribute('fill', '#6c757d');
+    }
+}
+</script>
 @endsection
diff --git a/resources/views/auth/passwords/confirm.blade.php b/resources/views/auth/passwords/confirm.blade.php
index ca78fc1..5bfdb45 100644
--- a/resources/views/auth/passwords/confirm.blade.php
+++ b/resources/views/auth/passwords/confirm.blade.php
@@ -16,8 +16,20 @@
                         <div class="form-group row">
                             <label for="password" class="col-md-4 col-form-label text-md-right">{{ __('Password') }}</label>
 
-                            <div class="col-md-6">
+                            <div class="col-md-6" style="position: relative;">
                                 <input id="password" type="password" class="form-control @error('password') is-invalid @enderror" name="password" required autocomplete="current-password">
+                                <span 
+                                    class="input-group-text border-0 position-absolute end-0 top-0 h-100 d-flex align-items-center" 
+                                    style="cursor:pointer; z-index: 3; border-radius: 0 0.375rem 0.375rem 0; border-left: none; border: 1px solid #ced4da; background: transparent; padding: 0 12px; height: 100%; display: flex; align-items: center; box-shadow: none; top: 0; bottom: 0;"
+                                    onclick="togglePasswordVisibility('password', 'eyeIcon-password')"
+                                    tabindex="0"
+                                    aria-label="Toggle password visibility"
+                                >
+                                    <svg id="eyeIcon-password" xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="#6c757d" class="bi bi-eye" viewBox="0 0 16 16">
+                                        <path d="M16 8s-3-5.5-8-5.5S0 8 0 8s3 5.5 8 5.5S16 8 16 8zM1.173 8a13.133 13.133 0 0 1 1.66-2.043C4.12 4.668 5.88 3.5 8 3.5c2.12 0 3.879 1.168 5.168 2.457A13.133 13.133 0 0 1 14.828 8c-.058.087-.122.183-.195.288-.335.48-.83 1.12-1.465 1.755C11.879 11.332 10.119 12.5 8 12.5c-2.12 0-3.879-1.168-5.168-2.457A13.134 13.134 0 0 1 1.172 8z"/>
+                                        <path d="M8 5.5a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5zM4.5 8a3.5 3.5 0 1 1 7 0 3.5 3.5 0 0 1-7 0z"/>
+                                    </svg>
+                                </span>
 
                                 @error('password')
                                     <span class="invalid-feedback" role="alert">
@@ -46,4 +58,18 @@
         </div>
     </div>
 </div>
+
+<script>
+function togglePasswordVisibility(inputId, iconId) {
+    const passwordInput = document.getElementById(inputId);
+    const eyeIcon = document.getElementById(iconId);
+    if (passwordInput.type === 'password') {
+        passwordInput.type = 'text';
+        eyeIcon.setAttribute('fill', '#12B652');
+    } else {
+        passwordInput.type = 'password';
+        eyeIcon.setAttribute('fill', '#6c757d');
+    }
+}
+</script>
 @endsection
diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php
index cbcd2d2..f698af2 100644
--- a/resources/views/auth/passwords/reset.blade.php
+++ b/resources/views/auth/passwords/reset.blade.php
@@ -19,8 +19,20 @@
     </span>
     @endif
 
-    <div class="input-group input-group-outline {{ $errors->has('password') ? ' has-danger' : '' }}">
+    <div class="input-group input-group-outline {{ $errors->has('password') ? ' has-danger' : '' }}" style="position: relative;">
         <input id="password" onKeyUp="checkPasswordStrength();" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" placeholder="{{ __('Password') }}" type="password" required>
+        <span 
+            class="input-group-text border-0 position-absolute end-0 top-0 h-100 d-flex align-items-center" 
+            style="cursor:pointer; z-index: 3; border-radius: 0 0.375rem 0.375rem 0; border-left: none; border: 1px solid #ced4da; background: transparent; padding: 0 12px; height: 100%; display: flex; align-items: center; box-shadow: none; top: 0; bottom: 0;"
+            onclick="togglePasswordVisibility('password', 'eyeIcon-password')"
+            tabindex="0"
+            aria-label="Toggle password visibility"
+        >
+            <svg id="eyeIcon-password" xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="#6c757d" class="bi bi-eye" viewBox="0 0 16 16">
+                <path d="M16 8s-3-5.5-8-5.5S0 8 0 8s3 5.5 8 5.5S16 8 16 8zM1.173 8a13.133 13.133 0 0 1 1.66-2.043C4.12 4.668 5.88 3.5 8 3.5c2.12 0 3.879 1.168 5.168 2.457A13.133 13.133 0 0 1 14.828 8c-.058.087-.122.183-.195.288-.335.48-.83 1.12-1.465 1.755C11.879 11.332 10.119 12.5 8 12.5c-2.12 0-3.879-1.168-5.168-2.457A13.134 13.134 0 0 1 1.172 8z"/>
+                <path d="M8 5.5a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5zM4.5 8a3.5 3.5 0 1 1 7 0 3.5 3.5 0 0 1-7 0z"/>
+            </svg>
+        </span>
     </div>
     @if ($errors->has('password'))
     <span class="invalid-feedback" role="alert">
@@ -31,11 +43,22 @@
         <small>{{ __('password strength') }}: <span class="text-muted font-weight-700" id="password-strength-status">none</span></small>
     </div>
 
-    <div class="input-group input-group-outline my-3">
+    <div class="input-group input-group-outline my-3" style="position: relative;">
         <div class="input-group input-group-alternative">
-
-            <input class="form-control" placeholder="{{ __('Confirm Password') }}" type="password" name="password_confirmation" required>
+            <input class="form-control" id="password_confirmation" placeholder="{{ __('Confirm Password') }}" type="password" name="password_confirmation" required>
         </div>
+        <span 
+            class="input-group-text border-0 position-absolute end-0 top-0 h-100 d-flex align-items-center" 
+            style="cursor:pointer; z-index: 3; border-radius: 0 0.375rem 0.375rem 0; border-left: none; border: 1px solid #ced4da; background: transparent; padding: 0 12px; height: 100%; display: flex; align-items: center; box-shadow: none; top: 0; bottom: 0;"
+            onclick="togglePasswordVisibility('password_confirmation', 'eyeIcon-password_confirmation')"
+            tabindex="0"
+            aria-label="Toggle password visibility"
+        >
+            <svg id="eyeIcon-password_confirmation" xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="#6c757d" class="bi bi-eye" viewBox="0 0 16 16">
+                <path d="M16 8s-3-5.5-8-5.5S0 8 0 8s3 5.5 8 5.5S16 8 16 8zM1.173 8a13.133 13.133 0 0 1 1.66-2.043C4.12 4.668 5.88 3.5 8 3.5c2.12 0 3.879 1.168 5.168 2.457A13.133 13.133 0 0 1 14.828 8c-.058.087-.122.183-.195.288-.335.48-.83 1.12-1.465 1.755C11.879 11.332 10.119 12.5 8 12.5c-2.12 0-3.879-1.168-5.168-2.457A13.134 13.134 0 0 1 1.172 8z"/>
+                <path d="M8 5.5a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5zM4.5 8a3.5 3.5 0 1 1 7 0 3.5 3.5 0 0 1-7 0z"/>
+            </svg>
+        </span>
     </div>
 
     <div class="text-center">
@@ -68,6 +91,18 @@
             }
         }
     }
+
+    function togglePasswordVisibility(inputId, iconId) {
+        const passwordInput = document.getElementById(inputId);
+        const eyeIcon = document.getElementById(iconId);
+        if (passwordInput.type === 'password') {
+            passwordInput.type = 'text';
+            eyeIcon.setAttribute('fill', '#12B652');
+        } else {
+            passwordInput.type = 'password';
+            eyeIcon.setAttribute('fill', '#6c757d');
+        }
+    }
 </script>
 
 @endsection
\ No newline at end of file
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index 46aabf6..eca32ae 100644
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -45,11 +45,23 @@
 
                             <div class="row">
                                 <div class="col-6 form-group{{ $errors->has('password') ? ' has-danger' : '' }}">
-                                    <div class="input-group ">
+                                    <div class="input-group" style="position: relative;">
                                         <div class="input-group-prepend">
                                             <span class="input-group-text"><i class="ni ni-lock-circle-open"></i></span>
                                         </div>
                                         <input id="password" onKeyUp="checkPasswordStrength();" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" placeholder="{{ __('Password') }}" type="password" name="password" required>
+                                        <span 
+                                            class="input-group-text border-0 position-absolute end-0 top-0 h-100 d-flex align-items-center" 
+                                            style="cursor:pointer; z-index: 3; border-radius: 0 0.375rem 0.375rem 0; border-left: none; border: 1px solid #ced4da; background: transparent; padding: 0 12px; height: 100%; display: flex; align-items: center; box-shadow: none; top: 0; bottom: 0;"
+                                            onclick="togglePasswordVisibility('password', 'eyeIcon-password')"
+                                            tabindex="0"
+                                            aria-label="Toggle password visibility"
+                                        >
+                                            <svg id="eyeIcon-password" xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="#6c757d" class="bi bi-eye" viewBox="0 0 16 16">
+                                                <path d="M16 8s-3-5.5-8-5.5S0 8 0 8s3 5.5 8 5.5S16 8 16 8zM1.173 8a13.133 13.133 0 0 1 1.66-2.043C4.12 4.668 5.88 3.5 8 3.5c2.12 0 3.879 1.168 5.168 2.457A13.133 13.133 0 0 1 14.828 8c-.058.087-.122.183-.195.288-.335.48-.83 1.12-1.465 1.755C11.879 11.332 10.119 12.5 8 12.5c-2.12 0-3.879-1.168-5.168-2.457A13.134 13.134 0 0 1 1.172 8z"/>
+                                                <path d="M8 5.5a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5zM4.5 8a3.5 3.5 0 1 1 7 0 3.5 3.5 0 0 1-7 0z"/>
+                                            </svg>
+                                        </span>
                                     </div>
                                     @if ($errors->has('password'))
                                         <span class="invalid-feedback" style="display: block;" role="alert">
@@ -58,11 +70,23 @@
                                     @endif
                                 </div>
                                 <div class="col-6 form-group">
-                                    <div class="input-group ">
+                                    <div class="input-group" style="position: relative;">
                                         <div class="input-group-prepend">
                                             <span class="input-group-text"><i class="ni ni-lock-circle-open"></i></span>
                                         </div>
-                                        <input name="password_confirmation" class="form-control" placeholder="{{ __('Confirm Password') }}" type="password"  required>
+                                        <input name="password_confirmation" id="password_confirmation" class="form-control" placeholder="{{ __('Confirm Password') }}" type="password"  required>
+                                        <span 
+                                            class="input-group-text border-0 position-absolute end-0 top-0 h-100 d-flex align-items-center" 
+                                            style="cursor:pointer; z-index: 3; border-radius: 0 0.375rem 0.375rem 0; border-left: none; border: 1px solid #ced4da; background: transparent; padding: 0 12px; height: 100%; display: flex; align-items: center; box-shadow: none; top: 0; bottom: 0;"
+                                            onclick="togglePasswordVisibility('password_confirmation', 'eyeIcon-password_confirmation')"
+                                            tabindex="0"
+                                            aria-label="Toggle password visibility"
+                                        >
+                                            <svg id="eyeIcon-password_confirmation" xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="#6c757d" class="bi bi-eye" viewBox="0 0 16 16">
+                                                <path d="M16 8s-3-5.5-8-5.5S0 8 0 8s3 5.5 8 5.5S16 8 16 8zM1.173 8a13.133 13.133 0 0 1 1.66-2.043C4.12 4.668 5.88 3.5 8 3.5c2.12 0 3.879 1.168 5.168 2.457A13.133 13.133 0 0 1 14.828 8c-.058.087-.122.183-.195.288-.335.48-.83 1.12-1.465 1.755C11.879 11.332 10.119 12.5 8 12.5c-2.12 0-3.879-1.168-5.168-2.457A13.134 13.134 0 0 1 1.172 8z"/>
+                                                <path d="M8 5.5a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5zM4.5 8a3.5 3.5 0 1 1 7 0 3.5 3.5 0 0 1-7 0z"/>
+                                            </svg>
+                                        </span>
                                     </div>
                                 </div>
                             </div>
@@ -212,6 +236,18 @@
     setTimeout(showSlides, 10000); // Change image every 2 seconds
     }
 
+    function togglePasswordVisibility(inputId, iconId) {
+        const passwordInput = document.getElementById(inputId);
+        const eyeIcon = document.getElementById(iconId);
+        if (passwordInput.type === 'password') {
+            passwordInput.type = 'text';
+            eyeIcon.setAttribute('fill', '#12B652');
+        } else {
+            passwordInput.type = 'password';
+            eyeIcon.setAttribute('fill', '#6c757d');
+        }
+    }
+
 </script>        
         <!-- END : LOGIN PAGE 5-2 -->
         <!--[if lt IE 9]>
diff --git a/resources/views/auth/registerportal.blade.php b/resources/views/auth/registerportal.blade.php
index 8a8228b..d5da93b 100644
--- a/resources/views/auth/registerportal.blade.php
+++ b/resources/views/auth/registerportal.blade.php
@@ -31,8 +31,20 @@
     @endif
 
     <!-- password -->
-    <div class="input-group input-group-outline {{ $errors->has('password') ? ' has-danger' : '' }}">
+    <div class="input-group input-group-outline {{ $errors->has('password') ? ' has-danger' : '' }}" style="position: relative;">
         <input id="password" onKeyUp="checkPasswordStrength();" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" placeholder="{{ __('Kata Laluan') }}" type="password" name="password" required>
+        <span 
+            class="input-group-text border-0 position-absolute end-0 top-0 h-100 d-flex align-items-center" 
+            style="cursor:pointer; z-index: 3; border-radius: 0 0.375rem 0.375rem 0; border-left: none; border: 1px solid #ced4da; background: transparent; padding: 0 12px; height: 100%; display: flex; align-items: center; box-shadow: none; top: 0; bottom: 0;"
+            onclick="togglePasswordVisibility('password', 'eyeIcon-password')"
+            tabindex="0"
+            aria-label="Toggle password visibility"
+        >
+            <svg id="eyeIcon-password" xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="#6c757d" class="bi bi-eye" viewBox="0 0 16 16">
+                <path d="M16 8s-3-5.5-8-5.5S0 8 0 8s3 5.5 8 5.5S16 8 16 8zM1.173 8a13.133 13.133 0 0 1 1.66-2.043C4.12 4.668 5.88 3.5 8 3.5c2.12 0 3.879 1.168 5.168 2.457A13.133 13.133 0 0 1 14.828 8c-.058.087-.122.183-.195.288-.335.48-.83 1.12-1.465 1.755C11.879 11.332 10.119 12.5 8 12.5c-2.12 0-3.879-1.168-5.168-2.457A13.134 13.134 0 0 1 1.172 8z"/>
+                <path d="M8 5.5a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5zM4.5 8a3.5 3.5 0 1 1 7 0 3.5 3.5 0 0 1-7 0z"/>
+            </svg>
+        </span>
     </div>
     @if ($errors->has('password'))
     <span class="invalid-feedback" style="display: block;" role="alert">
@@ -44,8 +56,20 @@
     </div>
 
     <!-- confirmation password -->
-    <div class="input-group input-group-outline mb-3">
-        <input name="password_confirmation" class="form-control" placeholder="{{ __('Sahkan Kata Laluan') }}" type="password" required>
+    <div class="input-group input-group-outline mb-3" style="position: relative;">
+        <input name="password_confirmation" id="password_confirmation" class="form-control" placeholder="{{ __('Sahkan Kata Laluan') }}" type="password" required>
+        <span 
+            class="input-group-text border-0 position-absolute end-0 top-0 h-100 d-flex align-items-center" 
+            style="cursor:pointer; z-index: 3; border-radius: 0 0.375rem 0.375rem 0; border-left: none; border: 1px solid #ced4da; background: transparent; padding: 0 12px; height: 100%; display: flex; align-items: center; box-shadow: none; top: 0; bottom: 0;"
+            onclick="togglePasswordVisibility('password_confirmation', 'eyeIcon-password_confirmation')"
+            tabindex="0"
+            aria-label="Toggle password visibility"
+        >
+            <svg id="eyeIcon-password_confirmation" xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="#6c757d" class="bi bi-eye" viewBox="0 0 16 16">
+                <path d="M16 8s-3-5.5-8-5.5S0 8 0 8s3 5.5 8 5.5S16 8 16 8zM1.173 8a13.133 13.133 0 0 1 1.66-2.043C4.12 4.668 5.88 3.5 8 3.5c2.12 0 3.879 1.168 5.168 2.457A13.133 13.133 0 0 1 14.828 8c-.058.087-.122.183-.195.288-.335.48-.83 1.12-1.465 1.755C11.879 11.332 10.119 12.5 8 12.5c-2.12 0-3.879-1.168-5.168-2.457A13.134 13.134 0 0 1 1.172 8z"/>
+                <path d="M8 5.5a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5zM4.5 8a3.5 3.5 0 1 1 7 0 3.5 3.5 0 0 1-7 0z"/>
+            </svg>
+        </span>
     </div>
 
     <div>
@@ -178,5 +202,17 @@
     //     slides[slideIndex - 1].style.display = "block";
     //     setTimeout(showSlides, 10000); // Change image every 2 seconds
     // }
+
+    function togglePasswordVisibility(inputId, iconId) {
+        const passwordInput = document.getElementById(inputId);
+        const eyeIcon = document.getElementById(iconId);
+        if (passwordInput.type === 'password') {
+            passwordInput.type = 'text';
+            eyeIcon.setAttribute('fill', '#12B652');
+        } else {
+            passwordInput.type = 'password';
+            eyeIcon.setAttribute('fill', '#6c757d');
+        }
+    }
 </script>
 @endsection
\ No newline at end of file
diff --git a/resources/views/includes/profile.blade.php b/resources/views/includes/profile.blade.php
index a69a4cc..7cc4b68 100644
--- a/resources/views/includes/profile.blade.php
+++ b/resources/views/includes/profile.blade.php
@@ -117,9 +117,21 @@
                             </div>
 
                             <div class="col-12">
-                                <div class="form-group{{ $errors->has('old_password') ? ' has-danger' : '' }} input-group input-group-static mb-4">
+                                <div class="form-group{{ $errors->has('old_password') ? ' has-danger' : '' }} input-group input-group-static mb-4" style="position: relative;">
                                     <label class="form-control-label" for="input-current-password">{{ __('Kata Laluan Semasa') }}</label>
                                     <input type="password" name="old_password" id="input-current-password" class="form-control form-control-alternative{{ $errors->has('old_password') ? ' is-invalid' : '' }}" placeholder="Kata laluan Semasa" value="" required>
+                                    <span 
+                                        class="input-group-text border-0 position-absolute end-0 top-50 translate-middle-y d-flex align-items-center" 
+                                        style="cursor:pointer; z-index: 3; border-radius: 0 0.375rem 0.375rem 0; border-left: none; border: 1px solid #ced4da; background: transparent; padding: 0 12px; height: calc(100% - 26px); display: flex; align-items: center; box-shadow: none;"
+                                        onclick="togglePasswordVisibility('input-current-password', 'eyeIcon-current-password')"
+                                        tabindex="0"
+                                        aria-label="Toggle password visibility"
+                                    >
+                                        <svg id="eyeIcon-current-password" xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="#6c757d" class="bi bi-eye" viewBox="0 0 16 16">
+                                            <path d="M16 8s-3-5.5-8-5.5S0 8 0 8s3 5.5 8 5.5S16 8 16 8zM1.173 8a13.133 13.133 0 0 1 1.66-2.043C4.12 4.668 5.88 3.5 8 3.5c2.12 0 3.879 1.168 5.168 2.457A13.133 13.133 0 0 1 14.828 8c-.058.087-.122.183-.195.288-.335.48-.83 1.12-1.465 1.755C11.879 11.332 10.119 12.5 8 12.5c-2.12 0-3.879-1.168-5.168-2.457A13.134 13.134 0 0 1 1.172 8z"/>
+                                            <path d="M8 5.5a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5zM4.5 8a3.5 3.5 0 1 1 7 0 3.5 3.5 0 0 1-7 0z"/>
+                                        </svg>
+                                    </span>
 
                                     @if ($errors->has('old_password'))
                                     <span class="invalid-feedback" role="alert">
@@ -130,9 +142,21 @@
                             </div>
                             <div class="col-12">
 
-                                <div class="form-group{{ $errors->has('password') ? ' has-danger' : '' }} input-group input-group-static mb-4">
+                                <div class="form-group{{ $errors->has('password') ? ' has-danger' : '' }} input-group input-group-static mb-4" style="position: relative;">
                                     <label class="form-control-label" for="input-password">{{ __('Kata Laluan Baharu') }}</label>
                                     <input type="password" name="password" id="input-password" class="form-control form-control-alternative{{ $errors->has('password') ? ' is-invalid' : '' }}" placeholder="Masukkan kata laluan baharu" value="" required>
+                                    <span 
+                                        class="input-group-text border-0 position-absolute end-0 top-50 translate-middle-y d-flex align-items-center" 
+                                        style="cursor:pointer; z-index: 3; border-radius: 0 0.375rem 0.375rem 0; border-left: none; border: 1px solid #ced4da; background: transparent; padding: 0 12px; height: calc(100% - 26px); display: flex; align-items: center; box-shadow: none;"
+                                        onclick="togglePasswordVisibility('input-password', 'eyeIcon-new-password')"
+                                        tabindex="0"
+                                        aria-label="Toggle password visibility"
+                                    >
+                                        <svg id="eyeIcon-new-password" xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="#6c757d" class="bi bi-eye" viewBox="0 0 16 16">
+                                            <path d="M16 8s-3-5.5-8-5.5S0 8 0 8s3 5.5 8 5.5S16 8 16 8zM1.173 8a13.133 13.133 0 0 1 1.66-2.043C4.12 4.668 5.88 3.5 8 3.5c2.12 0 3.879 1.168 5.168 2.457A13.133 13.133 0 0 1 14.828 8c-.058.087-.122.183-.195.288-.335.48-.83 1.12-1.465 1.755C11.879 11.332 10.119 12.5 8 12.5c-2.12 0-3.879-1.168-5.168-2.457A13.134 13.134 0 0 1 1.172 8z"/>
+                                            <path d="M8 5.5a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5zM4.5 8a3.5 3.5 0 1 1 7 0 3.5 3.5 0 0 1-7 0z"/>
+                                        </svg>
+                                    </span>
 
                                     @if ($errors->has('password'))
                                     <span class="invalid-feedback" role="alert">
@@ -140,9 +164,21 @@
                                     </span>
                                     @endif
                                 </div>
-                                <div class="form-group input-group input-group-static mb-4">
+                                <div class="form-group input-group input-group-static mb-4" style="position: relative;">
                                     <label class="form-control-label" for="input-password-confirmation">{{ __('Sahkan Kata Laluan Baharu') }}</label>
                                     <input type="password" name="password_confirmation" id="input-password-confirmation" class="form-control form-control-alternative" placeholder="Mengesahkan kata laluan baharu" value="" required>
+                                    <span 
+                                        class="input-group-text border-0 position-absolute end-0 top-50 translate-middle-y d-flex align-items-center" 
+                                        style="cursor:pointer; z-index: 3; border-radius: 0 0.375rem 0.375rem 0; border-left: none; border: 1px solid #ced4da; background: transparent; padding: 0 12px; height: calc(100% - 26px); display: flex; align-items: center; box-shadow: none;"
+                                        onclick="togglePasswordVisibility('input-password-confirmation', 'eyeIcon-confirm-password')"
+                                        tabindex="0"
+                                        aria-label="Toggle password visibility"
+                                    >
+                                        <svg id="eyeIcon-confirm-password" xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="#6c757d" class="bi bi-eye" viewBox="0 0 16 16">
+                                            <path d="M16 8s-3-5.5-8-5.5S0 8 0 8s3 5.5 8 5.5S16 8 16 8zM1.173 8a13.133 13.133 0 0 1 1.66-2.043C4.12 4.668 5.88 3.5 8 3.5c2.12 0 3.879 1.168 5.168 2.457A13.133 13.133 0 0 1 14.828 8c-.058.087-.122.183-.195.288-.335.48-.83 1.12-1.465 1.755C11.879 11.332 10.119 12.5 8 12.5c-2.12 0-3.879-1.168-5.168-2.457A13.134 13.134 0 0 1 1.172 8z"/>
+                                            <path d="M8 5.5a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5zM4.5 8a3.5 3.5 0 1 1 7 0 3.5 3.5 0 0 1-7 0z"/>
+                                        </svg>
+                                    </span>
                                 </div>
 
                             </div>
@@ -171,4 +207,18 @@
 </div>
 </div>
 
+<script>
+function togglePasswordVisibility(inputId, iconId) {
+    const passwordInput = document.getElementById(inputId);
+    const eyeIcon = document.getElementById(iconId);
+    if (passwordInput.type === 'password') {
+        passwordInput.type = 'text';
+        eyeIcon.setAttribute('fill', '#12B652');
+    } else {
+        passwordInput.type = 'password';
+        eyeIcon.setAttribute('fill', '#6c757d');
+    }
+}
+</script>
+
 @endsection
\ No newline at end of file
diff --git a/resources/views/profile/edit.blade.php b/resources/views/profile/edit.blade.php
index aa79c5c..5acb3af 100644
--- a/resources/views/profile/edit.blade.php
+++ b/resources/views/profile/edit.blade.php
@@ -98,9 +98,21 @@
                         @endif
 
                         <div class="pl-lg-4">
-                            <div class="form-group{{ $errors->has('old_password') ? ' has-danger' : '' }}">
+                            <div class="form-group{{ $errors->has('old_password') ? ' has-danger' : '' }}" style="position: relative;">
                                 <label class="form-control-label" for="input-current-password">{{ __('Current Password') }}</label>
                                 <input type="password" name="old_password" id="input-current-password" class="form-control form-control-alternative{{ $errors->has('old_password') ? ' is-invalid' : '' }}" placeholder="{{ __('Current Password') }}" value="" required>
+                                <span 
+                                    class="input-group-text border-0 position-absolute end-0 top-50 translate-middle-y d-flex align-items-center" 
+                                    style="cursor:pointer; z-index: 3; border-radius: 0 0.375rem 0.375rem 0; border-left: none; border: 1px solid #ced4da; background: transparent; padding: 0 12px; height: calc(100% - 26px); display: flex; align-items: center; box-shadow: none;"
+                                    onclick="togglePasswordVisibility('input-current-password', 'eyeIcon-current-password')"
+                                    tabindex="0"
+                                    aria-label="Toggle password visibility"
+                                >
+                                    <svg id="eyeIcon-current-password" xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="#6c757d" class="bi bi-eye" viewBox="0 0 16 16">
+                                        <path d="M16 8s-3-5.5-8-5.5S0 8 0 8s3 5.5 8 5.5S16 8 16 8zM1.173 8a13.133 13.133 0 0 1 1.66-2.043C4.12 4.668 5.88 3.5 8 3.5c2.12 0 3.879 1.168 5.168 2.457A13.133 13.133 0 0 1 14.828 8c-.058.087-.122.183-.195.288-.335.48-.83 1.12-1.465 1.755C11.879 11.332 10.119 12.5 8 12.5c-2.12 0-3.879-1.168-5.168-2.457A13.134 13.134 0 0 1 1.172 8z"/>
+                                        <path d="M8 5.5a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5zM4.5 8a3.5 3.5 0 1 1 7 0 3.5 3.5 0 0 1-7 0z"/>
+                                    </svg>
+                                </span>
 
                                 @if ($errors->has('old_password'))
                                 <span class="invalid-feedback" role="alert">
@@ -108,9 +120,21 @@
                                 </span>
                                 @endif
                             </div>
-                            <div class="form-group{{ $errors->has('password') ? ' has-danger' : '' }}">
+                            <div class="form-group{{ $errors->has('password') ? ' has-danger' : '' }}" style="position: relative;">
                                 <label class="form-control-label" for="input-password">{{ __('New Password') }}</label>
                                 <input type="password" name="password" id="input-password" class="form-control form-control-alternative{{ $errors->has('password') ? ' is-invalid' : '' }}" placeholder="{{ __('New Password') }}" value="" required>
+                                <span 
+                                    class="input-group-text border-0 position-absolute end-0 top-50 translate-middle-y d-flex align-items-center" 
+                                    style="cursor:pointer; z-index: 3; border-radius: 0 0.375rem 0.375rem 0; border-left: none; border: 1px solid #ced4da; background: transparent; padding: 0 12px; height: calc(100% - 26px); display: flex; align-items: center; box-shadow: none;"
+                                    onclick="togglePasswordVisibility('input-password', 'eyeIcon-new-password')"
+                                    tabindex="0"
+                                    aria-label="Toggle password visibility"
+                                >
+                                    <svg id="eyeIcon-new-password" xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="#6c757d" class="bi bi-eye" viewBox="0 0 16 16">
+                                        <path d="M16 8s-3-5.5-8-5.5S0 8 0 8s3 5.5 8 5.5S16 8 16 8zM1.173 8a13.133 13.133 0 0 1 1.66-2.043C4.12 4.668 5.88 3.5 8 3.5c2.12 0 3.879 1.168 5.168 2.457A13.133 13.133 0 0 1 14.828 8c-.058.087-.122.183-.195.288-.335.48-.83 1.12-1.465 1.755C11.879 11.332 10.119 12.5 8 12.5c-2.12 0-3.879-1.168-5.168-2.457A13.134 13.134 0 0 1 1.172 8z"/>
+                                        <path d="M8 5.5a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5zM4.5 8a3.5 3.5 0 1 1 7 0 3.5 3.5 0 0 1-7 0z"/>
+                                    </svg>
+                                </span>
 
                                 @if ($errors->has('password'))
                                 <span class="invalid-feedback" role="alert">
@@ -118,9 +142,21 @@
                                 </span>
                                 @endif
                             </div>
-                            <div class="form-group">
+                            <div class="form-group" style="position: relative;">
                                 <label class="form-control-label" for="input-password-confirmation">{{ __('Confirm New Password') }}</label>
                                 <input type="password" name="password_confirmation" id="input-password-confirmation" class="form-control form-control-alternative" placeholder="{{ __('Confirm New Password') }}" value="" required>
+                                <span 
+                                    class="input-group-text border-0 position-absolute end-0 top-50 translate-middle-y d-flex align-items-center" 
+                                    style="cursor:pointer; z-index: 3; border-radius: 0 0.375rem 0.375rem 0; border-left: none; border: 1px solid #ced4da; background: transparent; padding: 0 12px; height: calc(100% - 26px); display: flex; align-items: center; box-shadow: none;"
+                                    onclick="togglePasswordVisibility('input-password-confirmation', 'eyeIcon-confirm-password')"
+                                    tabindex="0"
+                                    aria-label="Toggle password visibility"
+                                >
+                                    <svg id="eyeIcon-confirm-password" xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="#6c757d" class="bi bi-eye" viewBox="0 0 16 16">
+                                        <path d="M16 8s-3-5.5-8-5.5S0 8 0 8s3 5.5 8 5.5S16 8 16 8zM1.173 8a13.133 13.133 0 0 1 1.66-2.043C4.12 4.668 5.88 3.5 8 3.5c2.12 0 3.879 1.168 5.168 2.457A13.133 13.133 0 0 1 14.828 8c-.058.087-.122.183-.195.288-.335.48-.83 1.12-1.465 1.755C11.879 11.332 10.119 12.5 8 12.5c-2.12 0-3.879-1.168-5.168-2.457A13.134 13.134 0 0 1 1.172 8z"/>
+                                        <path d="M8 5.5a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5zM4.5 8a3.5 3.5 0 1 1 7 0 3.5 3.5 0 0 1-7 0z"/>
+                                    </svg>
+                                </span>
                             </div>
 
                             <div class="text-center">
@@ -137,4 +173,18 @@
 
 {{-- @include('layouts.footers.auth') --}}
 </div>
+
+<script>
+function togglePasswordVisibility(inputId, iconId) {
+    const passwordInput = document.getElementById(inputId);
+    const eyeIcon = document.getElementById(iconId);
+    if (passwordInput.type === 'password') {
+        passwordInput.type = 'text';
+        eyeIcon.setAttribute('fill', '#12B652');
+    } else {
+        passwordInput.type = 'password';
+        eyeIcon.setAttribute('fill', '#6c757d');
+    }
+}
+</script>
 @endsection
\ No newline at end of file