diff --git a/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix.jelly b/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix.jelly
index a67eda82..ca386eeb 100644
--- a/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix.jelly
+++ b/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix.jelly
@@ -36,8 +36,8 @@ THE SOFTWARE.
           ${%Not run}
         </j:when>
         <j:otherwise>
-          <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">
+            <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':''}"/>
             <j:if test="${empty(o.x) and empty(o.y)}">
               ${p.combination.toString(o.z)}
             </j:if>
diff --git a/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix.jelly b/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix.jelly
index 9e1c2fc0..1be35bcf 100644
--- a/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix.jelly
+++ b/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix.jelly
@@ -35,10 +35,10 @@ THE SOFTWARE.
           ${%Not configured}
         </j:when>
         <j:otherwise>
-          <l:icon src="symbol-status-${p.iconColor.iconName}" class="icon-md" tooltip="${p.iconColor.description}" alt="${p.iconColor.description}"/>
           <a href="${p.shortUrl}" class="model-link inside" style="vertical-align: middle">
+            <l:icon src="symbol-status-${p.iconColor.iconName}" class="icon-md" tooltip="${p.iconColor.description}" alt="${p.iconColor.description}"/>
             <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/lib/hudson/matrix-project/matrix.jelly b/src/main/resources/lib/hudson/matrix-project/matrix.jelly
index 5c81ab92..a9726d2e 100644
--- a/src/main/resources/lib/hudson/matrix-project/matrix.jelly
+++ b/src/main/resources/lib/hudson/matrix-project/matrix.jelly
@@ -53,19 +53,19 @@ THE SOFTWARE.
         </j:forEach>
       </j:when>
       <j:otherwise>
-        <table id="configuration-matrix">
+        <table class="jenkins-table" id="configuration-matrix">
           <!-- X-axis -->
           <j:forEach var="x" items="${o.x}" varStatus="loop">
             <tr class="matrix-row">
               <!-- space for Y-axis -->
               <j:if test="${!empty(o.y)}">
-                <td id="matrix-title" colspan="${size(o.y)}">${%Configuration Matrix}</td>
+                <th id="matrix-title" colspan="${size(o.y)}">${%Configuration Matrix}</th>
               </j:if>
               <j:forEach begin="1" end="${o.repeatX(loop.index)}">
                 <j:forEach var="v" items="${x.values}">
-                  <td class="matrix-header" colspan="${o.width(loop.index)}" tooltip="${h.xmlEscape(x.name)}">
-                    ${v}
-                  </td>
+                  <th class="matrix-header" colspan="${o.width(loop.index)}">
+                    <span tooltip="${h.xmlEscape(x.name)}">${v}</span>
+                  </th>
                 </j:forEach>
               </j:forEach>
             </tr>
@@ -76,8 +76,8 @@ THE SOFTWARE.
             <tr>
               <j:forEach var="y" items="${o.y}" varStatus="loop">
                 <j:if test="${r.drawYHeader(loop.index)!=null}">
-                  <td class="matrix-leftcolumn" rowspan="${o.height(loop.index)}" tooltip="${h.xmlEscape(y.name)}">
-                    ${r.drawYHeader(loop.index)}
+                  <td class="matrix-leftcolumn" rowspan="${o.height(loop.index)}">
+                    <span tooltip="${h.xmlEscape(y.name)}">${r.drawYHeader(loop.index)}</span>
                   </td>
                 </j:if>
               </j:forEach>