From 6c412be2ea7c0fb64677152db753a1007934f892 Mon Sep 17 00:00:00 2001
From: "Julien Carion (juca)" <juca@odoo.com>
Date: Wed, 5 Jul 2023 14:18:18 +0000
Subject: [PATCH] [IMP] *: coherent hotkey uses

This commit makes hotkey uses more coherent throughout the entire
codebase by setting alt+q as main shortcurt for confirm and default
actions and alt+x for cancel actions.

task-3370463

closes odoo/odoo#127469

Related: odoo/enterprise#43694
Signed-off-by: Mathieu Duckerts-Antoine (dam) <dam@odoo.com>
---
 addons/account/views/account_move_views.xml          | 10 +++++-----
 addons/account/views/account_payment_view.xml        |  6 +++---
 addons/account/views/res_company_views.xml           |  2 +-
 .../wizard/account_automatic_entry_wizard_views.xml  |  2 +-
 addons/account/wizard/account_move_reversal_view.xml |  2 +-
 addons/account/wizard/account_move_send_views.xml    |  2 +-
 .../wizard/account_payment_register_views.xml        |  2 +-
 addons/account/wizard/account_resequence_views.xml   |  2 +-
 addons/account/wizard/account_tour_upload_bill.xml   |  4 ++--
 addons/account/wizard/account_unreconcile_view.xml   |  2 +-
 addons/account/wizard/account_validate_move_view.xml |  2 +-
 addons/account/wizard/setup_wizards_view.xml         |  4 ++--
 .../wizard/print_prenumbered_checks_views.xml        |  2 +-
 .../wizard/account_debit_note_view.xml               |  2 +-
 addons/auth_totp/wizard/auth_totp_wizard_views.xml   |  2 +-
 .../views/base_import_module_view.xml                |  6 +++---
 .../wizard/base_module_install_request_views.xml     |  4 ++--
 .../wizard/calendar_popover_delete_wizard.xml        |  2 +-
 addons/crm/views/crm_lead_views.xml                  |  2 +-
 addons/crm/wizard/crm_lead_lost_views.xml            |  2 +-
 addons/crm/wizard/crm_lead_pls_update_views.xml      |  2 +-
 .../wizard/crm_lead_to_opportunity_mass_views.xml    |  2 +-
 addons/crm/wizard/crm_lead_to_opportunity_views.xml  |  2 +-
 addons/crm/wizard/crm_merge_opportunities_views.xml  |  2 +-
 .../views/crm_iap_lead_mining_request_views.xml      |  2 +-
 .../wizard/choose_delivery_carrier_views.xml         |  2 +-
 .../event_sale/wizard/event_configurator_views.xml   |  4 ++--
 addons/event_sale/wizard/event_edit_registration.xml |  2 +-
 addons/gamification/wizard/grant_badge.xml           |  2 +-
 addons/gamification/wizard/update_goal.xml           |  2 +-
 .../google_calendar/wizard/reset_account_views.xml   |  2 +-
 addons/hr/wizard/hr_departure_wizard_views.xml       |  2 +-
 addons/hr/wizard/hr_plan_wizard_views.xml            |  2 +-
 addons/hr_expense/views/hr_expense_views.xml         |  4 ++--
 .../wizard/hr_expense_approve_duplicate_views.xml    |  2 +-
 .../wizard/hr_expense_refuse_reason_views.xml        |  2 +-
 .../wizard/hr_expense_split_wizard_views.xml         |  2 +-
 .../wizard/gamification_badge_user_wizard_views.xml  |  2 +-
 .../src/views/view_dialog/form_view_dialog.xml       |  4 ++--
 .../wizard/hr_holidays_summary_employees_views.xml   |  2 +-
 addons/hr_recruitment/views/hr_applicant_views.xml   |  4 ++--
 addons/hr_recruitment/views/hr_job_views.xml         |  2 +-
 .../wizard/applicant_refuse_reason_views.xml         |  2 +-
 .../wizard/applicant_send_mail_views.xml             |  2 +-
 .../hr_skills/wizard/hr_employee_cv_wizard_views.xml |  2 +-
 .../wizard/hr_employee_delete_wizard_views.xml       |  8 ++++----
 .../hr_work_entry_regeneration_wizard_views.xml      |  2 +-
 addons/l10n_fr_fec/wizard/account_fr_fec_view.xml    |  4 ++--
 .../l10n_latam_payment_mass_transfer_views.xml       |  2 +-
 addons/l10n_ph/wizard/generate_2307_wizard_views.xml |  2 +-
 addons/l10n_sa_edi/wizard/l10n_sa_edi_otp_wizard.xml |  2 +-
 .../loyalty/wizard/loyalty_generate_wizard_views.xml |  2 +-
 addons/lunch/views/lunch_orders_views.xml            |  4 ++--
 addons/mail/views/mail_activity_views.xml            |  6 +++---
 addons/mail/wizard/mail_blacklist_remove_views.xml   |  2 +-
 addons/mail/wizard/mail_compose_message_views.xml    |  2 +-
 addons/mail/wizard/mail_resend_message_views.xml     |  2 +-
 addons/mail/wizard/mail_template_preview_views.xml   |  2 +-
 addons/mail/wizard/mail_template_reset_views.xml     |  2 +-
 addons/mail/wizard/mail_wizard_invite_views.xml      |  2 +-
 addons/mass_mailing/views/mailing_mailing_views.xml  |  6 +++---
 .../wizard/mailing_contact_import_views.xml          |  4 ++--
 .../wizard/mailing_contact_to_list_views.xml         |  2 +-
 .../mass_mailing/wizard/mailing_list_merge_views.xml |  2 +-
 .../wizard/mailing_mailing_schedule_date_views.xml   |  2 +-
 .../wizard/mailing_mailing_test_views.xml            |  2 +-
 .../wizard/mailing_sms_test_views.xml                |  2 +-
 .../membership/wizard/membership_invoice_views.xml   |  2 +-
 .../wizard/reset_account_views.xml                   |  2 +-
 addons/mrp/views/mrp_production_views.xml            | 12 ++++++------
 addons/mrp/views/mrp_unbuild_views.xml               |  2 +-
 addons/mrp/wizard/change_production_qty_views.xml    |  2 +-
 addons/mrp/wizard/mrp_consumption_warning_views.xml  |  2 +-
 addons/mrp/wizard/mrp_production_backorder.xml       |  4 ++--
 addons/mrp/wizard/mrp_production_split.xml           |  6 +++---
 addons/mrp/wizard/mrp_workcenter_block_view.xml      |  2 +-
 .../wizard/confirm_expiry_view.xml                   |  4 ++--
 .../views/mrp_production_views.xml                   |  3 +--
 addons/payment/wizards/payment_link_wizard_views.xml |  5 +++--
 addons/payment/wizards/payment_onboarding_views.xml  |  2 +-
 .../wizard/phone_blacklist_remove_view.xml           |  2 +-
 .../wizard/pos_close_session_wizard.xml              |  2 +-
 addons/point_of_sale/wizard/pos_details.xml          |  2 +-
 addons/point_of_sale/wizard/pos_payment.xml          |  2 +-
 addons/portal/wizard/portal_share_views.xml          |  2 +-
 addons/product_expiry/wizard/confirm_expiry_view.xml |  2 +-
 addons/product_margin/wizard/product_margin_view.xml |  2 +-
 addons/project/views/project_project_views.xml       |  2 +-
 .../wizard/project_project_stage_delete_views.xml    |  2 +-
 addons/project/wizard/project_share_wizard_views.xml |  2 +-
 .../wizard/project_task_type_delete_views.xml        |  4 ++--
 addons/purchase/views/purchase_views.xml             |  4 ++--
 addons/repair/views/repair_views.xml                 |  4 ++--
 addons/repair/wizard/repair_make_invoice_views.xml   |  2 +-
 addons/sale/views/sale_order_views.xml               | 10 +++++-----
 .../sale/wizard/sale_make_invoice_advance_views.xml  |  2 +-
 .../wizard/crm_opportunity_to_quotation_views.xml    |  2 +-
 .../wizard/sale_loyalty_coupon_wizard_views.xml      |  2 +-
 .../wizard/sale_loyalty_reward_wizard_views.xml      |  4 ++--
 .../wizard/project_create_invoice_views.xml          |  2 +-
 .../wizard/project_create_sale_order_views.xml       |  2 +-
 addons/sms/wizard/sms_composer_views.xml             |  2 +-
 addons/sms/wizard/sms_resend_views.xml               |  6 +++---
 addons/sms/wizard/sms_template_preview_views.xml     |  2 +-
 addons/sms/wizard/sms_template_reset_views.xml       |  2 +-
 .../wizard/snailmail_letter_format_error_views.xml   |  2 +-
 ...nailmail_letter_missing_required_fields_views.xml |  2 +-
 addons/stock/views/stock_move_views.xml              |  6 +++---
 addons/stock/views/stock_package_level_views.xml     |  4 ++--
 addons/stock/views/stock_picking_views.xml           |  6 +++---
 addons/stock/views/stock_scrap_views.xml             |  2 +-
 addons/stock/wizard/product_replenish_views.xml      |  2 +-
 addons/stock/wizard/stock_assign_serial_views.xml    |  2 +-
 .../wizard/stock_backorder_confirmation_views.xml    |  2 +-
 .../stock/wizard/stock_change_product_qty_views.xml  |  2 +-
 addons/stock/wizard/stock_generate_serial_views.xml  |  2 +-
 .../stock/wizard/stock_immediate_transfer_views.xml  |  2 +-
 addons/stock/wizard/stock_import_lot_views.xml       |  2 +-
 .../stock/wizard/stock_inventory_adjustment_name.xml |  2 +-
 addons/stock/wizard/stock_inventory_conflict.xml     |  2 +-
 addons/stock/wizard/stock_inventory_warning.xml      |  4 ++--
 addons/stock/wizard/stock_label_type.xml             |  2 +-
 addons/stock/wizard/stock_lot_label_layout.xml       |  2 +-
 .../stock/wizard/stock_orderpoint_snooze_views.xml   |  2 +-
 .../stock/wizard/stock_package_destination_views.xml |  2 +-
 addons/stock/wizard/stock_picking_return_views.xml   |  2 +-
 addons/stock/wizard/stock_quantity_history.xml       |  2 +-
 addons/stock/wizard/stock_replenishment_info.xml     |  2 +-
 addons/stock/wizard/stock_request_count.xml          |  2 +-
 addons/stock/wizard/stock_rules_report_views.xml     |  2 +-
 .../stock/wizard/stock_scheduler_compute_views.xml   |  2 +-
 .../stock/wizard/stock_track_confirmation_views.xml  |  2 +-
 .../wizard/stock_warn_insufficient_qty_views.xml     |  2 +-
 .../stock_valuation_layer_revaluation_views.xml      |  2 +-
 addons/stock_delivery/views/delivery_view.xml        |  2 +-
 .../wizard/choose_delivery_package_views.xml         |  2 +-
 .../wizard/stock_picking_to_batch_views.xml          |  2 +-
 addons/stock_sms/wizard/confirm_stock_sms_views.xml  |  2 +-
 addons/survey/wizard/survey_invite_views.xml         |  2 +-
 addons/web/views/base_document_layout_views.xml      |  2 +-
 addons/website/views/website_views.xml               |  2 +-
 addons/website/wizard/website_robots.xml             |  2 +-
 .../wizard/crm_forward_to_partner_view.xml           |  2 +-
 .../wizard/coupon_share_views.xml                    |  2 +-
 .../wizard/slide_channel_invite_views.xml            |  4 ++--
 odoo/addons/base/data/ir_demo_data.xml               |  2 +-
 odoo/addons/base/views/ir_model_views.xml            |  2 +-
 odoo/addons/base/views/ir_profile_views.xml          |  4 ++--
 odoo/addons/base/views/ir_ui_view_views.xml          |  2 +-
 odoo/addons/base/views/res_config_views.xml          |  4 ++--
 odoo/addons/base/views/res_users_views.xml           | 10 +++++-----
 .../base/wizard/base_export_language_views.xml       |  4 ++--
 .../base/wizard/base_import_language_views.xml       |  2 +-
 .../base/wizard/base_language_install_views.xml      |  4 ++--
 .../base/wizard/base_module_uninstall_views.xml      |  2 +-
 odoo/addons/base/wizard/base_module_update_views.xml |  6 +++---
 odoo/addons/base/wizard/base_module_upgrade.py       |  2 +-
 .../addons/base/wizard/base_module_upgrade_views.xml |  4 ++--
 odoo/addons/base/wizard/base_partner_merge_views.xml |  6 +++---
 odoo/addons/test_exceptions/view.xml                 |  2 +-
 160 files changed, 226 insertions(+), 226 deletions(-)

diff --git a/addons/account/views/account_move_views.xml b/addons/account/views/account_move_views.xml
index e832d5a2766..4d71d24a7ac 100644
--- a/addons/account/views/account_move_views.xml
+++ b/addons/account/views/account_move_views.xml
@@ -572,11 +572,11 @@
                     <header>
                         <!-- Post -->
                         <button name="action_post" string="Post" class="oe_highlight"
-                                type="object" groups="account.group_account_invoice" data-hotkey="v"
+                                type="object" groups="account.group_account_invoice" data-hotkey="q"
                                 context="{'validate_analytic': True}"
                                 attrs="{'invisible': ['|', ('hide_post_button', '=', True), ('move_type', '!=', 'entry')]}"/>
                         <button name="action_post" string="Confirm" class="oe_highlight"
-                                type="object" groups="account.group_account_invoice" data-hotkey="v"
+                                type="object" groups="account.group_account_invoice" data-hotkey="q"
                                 context="{'validate_analytic': True}"
                                 attrs="{'invisible': ['|', '|', ('hide_post_button', '=', True), ('move_type', '=', 'entry'), ('display_inactive_currency_warning','=',True)]}"/>
                         <!-- Send (only invoices) -->
@@ -610,12 +610,12 @@
                                 type='object' groups="account.group_account_invoice"
                                 attrs="{'invisible': ['|', ('move_type', 'not in', ('out_invoice', 'in_invoice')), ('state', '!=', 'posted')]}"/>
                         <!-- Cancel -->
-                        <button name="button_cancel" string="Cancel Entry" type="object" groups="account.group_account_invoice" data-hotkey="w"
+                        <button name="button_cancel" string="Cancel Entry" type="object" groups="account.group_account_invoice" data-hotkey="x"
                                 attrs="{'invisible' : ['|', '|', ('id', '=', False), ('state', '!=', 'draft'),('move_type', '!=', 'entry')]}"/>
-                        <button name="button_cancel" string="Cancel" type="object" groups="account.group_account_invoice" data-hotkey="w"
+                        <button name="button_cancel" string="Cancel" type="object" groups="account.group_account_invoice" data-hotkey="x"
                                 attrs="{'invisible' : ['|', '|', ('id', '=', False), ('state', '!=', 'draft'),('move_type', '==', 'entry')]}"/>
                         <button name="button_draft" string="Reset to Draft" type="object" groups="account.group_account_invoice"
-                                attrs="{'invisible' : [('show_reset_to_draft_button', '=', False)]}" data-hotkey="q" />
+                                attrs="{'invisible' : [('show_reset_to_draft_button', '=', False)]}" data-hotkey="r" />
                         <!-- Set as Checked -->
                         <button name="button_set_checked" string="Set as Checked" type="object" groups="account.group_account_invoice"
                                 attrs="{'invisible' : [('to_check', '=', False)]}" data-hotkey="k" />
diff --git a/addons/account/views/account_payment_view.xml b/addons/account/views/account_payment_view.xml
index 017b295c542..992c97e43b6 100644
--- a/addons/account/views/account_payment_view.xml
+++ b/addons/account/views/account_payment_view.xml
@@ -152,13 +152,13 @@
                 <form string="Register Payment">
                     <header>
                         <button name="action_post" string="Confirm" type="object" class="oe_highlight"
-                                attrs="{'invisible': [('state', '!=', 'draft')]}" data-hotkey="v"/>
+                                attrs="{'invisible': [('state', '!=', 'draft')]}" data-hotkey="q"/>
                         <button name="action_draft" string="Reset To Draft" type="object" class="btn btn-secondary"
                                 attrs="{'invisible': [('state', 'not in', ('posted', 'cancel'))]}"
                                 groups="account.group_account_invoice" data-hotkey="w"/>
                         <button name="action_cancel" string="Cancel" type="object"
-                                attrs="{'invisible': ['|', ('id', '=', False), ('state', '!=', 'draft')]}" data-hotkey="z"/>
-                        <button name="mark_as_sent" string="Mark as Sent" type="object" data-hotkey="q"
+                                attrs="{'invisible': ['|', ('id', '=', False), ('state', '!=', 'draft')]}" data-hotkey="x"/>
+                        <button name="mark_as_sent" string="Mark as Sent" type="object" data-hotkey="v"
                                 attrs="{'invisible': ['|', '|', ('state', '!=', 'posted'), ('is_move_sent', '=', True), ('payment_method_code', '!=', 'manual')]}"/>
                         <button name="unmark_as_sent"  string="Unmark as Sent" type="object" data-hotkey="k"
                                 attrs="{'invisible': ['|', '|', ('state', '!=', 'posted'), ('is_move_sent', '=', False), ('payment_method_code', '!=', 'manual')]}"/>
diff --git a/addons/account/views/res_company_views.xml b/addons/account/views/res_company_views.xml
index b74c7d32d47..0f07c974ff2 100644
--- a/addons/account/views/res_company_views.xml
+++ b/addons/account/views/res_company_views.xml
@@ -59,7 +59,7 @@
                 <field name="account_sale_tax_id" />
                 <footer>
                     <button string="Apply" class="btn btn-primary" type="object" name="action_save_onboarding_sale_tax" data-hotkey="q" />
-                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z" />
+                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x" />
                 </footer>
             </form>
         </field>
diff --git a/addons/account/wizard/account_automatic_entry_wizard_views.xml b/addons/account/wizard/account_automatic_entry_wizard_views.xml
index b2fceded0e1..162661039ef 100644
--- a/addons/account/wizard/account_automatic_entry_wizard_views.xml
+++ b/addons/account/wizard/account_automatic_entry_wizard_views.xml
@@ -43,7 +43,7 @@
                     <field name="preview_move_data" widget="grouped_view_widget" class="d-block"/>
                     <footer>
                         <button string="Create Journal Entries" name="do_action" type="object" class="oe_highlight" data-hotkey="q"/>
-                        <button string="Cancel" class="btn btn-secondary" special="cancel" data-hotkey="z"/>
+                        <button string="Cancel" class="btn btn-secondary" special="cancel" data-hotkey="x"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/account/wizard/account_move_reversal_view.xml b/addons/account/wizard/account_move_reversal_view.xml
index 0ec7eaf035d..f743d83baee 100644
--- a/addons/account/wizard/account_move_reversal_view.xml
+++ b/addons/account/wizard/account_move_reversal_view.xml
@@ -19,7 +19,7 @@
                     <footer>
                         <button string='Reverse' name="refund_moves" type="object" class="btn-primary" data-hotkey="q"/>
                         <button string="Reverse and Create Invoice" name="modify_moves" type="object" class="btn-secondary"/>
