diff --git a/src/app/components/plugin-manager-component.js b/src/app/components/plugin-manager-component.js
index ea22814909..caf312b2b0 100644
--- a/src/app/components/plugin-manager-component.js
+++ b/src/app/components/plugin-manager-component.js
@@ -91,7 +91,7 @@ class PluginManagerComponent extends BaseApi {
       </button>`
 
     return yo`
-      <article class="list-group-item py-1" title="${displayName}" >
+      <article id="remixPluginManagerListItem_${name}" class="list-group-item py-1" title="${displayName}" >
         <div class="${css.row} justify-content-between align-items-center">
           <h6 class="${css.displayName}">${displayName}</h6>
           ${activationButton}
@@ -155,7 +155,7 @@ class PluginManagerComponent extends BaseApi {
       ? yo`
       <nav class="navbar navbar-expand-lg navbar-light bg-light justify-content-between align-items-center">
         <span class="navbar-brand">Inactive Modules</span>
-        <span class="badge badge-pill badge-primary">${inactives.length}</span>
+        <span class="badge badge-pill badge-primary" style = "cursor: default;">${inactives.length}</span>
       </nav>`
       : ''
 
diff --git a/src/app/components/vertical-icons.js b/src/app/components/vertical-icons.js
index 53b3a35186..8d7d4b068c 100644
--- a/src/app/components/vertical-icons.js
+++ b/src/app/components/vertical-icons.js
@@ -79,7 +79,8 @@ export class VerticalIcons {
       <div
         class="${css.icon}"
         onclick="${() => { this._iconClick(name) }}"
-        plugin="${name}" title="${title}" >
+        plugin="${name}"
+        title="${title}">
         <img class="image" src="${icon}" alt="${name}" />
       </div>`
     this.iconKind[kind || 'other'].appendChild(this.icons[name])
diff --git a/test-browser/helpers/contracts.js b/test-browser/helpers/contracts.js
index 949afb0217..36273b4080 100644
--- a/test-browser/helpers/contracts.js
+++ b/test-browser/helpers/contracts.js
@@ -142,17 +142,17 @@ function getAddressAtPosition (browser, index, callback) {
 }
 
 function testConstantFunction (browser, address, fnFullName, expectedInput, expectedOutput, cb) {
-  browser.waitForElementPresent('.instance button[title="' + fnFullName + '"]').perform(function (client, done) {
+  browser.waitForElementPresent('.instance button[plugin="' + fnFullName + '"]').perform(function (client, done) {
     client.execute(function () {
       document.querySelector('#runTabView').scrollTop = document.querySelector('#runTabView').scrollHeight
     }, [], function () {
       if (expectedInput) {
-        client.setValue('#runTabView input[title="' + expectedInput.types + '"]', expectedInput.values, function () {})
+        client.setValue('#runTabView input[plugin="' + expectedInput.types + '"]', expectedInput.values, function () {})
       }
       done()
     })
   })
-  .click('.instance button[title="' + fnFullName + '"]')
+  .click('.instance button[plugin="' + fnFullName + '"]')
   .pause(1000)
   .waitForElementPresent('#instance' + address + ' div[class^="contractActionsContainer"] div[class^="value"]')
   .scrollInto('#instance' + address + ' div[class^="contractActionsContainer"] div[class^="value"]')
diff --git a/test-browser/helpers/init.js b/test-browser/helpers/init.js
index cb7da2a19d..fc954aa166 100644
--- a/test-browser/helpers/init.js
+++ b/test-browser/helpers/init.js
@@ -21,10 +21,10 @@ function initModules (browser, callback) {
   .execute(function () {
     document.querySelector('div[id="pluginManager"]').scrollTop = document.querySelector('div[id="pluginManager"]').scrollHeight
   }, [], function () {
-    browser.click('#pluginManager article[title="solidity"] button')
-    .click('#pluginManager article[title="run"] button')
-    .click('#pluginManager article[title="solidityStaticAnalysis"] button')
-    .click('#pluginManager article[title="debugger"] button')
+    browser.click('#pluginManager article[id="remixPluginManagerListItem_solidity"] button')
+    .click('#pluginManager article[id="remixPluginManagerListItem_run"] button')
+    .click('#pluginManager article[id="remixPluginManagerListItem_solidityStaticAnalysis"] button')
+    .click('#pluginManager article[id="remixPluginManagerListItem_debugger"] button')
     .click('#icon-panel div[plugin="fileExplorers"]')
     .perform(() => { callback() })
   })