diff --git a/css/app.css b/css/app.css
index ee8c46f..f600e62 100644
--- a/css/app.css
+++ b/css/app.css
@@ -181,23 +181,9 @@ body {
 }
 
 #chat .message.twitch.first-message > div .first-chatter {
-    animation-name: wave-animation; 
-    animation-duration: 2.5s;
-    animation-iteration-count: infinite;
-    transform-origin: 70% 70%; 
     display: inline-block;
 }
 
-@keyframes wave-animation {
-    0% { transform: rotate( 0.0deg) }
-    10% { transform: rotate(14.0deg) }
-    20% { transform: rotate(-8.0deg) }
-    30% { transform: rotate(14.0deg) }
-    40% { transform: rotate(-4.0deg) }
-    50% { transform: rotate(10.0deg) }
-    60% { transform: rotate( 0.0deg) }
-    100% { transform: rotate( 0.0deg) }
-}
 
 #chat .message.twitch .platform { color: #a970ff; background: transparent !important; text-shadow: 0px 0px 0px #a970ff;}
 #chat .message.twitch .platform::after {
diff --git a/js/app.js b/js/app.js
index 0e21405..e3f5057 100644
--- a/js/app.js
+++ b/js/app.js
@@ -80,7 +80,7 @@ async function addMessageToChat(userID, messageID, platform, data) {
         <div id="${messageID}" data-user="${userID}" class="${platform} ${data.classes} message" style="">
             <div class="animate__animated ${chatHorizontal == true ? 'animate__fadeInRight' : 'animate__fadeInUp'} animate__faster">
 
-                ${data.classes.includes("first-message") ? '<span class="first-chatter">👋</span>' : '' }
+                ${data.classes.includes("first-message") ? '<span class="first-chatter">✨</span>' : '' }
 
                 ${!data.shared ? '' : data.shared}
 
@@ -301,4 +301,4 @@ const notifySuccess = (success) => {
 
 function escapeRegex(string) {
     return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-}
+}
\ No newline at end of file
diff --git a/js/streamelements/module.js b/js/streamelements/module.js
index 05cd029..6eba8e0 100644
--- a/js/streamelements/module.js
+++ b/js/streamelements/module.js
@@ -3,8 +3,6 @@ const showStreamElementsTips        = getURLParam("showStreamElementsTips", true
 const streamElementsHandlers = {
     'StreamElements.Tip': (response) => {
         console.debug(response.data);
-        if (showStreamElementsTips == false)
-            return;
         streamElementsEventMessage(response.data);
     },
 };
@@ -15,6 +13,9 @@ for (const [event, handler] of Object.entries(streamElementsHandlers)) {
 
 
 async function streamElementsEventMessage(data) {
+    
+    if (showStreamElementsTips == false) return;
+    
     const {
         username: userName,
         amount: moneyFromUser,
diff --git a/js/streamlabs/module.js b/js/streamlabs/module.js
index 653809d..f944462 100644
--- a/js/streamlabs/module.js
+++ b/js/streamlabs/module.js
@@ -3,8 +3,6 @@ const showStreamlabsDonations       = getURLParam("showStreamlabsDonations", tru
 const streamLabsHandlers = {
     'Streamlabs.Donation': (response) => {
         console.debug(response.data);
-        if (showStreamlabsDonations == false)
-            return;
         streamLabsEventMessage(response.data);
     },
 };
@@ -13,6 +11,9 @@ for (const [event, handler] of Object.entries(streamLabsHandlers)) {
 }
 
 async function streamLabsEventMessage(data) {
+    
+    if (showStreamlabsDonations == false) return;
+    
     const {
         from: userName,
         formattedAmount: moneyFromUser,
diff --git a/js/twitch/module.js b/js/twitch/module.js
index c1f860a..0810f3a 100644
--- a/js/twitch/module.js
+++ b/js/twitch/module.js
@@ -123,7 +123,10 @@ async function twitchChatMessage(data) {
         if (showTwitchSharedChat == true) {
             if (!data.sharedChat.primarySource)
             {
-                var sharedChat = `<div class="shared"><span><i class="fa-solid fa-comments"></i> <strong>${data.sharedChat.sourceRoom.name}</strong></span> <i class="fa-solid fa-arrow-turn-down"></i></div>`;
+                var sharedChat = `<div class="shared">
+                    <span><i class="fa-solid fa-comment-dots"></i> <strong>${data.sharedChat.sourceRoom.name}</strong></span>
+                    <i class="fa-solid fa-arrow-turn-down"></i>
+                </div>`;
             }
         }
         else if (!data.sharedChat.primarySource && showTwitchSharedChat == false) {