diff --git a/portal_event_tickets/__manifest__.py b/portal_event_tickets/__manifest__.py
index 0df8c80..887a8e9 100644
--- a/portal_event_tickets/__manifest__.py
+++ b/portal_event_tickets/__manifest__.py
@@ -12,7 +12,6 @@
         "portal",
         "partner_event",
         "website_event_sale",
-        "website_event_attendee_fields",
         "website_sale_refund",
     ],
     "data": [
@@ -20,8 +19,15 @@
         "views/event_registration.xml",
         "views/event_event.xml",
         "data/mail_template_data.xml",
-        "views/assets.xml",
     ],
+    "assets": {
+        "web.assets_frontend": [
+            "/portal_event_tickets/static/src/js/portal.esm.js",
+        ],
+        "web.assets_tests": [
+            "/portal_event_tickets/static/src/js/ticket_transfer.tour.esm.js",
+        ],
+    },
     "qweb": [],
     "demo": ["data/res_users_demo.xml"],
 }
diff --git a/portal_event_tickets/controllers/main.py b/portal_event_tickets/controllers/main.py
index 5754854..36bf8e8 100644
--- a/portal_event_tickets/controllers/main.py
+++ b/portal_event_tickets/controllers/main.py
@@ -145,13 +145,13 @@ def portal_get_ticket(self, ticket_id=None, **kw):
         registration_badge_template = (
             report_template_for_portal.get_metadata()[0].get("xmlid")
             if report_template_for_portal
-            else "event.report_event_registration_badge"
+            else "event.action_report_event_registration_badge"
         )
 
         pdf = (
-            request.env.ref(registration_badge_template)
+            request.env["ir.actions.report"]
             .with_user(SUPERUSER_ID)
-            ._render_qweb_pdf([ticket.id])[0]
+            ._render_qweb_pdf(registration_badge_template, [ticket.id])[0]
         )
 
         pdfhttpheaders = [
@@ -277,12 +277,20 @@ def ticket_transfer_receive(self, transfer_ticket=None, **kw):
             tickets = WebsiteEventController()._process_tickets_form(
                 ticket.event_id, {f"nb_register-{ticket.event_ticket_id.id or 0}": 1}
             )
+            default_first_attendee = {}
+            if ticket.attendee_partner_id:
+                default_first_attendee = {
+                    "name": ticket.attendee_partner_id.name,
+                    "phone": ticket.attendee_partner_id.phone,
+                    "email": ticket.attendee_partner_id.email,
+                }
             values.update(
                 {
                     "transfer_ticket": ticket,
                     "tickets": tickets,
                     "event": ticket.event_id,
                     "availability_check": True,
+                    "default_first_attendee": default_first_attendee,
                 }
             )
             return request.render(
@@ -297,7 +305,6 @@ def ticket_transfer_receive(self, transfer_ticket=None, **kw):
         )[0]
         registration["event_id"] = ticket.event_id.id
         partner_vals = request.env["event.registration"]._prepare_partner(registration)
-        assert not partner_vals.get("email")
 
         receiver.sudo().write(partner_vals)
 
diff --git a/portal_event_tickets/static/src/js/portal.esm.js b/portal_event_tickets/static/src/js/portal.esm.js
new file mode 100644
index 0000000..1718a61
--- /dev/null
+++ b/portal_event_tickets/static/src/js/portal.esm.js
@@ -0,0 +1,34 @@
+/** @odoo-module **/
+
+import publicWidget from "@web/legacy/js/public/public_widget";
+
+publicWidget.registry.TransferTicketWidget = publicWidget.Widget.extend({
+    selector: "#transfer_ticket",
+
+    async willStart() {
+        await this._super(...arguments);
+
+        const event_name = this.$el.data("event-name");
+        const $modal = $("#modal_attendees_registration");
+
+        /* Show form inline */
+        $modal.find("form").attr("action", "/my/tickets/transfer/receive");
+        $modal.removeClass("modal fade");
+
+        /* Remove Cancel button; update title */
+        var $submit = $modal.find("[type=submit]");
+        $submit.parent().empty().append($submit);
+        $submit.text("Confirm");
+
+        /* Remove Close button */
+        $modal.find(".close").remove();
+
+        /* Make email non-editable */
+        $modal.find("[name=1-email]").attr("disabled", "1");
+
+        /* Update title */
+        $modal
+            .find("h4.modal-title")
+            .html("Receive the ticket for <b>" + event_name + "</b>");
+    },
+});
diff --git a/portal_event_tickets/static/src/js/portal.js b/portal_event_tickets/static/src/js/portal.js
deleted file mode 100644
index c8491cc..0000000
--- a/portal_event_tickets/static/src/js/portal.js
+++ /dev/null
@@ -1,37 +0,0 @@
-odoo.define("portal_event_tickets.portal", function (require) {
-    "use strict";
-
-    var publicWidget = require("web.public.widget");
-
-    publicWidget.registry.transferTicketWidget = publicWidget.Widget.extend({
-        selector: "#transfer_ticket",
-
-        start: function () {
-            var def = this._super.apply(this, arguments);
-
-            var event_name = this.$el.data("event-name");
-            var $modal = $("#modal_attendees_registration");
-
-            /* Show form inline */
-            $modal.find("form").attr("action", "/my/tickets/transfer/receive");
-            $modal.removeClass("modal fade");
-
-            /* Remove Cancel button; update title */
-            var $submit = $modal.find("[type=submit]");
-            $submit.parent().empty().append($submit);
-            $submit.text("Confirm");
-
-            /* Remove Close button */
-            $modal.find(".close").remove();
-
-            /* Make email non-editable */
-            $modal.find("[name=1-email]").attr("disabled", "1");
-
-            /* Update title */
-            $modal
-                .find("h4.modal-title")
-                .html("Receive the ticket for <b>" + event_name + "</b>");
-            return def;
-        },
-    });
-});
diff --git a/portal_event_tickets/static/src/js/ticket_transfer.tour.esm.js b/portal_event_tickets/static/src/js/ticket_transfer.tour.esm.js
new file mode 100644
index 0000000..4709640
--- /dev/null
+++ b/portal_event_tickets/static/src/js/ticket_transfer.tour.esm.js
@@ -0,0 +1,30 @@
+/** @odoo-module **/
+
+import {registry} from "@web/core/registry";
+
+registry.category("web_tour.tours").add("ticket_transfer_receive", {
+    test: true,
+    url: "/my/tickets/transfer/receive",
+    steps: () => [
+        {
+            content: "Fill attendees details",
+            trigger: "input[type='email']",
+            run: function () {
+                // Fill:
+                // * phone (optional)
+                $("input[name^='1-phone']").val("111 111");
+            },
+        },
+        {
+            content: "Validate attendees details",
+            trigger: 'button:contains("Confirm")',
+        },
+        {
+            content: "We are redirected to /my/tickets page",
+            trigger: ".breadcrumb-item:contains(Tickets)",
+            run: function () {
+                // It's needed to don't make a click on the link
+            },
+        },
+    ],
+});
diff --git a/portal_event_tickets/static/src/js/ticket_transfer.tour.js b/portal_event_tickets/static/src/js/ticket_transfer.tour.js
deleted file mode 100644
index 7e1194f..0000000
--- a/portal_event_tickets/static/src/js/ticket_transfer.tour.js
+++ /dev/null
@@ -1,40 +0,0 @@
-odoo.define("portal_event_tickets.ticket_transfer_tour", function (require) {
-    "use strict";
-
-    var tour = require("web_tour.tour");
-
-    var options = {
-        test: true,
-        url: "/my/tickets/transfer/receive",
-    };
-
-    var tour_name = "ticket_transfer_receive";
-    tour.register(tour_name, options, [
-        {
-            content: "Fill attendees details",
-            extra_trigger: "input[name='1-function']",
-            trigger: "input[name='1-name']",
-            run: function () {
-                // Fill:
-                // * phone (optional)
-                // * country_id (mandatory)
-                // skip:
-                // * job position (optional)
-                $("input[name='1-phone']").val("111 111");
-                $("select[name='1-country_id']").val("1");
-            },
-        },
-        {
-            content: "Validate attendees details",
-            extra_trigger: "input[name='1-phone']",
-            trigger: 'button:contains("Confirm")',
-        },
-        {
-            content: "We are redirected to /my/tickets page",
-            trigger: ".breadcrumb-item:contains(Tickets)",
-            run: function () {
-                // It's needed to don't make a click on the link
-            },
-        },
-    ]);
-});
diff --git a/portal_event_tickets/tests/common.py b/portal_event_tickets/tests/common.py
index 9863eb8..2afef6d 100644
--- a/portal_event_tickets/tests/common.py
+++ b/portal_event_tickets/tests/common.py
@@ -29,34 +29,6 @@ def setUp(self):
             {"event_id": self.event.id}
         )
 
