diff --git a/src/js/i18n.js b/src/js/i18n.js
index 66d4becad988d..c4ef90cd81a15 100644
--- a/src/js/i18n.js
+++ b/src/js/i18n.js
@@ -165,7 +165,7 @@ vAPI.i18n.render = function(context) {
                    .replace(/<br>/g, '\n')
                    .replace(/\n{3,}/g, '\n\n');
         elem.setAttribute('data-tip', text);
-        if ( elem.getAttribute('aria-label') === 'data-i18n-tip' ) {
+        if ( elem.getAttribute('aria-label') === 'data-tip' ) {
             elem.setAttribute('aria-label', text);
         }
     }
diff --git a/src/popup.html b/src/popup.html
index e36e0327d1bd0..522d1814d8ba8 100644
--- a/src/popup.html
+++ b/src/popup.html
@@ -17,8 +17,8 @@
         <p id="basicTools">
             <span id="gotoZap" class="fa tool" data-i18n-tip="popupTipZapper" data-tip-position="under">&#xf0e7;</span>
             <span id="gotoPick" class="fa tool" data-i18n-tip="popupTipPicker" data-tip-position="under">&#xf1fb;</span>
-            <a href="logger-ui.html" class="fa tool enabled" aria-label="data-i18n-tip" data-i18n-tip="popupTipLog" data-tip-position="under" target="uBOLogger" tabindex="0">&#xf022;</a>
-            <a href="dashboard.html" class="fa tool enabled" aria-label="data-i18n-tip" data-i18n-tip="popupTipDashboard" data-tip-position="under" target="uBODashboard" tabindex="0">&#xf1de;</a>
+            <a href="logger-ui.html" class="fa tool enabled" aria-label="data-tip" data-i18n-tip="popupTipLog" data-tip-position="under" target="uBOLogger" tabindex="0">&#xf022;</a>
+            <a href="dashboard.html" class="fa tool enabled" aria-label="data-tip" data-i18n-tip="popupTipDashboard" data-tip-position="under" target="uBODashboard" tabindex="0">&#xf1de;</a>
         </p>
         <h2 id="dfToggler" data-i18n="popupBlockedRequestPrompt">&nbsp;</h2>
         <p class="statName">