diff --git a/addons/account/static/src/js/tours/account.js b/addons/account/static/src/js/tours/account.js
index 4ef2f9dadf2..03001c4b018 100644
--- a/addons/account/static/src/js/tours/account.js
+++ b/addons/account/static/src/js/tours/account.js
@@ -39,10 +39,7 @@ registry.category("web_tour.tours").add('account_tour', {
         position: "bottom",
     }, {
         trigger: "div[name=partner_id] .o_input_dropdown",
-        // FIXME WOWL: this selector needs to work in both legacy and non-legacy views
-        // because account_invoice_extracts *adds* a js_class on the base view which forces
-        // the use of a legacy view in enterprise only
-        extra_trigger: "[name=move_type] [raw-value=out_invoice], [name=move_type][raw-value=out_invoice]",
+        extra_trigger: "[name=move_type] [raw-value=out_invoice]",
         content: markup(_t("Write a company name to <b>create one</b> or <b>see suggestions</b>.")),
         position: "right",
     }, {
@@ -50,41 +47,26 @@ registry.category("web_tour.tours").add('account_tour', {
         auto: true,
     }, {
         trigger: ".o_m2o_dropdown_option a:contains('Create')",
-        // FIXME WOWL: this selector needs to work in both legacy and non-legacy views
-        // because account_invoice_extracts *adds* a js_class on the base view which forces
-        // the use of a legacy view in enterprise only
-        extra_trigger: "[name=move_type] [raw-value=out_invoice], [name=move_type][raw-value=out_invoice]",
+        extra_trigger: "[name=move_type] [raw-value=out_invoice]",
         content: _t("Select first partner"),
         auto: true,
     }, {
         trigger: ".modal-content button.btn-primary",
-        // FIXME WOWL: this selector needs to work in both legacy and non-legacy views
-        // because account_invoice_extracts *adds* a js_class on the base view which forces
-        // the use of a legacy view in enterprise only
-        extra_trigger: "[name=move_type] [raw-value=out_invoice], [name=move_type][raw-value=out_invoice]",
+        extra_trigger: "[name=move_type] [raw-value=out_invoice]",
         content: markup(_t("Once everything is set, you are good to continue. You will be able to edit this later in the <b>Customers</b> menu.")),
         auto: true,
     }, {
         trigger: "div[name=invoice_line_ids] .o_field_x2many_list_row_add a",
-        // FIXME WOWL: this selector needs to work in both legacy and non-legacy views
-        // because account_invoice_extracts *adds* a js_class on the base view which forces
-        // the use of a legacy view in enterprise only
-        extra_trigger: "[name=move_type] [raw-value=out_invoice], [name=move_type][raw-value=out_invoice]",
+        extra_trigger: "[name=move_type] [raw-value=out_invoice]",
         content: _t("Add a line to your invoice"),
     }, {
         trigger: "div[name=invoice_line_ids] div[name=name] textarea",
-        // FIXME WOWL: this selector needs to work in both legacy and non-legacy views
-        // because account_invoice_extracts *adds* a js_class on the base view which forces
-        // the use of a legacy view in enterprise only
-        extra_trigger: "[name=move_type] [raw-value=out_invoice], [name=move_type][raw-value=out_invoice]",
+        extra_trigger: "[name=move_type] [raw-value=out_invoice]",
         content: _t("Fill in the details of the line."),
         position: "bottom",
     }, {
         trigger: "div[name=invoice_line_ids] div[name=price_unit] input",
-        // FIXME WOWL: this selector needs to work in both legacy and non-legacy views
-        // because account_invoice_extracts *adds* a js_class on the base view which forces
-        // the use of a legacy view in enterprise only
-        extra_trigger: "[name=move_type] [raw-value=out_invoice], [name=move_type][raw-value=out_invoice]",
+        extra_trigger: "[name=move_type] [raw-value=out_invoice]",
         content: _t("Set a price"),
         position: "bottom",
         run: 'text 100',
@@ -96,34 +78,22 @@ registry.category("web_tour.tours").add('account_tour', {
         content: _t("Once your invoice is ready, press CONFIRM."),
     }, {
         trigger: "button[name=action_invoice_sent]",
-        // FIXME WOWL: this selector needs to work in both legacy and non-legacy views
-        // because account_invoice_extracts *adds* a js_class on the base view which forces
-        // the use of a legacy view in enterprise only
-        extra_trigger: "[name=move_type] [raw-value=out_invoice], [name=move_type][raw-value=out_invoice]",
+        extra_trigger: "[name=move_type] [raw-value=out_invoice]",
         content: _t("Send the invoice and check what the customer will receive."),
     }, {
         trigger: ".o_field_widget[name=email] input, input[name=email]",
-        // FIXME WOWL: this selector needs to work in both legacy and non-legacy views
-        // because account_invoice_extracts *adds* a js_class on the base view which forces
-        // the use of a legacy view in enterprise only
-        extra_trigger: "[name=move_type] [raw-value=out_invoice], [name=move_type][raw-value=out_invoice]",
+        extra_trigger: "[name=move_type] [raw-value=out_invoice]",
         content: markup(_t("Write here <b>your own email address</b> to test the flow.")),
         run: 'text customer@example.com',
         auto: true,
     }, {
         trigger: ".modal-content button.btn-primary",
-        // FIXME WOWL: this selector needs to work in both legacy and non-legacy views
-        // because account_invoice_extracts *adds* a js_class on the base view which forces
-        // the use of a legacy view in enterprise only
-        extra_trigger: "[name=move_type] [raw-value=out_invoice], [name=move_type][raw-value=out_invoice]",
+        extra_trigger: "[name=move_type] [raw-value=out_invoice]",
         content: _t("Validate."),
         auto: true,
     }, {
         trigger: "button[name=action_send_and_print]",
-        // FIXME WOWL: this selector needs to work in both legacy and non-legacy views
-        // because account_invoice_extracts *adds* a js_class on the base view which forces
-        // the use of a legacy view in enterprise only
-        extra_trigger: "[name=move_type] [raw-value=out_invoice], [name=move_type][raw-value=out_invoice]",
+        extra_trigger: "[name=move_type] [raw-value=out_invoice]",
         content: _t("Let's send the invoice."),
         position: "top"
     }, {
diff --git a/addons/l10n_ar/static/src/js/tours/account.js b/addons/l10n_ar/static/src/js/tours/account.js
index 913ef9db984..388b41d0a05 100644
--- a/addons/l10n_ar/static/src/js/tours/account.js
+++ b/addons/l10n_ar/static/src/js/tours/account.js
@@ -10,9 +10,8 @@ patch(registry.category("web_tour.tours").get("account_tour"), {
         const filteredSteps = originalSteps.filter((step) => step.trigger != "input[name=name]");
         const stepIndex = filteredSteps.findIndex((step) => step.trigger == 'div[name=partner_id] input');
         filteredSteps.splice(stepIndex + 2, 0, {
-        // FIXME WOWL: this selector needs to work in both legacy and non-legacy views
             trigger: "div[name=l10n_ar_afip_responsibility_type_id] input",
-            extra_trigger: "[name=move_type] [raw-value=out_invoice], [name=move_type][raw-value=out_invoice]",
+            extra_trigger: "[name=move_type] [raw-value=out_invoice]",
             position: "bottom",
             content: "Set the AFIP Responsability",
             run: "text IVA",