-        self.event.write(
-            {
-                "attendee_field_ids": [
-                    (
-                        6,
-                        0,
-                        [
-                            self.env.ref(
-                                "website_event_attendee_fields.attendee_field_name"
-                            ).id,
-                            self.env.ref(
-                                "website_event_attendee_fields.attendee_field_email"
-                            ).id,
-                            self.env.ref(
-                                "website_event_attendee_fields.attendee_field_phone"
-                            ).id,
-                            self.env.ref(
-                                "website_event_attendee_fields.attendee_field_country_id"
-                            ).id,
-                            self.env.ref(
-                                "website_event_attendee_fields.attendee_field_function"
-                            ).id,
-                        ],
-                    )
-                ]
-            }
-        )
-
         # create Portal User
         self.user_portal1 = self.env.ref("portal_event_tickets.user_portal1")
 
@@ -79,7 +51,6 @@ def _create_ticket(self, ticket_type, partner, event):
                 "note": "Invoice after delivery",
             }
         )
-        sale_order.onchange_partner_id()
 
         # In the sale order I add some sale order lines. i choose event product
         sale_order_line = self.env["sale.order.line"].create(
diff --git a/portal_event_tickets/views/assets.xml b/portal_event_tickets/views/assets.xml
deleted file mode 100644
index fd7a11a..0000000
--- a/portal_event_tickets/views/assets.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-    <template id="assets_frontend" inherit_id="website.assets_frontend">
-        <xpath expr="//script[last()]" position="after">
-            <script
-                type="text/javascript"
-                src="/portal_event_tickets/static/src/js/portal.js"
-            />
-        </xpath>
-    </template>
-
-    <template id="assets_tests" inherit_id="website.assets_tests">
-        <xpath expr="." position="inside">
-            <script
-                type="text/javascript"
-                src="/portal_event_tickets/static/src/js/ticket_transfer.tour.js"
-            />
-        </xpath>
-    </template>
-</odoo>
diff --git a/portal_event_tickets/views/event_event.xml b/portal_event_tickets/views/event_event.xml
index 0b43d39..18f0509 100644
--- a/portal_event_tickets/views/event_event.xml
+++ b/portal_event_tickets/views/event_event.xml
@@ -8,7 +8,7 @@
             <xpath expr="//field[@name='tag_ids']" position="after">
                 <field name="report_template_for_portal" groups="base.group_no_one" />
             </xpath>
-            <xpath expr="//field[@name='auto_confirm']" position="before">
+            <xpath expr="//field[@name='badge_format']" position="before">
                 <field name="ticket_transferring" />
                 <field name="ticket_changing" />
             </xpath>
diff --git a/portal_event_tickets/views/event_registration.xml b/portal_event_tickets/views/event_registration.xml
index ffceec6..d259ea2 100644
--- a/portal_event_tickets/views/event_registration.xml
+++ b/portal_event_tickets/views/event_registration.xml
@@ -12,8 +12,9 @@
             </xpath>
             <xpath expr="//sheet/*[1]" position="before">
                 <!-- put it before first element in the form -->
+                <field name="is_transferring" invisible="1" />
                 <p
-                    attrs="{'invisible': [('is_transferring', '=', False)]}"
+                    invisible="is_transferring == False"
                     style="color: red"
                 >Ticket transferring was started, but haven't finished!</p>
             </xpath>
diff --git a/portal_event_tickets/views/portal_templates.xml b/portal_event_tickets/views/portal_templates.xml
index 91b4e97..c2f46e4 100644
--- a/portal_event_tickets/views/portal_templates.xml
+++ b/portal_event_tickets/views/portal_templates.xml
@@ -25,7 +25,10 @@
                     <a
                         t-if="ticket"
                         t-attf-href="/my/tickets?{{ keep_query() }}"
-                    >Tickets </a> / Ticket #<span t-esc="ticket.id" />
+                    >Tickets
+                    </a>
+                    / Ticket #
+                    <span t-esc="ticket.id" />
                 </t>
                 <t t-else="">
                     Tickets
@@ -39,10 +42,15 @@
         inherit_id="portal.portal_my_home"
         priority="25"
     >
-        <xpath expr="//div[hasclass('o_portal_docs')]" position="inside">
+        <xpath expr="//div[@id='portal_client_category']" position="inside">
             <t t-call="portal.portal_docs_entry">
                 <t t-set="title">Tickets</t>
                 <t t-set="url" t-value="'/my/tickets'" />
+                <t t-set="text">View your tickets</t>
+                <t
+                    t-set="icon"
+                    t-value="'/portal/static/src/img/portal-connection.svg'"
+                />
                 <t t-set="placeholder_count" t-value="'tickets_count'" />
             </t>
         </xpath>
@@ -68,7 +76,9 @@
                             <a
                                 class="ticket-id"
                                 t-attf-href="/my/tickets/#{ticket.id}?#{keep_query()}"
-                            >#<t t-esc="ticket.id" /></a>
+                            >#
+                                <t t-esc="ticket.id" />
+                            </a>
                         </td>
                         <td>
                             <a t-attf-href="/my/tickets/#{ticket.id}?#{keep_query()}">
@@ -100,7 +110,11 @@
                     <t t-set="classes" t-value="'col-lg-auto d-print-none'" />
 
                     <t t-set="title">
-                        <h2 class="mb-0"><b>Ticket #<span t-esc="ticket.id" /></b></h2>
+                        <h2 class="mb-0">
+                            <b>Ticket #
+                                <span t-esc="ticket.id" />
+                            </b>
+                        </h2>
                     </t>
                     <t t-set="entries">
                         <ul
@@ -110,9 +124,9 @@
                                 <a
                                     t-if="ticket.event_id.ticket_transferring"
                                     role="button"
-                                    class="btn btn-primary btn-block mb8"
-                                    data-toggle="modal"
-                                    data-target="#transferTicketModal"
+                                    class="btn btn-primary d-block btn-block mb8"
+                                    data-bs-toggle="modal"
+                                    data-bs-target="#transferTicketModal"
                                     href="#"
                                 >
                                     <i class="fa fa-exchange" />
@@ -121,19 +135,19 @@
                                 <a
                                     t-if="ticket.event_id.ticket_transferring"
                                     role="button"
-                                    data-toggle="modal"
-                                    data-target="#changeTicketModal"
+                                    data-bs-toggle="modal"
+                                    data-bs-target="#changeTicketModal"
                                     href="#"
-                                    class="btn btn-primary btn-block mb8"
+                                    class="btn btn-primary d-block btn-block mb8"
                                 >
                                     <i class="fa fa-wrench" />
                                     Upgrade / Change ticket
                                 </a>
                                 <a
                                     t-attf-href="/my/tickets/pdf/#{ticket.id}"
-                                    class="btn btn-secondary btn-block mb8"
+                                    class="btn btn-secondary d-block btn-block mb8"
                                 >
-                                <i class="fa fa-print" />
+                                    <i class="fa fa-print" />
                                     Print
                                 </a>
                             </li>
@@ -144,7 +158,8 @@
                     <div id="introduction" class="pb-2 pt-3 card-header bg-white">
                         <h2 class="my-0">
                             <t t-esc="ticket.event_id.display_name" />
-                            #<em t-esc="ticket.id" />
+                            #
+                            <em t-esc="ticket.id" />
                         </h2>
                     </div>
                     <div class="card-body">
@@ -164,7 +179,7 @@
                     class="modal fade"
                     id="transferTicketModal"
                     tabindex="-1"
-                    role="dialog"
+                    role="modal"
                     aria-labelledby="myModalLabel"
                 >
                     <div class="modal-dialog" role="document">
@@ -181,24 +196,23 @@
                                     t-att-value="ticket.id"
                                 />
                                 <div class="modal-header">
+                                    <h4
+                                        class="modal-title"
+                                        id="myModalLabel"
+                                    >Ticket transferring
+                                    </h4>
                                     <button
                                         type="button"
-                                        class="close"
-                                        data-dismiss="modal"
+                                        class="btn-close"
+                                        data-bs-dismiss="modal"
                                         aria-label="Close"
                                     >
-                                        <span aria-hidden="true">&amp;times;</span>
                                     </button>
-                                    <h4
-                                        class="modal-title"
-                                        id="myModalLabel"
-                                    >Ticket transferring</h4>
                                 </div>
                                 <div class="modal-body">
                                     <div class="form-group">
-                                        <label
-                                            for="transfer_email"
-                                        >Receiver's Email</label>
+                                        <label for="transfer_email">Receiver's Email
+                                        </label>
                                         <input
                                             type="email"
                                             class="form-control"
@@ -206,19 +220,24 @@
                                             placeholder="Email"
                                         />
                                     </div>
-                                    <div class="alert alert-danger" role="alert"><b
-                                        >Warning!</b> Once confirmed this action cannot be undone</div>
+                                    <div class="alert alert-danger" role="alert">
+                                        <b>Warning!
+                                        </b>
+                                        Once confirmed this action cannot be undone
+                                    </div>
                                 </div>
                                 <div class="modal-footer">
                                     <button
                                         type="button"
                                         class="btn btn-default"
-                                        data-dismiss="modal"
-                                    >Close</button>
+                                        data-bs-dismiss="modal"
+                                    >Close
+                                    </button>
                                     <button
                                         type="submit"
                                         class="btn btn-primary"
-                                    >Confirm</button>
+                                    >Confirm
+                                    </button>
                                 </div>
                             </form>
                         </div>
@@ -246,34 +265,38 @@
                                     t-att-value="ticket.id"
                                 />
                                 <div class="modal-header">
+                                    <h4
+                                        class="modal-title"
+                                        id="myModalLabel"
+                                    >Upgrade / change ticket
+                                    </h4>
                                     <button
                                         type="button"
-                                        class="close"
-                                        data-dismiss="modal"
+                                        class="btn-close"
+                                        data-bs-dismiss="modal"
                                         aria-label="Close"
                                     >
-                                        <span aria-hidden="true">&amp;times;</span>
                                     </button>
-                                    <h4
-                                        class="modal-title"
-                                        id="myModalLabel"
-                                    >Upgrade / change ticket</h4>
                                 </div>
                                 <div class="modal-body">
                                     <p
                                     >This ticket can be changed to other tickets or products. Click <em
-                                        >continue</em>, register new ticket (or fill the cart by other tickets\products) and follow usual checkout process.</p>
+                                        >continue</em>, register new ticket (or fill the cart by other tickets\products) and
+                                        follow usual checkout process.
+                                    </p>
                                 </div>
                                 <div class="modal-footer">
                                     <button
                                         type="button"
                                         class="btn btn-default"
-                                        data-dismiss="modal"
-                                    >Close</button>
+                                        data-bs-dismiss="modal"
+                                    >Close
+                                    </button>
                                     <button
                                         type="submit"
                                         class="btn btn-primary"
-                                    >Continue</button>
+                                    >Continue
+                                    </button>
                                 </div>
                             </form>
                         </div>
@@ -299,12 +322,14 @@
                             <li>
                                 <a
                                     href="?error=receiver_not_found"
-                                >there is no partner with that email</a>
+                                >there is no partner with that email
+                                </a>
                             </li>
                             <li>
                                 <a
                                     href="?error=receiver_has_ticket"
-                                >Partner already has ticket</a>
+                                >Partner already has ticket
+                                </a>
                             </li>
                         </ul>
                     </div>
@@ -343,11 +368,11 @@
     </template>
     <template id="message_origin_link">
         <p>This ticket has been canceled from:
-        <t t-foreach="origin" t-as="o">
+            <t t-foreach="origin" t-as="o">
                 <a href="#" t-att-data-oe-model="o._name" t-att-data-oe-id="o.id">
                     <t t-esc="o.name" />
                 </a>
-                <span t-if="origin.ids[-1:] != o.ids">, </span>
+                <span t-if="origin.ids[-1:] != o.ids">,</span>
             </t>
         </p>
     </template>