-                        <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                        <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="x"/>
                     </footer>
                </form>
             </field>
diff --git a/addons/account/wizard/account_move_send_views.xml b/addons/account/wizard/account_move_send_views.xml
index a204a667bc7..3d3b1655ac7 100644
--- a/addons/account/wizard/account_move_send_views.xml
+++ b/addons/account/wizard/account_move_send_views.xml
@@ -88,7 +88,7 @@
                             class="print btn-primary o_mail_send">
                     </button>
                     <button string="Cancel"
-                            data-hotkey="z"
+                            data-hotkey="x"
                             name="action_cancel"
                             type="object"
                             class="btn-secondary"/>
diff --git a/addons/account/wizard/account_payment_register_views.xml b/addons/account/wizard/account_payment_register_views.xml
index 68122bd56dc..33fc2ff23ed 100644
--- a/addons/account/wizard/account_payment_register_views.xml
+++ b/addons/account/wizard/account_payment_register_views.xml
@@ -85,7 +85,7 @@
                     <footer>
                         <button string="Create Payments" name="action_create_payments" type="object" class="oe_highlight" data-hotkey="q" attrs="{'invisible': [('total_payments_amount', '=', 1)]}"/>
                         <button string="Create Payment" name="action_create_payments" type="object" class="oe_highlight" data-hotkey="q" attrs="{'invisible': [('total_payments_amount', '!=', 1)]}"/>
-                        <button string="Discard" class="btn btn-secondary" special="cancel" data-hotkey="z"/>
+                        <button string="Discard" class="btn btn-secondary" special="cancel" data-hotkey="x"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/account/wizard/account_resequence_views.xml b/addons/account/wizard/account_resequence_views.xml
index df181441769..d5b4ef1fd6f 100644
--- a/addons/account/wizard/account_resequence_views.xml
+++ b/addons/account/wizard/account_resequence_views.xml
@@ -23,7 +23,7 @@
                 </group>
                 <footer>
                     <button string="Confirm" name="resequence" type="object" default_focus="1" class="btn-primary" data-hotkey="q"/>
-                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x"/>
                 </footer>
             </form>
             </field>
diff --git a/addons/account/wizard/account_tour_upload_bill.xml b/addons/account/wizard/account_tour_upload_bill.xml
index cf9a1a836c9..e9d9df76015 100644
--- a/addons/account/wizard/account_tour_upload_bill.xml
+++ b/addons/account/wizard/account_tour_upload_bill.xml
@@ -17,7 +17,7 @@
                     </sheet>
                     <footer>
                         <button string="Continue" type="object" name="apply" class="btn-primary" data-hotkey="q"/>
-                        <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="z" />
+                        <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="x" />
                     </footer>
                </form>
             </field>
@@ -34,7 +34,7 @@
                     </sheet>
                     <footer>
                         <button string="Continue" type="object" name="apply" class="btn-primary" data-hotkey="q"/>
-                        <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="z" />
+                        <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="x" />
                     </footer>
                </form>
             </field>
diff --git a/addons/account/wizard/account_unreconcile_view.xml b/addons/account/wizard/account_unreconcile_view.xml
index 0d6482e2bda..6133fa9e9f4 100644
--- a/addons/account/wizard/account_unreconcile_view.xml
+++ b/addons/account/wizard/account_unreconcile_view.xml
@@ -11,7 +11,7 @@
                 <form class="o_form_label">If you unreconcile transactions, you must also verify all the actions that are linked to those transactions because they will not be disabled</form>
                 <footer>
                     <button string="Unreconcile" name="trans_unrec" type="object" default_focus="1" class="btn-primary" data-hotkey="q"/>
-                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x"/>
                 </footer>
             </form>
             </field>
diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml
index 4162a8f42a3..26302497516 100644
--- a/addons/account/wizard/account_validate_move_view.xml
+++ b/addons/account/wizard/account_validate_move_view.xml
@@ -14,7 +14,7 @@
                     <span class="o_form_label">All selected journal entries will be validated and posted. You won't be able to modify them afterwards.</span>
                     <footer>
                         <button string="Post Journal Entries" name="validate_move" type="object" default_focus="1" class="btn-primary" data-hotkey="q"/>
-                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/account/wizard/setup_wizards_view.xml b/addons/account/wizard/setup_wizards_view.xml
index 7860a1e9a9a..fa71f9a22ba 100644
--- a/addons/account/wizard/setup_wizards_view.xml
+++ b/addons/account/wizard/setup_wizards_view.xml
@@ -24,7 +24,7 @@
                     <footer>
                         <button name="action_save_onboarding_fiscal_year" string="Apply"
                                class="oe_highlight" type="object" data-hotkey="q" />
-                        <button special="cancel" data-hotkey="z" string="Cancel" />
+                        <button special="cancel" data-hotkey="x" string="Cancel" />
                     </footer>
                 </form>
             </field>
@@ -60,7 +60,7 @@
                     </sheet>
                     <footer>
                         <button string="Create" class="oe_highlight" type="object" name="validate" data-hotkey="q"/>
-                        <button string="Cancel" special="cancel" data-hotkey="z"/>
+                        <button string="Cancel" special="cancel" data-hotkey="x"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/account_check_printing/wizard/print_prenumbered_checks_views.xml b/addons/account_check_printing/wizard/print_prenumbered_checks_views.xml
index 641ed21a2bb..ca9017860a4 100644
--- a/addons/account_check_printing/wizard/print_prenumbered_checks_views.xml
+++ b/addons/account_check_printing/wizard/print_prenumbered_checks_views.xml
@@ -13,7 +13,7 @@
                     </group>
                     <footer>
                         <button name="print_checks" string="Print" type="object" class="oe_highlight" data-hotkey="q"/>
-                        <button string="Cancel" class="btn btn-secondary" special="cancel" data-hotkey="z"/>
+                        <button string="Cancel" class="btn btn-secondary" special="cancel" data-hotkey="x"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/account_debit_note/wizard/account_debit_note_view.xml b/addons/account_debit_note/wizard/account_debit_note_view.xml
index 4e3ebb2307e..edc802f5045 100644
--- a/addons/account_debit_note/wizard/account_debit_note_view.xml
+++ b/addons/account_debit_note/wizard/account_debit_note_view.xml
@@ -21,7 +21,7 @@
                     </group>
                     <footer>
                         <button string='Create Debit Note' name="create_debit" type="object" class="btn-primary" data-hotkey="q"/>
-                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x"/>
                     </footer>
                </form>
             </field>
diff --git a/addons/auth_totp/wizard/auth_totp_wizard_views.xml b/addons/auth_totp/wizard/auth_totp_wizard_views.xml
index 94a5ffdd1aa..76b967acf21 100644
--- a/addons/auth_totp/wizard/auth_totp_wizard_views.xml
+++ b/addons/auth_totp/wizard/auth_totp_wizard_views.xml
@@ -68,7 +68,7 @@
                 <footer>
                     <button type="object" name="enable" class="btn btn-primary"
                             string="Activate" data-hotkey="q"/>
-                    <button string="Cancel" special="cancel" data-hotkey="z"/>
+                    <button string="Cancel" special="cancel" data-hotkey="x"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/base_import_module/views/base_import_module_view.xml b/addons/base_import_module/views/base_import_module_view.xml
index 04790b3e079..b175cab101e 100644
--- a/addons/base_import_module/views/base_import_module_view.xml
+++ b/addons/base_import_module/views/base_import_module_view.xml
@@ -20,12 +20,12 @@
                     </group>
                     <footer>
                         <div states="init">
-                            <button name="import_module" string="Import App" type="object" class="btn-primary"/>
-                            <button special="cancel" data-hotkey="z" string="Cancel" class="btn-secondary"/>
+                            <button name="import_module" string="Import App" type="object" class="btn-primary" data-hotkey="q"/>
+                            <button special="cancel" data-hotkey="x" string="Cancel" class="btn-secondary"/>
                         </div>
                         <div states="done">
                             <button name="action_module_open" string="Open Modules" type="object" class="btn-primary" data-hotkey="q"/>
-                            <button special="cancel" data-hotkey="z" string="Close" class="btn-secondary"/>
+                            <button special="cancel" data-hotkey="x" string="Close" class="btn-secondary"/>
                         </div>
                     </footer>
                 </form>
diff --git a/addons/base_install_request/wizard/base_module_install_request_views.xml b/addons/base_install_request/wizard/base_module_install_request_views.xml
index 8b12bbd6615..32499122add 100644
--- a/addons/base_install_request/wizard/base_module_install_request_views.xml
+++ b/addons/base_install_request/wizard/base_module_install_request_views.xml
@@ -19,7 +19,7 @@
                 </group>
                 <footer>
                     <button string="Request Activation" class="btn-primary" type="object" name="action_send_request" data-hotkey="q"/>
-                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x"/>
                 </footer>
             </form>
         </field>
@@ -40,7 +40,7 @@
                 <field name="modules_description"/>
                 <footer>
                     <button string="Install App" class="btn-primary" type="object" name="action_install_module" data-hotkey="q"/>
-                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/calendar/wizard/calendar_popover_delete_wizard.xml b/addons/calendar/wizard/calendar_popover_delete_wizard.xml
index 8eb8bc4e700..263d14d0bc9 100644
--- a/addons/calendar/wizard/calendar_popover_delete_wizard.xml
+++ b/addons/calendar/wizard/calendar_popover_delete_wizard.xml
@@ -8,7 +8,7 @@
                 <field name="delete" widget="radio"/>
                 <footer>
                     <button name="close" string="Submit" type="object" class="btn-primary" data-hotkey="q"/>
-                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/crm/views/crm_lead_views.xml b/addons/crm/views/crm_lead_views.xml
index 5aaff56ffda..6b594227969 100644
--- a/addons/crm/views/crm_lead_views.xml
+++ b/addons/crm/views/crm_lead_views.xml
@@ -13,7 +13,7 @@
                             type="action" attrs="{'invisible': ['|', ('type', '=', 'lead'), '&amp;',('active', '=', False),('probability', '&lt;', 100)]}"/>
                         <button name="%(crm.action_crm_lead2opportunity_partner)d" string="Convert to Opportunity" type="action" help="Convert to Opportunity"
                             class="oe_highlight" attrs="{'invisible': ['|', ('type', '=', 'opportunity'), ('active', '=', False)]}" data-hotkey="v"/>
-                        <button name="toggle_active" string="Restore" type="object" data-hotkey="z"
+                        <button name="toggle_active" string="Restore" type="object" data-hotkey="x"
                             attrs="{'invisible': ['|', ('probability', '&gt;', 0), ('active', '=', True)]}"/>
                         <button name="%(crm.crm_lead_lost_action)d" string="Lost" type="action"  data-hotkey="l" title="Mark as lost"
                             attrs="{'invisible': ['|', ('type', '=', 'opportunity'), '&amp;', ('probability', '=', 0), ('active', '=', False)]}"/>
diff --git a/addons/crm/wizard/crm_lead_lost_views.xml b/addons/crm/wizard/crm_lead_lost_views.xml
index a057117a95e..bae26f2129d 100644
--- a/addons/crm/wizard/crm_lead_lost_views.xml
+++ b/addons/crm/wizard/crm_lead_lost_views.xml
@@ -12,7 +12,7 @@
                     </group>
                     <footer>
                         <button name="action_lost_reason_apply" string="Mark as Lost" type="object" class="btn-primary" data-hotkey="q"/>
-                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/crm/wizard/crm_lead_pls_update_views.xml b/addons/crm/wizard/crm_lead_pls_update_views.xml
index b47fe4f3687..29520e08972 100644
--- a/addons/crm/wizard/crm_lead_pls_update_views.xml
+++ b/addons/crm/wizard/crm_lead_pls_update_views.xml
@@ -17,7 +17,7 @@
                 <footer>
                     <button name="action_update_crm_lead_probabilities" type="object"
                         string="Update" class="btn-primary" data-hotkey="q"/>
-                    <button special="cancel" data-hotkey="z" string="Cancel"/>
+                    <button special="cancel" data-hotkey="x" string="Cancel"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_mass_views.xml b/addons/crm/wizard/crm_lead_to_opportunity_mass_views.xml
index 922b2ebc400..09257ad140e 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_mass_views.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_mass_views.xml
@@ -44,7 +44,7 @@
                 </group>
                 <footer>
                     <button string="Convert to Opportunities" name="action_mass_convert" type="object" class="btn-primary" data-hotkey="q"/>
-                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_views.xml b/addons/crm/wizard/crm_lead_to_opportunity_views.xml
index 17949aa0596..ca731c04723 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_views.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_views.xml
@@ -36,7 +36,7 @@
                 </group>
                 <footer>
                     <button name="action_apply" string="Create Opportunity" type="object" class="btn-primary" data-hotkey="q"/>
-                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/crm/wizard/crm_merge_opportunities_views.xml b/addons/crm/wizard/crm_merge_opportunities_views.xml
index 5e37320ce63..036eba331aa 100644
--- a/addons/crm/wizard/crm_merge_opportunities_views.xml
+++ b/addons/crm/wizard/crm_merge_opportunities_views.xml
@@ -27,7 +27,7 @@
                     </group>
                     <footer>
                         <button name="action_merge" type="object" string="Merge" class="btn-primary" data-hotkey="q"/>
-                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/crm_iap_mine/views/crm_iap_lead_mining_request_views.xml b/addons/crm_iap_mine/views/crm_iap_lead_mining_request_views.xml
index aa44133b224..b13a1d81f6d 100644
--- a/addons/crm_iap_mine/views/crm_iap_lead_mining_request_views.xml
+++ b/addons/crm_iap_mine/views/crm_iap_lead_mining_request_views.xml
@@ -101,7 +101,7 @@
                     </group>
                     <footer>
                         <button string="Generate Leads" name="action_submit" type="object" default_focus="1" class="btn-primary" invisible="not context.get('is_modal')" data-hotkey="q"/>
-                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z" invisible="not context.get('is_modal')"/>
+                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x" invisible="not context.get('is_modal')"/>
                     </footer>
                 </sheet>
             </form>
diff --git a/addons/delivery/wizard/choose_delivery_carrier_views.xml b/addons/delivery/wizard/choose_delivery_carrier_views.xml
index e836248a17a..fb98566791f 100644
--- a/addons/delivery/wizard/choose_delivery_carrier_views.xml
+++ b/addons/delivery/wizard/choose_delivery_carrier_views.xml
@@ -36,7 +36,7 @@
                 <footer>
                     <button name="button_confirm" invisible="not context.get('carrier_recompute')" type="object" string="Update" class="btn-primary" data-hotkey="q"/>
                     <button name="button_confirm" invisible="context.get('carrier_recompute')" type="object" string="Add" class="btn-primary" data-hotkey="q"/>
-                    <button string="Discard" special="cancel" data-hotkey="z" class="btn-secondary"/>
+                    <button string="Discard" special="cancel" data-hotkey="x" class="btn-secondary"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/event_sale/wizard/event_configurator_views.xml b/addons/event_sale/wizard/event_configurator_views.xml
index 46820d6a5d6..331228557d4 100644
--- a/addons/event_sale/wizard/event_configurator_views.xml
+++ b/addons/event_sale/wizard/event_configurator_views.xml
@@ -29,8 +29,8 @@
                     <field name="product_id" invisible="1"/>
                 </group>
                 <footer>
-                    <button string="Ok" class="btn-primary o_event_sale_js_event_configurator_ok" special="save" data-hotkey="v"/>
-                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                    <button string="Ok" class="btn-primary o_event_sale_js_event_configurator_ok" special="save" data-hotkey="q"/>
+                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/event_sale/wizard/event_edit_registration.xml b/addons/event_sale/wizard/event_edit_registration.xml
index b17a728faf4..d286b5d91a8 100644
--- a/addons/event_sale/wizard/event_edit_registration.xml
+++ b/addons/event_sale/wizard/event_edit_registration.xml
@@ -30,7 +30,7 @@
                     </sheet>
                     <footer>
                         <button string="Create/Update registrations" name="action_make_registration" type="object" class="btn-primary" data-hotkey="q"/>
-                        <button string="Skip" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                        <button string="Skip" class="btn-secondary" special="cancel" data-hotkey="x"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/gamification/wizard/grant_badge.xml b/addons/gamification/wizard/grant_badge.xml
index fc020b8bcb6..4e2f404ee09 100644
--- a/addons/gamification/wizard/grant_badge.xml
+++ b/addons/gamification/wizard/grant_badge.xml
@@ -12,7 +12,7 @@
                 </group>
                 <footer>
                     <button string="Grant Badge" type="object" name="action_grant_badge" class="btn-primary" data-hotkey="q"/>
-                    <button string="Cancel" special="cancel" data-hotkey="z" class="btn-secondary"/>
+                    <button string="Cancel" special="cancel" data-hotkey="x" class="btn-secondary"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/gamification/wizard/update_goal.xml b/addons/gamification/wizard/update_goal.xml
index af416ab83ab..6ff11160616 100644
--- a/addons/gamification/wizard/update_goal.xml
+++ b/addons/gamification/wizard/update_goal.xml
@@ -11,7 +11,7 @@
                 </group>
                 <footer>
                     <button string="Update" type="object" name="action_update_current" class="btn-primary" data-hotkey="q"/>
-                    <button string="Cancel" special="cancel" data-hotkey="z" class="btn-secondary"/>
+                    <button string="Cancel" special="cancel" data-hotkey="x" class="btn-secondary"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/google_calendar/wizard/reset_account_views.xml b/addons/google_calendar/wizard/reset_account_views.xml
index 440f0052d64..fb1f67d9e93 100644
--- a/addons/google_calendar/wizard/reset_account_views.xml
+++ b/addons/google_calendar/wizard/reset_account_views.xml
@@ -13,7 +13,7 @@
 
                 <footer>
                     <button name="reset_account" string="Confirm" type="object" class="btn-primary" data-hotkey="q"/>
-                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z" />
+                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x" />
                 </footer>
             </form>
         </field>
diff --git a/addons/hr/wizard/hr_departure_wizard_views.xml b/addons/hr/wizard/hr_departure_wizard_views.xml
index da4fa3e32dd..b8adbd6cea4 100644
--- a/addons/hr/wizard/hr_departure_wizard_views.xml
+++ b/addons/hr/wizard/hr_departure_wizard_views.xml
@@ -36,7 +36,7 @@
                     </sheet>
                     <footer>
                         <button name="action_register_departure" string="Apply" type="object" class="oe_highlight" data-hotkey="q"/>
