diff --git a/addons/im_livechat/static/src/embed/external/emoji_loader_patch.js b/addons/im_livechat/static/src/embed/external/emoji_loader_patch.js
index ca2887fc7ab..47e6ee1bab5 100644
--- a/addons/im_livechat/static/src/embed/external/emoji_loader_patch.js
+++ b/addons/im_livechat/static/src/embed/external/emoji_loader_patch.js
@@ -1,6 +1,6 @@
 /* @odoo-module */
 
-import { loader } from "@mail/core/common/emoji_picker";
+import { loader } from "@web/core/emoji_picker/emoji_picker";
 
 import { loadBundle } from "@web/core/assets";
 import { memoize } from "@web/core/utils/functions";
diff --git a/addons/mail/static/src/core/common/composer.js b/addons/mail/static/src/core/common/composer.js
index b0588ce35e1..b52a718ca7e 100644
--- a/addons/mail/static/src/core/common/composer.js
+++ b/addons/mail/static/src/core/common/composer.js
@@ -3,7 +3,7 @@
 import { AttachmentList } from "@mail/core/common/attachment_list";
 import { useAttachmentUploader } from "@mail/core/common/attachment_uploader_hook";
 import { useDropzone } from "@mail/core/common/dropzone_hook";
-import { EmojiPicker, useEmojiPicker } from "@mail/core/common/emoji_picker";
+import { EmojiPicker, useEmojiPicker } from "@web/core/emoji_picker/emoji_picker";
 import { MessageConfirmDialog } from "@mail/core/common/message_confirm_dialog";
 import { useMessaging, useStore } from "@mail/core/common/messaging_hook";
 import { NavigableList } from "@mail/core/common/navigable_list";
diff --git a/addons/mail/static/src/core/common/message.js b/addons/mail/static/src/core/common/message.js
index f457546903a..bbd798f163c 100644
--- a/addons/mail/static/src/core/common/message.js
+++ b/addons/mail/static/src/core/common/message.js
@@ -2,7 +2,7 @@
 
 import { AttachmentList } from "@mail/core/common/attachment_list";
 import { Composer } from "@mail/core/common/composer";
-import { useEmojiPicker } from "@mail/core/common/emoji_picker";
+import { useEmojiPicker } from "@web/core/emoji_picker/emoji_picker";
 import { ImStatus } from "@mail/core/common/im_status";
 import { LinkPreviewList } from "@mail/core/common/link_preview_list";
 import { MessageConfirmDialog } from "@mail/core/common/message_confirm_dialog";
diff --git a/addons/mail/static/src/core/common/message_reaction_menu.js b/addons/mail/static/src/core/common/message_reaction_menu.js
index 75cd7553d8a..ee276fb1fce 100644
--- a/addons/mail/static/src/core/common/message_reaction_menu.js
+++ b/addons/mail/static/src/core/common/message_reaction_menu.js
@@ -1,6 +1,6 @@
 /* @odoo-module */
 
-import { loadEmoji } from "@mail/core/common/emoji_picker";
+import { loadEmoji } from "@web/core/emoji_picker/emoji_picker";
 import { useStore } from "@mail/core/common/messaging_hook";
 import { onExternalClick } from "@mail/utils/common/hooks";
 
diff --git a/addons/mail/static/src/core/common/thread_service.js b/addons/mail/static/src/core/common/thread_service.js
index a8196c9d660..add96a3b7d9 100644
--- a/addons/mail/static/src/core/common/thread_service.js
+++ b/addons/mail/static/src/core/common/thread_service.js
@@ -1,7 +1,7 @@
 /* @odoo-module */
 
 import { Composer } from "@mail/core/common/composer_model";
