diff --git a/bigbluebutton-html5/.meteor/packages b/bigbluebutton-html5/.meteor/packages
index f23ddee2e79c68345ddeb08c1aa84fa7ae92fdfd..4efa37a6ad4dc93c2ff2c3353e3597cc50a0dfae 100644
--- a/bigbluebutton-html5/.meteor/packages
+++ b/bigbluebutton-html5/.meteor/packages
@@ -3,23 +3,23 @@
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # but you can also edit it by hand.
 
-meteor-base
-mobile-experience
-mongo
-reactive-var
+meteor-base@1.4.0
+mobile-experience@1.0.5
+mongo@1.6.0
+reactive-var@1.0.11
 
-standard-minifier-css
-standard-minifier-js
-es5-shim
-ecmascript
-shell-server
+standard-minifier-css@1.5.2
+standard-minifier-js@2.4.0
+es5-shim@4.8.0
+ecmascript@0.12.4
+shell-server@0.4.0
 
 static-html
 react-meteor-data
-http
-session
-tracker
-check
+http@1.4.1
+session@1.2.0
+tracker@1.2.0
+check@1.3.1
 jquery
 
 nathantreid:css-modules@=3.1.4
diff --git a/bigbluebutton-html5/.meteor/release b/bigbluebutton-html5/.meteor/release
index 2299ae70d95537b4a520d309fe34c4324b1d3eb5..91e05fc15b2fe549aa40d455e48972c2218faecf 100644
--- a/bigbluebutton-html5/.meteor/release
+++ b/bigbluebutton-html5/.meteor/release
@@ -1 +1 @@
-METEOR@1.8.0.1
+METEOR@1.8.0.2
diff --git a/bigbluebutton-html5/.meteor/versions b/bigbluebutton-html5/.meteor/versions
index 5b0d886693cfe6a7b19cf02aeee58470d43729fb..6a0728f210d663752b520be3e981edd13a8457cc 100644
--- a/bigbluebutton-html5/.meteor/versions
+++ b/bigbluebutton-html5/.meteor/versions
@@ -1,6 +1,6 @@
 allow-deny@1.1.0
 autoupdate@1.5.0
-babel-compiler@7.2.3
+babel-compiler@7.2.4
 babel-runtime@1.3.0
 base64@1.0.11
 binary-heap@1.0.11
@@ -21,7 +21,7 @@ ddp-server@2.2.0
 deps@1.0.12
 diff-sequence@1.1.1
 dynamic-import@0.5.0
-ecmascript@0.12.3
+ecmascript@0.12.4
 ecmascript-runtime@0.7.0
 ecmascript-runtime-client@0.8.0
 ecmascript-runtime-server@0.7.1
@@ -56,7 +56,7 @@ mongo-id@1.0.7
 nathantreid:css-modules@3.1.4
 npm-mongo@3.1.1
 ordered-dict@1.1.0
-promise@0.11.1
+promise@0.11.2
 random@1.1.0
 react-meteor-data@0.2.16
 reactive-dict@1.2.1
diff --git a/bigbluebutton-html5/imports/ui/components/tooltip/component.jsx b/bigbluebutton-html5/imports/ui/components/tooltip/component.jsx
index 37effb56735ce3265a8ea654cc779c02e03947d2..f8db150f65c721427ceeb3158553e57313af1667 100755
--- a/bigbluebutton-html5/imports/ui/components/tooltip/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/tooltip/component.jsx
@@ -29,7 +29,16 @@ class Tooltip extends Component {
     const expandedEl = tooltipTarget.parentElement.querySelector('[aria-expanded="true"]');
     const isTarget = expandedEl === tooltipTarget;
     if (expandedEl && !isTarget) return;
-    tip.set({ content: tooltipTarget.lastChild.innerText });
+
+    const findLabel = (node) => {
+      const { nodeName, lastChild, parentElement } = node;
+      if (nodeName.toLowerCase() === 'button') return lastChild.innerText;
+      return findLabel(parentElement);
+    };
+    const label = findLabel(tooltipTarget);
+    if (label) tip.set({ content: label });
+    // if we are not able to get the text, the default content is used
+
     tip.show();
   }