-                        <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                        <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="x"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/hr/wizard/hr_plan_wizard_views.xml b/addons/hr/wizard/hr_plan_wizard_views.xml
index 67bda4257d8..fd9e09fd538 100644
--- a/addons/hr/wizard/hr_plan_wizard_views.xml
+++ b/addons/hr/wizard/hr_plan_wizard_views.xml
@@ -21,7 +21,7 @@
                     <footer>
                         <button name="action_launch" string="Launch Plan" type="object" class="oe_highlight" attrs="{'invisible': [('warning', '!=', False)]}" groups="hr.group_hr_user" data-hotkey="q"/>
                         <button name="action_launch" string="Launch Plan" type="object" class="oe_highlight disabled" attrs="{'invisible': [('warning', '=', False)]}" groups="hr.group_hr_user" data-hotkey="q"/>
-                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/hr_expense/views/hr_expense_views.xml b/addons/hr_expense/views/hr_expense_views.xml
index 7772cb031ec..e18a0be9ebb 100644
--- a/addons/hr_expense/views/hr_expense_views.xml
+++ b/addons/hr_expense/views/hr_expense_views.xml
@@ -678,7 +678,7 @@
                     <button name="action_approve_expense_sheets"
                             string="Approve"
                             type="object"
-                            data-hotkey="v"
+                            data-hotkey="q"
                             context="{'validate_analytic': True}"
                             attrs="{'invisible': ['|', ('can_approve', '=', False), ('state', '!=', 'submit')]}"
                             class="oe_highlight o_expense_sheet_approve"/>
@@ -711,7 +711,7 @@
                             string="Reset to Draft"
                             type="object"
                             attrs="{'invisible': ['|', ('can_reset', '=', False), ('state', 'not in', ('submit', 'cancel', 'approve'))]}"
-                            data-hotkey="q"/>
+                            data-hotkey="k"/>
                     <button name="action_reset_expense_sheets"
                             string="Reset to Draft"
                             type="object"
diff --git a/addons/hr_expense/wizard/hr_expense_approve_duplicate_views.xml b/addons/hr_expense/wizard/hr_expense_approve_duplicate_views.xml
index 25b19330df2..4b1fa7ae44b 100644
--- a/addons/hr_expense/wizard/hr_expense_approve_duplicate_views.xml
+++ b/addons/hr_expense/wizard/hr_expense_approve_duplicate_views.xml
@@ -20,7 +20,7 @@
                 <footer>
                     <button string="Refuse" class="btn-primary" name="action_refuse" type="object" attrs="{'invisible': [('sheet_ids', '=', [])]}" data-hotkey="q" />
                     <button string="Approve" class="btn-secondary" name="action_approve" type="object" attrs="{'invisible': [('sheet_ids', '=', [])]}" data-hotkey="w" />
-                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x"/>
                 </footer>
            </form>
         </field>
diff --git a/addons/hr_expense/wizard/hr_expense_refuse_reason_views.xml b/addons/hr_expense/wizard/hr_expense_refuse_reason_views.xml
index 095007d194a..26dc0520dcf 100644
--- a/addons/hr_expense/wizard/hr_expense_refuse_reason_views.xml
+++ b/addons/hr_expense/wizard/hr_expense_refuse_reason_views.xml
@@ -10,7 +10,7 @@
                 <field name="reason" class="w-100"/>
                 <footer>
                     <button string='Refuse' name="action_refuse" type="object" class="oe_highlight" data-hotkey="q"/>
-                    <button string="Cancel" class="oe_link" special="cancel" data-hotkey="z"/>
+                    <button string="Cancel" class="oe_link" special="cancel" data-hotkey="x"/>
                 </footer>
            </form>
         </field>
diff --git a/addons/hr_expense/wizard/hr_expense_split_wizard_views.xml b/addons/hr_expense/wizard/hr_expense_split_wizard_views.xml
index f4728c551e0..2d10d34cb2c 100644
--- a/addons/hr_expense/wizard/hr_expense_split_wizard_views.xml
+++ b/addons/hr_expense/wizard/hr_expense_split_wizard_views.xml
@@ -38,7 +38,7 @@
                     <footer>
                         <button name="action_split_expense" attrs="{'invisible': [ ('split_possible', '=', True)]}" string="Split Expense" type="object" class="oe_highlight disabled"  data-hotkey="q"/>
                         <button name="action_split_expense" string="Split Expense" attrs="{'invisible': [('split_possible', '=', False)]}" type="object" class="oe_highlight"  data-hotkey="q"/>
-                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/hr_gamification/wizard/gamification_badge_user_wizard_views.xml b/addons/hr_gamification/wizard/gamification_badge_user_wizard_views.xml
index caada1aecbf..942c4a7093a 100644
--- a/addons/hr_gamification/wizard/gamification_badge_user_wizard_views.xml
+++ b/addons/hr_gamification/wizard/gamification_badge_user_wizard_views.xml
@@ -33,7 +33,7 @@
                     <field name="comment" nolabel="1" placeholder="Describe what they did and why it matters (will be public)" />
                     <footer>
                         <button string="Reward Employee" type="object" name="action_grant_badge" class="btn-primary" data-hotkey="q"/>
-                        <button string="Cancel" special="cancel" data-hotkey="z" class="btn-secondary"/>
+                        <button string="Cancel" special="cancel" data-hotkey="x" class="btn-secondary"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/hr_holidays/static/src/views/view_dialog/form_view_dialog.xml b/addons/hr_holidays/static/src/views/view_dialog/form_view_dialog.xml
index 45f1360e79c..a273628f862 100644
--- a/addons/hr_holidays/static/src/views/view_dialog/form_view_dialog.xml
+++ b/addons/hr_holidays/static/src/views/view_dialog/form_view_dialog.xml
@@ -3,7 +3,7 @@
 
     <t t-name="hr_holidays.FormViewDialog.buttons" t-inherit="web.FormViewDialog.ToOne.buttons" owl="1">
         <xpath expr="//button[contains(@class, 'o_form_button_save')]" position="replace">
-            <button class="btn btn-primary o_form_button_save" t-on-click="saveButtonClicked" data-hotkey="c">Save</button>
+            <button class="btn btn-primary o_form_button_save" t-on-click="saveButtonClicked" data-hotkey="q">Save</button>
         </xpath>
 
         <xpath expr="//button[contains(@class, 'o_form_button_cancel')]" position="after">
@@ -14,7 +14,7 @@
                 <button class="btn btn-secondary" t-if="canRefuse" t-on-click="() => this.onClick('action_refuse')" data-hotkey="z">Refuse</button>
                 <button class="btn btn-secondary" t-if="canApprove" t-on-click="() => this.onClick('action_approve')" data-hotkey="g">Approve</button>
                 <button class="btn btn-secondary" t-if="canValidate" t-on-click="() => this.onClick('action_validate')" data-hotkey="v">Validate</button>
-            <div/>
+            </div>
         </xpath>
     </t>
 </templates>
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_employees_views.xml b/addons/hr_holidays/wizard/hr_holidays_summary_employees_views.xml
index 25b994b8246..a6a658c3300 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_employees_views.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_employees_views.xml
@@ -15,7 +15,7 @@
                     </group>
                     <footer>
                         <button name="print_report" string="Print" type="object" class="btn-primary" data-hotkey="q"/>
-                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z" />
+                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x" />
                     </footer>
                 </form>
             </field>
diff --git a/addons/hr_recruitment/views/hr_applicant_views.xml b/addons/hr_recruitment/views/hr_applicant_views.xml
index eda0ed9fc88..ac346bafd88 100644
--- a/addons/hr_recruitment/views/hr_applicant_views.xml
+++ b/addons/hr_recruitment/views/hr_applicant_views.xml
@@ -63,10 +63,10 @@
             <field name="meeting_ids" invisible="1"/>
             <field name="refuse_reason_id" invisible="1"/>
             <header>
-                <button string="Create Employee" name="create_employee_from_applicant" type="object" data-hotkey="v" groups="hr_recruitment.group_hr_recruitment_user"
+                <button string="Create Employee" name="create_employee_from_applicant" type="object" data-hotkey="q" groups="hr_recruitment.group_hr_recruitment_user"
                         class="o_create_employee" attrs="{'invisible': ['|', '|', ('emp_id', '!=', False), ('active', '=', False), ('date_closed', '=', False)]}"/>
                 <button string="Refuse" name="archive_applicant" type="object" attrs="{'invisible': [('active', '=', False)]}" data-hotkey="d"/>
-                <button string="Restore" name="toggle_active" type="object" attrs="{'invisible': [('active', '=', True)]}" data-hotkey="z"/>
+                <button string="Restore" name="toggle_active" type="object" attrs="{'invisible': [('active', '=', True)]}" data-hotkey="x"/>
                 <field name="stage_id" widget="statusbar" options="{'clickable': '1', 'fold_field': 'fold'}" attrs="{'invisible': [('active', '=', False),('emp_id', '=', False)]}"/>
             </header>
             <sheet>
diff --git a/addons/hr_recruitment/views/hr_job_views.xml b/addons/hr_recruitment/views/hr_job_views.xml
index 8c738d7d6a1..ed861b8803a 100644
--- a/addons/hr_recruitment/views/hr_job_views.xml
+++ b/addons/hr_recruitment/views/hr_job_views.xml
@@ -157,7 +157,7 @@
                 </group>
                 <footer>
                     <button string="Create" type="object" name="close_dialog" class="btn-primary o_create_job" data-hotkey="q"/>
-                    <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                    <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="x"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/hr_recruitment/wizard/applicant_refuse_reason_views.xml b/addons/hr_recruitment/wizard/applicant_refuse_reason_views.xml
index 7d1d1da3c78..95f8a3fc0a4 100644
--- a/addons/hr_recruitment/wizard/applicant_refuse_reason_views.xml
+++ b/addons/hr_recruitment/wizard/applicant_refuse_reason_views.xml
@@ -16,7 +16,7 @@
                     </div>
                     <footer>
                         <button name="action_refuse_reason_apply" string="Refuse" type="object" class="btn-primary" data-hotkey="q"/>
-                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/hr_recruitment/wizard/applicant_send_mail_views.xml b/addons/hr_recruitment/wizard/applicant_send_mail_views.xml
index f4d927478a1..1df298f33c3 100644
--- a/addons/hr_recruitment/wizard/applicant_send_mail_views.xml
+++ b/addons/hr_recruitment/wizard/applicant_send_mail_views.xml
@@ -17,7 +17,7 @@
                         options="{'style-inline': true}" force_save="1"/>
                 <footer>
                     <button name="action_send" string="Send" type="object" class="btn-primary" data-hotkey="q"/>
-                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/hr_skills/wizard/hr_employee_cv_wizard_views.xml b/addons/hr_skills/wizard/hr_employee_cv_wizard_views.xml
index 2e55e28da5e..4a009a60e83 100644
--- a/addons/hr_skills/wizard/hr_employee_cv_wizard_views.xml
+++ b/addons/hr_skills/wizard/hr_employee_cv_wizard_views.xml
@@ -22,7 +22,7 @@
                 </group>
                 <footer>
                     <button name="action_validate" string="Print" type="object" class="oe_highlight" data-hotkey="q"/>
-                    <button string="Discard" special="cancel" data-hotkey="z" class="btn-secondary"/>
+                    <button string="Discard" special="cancel" data-hotkey="x" class="btn-secondary"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/hr_timesheet/wizard/hr_employee_delete_wizard_views.xml b/addons/hr_timesheet/wizard/hr_employee_delete_wizard_views.xml
index 10fac39a3c3..6e471f219bf 100644
--- a/addons/hr_timesheet/wizard/hr_employee_delete_wizard_views.xml
+++ b/addons/hr_timesheet/wizard/hr_employee_delete_wizard_views.xml
@@ -24,14 +24,14 @@
                         <button string="Archive Employees" type="object" name="action_archive" class="btn btn-primary"
                             attrs="{'invisible': [('has_active_employee', '=', False)]}" data-hotkey="q"/>
                         <button string="See Timesheets" type="object" name="action_open_timesheets" class="btn btn-primary" groups="hr_timesheet.group_hr_timesheet_approver"
-                            attrs="{'invisible': [('has_active_employee', '=', True)]}" data-hotkey="x"/>
+                            attrs="{'invisible': [('has_active_employee', '=', True)]}" data-hotkey="w"/>
                         <button string="See Timesheets" type="object" name="action_open_timesheets" class="btn btn-secondary" groups="hr_timesheet.group_hr_timesheet_approver"
-                            attrs="{'invisible': [('has_active_employee', '=', False)]}" data-hotkey="x"/>
-                        <button string="Discard" special="cancel" data-hotkey="z"/>
+                            attrs="{'invisible': [('has_active_employee', '=', False)]}" data-hotkey="w"/>
+                        <button string="Discard" special="cancel" data-hotkey="x"/>
                     </footer>
                     <footer attrs="{'invisible': [('has_timesheet', '=', True)]}">
                         <button string="Ok" type="object" name="action_confirm_delete" class="btn btn-primary" data-hotkey="q"/>
-                        <button string="Discard" special="cancel" data-hotkey="z"/>
+                        <button string="Discard" special="cancel" data-hotkey="x"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/hr_work_entry_contract/wizard/hr_work_entry_regeneration_wizard_views.xml b/addons/hr_work_entry_contract/wizard/hr_work_entry_regeneration_wizard_views.xml
index 7d76fc6aa2d..d8fc7546d44 100644
--- a/addons/hr_work_entry_contract/wizard/hr_work_entry_regeneration_wizard_views.xml
+++ b/addons/hr_work_entry_contract/wizard/hr_work_entry_regeneration_wizard_views.xml
@@ -57,7 +57,7 @@
                             string="Regenerate Work Entries"
                             class="btn btn-primary disabled"
                             attrs="{'invisible': [('search_criteria_completed', '=', True), ('valid', '=', True)]}"/>
-                    <button name="cancel_button" string="Cancel" class="btn-secondary" special="cancel"/>
+                    <button name="cancel_button" string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/l10n_fr_fec/wizard/account_fr_fec_view.xml b/addons/l10n_fr_fec/wizard/account_fr_fec_view.xml
index 525a106aac3..25451fe04a8 100644
--- a/addons/l10n_fr_fec/wizard/account_fr_fec_view.xml
+++ b/addons/l10n_fr_fec/wizard/account_fr_fec_view.xml
@@ -114,8 +114,8 @@
             </notebook>
             <footer>
                 <button string="Generate" name="generate_fec" type="object"
-                    class="oe_highlight"/>
-                <button string="Cancel" class="btn btn-secondary" special="cancel" data-hotkey="z"/>
+                    class="oe_highlight" data-hotkey="q"/>
+                <button string="Cancel" class="btn btn-secondary" special="cancel" data-hotkey="x"/>
             </footer>
         </form>
     </field>
diff --git a/addons/l10n_latam_check/wizards/l10n_latam_payment_mass_transfer_views.xml b/addons/l10n_latam_check/wizards/l10n_latam_payment_mass_transfer_views.xml
index e5a090ee9cf..6f73bd02310 100644
--- a/addons/l10n_latam_check/wizards/l10n_latam_payment_mass_transfer_views.xml
+++ b/addons/l10n_latam_check/wizards/l10n_latam_payment_mass_transfer_views.xml
@@ -26,7 +26,7 @@
                     <button string="Cancel"
                         class="btn btn-secondary"
                         special="cancel"
-                        data-hotkey="z"/>
+                        data-hotkey="x"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/l10n_ph/wizard/generate_2307_wizard_views.xml b/addons/l10n_ph/wizard/generate_2307_wizard_views.xml
index bf81e50b68c..a129d79b8bc 100644
--- a/addons/l10n_ph/wizard/generate_2307_wizard_views.xml
+++ b/addons/l10n_ph/wizard/generate_2307_wizard_views.xml
@@ -22,7 +22,7 @@
                 </group>
                 <footer>
                     <button string="Generate" type="object" name="action_generate" class="btn btn-primary" data-hotkey="q"/>
-                    <button string="Cancel" special="cancel" data-hotkey="z" class="btn btn-secondary"/>
+                    <button string="Cancel" special="cancel" data-hotkey="x" class="btn btn-secondary"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/l10n_sa_edi/wizard/l10n_sa_edi_otp_wizard.xml b/addons/l10n_sa_edi/wizard/l10n_sa_edi_otp_wizard.xml
index 7d7e6b88b31..5dd77b731de 100644
--- a/addons/l10n_sa_edi/wizard/l10n_sa_edi_otp_wizard.xml
+++ b/addons/l10n_sa_edi/wizard/l10n_sa_edi_otp_wizard.xml
@@ -14,7 +14,7 @@
                 </group>
                 <footer>
                     <button string="Request" type="object" name="validate" class="btn btn-primary" data-hotkey="q"/>
-                    <button string="Cancel" special="cancel" data-hotkey="z" class="btn btn-secondary"/>
+                    <button string="Cancel" special="cancel" data-hotkey="x" class="btn btn-secondary"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/loyalty/wizard/loyalty_generate_wizard_views.xml b/addons/loyalty/wizard/loyalty_generate_wizard_views.xml
index a57dc40a96c..e41f1bab00d 100644
--- a/addons/loyalty/wizard/loyalty_generate_wizard_views.xml
+++ b/addons/loyalty/wizard/loyalty_generate_wizard_views.xml
@@ -44,7 +44,7 @@
                         </span>
                         <field name="program_type" nolabel="1"/>
                     </button>
-                    <button special="cancel" data-hotkey="z" string="Cancel"/>
+                    <button special="cancel" data-hotkey="x" string="Cancel"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/lunch/views/lunch_orders_views.xml b/addons/lunch/views/lunch_orders_views.xml
index 2f60c69fbe1..0762869b8be 100644
--- a/addons/lunch/views/lunch_orders_views.xml
+++ b/addons/lunch/views/lunch_orders_views.xml
@@ -274,9 +274,9 @@
                     </div>
                 </div>
                 <footer>
-                    <button string="Save" special="save" data-hotkey="v" class="oe_highlight" invisible="not context.get('active_id', False)"/>
+                    <button string="Save" special="save" data-hotkey="q" class="oe_highlight" invisible="not context.get('active_id', False)"/>
                     <button string="Add To Cart" name="add_to_cart" type="object" class="oe_highlight" invisible="context.get('active_id', False)" attrs="{'invisible': [('order_deadline_passed', '=', True)]}" data-hotkey="w"/>
-                    <button string="Discard" special="cancel" data-hotkey="z"/>
+                    <button string="Discard" special="cancel" data-hotkey="x"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/mail/views/mail_activity_views.xml b/addons/mail/views/mail_activity_views.xml
index 531e868d146..7660d375253 100644
--- a/addons/mail/views/mail_activity_views.xml
+++ b/addons/mail/views/mail_activity_views.xml
@@ -142,12 +142,12 @@
                             type="object" class="btn-secondary" data-hotkey="w"
                             context="{'mail_activity_quick_update': True}"/>
                         <button attrs="{'invisible': [('chaining_type', '=', 'trigger')]}" string="Done &amp; Schedule Next" name="action_done_schedule_next"
