diff --git a/includes/core/load.js.php b/includes/core/load.js.php
index 5352383e4..30db793d7 100755
--- a/includes/core/load.js.php
+++ b/includes/core/load.js.php
@@ -131,7 +131,7 @@ function(teampassUser) {
                             if (debugJavascript === true) console.log('User has to regenerate keys')
                             // HIde
                             $('.content-header, .content').addClass('hidden');
-                            $('#dialog-user-temporary-code-info').html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('renecyption_expected');?>');
+                            $('#dialog-user-temporary-code-info').html('<i class="icon fa-solid fa-info mr-2"></i><?php echo langHdl('renecyption_expected');?>');
 
                             // Show passwords inputs and form
                             $('#dialog-user-temporary-code').removeClass('hidden');
@@ -145,7 +145,7 @@ function(teampassUser) {
 
                             // Show passwords inputs and form
                             $('#dialog-user-change-password-info')
-                                .html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('user_has_to_change_password_info');?>')
+                                .html('<i class="icon fa-solid fa-info mr-2"></i><?php echo langHdl('user_has_to_change_password_info');?>')
                                 .removeClass('hidden');
                             $('#dialog-user-change-password').removeClass('hidden');
 
@@ -158,7 +158,7 @@ function(teampassUser) {
 
                             // Show passwords inputs and form
                             $('#dialog-ldap-user-change-password-info')
-                                .html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('ldap_user_has_changed_his_password');?>')
+                                .html('<i class="icon fa-solid fa-info mr-2"></i><?php echo langHdl('ldap_user_has_changed_his_password');?>')
                                 .removeClass('hidden');
                             $('#dialog-ldap-user-change-password').removeClass('hidden');
                             
@@ -264,7 +264,7 @@ function(teampassUser) {
         console.log('User has to regenerate keys')
         // HIde
         $('.content-header, .content').addClass('hidden');
-        $('#dialog-user-temporary-code-info').html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('renecyption_expected');?>');
+        $('#dialog-user-temporary-code-info').html('<i class="icon fa-solid fa-info mr-2"></i><?php echo langHdl('renecyption_expected');?>');
 
         // Show passwords inputs and form
         $('#dialog-user-temporary-code').removeClass('hidden');
@@ -277,7 +277,7 @@ function(teampassUser) {
         console.log('show password change')
         // HIde
         $('.content-header, .content, #button_do_sharekeys_reencryption').addClass('hidden');
-        $('#warning-text-reencryption').html('<i class="icon fas fa-info mr-2"></i>'.langHdl('ldap_password_change_warning'));
+        $('#warning-text-reencryption').html('<i class="icon fa-solid fa-info mr-2"></i>'.langHdl('ldap_password_change_warning'));
 
         // Show passwords inputs and form
         $('#dialog-encryption-keys, .ask-for-previous-password').removeClass('hidden');
@@ -294,7 +294,7 @@ function(teampassUser) {
         // Prepare modal
         showModalDialogBox(
             '#warningModal',
-            '<i class="fas fa-user-shield fa-lg warning mr-2"></i><?php echo langHdl('caution'); ?>',
+            '<i class="fa-solid fa-user-shield fa-lg warning mr-2"></i><?php echo langHdl('caution'); ?>',
             '<?php echo langHdl('login_attempts_identified_since_last_connection'); ?>',
             '<?php echo langHdl('see_detail'); ?>',
             '<?php echo langHdl('cancel'); ?>'
@@ -312,7 +312,7 @@ function(teampassUser) {
         $(document).on('click', '#warningModalButtonAction', function() {
             // SHow user
             toastr.remove();
-            toastr.info('<?php echo langHdl('in_progress'); ?><i class="fas fa-circle-notch fa-spin fa-2x ml-3"></i>');
+            toastr.info('<?php echo langHdl('in_progress'); ?><i class="fa-solid fa-circle-notch fa-spin fa-2x ml-3"></i>');
 
             // Action
             store.update(
@@ -334,7 +334,7 @@ function(teampassUser) {
         $(document).on('click', '#button_do_personal_items_reencryption', function() {
             // SHow user
             toastr.remove();
-            toastr.info('<?php echo langHdl('in_progress'); ?><i class="fas fa-circle-notch fa-spin fa-2x ml-3"></i>');
+            toastr.info('<?php echo langHdl('in_progress'); ?><i class="fa-solid fa-circle-notch fa-spin fa-2x ml-3"></i>');
 
             defusePskRemoval(store.get('teampassUser').user_id, 'psk', 0);
             
@@ -343,7 +343,7 @@ function defusePskRemoval(userId, step, start)
                 if (step === 'psk') {
                     // Inform user
                     $("#user-current-defuse-psk-progress").html('<b><?php echo langHdl('encryption_keys'); ?> </b> [' + start + ' - ' + (parseInt(start) + <?php echo NUMBER_ITEMS_IN_BATCH;?>) + '] ' +
-                        '... <?php echo langHdl('please_wait'); ?><i class="fas fa-spinner fa-pulse ml-3 text-primary"></i>');
+                        '... <?php echo langHdl('please_wait'); ?><i class="fa-solid fa-spinner fa-pulse ml-3 text-primary"></i>');
 
                     var data = {
                         'userPsk' : $('#user-current-defuse-psk').val(),
@@ -385,7 +385,7 @@ function(data) {
                     );
                 } else {
                     // Finished
-                    $("#user-current-defuse-psk-progress").html('<i class="fas fa-check text-success mr-3"></i><?php echo langHdl('done'); ?>');
+                    $("#user-current-defuse-psk-progress").html('<i class="fa-solid fa-check text-success mr-3"></i><?php echo langHdl('done'); ?>');
 
                     toastr.remove();
                 }
@@ -425,13 +425,13 @@ function(data) {
 
                 // Show passwords inputs and form
                 $('#dialog-ldap-user-change-password-info')
-                    .html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('ldap_user_has_changed_his_password');?>')
+                    .html('<i class="icon fa-solid fa-info mr-2"></i><?php echo langHdl('ldap_user_has_changed_his_password');?>')
                     .removeClass('hidden');
                 $('#dialog-ldap-user-change-password').removeClass('hidden');
 
                 // ----
             } else if ($(this).data('name') === 'password-change') {
-                console.log('show password change')
+                //console.log('show password change')
                 // HIde
                 $('.content-header, .content, #button_do_user_change_password').addClass('hidden');
 
@@ -439,7 +439,7 @@ function(data) {
                 $('#button_do_user_change_password').after('<button class="btn btn-primary" id="button_do_pwds_checks"><?php echo langHdl('perform_checks'); ?></button>');
 
                 // Show passwords inputs and form
-                $('#dialog-user-change-password-progress').html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('change_your_password_info_message'); ?>');
+                $('#dialog-user-change-password-progress').html('<i class="icon fa-solid fa-info mr-2"></i><?php echo langHdl('change_your_password_info_message'); ?>');
                 $('#dialog-user-change-password').removeClass('hidden');
 
                 // Actions
@@ -477,13 +477,119 @@ function(data) {
                         );
                     }
                 });
+                
                 // ----
             } else if ($(this).data('name') === 'profile') {
                 // Show profile page
                 document.location.href = "index.php?page=profile";
+
+                // ----
             } else if ($(this).data('name') === 'logout') {
                 // Logout directly to login form
                 window.location.href = "./includes/core/logout.php?token=<?php echo $_SESSION['key']; ?>";
+
+                // ----
+            } else if ($(this).data('name') === 'generate-new_keys') {
+                // User wants to generate new keys
+                console.log('show new keys generation');
+
+                // SHow modal
+                showModalDialogBox(
+                    '#warningModal',
+                    '<i class="fa-solid fa-person-digging fa-lg warning mr-2"></i><?php echo langHdl('generate_new_keys'); ?> <b>',
+                    '<div class="form-group">'+
+                        '<?php echo langHdl('generate_new_keys_info'); ?>' +
+                    '</div>' +
+                    '<div class="form-group hidden" id="encryption-otp-div">'+
+                        '<label for="encryption-otp"><?php echo langHdl('encryption_key'); ?></label>'+
+                        '<input readonly type="text" class="form-control disabled" id="encryption-otp" value="">'+
+                    '</div>',
+                    '<?php echo langHdl('perform'); ?>',
+                    '<?php echo langHdl('close'); ?>'
+                );
+                $(document).on('click', '#warningModalButtonAction', function() {
+                    // On PERFORM click
+                    // launch action
+                    $('#warningModalButtonAction')
+                        .addClass('disabled')
+                        .html('<i class="fa-solid fa-spinner fa-spin"></i>');
+                    $('#warningModalButtonClose').addClass('disabled');
+                    var parameters = {
+                        'user_id': parseInt(store.get('teampassUser').user_id)
+                    };
+                    $.post(
+                        "sources/main.queries.php", {
+                            type: "generate_temporary_encryption_key",
+                            type_category: 'action_key',
+                            data: prepareExchangedData(JSON.stringify(parameters), "encode", "<?php echo $_SESSION['key']; ?>"),
+                            key: "<?php echo $_SESSION['key']; ?>"
+                        },
+                        function(data) {  
+                            data = prepareExchangedData(data, 'decode', '<?php echo $_SESSION['key']; ?>');
+                            if (debugJavascript === true) console.log(data)
+
+                            if (data.error !== false) {
+                                // Show error
+                                toastr.remove();
+                                toastr.error(
+                                    data.message,
+                                    '<?php echo langHdl('caution'); ?>', {
+                                        timeOut: 5000,
+                                        progressBar: true
+                                    }
+                                );
+                            } else {
+                                $("#encryption-otp").val(data.userTemporaryCode);
+                                $("#encryption-otp-div").removeClass('hidden');
+                                // update the process
+                                // add all tasks
+                                var parameters = {
+                                    'user_id': parseInt(store.get('teampassUser').user_id),
+                                    'user_pwd': data.user_pwd,
+                                    'encryption_key': data.userTemporaryCode,
+                                    'delete_existing_keys': true
+                                };
+                                $.post(
+                                    "sources/main.queries.php", {
+                                        type: "user_new_keys_generation",
+                                        type_category: 'action_key',
+                                        data: prepareExchangedData(JSON.stringify(parameters), "encode", "<?php echo $_SESSION['key']; ?>"),
+                                        key: "<?php echo $_SESSION['key']; ?>"
+                                    },
+                                    function(data_next1) { 
+                                        data_next1 = prepareExchangedData(data_next1, 'decode', '<?php echo $_SESSION['key']; ?>');
+                                        if (debugJavascript === true) console.log(data_next1)
+
+                                        if (data_next1.error !== false) {
+                                            // Show error
+                                            toastr.remove();
+                                            toastr.error(
+                                                data_next1.message,
+                                                '<?php echo langHdl('caution'); ?>', {
+                                                    timeOut: 5000,
+                                                    progressBar: true
+                                                }
+                                            );
+                                        } else {
+                                            $("#encryption-otp-div").after('<div><?php echo langHdl('generate_new_keys_end'); ?></div>');
+                                            // Show warning
+                                            $('#user_not_ready').removeClass('hidden');
+                                            // update local storage
+                                            store.update(
+                                                'teampassUser', {},
+                                                function(teampassUser) {
+                                                    teampassUser.is_ready_for_usage = 0;
+                                                }
+                                            );
+                                            $("#warningModalButtonAction").addClass('hidden');
+                                            $('#warningModalButtonClose').removeClass('disabled');
+                                        }
+                                    }
+                                );
+                            }
+                        }
+                    );
+                });
             }
         }
     });
@@ -501,7 +607,7 @@ function(data) {
     $('#button_save_user_psk').click(function() {
         toastr.remove();
         toastr.info(
-            '<?php echo langHdl('in_progress'); ?><i class="fas fa-circle-notch fa-spin fa-2x ml-3"></i>'
+            '<?php echo langHdl('in_progress'); ?><i class="fa-solid fa-circle-notch fa-spin fa-2x ml-3"></i>'
         );
 
         // Prepare data
@@ -675,10 +781,10 @@ function() {
             console.log('Reencryption based upon user decision to change his auth password');
 
             // Show progress
-            $('#dialog-user-change-password-progress').html('<b><?php echo langHdl('please_wait'); ?></b><i class="fas fa-spinner fa-pulse ml-3 text-primary"></i>');
+            $('#dialog-user-change-password-progress').html('<b><?php echo langHdl('please_wait'); ?></b><i class="fa-solid fa-spinner fa-pulse ml-3 text-primary"></i>');
             toastr.remove();
             toastr.info(
-                '<?php echo langHdl('in_progress'); ?><i class="fas fa-circle-notch fa-spin fa-2x ml-3"></i>'
+                '<?php echo langHdl('in_progress'); ?><i class="fa-solid fa-circle-notch fa-spin fa-2x ml-3"></i>'
             );
             
             // Disable buttons
@@ -766,10 +872,10 @@ function(data) {
         console.log('Reencryption based upon admin decision to change user auth password');
 
         // Show progress
-        $('#dialog-admin-change-user-password-progress').html('<b><?php echo langHdl('please_wait'); ?></b><i class="fas fa-spinner fa-pulse ml-3 text-primary"></i>');
+        $('#dialog-admin-change-user-password-progress').html('<b><?php echo langHdl('please_wait'); ?></b><i class="fa-solid fa-spinner fa-pulse ml-3 text-primary"></i>');
         toastr.remove();
         toastr.info(
-            '<?php echo langHdl('in_progress'); ?><i class="fas fa-circle-notch fa-spin fa-2x ml-3"></i>'
+            '<?php echo langHdl('in_progress'); ?><i class="fa-solid fa-circle-notch fa-spin fa-2x ml-3"></i>'
         );
         
         // Disable buttons
@@ -867,7 +973,7 @@ function(data) {
             $('#dialog-admin-change-user-password-info').html('<?php echo langHdl('sending_email_message');?>');
             toastr.remove();
             toastr.info(
-                '<?php echo langHdl('in_progress'); ?><i class="fas fa-circle-notch fa-spin fa-2x ml-3"></i>'
+                '<?php echo langHdl('in_progress'); ?><i class="fa-solid fa-circle-notch fa-spin fa-2x ml-3"></i>'
             );
 
             // Launch action
@@ -933,10 +1039,10 @@ function(data) {
         console.log('Reencryption based upon users temporary code');
 
         // Show progress
-        $('#dialog-user-temporary-code-progress').html('<b><?php echo langHdl('please_wait'); ?></b><i class="fas fa-spinner fa-pulse ml-3 text-primary"></i>');
+        $('#dialog-user-temporary-code-progress').html('<b><?php echo langHdl('please_wait'); ?></b><i class="fa-solid fa-spinner fa-pulse ml-3 text-primary"></i>');
         toastr.remove();
         toastr.info(
-            '<?php echo langHdl('in_progress'); ?><i class="fas fa-circle-notch fa-spin fa-2x ml-3"></i>'
+            '<?php echo langHdl('in_progress'); ?><i class="fa-solid fa-circle-notch fa-spin fa-2x ml-3"></i>'
         );
         
         // Disable buttons
@@ -1018,7 +1124,7 @@ function(data) {
                                 $('#dialog-user-temporary-code-do').attr('disabled', 'disabled');
 
                                 // Finished
-                                $("#dialog-user-temporary-code-progress").html('<i class="fas fa-check text-success mr-3"></i><?php echo langHdl('done'); ?>');
+                                $("#dialog-user-temporary-code-progress").html('<i class="fa-solid fa-check text-success mr-3"></i><?php echo langHdl('done'); ?>');
                                 toastr.remove();
 
                                 store.update(
@@ -1055,10 +1161,10 @@ function(teampassUser) {
         console.log('Building items keys database for new LDAP user');
 
         // Show progress
-        $('#dialog-ldap-user-build-keys-database-progress').html('<b><?php echo langHdl('please_wait'); ?></b><i class="fas fa-spinner fa-pulse ml-3 text-primary"></i>');
+        $('#dialog-ldap-user-build-keys-database-progress').html('<b><?php echo langHdl('please_wait'); ?></b><i class="fa-solid fa-spinner fa-pulse ml-3 text-primary"></i>');
         toastr.remove();
         toastr.info(
-            '<?php echo langHdl('in_progress'); ?><i class="fas fa-circle-notch fa-spin fa-2x ml-3"></i>'
+            '<?php echo langHdl('in_progress'); ?><i class="fa-solid fa-circle-notch fa-spin fa-2x ml-3"></i>'
         );
         
         // Disable buttons
@@ -1133,7 +1239,7 @@ function(data) {
                                 );
 
                                 
-                                $("#dialog-ldap-user-build-keys-database-progress").html('<i class="fas fa-exclamation-circle text-danger mr-3"></i><?php echo langHdl('bad_code'); ?>');
+                                $("#dialog-ldap-user-build-keys-database-progress").html('<i class="fa-solid fa-exclamation-circle text-danger mr-3"></i><?php echo langHdl('bad_code'); ?>');
 
                                 // Enable buttons
                                 $('#dialog-ldap-user-build-keys-database-do, #dialog-ldap-user-build-keys-database-close').removeAttr('disabled');
@@ -1144,7 +1250,7 @@ function(data) {
                                 $('#dialog-ldap-user-build-keys-database-do').attr('disabled', 'disabled');
 
                                 // Finished
-                                $("#dialog-ldap-user-build-keys-database-progress").html('<i class="fas fa-check text-success mr-3"></i><?php echo langHdl('done'); ?>');
+                                $("#dialog-ldap-user-build-keys-database-progress").html('<i class="fa-solid fa-check text-success mr-3"></i><?php echo langHdl('done'); ?>');
                                 toastr.remove();
 
                                 store.update(
@@ -1193,10 +1299,10 @@ function(teampassUser) {
             console.log('Reencryption based upon user auth password changed in LDAP');
 
             // Show progress
-            $('#dialog-ldap-user-change-password-progress').html('<b><?php echo langHdl('please_wait'); ?></b><i class="fas fa-spinner fa-pulse ml-3 text-primary"></i>');
+            $('#dialog-ldap-user-change-password-progress').html('<b><?php echo langHdl('please_wait'); ?></b><i class="fa-solid fa-spinner fa-pulse ml-3 text-primary"></i>');
             toastr.remove();
             toastr.info(
-                '<?php echo langHdl('in_progress'); ?><i class="fas fa-circle-notch fa-spin fa-2x ml-3"></i>'
+                '<?php echo langHdl('in_progress'); ?><i class="fa-solid fa-circle-notch fa-spin fa-2x ml-3"></i>'
             );
             
             // Disable buttons
@@ -1366,7 +1472,7 @@ function showExtendSession() {
         // Prepare modal
         showModalDialogBox(
             '#warningModal',
-            '<i class="fas fa-clock fa-lg warning mr-2"></i><?php echo langHdl('index_add_one_hour'); ?>',
+            '<i class="fa-solid fa-clock fa-lg warning mr-2"></i><?php echo langHdl('index_add_one_hour'); ?>',
             '<div class="form-group">' +
             '<label for="warningModal-input" class="col-form-label"><?php echo langHdl('index_session_duration') . ' (' . langHdl('minutes') . ')'; ?>:</label>' +
             '<input type="text" class="form-control" id="warningModal-input" value="<?php echo isset($_SESSION['user']['session_duration']) === true ? (int) $_SESSION['user']['session_duration'] / 60 : 60; ?>">' +
@@ -1380,7 +1486,7 @@ function showExtendSession() {
             // SHow user
             toastr.remove();
             toastr.info(
-                '<?php echo langHdl('in_progress'); ?><i class="fas fa-circle-notch fa-spin fa-2x ml-3"></i>'
+                '<?php echo langHdl('in_progress'); ?><i class="fa-solid fa-circle-notch fa-spin fa-2x ml-3"></i>'
             );
 
             // Perform action
@@ -1480,7 +1586,7 @@ function showItemCard(itemDefinition) {
         // Show circle-notch
         toastr.remove();
         toastr.info(
-            '<?php echo langHdl('in_progress'); ?><i class="fas fa-circle-notch fa-spin fa-2x ml-3"></i>'
+            '<?php echo langHdl('in_progress'); ?><i class="fa-solid fa-circle-notch fa-spin fa-2x ml-3"></i>'
         );
 
         if (window.location.href.indexOf('page=items') === -1) {
@@ -1550,11 +1656,11 @@ function userShareKeysReencryption(
     ) {
         console.log('USER SHAREKEYS RE-ENCRYPTION START');
 
-        $('#'+divIdDialog+'-progress').html('<b><?php echo langHdl('clearing_old_sharekeys'); ?></b><i class="fas fa-spinner fa-pulse ml-3 text-primary"></i>');
+        $('#'+divIdDialog+'-progress').html('<b><?php echo langHdl('clearing_old_sharekeys'); ?></b><i class="fa-solid fa-spinner fa-pulse ml-3 text-primary"></i>');
 
         toastr.remove();
         toastr.info(
-            '<?php echo langHdl('in_progress'); ?><i class="fas fa-circle-notch fa-spin fa-2x ml-3"></i>'
+            '<?php echo langHdl('in_progress'); ?><i class="fa-solid fa-circle-notch fa-spin fa-2x ml-3"></i>'
         );
 
         var data = {
@@ -1628,7 +1734,7 @@ function userShareKeysReencryptionNext(
             // Inform user
             $("#"+divIdDialog+'-progress').html('<b><?php echo langHdl('encryption_keys'); ?> - ' +
                 stepText + '</b> [' + start + ' - ' + (parseInt(start) + <?php echo NUMBER_ITEMS_IN_BATCH;?>) + '] ' +
-                '... <?php echo langHdl('please_wait'); ?><i class="fas fa-spinner fa-pulse ml-3 text-primary"></i>');
+                '... <?php echo langHdl('please_wait'); ?><i class="fa-solid fa-spinner fa-pulse ml-3 text-primary"></i>');
 
             var data = {
                 'action': step,
@@ -1674,13 +1780,13 @@ function(data) {
                 $('#'+divIdDialog+'-close').removeAttr('disabled');
 
                 // Finished
-                $("#"+divIdDialog+'-progress').html('<i class="fas fa-check text-success mr-3"></i><?php echo langHdl('done'); ?>');
+                $("#"+divIdDialog+'-progress').html('<i class="fa-solid fa-check text-success mr-3"></i><?php echo langHdl('done'); ?>');
                 toastr.remove();
 
                 // Unlog if same user
                 if (userId === <?php echo $_SESSION['user_id']; ?>) {
                     toastr.success(
-                        '<?php echo langHdl('logout_on_going'); ?><i class="fas fa-circle-notch fa-spin fa-2x ml-3"></i>',
+                        '<?php echo langHdl('logout_on_going'); ?><i class="fa-solid fa-circle-notch fa-spin fa-2x ml-3"></i>',
                         '', {
                             timeOut: 4000
                         }
@@ -1689,8 +1795,8 @@ function(data) {
                     window.location.href = "./includes/core/logout.php?token=<?php echo $_SESSION['key']; ?>"
                 } else if (store.get('teampassUser').admin_user_password) {
                     // now select if sending by email
-                    $('#dialog-admin-change-user-password-info').html('<i class="fas fa-envelope-open-text fa-lg warning mr-2"></i><?php echo langHdl('information'); ?><br><br>'+
-                    '<i class="fas fa-info-circle mr-2"></i><?php echo langHdl('send_user_password_by_email'); ?>'+
+                    $('#dialog-admin-change-user-password-info').html('<i class="fa-solid fa-envelope-open-text fa-lg warning mr-2"></i><?php echo langHdl('information'); ?><br><br>'+
+                    '<i class="fa-solid fa-info-circle mr-2"></i><?php echo langHdl('send_user_password_by_email'); ?>'+
                     '<div class="row">'+
                         '<div class="col-lg-2"><button type="button" class="btn btn-block btn-secondary mr-2 temp-button"  data-action="show-user-pwd"><?php echo langHdl('show_user_password'); ?></button></div>'+
                         '<div class="col-lg-2"><input class="form-control form-item-control" type="hidden" id="temp-user-pwd" value="'+store.get('teampassUser').admin_user_password+'"></div>'+
diff --git a/includes/language/bulgarian.php b/includes/language/bulgarian.php
index a1c270cb3..9d8fce9aa 100755
--- a/includes/language/bulgarian.php
+++ b/includes/language/bulgarian.php
@@ -1060,5 +1060,9 @@
     'tasks_cron_running' => 'Cron job is correctly set',
     'currently_using_version' => 'Current version loaded',
     'git_commit_value' => 'Git commit value',
+    'generate_new_keys' => 'Generate new keys',
+    'generate_new_keys_info' => 'By continuing, you will generate new keys for all objects you have access to. This should only be done if you have no password shown. A code will be provided. Store it carrefully, it will be asked once the process is finished.',
+    'encryption_key' => 'Encryption key',
+    'generate_new_keys_end' => 'Process is on going in background and could take several minutes. You can now close this window.',
 
 );
diff --git a/includes/language/catalan.php b/includes/language/catalan.php
index 871cfb356..27a4a802c 100755
--- a/includes/language/catalan.php
+++ b/includes/language/catalan.php
@@ -1060,5 +1060,9 @@
     'tasks_cron_running' => 'Cron job is correctly set',
     'currently_using_version' => 'Current version loaded',
     'git_commit_value' => 'Git commit value',
+    'generate_new_keys' => 'Generate new keys',
+    'generate_new_keys_info' => 'By continuing, you will generate new keys for all objects you have access to. This should only be done if you have no password shown. A code will be provided. Store it carrefully, it will be asked once the process is finished.',
+    'encryption_key' => 'Encryption key',
+    'generate_new_keys_end' => 'Process is on going in background and could take several minutes. You can now close this window.',
 
 );
diff --git a/includes/language/chinese.php b/includes/language/chinese.php
index 8961df7bc..f1316a970 100755
--- a/includes/language/chinese.php
+++ b/includes/language/chinese.php
@@ -1060,5 +1060,9 @@
     'tasks_cron_running' => 'Cron job is correctly set',
     'currently_using_version' => 'Current version loaded',
     'git_commit_value' => 'Git commit value',
+    'generate_new_keys' => 'Generate new keys',
+    'generate_new_keys_info' => 'By continuing, you will generate new keys for all objects you have access to. This should only be done if you have no password shown. A code will be provided. Store it carrefully, it will be asked once the process is finished.',
+    'encryption_key' => 'Encryption key',
+    'generate_new_keys_end' => 'Process is on going in background and could take several minutes. You can now close this window.',
 
 );
diff --git a/includes/language/czech.php b/includes/language/czech.php
index e0e712aa9..97b724bca 100755
--- a/includes/language/czech.php
+++ b/includes/language/czech.php
@@ -1060,5 +1060,9 @@
     'tasks_cron_running' => 'Cron job is correctly set',
     'currently_using_version' => 'Current version loaded',
     'git_commit_value' => 'Git commit value',
+    'generate_new_keys' => 'Generate new keys',
+    'generate_new_keys_info' => 'By continuing, you will generate new keys for all objects you have access to. This should only be done if you have no password shown. A code will be provided. Store it carrefully, it will be asked once the process is finished.',
+    'encryption_key' => 'Encryption key',
+    'generate_new_keys_end' => 'Process is on going in background and could take several minutes. You can now close this window.',
 
 );
diff --git a/includes/language/dutch.php b/includes/language/dutch.php
index ed8dfb269..534760deb 100755
--- a/includes/language/dutch.php
+++ b/includes/language/dutch.php
@@ -1060,5 +1060,9 @@
     'tasks_cron_running' => 'Cron job is correctly set',
     'currently_using_version' => 'Current version loaded',
     'git_commit_value' => 'Git commit value',
+    'generate_new_keys' => 'Generate new keys',
+    'generate_new_keys_info' => 'By continuing, you will generate new keys for all objects you have access to. This should only be done if you have no password shown. A code will be provided. Store it carrefully, it will be asked once the process is finished.',
+    'encryption_key' => 'Encryption key',
+    'generate_new_keys_end' => 'Process is on going in background and could take several minutes. You can now close this window.',
 
 );
diff --git a/includes/language/english.php b/includes/language/english.php
index a8e996c85..1a981c733 100755
--- a/includes/language/english.php
+++ b/includes/language/english.php
@@ -17,6 +17,10 @@
  * @see       https://www.teampass.net
  */
 return array(
+    'generate_new_keys' => 'Generate new keys',
+    'generate_new_keys_info' => 'By continuing, you will generate new keys for all objects you have access to. This should only be done if you have no password shown. A code will be provided. Store it carrefully, it will be asked once the process is finished.',
+    'encryption_key' => 'Encryption key',
+    'generate_new_keys_end' => 'Process is on going in background and could take several minutes. You can now close this window.',
     'currently_using_version' => 'Current version loaded',
     'git_commit_value' => 'Git commit value',
     'add_new_job' => 'Add new job',
diff --git a/includes/language/estonian.php b/includes/language/estonian.php
index febcdca03..aec13b51c 100755
--- a/includes/language/estonian.php
+++ b/includes/language/estonian.php
@@ -1060,5 +1060,9 @@
     'tasks_cron_running' => 'Cron job is correctly set',
     'currently_using_version' => 'Current version loaded',
     'git_commit_value' => 'Git commit value',
+    'generate_new_keys' => 'Generate new keys',
+    'generate_new_keys_info' => 'By continuing, you will generate new keys for all objects you have access to. This should only be done if you have no password shown. A code will be provided. Store it carrefully, it will be asked once the process is finished.',
+    'encryption_key' => 'Encryption key',
+    'generate_new_keys_end' => 'Process is on going in background and could take several minutes. You can now close this window.',
 
 );
diff --git a/includes/language/french.php b/includes/language/french.php
index faf6959a5..90dfc78fa 100755
--- a/includes/language/french.php
+++ b/includes/language/french.php
@@ -1060,5 +1060,9 @@
     'tasks_cron_running' => 'Cron job trouvé',
     'currently_using_version' => 'Version actuellement chargée',
     'git_commit_value' => 'Version du commit de Git',
+    'generate_new_keys' => 'Générer de nouvelles clés',
+    'generate_new_keys_info' => 'En poursuivant, de nouvelles clés pour les objets vont être générées. Cela devrait être effectué uniquement si les mots de passe ne s\'affichent plus. Une clé de cryptage sera fournie. Conservez la précieusement car elle sera demandé à la fin de l\'opération.',
+    'encryption_key' => 'Clé de cryptage',
+    'generate_new_keys_end' => 'L\'opération est en cours en arrière plan et peut prendre plusieurs minutes. Vous pouvez maintenant fermer cette fenêtre.',
 
 );
diff --git a/includes/language/german.php b/includes/language/german.php
index 0fddc681c..d5f2e71b7 100755
--- a/includes/language/german.php
+++ b/includes/language/german.php
@@ -1060,5 +1060,9 @@
     'tasks_cron_running' => 'Cron job is correctly set',
     'currently_using_version' => 'Current version loaded',
     'git_commit_value' => 'Git commit value',
+    'generate_new_keys' => 'Generate new keys',
+    'generate_new_keys_info' => 'By continuing, you will generate new keys for all objects you have access to. This should only be done if you have no password shown. A code will be provided. Store it carrefully, it will be asked once the process is finished.',
+    'encryption_key' => 'Encryption key',
+    'generate_new_keys_end' => 'Process is on going in background and could take several minutes. You can now close this window.',
 
 );
diff --git a/includes/language/greek.php b/includes/language/greek.php
index 81e0aabb1..2781f6c3d 100755
--- a/includes/language/greek.php
+++ b/includes/language/greek.php
@@ -1060,5 +1060,9 @@
     'tasks_cron_running' => 'Cron job is correctly set',
     'currently_using_version' => 'Current version loaded',
     'git_commit_value' => 'Git commit value',
+    'generate_new_keys' => 'Generate new keys',
+    'generate_new_keys_info' => 'By continuing, you will generate new keys for all objects you have access to. This should only be done if you have no password shown. A code will be provided. Store it carrefully, it will be asked once the process is finished.',
+    'encryption_key' => 'Encryption key',
+    'generate_new_keys_end' => 'Process is on going in background and could take several minutes. You can now close this window.',
 
 );
diff --git a/includes/language/hungarian.php b/includes/language/hungarian.php
index 2dc0633df..4efd64adf 100755
--- a/includes/language/hungarian.php
+++ b/includes/language/hungarian.php
@@ -1060,5 +1060,9 @@
     'tasks_cron_running' => 'Cron job is correctly set',
     'currently_using_version' => 'Current version loaded',
     'git_commit_value' => 'Git commit value',
+    'generate_new_keys' => 'Generate new keys',
+    'generate_new_keys_info' => 'By continuing, you will generate new keys for all objects you have access to. This should only be done if you have no password shown. A code will be provided. Store it carrefully, it will be asked once the process is finished.',
+    'encryption_key' => 'Encryption key',
+    'generate_new_keys_end' => 'Process is on going in background and could take several minutes. You can now close this window.',
 
 );
diff --git a/includes/language/italian.php b/includes/language/italian.php
index 06d6ab75b..2118b933b 100755
--- a/includes/language/italian.php
+++ b/includes/language/italian.php
@@ -1060,5 +1060,9 @@
     'tasks_cron_running' => 'Cron job is correctly set',
     'currently_using_version' => 'Current version loaded',
     'git_commit_value' => 'Git commit value',
+    'generate_new_keys' => 'Generate new keys',
+    'generate_new_keys_info' => 'By continuing, you will generate new keys for all objects you have access to. This should only be done if you have no password shown. A code will be provided. Store it carrefully, it will be asked once the process is finished.',
+    'encryption_key' => 'Encryption key',
+    'generate_new_keys_end' => 'Process is on going in background and could take several minutes. You can now close this window.',
 
 );
diff --git a/includes/language/japanese.php b/includes/language/japanese.php
index 017727888..b901a88fd 100755
--- a/includes/language/japanese.php
+++ b/includes/language/japanese.php
@@ -1060,5 +1060,9 @@
     'tasks_cron_running' => 'Cron job is correctly set',
     'currently_using_version' => '現在のバージョンが読み込まれました',
     'git_commit_value' => 'Gitのコミット値',
+    'generate_new_keys' => 'Generate new keys',
+    'generate_new_keys_info' => 'By continuing, you will generate new keys for all objects you have access to. This should only be done if you have no password shown. A code will be provided. Store it carrefully, it will be asked once the process is finished.',
+    'encryption_key' => 'Encryption key',
+    'generate_new_keys_end' => 'Process is on going in background and could take several minutes. You can now close this window.',
 
 );
diff --git a/includes/language/norwegian.php b/includes/language/norwegian.php
index fdbbf8d22..0c6876959 100755
--- a/includes/language/norwegian.php
+++ b/includes/language/norwegian.php
@@ -1060,5 +1060,9 @@
     'tasks_cron_running' => 'Cron job is correctly set',
     'currently_using_version' => 'Current version loaded',
     'git_commit_value' => 'Git commit value',
+    'generate_new_keys' => 'Generate new keys',
+    'generate_new_keys_info' => 'By continuing, you will generate new keys for all objects you have access to. This should only be done if you have no password shown. A code will be provided. Store it carrefully, it will be asked once the process is finished.',
+    'encryption_key' => 'Encryption key',
+    'generate_new_keys_end' => 'Process is on going in background and could take several minutes. You can now close this window.',
 
 );
diff --git a/includes/language/polish.php b/includes/language/polish.php
index 351bb5c7a..bb8e06087 100755
--- a/includes/language/polish.php
+++ b/includes/language/polish.php
@@ -18,42 +18,42 @@
  */
 return array(
     'show_user_temporary_encryption_code' => 'Wyświetl kod szyfrowania użytkownika',
-    'email_body_new_user' => 'Hello,<br><br>This is a generated email from Teampass passwords manager.<br><br>An administrator has created for you a user account on Teampass. Next time you will connect to Teampass, please use next credentials:<ul><li>login: #login#</li><li>Password: #password#</li><li>Encryption code: #code#</li></ul><br><br><br>Cheers',
+    'email_body_new_user' => 'Witaj,<br><br>Ten email został wygenerowany z system zarządzania haseł Teampass.<br><br>Administrator utworzył dla Ciebie hasło w systemie. Przy następnym logowaniu do systemu Teampass, użyj następujących poświadczeń:<ul><li>login: #login#</li><li>Password: #password#</li><li>Kod szyfrowania: #code#</li></ul><br><br><br>Pozdrowienia',
     'user_password' => 'Hasło użytkownika',
     'user_temporary_encryption_code' => 'Kod szyfrowania użytkownika',
-    'no_email_set' => 'No email has been registered',
+    'no_email_set' => 'Nie został zarejestrowany adres email',
     'send_user_password_by_email' => 'Decide if the user login password should be sent by email.<br>If yes then press button Send.<br><br>Otherwize use the button Copy to clipboard to send it to the user by another mean.<br>It becomes your responsibility as an Administrator to provide the user the password in a secure way.',
-    'admin_change_user_encryption_code_info' => 'This operation will reset the encryption code for this user.',
-    'send_by_email' => 'Wyślij wiadomością',
+    'admin_change_user_encryption_code_info' => 'Ta czynność spowoduje zresetowanie kodu szyfrowania dla tego użytkownika.',
+    'send_by_email' => 'Wyślij wiadomością email',
     'filters' => 'Filtry',
     'show_user_password' => 'Wyświetl hasło użytkownika',
     'open_website' => 'Otwórz stronę WWW',
-    'mfa_for_roles' => 'MFA is requested for users in Roles',
-    'mfa_for_roles_tip' => 'By default, once an MFA method is selected, it is enabled for all users. Nevertheless, you might select the roles for which it is expected.<br>NOT YET IMPLEMENTED',
-    'at_least_one_administrator_is_requested' => 'At least one administrator is requested',
+    'mfa_for_roles' => 'Mechanizm MFA jest wymagany dla roli użytkowników',
+    'mfa_for_roles_tip' => 'Domyślnie, jedna metoda MFA może być wybrana włączona dla wszystkich użytkowników. Jednakże możesz wybrać role, dla których jest ona Wymagana.<br>JESZCZE NIE WDRAŻONE',
+    'at_least_one_administrator_is_requested' => 'Wymagany jest co najmniej jeden administrator',
     'bad_code' => 'Niepoprawny kod',
     'generating_keys' => 'Generowanie kluczy',
-    'this_may_take_time' => 'This may take a couple of minutes',
-    'disable_enable' => 'Disable / Enable',
+    'this_may_take_time' => 'To może zająć kilka minut',
+    'disable_enable' => 'Wyłączenie / Włączenie',
     'user_disable_status' => 'Tick the box to disable or leave empty to enable',
-    'help_for_launching_items_encryption' => 'We need to generate the keys database for your account. Please provide your encryption code.',
-    'managed_through_ad' => 'Managed through AD',
-    'new_ldap_user_info' => 'Please complete the definition for user',
+    'help_for_launching_items_encryption' => 'Wymagane jest wygenerowanie bazy kluczy dla Twojego konta. Proszę o podanie Twojego klucza szyfrowania',
+    'managed_through_ad' => 'Zarządzane za pomocą AD',
+    'new_ldap_user_info' => 'Uzupełnij definicję użytkownika',
     'email_body_user_added_from_ldap_encryption_code' => 'Cześć,<br><br>To jest wiadomość e-mail wygenerowana od menedżera haseł Teampass.<br><br>Masz teraz aktywne konto w systemie Teampass. Możesz użyć swoich danych logowania AD, aby się zalogować do systemu.<br><br>Przy pierwszym logowaniu będzie oczekiwany od Ciebie kod szyfrujący wskazany poniżej:<br><br><b>#enc_code#</b><br><br><br>',
-    'settings_ldap_user_object_filter' => 'User Object Filter',
+    'settings_ldap_user_object_filter' => 'Filtr użytkowników',
     'settings_ldap_user_object_filter_tip' => 'The filter to use when searching user objects. Example: (objectCategory=Person)(sAMAccountName=*)',
     'settings_ldap_additional_user_dn_tip' => 'This value is used in addition to the base DN when searching and loading users. If no value is supplied, the subtree search will start from the base DN. Examples: ou=Users ; cn=users',
-    'settings_ldap_additional_user_dn' => 'Additional User DN',
+    'settings_ldap_additional_user_dn' => 'Dodatkowy DN użytkownika',
     'ldap_user_has_changed_his_password' => 'Your authentication password has been changed in your AD since you last get logged in in Teampass. We need to adapt your encryption key. Please provide your previous password and the current one.',
-    'provide_your_previous_password' => 'Your previous password',
-    'admin_change_user_password_info' => 'This operation will reset the selected user current password.',
-    'sending_email_message' => 'Now sending email to user, please wait',
+    'provide_your_previous_password' => 'Twoje poprzednie hasło',
+    'admin_change_user_password_info' => 'Ta czynność spowoduje zresetowanie aktualnego hasła dla wybranego użytkownika.',
+    'sending_email_message' => 'Wysyłanie wiadomości email do użytkownika, proszę poczekać',
     'change_your_password_info_message' => 'Please provide your new authentication password and confirm it.',
     'user_has_to_change_password_info' => 'The current used password has been generated. It is expected from you to change it for security purpose.',
     'ready_to_go' => 'Ready to go',
-    'passwords_not_the_same' => 'Provided passwords are not the same',
-    'inititialization' => 'Initialization',
-    'bad_password' => 'Bad password',
+    'passwords_not_the_same' => 'Wprowadzone hasła nie są takie same',
+    'inititialization' => 'Inicjalizacja',
+    'bad_password' => 'Błędne hasło',
     'perform_checks' => 'Perform checks',
     'email_body_temporary_encryption_code' => 'Hello,<br><br>This is a generated email from Teampass passwords manager.<br><br>Some changes were performed on your account that require a new encryption of items for data security. Next time you will connect to Teampass, use your current credentials and use this temporary encryption code when requested:<br><br><b>#enc_code#</b><br><br><br>Cheers',
     'temporary_encryption_code' => 'Your temporary encryption code',
@@ -61,14 +61,14 @@
     'error_no_user_in_ad' => 'User not found in AD!',
     'error_ad_user_expired' => 'User is expired!',
     'error' => 'Error caught',
-    'hosts' => 'Hosts',
+    'hosts' => 'Hosty',
     'settings_ldap_hosts_tip' => 'The hosts option is an array of IP addresses or host names located on your network that serve an LDAP directory (seprated by a comma). You insert as many servers or as little as you would like depending on your forest (with the minimum of one of course).',
     'base_distiguished_name' => 'Base DN',
     'settings_ldap_bdn_tip' => 'The root distinguished name (DN) to use when running queries against the directory server. Examples: o=example,c=com ; cn=users,dc=ad,dc=example,dc=com',
     'username' => 'Username',
     'settings_ldap_username_tip' => 'The distinguished name of the user that the application will use when connecting to the directory server. Examples: cn=administrator,cn=users,dc=ad,dc=example,dc=com ; cn=user,dc=domain,dc=name',
     'settings_ldap_password_tip' => 'The password of the user specified above.',
-    'settings_ldap_port_tip' => 'Domyślny nieszyfrowany port LDAP: 389, domyślny szyfrowany port LDAP: 636',
+    'settings_ldap_port_tip' => 'Port używane do uwierzytelnienia do LDAP. Domyślnie używane porty: dla połączenie nieszyfrowanych: 389, dla połączeń szyfrowanych: 636. ',
     'undefined' => 'Undefined',
     'error_cannot_open_file' => 'File cannot be opened',
     'provide_current_psk_and_click_launch' => 'When ready, click button Launch',
@@ -101,21 +101,21 @@
     'remove_install_folder' => 'Install folder has to be removed',
     'list_users' => 'Lista użytkowników',
     'ldap_synchronization' => 'Synchronizacja LDAP',
-    'in_progress' => 'In progress',
+    'in_progress' => 'W trakcie',
     'clipboard_password_life_duration' => 'Delay before the clipboard is cleared (in seconds)',
     'clipboard_password_life_duration_tip' => 'Permits to define a delay in seconds before which the password copied in clipboard will be cleared from the browser clipboard. Set to 0 to disable.',
-    'clipboard_will_be_cleared' => 'Password is now in clipboard. It will soon be cleared...',
+    'clipboard_will_be_cleared' => 'Hasło zostało skopiowane do schowka. Wkrótce zostanie z niego usunięte…',
     'file_folder_not_accessible' => 'Files folder is not accessible',
     'error_missing_id' => 'An error occurred. Missing ID ... ?',
     'error_folder_not_allowed' => 'Selected folder is not allowed',
     'all_fields_mandatory' => 'All fields are mandatory',
     'history_insert_entry' => 'Insert in History',
-    'clear_form' => 'Clear form',
+    'clear_form' => 'Wyczyść formularz',
     'info_about_history_insertion' => 'Caution - This feature permits you to insert manually an event in the item history log. Once added it will not be possible to remove it. Also notice that your account id will be associated to this new entry.',
     'select_all' => 'Zaznacz wszystko',
-    'unselect_all' => 'Unselect all',
+    'unselect_all' => 'Odznacz wszystko',
     'no_data_to_display' => 'No data to display! Either no folder already exists, either you have access to none of them.',
-    'server' => 'Server',
+    'server' => 'Serwer',
     'data_refreshed' => 'Data refreshed',
     'loading_image' => 'Loading image',
     'compare_with_another_role' => 'Compare with another role',
@@ -318,20 +318,20 @@
     'duo_security' => 'Duo Security',
     'yubico' => 'Yubico Authenticator',
     'website_canal' => 'Kliknij aby otworzyć stronę internetową Teampass',
-    '2fa_credential_not_correct' => '2FA credential is not correct',
+    '2fa_credential_not_correct' => 'Poświadczenia 2FA są nieprawidłowe',
     'no_change_performed' => 'No change was performed.',
-    'password_strength' => 'Siła haseł',
-    'new_password_required' => 'A new password is required',
+    'password_strength' => 'Siła hasła',
+    'new_password_required' => 'Wymagane jest nowe hasło',
     'limited_search' => 'Limited search',
     'empty_psk' => 'Saltkey is missing',
     'currently_no_favorites' => 'Aktualnie nie posiadasz żadnych ulubionych wpisów',
     'favorites' => 'Ulubione',
     'confirm_item_move' => 'You have selected Moving"... are you sure?"',
-    'copy_to_clipboard' => 'Copy to clipboard',
-    'please_wait_while_loading' => 'Please wait while data is loading',
-    'defect_report' => 'Bug report',
+    'copy_to_clipboard' => 'Skopiuj do schowka',
+    'please_wait_while_loading' => 'Proszę poczekać na załadowanie danych',
+    'defect_report' => 'Zgłoś błąd',
     'actions' => 'Akcje',
-    'no_user' => 'Wrong user',
+    'no_user' => 'Nieprawidłowy użytkownik',
     'generate_api_token' => 'Generate new API token',
     'upload_feature' => 'Upload feature',
     'profile' => 'Profil',
@@ -345,38 +345,38 @@
     'nothing_to_save' => 'Nothing to save',
     'notification_engaged' => 'You are receiving notifications on Item change',
     'notification_not_engaged' => 'You are not receiving notifications on Item change',
-    'viewed_number' => 'Number of Views',
-    'automatic_deletion_engaged' => 'Automatic deletion',
+    'viewed_number' => 'Liczba wyświetleń',
+    'automatic_deletion_engaged' => 'Automatyczne kasowanie',
     'auto_update_enabled' => 'Automatic user password change enabled. Next change planned',
     'copy_folder' => 'Kopiuj katalog',
-    'select_source_folder' => 'Select folder to copy',
-    'select_destination_folder' => 'Select destination folder',
-    'delete_folder' => 'Folder delete',
-    'select_folder_to_delete' => 'Select folder to delete',
+    'select_source_folder' => 'Wybierz katalog do kopiowania',
+    'select_destination_folder' => 'Wskaż katalog docelowy',
+    'delete_folder' => 'Wykasuj katalog',
+    'select_folder_to_delete' => 'Wskaż folder do wykasowani',
     'folder_delete_confirm' => 'The seleted folder and its items will be deleted. Please tick the checkbox to confirm this deletion.',
-    'json_error_format' => 'Bad JSON format',
-    'password_cannot_be_empty' => 'Password cannot be empty',
-    'password_too_long' => 'Password is too long',
+    'json_error_format' => 'Niepoprawny format JSON',
+    'password_cannot_be_empty' => 'Hasło nie może być puste',
+    'password_too_long' => 'Hasło ma zbyt dużo znaków',
     'error_no_action_identified' => 'No action has been identified',
     'ldap' => 'LDAP',
     'emails' => 'E-maile',
-    'backups' => 'Kupie zapasowe',
+    'backups' => 'Kopie zapasowe',
     'api' => 'API',
-    'add_folder' => 'Dodaj nowy folder',
-    'select_folder_parent' => 'Wybierz folder nadrzędny',
+    'add_folder' => 'Dodaj nowy katalog',
+    'select_folder_parent' => 'Wybierz katalog nadrzędny',
     'add' => 'Dodaj',
     'key_is_not_correct' => 'Provided session key is not correct',
     'suggestion_information' => 'You can suggest any change on this item to the author. Use the above form to make your change proposals and click the Perform button to inform the author.',
-    'email_address' => 'Email address',
+    'email_address' => 'Adres email',
     'enter_email' => 'Enter email',
-    'notification' => 'Notification',
+    'notification' => 'Powiadomienia',
     'notify_on_change' => 'Notify me on changes',
     'notification_message' => 'You can use this setting to get notified or not on changes performed on this item.',
-    'share_item' => 'Share item',
+    'share_item' => 'Udostępnij element',
     'share_item_message' => 'You can share this item with someone. Please provide a valid email and click Perform button.',
     'delete_item_message' => 'You have decided to delete this selected item. You need to confirm your choice by clicking Perform button.',
     'warning' => 'Warning',
-    'information' => 'Informacje',
+    'information' => 'Informacja',
     'perform' => 'Perform',
     'delete_item' => 'Delete item',
     'copy_item' => 'Copy item',
@@ -390,7 +390,7 @@
     'changes_ongoing' => 'Some changes were not saved. Do you confirm to quit without saving?',
     'no_file_to_upload' => 'No file to upload',
     'add_files_and_click_start' => 'Add files to the upload queue and click the start button.',
-    'select_files' => 'Select files',
+    'select_files' => 'Wybierz pliki',
     'attached_files' => 'Attached files',
     'visible_by' => 'Widoczne dla',
     'anounce_item_by_email' => 'Anounce this item to users',
@@ -398,9 +398,9 @@
     'allow_item_to_be_deleted' => 'Allow this item to be deleted on next condition',
     'item_deleted_after_being_viewed_x_times' => 'Item will be deleted after being viewed X times',
     'item_deleted_after_date' => 'Item will be deleted after defined date',
-    'password' => 'Password',
+    'password' => 'Hasło',
     'save' => 'Zapisz',
-    'folder' => 'Folder',
+    'folder' => 'Katalog',
     'main' => 'Main',
     'fields' => 'Pola',
     'details' => 'Szczegóły',
@@ -409,19 +409,19 @@
     'no_custom_fields' => 'No custom fields',
     'no_attachment' => 'No attachment',
     'logout_confirm' => 'Logout? Please confirm.',
-    'saved' => 'Saved',
+    'saved' => 'Zapisane',
     'attachments' => 'Załączniki',
     'success' => 'Success',
     'server_answer_error' => 'An error appears. Answer from Server cannot be parsed!',
     'server_returned_data' => 'Returned data',
-    'version_alone' => 'version',
+    'version_alone' => 'wersja',
     'statistics' => 'Statystyki',
     'options' => 'Opcje',
     'users' => 'Użytkownicy',
-    'folders' => 'Foldery',
+    'folders' => 'Katalog',
     'find_message' => '<i class="fa fa-info-circle"></i> Ilość wyników znalezionych: %X% ',
     'auto_update_server_password_info' => 'Kliknięcie start, automatycznie wykona poniższe kroki:<ul><li>Połączenie przez SSH do serwera wykorzystując dane logowania i pole `URL`,</li><li>Zmiana hasła użytkownika na serwerze</il><li>Zachowanie nowego hasła w Teampass</il><li>Zakończenie połączenia SSH</li></ul><br /><b>Upewnij się, że użytkownik posiada prawa do zalogowania się i zmiany hasła na serwerze (jeśli nie, określ hasło użytkownika root) przed uruchomieniem.</b> ',
-    'share' => 'Podziel się elementem',
+    'share' => 'Udostępnij',
     'notify' => 'Notify',
     'error_no_selected_folder' => 'Musisz wybrać folder',
     'email_subject_item_updated' => 'Hasło zostało zaktualizowane.',
@@ -438,7 +438,7 @@
     'auto_create_folder_role' => 'Dodaj Folder oraz Rolę dla ',
     'start_upload' => 'Rozpocznij wysyłanie plików',
     'error_upload_runtime_not_found' => 'Opcja uaktualnienia: Nie znaleziono wykonania.',
-    'user_profile_api_key' => 'Your API key',
+    'user_profile_api_key' => 'Twój klucz API',
     'index_change_pw' => 'Zmień hasło',
     'admin_2factors_authentication_setting' => 'Uaktywnij 2-poziomową autoryzację dla Google',
     'admin_2factors_authentication_setting_tip' => '<span style="font-size:11px;max-width:300px;">Uwierzytelnianie dwuskładnikowe Google umożliwia dodanie kolejnego zabezpieczenia do logowania się użytkownika. W momencie gdy użytkownik chce logować się do TeamPass w ten sposób generowany jest jednorazowy kod QR. Kod QR musi zostać zeskanowany, aby otrzymać jednorazowe hasło.<br />UWAGA: Wymaga to skanera kodów QR (np. smartphon-a) oraz dostępu do internetu przy pierwszym użyciu.</span> ',
@@ -449,11 +449,11 @@
     'email_share_item_subject' => '[TeamPass] Element został Ci udostępniony',
     'email_share_item_mail' => 'Witaj,<br><br><u>#tp_user#</u> udostępnia Ci pozycję <b>#tp_item#</b>.<br>Kliknij na <a href="#tp_link#">LINK</a> aby ją obejrzeć.<br><br>Pozdrawiam.',
     'index_maintenance_mode_admin' => 'Tryb konserwacji został aktywowany. Normalni Użytkownicy nie mogą się zalogować do TeamPass.',
-    '2fa_authentication_selector' => 'Select a 2 factor authenticator method',
+    '2fa_authentication_selector' => 'Wybierz metodę uwierzytelnienia 2FA',
     'upload_empty_file' => 'Upload empty file',
     'upload_any_extension_file' => 'Upload any extension file',
     'upload_any_extension_file_tip' => 'When enabled, this option will allow users to upload any kind of files.',
-    'log_in' => 'Log In',
+    'log_in' => 'Zaloguj',
     'create_item_based_upon_template' => 'Use of template for Item',
     'create_item_based_upon_template_tip' => 'When enabled, this feature permits the author to select a template made of Custom Fields. Notice that this feature requires Custom Fields to be enabled too.',
     'main_template' => 'Use as template',
@@ -464,7 +464,7 @@
     'masked_text' => 'Masked text',
     'textarea' => 'Textarea',
     'admin_yubico_authentication_setting' => 'Enable Yubico authentication',
-    'yubico_user_id' => 'Client ID',
+    'yubico_user_id' => 'ID użytkownika',
     'yubico_user_key' => 'Secret KEY',
     'yubico_bad_code' => 'Wrong Yubico information',
     'press_your_yubico_key' => 'Press your Yubico key',
@@ -496,7 +496,7 @@
     'settings_item_extra_fields' => 'Niestandardowe pola elementów włączone',
     'settings_item_extra_fields_tip' => 'Ta opcja zezwala na dodanie do pozycji dodatkowych pól, które są zdefiniowane i podzielone na kategorie przez administratora. Wszystkie dane są szyfrowane. Opcja ta wykorzystuje dodatkowe zapytania SQL (około 5 razy więcej na dodatkowe Pole podczas aktualizacji pozycji) co może wymagać więcej czasu na zakończenie działania. Zależnie od możliwości serwera.',
     'settings_ldap_type' => 'Typ serwera LDAP',
-    'server_time' => 'Czas serwera',
+    'server_time' => 'Czas na serwerze',
     'settings_tree_counters' => 'Pokaż więcej liczników w drzewie folderów',
     'settings_tree_counters_tip' => 'Po wybraniu tej opcji przy każdym katalogu będą wyświetlane 3 liczniki: liczba pozycji w folderze, liczba pozycji w podfolderze, liczba podfolderów. Włączenie tej opcji może wydłużyć czas potrzebny na wyświetlenie drzewa katalogów.',
     'admin_action_check_pf' => 'Stwórz osobisty folder dla wszystkich użytkowników (jeśli go nie posiadają)',
@@ -997,7 +997,7 @@
     'settings_api_token_duration_tip' => 'Delay during wich the generated JWT token is valid. After this delay, it is requested to post an authorize request to the API.',
     'show_encryption_code_to_admin' => 'TTo jest zaszyfrowany kod, którego użytkownik będzie potrzebował podczas tego logowania. Poprosiłeś o jego obejrzenie, skopiuj go i udostępnij w bezpieczny sposób. Kod to',
     'previous_password' => 'Previous password used to connect to Teampass',
-    'generate_new_otp' => 'Generate new OTP',
+    'generate_new_otp' => 'Wygeneruj nowy kod OTP',
     'generate_new_otp_informations' => 'This operation consists in generating from scratch all keys for the selected user. As a consequence, the user will have to provide the new generated OTP at next login.',
     'html' => 'html',
     'execution_time' => 'Execution time',
@@ -1017,48 +1017,52 @@
     'task_in_progress_user_not_active' => 'Tasks in progress - User not active',
     'enable_tasks_manager' => 'Enable background tasks with cron manager',
     'enable_tasks_manager_tip' => 'This option should be enabled if you noticed that some tasks take long time. This permits to enable to handle those tasks using a background job performed by server cron manager. See documentation for more details.',
-    'sync_new_ldap_password' => 'Synchronize new password',
+    'sync_new_ldap_password' => 'Zsynchronizuj nowe hasło',
     'error_new_ldap_password_detected' => 'It seems your password has changed and Teampass requires it to encrypt your master private key.',
     'settings_ldap_tls_certifacte_check' => 'Certificate check for LDAP TLS',
     'settings_ldap_tls_certifacte_check_tip' => 'Specifies the certificate checking strategy. <a href="https://gist.github.com/heiglandreas/8a299a6f47a13ba463c3f2da41c679f7" target="_blank">More information</a>.',
-    'user_keys_management' => 'User keys management',
-    'sending_emails' => 'Sending emails',
-    'task_frequency' => 'Frequency (in minutes)',
+    'user_keys_management' => 'Zarządzanie kluczami użytkownika',
+    'sending_emails' => 'Wysyłanie wiadomości email',
+    'task_frequency' => 'Częstotliwość (w minutach)',
     'tasks_information' => 'Task relies on a dedicated cron job. For this, it is requested to add a new entry to your crontab to run Teampass scheduler every minute.<br>Next entry to be added:<br><code>* * * * * path/to/phpbin #teampass_path#/sources/scheduler.php</code><br><br>Note: please adapt the path to php bin (in most cases, it can be replaced by <code>php</code>).',
-    'bad_duo_mfa' => 'Bad DUO code',
-    'creation_date' => 'Creation date',
-    'never' => 'Never',
-    'loading_main_page' => 'Please wait, loading main page ...',
+    'bad_duo_mfa' => 'Niepoprawny kod DUO',
+    'creation_date' => 'Data utworzenia',
+    'never' => 'Nigdy',
+    'loading_main_page' => 'Proszę poczekać, ładowana jest strona główna …',
     'alert_session_not_consistent' => 'Current session is not consistent and needs to be refreshed. The page will reload.',
     'link' => 'Link',
     'error_not_allowed_to_authenticate' => 'You are not allowed to authenticate',
     'enable_tasks_log' => 'Enable cron job log',
     'enable_tasks_log_tip' => 'Permits to log all tasks performed by the cron job inside table <i>processes_log</i>. Could be useful for checking events.',
-    'items_and_folders_statistics' => 'Items and folders statistics',
-    'item_copying' => 'Item is being copied',
+    'items_and_folders_statistics' => 'Elementy w folderze statystyk',
+    'item_copying' => 'Rozpoczęto kopiowanie elementów',
     'upgrade_requested' => 'Teampass database is not up to date.',
     'upgrade_requested_more' => 'Some inconsistencies have been identified between files and configuration, Your administrator should perform upgrade process before you continue.',
-    'settings_ldap_group_object_filter' => 'LDAP group object filter',
+    'settings_ldap_group_object_filter' => 'Filtr LDAP dla grup',
     'settings_ldap_group_object_filter_tip' => 'LDAP filter to use to find the group object. For example: (objectClass=group1)(objectClass=group2)',
     'settings_ad_users_with_ad_groups' => 'AD user roles mapped with their AD groups',
     'settings_ad_users_with_ad_groups_tip' => 'Permits to map AD user roles with their AD groups. Those roles will be added to the one defined in their profile.',
     'settings_ad_user_auto_creation' => 'AD user to get created automatically',
     'settings_ad_user_auto_creation_tip' => 'Permits an AD user to get automatically created in Teampass when he logs in for the first time. Notice that if option AD user roles mapped with their AD groups enabled then he will get the roles mapped with his AD groups.',
-    'settings_ldap_guid_attibute' => 'LDAP GUID attribute',
+    'settings_ldap_guid_attibute' => 'Atrybut GUID LDAP',
     'settings_ldap_guid_attibute_tip' => 'LDAP attribute to use to identify the GUID of an object. For example: objectGUID, objectSid, GUID, gidNumber, ...',
-    'ad_group' => 'AD group',
+    'ad_group' => 'Grupy AD',
     'mapped_with_role' => 'Mapped with role',
     'ad_groupe_and_roles_mapping' => 'AD group and roles mapping',
     'select_adgroup_mapping' => 'Select the role to map with current AD group',
     'enable_backlog_mail' => 'Enable sending backlog emails',
-    'provide_label' => 'Provide a label',
-    'uploading' => 'Uploading...',
+    'provide_label' => 'Wprowadź etykietę',
+    'uploading' => 'Wgrywanie…',
     'keys_encryption_not_ready' => 'Be informed that your password keys are currently in process of being created. Please wait a few minutes more.',
-    'account_not_ready' => 'Account in construction',
-    'add_new_job' => 'Add new job',
+    'account_not_ready' => 'Konto jest aktualnie tworzone',
+    'add_new_job' => 'Dodaj nowe zadanie',
     'tasks_cron_not_running' => 'Cron job is not set. Please edit crontab with your server user (usually www-data) with command <code>crontab -u www-data -e</code>.<br>Or press the button to try its creation automatically.',
-    'tasks_cron_running' => 'Cron job is correctly set',
-    'currently_using_version' => 'Current version loaded',
+    'tasks_cron_running' => 'Zadanie Cron zostało poprawnie utworzone',
+    'currently_using_version' => 'Aktualna wersja',
     'git_commit_value' => 'Git commit value',
+    'generate_new_keys' => 'Generate new keys',
+    'generate_new_keys_info' => 'By continuing, you will generate new keys for all objects you have access to. This should only be done if you have no password shown. A code will be provided. Store it carrefully, it will be asked once the process is finished.',
+    'encryption_key' => 'Encryption key',
+    'generate_new_keys_end' => 'Process is on going in background and could take several minutes. You can now close this window.',
 
 );
diff --git a/includes/language/portuguese.php b/includes/language/portuguese.php
index 298250b37..7395981db 100755
--- a/includes/language/portuguese.php
+++ b/includes/language/portuguese.php
@@ -1060,5 +1060,9 @@
     'tasks_cron_running' => 'Cron job is correctly set',
     'currently_using_version' => 'Current version loaded',
     'git_commit_value' => 'Git commit value',
+    'generate_new_keys' => 'Generate new keys',
+    'generate_new_keys_info' => 'By continuing, you will generate new keys for all objects you have access to. This should only be done if you have no password shown. A code will be provided. Store it carrefully, it will be asked once the process is finished.',
+    'encryption_key' => 'Encryption key',
+    'generate_new_keys_end' => 'Process is on going in background and could take several minutes. You can now close this window.',
 
 );
diff --git a/includes/language/portuguese_br.php b/includes/language/portuguese_br.php
index 4a9ac7bd7..bdb564dc7 100755
--- a/includes/language/portuguese_br.php
+++ b/includes/language/portuguese_br.php
@@ -1060,5 +1060,9 @@
     'tasks_cron_running' => 'Cron job is correctly set',
     'currently_using_version' => 'Current version loaded',
     'git_commit_value' => 'Git commit value',
+    'generate_new_keys' => 'Generate new keys',
+    'generate_new_keys_info' => 'By continuing, you will generate new keys for all objects you have access to. This should only be done if you have no password shown. A code will be provided. Store it carrefully, it will be asked once the process is finished.',
+    'encryption_key' => 'Encryption key',
+    'generate_new_keys_end' => 'Process is on going in background and could take several minutes. You can now close this window.',
 
 );
diff --git a/includes/language/romanian.php b/includes/language/romanian.php
index 6ae632fd7..b8f87cba9 100755
--- a/includes/language/romanian.php
+++ b/includes/language/romanian.php
@@ -1060,5 +1060,9 @@
     'tasks_cron_running' => 'Cron job is correctly set',
     'currently_using_version' => 'Current version loaded',
     'git_commit_value' => 'Git commit value',
+    'generate_new_keys' => 'Generate new keys',
+    'generate_new_keys_info' => 'By continuing, you will generate new keys for all objects you have access to. This should only be done if you have no password shown. A code will be provided. Store it carrefully, it will be asked once the process is finished.',
+    'encryption_key' => 'Encryption key',
+    'generate_new_keys_end' => 'Process is on going in background and could take several minutes. You can now close this window.',
 
 );
diff --git a/includes/language/russian.php b/includes/language/russian.php
index 2189855df..b3fe007c9 100755
--- a/includes/language/russian.php
+++ b/includes/language/russian.php
@@ -1061,5 +1061,9 @@
     'tasks_cron_running' => 'Cron job is correctly set',
     'currently_using_version' => 'Current version loaded',
     'git_commit_value' => 'Git commit value',
+    'generate_new_keys' => 'Generate new keys',
+    'generate_new_keys_info' => 'By continuing, you will generate new keys for all objects you have access to. This should only be done if you have no password shown. A code will be provided. Store it carrefully, it will be asked once the process is finished.',
+    'encryption_key' => 'Encryption key',
+    'generate_new_keys_end' => 'Process is on going in background and could take several minutes. You can now close this window.',
 
 );
diff --git a/includes/language/spanish.php b/includes/language/spanish.php
index 31c5b0135..888f74dfc 100755
--- a/includes/language/spanish.php
+++ b/includes/language/spanish.php
@@ -1060,5 +1060,9 @@
     'tasks_cron_running' => 'Cron job is correctly set',
     'currently_using_version' => 'Current version loaded',
     'git_commit_value' => 'Git commit value',
+    'generate_new_keys' => 'Generate new keys',
+    'generate_new_keys_info' => 'By continuing, you will generate new keys for all objects you have access to. This should only be done if you have no password shown. A code will be provided. Store it carrefully, it will be asked once the process is finished.',
+    'encryption_key' => 'Encryption key',
+    'generate_new_keys_end' => 'Process is on going in background and could take several minutes. You can now close this window.',
 
 );
diff --git a/includes/language/swedish.php b/includes/language/swedish.php
index 6e7474f8b..cdbe1ce35 100755
--- a/includes/language/swedish.php
+++ b/includes/language/swedish.php
@@ -1060,5 +1060,9 @@
     'tasks_cron_running' => 'Cron job is correctly set',
     'currently_using_version' => 'Current version loaded',
     'git_commit_value' => 'Git commit value',
+    'generate_new_keys' => 'Generate new keys',
+    'generate_new_keys_info' => 'By continuing, you will generate new keys for all objects you have access to. This should only be done if you have no password shown. A code will be provided. Store it carrefully, it will be asked once the process is finished.',
+    'encryption_key' => 'Encryption key',
+    'generate_new_keys_end' => 'Process is on going in background and could take several minutes. You can now close this window.',
 
 );
diff --git a/includes/language/turkish.php b/includes/language/turkish.php
index 3c0bad11a..86a80aa7c 100755
--- a/includes/language/turkish.php
+++ b/includes/language/turkish.php
@@ -1060,5 +1060,9 @@
     'tasks_cron_running' => 'Cron job is correctly set',
     'currently_using_version' => 'Current version loaded',
     'git_commit_value' => 'Git commit value',
+    'generate_new_keys' => 'Generate new keys',
+    'generate_new_keys_info' => 'By continuing, you will generate new keys for all objects you have access to. This should only be done if you have no password shown. A code will be provided. Store it carrefully, it will be asked once the process is finished.',
+    'encryption_key' => 'Encryption key',
+    'generate_new_keys_end' => 'Process is on going in background and could take several minutes. You can now close this window.',
 
 );
diff --git a/includes/language/ukrainian.php b/includes/language/ukrainian.php
index acd44df5b..d4dc8dd6c 100755
--- a/includes/language/ukrainian.php
+++ b/includes/language/ukrainian.php
@@ -1060,5 +1060,9 @@
     'tasks_cron_running' => 'Cron job is correctly set',
     'currently_using_version' => 'Current version loaded',
     'git_commit_value' => 'Git commit value',
+    'generate_new_keys' => 'Generate new keys',
+    'generate_new_keys_info' => 'By continuing, you will generate new keys for all objects you have access to. This should only be done if you have no password shown. A code will be provided. Store it carrefully, it will be asked once the process is finished.',
+    'encryption_key' => 'Encryption key',
+    'generate_new_keys_end' => 'Process is on going in background and could take several minutes. You can now close this window.',
 
 );
diff --git a/includes/language/vietnamese.php b/includes/language/vietnamese.php
index edf482c7c..712c997fa 100755
--- a/includes/language/vietnamese.php
+++ b/includes/language/vietnamese.php
@@ -1060,5 +1060,9 @@
     'tasks_cron_running' => 'Cron job is correctly set',
     'currently_using_version' => 'Current version loaded',
     'git_commit_value' => 'Git commit value',
+    'generate_new_keys' => 'Generate new keys',
+    'generate_new_keys_info' => 'By continuing, you will generate new keys for all objects you have access to. This should only be done if you have no password shown. A code will be provided. Store it carrefully, it will be asked once the process is finished.',
+    'encryption_key' => 'Encryption key',
+    'generate_new_keys_end' => 'Process is on going in background and could take several minutes. You can now close this window.',
 
 );
diff --git a/index.php b/index.php
index 236decb9c..522d50e94 100755
--- a/index.php
+++ b/index.php
@@ -270,7 +270,7 @@
                 <!-- Left navbar links -->
                 <ul class="navbar-nav">
                     <li class="nav-item">
-                        <a class="nav-link" data-widget="pushmenu" href="#"><i class="fas fa-bars"></i></a>
+                        <a class="nav-link" data-widget="pushmenu" href="#"><i class="fa-solid fa-bars"></i></a>
                     </li>
                     <?php
                         if ($get['page'] === 'items') {
@@ -310,25 +310,28 @@
                                     <i class="far fa-clock fa-fw mr-2"></i><?php echo langHdl('index_add_one_hour'); ?></a>
                                 <div class="dropdown-divider"></div>
                                 <a class="dropdown-item user-menu" href="#" data-name="profile">
-                                    <i class="fas fa-user-circle fa-fw mr-2"></i><?php echo langHdl('my_profile'); ?>
+                                    <i class="fa-solid fa-user-circle fa-fw mr-2"></i><?php echo langHdl('my_profile'); ?>
                                 </a>
                                 <?php
                                     if (empty($session_auth_type) === false && $session_auth_type !== 'ldap') {
                                         ?>
                                     <a class="dropdown-item user-menu" href="#" data-name="password-change">
-                                        <i class="fas fa-lock fa-fw mr-2"></i><?php echo langHdl('index_change_pw'); ?>
+                                        <i class="fa-solid fa-lock fa-fw mr-2"></i><?php echo langHdl('index_change_pw'); ?>
                                     </a>
                                 <?php
                                     } elseif ($session_auth_type === 'ldap') {
                                         ?>
                                     <a class="dropdown-item user-menu" href="#" data-name="sync-new-ldap-password">
-                                        <i class="fas fa-key fa-fw mr-2"></i><?php echo langHdl('sync_new_ldap_password'); ?>
+                                        <i class="fa-solid fa-key fa-fw mr-2"></i><?php echo langHdl('sync_new_ldap_password'); ?>
                                     </a>
                                 <?php
                                     } ?>
+                                <a class="dropdown-item user-menu" href="#" data-name="generate-new_keys">
+                                    <i class="fa-solid fa-mask fa-fw mr-2"></i><?php echo langHdl('generate_new_keys'); ?>
+                                </a>
                                 <div class="dropdown-divider"></div>
                                 <a class="dropdown-item user-menu" href="#" data-name="logout">
-                                    <i class="fas fa-sign-out-alt fa-fw mr-2"></i><?php echo langHdl('disconnect'); ?>
+                                    <i class="fa-solid fa-sign-out-alt fa-fw mr-2"></i><?php echo langHdl('disconnect'); ?>
                                 </a>
                             </div>
                         </div>
@@ -337,7 +340,7 @@
                         <span class="align-middle infotip ml-2 text-info" title="<?php echo langHdl('index_expiration_in'); ?>" id="countdown"></span>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link" data-widget="control-sidebar" data-slide="true" href="#" id="controlsidebar"><i class="fas fa-th-large"></i></a>
+                        <a class="nav-link" data-widget="control-sidebar" data-slide="true" href="#" id="controlsidebar"><i class="fa-solid fa-th-large"></i></a>
                     </li>
                 </ul>
             </nav>
@@ -362,7 +365,7 @@
                                     echo '
                     <li class="nav-item">
                         <a href="#" data-name="items" class="nav-link', $get['page'] === 'items' ? ' active' : '', '">
-                        <i class="nav-icon fas fa-key"></i>
+                        <i class="nav-icon fa-solid fa-key"></i>
                         <p>
                             ' . langHdl('pw') . '
                         </p>
@@ -375,7 +378,7 @@
         echo '
                     <li class="nav-item">
                         <a href="#" data-name="import" class="nav-link', $get['page'] === 'import' ? ' active' : '', '">
-                        <i class="nav-icon fas fa-file-import"></i>
+                        <i class="nav-icon fa-solid fa-file-import"></i>
                         <p>
                             ' . langHdl('import') . '
                         </p>
@@ -396,7 +399,7 @@
         echo '
                     <li class="nav-item">
                         <a href="#" data-name="export" class="nav-link', $get['page'] === 'export' ? ' active' : '', '">
-                        <i class="nav-icon fas fa-file-export"></i>
+                        <i class="nav-icon fa-solid fa-file-export"></i>
                         <p>
                             ' . langHdl('export') . '
                         </p>
@@ -410,7 +413,7 @@
         echo '
                     <li class="nav-item">
                         <a href="#" data-name="offline" class="nav-link', $get['page'] === 'offline' ? ' active' : '' ,'">
-                        <i class="nav-icon fas fa-plug"></i>
+                        <i class="nav-icon fa-solid fa-plug"></i>
                         <p>
                             '.langHdl('offline').'
                         </p>
@@ -423,7 +426,7 @@
         echo '
                     <li class="nav-item">
                         <a href="#" data-name="search" class="nav-link', $get['page'] === 'search' ? ' active' : '', '">
-                        <i class="nav-icon fas fa-search"></i>
+                        <i class="nav-icon fa-solid fa-search"></i>
                         <p>
                             ' . langHdl('find') . '
                         </p>
@@ -439,7 +442,7 @@
         echo '
                     <li class="nav-item">
                         <a href="#" data-name="favourites" class="nav-link', $get['page'] === 'admin' ? ' favourites' : '', '">
-                        <i class="nav-icon fas fa-star"></i>
+                        <i class="nav-icon fa-solid fa-star"></i>
                         <p>
                             ' . langHdl('favorites') . '
                         </p>
@@ -453,7 +456,7 @@
             echo '
                         <li class="nav-item">
                             <a href="#" data-name="kb" class="nav-link', $get['page'] === 'kb' ? ' active' : '' ,'">
-                            <i class="nav-icon fas fa-map-signs"></i>
+                            <i class="nav-icon fa-solid fa-map-signs"></i>
                             <p>
     '.langHdl('kb_menu').'
                             </p>
@@ -469,7 +472,7 @@
         echo '
                     <li class="nav-item">
                         <a href="#" data-name="suggestion" class="nav-link', $get['page'] === 'suggestion' ? ' active' : '', '">
-                        <i class="nav-icon fas fa-lightbulb"></i>
+                        <i class="nav-icon fa-solid fa-lightbulb"></i>
                         <p>
                             ' . langHdl('suggestion_menu') . '
                         </p>
@@ -482,7 +485,7 @@
         echo '
                     <li class="nav-item">
                         <a href="#" data-name="admin" class="nav-link', $get['page'] === 'admin' ? ' active' : '', '">
-                        <i class="nav-icon fas fa-info"></i>
+                        <i class="nav-icon fa-solid fa-info"></i>
                         <p>
                             ' . langHdl('admin_main') . '
                         </p>
@@ -490,64 +493,64 @@
                     </li>
                     <li class="nav-item has-treeview', $menuAdmin === true ? ' menu-open' : '', '">
                         <a href="#" class="nav-link">
-                            <i class="nav-icon fas fa-wrench"></i>
+                            <i class="nav-icon fa-solid fa-wrench"></i>
                             <p>
                                 ' . langHdl('admin_settings') . '
-                                <i class="fas fa-angle-left right"></i>
+                                <i class="fa-solid fa-angle-left right"></i>
                             </p>
                         </a>
                         <ul class="nav-item nav-treeview">
                             <li class="nav-item">
                                 <a href="#" data-name="options" class="nav-link', $get['page'] === 'options' ? ' active' : '', '">
-                                    <i class="fas fa-check-double nav-icon"></i>
+                                    <i class="fa-solid fa-check-double nav-icon"></i>
                                     <p>' . langHdl('options') . '</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="2fa" class="nav-link', $get['page'] === '2fa' ? ' active' : '', '">
-                                    <i class="fas fa-qrcode nav-icon"></i>
+                                    <i class="fa-solid fa-qrcode nav-icon"></i>
                                     <p>' . langHdl('mfa_short') . '</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="api" class="nav-link', $get['page'] === 'api' ? ' active' : '', '">
-                                    <i class="fas fa-cubes nav-icon"></i>
+                                    <i class="fa-solid fa-cubes nav-icon"></i>
                                     <p>' . langHdl('api') . '</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="backups" class="nav-link', $get['page'] === 'backups' ? ' active' : '', '">
-                                    <i class="fas fa-database nav-icon"></i>
+                                    <i class="fa-solid fa-database nav-icon"></i>
                                     <p>' . langHdl('backups') . '</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="emails" class="nav-link', $get['page'] === 'emails' ? ' active' : '', '">
-                                    <i class="fas fa-envelope nav-icon"></i>
+                                    <i class="fa-solid fa-envelope nav-icon"></i>
                                     <p>' . langHdl('emails') . '</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="fields" class="nav-link', $get['page'] === 'fields' ? ' active' : '', '">
-                                    <i class="fas fa-keyboard nav-icon"></i>
+                                    <i class="fa-solid fa-keyboard nav-icon"></i>
                                     <p>' . langHdl('fields') . '</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="ldap" class="nav-link', $get['page'] === 'ldap' ? ' active' : '', '">
-                                    <i class="fas fa-id-card nav-icon"></i>
+                                    <i class="fa-solid fa-id-card nav-icon"></i>
                                     <p>' . langHdl('ldap') . '</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="uploads" class="nav-link', $get['page'] === 'uploads' ? ' active' : '', '">
-                                    <i class="fas fa-file-upload nav-icon"></i>
+                                    <i class="fa-solid fa-file-upload nav-icon"></i>
                                     <p>' . langHdl('uploads') . '</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="statistics" class="nav-link', $get['page'] === 'statistics' ? ' active' : '', '">
-                                    <i class="fas fa-chart-bar nav-icon"></i>
+                                    <i class="fa-solid fa-chart-bar nav-icon"></i>
                                     <p>' . langHdl('statistics') . '</p>
                                 </a>
                             </li>
@@ -558,7 +561,7 @@
                         echo '
                     <li class="nav-item">
                         <a href="#" data-name="tasks" class="nav-link', $get['page'] === 'tasks' ? ' active' : '', '">
-                        <i class="fas fa-tasks nav-icon"></i>
+                        <i class="fa-solid fa-tasks nav-icon"></i>
                         <p>' . langHdl('tasks') . '</p>
                         </a>
                     </li>';
@@ -566,7 +569,7 @@
                     echo '
                     <li class="nav-item">
                         <a href="#" data-name="actions" class="nav-link', $get['page'] === 'actions' ? ' active' : '', '">
-                        <i class="nav-icon fas fa-cogs"></i>
+                        <i class="nav-icon fa-solid fa-cogs"></i>
                         <p>
                             ' . langHdl('actions') . '
                         </p>
@@ -582,7 +585,7 @@
         echo '
                     <li class="nav-item">
                         <a href="#" data-name="folders" class="nav-link', $get['page'] === 'folders' ? ' active' : '', '">
-                        <i class="nav-icon fas fa-folder-open"></i>
+                        <i class="nav-icon fa-solid fa-folder-open"></i>
                         <p>
                             ' . langHdl('folders') . '
                         </p>
@@ -590,7 +593,7 @@
                     </li>
                     <li class="nav-item">
                         <a href="#" data-name="roles" class="nav-link', $get['page'] === 'roles' ? ' active' : '', '">
-                        <i class="nav-icon fas fa-graduation-cap"></i>
+                        <i class="nav-icon fa-solid fa-graduation-cap"></i>
                         <p>
                             ' . langHdl('roles') . '
                         </p>
@@ -598,7 +601,7 @@
                     </li>
                     <li class="nav-item">
                         <a href="#" data-name="users" class="nav-link', $get['page'] === 'users' ? ' active' : '', '">
-                        <i class="nav-icon fas fa-users"></i>
+                        <i class="nav-icon fa-solid fa-users"></i>
                         <p>
                             ' . langHdl('users') . '
                         </p>
@@ -606,8 +609,8 @@
                     </li>
                     <li class="nav-item has-treeview', $menuUtilities === true ? ' menu-open' : '', '">
                         <a href="#" class="nav-link">
-                        <i class="nav-icon fas fa-cubes"></i>
-                        <p>' . langHdl('admin_views') . '<i class="fas fa-angle-left right"></i></p>
+                        <i class="nav-icon fa-solid fa-cubes"></i>
+                        <p>' . langHdl('admin_views') . '<i class="fa-solid fa-angle-left right"></i></p>
                         </a>
                         <ul class="nav nav-treeview">
                             <li class="nav-item">
@@ -618,19 +621,19 @@
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="utilities.deletion" class="nav-link', $get['page'] === 'utilities.deletion' ? ' active' : '', '">
-                                <i class="fas fa-trash-alt nav-icon"></i>
+                                <i class="fa-solid fa-trash-alt nav-icon"></i>
                                 <p>' . langHdl('deletion') . '</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="utilities.logs" class="nav-link', $get['page'] === 'utilities.logs' ? ' active' : '', '">
-                                <i class="fas fa-history nav-icon"></i>
+                                <i class="fa-solid fa-history nav-icon"></i>
                                 <p>' . langHdl('logs') . '</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="utilities.database" class="nav-link', $get['page'] === 'utilities.database' ? ' active' : '', '">
-                                <i class="fas fa-database nav-icon"></i>
+                                <i class="fa-solid fa-database nav-icon"></i>
                                 <p>' . langHdl('database') . '</p>
                                 </a>
                             </li>
@@ -642,13 +645,13 @@
                     <!-- /.sidebar-menu -->
                 <div class="menu-footer">
                     <div class="" id="sidebar-footer">
-                        <i class="fas fa-clock-o mr-2 infotip text-info pointer" title="<?php echo langHdl('server_time') . ' ' .
+                        <i class="fa-solid fa-clock-o mr-2 infotip text-info pointer" title="<?php echo langHdl('server_time') . ' ' .
                             date($SETTINGS['date_format'], (int) $server['request_time']) . ' - ' .
                             date($SETTINGS['time_format'], (int) $server['request_time']); ?>"></i>
-                        <i class="fas fa-users mr-2 infotip text-info pointer" title="<?php echo $session_nb_users_online . ' ' . langHdl('users_online'); ?>"></i>
-                        <a href="<?php echo DOCUMENTATION_URL; ?>" target="_blank" class="text-info"><i class="fas fa-book mr-2 infotip" title="<?php echo langHdl('documentation_canal'); ?>"></i></a>
+                        <i class="fa-solid fa-users mr-2 infotip text-info pointer" title="<?php echo $session_nb_users_online . ' ' . langHdl('users_online'); ?>"></i>
+                        <a href="<?php echo DOCUMENTATION_URL; ?>" target="_blank" class="text-info"><i class="fa-solid fa-book mr-2 infotip" title="<?php echo langHdl('documentation_canal'); ?>"></i></a>
                         <a href="<?php echo HELP_URL; ?>" target="_blank" class="text-info"><i class="fa-solid fa-life-ring mr-2 infotip" title="<?php echo langHdl('admin_help'); ?>"></i></a>
-                        <i class="fas fa-bug infotip pointer text-info" title="<?php echo langHdl('bugs_page'); ?>" onclick="generateBugReport()"></i>
+                        <i class="fa-solid fa-bug infotip pointer text-info" title="<?php echo langHdl('bugs_page'); ?>" onclick="generateBugReport()"></i>
                     </div>
                 </div>
                 </div>
@@ -662,7 +665,7 @@
                 <div class="card card-danger m-2 hidden" id="dialog-bug-report">
                     <div class="card-header">
                         <h3 class="card-title">
-                            <i class="fas fa-bug mr-2"></i>
+                            <i class="fa-solid fa-bug mr-2"></i>
                             <?php echo langHdl('defect_report'); ?>
                         </h3>
                     </div>
@@ -670,7 +673,7 @@
                         <div class="row">
                             <div class="col-sm-12 col-md-12">
                                 <div class="mb-2 alert alert-info">
-                                    <i class="icon fas fa-info mr-2"></i>
+                                    <i class="icon fa-solid fa-info mr-2"></i>
                                     <?php echo langHdl('bug_report_to_github'); ?>
                                 </div>
                                 <textarea class="form-control" style="min-height:300px;" id="dialog-bug-report-text" placeholder="<?php echo langHdl('please_wait_while_loading'); ?>"></textarea>
@@ -690,7 +693,7 @@
                 <div class="card card-warning m-3 hidden" id="dialog-user-change-password">
                     <div class="card-header">
                         <h3 class="card-title">
-                            <i class="fas fa-bullhorn mr-2"></i>
+                            <i class="fa-solid fa-bullhorn mr-2"></i>
                             <?php echo langHdl('your_attention_is_required'); ?>
                         </h3>
                     </div>
@@ -739,7 +742,7 @@
                 <div class="card card-warning m-3 hidden" id="dialog-ldap-user-change-password">
                     <div class="card-header">
                         <h3 class="card-title">
-                            <i class="fas fa-bullhorn mr-2"></i>
+                            <i class="fa-solid fa-bullhorn mr-2"></i>
                             <?php echo langHdl('your_attention_is_required'); ?>
                         </h3>
                     </div>
@@ -778,7 +781,7 @@
                 <div class="card card-warning m-3 hidden" id="dialog-admin-change-user-password">
                     <div class="card-header">
                         <h3 class="card-title">
-                            <i class="fas fa-bullhorn mr-2"></i>
+                            <i class="fa-solid fa-bullhorn mr-2"></i>
                             <?php echo langHdl('your_attention_is_required'); ?>
                         </h3>
                     </div>
@@ -807,7 +810,7 @@
                 <div class="card card-warning m-3 hidden" id="dialog-user-temporary-code">
                     <div class="card-header">
                         <h3 class="card-title">
-                            <i class="fas fa-bullhorn mr-2"></i>
+                            <i class="fa-solid fa-bullhorn mr-2"></i>
                             <?php echo langHdl('your_attention_is_required'); ?>
                         </h3>
                     </div>
@@ -846,7 +849,7 @@
                 <div class="card card-warning m-3 mt-3 hidden" id="dialog-encryption-keys">
                     <div class="card-header">
                         <h3 class="card-title">
-                            <i class="fas fa-bullhorn mr-2"></i>
+                            <i class="fa-solid fa-bullhorn mr-2"></i>
                             <?php echo langHdl('your_attention_is_required'); ?>
                         </h3>
                     </div>
@@ -854,7 +857,7 @@
                         <div class="row">
                             <div class="col-sm-12 col-md-12">
                                 <div class="mb-2 alert alert-info" id="warning-text-reencryption">
-                                    <i class="icon fas fa-info mr-2"></i>
+                                    <i class="icon fa-solid fa-info mr-2"></i>
                                     <?php echo langHdl('objects_encryption_explanation'); ?>
                                 </div>
                             </div>
@@ -873,7 +876,7 @@
                 <div class="card card-warning m-3 mt-3 hidden" id="dialog-ldap-user-build-keys-database">
                     <div class="card-header">
                         <h3 class="card-title">
-                            <i class="fas fa-bullhorn mr-2"></i>
+                            <i class="fa-solid fa-bullhorn mr-2"></i>
                             <?php echo langHdl('your_attention_is_required'); ?>
                         </h3>
                     </div>
@@ -881,7 +884,7 @@
                         <div class="row">
                             <div class="col-sm-12 col-md-12">
                                 <div class="mb-2 alert alert-info" id="warning-text-reencryption">
-                                    <i class="icon fas fa-info mr-2"></i>
+                                    <i class="icon fa-solid fa-info mr-2"></i>
                                     <?php echo langHdl('help_for_launching_items_encryption'); ?>
                                 </div>
 
@@ -910,7 +913,7 @@
                 <div class="card card-warning m-3 hidden" id="dialog-encryption-personal-items-after-upgrade">
                     <div class="card-header">
                         <h3 class="card-title">
-                            <i class="fas fa-bullhorn mr-2"></i>
+                            <i class="fa-solid fa-bullhorn mr-2"></i>
                             <?php echo langHdl('your_attention_is_required'); ?>
                         </h3>
                     </div>
@@ -918,7 +921,7 @@
                         <div class="row">
                             <div class="col-sm-12 col-md-12">
                                 <div class="mb-2 alert alert-info" id="warning-text-changing-password">
-                                    <i class="icon fas fa-info mr-2"></i>
+                                    <i class="icon fa-solid fa-info mr-2"></i>
                                     <?php echo langHdl('objects_encryption_explanation'); ?>
                                 </div>
                                 <div class="input-group mb-3">
diff --git a/install/upgrade_run_3.0.0.php b/install/upgrade_run_3.0.0.php
index a3a639f1c..3839ea841 100644
--- a/install/upgrade_run_3.0.0.php
+++ b/install/upgrade_run_3.0.0.php
@@ -879,10 +879,17 @@
     ) CHARSET=utf8;'
 );
 
-mysqli_query(
-    $db_link,
-    'CREATE INDEX IF NOT EXISTS CACHE ON ' . $pre . 'cache_tree (increment_id, user_id)'
+// Add the Primary INDEX CACHE to the cache_tree table
+$res = checkIndexExist(
+    $pre . 'cache_tree',
+    'CACHE',
+    "ADD KEY `CACHE` (`increment_id`, `user_id`)"
 );
+if (!$res) {
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding the INDEX CACHE to the cache_tree table! ' . mysqli_error($db_link) . '!"}]';
+    mysqli_close($db_link);
+    exit();
+}
 
 mysqli_query(
     $db_link,
@@ -1639,22 +1646,53 @@
 }
 
 // Add indexes
-mysqli_query(
-    $db_link,
-    'CREATE INDEX IF NOT EXISTS `OBJECT` ON ' . $pre . 'sharekeys_items (object_id)'
+// Add the Primary INDEX OBJECT to the sharekeys_items table
+$res = checkIndexExist(
+    $pre . 'sharekeys_items',
+    'OBJECT',
+    "ADD KEY `OBJECT` (`object_id`)"
 );
-mysqli_query(
-    $db_link,
-    'CREATE INDEX IF NOT EXISTS USER ON ' . $pre . 'sharekeys_items (user_id)'
+if (!$res) {
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding the INDEX OBJECT to the sharekeys_items table! ' . mysqli_error($db_link) . '!"}]';
+    mysqli_close($db_link);
+    exit();
+}
+
+// Add the Primary INDEX USER to the sharekeys_items table
+$res = checkIndexExist(
+    $pre . 'sharekeys_items',
+    'USER',
+    "ADD KEY `USER` (`user_id`)"
 );
-mysqli_query(
-    $db_link,
-    'CREATE INDEX IF NOT EXISTS `OBJECT` ON ' . $pre . 'sharekeys_logs (object_id)'
+if (!$res) {
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding the INDEX USER to the sharekeys_items table! ' . mysqli_error($db_link) . '!"}]';
+    mysqli_close($db_link);
+    exit();
+}
+
+// Add the Primary INDEX OBJECT to the sharekeys_logs table
+$res = checkIndexExist(
+    $pre . 'sharekeys_logs',
+    'OBJECT',
+    "ADD KEY `OBJECT` (`object_id`)"
 );
-mysqli_query(
-    $db_link,
-    'CREATE INDEX IF NOT EXISTS USER ON ' . $pre . 'sharekeys_logs (user_id)'
+if (!$res) {
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding the INDEX OBJECT to the sharekeys_logs table! ' . mysqli_error($db_link) . '!"}]';
+    mysqli_close($db_link);
+    exit();
+}
+
+// Add the Primary INDEX USER to the sharekeys_logs table
+$res = checkIndexExist(
+    $pre . 'sharekeys_logs',
+    'USER',
+    "ADD KEY `USER` (`user_id`)"
 );
+if (!$res) {
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding the INDEX USER to the sharekeys_logs table! ' . mysqli_error($db_link) . '!"}]';
+    mysqli_close($db_link);
+    exit();
+}
 
 // Add field nb_items_in_folder to NESTED_TREE table
 $res = addColumnIfNotExist(
@@ -1731,10 +1769,17 @@
     "INT(12) DEFAULT NULL"
 );
 
-mysqli_query(
-    $db_link,
-    'CREATE INDEX IF NOT EXISTS USER ON ' . $pre . 'api (user_id)'
+// Add the Primary INDEX USER to the api table
+$res = checkIndexExist(
+    $pre . 'api',
+    'USER',
+    "ADD KEY `USER` (`user_id`)"
 );
+if (!$res) {
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding the INDEX USER to the api table! ' . mysqli_error($db_link) . '!"}]';
+    mysqli_close($db_link);
+    exit();
+}
 
 try {
     mysqli_query(
diff --git a/scripts/background_tasks___user_keys_creation.php b/scripts/background_tasks___user_keys_creation.php
index b759e6cb1..a0d48b4e0 100755
--- a/scripts/background_tasks___user_keys_creation.php
+++ b/scripts/background_tasks___user_keys_creation.php
@@ -173,7 +173,7 @@ function handleTask(int $processId, array $ProcessArguments, array $SETTINGS)
                 (bool) false,
                 (string) $args['step'],
                 (int) $args['index'],
-                (int) $args['nb'],
+                (int) isset($SETTINGS['maximum_number_of_items_to_treat']) === true ? $SETTINGS['maximum_number_of_items_to_treat'] : $args['nb'],
                 $SETTINGS,
                 $ProcessArguments
             );
@@ -188,7 +188,7 @@ function handleTask(int $processId, array $ProcessArguments, array $SETTINGS)
                     json_encode([
                         "step" => $taskStatus['new_action'],
                         "index" => $taskStatus['new_index'],
-                        "nb" => $args['nb'],
+                        "nb" => isset($SETTINGS['maximum_number_of_items_to_treat']) === true ? $SETTINGS['maximum_number_of_items_to_treat'] : $args['nb'],
                     ]),
                     'is_in_progress' => $taskStatus['new_action'] !== $args['step'] ? -1 : 1,
                     'finished_at' => $taskStatus['new_action'] !== $args['step'] ? time() : NULL,
diff --git a/sources/main.functions.php b/sources/main.functions.php
index 5409cad33..d1cda1d80 100755
--- a/sources/main.functions.php
+++ b/sources/main.functions.php
@@ -3166,11 +3166,11 @@ function ldapCheckUserPassword(string $login, string $password, array $SETTINGS)
  *
  * @return bool
  */
-function deleteUserObjetsKeys(int $userId, array $SETTINGS): bool
+function deleteUserObjetsKeys(int $userId, array $SETTINGS = []): bool
 {
     // include librairies & connect to DB
-    include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_once __DIR__. '/../includes/config/settings.php';
+    include_once __DIR__. '/../includes/libraries/Database/Meekrodb/db.class.php';
     if (defined('DB_PASSWD_CLEAR') === false) {
         define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
     }
@@ -3894,4 +3894,169 @@ function upgradeRequired(): bool
     }
 
     return false;
+}
+
+/**
+ * Permits to change the user keys on his demand
+ *
+ * @param integer $userId
+ * @param string $passwordClear
+ * @param string $encryptionKey
+ * @param boolean $deleteExistingKeys
+ * @return boolean
+ */
+function handleUserKeys(
+    int $userId,
+    string $passwordClear,
+    string $encryptionKey = '',
+    bool $deleteExistingKeys = false
+): string
+{
+
+    // prepapre background tasks for item keys generation        
+    $val = DB::queryFirstRow(
+        'SELECT pw, public_key, private_key
+        FROM ' . prefixTable('users') . '
+        WHERE id = %i',
+        TP_USER_ID
+    );
+    if (DB::count() > 0) {
+        // Create process
+        DB::insert(
+            prefixTable('processes'),
+            array(
+                'created_at' => time(),
+                'process_type' => 'create_user_keys',
+                'arguments' => json_encode([
+                    'new_user_id' => (int) $userId,
+                    'new_user_pwd' => cryption($passwordClear, '','encrypt')['string'],
+                    'new_user_code' => cryption(empty($encryptionKey) === true ? uniqidReal(20) : $encryptionKey, '','encrypt')['string'],
+                    'owner_id' => (int) TP_USER_ID,
+                    'creator_pwd' => $val['pw'],
+                ]),
+                'updated_at' => '',
+                'finished_at' => '',
+                'output' => '',
+            )
+        );
+        $processId = DB::insertId();
+
+        // Delete existing keys
+        if ($deleteExistingKeys === true) {
+            deleteUserObjetsKeys(
+                (int) $userId,
+            );
+        }
+
+        // Create tasks
+        DB::insert(
+            prefixTable('processes_tasks'),
+            array(
+                'process_id' => $processId,
+                'created_at' => time(),
+                'task' => json_encode([
+                    'step' => 'step0',
+                    'index' => 0,
+                    'nb' => isset($SETTINGS['maximum_number_of_items_to_treat']) === true ? $SETTINGS['maximum_number_of_items_to_treat'] : NUMBER_ITEMS_IN_BATCH,
+                ]),
+            )
+        );
+
+        DB::insert(
+            prefixTable('processes_tasks'),
+            array(
+                'process_id' => $processId,
+                'created_at' => time(),
+                'task' => json_encode([
+                    'step' => 'step1',
+                    'index' => 0,
+                    'nb' => isset($SETTINGS['maximum_number_of_items_to_treat']) === true ? $SETTINGS['maximum_number_of_items_to_treat'] : NUMBER_ITEMS_IN_BATCH,
+                ]),
+            )
+        );
+
+        DB::insert(
+            prefixTable('processes_tasks'),
+            array(
+                'process_id' => $processId,
+                'created_at' => time(),
+                'task' => json_encode([
+                    'step' => 'step2',
+                    'index' => 0,
+                    'nb' => isset($SETTINGS['maximum_number_of_items_to_treat']) === true ? $SETTINGS['maximum_number_of_items_to_treat'] : NUMBER_ITEMS_IN_BATCH,
+                ]),
+            )
+        );
+
+        DB::insert(
+            prefixTable('processes_tasks'),
+            array(
+                'process_id' => $processId,
+                'created_at' => time(),
+                'task' => json_encode([
+                    'step' => 'step3',
+                    'index' => 0,
+                    'nb' => isset($SETTINGS['maximum_number_of_items_to_treat']) === true ? $SETTINGS['maximum_number_of_items_to_treat'] : NUMBER_ITEMS_IN_BATCH,
+                ]),
+            )
+        );
+
+        DB::insert(
+            prefixTable('processes_tasks'),
+            array(
+                'process_id' => $processId,
+                'created_at' => time(),
+                'task' => json_encode([
+                    'step' => 'step4',
+                    'index' => 0,
+                    'nb' => isset($SETTINGS['maximum_number_of_items_to_treat']) === true ? $SETTINGS['maximum_number_of_items_to_treat'] : NUMBER_ITEMS_IN_BATCH,
+                ]),
+            )
+        );
+
+        DB::insert(
+            prefixTable('processes_tasks'),
+            array(
+                'process_id' => $processId,
+                'created_at' => time(),
+                'task' => json_encode([
+                    'step' => 'step5',
+                    'index' => 0,
+                    'nb' => isset($SETTINGS['maximum_number_of_items_to_treat']) === true ? $SETTINGS['maximum_number_of_items_to_treat'] : NUMBER_ITEMS_IN_BATCH,
+                ]),
+            )
+        );
+
+        DB::insert(
+            prefixTable('processes_tasks'),
+            array(
+                'process_id' => $processId,
+                'created_at' => time(),
+                'task' => json_encode([
+                    'step' => 'step6',
+                    'index' => 0,
+                    'nb' => isset($SETTINGS['maximum_number_of_items_to_treat']) === true ? $SETTINGS['maximum_number_of_items_to_treat'] : NUMBER_ITEMS_IN_BATCH,
+                ]),
+            )
+        );
+
+        // update user's new status
+        DB::update(
+            prefixTable('users'),
+            [
+                'is_ready_for_usage' => 0,
+            ],
+            'id=%i',
+            $userId
+        );
+    }
+
+    return prepareExchangedData(
+        __DIR__.'/..',
+        array(
+            'error' => false,
+            'message' => '',
+        ),
+        'encode'
+    );
 }
\ No newline at end of file
diff --git a/sources/main.queries.php b/sources/main.queries.php
index c9c8be931..603ad4ace 100755
--- a/sources/main.queries.php
+++ b/sources/main.queries.php
@@ -482,8 +482,8 @@ function keyHandler(string $post_type, /*php8 array|null|string */$dataReceived,
             );
 
         /*
-            * User's public/private keys change
-            */
+        * User's public/private keys change
+        */
         case 'change_private_key_encryption_password'://action_key
             return changePrivateKeyEncryptionPassword(
                 (int) filter_var($dataReceived['user_id'], FILTER_SANITIZE_NUMBER_INT),
@@ -494,8 +494,8 @@ function keyHandler(string $post_type, /*php8 array|null|string */$dataReceived,
             );
 
         /*
-            * Generates a KEY with CRYPT
-            */
+        * Generates a KEY with CRYPT
+        */
         case 'generate_new_key'://action_key
             // load passwordLib library
             $pwdlib = new SplClassLoader('PasswordLib', '../includes/libraries');
@@ -505,6 +505,17 @@ function keyHandler(string $post_type, /*php8 array|null|string */$dataReceived,
             $key = $pwdlib->getRandomToken(filter_input(INPUT_POST, 'size', FILTER_SANITIZE_NUMBER_INT));
             return '[{"key" : "' . htmlentities($key, ENT_QUOTES) . '"}]';
 
+        /*
+        * Launch user keys change on his demand
+        */
+        case 'user_new_keys_generation'://action_key
+            return handleUserKeys(
+                (int) filter_var($dataReceived['user_id'], FILTER_SANITIZE_NUMBER_INT),
+                (string) filter_var($dataReceived['user_pwd'], FILTER_SANITIZE_FULL_SPECIAL_CHARS),
+                (string) filter_var($dataReceived['encryption_key'], FILTER_SANITIZE_FULL_SPECIAL_CHARS),
+                (bool) filter_var($dataReceived['delete_existing_keys'], FILTER_VALIDATE_BOOLEAN),
+            );
+
         /*
         * Default case
         */