diff --git a/assets/css/frontend-forms.css b/assets/css/frontend-forms.css
index 036a963a1..6d14755f2 100644
--- a/assets/css/frontend-forms.css
+++ b/assets/css/frontend-forms.css
@@ -1833,3 +1833,9 @@ body .wpuf-attachment-upload-filelist + .moxie-shim {
 .iti--allow-dropdown input[type="text"] {
   padding-left: 52px !important;
 }
+img.wpuf-eye {
+  position: absolute;
+  right: 0;
+  top: 50%;
+  transform: translateY(-50%) translateX(-6%);
+}
diff --git a/assets/images/eye-close.svg b/assets/images/eye-close.svg
new file mode 100644
index 000000000..ab7400f68
--- /dev/null
+++ b/assets/images/eye-close.svg
@@ -0,0 +1,3 @@
+<svg width="18" height="10" viewBox="0 0 24 17" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.89432 17.2145C3.46829 17.6405 3.46829 18.3312 3.89432 18.7573C4.32035 19.1833 5.01107 19.1833 5.4371 18.7573L8.32366 15.8707C9.4885 16.2173 10.7224 16.4034 12 16.4034C17.4545 16.4034 22.1127 13.0107 24 8.22162C23.2794 6.39314 22.1549 4.7682 20.7364 3.45793L22.3321 1.8623C22.7581 1.43627 22.7581 0.745546 22.3321 0.319519C21.906 -0.106507 21.2153 -0.106506 20.7893 0.31952L3.89432 17.2145ZM17.2934 6.90099L15.1754 9.01896C14.8841 10.1879 13.9662 11.1057 12.7973 11.397L10.6794 13.515C11.1023 13.6203 11.5447 13.6762 12 13.6762C15.0109 13.6762 17.4545 11.2325 17.4545 8.22162C17.4545 7.76627 17.3987 7.3239 17.2934 6.90099ZM8.86331 9.16058L12.939 5.08494C12.6417 4.99642 12.3265 4.9489 12 4.9489C10.1891 4.9489 8.72727 6.41071 8.72727 8.22162C8.72727 8.54813 8.77479 8.86329 8.86331 9.16058ZM12 2.76708C12.9406 2.76708 13.8259 3.00557 14.5986 3.42534L16.9836 1.04027C15.4508 0.395923 13.7672 0.0398042 12 0.0398042C6.54545 0.0398042 1.88727 3.43253 0 8.22162C0.87726 10.4477 2.35322 12.3721 4.22957 13.7943L7.20371 10.8202C6.78394 10.0475 6.54545 9.16224 6.54545 8.22162C6.54545 5.21071 8.98909 2.76708 12 2.76708Z" fill="black"/>
+</svg>
diff --git a/assets/images/eye.svg b/assets/images/eye.svg
new file mode 100644
index 000000000..08958c07b
--- /dev/null
+++ b/assets/images/eye.svg
@@ -0,0 +1,3 @@
+<svg width="18" height="10" viewBox="0 0 24 17" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 0C6.54545 0 1.88727 3.39273 0 8.18182C1.88727 12.9709 6.54545 16.3636 12 16.3636C17.4545 16.3636 22.1127 12.9709 24 8.18182C22.1127 3.39273 17.4545 0 12 0ZM12 13.6364C8.98909 13.6364 6.54545 11.1927 6.54545 8.18182C6.54545 5.17091 8.98909 2.72727 12 2.72727C15.0109 2.72727 17.4545 5.17091 17.4545 8.18182C17.4545 11.1927 15.0109 13.6364 12 13.6364ZM12 4.90909C10.1891 4.90909 8.72727 6.37091 8.72727 8.18182C8.72727 9.99273 10.1891 11.4545 12 11.4545C13.8109 11.4545 15.2727 9.99273 15.2727 8.18182C15.2727 6.37091 13.8109 4.90909 12 4.90909Z" fill="black"/>
+</svg>
diff --git a/assets/js/frontend-form.js b/assets/js/frontend-form.js
index 94304b736..b22dc9624 100644
--- a/assets/js/frontend-form.js
+++ b/assets/js/frontend-form.js
@@ -1492,4 +1492,19 @@
         // Set name attribute for google map search field
         $(".wpuf-form-add #wpuf-map-add-location").attr("name", "find_address");
     });