-                            type="object" class="btn-secondary" data-hotkey="x"
+                            type="object" class="btn-secondary" data-hotkey="q"
                             context="{'mail_activity_quick_update': True}"/>
                         <button attrs="{'invisible': [('chaining_type', '=', 'suggest')]}" string="Done &amp; Launch Next" name="action_done_schedule_next"
-                            type="object" class="btn-secondary" data-hotkey="x"
+                            type="object" class="btn-secondary" data-hotkey="q"
                             context="{'mail_activity_quick_update': True}"/>
-                        <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="z" />
+                        <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="x" />
                     </footer>
                 </sheet>
             </form>
diff --git a/addons/mail/wizard/mail_blacklist_remove_views.xml b/addons/mail/wizard/mail_blacklist_remove_views.xml
index 486520ff61e..311e44c912d 100644
--- a/addons/mail/wizard/mail_blacklist_remove_views.xml
+++ b/addons/mail/wizard/mail_blacklist_remove_views.xml
@@ -11,7 +11,7 @@
                 </group>
                 <footer>
                     <button name="action_unblacklist_apply" string="Confirm" type="object" class="btn-primary" data-hotkey="q"/>
-                    <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                    <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="x"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/mail/wizard/mail_compose_message_views.xml b/addons/mail/wizard/mail_compose_message_views.xml
index 7b1c84eddd7..61f8d5259ae 100644
--- a/addons/mail/wizard/mail_compose_message_views.xml
+++ b/addons/mail/wizard/mail_compose_message_views.xml
@@ -79,7 +79,7 @@
                         <button string="Log" name="action_send_mail"
                                 type="object" class="btn-primary" data-hotkey="q"
                                 attrs="{'invisible': [('subtype_is_log', '=', False)]}"/>
-                        <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="z" />
+                        <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="x" />
                         <button icon="fa-lg fa-save" type="object"
                                 name="action_save_as_template" string="Save as new template"
                                 attrs="{'invisible': [('can_edit_body', '=', False)]}"
diff --git a/addons/mail/wizard/mail_resend_message_views.xml b/addons/mail/wizard/mail_resend_message_views.xml
index ba8379b3c01..6f844ee7e6a 100644
--- a/addons/mail/wizard/mail_resend_message_views.xml
+++ b/addons/mail/wizard/mail_resend_message_views.xml
@@ -28,7 +28,7 @@
                                 attrs="{'invisible': [('can_resend', '=', True)]}" data-hotkey="w"/>
                         <button string="Ignore all" name="cancel_mail_action" type="object" class="btn-secondary"
                                 attrs="{'invisible': [('can_resend', '=', False)]}" data-hotkey="w"/>
-                        <button string="Close" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                        <button string="Close" class="btn-secondary" special="cancel" data-hotkey="x"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/mail/wizard/mail_template_preview_views.xml b/addons/mail/wizard/mail_template_preview_views.xml
index 54908fff15e..d765b1ef85b 100644
--- a/addons/mail/wizard/mail_template_preview_views.xml
+++ b/addons/mail/wizard/mail_template_preview_views.xml
@@ -37,7 +37,7 @@
                         </group>
                     </sheet>
                     <footer>
-                        <button string="Close" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                        <button string="Close" class="btn-secondary" special="cancel" data-hotkey="x"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/mail/wizard/mail_template_reset_views.xml b/addons/mail/wizard/mail_template_reset_views.xml
index 5b67077f2b9..a02a6a0340e 100644
--- a/addons/mail/wizard/mail_template_reset_views.xml
+++ b/addons/mail/wizard/mail_template_reset_views.xml
@@ -11,7 +11,7 @@
                 </div>
                 <footer>
                     <button string="Reset Template" class="btn btn-primary" type="object" name="reset_template" data-hotkey="q"/>
-                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/mail/wizard/mail_wizard_invite_views.xml b/addons/mail/wizard/mail_wizard_invite_views.xml
index 3f7372c080a..167b31042ae 100644
--- a/addons/mail/wizard/mail_wizard_invite_views.xml
+++ b/addons/mail/wizard/mail_wizard_invite_views.xml
@@ -22,7 +22,7 @@
                     <footer>
                         <button string="Add Followers"
                             name="add_followers" type="object" class="btn-primary" data-hotkey="q"/>
-                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z" />
+                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x" />
                     </footer>
                 </form>
             </field>
diff --git a/addons/mass_mailing/views/mailing_mailing_views.xml b/addons/mass_mailing/views/mailing_mailing_views.xml
index 067cf142572..a0a06e37495 100644
--- a/addons/mass_mailing/views/mailing_mailing_views.xml
+++ b/addons/mass_mailing/views/mailing_mailing_views.xml
@@ -60,16 +60,16 @@
                 <form string="Mailing" class="o_mass_mailing_mailing_form">
                     <header class="pt-3">
                         <button name="action_launch" type="object" class="oe_highlight" string="Send"
-                            attrs="{'invisible': [('state', 'in', ('in_queue',  'sending', 'done'))]}" data-hotkey="v"
+                            attrs="{'invisible': [('state', 'in', ('in_queue',  'sending', 'done'))]}" data-hotkey="q"
                             confirm="This will send the email to all recipients. Are you sure you want to proceed?"
                             confirm-title="Send Confirmation" confirm-label="Send to all"
                             />
                         <button name="action_schedule" type="object" class="btn-secondary" string="Schedule"
-                            attrs="{'invisible': [('state', 'in', ('in_queue',  'sending', 'done'))]}" data-hotkey="x"/>
+                            attrs="{'invisible': [('state', 'in', ('in_queue',  'sending', 'done'))]}" data-hotkey="v"/>
                         <button name="action_duplicate" type="object" class="btn-secondary" string="Duplicate"
                             data-hotkey="d" attrs="{'invisible': [('state', '!=', 'done')]}"/>
                         <button name="action_test" type="object" class="btn-secondary" string="Test" data-hotkey="k"/>
-                        <button name="action_cancel" type="object" attrs="{'invisible': [('state', '!=', 'in_queue')]}" class="btn-secondary" string="Cancel" data-hotkey="z"/>
+                        <button name="action_cancel" type="object" attrs="{'invisible': [('state', '!=', 'in_queue')]}" class="btn-secondary" string="Cancel" data-hotkey="x"/>
                         <button name="action_retry_failed" type="object" attrs="{'invisible': ['|', ('state', '!=', 'done'), ('failed', '=', 0)]}" class="oe_highlight" string="Retry" data-hotkey="y"/>
 
                         <div class="alert alert-info mb-2 text-center" role="alert"
diff --git a/addons/mass_mailing/wizard/mailing_contact_import_views.xml b/addons/mass_mailing/wizard/mailing_contact_import_views.xml
index 97f14b7cd3b..03f1adab8a4 100644
--- a/addons/mass_mailing/wizard/mailing_contact_import_views.xml
+++ b/addons/mass_mailing/wizard/mailing_contact_import_views.xml
@@ -27,9 +27,9 @@
                 </p>
                 <footer>
                     <button string="Import" type="object" name="action_import"
-                        class="btn-primary" data-hotkey="i"/>
+                        class="btn-primary" data-hotkey="q"/>
                     <button string="Discard" class="btn-secondary"
-                        special="cancel" data-hotkey="z"/>
+                        special="cancel" data-hotkey="x"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/mass_mailing/wizard/mailing_contact_to_list_views.xml b/addons/mass_mailing/wizard/mailing_contact_to_list_views.xml
index 269df23e01a..c5eab4ca905 100644
--- a/addons/mass_mailing/wizard/mailing_contact_to_list_views.xml
+++ b/addons/mass_mailing/wizard/mailing_contact_to_list_views.xml
@@ -13,7 +13,7 @@
                     <footer>
                         <button string="Add" name="action_add_contacts" type="object" class="btn-primary" data-hotkey="q"/>
                         <button string="Add and Send Mailing" name="action_add_contacts_and_send_mailing" type="object" class="btn-primary" data-hotkey="w"/>
-                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z" />
+                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x" />
                     </footer>
                 </form>
             </field>
diff --git a/addons/mass_mailing/wizard/mailing_list_merge_views.xml b/addons/mass_mailing/wizard/mailing_list_merge_views.xml
index 6e6869ab42d..c014b544a73 100644
--- a/addons/mass_mailing/wizard/mailing_list_merge_views.xml
+++ b/addons/mass_mailing/wizard/mailing_list_merge_views.xml
@@ -20,7 +20,7 @@
                 </field>
                 <footer>
                     <button name="action_mailing_lists_merge" type="object" string="Merge" class="btn-primary" data-hotkey="q"/>
-                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/mass_mailing/wizard/mailing_mailing_schedule_date_views.xml b/addons/mass_mailing/wizard/mailing_mailing_schedule_date_views.xml
index 9520122b16b..e0b180adb1d 100644
--- a/addons/mass_mailing/wizard/mailing_mailing_schedule_date_views.xml
+++ b/addons/mass_mailing/wizard/mailing_mailing_schedule_date_views.xml
@@ -12,7 +12,7 @@
                 </group>
                 <footer>
                     <button string="Schedule" name="action_schedule_date" type="object" class="btn-primary" data-hotkey="q"/>
-                    <button string="Discard " class="btn-secondary" special="cancel" data-hotkey="z" />
+                    <button string="Discard " class="btn-secondary" special="cancel" data-hotkey="x" />
                 </footer>
             </form>
         </field>
diff --git a/addons/mass_mailing/wizard/mailing_mailing_test_views.xml b/addons/mass_mailing/wizard/mailing_mailing_test_views.xml
index d920ce46cbe..aca9c1c4f70 100644
--- a/addons/mass_mailing/wizard/mailing_mailing_test_views.xml
+++ b/addons/mass_mailing/wizard/mailing_mailing_test_views.xml
@@ -14,7 +14,7 @@
                     </group>
                     <footer>
                         <button string="Send test" name="send_mail_test" type="object" class="btn-primary" data-hotkey="q"/>
-                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/mass_mailing_sms/wizard/mailing_sms_test_views.xml b/addons/mass_mailing_sms/wizard/mailing_sms_test_views.xml
index ca431d49f32..2bf3eb1b627 100644
--- a/addons/mass_mailing_sms/wizard/mailing_sms_test_views.xml
+++ b/addons/mass_mailing_sms/wizard/mailing_sms_test_views.xml
@@ -14,7 +14,7 @@
                 </group>
                 <footer>
                     <button string="Send" name="action_send_sms" type="object" class="btn-primary" data-hotkey="q"/>
-                    <button string="Cancel" class="btn btn-secondary" special="cancel" data-hotkey="z"/>
+                    <button string="Cancel" class="btn btn-secondary" special="cancel" data-hotkey="x"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/membership/wizard/membership_invoice_views.xml b/addons/membership/wizard/membership_invoice_views.xml
index 7c1df9c04ac..4ddf9eb3fe8 100644
--- a/addons/membership/wizard/membership_invoice_views.xml
+++ b/addons/membership/wizard/membership_invoice_views.xml
@@ -12,7 +12,7 @@
                     </group>
                     <footer>
                         <button string="Invoice Membership" name="membership_invoice" type="object" class="btn-primary" data-hotkey="q"/>
-                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z" />
+                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x" />
                     </footer>
                 </form>
             </field>
diff --git a/addons/microsoft_calendar/wizard/reset_account_views.xml b/addons/microsoft_calendar/wizard/reset_account_views.xml
index fa72bee27cf..1d79cff27ba 100644
--- a/addons/microsoft_calendar/wizard/reset_account_views.xml
+++ b/addons/microsoft_calendar/wizard/reset_account_views.xml
@@ -13,7 +13,7 @@
 
                 <footer>
                     <button name="reset_account" string="Confirm" type="object" class="btn-primary" data-hotkey="q"/>
-                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z" />
+                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x" />
                 </footer>
             </form>
         </field>
diff --git a/addons/mrp/views/mrp_production_views.xml b/addons/mrp/views/mrp_production_views.xml
index bd4ae4c13e9..0e5c2b326e5 100644
--- a/addons/mrp/views/mrp_production_views.xml
+++ b/addons/mrp/views/mrp_production_views.xml
@@ -119,10 +119,10 @@
                         ('move_raw_ids', '!=', []),
                         ('show_produce_all', '=', False)]}" string="Produce All" type="object" class="oe_highlight" data-hotkey="g"
                             confirm="There are no components to consume. Are you still sure you want to continue?"/>
-                    <button name="action_confirm" attrs="{'invisible': [('state', '!=', 'draft')]}" string="Confirm" type="object" class="oe_highlight" data-hotkey="v"/>
-                    <button name="button_plan" attrs="{'invisible': ['|', '|', ('state', 'not in', ('confirmed', 'progress', 'to_close')), ('workorder_ids', '=', []), ('is_planned', '=', True)]}" type="object" string="Plan" class="oe_highlight" data-hotkey="x"/>
-                    <button name="button_unplan" type="object" string="Unplan" attrs="{'invisible': ['|', ('is_planned', '=', False), ('state', '=', 'cancel')]}" data-hotkey="x"/>
-                    <button name="action_assign" attrs="{'invisible': ['|', ('state', 'in', ('draft', 'done', 'cancel')), ('reserve_visible', '=', False)]}" string="Check availability" type="object" data-hotkey="q"/>
+                    <button name="action_confirm" attrs="{'invisible': [('state', '!=', 'draft')]}" string="Confirm" type="object" class="oe_highlight" data-hotkey="q"/>
+                    <button name="button_plan" attrs="{'invisible': ['|', '|', ('state', 'not in', ('confirmed', 'progress', 'to_close')), ('workorder_ids', '=', []), ('is_planned', '=', True)]}" type="object" string="Plan" class="oe_highlight" data-hotkey="z"/>
+                    <button name="button_unplan" type="object" string="Unplan" attrs="{'invisible': ['|', ('is_planned', '=', False), ('state', '=', 'cancel')]}" data-hotkey="z"/>
+                    <button name="action_assign" attrs="{'invisible': ['|', ('state', 'in', ('draft', 'done', 'cancel')), ('reserve_visible', '=', False)]}" string="Check availability" type="object" data-hotkey="c"/>
                     <button name="do_unreserve" type="object" string="Unreserve" attrs="{'invisible': [('unreserve_visible', '=', False)]}" data-hotkey="w"/>
                     <button name="button_scrap" type="object" string="Scrap" attrs="{'invisible': [('state', 'in', ('cancel', 'draft'))]}" data-hotkey="y"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done"/>
@@ -130,9 +130,9 @@
                     <button name="action_toggle_is_locked" attrs="{'invisible': ['|', ('show_lock', '=', False), ('is_locked', '=', True)]}" string="Lock" groups="mrp.group_mrp_manager" type="object" help="Lock the manufacturing order to prevent changes to what has been consumed or produced." data-hotkey="l"/>
                     <field name="show_serial_mass_produce" invisible="1"/>
                     <button name="action_serial_mass_produce_wizard" attrs="{'invisible': [('show_serial_mass_produce', '=', False)]}" string="Mass Produce" type="object"/>
-                    <button name="action_cancel" type="object" string="Cancel" data-hotkey="z"
+                    <button name="action_cancel" type="object" string="Cancel" data-hotkey="x"
                             attrs="{'invisible': ['|', '|', ('id', '=', False), ('state', 'in', ('done', 'cancel')), ('confirm_cancel', '=', True)]}"/>
-                    <button name="action_cancel" type="object" string="Cancel" data-hotkey="z"
+                    <button name="action_cancel" type="object" string="Cancel" data-hotkey="x"
                             attrs="{'invisible': ['|', '|', ('id', '=', False), ('state', 'in', ('done', 'cancel')), ('confirm_cancel', '=', False)]}"
                             confirm="Some product moves have already been confirmed, this manufacturing order can't be completely cancelled. Are you still sure you want to process?"/>
                     <button name="button_unbuild" type="object" string="Unbuild" attrs="{'invisible': [('state', '!=', 'done')]}" data-hotkey="shift+v"/>
diff --git a/addons/mrp/views/mrp_unbuild_views.xml b/addons/mrp/views/mrp_unbuild_views.xml
index f3337ced34a..22502053d96 100644
--- a/addons/mrp/views/mrp_unbuild_views.xml
+++ b/addons/mrp/views/mrp_unbuild_views.xml
@@ -166,7 +166,7 @@
                     </sheet>
                     <footer class="oe_edit_only">
                         <button name="action_validate" string="Unbuild" type="object" states="draft" class="oe_highlight" data-hotkey="q"/>
-                        <button string="Discard" special="cancel" data-hotkey="z"/>
+                        <button string="Discard" special="cancel" data-hotkey="x"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/mrp/wizard/change_production_qty_views.xml b/addons/mrp/wizard/change_production_qty_views.xml
index 3cb1b97fdc6..1bd90b59e25 100644
--- a/addons/mrp/wizard/change_production_qty_views.xml
+++ b/addons/mrp/wizard/change_production_qty_views.xml
@@ -21,7 +21,7 @@
                     <footer>
                         <button name="change_prod_qty" string="Set Quantity" data-hotkey="q"
                             colspan="1" type="object" class="btn-primary"/>
-                        <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="z" />
+                        <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="x" />
                     </footer>
                 </form>
             </field>
diff --git a/addons/mrp/wizard/mrp_consumption_warning_views.xml b/addons/mrp/wizard/mrp_consumption_warning_views.xml
index 14f875d5403..5257c8efc98 100644
--- a/addons/mrp/wizard/mrp_consumption_warning_views.xml
+++ b/addons/mrp/wizard/mrp_consumption_warning_views.xml
@@ -39,7 +39,7 @@
                         <button name="action_confirm" string="Confirm" attrs="{'invisible': [('consumption', '=', 'strict')]}" data-hotkey="q"
                             colspan="1" type="object" class="btn-primary"/>
                         <button name="action_set_qty" string="Set Quantities &amp; Validate" colspan="1" type="object" class="btn-secondary"/>
-                        <button name="action_cancel" string="Discard" data-hotkey="w"
+                        <button name="action_cancel" string="Discard" data-hotkey="x"
                             colspan="1" type="object" class="btn-secondary"/>
                     </footer>
                 </form>
diff --git a/addons/mrp/wizard/mrp_production_backorder.xml b/addons/mrp/wizard/mrp_production_backorder.xml
index d469d0b17b1..b0c8bee0300 100644
--- a/addons/mrp/wizard/mrp_production_backorder.xml
+++ b/addons/mrp/wizard/mrp_production_backorder.xml
@@ -25,8 +25,8 @@
                             colspan="1" type="object" class="btn-primary" attrs="{'invisible': [('show_backorder_lines', '!=', False)]}"/>
                         <button name="action_backorder" string="Validate" data-hotkey="q"
                             colspan="1" type="object" class="btn-primary" attrs="{'invisible': [('show_backorder_lines', '=', False)]}"/>
