diff --git a/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix.jelly b/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix.jelly
index ca386eeb..21097a95 100644
--- a/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix.jelly
+++ b/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix.jelly
@@ -33,13 +33,15 @@ THE SOFTWARE.
       <j:choose>
         <j:when test="${b==null}">
           <l:icon src="symbol-status-nobuilt" class="icon-md" tooltip="${%Not run}" alt="${%Not run}"/>
-          ${%Not run}
         </j:when>
         <j:otherwise>
-          <a href="${p.nearestRunUrl}" class="model-link inside">
-            <l:icon src="symbol-status-${b.iconColor.iconName}" class="icon-md" tooltip="${h.xmlEscape(p.tooltip)} ${it.number!=b.number?(it.isBuilding()?'- pending' : '- skipped'):''}" alt="${p.tooltip}" style="vertical-align: middle; ${it.number!=b.number?'opacity:0.5':''}"/>
+          <a href="${p.nearestRunUrl}" class="model-link inside"
+             tooltip="${h.xmlEscape(p.tooltip)} ${it.number!=b.number?(it.isBuilding()?'- pending' : '- skipped'):''}"
+             data-tooltip-append-to-parent="true"
+             style="${it.number!=b.number?'opacity:0.5':''}">
+            <l:icon src="symbol-status-${b.iconColor.iconName}" class="icon-md" alt="${p.tooltip}"/>
             <j:if test="${empty(o.x) and empty(o.y)}">
-              ${p.combination.toString(o.z)}
+              <span class="jenkins-!-margin-left-1">${p.combination.toString(o.z)}</span>
             </j:if>
           </a>
         </j:otherwise>
diff --git a/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix.jelly b/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix.jelly
index 1be35bcf..001f7d9c 100644
--- a/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix.jelly
+++ b/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix.jelly
@@ -32,7 +32,6 @@ THE SOFTWARE.
       <j:choose>
         <j:when test="${p==null}">
           <l:icon src="symbol-status-nobuilt" class="icon-md" tooltip="${%Not configured}" alt="${%Not configured}"/>
-          ${%Not configured}
         </j:when>
         <j:otherwise>
           <a href="${p.shortUrl}" class="model-link inside" style="vertical-align: middle">
diff --git a/src/main/resources/lib/hudson/matrix-project/matrix.jelly b/src/main/resources/lib/hudson/matrix-project/matrix.jelly
index a9726d2e..0bf1c040 100644
--- a/src/main/resources/lib/hudson/matrix-project/matrix.jelly
+++ b/src/main/resources/lib/hudson/matrix-project/matrix.jelly
@@ -53,7 +53,7 @@ THE SOFTWARE.
         </j:forEach>
       </j:when>
       <j:otherwise>
-        <table class="jenkins-table" id="configuration-matrix">
+        <table id="configuration-matrix">
           <!-- X-axis -->
           <j:forEach var="x" items="${o.x}" varStatus="loop">
             <tr class="matrix-row">