+
+    $(function($) {
+        // eye icon for password field
+        $(document).on('click', '.wpuf-eye', function () {
+            const input = $( this ).siblings( 'input' );
+
+            if ( input.attr("type") === "password" ) {
+                input.attr( "type", "text" );
+                $( this ).attr( "src", wpuf_frontend.asset_url + '/images/eye-close.svg' );
+            } else {
+                input.attr( "type", "password" );
+                $( this ).attr( "src", wpuf_frontend.asset_url + '/images/eye.svg' );
+            }
+        });
+    });
 })(jQuery, window);
diff --git a/assets/less/frontend-forms.less b/assets/less/frontend-forms.less
index 4711939cb..06f637d1e 100644
--- a/assets/less/frontend-forms.less
+++ b/assets/less/frontend-forms.less
@@ -2121,3 +2121,10 @@ ul.wpuf-form{
 .iti--allow-dropdown input[type="text"] {
     padding-left: 52px !important;
 }
+
+img.wpuf-eye {
+    position: absolute;
+    right: 0;
+    top: 50%;
+    transform: translateY(-50%) translateX(-6%);
+}
diff --git a/includes/Frontend.php b/includes/Frontend.php
index 1d27c19aa..803304231 100644
--- a/includes/Frontend.php
+++ b/includes/Frontend.php
@@ -99,44 +99,46 @@ public function enqueue_scripts() {
                     ],
                 ]
             );