-                        <button name="action_close_mo" type="object" string="No Backorder" attrs="{'invisible': [('show_backorder_lines', '!=', False)]}" data-hotkey="x"/>
-                        <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="z" />
+                        <button name="action_close_mo" type="object" string="No Backorder" attrs="{'invisible': [('show_backorder_lines', '!=', False)]}" data-hotkey="w"/>
+                        <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="x" />
                     </footer>
                 </form>
             </field>
diff --git a/addons/mrp/wizard/mrp_production_split.xml b/addons/mrp/wizard/mrp_production_split.xml
index 96d94ac466b..d8e1d8ae76a 100644
--- a/addons/mrp/wizard/mrp_production_split.xml
+++ b/addons/mrp/wizard/mrp_production_split.xml
@@ -18,7 +18,7 @@
                         </tree>
                     </field>
                     <footer>
-                        <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                        <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="x"/>
                     </footer>
                 </form>
             </field>
@@ -63,8 +63,8 @@
                     <field name="valid_details" invisible="1"/>
                     <footer>
                         <button string="Split" class="btn-primary" type="object" name="action_split" data-hotkey="q" attrs="{'invisible': [('valid_details', '=', False)]}"/>
-                        <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="z" attrs="{'invisible': [('production_split_multi_id', '!=', False)]}"/>
-                        <button string="Discard" class="btn-secondary" type="object" name="action_return_to_list" data-hotkey="z" attrs="{'invisible': [('production_split_multi_id', '=', False)]}"/>
+                        <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="x" attrs="{'invisible': [('production_split_multi_id', '!=', False)]}"/>
+                        <button string="Discard" class="btn-secondary" type="object" name="action_return_to_list" data-hotkey="x" attrs="{'invisible': [('production_split_multi_id', '=', False)]}"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/mrp/wizard/mrp_workcenter_block_view.xml b/addons/mrp/wizard/mrp_workcenter_block_view.xml
index eb44e2f28f1..60097b83451 100644
--- a/addons/mrp/wizard/mrp_workcenter_block_view.xml
+++ b/addons/mrp/wizard/mrp_workcenter_block_view.xml
@@ -14,7 +14,7 @@
                 </group>
                 <footer>
                     <button name="button_block" string="Block" type="object" class="btn-danger text-uppercase" data-hotkey="q"/>
-                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z" />
+                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x" />
                 </footer>
             </form>
         </field>
diff --git a/addons/mrp_product_expiry/wizard/confirm_expiry_view.xml b/addons/mrp_product_expiry/wizard/confirm_expiry_view.xml
index ed524a029ad..6c0a71af48b 100644
--- a/addons/mrp_product_expiry/wizard/confirm_expiry_view.xml
+++ b/addons/mrp_product_expiry/wizard/confirm_expiry_view.xml
@@ -21,12 +21,12 @@
             </xpath>
             <xpath expr="//button[@name='process']" position="after">
                 <!-- From Produce Product wizard -->
-                <button name="confirm_produce"
+                <button name="confirm_produce" data-hotkey="q"
                     string="Confirm"
                     type="object"
                     attrs="{'invisible': [('production_ids', '=', [])]}"
                     class="btn-primary"/>
-                <button special="cancel" data-hotkey="z"
+                <button special="cancel" data-hotkey="x"
                     string="Discard"
                     attrs="{'invisible': [('production_ids', '=', [])]}"
                     class="btn-secondary"/>
diff --git a/addons/mrp_subcontracting/views/mrp_production_views.xml b/addons/mrp_subcontracting/views/mrp_production_views.xml
index 8123ca5f87b..0c229f6576a 100644
--- a/addons/mrp_subcontracting/views/mrp_production_views.xml
+++ b/addons/mrp_subcontracting/views/mrp_production_views.xml
@@ -49,7 +49,7 @@
                 <footer>
                     <button name="subcontracting_record_component" attrs="{'invisible': ['|', ('state', '=', 'to_close'), ('qty_producing', '&lt;', 0.001)]}" string="Continue" type="object" class="oe_highlight" data-hotkey="q"/>
                     <button name="subcontracting_record_component" attrs="{'invisible': [('state', '!=', 'to_close')]}" string="Record Production" type="object" class="oe_highlight" data-hotkey="q"/>
-                    <button string="Discard" special="cancel" data-hotkey="z" />
+                    <button string="Discard" special="cancel" data-hotkey="x" />
                 </footer>
             </xpath>
             <xpath expr="//div[hasclass('oe_chatter')]" position="replace"/>
@@ -109,4 +109,3 @@
         </field>
     </record>
 </odoo>
-
diff --git a/addons/payment/wizards/payment_link_wizard_views.xml b/addons/payment/wizards/payment_link_wizard_views.xml
index 95d286f9716..f674f8b96d8 100644
--- a/addons/payment/wizards/payment_link_wizard_views.xml
+++ b/addons/payment/wizards/payment_link_wizard_views.xml
@@ -40,11 +40,12 @@
                            string="Generate and Copy Payment Link"
                            readonly="1"
                            disabled="[('warning_message', '!=', '')]"
-                           widget="CopyClipboardButton"/>
+                           widget="CopyClipboardButton"
+                           data-hotkey="q"/>
                     <button string="Close"
                             class="btn btn-secondary rounded-2"
                             special="cancel"
-                            data-hotkey="z"/>
+                            data-hotkey="x"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/payment/wizards/payment_onboarding_views.xml b/addons/payment/wizards/payment_onboarding_views.xml
index 7bd71aae308..1a0681c0374 100644
--- a/addons/payment/wizards/payment_onboarding_views.xml
+++ b/addons/payment/wizards/payment_onboarding_views.xml
@@ -36,7 +36,7 @@
                 <footer>
                     <button name="add_payment_methods" string="Apply" class="oe_highlight"
                             type="object" data-hotkey="q" />
-                    <button special="cancel" data-hotkey="z" string="Cancel" />
+                    <button special="cancel" data-hotkey="x" string="Cancel" />
                 </footer>
             </form>
         </field>
diff --git a/addons/phone_validation/wizard/phone_blacklist_remove_view.xml b/addons/phone_validation/wizard/phone_blacklist_remove_view.xml
index ccb39de4c66..c0b666e495d 100644
--- a/addons/phone_validation/wizard/phone_blacklist_remove_view.xml
+++ b/addons/phone_validation/wizard/phone_blacklist_remove_view.xml
@@ -11,7 +11,7 @@
                 </group>
                 <footer>
                     <button name="action_unblacklist_apply" string="Confirm" type="object" class="btn-primary" data-hotkey="q"/>
-                    <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                    <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="x"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/point_of_sale/wizard/pos_close_session_wizard.xml b/addons/point_of_sale/wizard/pos_close_session_wizard.xml
index 21e9062e872..c2a319ddd25 100644
--- a/addons/point_of_sale/wizard/pos_close_session_wizard.xml
+++ b/addons/point_of_sale/wizard/pos_close_session_wizard.xml
@@ -13,7 +13,7 @@
                 </group>
                 <footer>
                     <button name="close_session" string="Close Session" type="object" class="btn-primary" data-hotkey="q"/>
-                    <button special="cancel" data-hotkey="z" string="Cancel" class="btn-secondary" />
+                    <button special="cancel" data-hotkey="x" string="Cancel" class="btn-secondary" />
                 </footer>
             </form>
         </field>
diff --git a/addons/point_of_sale/wizard/pos_details.xml b/addons/point_of_sale/wizard/pos_details.xml
index 9bd2b0e1f22..313fff4bd6e 100644
--- a/addons/point_of_sale/wizard/pos_details.xml
+++ b/addons/point_of_sale/wizard/pos_details.xml
@@ -14,7 +14,7 @@
                     </group>
                     <footer>
                         <button name="generate_report" string="Print" type="object" class="btn-primary" data-hotkey="q"/>
-                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z" />
+                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x" />
                     </footer>
                 </form>
             </field>
diff --git a/addons/point_of_sale/wizard/pos_payment.xml b/addons/point_of_sale/wizard/pos_payment.xml
index 718d7ad6386..18f30cec6ea 100644
--- a/addons/point_of_sale/wizard/pos_payment.xml
+++ b/addons/point_of_sale/wizard/pos_payment.xml
@@ -13,7 +13,7 @@
                 </group>
                 <footer>
                     <button name="check" string="Make Payment" type="object" class="btn-primary" data-hotkey="q"/>
-                    <button special="cancel" data-hotkey="z" string="Cancel" class="btn-secondary"/>
+                    <button special="cancel" data-hotkey="x" string="Cancel" class="btn-secondary"/>
                 </footer>
             </form>
             </field>
diff --git a/addons/portal/wizard/portal_share_views.xml b/addons/portal/wizard/portal_share_views.xml
index f6e3748f218..e5ef186ec33 100644
--- a/addons/portal/wizard/portal_share_views.xml
+++ b/addons/portal/wizard/portal_share_views.xml
@@ -15,7 +15,7 @@
                 </group>
                 <footer>
                     <button string="Send" name="action_send_mail" attrs="{'invisible': [('access_warning', '!=', '')]}" type="object" class="btn-primary" data-hotkey="q"/>
-                    <button string="Cancel" class="btn-default" special="cancel" data-hotkey="z" />
+                    <button string="Cancel" class="btn-default" special="cancel" data-hotkey="x" />
                 </footer>
             </form>
         </field>
diff --git a/addons/product_expiry/wizard/confirm_expiry_view.xml b/addons/product_expiry/wizard/confirm_expiry_view.xml
index a5e80a09e19..bfe83c10507 100644
--- a/addons/product_expiry/wizard/confirm_expiry_view.xml
+++ b/addons/product_expiry/wizard/confirm_expiry_view.xml
@@ -28,7 +28,7 @@
                         class="btn-secondary"/>
                     <button string="Discard"
                         class="btn-secondary"
-                        special="cancel" data-hotkey="z"/>
+                        special="cancel" data-hotkey="x"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/product_margin/wizard/product_margin_view.xml b/addons/product_margin/wizard/product_margin_view.xml
index 57fc35f3a15..7512a170242 100644
--- a/addons/product_margin/wizard/product_margin_view.xml
+++ b/addons/product_margin/wizard/product_margin_view.xml
@@ -12,7 +12,7 @@
                     </group>
                     <footer>
                         <button name="action_open_window" string="Open Margins" type="object" class="btn-primary" data-hotkey="q"/>
-                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z" />
+                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x" />
                     </footer>
                 </form>
             </field>
diff --git a/addons/project/views/project_project_views.xml b/addons/project/views/project_project_views.xml
index c5374c73587..3743f135aa8 100644
--- a/addons/project/views/project_project_views.xml
+++ b/addons/project/views/project_project_views.xml
@@ -338,7 +338,7 @@
                 <xpath expr="//div[@name='alias_def']" position="after">
                     <footer>
                         <button string="Create project" name="action_view_tasks" type="object" class="btn-primary o_open_tasks" data-hotkey="q"/>
-                        <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                        <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="x"/>
                     </footer>
                 </xpath>
             </field>
diff --git a/addons/project/wizard/project_project_stage_delete_views.xml b/addons/project/wizard/project_project_stage_delete_views.xml
index e47709c30c6..5b716b09b3a 100644
--- a/addons/project/wizard/project_project_stage_delete_views.xml
+++ b/addons/project/wizard/project_project_stage_delete_views.xml
@@ -19,7 +19,7 @@
                 <footer>
                     <button string="Archive Stages" type="object" name="action_archive" class="btn btn-primary" attrs="{'invisible': ['|', ('stages_active', '=', False), ('projects_count', '=', 0)]}" data-hotkey="q"/>
                     <button string="Delete" type="object" name="action_unlink" class="btn btn-primary" attrs="{'invisible': [('projects_count', '>', 0)]}" data-hotkey="w"/>
-                    <button string="Discard" special="cancel" data-hotkey="z" t-att-class="stages_active or projects_count ? '' : 'btn btn-primary'" />
+                    <button string="Discard" special="cancel" data-hotkey="x" t-att-class="stages_active or projects_count ? '' : 'btn btn-primary'" />
                 </footer>
             </form>
         </field>
diff --git a/addons/project/wizard/project_share_wizard_views.xml b/addons/project/wizard/project_share_wizard_views.xml
index 184f93a09c1..512dba38029 100644
--- a/addons/project/wizard/project_share_wizard_views.xml
+++ b/addons/project/wizard/project_share_wizard_views.xml
@@ -22,7 +22,7 @@
                 <field name="note" placeholder="Add a note" nolabel="1"/>
                 <footer>
                     <button string="Send" name="action_send_mail" attrs="{'invisible': [('access_warning', '!=', '')]}" type="object" class="btn-primary" data-hotkey="q"/>
-                    <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="z" />
+                    <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="x" />
                 </footer>
             </form>
         </field>
diff --git a/addons/project/wizard/project_task_type_delete_views.xml b/addons/project/wizard/project_task_type_delete_views.xml
index 76a0bb8ec01..1e2b91e3db5 100644
--- a/addons/project/wizard/project_task_type_delete_views.xml
+++ b/addons/project/wizard/project_task_type_delete_views.xml
@@ -19,7 +19,7 @@
                 <footer>
                     <button string="Archive Stages" type="object" name="action_archive" class="btn btn-primary" attrs="{'invisible': ['|', ('stages_active', '=', False), ('tasks_count', '=', 0)]}" data-hotkey="q"/>
                     <button string="Delete" type="object" name="action_unlink" class="btn btn-primary" attrs="{'invisible': [('tasks_count', '>', 0)]}" data-hotkey="w"/>
-                    <button string="Discard" special="cancel" data-hotkey="z" />
+                    <button string="Discard" special="cancel" data-hotkey="x" />
                 </footer>
             </form>
         </field>
@@ -41,7 +41,7 @@
                 </div>
                 <footer>
                     <button string="Confirm" type="object" name="action_confirm" class="btn btn-primary" data-hotkey="q"/>
-                    <button string="Discard" special="cancel" data-hotkey="z" />
+                    <button string="Discard" special="cancel" data-hotkey="x" />
                 </footer>
             </form>
         </field>
diff --git a/addons/purchase/views/purchase_views.xml b/addons/purchase/views/purchase_views.xml
index c2add77c09c..b55c0544b38 100644
--- a/addons/purchase/views/purchase_views.xml
+++ b/addons/purchase/views/purchase_views.xml
@@ -135,12 +135,12 @@
                 <header>
                     <button name="action_rfq_send" states="draft" string="Send by Email" type="object" context="{'send_rfq':True}" class="oe_highlight" data-hotkey="g"/>
                     <button name="print_quotation" string="Print RFQ" type="object" states="draft" class="oe_highlight" groups="base.group_user" data-hotkey="k"/>
-                    <button name="button_confirm" type="object" states="sent" string="Confirm Order" context="{'validate_analytic': True}" class="oe_highlight" id="bid_confirm" data-hotkey="v"/>
+                    <button name="button_confirm" type="object" states="sent" string="Confirm Order" context="{'validate_analytic': True}" class="oe_highlight" id="bid_confirm" data-hotkey="q"/>
                     <button name="button_approve" type="object" states='to approve' string="Approve Order" class="oe_highlight" groups="purchase.group_purchase_manager" data-hotkey="z"/>
                     <button name="action_create_invoice" string="Create Bill" type="object" class="oe_highlight" context="{'create_bill':True}" attrs="{'invisible': ['|', ('state', 'not in', ('purchase', 'done')), ('invoice_status', 'in', ('no', 'invoiced'))]}" data-hotkey="w"/>
                     <button name="action_rfq_send" states="sent" string="Re-Send by Email" type="object" context="{'send_rfq':True}" data-hotkey="g"/>
                     <button name="print_quotation" string="Print RFQ" type="object" states="sent" groups="base.group_user" data-hotkey="k"/>
-                    <button name="button_confirm" type="object" states="draft" context="{'validate_analytic': True}" string="Confirm Order" id="draft_confirm"/>
+                    <button name="button_confirm" type="object" states="draft" context="{'validate_analytic': True}" string="Confirm Order" id="draft_confirm" data-hotkey="q"/>
                     <button name="action_rfq_send" states="purchase" string="Send PO by Email" type="object" context="{'send_rfq':False}" data-hotkey="g"/>
                     <button name="confirm_reminder_mail" string="Confirm Receipt Date" type="object" attrs="{'invisible': ['|','|', ('state', 'not in', ('purchase', 'done')), ('mail_reminder_confirmed', '=', True), ('date_planned', '=', False)]}" groups="base.group_no_one" data-hotkey="o"/>
                     <button name="action_create_invoice" string="Create Bill" type="object" context="{'create_bill':True}" attrs="{'invisible': ['|', '|', ('state', 'not in', ('purchase', 'done')), ('invoice_status', 'not in', ('no', 'invoiced')), ('order_line', '=', [])]}" data-hotkey="w"/>
diff --git a/addons/repair/views/repair_views.xml b/addons/repair/views/repair_views.xml
index 701b87a0af7..51a62505f15 100644
--- a/addons/repair/views/repair_views.xml
+++ b/addons/repair/views/repair_views.xml
@@ -39,11 +39,11 @@
                    <button name="action_validate" states="draft" type="object" string="Confirm Repair" class="oe_highlight" data-hotkey="v"/>
                    <button name="action_repair_start" attrs="{'invisible': ['&amp;', ('state','!=','confirmed'), '!', '&amp;', ('state','=','ready'), ('invoice_method','=','b4repair')]}"
                     type="object" string="Start Repair" class="oe_highlight" data-hotkey="q"/>
-                   <button name="action_repair_end" states="under_repair" type="object" string="End Repair" class="oe_highlight" data-hotkey="x"/>
+                   <button name="action_repair_end" states="under_repair" type="object" string="End Repair" class="oe_highlight" data-hotkey="w"/>
                    <button name="action_repair_invoice_create" type="object" string="Create Invoice" class="oe_highlight" groups="account.group_account_invoice" attrs="{'invisible': ['|', ('state', '!=', '2binvoiced'), ('invoice_id', '!=', False)]}" data-hotkey="w"/>
                    <button name="action_send_mail" states="draft" string="Send Quotation" type="object" data-hotkey="g"/>
                    <button name="print_repair_order" states="draft" string="Print Quotation" type="object" data-hotkey="y"/>
-                   <button name="action_repair_cancel_draft" states="cancel" string="Set to Draft" type="object" data-hotkey="z"/>
+                   <button name="action_repair_cancel_draft" states="cancel" string="Set to Draft" type="object" data-hotkey="x"/>
                    <button name="action_repair_cancel" string="Cancel Repair" type="object" confirm="Draft invoices for this order will be cancelled. Do you confirm the action?" attrs="{'invisible':['|', ('state', 'in', ('cancel', 'done')), ('invoice_state', '!=', 'draft')]}" data-hotkey="l"/>
                    <button name="action_repair_cancel" string="Cancel Repair" type="object" attrs="{'invisible': ['|', ('state','in', ('cancel','done')), ('invoice_state', '=', 'draft')]}" data-hotkey="l"/>
                    <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done"/>
