diff --git a/core/src/main/resources/hudson/PluginManager/_table.css b/core/src/main/resources/hudson/PluginManager/_table.css
index f965ac727848e61083dd62d582cb744e6d6a7d68..2ffc6ea39fc3c22d144d90ad056f00d61bd9adb8 100644
--- a/core/src/main/resources/hudson/PluginManager/_table.css
+++ b/core/src/main/resources/hudson/PluginManager/_table.css
@@ -15,14 +15,28 @@ time {
     margin-top: 0.25em;
 }
 
-.plugin-manager__category-label {
+.plugin-manager__category-label:link,
+.plugin-manager__category-label:visited {
     display: inline-block;
     border: 1px solid #ccc;
-    background-color: #eee;
+    background-color: #fbfbfb;
+    color: #333;
     border-radius: 4px;
     font-size: 0.75rem;
+    font-weight: 500;
     padding: 0 0.5rem;
     margin: 0 0.25rem 0.25rem 0;
+    text-decoration: none;
+    text-align: center;
+    white-space: nowrap;
+    vertical-align: baseline;
+    transition: all 0.15s ease-in-out;
+}
+.plugin-manager__category-label:hover,
+.plugin-manager__category-label:focus,
+.plugin-manager__category-label:active {
+    background-color: #f2f2f2;
+    border-color:  #333;
 }
 
 .plugin-manager__search-input {
diff --git a/core/src/main/resources/hudson/PluginManager/table.jelly b/core/src/main/resources/hudson/PluginManager/table.jelly
index fb27209d35e0aec94cb471a86a3d951fb714d8d4..312230042ae99e3fd2709946e7c1421510477753 100644
--- a/core/src/main/resources/hudson/PluginManager/table.jelly
+++ b/core/src/main/resources/hudson/PluginManager/table.jelly
@@ -104,11 +104,10 @@ THE SOFTWARE.
                         <div class="plugin-manager__categories">
                           <j:forEach var="label" items="${p.categories}">
                             <j:if test="${!it.isMetaLabel(label)}">
-                              <span class="plugin-manager__category-label">
-                                <a href="?filter=${app.updateCenter.getCategoryDisplayName(label)}">
-                                  ${app.updateCenter.getCategoryDisplayName(label)}
-                                </a>
-                              </span>
+                              <a href="?filter=${app.updateCenter.getCategoryDisplayName(label)}"
+                                 class="plugin-manager__category-label">
+                                ${app.updateCenter.getCategoryDisplayName(label)}
+                              </a>
                             </j:if>
                           </j:forEach>
                         </div>