diff --git a/addons/hr_holidays/static/src/im_status_patch.xml b/addons/hr_holidays/static/src/im_status_patch.xml
index 91e9da76733..31fa8f87373 100644
--- a/addons/hr_holidays/static/src/im_status_patch.xml
+++ b/addons/hr_holidays/static/src/im_status_patch.xml
@@ -2,7 +2,7 @@
 <templates xml:space="preserve">
     <t t-inherit="mail.ImStatus" t-inherit-mode="extension">
         <xpath expr="//span" position="inside">
-            <i t-if="props.persona.im_status === 'leave_online'" class="fa fa-plane text-primary" title="Online" role="img" aria-label="User is online"/>
+            <i t-if="props.persona.im_status === 'leave_online'" class="fa fa-plane text-success" title="Online" role="img" aria-label="User is online"/>
             <i t-if="props.persona.im_status === 'leave_away'" class="fa fa-plane text-warning" title="Idle" role="img" aria-label="User is idle"/>
             <i t-if="props.persona.im_status === 'leave_offline'" class="fa fa-plane text-700" title="Out of office" role="img" aria-label="User is out of office"/>
         </xpath>        
diff --git a/addons/mail/static/src/discuss/im_status.xml b/addons/mail/static/src/discuss/im_status.xml
index 0bd50106ffc..384da407b1f 100644
--- a/addons/mail/static/src/discuss/im_status.xml
+++ b/addons/mail/static/src/discuss/im_status.xml
@@ -4,10 +4,10 @@
     <t t-name="mail.ImStatus" owl="1">
         <div class="o-mail-ImStatus d-flex justify-content-center flex-shrink-0 align-items-center rounded-circle small o-bg-inherit" t-att-class="props.className">
             <span t-if="props.persona.im_status" class="d-flex flex-column">
-                <i t-if="props.persona.im_status === 'online'" class="fa fa-circle text-primary" title="Online" role="img" aria-label="User is online"/>
+                <i t-if="props.persona.im_status === 'online'" class="fa fa-circle text-success" title="Online" role="img" aria-label="User is online"/>
                 <i t-if="props.persona.im_status === 'away'" class="fa fa-circle text-warning" title="Idle" role="img" aria-label="User is idle"/>
                 <i t-if="props.persona.im_status === 'offline'" class="fa fa-circle-o text-700" title="Offline" role="img" aria-label="User is offline"/>
-                <i t-if="props.persona.im_status === 'bot'" class="fa fa-heart text-primary" title="Bot" role="img" aria-label="User is a bot"/>
+                <i t-if="props.persona.im_status === 'bot'" class="fa fa-heart text-success" title="Bot" role="img" aria-label="User is a bot"/>
             </span>
         </div>
     </t>
diff --git a/addons/mail/static/src/discuss/thread_icon.scss b/addons/mail/static/src/discuss/thread_icon.scss
deleted file mode 100644
index 32eee0887e9..00000000000
--- a/addons/mail/static/src/discuss/thread_icon.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.o-mail-ThreadIcon-online {
-    color: $o-enterprise-primary-color;
-}
diff --git a/addons/mail/static/src/discuss/thread_icon.xml b/addons/mail/static/src/discuss/thread_icon.xml
index 22ddd10b7c3..b9a3b42a494 100644
--- a/addons/mail/static/src/discuss/thread_icon.xml
+++ b/addons/mail/static/src/discuss/thread_icon.xml
@@ -11,10 +11,10 @@
                 <Typing t-if="props.thread.hasTypingMembers" channel="props.thread" size="props.size" displayText="false"/>
                 <t t-else="">
                     <t name="chat_static">
-                        <div t-if="chatPartner.im_status === 'online'" class="o-mail-ThreadIcon-online fa fa-fw fa-circle" title="Online"/>
+                        <div t-if="chatPartner.im_status === 'online'" class="fa fa-fw fa-circle text-success" title="Online"/>
                         <div t-elif="chatPartner.im_status === 'offline'" class="fa fa-fw fa-circle-o" title="Offline"/>
                         <div t-elif="chatPartner.im_status === 'away'" class="fa fa-fw fa-circle text-warning" title="Away"/>
-                        <div t-elif="chatPartner.im_status === 'bot'" class="o-mail-ThreadIcon-online fa fa-fw fa-heart" title="Bot"/>
+                        <div t-elif="chatPartner.im_status === 'bot'" class="fa fa-fw fa-heart text-success" title="Bot"/>
                         <t t-else="" name="noImStatusCondition">
                             <div class="fa fa-fw fa-question-circle" title="No IM status available"/>
                         </t>
diff --git a/addons/mail/static/tests/composer/typing_tests.js b/addons/mail/static/tests/composer/typing_tests.js
index 2c8c02f868e..e619a52d335 100644
--- a/addons/mail/static/tests/composer/typing_tests.js
+++ b/addons/mail/static/tests/composer/typing_tests.js
@@ -335,7 +335,7 @@ QUnit.test("chat: correspondent is typing", async (assert) => {
     const { env, openDiscuss } = await start();
     await openDiscuss();
     assert.containsOnce($(".o-mail-DiscussCategoryItem"), ".o-mail-DiscussCategoryItem-threadIcon");
-    assert.containsOnce($, ".o-mail-ThreadIcon-online");
+    assert.containsOnce($, ".fa-circle.text-success");
 
     // simulate receive typing notification from demo "is typing"
     await afterNextRender(() =>
@@ -356,5 +356,5 @@ QUnit.test("chat: correspondent is typing", async (assert) => {
             is_typing: false,
         })
     );
-    assert.containsOnce($, ".o-mail-ThreadIcon-online");
+    assert.containsOnce($, ".fa-circle.text-success");
 });
diff --git a/addons/mail/static/tests/discuss/discuss_tests.js b/addons/mail/static/tests/discuss/discuss_tests.js
index 1aaffe08d15..ce432ad63a8 100644
--- a/addons/mail/static/tests/discuss/discuss_tests.js
+++ b/addons/mail/static/tests/discuss/discuss_tests.js
@@ -397,7 +397,7 @@ QUnit.test("sidebar: chat im_status rendering", async (assert) => {
     assert.strictEqual(chat2.textContent, "Partner2");
     assert.strictEqual(chat3.textContent, "Partner3");
     assert.containsOnce(chat1, ".o-mail-ThreadIcon div[title='Offline']");
-    assert.containsOnce(chat2, ".o-mail-ThreadIcon-online");
+    assert.containsOnce(chat2, ".fa-circle.text-success");
     assert.containsOnce(chat3, ".o-mail-ThreadIcon div[title='Away']");
 });