-import { loadEmoji } from "@mail/core/common/emoji_picker";
+import { loadEmoji } from "@web/core/emoji_picker/emoji_picker";
 import { DEFAULT_AVATAR } from "@mail/core/common/persona_service";
 import { Thread } from "@mail/core/common/thread_model";
 import {
diff --git a/addons/mail/static/src/utils/common/format.js b/addons/mail/static/src/utils/common/format.js
index f55c7a2f083..6d7479a24e4 100644
--- a/addons/mail/static/src/utils/common/format.js
+++ b/addons/mail/static/src/utils/common/format.js
@@ -1,6 +1,6 @@
 /* @odoo-module */
 
-import { loadEmoji } from "@mail/core/common/emoji_picker";
+import { loadEmoji } from "@web/core/emoji_picker/emoji_picker";
 
 import { escape, unaccent } from "@web/core/utils/strings";
 import { url } from "@web/core/utils/urls";
diff --git a/addons/mail/static/src/views/web/fields/emojis_field_common/emojis_field_common.js b/addons/mail/static/src/views/web/fields/emojis_field_common/emojis_field_common.js
index 5bf9d8ada8f..37bdb7727d4 100644
--- a/addons/mail/static/src/views/web/fields/emojis_field_common/emojis_field_common.js
+++ b/addons/mail/static/src/views/web/fields/emojis_field_common/emojis_field_common.js
@@ -1,6 +1,6 @@
 /* @odoo-module */
 
-import { useEmojiPicker } from "@mail/core/common/emoji_picker";
+import { useEmojiPicker } from "@web/core/emoji_picker/emoji_picker";
 
 import { useRef } from "@odoo/owl";
 
diff --git a/addons/mail/static/tests/emoji/emoji_tests.js b/addons/mail/static/tests/emoji/emoji_tests.js
index 5dd88d14548..9fe144b257c 100644
--- a/addons/mail/static/tests/emoji/emoji_tests.js
+++ b/addons/mail/static/tests/emoji/emoji_tests.js
@@ -1,6 +1,6 @@
 /* @odoo-module */
 
-import { EMOJI_PER_ROW } from "@mail/core/common/emoji_picker";
+import { EMOJI_PER_ROW } from "@web/core/emoji_picker/emoji_picker";
 import {
     afterNextRender,
     click,
diff --git a/addons/mail/static/tests/helpers/test_utils.js b/addons/mail/static/tests/helpers/test_utils.js
index 01267b2be51..faa9dbcb21f 100644
--- a/addons/mail/static/tests/helpers/test_utils.js
+++ b/addons/mail/static/tests/helpers/test_utils.js
@@ -2,7 +2,7 @@
 
 import { getPyEnv, startServer } from "@bus/../tests/helpers/mock_python_environment";
 
-import { loadEmoji } from "@mail/core/common/emoji_picker";
+import { loadEmoji } from "@web/core/emoji_picker/emoji_picker";
 import { patchBrowserNotification } from "@mail/../tests/helpers/patch_notifications";
 import { getAdvanceTime } from "@mail/../tests/helpers/time_control";
 import { getWebClientReady } from "@mail/../tests/helpers/webclient_setup";
diff --git a/addons/mail/static/src/core/common/emoji_data.js b/addons/web/static/src/core/emoji_picker/emoji_data.js
similarity index 100%
rename from addons/mail/static/src/core/common/emoji_data.js
rename to addons/web/static/src/core/emoji_picker/emoji_data.js
diff --git a/addons/mail/static/src/core/common/emoji_picker.js b/addons/web/static/src/core/emoji_picker/emoji_picker.js
similarity index 98%
rename from addons/mail/static/src/core/common/emoji_picker.js
rename to addons/web/static/src/core/emoji_picker/emoji_picker.js
index c75cc969cf2..a7e5e00a32d 100644
--- a/addons/mail/static/src/core/common/emoji_picker.js
+++ b/addons/web/static/src/core/emoji_picker/emoji_picker.js
@@ -110,12 +110,12 @@ export const loader = {
 };
 
 /**
- * @returns {import("@mail/core/common/emoji_data")}
+ * @returns {import("@web/core/emoji_picker/emoji_data")}
  */
 export async function loadEmoji() {
     try {
         await loader.loadEmoji();
-        return odoo.runtimeImport("@mail/core/common/emoji_data");
+        return odoo.runtimeImport("@web/core/emoji_picker/emoji_data");
     } catch {
         // Could be intentional (tour ended successfully while emoji still loading)
         return { emojis: [], categories: [] };
diff --git a/addons/mail/static/src/core/common/emoji_picker.scss b/addons/web/static/src/core/emoji_picker/emoji_picker.scss
similarity index 100%
rename from addons/mail/static/src/core/common/emoji_picker.scss
rename to addons/web/static/src/core/emoji_picker/emoji_picker.scss
diff --git a/addons/mail/static/src/core/common/emoji_picker.xml b/addons/web/static/src/core/emoji_picker/emoji_picker.xml
similarity index 100%
rename from addons/mail/static/src/core/common/emoji_picker.xml
rename to addons/web/static/src/core/emoji_picker/emoji_picker.xml