diff --git a/src/main/resources/font-awesome/svg-icon.jelly b/src/main/resources/font-awesome/svg-icon.jelly
index dc6c63b..645e060 100644
--- a/src/main/resources/font-awesome/svg-icon.jelly
+++ b/src/main/resources/font-awesome/svg-icon.jelly
@@ -25,12 +25,9 @@
 
   <j:choose>
     <j:when test="${tooltip != null and size(tooltip) > 0}">
-      <span class="fa-tooltip">
-        <span class="jenkins-tooltip">${tooltip}</span>
-        <svg class="fa-svg-icon ${class}">
-          <use href="${resURL}/plugin/font-awesome-api/sprites/${prefix != null ? prefix : 'solid'}.svg#${name}"/>
-        </svg>
-      </span>
+      <svg tooltip="${tooltip}" class="fa-svg-icon ${class}">
+        <use href="${resURL}/plugin/font-awesome-api/sprites/${prefix != null ? prefix : 'solid'}.svg#${name}"/>
+      </svg>
     </j:when>
     <j:otherwise>
       <svg class="fa-svg-icon ${class}">
diff --git a/src/main/webapp/css/jenkins-style.css b/src/main/webapp/css/jenkins-style.css
index f77d60d..69bb584 100644
--- a/src/main/webapp/css/jenkins-style.css
+++ b/src/main/webapp/css/jenkins-style.css
@@ -2,24 +2,6 @@
     --fa-image-color: #b4b4b4;
 }
 
-.fa-tooltip {
-    position: relative;
-    display: inline-block;
-    font-weight: normal;
-}
-
-.fa-tooltip .jenkins-tooltip {
-    visibility: hidden;
-    position: absolute;
-    top: 105%;
-    left: 105%;
-    width: 15em;
-}
-
-.fa-tooltip:hover .jenkins-tooltip {
-    visibility: visible;
-}
-
 /* ------------------------------------------------------------------------------------------------------------------- */
 /* A small image button                                                                                                */
 /* ------------------------------------------------------------------------------------------------------------------- */