diff --git a/addons/repair/wizard/repair_make_invoice_views.xml b/addons/repair/wizard/repair_make_invoice_views.xml
index b428dc9e1f8..322db57a06e 100644
--- a/addons/repair/wizard/repair_make_invoice_views.xml
+++ b/addons/repair/wizard/repair_make_invoice_views.xml
@@ -14,7 +14,7 @@
                 </group>
                 <footer>
                     <button name="make_invoices" string="Create Invoice" type="object" class="btn-primary" data-hotkey="q"/>
-                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z" />
+                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x" />
                 </footer>
             </form>
             </field>
diff --git a/addons/sale/views/sale_order_views.xml b/addons/sale/views/sale_order_views.xml
index 0f615faea82..14798e2794d 100644
--- a/addons/sale/views/sale_order_views.xml
+++ b/addons/sale/views/sale_order_views.xml
@@ -236,19 +236,19 @@
                         confirm="Are you sure you want to void the authorized transaction? This action can't be undone."
                         attrs="{'invisible': [('authorized_transaction_ids', '=', [])]}"/>
                 <button id="create_invoice" name="%(sale.action_view_sale_advance_payment_inv)d" string="Create Invoice"
-                    type="action" class="btn-primary" data-hotkey="q"
+                    type="action" class="btn-primary" data-hotkey="c"
                     attrs="{'invisible': [('invoice_status', '!=', 'to invoice')]}"/>
                 <button id="create_invoice_percentage" name="%(sale.action_view_sale_advance_payment_inv)d" string="Create Invoice"
-                    type="action" context="{'default_advance_payment_method': 'percentage'}" data-hotkey="q"
+                    type="action" context="{'default_advance_payment_method': 'percentage'}" data-hotkey="c"
                     attrs="{'invisible': ['|',('invoice_status', '!=', 'no'), ('state', '!=', 'sale')]}"/>
                 <button name="action_quotation_send" string="Send by Email" type="object" states="draft" class="btn-primary" data-hotkey="g" context="{'validate_analytic': True}"/>
                 <button name="action_quotation_send" type="object" string="Send PRO-FORMA Invoice"
                     groups="sale.group_proforma_sales" class="btn-primary"
                     attrs="{'invisible': ['|', ('state', '!=', 'draft'), ('invoice_count','&gt;=',1)]}" context="{'proforma': True, 'validate_analytic': True}"/>
-                <button name="action_confirm" id="action_confirm" data-hotkey="v"
+                <button name="action_confirm" id="action_confirm" data-hotkey="q"
                     string="Confirm" class="btn-primary" type="object" context="{'validate_analytic': True}"
                     attrs="{'invisible': [('state', 'not in', ['sent'])]}"/>
-                <button name="action_confirm" data-hotkey="v"
+                <button name="action_confirm" data-hotkey="q"
                     string="Confirm" type="object" context="{'validate_analytic': True}"
                     attrs="{'invisible': [('state', 'not in', ['draft'])]}"/>
                 <button name="action_quotation_send" type="object" string="Send PRO-FORMA Invoice" groups="sale.group_proforma_sales" attrs="{'invisible': ['|', ('state', '=', 'draft'), ('invoice_count','&gt;=',1)]}" context="{'proforma': True, 'validate_analytic': True}"/>
@@ -258,7 +258,7 @@
                 <button name="action_unlock" type="object" string="Unlock"
                         attrs="{'invisible': [('locked', '=', False)]}" groups="sales_team.group_sale_manager"/>
                 <button name="action_preview_sale_order" string="Preview" type="object" class="btn-secondary"/>
-                <button name="action_cancel" type="object" string="Cancel" attrs="{'invisible': ['|', ('state', 'not in', ['draft', 'sent','sale']), ('id', '=', False)]}" data-hotkey="z"/>
+                <button name="action_cancel" type="object" string="Cancel" attrs="{'invisible': ['|', ('state', 'not in', ['draft', 'sent','sale']), ('id', '=', False)]}" data-hotkey="x"/>
                 <button name="action_draft" states="cancel" type="object" string="Set to Quotation" data-hotkey="w"/>
                 <t groups="sale.group_auto_done_setting">
                     <button name="action_lock" type="object" string="Lock"
diff --git a/addons/sale/wizard/sale_make_invoice_advance_views.xml b/addons/sale/wizard/sale_make_invoice_advance_views.xml
index 1b6cb6e28ca..98088457861 100644
--- a/addons/sale/wizard/sale_make_invoice_advance_views.xml
+++ b/addons/sale/wizard/sale_make_invoice_advance_views.xml
@@ -62,7 +62,7 @@
                         id="create_invoice_open"
                         string="Create Draft Invoice"
                         class="btn-primary" data-hotkey="q"/>
-                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/sale_crm/wizard/crm_opportunity_to_quotation_views.xml b/addons/sale_crm/wizard/crm_opportunity_to_quotation_views.xml
index 5c5b910f471..21e04fc911c 100644
--- a/addons/sale_crm/wizard/crm_opportunity_to_quotation_views.xml
+++ b/addons/sale_crm/wizard/crm_opportunity_to_quotation_views.xml
@@ -19,7 +19,7 @@
                 </group>
                 <footer>
                     <button name="action_apply" string="Confirm" type="object" class="btn-primary" data-hotkey="q"/>
-                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/sale_loyalty/wizard/sale_loyalty_coupon_wizard_views.xml b/addons/sale_loyalty/wizard/sale_loyalty_coupon_wizard_views.xml
index 7efedef5e3e..997d55e5e23 100644
--- a/addons/sale_loyalty/wizard/sale_loyalty_coupon_wizard_views.xml
+++ b/addons/sale_loyalty/wizard/sale_loyalty_coupon_wizard_views.xml
@@ -14,7 +14,7 @@
                 </sheet>
                 <footer>
                     <button type="object" name="action_apply" string="Apply" class="btn btn-primary" data-hotkey="q"/>
-                    <button special="cancel" string="Discard" class="btn btn-secondary" data-hotkey="z"/>
+                    <button special="cancel" string="Discard" class="btn btn-secondary" data-hotkey="x"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/sale_loyalty/wizard/sale_loyalty_reward_wizard_views.xml b/addons/sale_loyalty/wizard/sale_loyalty_reward_wizard_views.xml
index 1a4a22d9701..28ece068b7d 100644
--- a/addons/sale_loyalty/wizard/sale_loyalty_reward_wizard_views.xml
+++ b/addons/sale_loyalty/wizard/sale_loyalty_reward_wizard_views.xml
@@ -29,10 +29,10 @@
                     <button type="object" name="action_apply" string="Apply" class="btn btn-primary"
                         attrs="{'invisible': [('reward_ids', '=', [])]}" data-hotkey="q"/>
                     <button special="cancel" string="Discard" class="btn btn-secondary"
-                        attrs="{'invisible': [('reward_ids', '=', [])]}" data-hotkey="z"/>
+                        attrs="{'invisible': [('reward_ids', '=', [])]}" data-hotkey="x"/>
                     <!-- No rewards -->
                     <button special="cancel" string="Discard" class="btn btn-primary"
-                        attrs="{'invisible': [('reward_ids', '!=', [])]}" data-hotkey="z"/>
+                        attrs="{'invisible': [('reward_ids', '!=', [])]}" data-hotkey="x"/>
                     <button type="action" name="%(loyalty.loyalty_program_discount_loyalty_action)d" string="Coupons &amp; Loyalty" class="btn btn-secondary float-end"
                         attrs="{'invisible': [('reward_ids', '!=', [])]}" groups="sales_team.group_sale_manager" data-hotkey="q"/>
                 </footer>
diff --git a/addons/sale_timesheet/wizard/project_create_invoice_views.xml b/addons/sale_timesheet/wizard/project_create_invoice_views.xml
index 27b03368a3b..50e22755c41 100644
--- a/addons/sale_timesheet/wizard/project_create_invoice_views.xml
+++ b/addons/sale_timesheet/wizard/project_create_invoice_views.xml
@@ -14,7 +14,7 @@
                 </group>
                 <footer>
                     <button string="Create Invoice" type="object" name="action_create_invoice" class="oe_highlight" data-hotkey="q"/>
-                    <button string="Discard" special="cancel" data-hotkey="z" type="object" class="btn btn-secondary oe_inline"/>
+                    <button string="Discard" special="cancel" data-hotkey="x" type="object" class="btn btn-secondary oe_inline"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/sale_timesheet/wizard/project_create_sale_order_views.xml b/addons/sale_timesheet/wizard/project_create_sale_order_views.xml
index fe8211fdb59..b7f0cc1706d 100644
--- a/addons/sale_timesheet/wizard/project_create_sale_order_views.xml
+++ b/addons/sale_timesheet/wizard/project_create_sale_order_views.xml
@@ -26,7 +26,7 @@
                 </group>
                 <footer>
                     <button string="Create Sales Order" type="object" name="action_create_sale_order" class="oe_highlight" data-hotkey="q"/>
-                    <button string="Discard" special="cancel" data-hotkey="z" type="object" class="btn btn-secondary oe_inline"/>
+                    <button string="Discard" special="cancel" data-hotkey="x" type="object" class="btn btn-secondary oe_inline"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/sms/wizard/sms_composer_views.xml b/addons/sms/wizard/sms_composer_views.xml
index ec1aefa6d16..1caaaabda99 100644
--- a/addons/sms/wizard/sms_composer_views.xml
+++ b/addons/sms/wizard/sms_composer_views.xml
@@ -60,7 +60,7 @@
                         attrs="{'invisible': [('composition_mode', '!=', 'mass')]}"/>
                     <button string="Send Now" type="object" name="action_send_sms_mass_now" data-hotkey="w"
                         attrs="{'invisible': [('composition_mode', '!=', 'mass')]}"/>
-                    <button string="Close" class="btn btn-secondary" special="cancel" data-hotkey="z"/>
+                    <button string="Close" class="btn btn-secondary" special="cancel" data-hotkey="x"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/sms/wizard/sms_resend_views.xml b/addons/sms/wizard/sms_resend_views.xml
index 4ba9d9f5172..60fa68ce665 100644
--- a/addons/sms/wizard/sms_resend_views.xml
+++ b/addons/sms/wizard/sms_resend_views.xml
@@ -27,10 +27,10 @@
                     <button string="Send &amp; Close" name="action_resend" type="object" class="btn-primary o_mail_send"
                             attrs="{'invisible': ['|', ('has_unregistered_account', '=', False), ('can_resend', '=', False)]}" data-hotkey="w"/>
                     <button string="Ignore all" name="action_cancel" type="object" class="btn-primary"
-                            attrs="{'invisible': ['|', '|', ('has_insufficient_credit', '=', True), ('has_unregistered_account', '=', True), '&amp;', ('has_unregistered_account', '=', True), ('can_resend', '=', True)]}" data-hotkey="x"/>
+                            attrs="{'invisible': ['|', '|', ('has_insufficient_credit', '=', True), ('has_unregistered_account', '=', True), '&amp;', ('has_unregistered_account', '=', True), ('can_resend', '=', True)]}" data-hotkey="z"/>
                     <button string="Ignore all" name="action_cancel" type="object" class="btn-secondary"
-                            attrs="{'invisible': ['!', '|', '|', ('has_insufficient_credit', '=', True), ('has_unregistered_account', '=', True), '&amp;', ('has_unregistered_account', '=', True), ('can_resend', '=', True)]}" data-hotkey="x"/>
-                    <button string="Close" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                            attrs="{'invisible': ['!', '|', '|', ('has_insufficient_credit', '=', True), ('has_unregistered_account', '=', True), '&amp;', ('has_unregistered_account', '=', True), ('can_resend', '=', True)]}" data-hotkey="z"/>
+                    <button string="Close" class="btn-secondary" special="cancel" data-hotkey="x"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/sms/wizard/sms_template_preview_views.xml b/addons/sms/wizard/sms_template_preview_views.xml
index 2014f852ebd..a9ba0a8ad9c 100644
--- a/addons/sms/wizard/sms_template_preview_views.xml
+++ b/addons/sms/wizard/sms_template_preview_views.xml
@@ -22,7 +22,7 @@
                         <field name="body" readonly="1" nolabel="1" options='{"safe": True}'/>
                     <hr/>
                     <footer>
-                        <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                        <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="x"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/sms/wizard/sms_template_reset_views.xml b/addons/sms/wizard/sms_template_reset_views.xml
index 101601ebe71..ddcd659feec 100644
--- a/addons/sms/wizard/sms_template_reset_views.xml
+++ b/addons/sms/wizard/sms_template_reset_views.xml
@@ -12,7 +12,7 @@
                 </div>
                 <footer>
                     <button string="Proceed" class="btn btn-primary" type="object" name="reset_template" data-hotkey="q"/>
-                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/snailmail/wizard/snailmail_letter_format_error_views.xml b/addons/snailmail/wizard/snailmail_letter_format_error_views.xml
index d63596a4aea..6c30cafde51 100644
--- a/addons/snailmail/wizard/snailmail_letter_format_error_views.xml
+++ b/addons/snailmail/wizard/snailmail_letter_format_error_views.xml
@@ -14,7 +14,7 @@
                 <footer>
                     <button string="Update Config and Re-send" name="update_resend_action" type="object" class="btn-primary" data-hotkey="q"/>
                     <button string="Cancel Letter" name="cancel_letter_action" type="object" class="btn-primary" data-hotkey="w"/>
-                    <button string="Close" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                    <button string="Close" class="btn-secondary" special="cancel" data-hotkey="x"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/snailmail/wizard/snailmail_letter_missing_required_fields_views.xml b/addons/snailmail/wizard/snailmail_letter_missing_required_fields_views.xml
index 62c1ed42c0e..dd31713114f 100644
--- a/addons/snailmail/wizard/snailmail_letter_missing_required_fields_views.xml
+++ b/addons/snailmail/wizard/snailmail_letter_missing_required_fields_views.xml
@@ -23,7 +23,7 @@
                 <footer>
                     <button string="Update address and re-send" type="object" name="update_address_save" class="btn-primary" data-hotkey="q"/>
                     <button string="Cancel letter" type="object" name="update_address_cancel" class="btn-secondary" data-hotkey="w"/>
-                    <button string="Close" special='cancel' class="btn-secondary" data-hotkey="z"/>
+                    <button string="Close" special='cancel' class="btn-secondary" data-hotkey="x"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/stock/views/stock_move_views.xml b/addons/stock/views/stock_move_views.xml
index 0be9f6e4e1a..b61cbec23af 100644
--- a/addons/stock/views/stock_move_views.xml
+++ b/addons/stock/views/stock_move_views.xml
@@ -182,8 +182,8 @@
                            widget="sml_x2_many"/>
                     <footer class="d-flex justify-content-between" attrs="{'invisible': ['|', ('state', '=', 'cancel'), '&amp;', ('state', '=', 'done'), ('is_locked', '=', True)]}">
                         <div class="d-flex gap-1">
-                            <button string="Confirm" special="save" data-hotkey="v" class="oe_highlight"/>
-                            <button string="Discard" special="cancel" data-hotkey="z"/>
+                            <button string="Confirm" special="save" data-hotkey="q" class="oe_highlight"/>
+                            <button string="Discard" special="cancel" data-hotkey="x"/>
                         </div>
                         <div>
                             <button name="action_open_generate_serial" attrs="{'invisible': [('display_assign_serial', '=', False)]}" string="Generate Serials" type="object" class="float-end btn-link"/>
@@ -191,7 +191,7 @@
                         </div>
                     </footer>
                     <footer class="oe_edit_only" attrs="{'invisible': ['|', '&amp;', ('state', '!=', 'cancel'), ('state', '!=', 'done'), '&amp;', ('state', '=', 'done'), ('is_locked', '!=', True)]}">
-                        <button string="Close" special="cancel" data-hotkey="z"/>
+                        <button string="Close" special="cancel" data-hotkey="x"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/stock/views/stock_package_level_views.xml b/addons/stock/views/stock_package_level_views.xml
index 2a3954028fb..338723870a1 100644
--- a/addons/stock/views/stock_package_level_views.xml
+++ b/addons/stock/views/stock_package_level_views.xml
@@ -56,8 +56,8 @@
         <field name="arch" type="xml">
             <xpath expr='//form' position='inside'>
                 <footer class="oe_edit_only">
-                    <button string="Confirm" special="save" data-hotkey="v" class="oe_highlight"/>
-                    <button string="Discard" special="cancel" data-hotkey="z"/>
+                    <button string="Confirm" special="save" data-hotkey="q" class="oe_highlight"/>
+                    <button string="Discard" special="cancel" data-hotkey="x"/>
                 </footer>
             </xpath>
         </field>
diff --git a/addons/stock/views/stock_picking_views.xml b/addons/stock/views/stock_picking_views.xml
index 15931f492d4..daadf71a9f8 100644
--- a/addons/stock/views/stock_picking_views.xml
+++ b/addons/stock/views/stock_picking_views.xml
@@ -126,8 +126,8 @@
                 <field name="company_id" invisible="1"/>
 
                 <header>
-                    <button name="action_confirm" attrs="{'invisible': [('state', '!=', 'draft')]}" string="Mark as Todo" type="object" class="oe_highlight" groups="base.group_user" data-hotkey="x"/>
-                    <button name="action_assign" attrs="{'invisible': [('show_check_availability', '=', False)]}" string="Check Availability" type="object" class="oe_highlight" groups="base.group_user" data-hotkey="q"/>
+                    <button name="action_confirm" attrs="{'invisible': [('state', '!=', 'draft')]}" string="Mark as Todo" type="object" class="oe_highlight" groups="base.group_user" data-hotkey="q"/>
+                    <button name="action_assign" attrs="{'invisible': [('show_check_availability', '=', False)]}" string="Check Availability" type="object" class="oe_highlight" groups="base.group_user" data-hotkey="w"/>
                     <button name="button_validate" attrs="{'invisible': ['|', ('state', 'in', ('waiting','confirmed', 'draft', 'done', 'cancel')), ('show_validate', '=', False)]}" string="Validate" type="object" class="oe_highlight" groups="stock.group_stock_user" data-hotkey="v"/>
                     <button name="button_validate" attrs="{'invisible': ['|', ('state', 'in', ('draft', 'assigned', 'done', 'cancel')), ('show_validate', '=', False)]}" string="Validate" type="object" groups="stock.group_stock_user" class="o_btn_validate" data-hotkey="v"/>
                     <button name="action_reset_draft" attrs="{'invisible': [('state', 'in', ('draft', 'done', 'cancel'))]}" string="Set Draft" type="object" groups="stock.group_stock_user" class="o_highlight" data-hotkey="d"/>
@@ -144,7 +144,7 @@
                     <button name="%(action_report_delivery)d" string="Print" attrs="{'invisible': [('state', '!=', 'done')]}" type="action" groups="base.group_user" data-hotkey="o"/>
                     <button name="%(act_stock_return_picking)d" string="Return" attrs="{'invisible': [('state', '!=', 'done')]}" type="action" groups="base.group_user" data-hotkey="k"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" />
