diff --git a/bigbluebutton-html5/imports/ui/components/button/component.jsx b/bigbluebutton-html5/imports/ui/components/button/component.jsx
index 9756058446e8f5eb79028c0ce198eab91baa4ff8..4ca5fc9843646774e166c1c383a6607ddba5e02e 100644
--- a/bigbluebutton-html5/imports/ui/components/button/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/button/component.jsx
@@ -117,13 +117,13 @@ export default class Button extends BaseButton {
       circle,
       hideLabel,
       label,
-      'aria-label' : ariaLabel
+      'aria-label': ariaLabel,
     } = this.props;
 
     const renderFuncName = circle ? 'renderCircle' : 'renderDefault';
 
     if (hideLabel) {
-      const tooltipLabel = label ? label : ariaLabel;
+      const tooltipLabel = label || ariaLabel;
 
       return (
         <Tooltip
diff --git a/bigbluebutton-html5/imports/ui/components/tooltip/component.jsx b/bigbluebutton-html5/imports/ui/components/tooltip/component.jsx
index dd8b694ec96427cc22b0995c042313308379da71..ad2f3b6bc1ff2570716a1a9add301e424cdc7a47 100644
--- a/bigbluebutton-html5/imports/ui/components/tooltip/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/tooltip/component.jsx
@@ -25,7 +25,7 @@ class Tooltip extends Component {
     this.onShow = this.onShow.bind(this);
     this.onHide = this.onHide.bind(this);
     this.handleEscapeHide = this.handleEscapeHide.bind(this);
-    this.delay = [250, 100];
+    this.delay = [150, 50];
     this.dynamicTitle = true;
   }
 
@@ -40,6 +40,7 @@ class Tooltip extends Component {
       delay: this.delay,
       onShow: this.onShow,
       onHide: this.onHide,
+      touchHold: true,
     };
 
     this.tooltip = Tippy(`#${this.tippySelectorId}`, options);