diff --git a/bigbluebutton-html5/client/stylesheets/modals.css b/bigbluebutton-html5/client/stylesheets/modals.css
index ff491e5cff0d04561f448843ecdcd17fd6e719f8..dbd6263f8de12482a3cfc8649fc3a83f4a4153eb 100755
--- a/bigbluebutton-html5/client/stylesheets/modals.css
+++ b/bigbluebutton-html5/client/stylesheets/modals.css
@@ -1,7 +1,3 @@
-:root{
-  --enableAnimation: 1;
-}
-
 .ReactModal__Overlay {
   -webkit-perspective: 600;
   perspective: 600;
diff --git a/bigbluebutton-html5/imports/ui/components/audio/audio-controls/styles.scss b/bigbluebutton-html5/imports/ui/components/audio/audio-controls/styles.scss
index 2e81f0ddd0e87ac04f90356c81879f844acf1dcd..66475595d11fb486ce3566bda4a8551e957312ee 100755
--- a/bigbluebutton-html5/imports/ui/components/audio/audio-controls/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/audio/audio-controls/styles.scss
@@ -37,11 +37,13 @@
   }
 }
 
-    [style~="--enableAnimation:0;"] .button.glow {
-    background-clip: padding-box;
-    border: 3px solid transparent;
-    box-shadow: 0 0 0 2px rgba(255,255,255,.5);
-    }
+[style~="--enableAnimation:0;"] .button.glow span {
+  content: '';
+  outline: none !important;
+  background-clip: padding-box;
+  border: var(--border-size-large) solid transparent;
+  box-shadow: 0 0 0 var(--border-size) rgba(255,255,255,.5);
+}
 
 @keyframes pulse {
   0% {
diff --git a/bigbluebutton-html5/imports/ui/components/tooltip/component.jsx b/bigbluebutton-html5/imports/ui/components/tooltip/component.jsx
index 5c4ac0b33096e525dbbf680aca21799ab2ad175c..5ec575588cd633fc6907258331fe6e2434f562a6 100755
--- a/bigbluebutton-html5/imports/ui/components/tooltip/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/tooltip/component.jsx
@@ -69,18 +69,15 @@ class Tooltip extends Component {
   componentDidUpdate() {
     const { enableAnimation } = this.state;
     const { animations } = Settings.application;
+
     if (animations !== enableAnimation) {
       const elements = document.querySelectorAll('[id^="tippy-"]');
       elements.forEach((e) => {
         const instance = e._tippy;
-        if (animations) instance.set({ animation: 'shift-away' });
-        if (!animations) instance.set({ animation: 'none' });
+        instance.set({ animation: animations ? 'shift-away' : 'none' });
       });
-      if (animations) {
-        this.setEnableAnimation(true);
-      } else {
-        this.setEnableAnimation(false);
-      }
+
+      this.setEnableAnimation(animations);
     }
   }
 
diff --git a/bigbluebutton-html5/private/config/settings.yml b/bigbluebutton-html5/private/config/settings.yml
index 0483f7621d7df72e248fdd2609699946f9774be3..ac3420e9f55b19b0b9906dd2f3f3f29ce06255f8 100755
--- a/bigbluebutton-html5/private/config/settings.yml
+++ b/bigbluebutton-html5/private/config/settings.yml
@@ -18,7 +18,7 @@ public:
     askForFeedbackOnLogout: false
     defaultSettings:
       application:
-        animations: false
+        animations: true
         chatAudioAlerts: false
         chatPushAlerts: false
         fallbackLocale: en