-                    <button name="action_cancel" attrs="{'invisible': [('state', 'not in', ('assigned', 'confirmed', 'draft', 'waiting'))]}" string="Cancel" groups="base.group_user" type="object" data-hotkey="z"/>
+                    <button name="action_cancel" attrs="{'invisible': [('state', 'not in', ('assigned', 'confirmed', 'draft', 'waiting'))]}" string="Cancel" groups="base.group_user" type="object" data-hotkey="x"/>
                 </header>
                 <sheet>
                     <div class="oe_button_box" name="button_box">
diff --git a/addons/stock/views/stock_scrap_views.xml b/addons/stock/views/stock_scrap_views.xml
index 3a6d0d327e7..2b4500c0800 100644
--- a/addons/stock/views/stock_scrap_views.xml
+++ b/addons/stock/views/stock_scrap_views.xml
@@ -187,7 +187,7 @@
                     </group>
                     <footer>
                         <button name="action_validate" string="Validate" type="object" class="btn-primary" data-hotkey="q"/>
-                        <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="z" />
+                        <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="x" />
                     </footer>
                 </form>
             </field>
diff --git a/addons/stock/wizard/product_replenish_views.xml b/addons/stock/wizard/product_replenish_views.xml
index 6d2b04a4161..fc2af41a592 100644
--- a/addons/stock/wizard/product_replenish_views.xml
+++ b/addons/stock/wizard/product_replenish_views.xml
@@ -50,7 +50,7 @@
                         class="btn-primary"/>
                     <button string="Discard"
                         class="btn-secondary"
-                        special="cancel" data-hotkey="z" />
+                        special="cancel" data-hotkey="x" />
                 </footer>
             </form>
         </field>
diff --git a/addons/stock/wizard/stock_assign_serial_views.xml b/addons/stock/wizard/stock_assign_serial_views.xml
index 9f615f5c8e6..9d585290ca7 100644
--- a/addons/stock/wizard/stock_assign_serial_views.xml
+++ b/addons/stock/wizard/stock_assign_serial_views.xml
@@ -14,7 +14,7 @@
                 <footer>
                     <button name="generate_serial_numbers" type="object" data-hotkey="q"
                             string="Assign Serial Numbers" class="oe_highlight"/>
-                    <button special="cancel" data-hotkey="z" string="Cancel"/>
+                    <button special="cancel" data-hotkey="x" string="Cancel"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/stock/wizard/stock_backorder_confirmation_views.xml b/addons/stock/wizard/stock_backorder_confirmation_views.xml
index 42b4162680e..531125b5fbc 100644
--- a/addons/stock/wizard/stock_backorder_confirmation_views.xml
+++ b/addons/stock/wizard/stock_backorder_confirmation_views.xml
@@ -41,7 +41,7 @@
                 <footer>
                     <button name="process" string="Create Backorder" type="object" class="oe_highlight" data-hotkey="q"/>
                     <button name="process_cancel_backorder" string="No Backorder" type="object" class="btn-danger text-uppercase" attrs="{'invisible': [('show_transfers', '=', True)]}" data-hotkey="w"/>
-                    <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="z" />
+                    <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="x" />
                 </footer>
             </form>
         </field>
diff --git a/addons/stock/wizard/stock_change_product_qty_views.xml b/addons/stock/wizard/stock_change_product_qty_views.xml
index 28444bd4f3c..4a0c0254fad 100644
--- a/addons/stock/wizard/stock_change_product_qty_views.xml
+++ b/addons/stock/wizard/stock_change_product_qty_views.xml
@@ -28,7 +28,7 @@
                     </div>
                     <footer>
                         <button name="change_product_qty" string="Apply" type="object" class="btn-primary" data-hotkey="q"/>
-                        <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                        <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="x"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/stock/wizard/stock_generate_serial_views.xml b/addons/stock/wizard/stock_generate_serial_views.xml
index e5ad28b6b0c..6835da5c126 100644
--- a/addons/stock/wizard/stock_generate_serial_views.xml
+++ b/addons/stock/wizard/stock_generate_serial_views.xml
@@ -18,7 +18,7 @@
                     </group>
                     <footer>
                         <button name="action_generate_serial" string="Generate" type="object" class="btn-primary" data-hotkey="q"/>
-                        <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                        <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="x"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/stock/wizard/stock_immediate_transfer_views.xml b/addons/stock/wizard/stock_immediate_transfer_views.xml
index ad55e989dba..df56a8c66b4 100644
--- a/addons/stock/wizard/stock_immediate_transfer_views.xml
+++ b/addons/stock/wizard/stock_immediate_transfer_views.xml
@@ -28,7 +28,7 @@
 
                 <footer>
                     <button name="process" string="Mark All Done" type="object" class="btn-primary" data-hotkey="q"/>
-                    <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="z" />
+                    <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="x" />
                 </footer>
             </form>
         </field>
diff --git a/addons/stock/wizard/stock_import_lot_views.xml b/addons/stock/wizard/stock_import_lot_views.xml
index ba9b38cee63..3b05d912d4f 100644
--- a/addons/stock/wizard/stock_import_lot_views.xml
+++ b/addons/stock/wizard/stock_import_lot_views.xml
@@ -22,7 +22,7 @@
             </group>
             <footer>
                 <button name="action_import_lot" string="Import" type="object" class="btn-primary" data-hotkey="q"/>
-                <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="x"/>
             </footer>
         </form>
     </field>
diff --git a/addons/stock/wizard/stock_inventory_adjustment_name.xml b/addons/stock/wizard/stock_inventory_adjustment_name.xml
index c75449f291e..f3718b6473c 100644
--- a/addons/stock/wizard/stock_inventory_adjustment_name.xml
+++ b/addons/stock/wizard/stock_inventory_adjustment_name.xml
@@ -17,7 +17,7 @@
                 </div>
                 <footer>
                     <button name="action_apply" string="Apply" type="object" class="btn-primary" data-hotkey="q"/>
-                    <button name="cancel_button" string="Discard" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                    <button name="cancel_button" string="Discard" class="btn-secondary" special="cancel" data-hotkey="x"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/stock/wizard/stock_inventory_conflict.xml b/addons/stock/wizard/stock_inventory_conflict.xml
index 36b16085410..0681c715740 100644
--- a/addons/stock/wizard/stock_inventory_conflict.xml
+++ b/addons/stock/wizard/stock_inventory_conflict.xml
@@ -44,7 +44,7 @@
                 <footer>
                     <button name="action_keep_counted_quantity" string="Keep Counted Quantity" type="object" class="btn-primary" data-hotkey="q"/>
                     <button name="action_keep_difference" string="Keep Difference" type="object" class="btn-primary" data-hotkey="w"/>
-                    <button name="cancel_button" string="Discard" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                    <button name="cancel_button" string="Discard" class="btn-secondary" special="cancel" data-hotkey="x"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/stock/wizard/stock_inventory_warning.xml b/addons/stock/wizard/stock_inventory_warning.xml
index 76c8a0e9d67..1ed2d3e38c8 100644
--- a/addons/stock/wizard/stock_inventory_warning.xml
+++ b/addons/stock/wizard/stock_inventory_warning.xml
@@ -11,7 +11,7 @@
                 </div>
                 <footer>
                     <button name="action_reset" string="Continue" type="object" class="btn-primary" data-hotkey="q"/>
-                    <button name="cancel_button" string="Discard" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                    <button name="cancel_button" string="Discard" class="btn-secondary" special="cancel" data-hotkey="x"/>
                 </footer>
             </form>
         </field>
@@ -28,7 +28,7 @@
                 </div>
                 <footer>
                     <button name="action_set" string="Continue" type="object" class="btn-primary" data-hotkey="q"/>
-                    <button name="cancel_button" string="Discard" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                    <button name="cancel_button" string="Discard" class="btn-secondary" special="cancel" data-hotkey="x"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/stock/wizard/stock_label_type.xml b/addons/stock/wizard/stock_label_type.xml
index bace1e07cc6..8a4bc8533b1 100644
--- a/addons/stock/wizard/stock_label_type.xml
+++ b/addons/stock/wizard/stock_label_type.xml
@@ -12,7 +12,7 @@
                 </group>
                 <footer>
                     <button name="process" string="Confirm" type="object" class="btn-primary" data-hotkey="q"/>
-                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/stock/wizard/stock_lot_label_layout.xml b/addons/stock/wizard/stock_lot_label_layout.xml
index 525bbfd7563..543d1364bf1 100644
--- a/addons/stock/wizard/stock_lot_label_layout.xml
+++ b/addons/stock/wizard/stock_lot_label_layout.xml
@@ -13,7 +13,7 @@
                 </group>
                 <footer>
                     <button name="process" string="Confirm" type="object" class="btn-primary" data-hotkey="q"/>
-                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/stock/wizard/stock_orderpoint_snooze_views.xml b/addons/stock/wizard/stock_orderpoint_snooze_views.xml
index 937e0a9bc80..1e886167f02 100644
--- a/addons/stock/wizard/stock_orderpoint_snooze_views.xml
+++ b/addons/stock/wizard/stock_orderpoint_snooze_views.xml
@@ -12,7 +12,7 @@
                 </group>
                 <footer>
                     <button string="Snooze" name="action_snooze" type="object" class="btn-primary" data-hotkey="q"/>
-                    <button string="Discard" name="cancel_button" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                    <button string="Discard" name="cancel_button" class="btn-secondary" special="cancel" data-hotkey="x"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/stock/wizard/stock_package_destination_views.xml b/addons/stock/wizard/stock_package_destination_views.xml
index e9b8e955f7b..527aa86b9cc 100644
--- a/addons/stock/wizard/stock_package_destination_views.xml
+++ b/addons/stock/wizard/stock_package_destination_views.xml
@@ -51,7 +51,7 @@
                 </div>
                 <footer>
                     <button string="Confirm" name="action_done" type="object" class="btn-primary" data-hotkey="q"/>
-                    <button string="Discard" name="cancel_button" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                    <button string="Discard" name="cancel_button" class="btn-secondary" special="cancel" data-hotkey="x"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/stock/wizard/stock_picking_return_views.xml b/addons/stock/wizard/stock_picking_return_views.xml
index a88108bec34..f7362fb8fac 100644
--- a/addons/stock/wizard/stock_picking_return_views.xml
+++ b/addons/stock/wizard/stock_picking_return_views.xml
@@ -33,7 +33,7 @@
                 </group>
                 <footer>
                     <button name="create_returns" string="Return" type="object" class="btn-primary" data-hotkey="q"/>
-                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z" />
+                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x" />
                 </footer>
             </form>
         </field>
diff --git a/addons/stock/wizard/stock_quantity_history.xml b/addons/stock/wizard/stock_quantity_history.xml
index 61939652652..c2df9ededbd 100644
--- a/addons/stock/wizard/stock_quantity_history.xml
+++ b/addons/stock/wizard/stock_quantity_history.xml
@@ -10,7 +10,7 @@
                 </group>
                 <footer>
                     <button name="open_at_date" string="Confirm" type="object" class="btn-primary" data-hotkey="q"/>
-                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z" />
+                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x" />
                 </footer>
             </form>
         </field>
diff --git a/addons/stock/wizard/stock_replenishment_info.xml b/addons/stock/wizard/stock_replenishment_info.xml
index 0088632873a..d4cfa5d423d 100644
--- a/addons/stock/wizard/stock_replenishment_info.xml
+++ b/addons/stock/wizard/stock_replenishment_info.xml
@@ -22,7 +22,7 @@
                     </page>
                 </notebook>
                 <footer>
-                    <button string="Close" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                    <button string="Close" class="btn-secondary" special="cancel" data-hotkey="x"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/stock/wizard/stock_request_count.xml b/addons/stock/wizard/stock_request_count.xml
index 5c9c629b632..7d815fda000 100644
--- a/addons/stock/wizard/stock_request_count.xml
+++ b/addons/stock/wizard/stock_request_count.xml
@@ -14,7 +14,7 @@
                 </group>
                 <footer>
                     <button name="action_request_count" string="Confirm" type="object" class="btn-primary" data-hotkey="q"/>
-                    <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                    <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="x"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/stock/wizard/stock_rules_report_views.xml b/addons/stock/wizard/stock_rules_report_views.xml
index 90a53b07aac..d5a8920dedf 100644
--- a/addons/stock/wizard/stock_rules_report_views.xml
+++ b/addons/stock/wizard/stock_rules_report_views.xml
@@ -21,7 +21,7 @@
                         type="object"
                         data-hotkey="q"
                         class="btn-primary"/>
-                    <button string="Cancel" class="btn-default" special="cancel" data-hotkey="z"/>
+                    <button string="Cancel" class="btn-default" special="cancel" data-hotkey="x"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/stock/wizard/stock_scheduler_compute_views.xml b/addons/stock/wizard/stock_scheduler_compute_views.xml
index c12814dc647..68aa1a1e9ec 100644
--- a/addons/stock/wizard/stock_scheduler_compute_views.xml
+++ b/addons/stock/wizard/stock_scheduler_compute_views.xml
@@ -10,7 +10,7 @@
                 </p>
                 <footer>
                     <button name="procure_calculation" string="Run Scheduler" type="object" class="btn-primary" data-hotkey="q"/>
-                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z" />
+                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x" />
                 </footer>
             </form>
         </field>
diff --git a/addons/stock/wizard/stock_track_confirmation_views.xml b/addons/stock/wizard/stock_track_confirmation_views.xml
index 15cf62e7fe4..13a4bfeaf2f 100644
--- a/addons/stock/wizard/stock_track_confirmation_views.xml
+++ b/addons/stock/wizard/stock_track_confirmation_views.xml
@@ -20,7 +20,7 @@
                 </field>
                 <footer>
                     <button name="action_confirm" string="Apply" type="object" class="btn-primary" data-hotkey="q"/>
-                    <button string="Discard" special="cancel" data-hotkey="z" class="btn-secondary"/>
+                    <button string="Discard" special="cancel" data-hotkey="x" class="btn-secondary"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/stock/wizard/stock_warn_insufficient_qty_views.xml b/addons/stock/wizard/stock_warn_insufficient_qty_views.xml
index 5392ba73de8..8432a637691 100644
--- a/addons/stock/wizard/stock_warn_insufficient_qty_views.xml
+++ b/addons/stock/wizard/stock_warn_insufficient_qty_views.xml
@@ -25,7 +25,7 @@
                 <div name="description">
                 </div>
                 <footer>
-                    <button name="cancel_button" string="Discard" class="btn-primary" special="cancel" data-hotkey="z"/>
+                    <button name="cancel_button" string="Discard" class="btn-primary" special="cancel" data-hotkey="x"/>
                     <button string="Confirm" name="action_done" type="object" class="btn-secondary" data-hotkey="q"/>
                 </footer>
             </form>
diff --git a/addons/stock_account/wizard/stock_valuation_layer_revaluation_views.xml b/addons/stock_account/wizard/stock_valuation_layer_revaluation_views.xml
index 74cb285173e..1e8c7937c6e 100644
--- a/addons/stock_account/wizard/stock_valuation_layer_revaluation_views.xml
+++ b/addons/stock_account/wizard/stock_valuation_layer_revaluation_views.xml
@@ -37,7 +37,7 @@
                 </sheet>
                 <footer>
                     <button name="action_validate_revaluation" string="Revalue" type="object" class="btn-primary" data-hotkey="q"/>
-                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z" />
+                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x" />
                 </footer>
             </form>
         </field>
diff --git a/addons/stock_delivery/views/delivery_view.xml b/addons/stock_delivery/views/delivery_view.xml
index a5e21f0870b..c606de18d98 100644
--- a/addons/stock_delivery/views/delivery_view.xml
+++ b/addons/stock_delivery/views/delivery_view.xml
@@ -109,7 +109,7 @@
                         </div>
                     </group>
                     <footer>
-                        <button string="OK" special="cancel" data-hotkey="z" class="oe_highlight"/>
+                        <button string="OK" special="cancel" data-hotkey="x" class="oe_highlight"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/stock_delivery/wizard/choose_delivery_package_views.xml b/addons/stock_delivery/wizard/choose_delivery_package_views.xml
index f3806847649..5b8e97df146 100644
--- a/addons/stock_delivery/wizard/choose_delivery_package_views.xml
+++ b/addons/stock_delivery/wizard/choose_delivery_package_views.xml
@@ -17,7 +17,7 @@
                 </group>
                 <footer>
                     <button name="action_put_in_pack" type="object" string="Save" class="btn-primary" data-hotkey="q"/>
-                    <button string="Discard" special="cancel" data-hotkey="z" class="btn-secondary"/>
+                    <button string="Discard" special="cancel" data-hotkey="x" class="btn-secondary"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/stock_picking_batch/wizard/stock_picking_to_batch_views.xml b/addons/stock_picking_batch/wizard/stock_picking_to_batch_views.xml
index f4273e10949..c2c57f2a577 100644
--- a/addons/stock_picking_batch/wizard/stock_picking_to_batch_views.xml
+++ b/addons/stock_picking_batch/wizard/stock_picking_to_batch_views.xml
@@ -19,7 +19,7 @@
 
                 <footer>
                     <button name="attach_pickings" type="object" string="Confirm" class="btn-primary" data-hotkey="q"/>
-                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/stock_sms/wizard/confirm_stock_sms_views.xml b/addons/stock_sms/wizard/confirm_stock_sms_views.xml
index 0fdc2c3d9af..689766859d9 100644
--- a/addons/stock_sms/wizard/confirm_stock_sms_views.xml
+++ b/addons/stock_sms/wizard/confirm_stock_sms_views.xml
@@ -12,7 +12,7 @@
                             string="Confirm" class="oe_highlight"/>
                     <button name="dont_send_sms" type="object" data-hotkey="w"
                             string="Disable SMS" class="btn btn-secondary"/>
-                    <button special="cancel" data-hotkey="z" string="Cancel"/>
+                    <button special="cancel" data-hotkey="x" string="Cancel"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/survey/wizard/survey_invite_views.xml b/addons/survey/wizard/survey_invite_views.xml
index 7c6f111051e..b5c4108453c 100644
--- a/addons/survey/wizard/survey_invite_views.xml
+++ b/addons/survey/wizard/survey_invite_views.xml
@@ -67,7 +67,7 @@
                     </group>
                     <footer>
                         <button string="Send" attrs="{'invisible': [('send_email', '=', False)]}" name="action_invite" type="object" class="btn-primary" data-hotkey="q"/>
-                        <button string="Close" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                        <button string="Close" class="btn-secondary" special="cancel" data-hotkey="x"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/web/views/base_document_layout_views.xml b/addons/web/views/base_document_layout_views.xml
index 0341cb9528a..874a88f940d 100644
--- a/addons/web/views/base_document_layout_views.xml
+++ b/addons/web/views/base_document_layout_views.xml
@@ -39,7 +39,7 @@
                     </group>
                     <footer>
                         <button string="Save" class="btn-primary" type="object" name="document_layout_save" data-hotkey="q"/>
