diff --git a/eslint.config.mjs b/eslint.config.mjs
index 84b836f4480..bab0e44b63e 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -7,6 +7,7 @@ export default [
       "ember/no-classic-classes": "error",
       "discourse/i18n-import-location": "error",
       "discourse/i18n-t": "error",
+      "discourse/discourse-common-imports": "error",
       "qunit/no-assert-equal-boolean": "error",
       "qunit/no-assert-equal": "error",
       "qunit/no-loose-assertions": "error",
diff --git a/package.json b/package.json
index 45ab38f68c5..27ad0ea0c95 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
   "license": "GPL-2.0-only",
   "devDependencies": {
     "@babel/plugin-proposal-decorators": "^7.25.9",
-    "@discourse/lint-configs": "^2.2.3",
+    "@discourse/lint-configs": "^2.3.0",
     "@discourse/moment-timezone-names-translations": "^1.0.0",
     "@fortawesome/fontawesome-free": "6.6.0",
     "@glint/core": "^1.5.1",
diff --git a/plugins/chat/assets/javascripts/discourse/components/channel-icon/index.gjs b/plugins/chat/assets/javascripts/discourse/components/channel-icon/index.gjs
index a115ccd2bc4..72135f8f99d 100644
--- a/plugins/chat/assets/javascripts/discourse/components/channel-icon/index.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/channel-icon/index.gjs
@@ -1,6 +1,6 @@
 import Component from "@glimmer/component";
 import { htmlSafe } from "@ember/template";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import ChatUserAvatar from "discourse/plugins/chat/discourse/components/chat-user-avatar";
 
 export default class ChatChannelIcon extends Component {
diff --git a/plugins/chat/assets/javascripts/discourse/components/channels-list-direct.gjs b/plugins/chat/assets/javascripts/discourse/components/channels-list-direct.gjs
index 4292b5b8e92..e6b91c0bd4a 100644
--- a/plugins/chat/assets/javascripts/discourse/components/channels-list-direct.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/channels-list-direct.gjs
@@ -7,7 +7,7 @@ import { and, not, or } from "truth-helpers";
 import DButton from "discourse/components/d-button";
 import PluginOutlet from "discourse/components/plugin-outlet";
 import concatClass from "discourse/helpers/concat-class";
-import dIcon from "discourse-common/helpers/d-icon";
+import dIcon from "discourse/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 import ChatModalNewMessage from "discourse/plugins/chat/discourse/components/chat/modal/new-message";
 import EmptyChannelsList from "discourse/plugins/chat/discourse/components/empty-channels-list";
diff --git a/plugins/chat/assets/javascripts/discourse/components/channels-list-public.gjs b/plugins/chat/assets/javascripts/discourse/components/channels-list-public.gjs
index f2886e3d3e0..1c65b077eec 100644
--- a/plugins/chat/assets/javascripts/discourse/components/channels-list-public.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/channels-list-public.gjs
@@ -7,7 +7,7 @@ import { service } from "@ember/service";
 import { and } from "truth-helpers";
 import PluginOutlet from "discourse/components/plugin-outlet";
 import concatClass from "discourse/helpers/concat-class";
-import dIcon from "discourse-common/helpers/d-icon";
+import dIcon from "discourse/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 import EmptyChannelsList from "discourse/plugins/chat/discourse/components/empty-channels-list";
 import ChatChannelRow from "./chat-channel-row";
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-card.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-channel-card.gjs
index a0d2c512bb7..26a1d6b2b20 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-card.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-card.gjs
@@ -5,8 +5,8 @@ import { service } from "@ember/service";
 import { gt } from "truth-helpers";
 import borderColor from "discourse/helpers/border-color";
 import concatClass from "discourse/helpers/concat-class";
+import dIcon from "discourse/helpers/d-icon";
 import replaceEmoji from "discourse/helpers/replace-emoji";
-import dIcon from "discourse-common/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 import ToggleChannelMembershipButton from "./toggle-channel-membership-button";
 
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-row.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-channel-row.gjs
index d022011b762..38c2f5b211f 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-row.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-row.gjs
@@ -10,10 +10,10 @@ import { htmlSafe } from "@ember/template";
 import { modifier as modifierFn } from "ember-modifier";
 import { and, eq } from "truth-helpers";
 import concatClass from "discourse/helpers/concat-class";
+import icon from "discourse/helpers/d-icon";
 import replaceEmoji from "discourse/helpers/replace-emoji";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { bind } from "discourse/lib/decorators";
-import icon from "discourse-common/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 import ChannelIcon from "discourse/plugins/chat/discourse/components/channel-icon";
 import ChannelName from "discourse/plugins/chat/discourse/components/channel-name";
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-status.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-channel-status.gjs
index 2c2cfb61613..067e7198f9f 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-status.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-status.gjs
@@ -1,5 +1,5 @@
 import Component from "@glimmer/component";
-import dIcon from "discourse-common/helpers/d-icon";
+import dIcon from "discourse/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 import {
   CHANNEL_STATUSES,
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-composer-message-details.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-composer-message-details.gjs
index 910ad7766b4..62bdd883840 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-composer-message-details.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-composer-message-details.gjs
@@ -1,7 +1,7 @@
 import { htmlSafe } from "@ember/template";
 import DButton from "discourse/components/d-button";
+import dIcon from "discourse/helpers/d-icon";
 import replaceEmoji from "discourse/helpers/replace-emoji";
-import dIcon from "discourse-common/helpers/d-icon";
 import ChatUserAvatar from "./chat-user-avatar";
 
 const ChatComposerMessageDetails = <template>
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-composer-upload.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-composer-upload.gjs
index ca0cea2e5db..37b61279182 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-composer-upload.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-composer-upload.gjs
@@ -1,8 +1,8 @@
 import Component from "@glimmer/component";
 import DButton from "discourse/components/d-button";
 import concatClass from "discourse/helpers/concat-class";
+import dIcon from "discourse/helpers/d-icon";
 import { isImage } from "discourse/lib/uploads";
-import dIcon from "discourse-common/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 
 export default class ChatComposerUpload extends Component {
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-header.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-header.gjs
index 391e934f3c6..af929eac64e 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-header.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-header.gjs
@@ -2,8 +2,8 @@ import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
 import { LinkTo } from "@ember/routing";
 import { service } from "@ember/service";
+import icon from "discourse/helpers/d-icon";
 import getURL from "discourse/lib/get-url";
-import icon from "discourse-common/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 
 export default class ChatHeader extends Component {
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-mention-warnings.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-mention-warnings.gjs
index b737087b9d5..a8b0657f965 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-mention-warnings.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-mention-warnings.gjs
@@ -1,8 +1,8 @@
 import Component from "@glimmer/component";
 import { service } from "@ember/service";
 import { htmlSafe } from "@ember/template";
+import dIcon from "discourse/helpers/d-icon";
 import getURL from "discourse/lib/get-url";
-import dIcon from "discourse-common/helpers/d-icon";
 import I18n, { i18n } from "discourse-i18n";
 
 export default class ChatMentionWarnings extends Component {
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-in-reply-to-indicator.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-message-in-reply-to-indicator.gjs
index bfd47be4f8e..247e86f32de 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-message-in-reply-to-indicator.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message-in-reply-to-indicator.gjs
@@ -2,8 +2,8 @@ import Component from "@glimmer/component";
 import { LinkTo } from "@ember/routing";
 import { service } from "@ember/service";
 import { htmlSafe } from "@ember/template";
+import dIcon from "discourse/helpers/d-icon";
 import replaceEmoji from "discourse/helpers/replace-emoji";
-import dIcon from "discourse-common/helpers/d-icon";
 import ChatEmojiAvatar from "./chat-emoji-avatar";
 import ChatUserAvatar from "./chat-user-avatar";
 
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-thread-heading.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-thread-heading.gjs
index 716ac34f4e1..b088ffb4e74 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-thread-heading.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-thread-heading.gjs
@@ -1,6 +1,6 @@
 import Component from "@glimmer/component";
+import icon from "discourse/helpers/d-icon";
 import replaceEmoji from "discourse/helpers/replace-emoji";
-import icon from "discourse-common/helpers/d-icon";
 
 export default class ChatThreadHeading extends Component {
   get showHeading() {
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/composer/button.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/composer/button.gjs
index 9eab950c65f..2b6937651be 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/composer/button.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/composer/button.gjs
@@ -1,4 +1,4 @@
-import dIcon from "discourse-common/helpers/d-icon";
+import dIcon from "discourse/helpers/d-icon";
 
 const ChatComposerButton = <template>
   <div class="chat-composer-button__wrapper">
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/form/row.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/form/row.gjs
index 49872bc4ee3..dc448c26647 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/form/row.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/form/row.gjs
@@ -1,6 +1,6 @@
 import { LinkTo } from "@ember/routing";
 import concatClass from "discourse/helpers/concat-class";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 
 const ChatFormRow = <template>
   {{#if @route}}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/header/icon.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/header/icon.gjs
index 4bec92e5041..6e97f1fa6ad 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/header/icon.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/header/icon.gjs
@@ -2,8 +2,8 @@ import Component from "@glimmer/component";
 import { service } from "@ember/service";
 import DButton from "discourse/components/d-button";
 import concatClass from "discourse/helpers/concat-class";
+import icon from "discourse/helpers/d-icon";
 import getURL from "discourse/lib/get-url";
-import icon from "discourse-common/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 import ChatHeaderIconUnreadIndicator from "discourse/plugins/chat/discourse/components/chat/header/icon/unread-indicator";
 import { getUserChatSeparateSidebarMode } from "discourse/plugins/chat/discourse/lib/get-user-chat-separate-sidebar-mode";
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/group.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/group.gjs
index ee5b5e7936b..34058a7cc63 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/group.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/group.gjs
@@ -1,6 +1,6 @@
 import Component from "@glimmer/component";
 import { service } from "@ember/service";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 
 export default class ChatableGroup extends Component {
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/member.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/member.gjs
index c42b32e2cd3..6cf1a940264 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/member.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/member.gjs
@@ -2,7 +2,7 @@ import { fn } from "@ember/helper";
 import { eq } from "truth-helpers";
 import DButton from "discourse/components/d-button";
 import concatClass from "discourse/helpers/concat-class";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import ChatUserAvatar from "discourse/plugins/chat/discourse/components/chat-user-avatar";
 
 const Member = <template>
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/members.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/members.gjs
index c4d510e975c..df870d02443 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/members.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/members.gjs
@@ -4,7 +4,7 @@ import { on } from "@ember/modifier";
 import { action } from "@ember/object";
 import didInsert from "@ember/render-modifiers/modifiers/did-insert";
 import { eq } from "truth-helpers";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 import { getNext, getPrevious } from "./lib/iterate-list";
 import Member from "./member";
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/search-input.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/search-input.gjs
index be96d7c4cc1..5a04f6e8059 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/search-input.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/search-input.gjs
@@ -1,7 +1,7 @@
 import Component from "@glimmer/component";
 import { Input } from "@ember/component";
 import { on } from "@ember/modifier";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 
 export default class ChatMessageCreatorSearchInput extends Component {
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message/info.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/message/info.gjs
index bbea6d63661..745cc432d93 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/message/info.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message/info.gjs
@@ -8,9 +8,9 @@ import { and } from "truth-helpers";
 import BookmarkIcon from "discourse/components/bookmark-icon";
 import UserStatusMessage from "discourse/components/user-status-message";
 import concatClass from "discourse/helpers/concat-class";
+import dIcon from "discourse/helpers/d-icon";
 import { bind } from "discourse/lib/decorators";
 import { prioritizeNameInUx } from "discourse/lib/settings";
-import dIcon from "discourse-common/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 import ChannelTitle from "discourse/plugins/chat/discourse/components/channel-title";
 import formatChatDate from "../../../helpers/format-chat-date";
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message/left-gutter.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/message/left-gutter.gjs
index 6817a25c864..dd0d0fafaf7 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/message/left-gutter.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message/left-gutter.gjs
@@ -4,7 +4,7 @@ import { LinkTo } from "@ember/routing";
 import { service } from "@ember/service";
 import { eq } from "truth-helpers";
 import BookmarkIcon from "discourse/components/bookmark-icon";
-import dIcon from "discourse-common/helpers/d-icon";
+import dIcon from "discourse/helpers/d-icon";
 import formatChatDate from "../../../helpers/format-chat-date";
 
 export default class ChatMessageLeftGutter extends Component {
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/thread-settings.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/thread-settings.gjs
index f4e2280e539..3b6be8f59d3 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/modal/thread-settings.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/thread-settings.gjs
@@ -6,8 +6,8 @@ import { service } from "@ember/service";
 import { htmlSafe } from "@ember/template";
 import DButton from "discourse/components/d-button";
 import DModal from "discourse/components/d-modal";
+import icon from "discourse/helpers/d-icon";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import icon from "discourse-common/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 
 export default class ChatModalThreadSettings extends Component {
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/back-button.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/back-button.gjs
index bf21d186262..0fa1b9ea4a0 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/back-button.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/back-button.gjs
@@ -1,7 +1,7 @@
 import Component from "@glimmer/component";
 import { LinkTo } from "@ember/routing";
 import { service } from "@ember/service";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 
 export default class ChatNavbarBackButton extends Component {
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/browse-channels-button.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/browse-channels-button.gjs
index 6a1fb098afa..566aa4d6c8d 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/browse-channels-button.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/browse-channels-button.gjs
@@ -1,7 +1,7 @@
 import Component from "@glimmer/component";
 import { LinkTo } from "@ember/routing";
 import { service } from "@ember/service";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 
 export default class ChatNavbarBrowseChannelsButton extends Component {
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-thread-button.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-thread-button.gjs
index 5131be527d2..d18dbeafec5 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-thread-button.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-thread-button.gjs
@@ -1,7 +1,7 @@
 import Component from "@glimmer/component";
 import { LinkTo } from "@ember/routing";
 import { service } from "@ember/service";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 
 export default class ChatNavbarCloseThreadButton extends Component {
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-threads-button.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-threads-button.gjs
index 3bb91627546..3ce7874c626 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-threads-button.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-threads-button.gjs
@@ -1,7 +1,7 @@
 import Component from "@glimmer/component";
 import { LinkTo } from "@ember/routing";
 import { service } from "@ember/service";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 
 export default class ChatNavbarCloseThreadsButton extends Component {
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/threads-list-button.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/threads-list-button.gjs
index 61cb286383e..469928312df 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/threads-list-button.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/threads-list-button.gjs
@@ -2,7 +2,7 @@ import Component from "@glimmer/component";
 import { LinkTo } from "@ember/routing";
 import { service } from "@ember/service";
 import concatClass from "discourse/helpers/concat-class";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 import ThreadHeaderUnreadIndicator from "discourse/plugins/chat/discourse/components/chat/thread/header-unread-indicator";
 
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/title.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/title.gjs
index c088ada4030..c2b791951ec 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/title.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/title.gjs
@@ -1,6 +1,6 @@
 import { hash } from "@ember/helper";
 import concatClass from "discourse/helpers/concat-class";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import SubTitle from "./sub-title";
 
 const ChatNavbarTitle = <template>
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/notices/mention_without_membership.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/notices/mention_without_membership.gjs
index 3f044e4109d..e8f820254c0 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/notices/mention_without_membership.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/notices/mention_without_membership.gjs
@@ -3,8 +3,8 @@ import { tracked } from "@glimmer/tracking";
 import { on } from "@ember/modifier";
 import { action } from "@ember/object";
 import { service } from "@ember/service";
+import dIcon from "discourse/helpers/d-icon";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import dIcon from "discourse-common/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 import laterFn from "../../../modifiers/chat/later-fn";
 
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-info-members.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-info-members.gjs
index 25e90324cb8..1543d4b8100 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-info-members.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-info-members.gjs
@@ -7,12 +7,12 @@ import { LinkTo } from "@ember/routing";
 import { service } from "@ember/service";
 import { modifier } from "ember-modifier";
 import FilterInput from "discourse/components/filter-input";
+import icon from "discourse/helpers/d-icon";
 import discourseDebounce from "discourse/lib/debounce";
 import { INPUT_DELAY } from "discourse/lib/environment";
 import isElementInViewport from "discourse/lib/is-element-in-viewport";
 import DiscourseURL, { userPath } from "discourse/lib/url";
 import autoFocus from "discourse/modifiers/auto-focus";
-import icon from "discourse-common/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 import MessageCreator from "discourse/plugins/chat/discourse/components/chat/message-creator";
 import { MODES } from "discourse/plugins/chat/discourse/components/chat/message-creator/constants";
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-info-settings.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-info-settings.gjs
index 09ee7ebcdca..6526a80da9e 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-info-settings.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-info-settings.gjs
@@ -7,9 +7,9 @@ import { service } from "@ember/service";
 import DButton from "discourse/components/d-button";
 import DToggleSwitch from "discourse/components/d-toggle-switch";
 import categoryBadge from "discourse/helpers/category-badge";
+import icon from "discourse/helpers/d-icon";
 import replaceEmoji from "discourse/helpers/replace-emoji";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import icon from "discourse-common/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 import ComboBox from "select-kit/components/combo-box";
 import ChatForm from "discourse/plugins/chat/discourse/components/chat/form";
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/scroll-to-bottom-arrow.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/scroll-to-bottom-arrow.gjs
index 91388fe4721..242f755f2b8 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/scroll-to-bottom-arrow.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/scroll-to-bottom-arrow.gjs
@@ -1,6 +1,6 @@
 import DButton from "discourse/components/d-button";
 import concatClass from "discourse/helpers/concat-class";
-import dIcon from "discourse-common/helpers/d-icon";
+import dIcon from "discourse/helpers/d-icon";
 
 const ScrollToBottomArrow = <template>
   <div class="chat-scroll-to-bottom">
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/thread/header.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/thread/header.gjs
index 5081af0f3c3..ef3543b3143 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/thread/header.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/thread/header.gjs
@@ -2,9 +2,9 @@ import Component from "@glimmer/component";
 import { on } from "@ember/modifier";
 import { service } from "@ember/service";
 import { or } from "truth-helpers";
+import icon from "discourse/helpers/d-icon";
 import noop from "discourse/helpers/noop";
 import replaceEmoji from "discourse/helpers/replace-emoji";
-import icon from "discourse-common/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 import and from "truth-helpers/helpers/and";
 import ThreadSettingsModal from "discourse/plugins/chat/discourse/components/chat/modal/thread-settings";
diff --git a/plugins/chat/assets/javascripts/discourse/connectors/user-preferences-nav/chat-preferences.gjs b/plugins/chat/assets/javascripts/discourse/connectors/user-preferences-nav/chat-preferences.gjs
index 9c69c78fdfa..478477813ef 100644
--- a/plugins/chat/assets/javascripts/discourse/connectors/user-preferences-nav/chat-preferences.gjs
+++ b/plugins/chat/assets/javascripts/discourse/connectors/user-preferences-nav/chat-preferences.gjs
@@ -1,6 +1,6 @@
 import Component from "@glimmer/component";
 import { LinkTo } from "@ember/routing";
-import dIcon from "discourse-common/helpers/d-icon";
+import dIcon from "discourse/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 
 export default class ChatPreferences extends Component {
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/services/composer-presence-manager.js b/plugins/discourse-presence/assets/javascripts/discourse/services/composer-presence-manager.js
index b02e2f9b05e..f45e39c385d 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/services/composer-presence-manager.js
+++ b/plugins/discourse-presence/assets/javascripts/discourse/services/composer-presence-manager.js
@@ -1,6 +1,6 @@
 import { cancel, debounce } from "@ember/runloop";
 import Service, { service } from "@ember/service";
-import { isTesting } from "discourse-common/config/environment";
+import { isTesting } from "discourse/lib/environment";
 
 const KEEP_ALIVE = 10 * 1000; // 10 seconds
 
diff --git a/plugins/poll/assets/javascripts/discourse/components/poll-buttons-dropdown.gjs b/plugins/poll/assets/javascripts/discourse/components/poll-buttons-dropdown.gjs
index addbd450f75..74efcedf77f 100644
--- a/plugins/poll/assets/javascripts/discourse/components/poll-buttons-dropdown.gjs
+++ b/plugins/poll/assets/javascripts/discourse/components/poll-buttons-dropdown.gjs
@@ -4,7 +4,7 @@ import { action, get } from "@ember/object";
 import { service } from "@ember/service";
 import DButton from "discourse/components/d-button";
 import DropdownMenu from "discourse/components/dropdown-menu";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import DMenu from "float-kit/components/d-menu";
 
 const buttonOptionsMap = {
diff --git a/plugins/poll/assets/javascripts/discourse/components/poll-info.gjs b/plugins/poll/assets/javascripts/discourse/components/poll-info.gjs
index 2b9d5332d4e..0e67e116485 100644
--- a/plugins/poll/assets/javascripts/discourse/components/poll-info.gjs
+++ b/plugins/poll/assets/javascripts/discourse/components/poll-info.gjs
@@ -1,8 +1,8 @@
 import Component from "@glimmer/component";
 import { service } from "@ember/service";
 import { htmlSafe } from "@ember/template";
+import icon from "discourse/helpers/d-icon";
 import { relativeAge } from "discourse/lib/formatter";
-import icon from "discourse-common/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 
 const ON_VOTE = "on_vote";
diff --git a/plugins/poll/assets/javascripts/discourse/components/poll-option-ranked-choice-dropdown.gjs b/plugins/poll/assets/javascripts/discourse/components/poll-option-ranked-choice-dropdown.gjs
index 72a569d0020..30b82906ce2 100644
--- a/plugins/poll/assets/javascripts/discourse/components/poll-option-ranked-choice-dropdown.gjs
+++ b/plugins/poll/assets/javascripts/discourse/components/poll-option-ranked-choice-dropdown.gjs
@@ -3,7 +3,7 @@ import { fn } from "@ember/helper";
 import { action } from "@ember/object";
 import DButton from "discourse/components/d-button";
 import DropdownMenu from "discourse/components/dropdown-menu";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 import DMenu from "float-kit/components/d-menu";
 
diff --git a/plugins/poll/assets/javascripts/discourse/components/poll-options.gjs b/plugins/poll/assets/javascripts/discourse/components/poll-options.gjs
index 4501a7cbd4a..6112069c123 100644
--- a/plugins/poll/assets/javascripts/discourse/components/poll-options.gjs
+++ b/plugins/poll/assets/javascripts/discourse/components/poll-options.gjs
@@ -5,8 +5,8 @@ import { action } from "@ember/object";
 import { service } from "@ember/service";
 import { htmlSafe } from "@ember/template";
 import concatClass from "discourse/helpers/concat-class";
+import icon from "discourse/helpers/d-icon";
 import routeAction from "discourse/helpers/route-action";
-import icon from "discourse-common/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 import PollOptionRankedChoice from "./poll-option-ranked-choice";
 
diff --git a/plugins/poll/assets/javascripts/discourse/components/poll-voters-ranked-choice.gjs b/plugins/poll/assets/javascripts/discourse/components/poll-voters-ranked-choice.gjs
index 67b19d43115..6c60caf4e8e 100644
--- a/plugins/poll/assets/javascripts/discourse/components/poll-voters-ranked-choice.gjs
+++ b/plugins/poll/assets/javascripts/discourse/components/poll-voters-ranked-choice.gjs
@@ -1,7 +1,7 @@
 import Component from "@glimmer/component";
 import { eq } from "truth-helpers";
 import avatar from "discourse/helpers/bound-avatar-template";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 
 export default class PollVotersComponent extends Component {
   groupVotersByRank = (voters) => {
diff --git a/plugins/poll/assets/javascripts/discourse/components/poll.gjs b/plugins/poll/assets/javascripts/discourse/components/poll.gjs
index e326ee4d99c..68e1ff19845 100644
--- a/plugins/poll/assets/javascripts/discourse/components/poll.gjs
+++ b/plugins/poll/assets/javascripts/discourse/components/poll.gjs
@@ -5,10 +5,10 @@ import { action } from "@ember/object";
 import didUpdate from "@ember/render-modifiers/modifiers/did-update";
 import { service } from "@ember/service";
 import { htmlSafe } from "@ember/template";
+import icon from "discourse/helpers/d-icon";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import round from "discourse/lib/round";
-import icon from "discourse-common/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 import PollBreakdownModal from "../components/modal/poll-breakdown";
 import {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 0de273171b8..87f7c4c57ca 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -35,8 +35,8 @@ importers:
         specifier: ^7.25.9
         version: 7.25.9(@babel/core@7.26.0)
       '@discourse/lint-configs':
-        specifier: ^2.2.3
-        version: 2.2.3(ember-template-lint@6.0.0)(eslint@9.18.0)(prettier@2.8.8)
+        specifier: ^2.3.0
+        version: 2.3.0(ember-template-lint@6.0.0)(eslint@9.18.0)(prettier@2.8.8)
       '@discourse/moment-timezone-names-translations':
         specifier: ^1.0.0
         version: 1.0.0
@@ -1818,8 +1818,8 @@ packages:
   '@discourse/itsatrap@2.0.10':
     resolution: {integrity: sha512-Jn1gdiyHMGUsmUfLFf4Q7VnTAv0l7NePbegU6pKhKHEmbzV3FosGxq30fTOYgVyTS1bxqGjlA6LvQttJpv3ROw==}
 
-  '@discourse/lint-configs@2.2.3':
-    resolution: {integrity: sha512-GZE2u/9QfLRIEDscickTx6sB51pA/8lZeNx1YTgoXx6OnyOCxfQf/24M9GTPHcOYZHIDtqAFrffSd9FI5NNUOw==}
+  '@discourse/lint-configs@2.3.0':
+    resolution: {integrity: sha512-vHmUUnuTemLDGpnfgK4jcmToM9accbByzxuL3NTY3bGDtygG/B09wkxWr+A9UbAMhlKsJy9w9sIH/2BovyYX3Q==}
     peerDependencies:
       ember-template-lint: 6.0.0
       eslint: ^9.15.0
@@ -9305,7 +9305,7 @@ snapshots:
 
   '@discourse/itsatrap@2.0.10': {}
 
-  '@discourse/lint-configs@2.2.3(ember-template-lint@6.0.0)(eslint@9.18.0)(prettier@2.8.8)':
+  '@discourse/lint-configs@2.3.0(ember-template-lint@6.0.0)(eslint@9.18.0)(prettier@2.8.8)':
     dependencies:
       '@babel/core': 7.26.0(supports-color@8.1.1)
       '@babel/eslint-parser': 7.26.5(@babel/core@7.26.0)(eslint@9.18.0)