-
             wp_localize_script(
-                'wpuf-frontend-form', 'wpuf_frontend', [
-                    'ajaxurl'       => admin_url( 'admin-ajax.php' ),
-                    'error_message' => __( 'Please fix the errors to proceed', 'wp-user-frontend' ),
-                    'nonce'         => wp_create_nonce( 'wpuf_nonce' ),
-                    'word_limit'    => __( 'Word limit reached', 'wp-user-frontend' ),
-                    'cancelSubMsg'  => __(
-                        'Are you sure you want to cancel your current subscription ?', 'wp-user-frontend'
-                    ),
-                    'delete_it'     => __( 'Yes', 'wp-user-frontend' ),
-                    'cancel_it'     => __( 'No', 'wp-user-frontend' ),
-                    'word_max_title'               => __(
-                        'Maximum word limit reached. Please shorten your texts.', 'wp-user-frontend'
-                    ),
-                    'word_max_details'             => __(
-                        'This field supports a maximum of %number% words, and the limit is reached. Remove a few words to reach the acceptable limit of the field.',
-                        'wp-user-frontend'
-                    ),
-                    'word_min_title'               => __( 'Minimum word required.', 'wp-user-frontend' ),
-                    'word_min_details'             => __(
-                        'This field requires minimum %number% words. Please add some more text.', 'wp-user-frontend'
-                    ),
-                    'char_max_title'               => __(
-                        'Maximum character limit reached. Please shorten your texts.', 'wp-user-frontend'
-                    ),
-                    'char_max_details'             => __(
-                        'This field supports a maximum of %number% characters, and the limit is reached. Remove a few characters to reach the acceptable limit of the field.',
-                        'wp-user-frontend'
-                    ),
-                    'char_min_title'               => __( 'Minimum character required.', 'wp-user-frontend' ),
-                    'char_min_details'             => __(
-                        'This field requires minimum %number% characters. Please add some more character.',
-                        'wp-user-frontend'
-                    ),
-                    'protected_shortcodes'         => wpuf_get_protected_shortcodes(),
-                    'protected_shortcodes_message' => __( 'Using %shortcode% is restricted', 'wp-user-frontend' ),
-                ]
+                'wpuf-frontend-form', 'wpuf_frontend', apply_filters(
+                    'wpuf_frontend_object', [
+                        'asset_url'                    => WPUF_ASSET_URI,
+                        'ajaxurl'                      => admin_url( 'admin-ajax.php' ),
+                        'error_message'                => __( 'Please fix the errors to proceed', 'wp-user-frontend' ),
+                        'nonce'                        => wp_create_nonce( 'wpuf_nonce' ),
+                        'word_limit'                   => __( 'Word limit reached', 'wp-user-frontend' ),
+                        'cancelSubMsg'                 => __(
+                            'Are you sure you want to cancel your current subscription ?', 'wp-user-frontend'
+                        ),
+                        'delete_it'                    => __( 'Yes', 'wp-user-frontend' ),
+                        'cancel_it'                    => __( 'No', 'wp-user-frontend' ),
+                        'word_max_title'               => __(
+                            'Maximum word limit reached. Please shorten your texts.', 'wp-user-frontend'
+                        ),
+                        'word_max_details'             => __(
+                            'This field supports a maximum of %number% words, and the limit is reached. Remove a few words to reach the acceptable limit of the field.',
+                            'wp-user-frontend'
+                        ),
+                        'word_min_title'               => __( 'Minimum word required.', 'wp-user-frontend' ),
+                        'word_min_details'             => __(
+                            'This field requires minimum %number% words. Please add some more text.', 'wp-user-frontend'
+                        ),
+                        'char_max_title'               => __(
+                            'Maximum character limit reached. Please shorten your texts.', 'wp-user-frontend'
+                        ),
+                        'char_max_details'             => __(
+                            'This field supports a maximum of %number% characters, and the limit is reached. Remove a few characters to reach the acceptable limit of the field.',
+                            'wp-user-frontend'
+                        ),
+                        'char_min_title'               => __( 'Minimum character required.', 'wp-user-frontend' ),
+                        'char_min_details'             => __(
+                            'This field requires minimum %number% characters. Please add some more character.',
+                            'wp-user-frontend'
+                        ),
+                        'protected_shortcodes'         => wpuf_get_protected_shortcodes(),
+                        'protected_shortcodes_message' => __( 'Using %shortcode% is restricted', 'wp-user-frontend' ),
+                    ]
+                )
             );
 
             wp_localize_script(
diff --git a/templates/dashboard/edit-profile.php b/templates/dashboard/edit-profile.php
index 7829f8a32..19cbe0211 100644
--- a/templates/dashboard/edit-profile.php
+++ b/templates/dashboard/edit-profile.php
@@ -3,6 +3,7 @@
 global $current_user;
 ob_start();
 
+$eye_icon_src = file_exists( WPUF_ROOT . '/assets/images/eye.svg' ) ? WPUF_ASSET_URI . '/images/eye.svg' : '';
 ?>
 
 <form class="wpuf-form wpuf-update-profile-form" action="" method="post">
@@ -44,7 +45,10 @@
                 <label for="current_password"><?php esc_html_e( 'Current Password', 'wp-user-frontend' ); ?></label>
             </div>
             <div class="wpuf-fields" >
-                <input type="password" class="input-text" name="current_password" id="current_password" size="16" value="" autocomplete="off" />
+                <div class="wpuf-fields-inline" style="position: relative;">
+                    <input type="password" class="input-text" name="current_password" id="current_password" size="16" value="" autocomplete="off" />
+                    <img class="wpuf-eye" src="<?php echo esc_url( $eye_icon_src ); ?>" alt="">
+                </div>
             </div>
             <span class="wpuf-help"><?php esc_html_e( 'Leave this field empty to keep your password unchanged.', 'wp-user-frontend' ); ?></span>
         </li>
@@ -55,7 +59,10 @@
                 <label for="pass1"><?php esc_html_e( 'New Password', 'wp-user-frontend' ); ?></label>
             </div>
             <div class="wpuf-fields" >
-                <input type="password" class="input-text" name="pass1" id="pass1" size="16" value="" autocomplete="off" />
+                <div class="wpuf-fields-inline" style="position: relative;">
+                    <input type="password" class="input-text" name="pass1" id="pass1" size="16" value="" autocomplete="off" />
+                    <img class="wpuf-eye" src="<?php echo esc_url( $eye_icon_src ); ?>" alt="">
+                </div>
             </div>
         </li>
         <div class="clear"></div>
@@ -65,7 +72,10 @@
                 <label for="pass2"><?php esc_html_e( 'Confirm New Password', 'wp-user-frontend' ); ?></label>
             </div>
             <div class="wpuf-fields" >
-                <input type="password" class="input-text" name="pass2" id="pass2" size="16" value="" autocomplete="off" />
+                <div class="wpuf-fields-inline" style="position: relative;">
+                    <input type="password" class="input-text" name="pass2" id="pass2" size="16" value="" autocomplete="off" />
+                    <img class="wpuf-eye" src="<?php echo esc_url( $eye_icon_src ); ?>" alt="">
+                </div>
             </div>
 
             <span style="display: block; margin-top:20px" class="pass-strength-result" id="pass-strength-result"><?php esc_html_e( 'Strength indicator', 'wp-user-frontend' ); ?></span>
diff --git a/templates/registration-form.php b/templates/registration-form.php
index 7014d2bd8..50a20d34a 100644
--- a/templates/registration-form.php
+++ b/templates/registration-form.php
@@ -22,6 +22,7 @@
 
     <?php wpuf()->frontend->registration->show_errors(); ?>
     <?php wpuf()->frontend->registration->show_messages(); ?>
+    <?php $eye_icon_src = file_exists( WPUF_ROOT . '/assets/images/eye.svg' ) ? WPUF_ASSET_URI . '/images/eye.svg' : ''; ?>
 
     <form name="registrationform" class="wpuf-registration-form" id="registrationform" action="<?php echo esc_attr( $action_url ); ?>" method="post">
 
@@ -59,15 +60,17 @@
 
             <li>
                 <div class="wpuf-label"><?php esc_html_e( 'Password', 'wp-user-frontend' ); ?> <span class="required">*</span></div>
-                <div class="wpuf-fields">
+                <div class="wpuf-fields-inline" style="position: relative; width: fit-content">
                     <input type="password" name="pwd1" id="wpuf-user_pass1" class="input" value="" size="40" />
+                    <img class="wpuf-eye" src="<?php echo esc_url( $eye_icon_src ); ?>" alt="">
                 </div>
             </li>
 
             <li>
                 <div class="wpuf-label"><?php esc_html_e( 'Confirm Password', 'wp-user-frontend' ); ?> <span class="required">*</span></div>
-                <div class="wpuf-fields">
+                <div class="wpuf-fields-inline" style="position: relative; width: fit-content">
                     <input type="password" name="pwd2" id="wpuf-user_pass2" class="input" value="" size="40" />
+                    <img class="wpuf-eye" src="<?php echo esc_url( $eye_icon_src ); ?>" alt="">
                 </div>
             </li>
 
diff --git a/templates/reset-pass-form.php b/templates/reset-pass-form.php
index 749c001ff..6cda8941a 100644
--- a/templates/reset-pass-form.php
+++ b/templates/reset-pass-form.php
@@ -10,17 +10,25 @@
     <?php
         wpuf()->frontend->simple_login->show_errors();
         wpuf()->frontend->simple_login->show_messages();
+  
+        $eye_icon_src = file_exists( WPUF_ROOT . '/assets/images/eye.svg' ) ? WPUF_ASSET_URI . '/images/eye.svg' : '';
     ?>
 
     <form name="resetpasswordform" id="resetpasswordform" action="" method="post">
         <p>
             <label for="wpuf-pass1"><?php esc_html_e( 'New password', 'wp-user-frontend' ); ?></label>
-            <input name="pass1" id="wpuf-pass1" class="input" size="20" value="" type="password" autocomplete="off" />
+            <div class="wpuf-fields-inline" style="position: relative; width: fit-content">
+                <input name="pass1" id="wpuf-pass1" class="input" size="20" value="" type="password" autocomplete="off" />
+                <img class="wpuf-eye" src="<?php echo esc_url( $eye_icon_src ); ?>" alt="">
+            </div>
         </p>
 
         <p>
             <label for="wpuf-pass2"><?php esc_html_e( 'Confirm new password', 'wp-user-frontend' ); ?></label>
-            <input name="pass2" id="wpuf-pass2" class="input" size="20" value="" type="password" autocomplete="off" />
+            <div class="wpuf-fields-inline" style="position: relative; width: fit-content">
+                <input name="pass2" id="wpuf-pass2" class="input" size="20" value="" type="password" autocomplete="off" />
+                <img class="wpuf-eye" src="<?php echo esc_url( $eye_icon_src ); ?>" alt="">
+            </div>
         </p>
 
         <?php do_action( 'resetpassword_form' ); ?>