-                        <button special="cancel" data-hotkey="z" string="Cancel" />
+                        <button special="cancel" data-hotkey="x" string="Cancel" />
                     </footer>
                 </form>
             </field>
diff --git a/addons/website/views/website_views.xml b/addons/website/views/website_views.xml
index 7280ca34c4d..7c8148cd87b 100644
--- a/addons/website/views/website_views.xml
+++ b/addons/website/views/website_views.xml
@@ -57,7 +57,7 @@
                 <xpath expr="//form" position="inside">
                     <footer>
                         <button name="create_and_redirect_configurator" type="object" string="Create" class="btn btn-primary" data-hotkey="q"/>
-                        <button string="Cancel" class="btn btn-secondary" special="cancel" data-hotkey="z"/>
+                        <button string="Cancel" class="btn btn-secondary" special="cancel" data-hotkey="x"/>
                     </footer>
                 </xpath>
                 <xpath expr="//notebook" position="replace"/>
diff --git a/addons/website/wizard/website_robots.xml b/addons/website/wizard/website_robots.xml
index af5674ffcea..509cc138e61 100644
--- a/addons/website/wizard/website_robots.xml
+++ b/addons/website/wizard/website_robots.xml
@@ -18,7 +18,7 @@
                 </small>
                 <footer>
                     <button string="Save" name="action_save" type="object" class="oe_highlight" data-hotkey="q"/>
-                    <button string="Cancel" class="btn btn-default" special="cancel" data-hotkey="z"/>
+                    <button string="Cancel" class="btn btn-default" special="cancel" data-hotkey="x"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/website_crm_partner_assign/wizard/crm_forward_to_partner_view.xml b/addons/website_crm_partner_assign/wizard/crm_forward_to_partner_view.xml
index b8b23e64861..75248fda8d6 100644
--- a/addons/website_crm_partner_assign/wizard/crm_forward_to_partner_view.xml
+++ b/addons/website_crm_partner_assign/wizard/crm_forward_to_partner_view.xml
@@ -31,7 +31,7 @@
                     </notebook>
                     <footer>
                         <button name="action_forward" string="Send" type="object" class="btn-primary" data-hotkey="q"/>
-                        <button string="Cancel" special="cancel" data-hotkey="z" class="btn-secondary"/>
+                        <button string="Cancel" special="cancel" data-hotkey="x" class="btn-secondary"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/website_sale_loyalty/wizard/coupon_share_views.xml b/addons/website_sale_loyalty/wizard/coupon_share_views.xml
index e599926fa8d..b2513d77781 100644
--- a/addons/website_sale_loyalty/wizard/coupon_share_views.xml
+++ b/addons/website_sale_loyalty/wizard/coupon_share_views.xml
@@ -24,7 +24,7 @@
                     </group>
                 </group>
                 <footer>
-                    <button string="Done" class="btn-primary" special="cancel" data-hotkey="z"/>
+                    <button string="Done" class="btn-primary" special="cancel" data-hotkey="x"/>
                     <button string="Generate Short Link" class="btn-secondary" type="object" name="action_generate_short_link"
                             attrs="{'invisible': ['|', ('website_id', '=', False), ('id', '!=', False)]}" data-hotkey="g"/>
                 </footer>
diff --git a/addons/website_slides/wizard/slide_channel_invite_views.xml b/addons/website_slides/wizard/slide_channel_invite_views.xml
index 0226d7dbc73..687f4e7d9f0 100644
--- a/addons/website_slides/wizard/slide_channel_invite_views.xml
+++ b/addons/website_slides/wizard/slide_channel_invite_views.xml
@@ -45,8 +45,8 @@
                     </sheet>
                     <footer>
                         <button string="Send" attrs="{'invisible':[('send_email', '=', False)]}" name="action_invite" type="object" class="btn-primary" data-hotkey="q"/>
-                        <button string="Close" attrs="{'invisible':[('send_email', '=', True)]}" class="btn-secondary" special="cancel" data-hotkey="z"/>
-                        <button string="Cancel" attrs="{'invisible':[('send_email', '=', False)]}" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                        <button string="Close" attrs="{'invisible':[('send_email', '=', True)]}" class="btn-secondary" special="cancel" data-hotkey="x"/>
+                        <button string="Cancel" attrs="{'invisible':[('send_email', '=', False)]}" class="btn-secondary" special="cancel" data-hotkey="x"/>
                     </footer>
                 </form>
             </field>
diff --git a/odoo/addons/base/data/ir_demo_data.xml b/odoo/addons/base/data/ir_demo_data.xml
index 5ca53c3bce8..ac3afafdf00 100644
--- a/odoo/addons/base/data/ir_demo_data.xml
+++ b/odoo/addons/base/data/ir_demo_data.xml
@@ -28,7 +28,7 @@
                 </div>
 
                 <footer>
-                    <button special="cancel" data-hotkey="z" string="Oops, no!" class="btn-primary"/>
+                    <button special="cancel" data-hotkey="x" string="Oops, no!" class="btn-primary"/>
                     <button name="install_demo" string="Yes, I understand the risks" type="object" class="btn-secondary" data-hotkey="q"/>
                 </footer>
             </form>
diff --git a/odoo/addons/base/views/ir_model_views.xml b/odoo/addons/base/views/ir_model_views.xml
index 78c34ae12b9..c58d92919e7 100644
--- a/odoo/addons/base/views/ir_model_views.xml
+++ b/odoo/addons/base/views/ir_model_views.xml
@@ -13,7 +13,7 @@
                     </group>
                     <footer>
                         <button name="menu_create" string="Create Menu" type="object" class="btn-primary" data-hotkey="q"/>
-                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z" />
+                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x" />
                     </footer>
                 </form>
             </field>
diff --git a/odoo/addons/base/views/ir_profile_views.xml b/odoo/addons/base/views/ir_profile_views.xml
index f8b9ca49543..82990d581b1 100644
--- a/odoo/addons/base/views/ir_profile_views.xml
+++ b/odoo/addons/base/views/ir_profile_views.xml
@@ -66,8 +66,8 @@
                     <field name="expiration"/>
                 </group>
                 <footer>
-                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z"/>
-                    <button string="Enable profiling" type="object" name="submit" class="btn btn-primary"/>
+                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x"/>
+                    <button string="Enable profiling" type="object" name="submit" class="btn btn-primary" data-hotkey="q"/>
                 </footer>
             </form>
         </field>
diff --git a/odoo/addons/base/views/ir_ui_view_views.xml b/odoo/addons/base/views/ir_ui_view_views.xml
index 8daaccfedb9..53ac81058c0 100644
--- a/odoo/addons/base/views/ir_ui_view_views.xml
+++ b/odoo/addons/base/views/ir_ui_view_views.xml
@@ -129,7 +129,7 @@
                     </div>
                     <footer>
                         <button string="Reset View" name="reset_view_button" type="object" class="btn-primary" attrs="{'invisible': [('has_diff', '=', False)]}" data-hotkey="q"/>
-                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z" />
+                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x" />
                     </footer>
                 </form>
             </field>
diff --git a/odoo/addons/base/views/res_config_views.xml b/odoo/addons/base/views/res_config_views.xml
index 56c5da6fccb..342ce5f36f8 100644
--- a/odoo/addons/base/views/res_config_views.xml
+++ b/odoo/addons/base/views/res_config_views.xml
@@ -10,7 +10,7 @@
                     <group name="res_config_contents"/>
                     <footer>
                         <button name="action_next" type="object" string="Apply" class="btn-primary" data-hotkey="q"/>
-                        <button name="action_skip" type="object" special="cancel" data-hotkey="z" string="Cancel" class="btn-secondary"/>
+                        <button name="action_skip" type="object" special="cancel" data-hotkey="x" string="Cancel" class="btn-secondary"/>
                     </footer>
                 </form>
             </field>
@@ -24,7 +24,7 @@
                     <separator string="title" colspan="4"/>
                     <footer>
                         <button name="action_next" type="object" string="Install Apps" class="btn-primary" data-hotkey="q"/>
-                        <button string="Skip" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                        <button string="Skip" class="btn-secondary" special="cancel" data-hotkey="x"/>
                     </footer>
                 </form>
             </field>
diff --git a/odoo/addons/base/views/res_users_views.xml b/odoo/addons/base/views/res_users_views.xml
index 33ba6d6a393..6dc7c0d9a78 100644
--- a/odoo/addons/base/views/res_users_views.xml
+++ b/odoo/addons/base/views/res_users_views.xml
@@ -12,7 +12,7 @@
                     </group>
                     <footer>
                         <button string="Change Password" name="change_password" type="object" class="btn-primary" data-hotkey="q"/>
-                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z" />
+                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x" />
                     </footer>
                 </form>
             </field>
@@ -27,7 +27,7 @@
                     <field mode="tree" name="user_ids"/>
                     <footer>
                         <button string="Change Password" name="change_password_button" type="object" class="btn-primary" data-hotkey="q"/>
-                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z" />
+                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x" />
                     </footer>
                 </form>
             </field>
@@ -387,7 +387,7 @@
                     </p>
                     <footer>
                         <button name="make_key" type="object" string="Generate key" class="btn-primary" data-hotkey="q"/>
-                        <button special="cancel" data-hotkey="z" string="Cancel" class="btn-secondary"/>
+                        <button special="cancel" data-hotkey="x" string="Cancel" class="btn-secondary"/>
                     </footer>
                     </sheet>
                 </form>
@@ -414,7 +414,7 @@
                             to your user account, it is very important to store it securely.
                         </p>
                         <footer>
-                            <button special="cancel" data-hotkey="z" string="Done!"/>
+                            <button special="cancel" data-hotkey="x" string="Done!"/>
                         </footer>
                     </sheet>
                 </form>
@@ -504,7 +504,7 @@
                     </notebook>
                     <footer>
                         <button name="preference_save" type="object" string="Save" class="btn-primary" data-hotkey="q"/>
-                        <button name="preference_cancel" string="Cancel" special="cancel" data-hotkey="z" class="btn-secondary"/>
+                        <button name="preference_cancel" string="Cancel" special="cancel" data-hotkey="x" class="btn-secondary"/>
                     </footer>
                 </form>
             </field>
diff --git a/odoo/addons/base/wizard/base_export_language_views.xml b/odoo/addons/base/wizard/base_export_language_views.xml
index 1389bf4f7fd..abe0c3737ee 100644
--- a/odoo/addons/base/wizard/base_export_language_views.xml
+++ b/odoo/addons/base/wizard/base_export_language_views.xml
@@ -32,10 +32,10 @@
                     </div>
                     <footer states="choose">
                         <button name="act_getfile" string="Export" type="object" class="btn-primary" data-hotkey="q"/>
-                        <button special="cancel" data-hotkey="z" string="Cancel" type="object" class="btn-secondary"/>
+                        <button special="cancel" data-hotkey="x" string="Cancel" type="object" class="btn-secondary"/>
                     </footer>
                     <footer states="get">
-                        <button special="cancel" data-hotkey="z" string="Close" type="object" class="btn-primary"/>
+                        <button special="cancel" data-hotkey="x" string="Close" type="object" class="btn-primary"/>
                     </footer>
                 </form>
             </field>
diff --git a/odoo/addons/base/wizard/base_import_language_views.xml b/odoo/addons/base/wizard/base_import_language_views.xml
index 640ef88d97e..7d30ccdc608 100644
--- a/odoo/addons/base/wizard/base_import_language_views.xml
+++ b/odoo/addons/base/wizard/base_import_language_views.xml
@@ -16,7 +16,7 @@
                     </group>
                     <footer>
                         <button name="import_lang" string="Import" type="object" class="btn-primary" data-hotkey="q"/>
-                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z" />
+                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x" />
                     </footer>
                 </form>
             </field>
diff --git a/odoo/addons/base/wizard/base_language_install_views.xml b/odoo/addons/base/wizard/base_language_install_views.xml
index f6d81ae7bfa..cf5c7e19f04 100644
--- a/odoo/addons/base/wizard/base_language_install_views.xml
+++ b/odoo/addons/base/wizard/base_language_install_views.xml
@@ -36,8 +36,8 @@
                         <field name="overwrite" groups="base.group_no_one"/>
                     </group>
                     <footer>
-                        <button name="lang_install" string="Add" type="object" class="btn-primary"/>
-                        <button special="cancel" data-hotkey="z" string="Cancel" class="btn-secondary"/>
+                        <button name="lang_install" string="Add" data-hotkey="q" type="object" class="btn-primary"/>
+                        <button special="cancel" data-hotkey="x" string="Cancel" class="btn-secondary"/>
                     </footer>
                 </form>
            </field>
diff --git a/odoo/addons/base/wizard/base_module_uninstall_views.xml b/odoo/addons/base/wizard/base_module_uninstall_views.xml
index ed232b3fa4a..446c4077a53 100644
--- a/odoo/addons/base/wizard/base_module_uninstall_views.xml
+++ b/odoo/addons/base/wizard/base_module_uninstall_views.xml
@@ -51,7 +51,7 @@
                     </field>
                     <footer>
                         <button string="Uninstall" class="btn-secondary" type="object" name="action_uninstall" data-hotkey="q"/>
-                        <button string="Discard" class="btn-primary" special="cancel" data-hotkey="z"/>
+                        <button string="Discard" class="btn-primary" special="cancel" data-hotkey="x"/>
                     </footer>
                 </form>
             </field>
diff --git a/odoo/addons/base/wizard/base_module_update_views.xml b/odoo/addons/base/wizard/base_module_update_views.xml
index 27e1bc4b268..7439618af60 100644
--- a/odoo/addons/base/wizard/base_module_update_views.xml
+++ b/odoo/addons/base/wizard/base_module_update_views.xml
@@ -18,12 +18,12 @@
                     </group>
                     <footer>
                         <div states="init" class="d-flex gap-1">
-                            <button name="update_module" string="Update" type="object" class="btn-primary"/>
-                            <button special="cancel" data-hotkey="z" string="Cancel" class="btn-secondary"/>
+                            <button name="update_module" string="Update" type="object" class="btn-primary" data-hotkey="q"/>
+                            <button special="cancel" data-hotkey="x" string="Cancel" class="btn-secondary"/>
                         </div>
                         <div states="done" class="d-flex gap-1">
                             <button name="action_module_open" string="Open Apps" type="object" class="btn-primary" data-hotkey="q"/>
-                            <button special="cancel" data-hotkey="z" string="Close" class="btn-secondary"/>
+                            <button special="cancel" data-hotkey="x" string="Close" class="btn-secondary"/>
                         </div>
                     </footer>
                 </form>
diff --git a/odoo/addons/base/wizard/base_module_upgrade.py b/odoo/addons/base/wizard/base_module_upgrade.py
index 73aa14547bc..01a968af68a 100644
--- a/odoo/addons/base/wizard/base_module_upgrade.py
+++ b/odoo/addons/base/wizard/base_module_upgrade.py
@@ -36,7 +36,7 @@ class BaseModuleUpgrade(models.TransientModel):
                                 <separator string="Upgrade Completed" colspan="4"/>
                                 <footer>
                                     <button name="config" string="Start Configuration" type="object" class="btn-primary" data-hotkey="q"/>
-                                    <button special="cancel" data-hotkey="z" string="Close" class="btn-secondary"/>
+                                    <button special="cancel" data-hotkey="x" string="Close" class="btn-secondary"/>
                                 </footer>
                              </form>'''
 
diff --git a/odoo/addons/base/wizard/base_module_upgrade_views.xml b/odoo/addons/base/wizard/base_module_upgrade_views.xml
index cd6b945c8f5..e04b63ae65a 100644
--- a/odoo/addons/base/wizard/base_module_upgrade_views.xml
+++ b/odoo/addons/base/wizard/base_module_upgrade_views.xml
@@ -14,7 +14,7 @@
                     <field name="module_info"/>
                     <footer>
                         <button name="upgrade_module" string="Confirm" type="object" class="btn-primary" data-hotkey="q"/>
-                        <button string="Cancel" class="btn-secondary" name="upgrade_module_cancel" type="object" data-hotkey="z"/>
+                        <button string="Cancel" class="btn-secondary" name="upgrade_module_cancel" type="object" data-hotkey="x"/>
                     </footer>
                 </form>
             </field>
@@ -45,7 +45,7 @@
                     <div><span class="o_form_label">We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)."</span></div>
                     <footer>
                         <button name="config" string="Start configuration" type="object" class="btn-primary" data-hotkey="q"/>
-                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z"/>
+                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x"/>
                     </footer>
                 </form>
             </field>
diff --git a/odoo/addons/base/wizard/base_partner_merge_views.xml b/odoo/addons/base/wizard/base_partner_merge_views.xml
index c752d107570..d4d753aa418 100644
--- a/odoo/addons/base/wizard/base_partner_merge_views.xml
+++ b/odoo/addons/base/wizard/base_partner_merge_views.xml
@@ -82,7 +82,7 @@
                             type='object'
                             attrs="{'invisible': [('state', '!=', 'selection')]}" />
                         <button name='action_start_manual_process'
-                            string='Merge with Manual Check' data-hotkey="x"
+                            string='Merge with Manual Check' data-hotkey="w"
                             type='object'  class='oe_highlight'
                             attrs="{'invisible': [('state', '!=', 'option')]}" />
                         <button name='action_start_automatic_process'
@@ -95,8 +95,8 @@
                             type='object' data-hotkey="y"
                             confirm="Are you sure to execute the list of automatic merges of your contacts?"
                             attrs="{'invisible': [('state', '!=', 'option')]}" />
-                        <button special="cancel" data-hotkey="z" string="Cancel" type="object" class="btn btn-secondary oe_inline" attrs="{'invisible': [('state', '=', 'finished')]}"/>
-                        <button special="cancel" data-hotkey="z" string="Close" type="object" class="btn btn-secondary oe_inline" attrs="{'invisible': [('state', '!=', 'finished')]}"/>
+                        <button special="cancel" data-hotkey="x" string="Cancel" type="object" class="btn btn-secondary oe_inline" attrs="{'invisible': [('state', '=', 'finished')]}"/>
+                        <button special="cancel" data-hotkey="x" string="Close" type="object" class="btn btn-secondary oe_inline" attrs="{'invisible': [('state', '!=', 'finished')]}"/>
                     </footer>
                 </form>
             </field>
diff --git a/odoo/addons/test_exceptions/view.xml b/odoo/addons/test_exceptions/view.xml
index 54802a001ae..9c9995d8f3f 100644
--- a/odoo/addons/test_exceptions/view.xml
+++ b/odoo/addons/test_exceptions/view.xml
@@ -77,7 +77,7 @@
                         </div>
                     </group>
                     <footer>
-                        <button special="cancel" data-hotkey="z" string="Close"/>
+                        <button special="cancel" data-hotkey="x" string="Close"/>
                     </footer>
                 </form>
            </field>