diff --git a/application/views/scripts/pivottablePagination.phtml b/application/views/scripts/pivottablePagination.phtml
index 832cba0ef..0b4c7420e 100644
--- a/application/views/scripts/pivottablePagination.phtml
+++ b/application/views/scripts/pivottablePagination.phtml
@@ -6,6 +6,7 @@ if ($xAxisPaginator->count() <= 1 && $yAxisPaginator->count() <= 1) {
     return; // Display this pagination only if there are multiple pages
 }
 
+$fromTo = $this->translate('%s: %d to %d of %d');
 $xAxisPages = $xAxisPaginator->getPages('all');
 $yAxisPages = $yAxisPaginator->getPages('all');
 
@@ -22,7 +23,21 @@ $yAxisPages = $yAxisPaginator->getPages('all');
 <?php if ($xAxisPage !== $xAxisPages->current || $yAxisPage !== $yAxisPages->current): ?>
                     <a href="<?= Url::fromRequest()->overwriteParams(
                         array('page' => $xAxisPage . ',' . $yAxisPage)
-                    )->getAbsoluteUrl(); ?>" title="<?= $xAxisPage . ',' . $yAxisPage; ?>"></a>
+                    )->getAbsoluteUrl(); ?>" title="<?= sprintf(
+                        $fromTo,
+                        $this->translate('Hosts'),
+                        ($yAxisPage - 1) * $yAxisPages->itemCountPerPage + 1,
+                        $yAxisPage === $yAxisPages->last ? $yAxisPages->totalItemCount : $yAxisPage * $yAxisPages->itemCountPerPage,
+                        $yAxisPages->totalItemCount
+                    ) . '; ' . sprintf(
+                        $fromTo,
+                        $this->translate('Services'),
+                        ($xAxisPage - 1) * $xAxisPages->itemCountPerPage + 1,
+                        $xAxisPage === $xAxisPages->last ? $xAxisPages->totalItemCount : $xAxisPage * $xAxisPages->itemCountPerPage,
+                        $xAxisPages->totalItemCount
+                    ); ?>"></a>
+<?php else: ?>
+                    &nbsp;
 <?php endif ?>
                 </td>
 <?php endforeach ?>
diff --git a/modules/monitoring/application/views/scripts/list/servicematrix.phtml b/modules/monitoring/application/views/scripts/list/servicematrix.phtml
index 612b01990..dac296f46 100644
--- a/modules/monitoring/application/views/scripts/list/servicematrix.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicematrix.phtml
@@ -22,9 +22,17 @@
         <thead>
             <tr>
                 <th>&nbsp;</th>
+                <th colspan="<?= count($serviceStates); ?>">
+                    <div>
 <?php foreach (array_keys($serviceStates) as $service_description): ?>
-                <th><span><?= $service_description; ?></span></th>
+                        <span>
+                            <abbr title="<?= $service_description; ?>">
+                                <?= strlen($service_description) > 18 ? substr($service_description, 0, 18) . '...' : $service_description; ?>
+                            </abbr>
+                        </span>
 <?php endforeach ?>
+                    </div>
+                </th>
             </tr>
         </thead>
         <tbody>
@@ -39,14 +47,14 @@
                 </th>
 <?php foreach (array_values($serviceStates) as $service): ?>
 <?php if ($service !== null): ?>
-                <td class="state_<?= $this->monitoringState($service, 'service'); ?> <?= $service->service_handled ? 'handled' : ''; ?>">
+                <td>
                     <a href="<?= $this->href(
                         'monitoring/show/service',
                         array(
                             'host'      => $service->host_name,
                             'service'   => $service->service_description
                         )
-                    ); ?>" title="<?= $this->escape($service->service_output); ?>"></a>
+                    ); ?>" title="<?= $this->escape($service->service_output); ?>" class="state_<?= $this->monitoringState($service, 'service'); ?> <?= $service->service_handled ? 'handled' : ''; ?>"></a>
 <?php else: ?>
                 <td>
                     &centerdot;
diff --git a/public/css/icinga/monitoring-colors.less b/public/css/icinga/monitoring-colors.less
index 6ab287ae7..b2a7b8f3a 100644
--- a/public/css/icinga/monitoring-colors.less
+++ b/public/css/icinga/monitoring-colors.less
@@ -507,8 +507,6 @@ div.pivot-pagination {
   margin: 1em;
 
   table {
-    width: 1px; // Ensures that its cells are really of fixed width
-    table-layout: fixed;
     border-spacing: 0.2em;
     border-collapse: separate;
     border: 1px solid LightGrey;
@@ -516,8 +514,7 @@ div.pivot-pagination {
 
     td {
       padding: 0;
-      width: 1.7em;
-      height: 1.7em;
+      line-height: 1em;
       background-color: #fbfbfb;
 
       &:hover, &.active {
@@ -525,63 +522,65 @@ div.pivot-pagination {
       }
 
       a {
-        padding: 10% 50%;
+        width: 16px;
+        height: 16px;
+        display: block;
       }
     }
   }
 }
 
 table.pivot {
-  width: 1px; // Ensures that its cells are really of fixed width
-  table-layout: fixed;
-  border-spacing: 0.2em;
-  border-collapse: separate;
-
-  th, td {
-    width: 0.5em;
-  }
-
   thead {
     th {
       height: 6em;
-      padding: 0 0 1em 1.4em;
-      vertical-align: bottom;
+      padding: 2px;
+      position: relative;
 
-      &:first-of-type {
-        width: 4em;
-      }
+      div {
+        top: 2px;
+        left: 2px;
+        right: -1.5em;
+        position: absolute;
+        padding-left: 1.2em;
 
-      span {
-        font-size: 0.8em;
-        line-height: 2.4em;
-        white-space: nowrap;
-        display: inline-block;
+        span {
+          width: 1.5em;
+          margin-right: 4px;
+          margin-top: 4em;
+          line-height: 2em;
+          white-space: nowrap;
+          display: block;
+          float: left;
 
-        transform: rotate(-45deg);
-        transform-origin: bottom left;
-        -o-transform: rotate(-45deg);
-        -o-transform-origin: bottom left;
-        -ms-transform: rotate(-45deg);
-        -ms-transform-origin: bottom left;
-        -moz-transform: rotate(-45deg);
-        -moz-transform-origin: bottom left;
-        -webkit-transform: rotate(-45deg);
-        -webkit-transform-origin: bottom left;
-        filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
+          transform: rotate(-45deg);
+          transform-origin: bottom left;
+          -o-transform: rotate(-45deg);
+          -o-transform-origin: bottom left;
+          -ms-transform: rotate(-45deg);
+          -ms-transform-origin: bottom left;
+          -moz-transform: rotate(-45deg);
+          -moz-transform-origin: bottom left;
+          -webkit-transform: rotate(-45deg);
+          -webkit-transform-origin: bottom left;
+          filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
+
+          abbr {
+            font-size: 0.8em;
+          }
+        }
       }
     }
   }
 
   tbody {
     th {
-      width: 4em;
-      font-size: 0.8em;
-      line-height: 2.2em;
-      padding-right: 1.2em;
+      padding: 0 14px 0 0;
 
       a {
-        color: black;
+        font-size: 0.8em;
         text-decoration: none;
+        color: black;
 
         &:hover {
           color: #666;
@@ -590,43 +589,47 @@ table.pivot {
     }
 
     td {
-      padding: 0;
+      min-width: 1.5em;
+      min-height: 1.5em;
+      padding: 2px;
       text-align: center;
-      border-radius: 0.5em;
 
       a {
-        padding: 20% 50%;
-      }
+        width: 1.5em;
+        height: 1.5em;
+        display: block;
+        border-radius: 0.5em;
 
-      &.state_ok {
-        background-color: @colorOk;
-      }
-
-      &.state_pending {
-        background-color: @colorPending;
-      }
-
-      &.state_warning {
-        background-color: @colorWarning;
-
-        &.handled {
-          background-color: @colorWarningHandled;
+        &.state_ok {
+          background-color: @colorOk;
         }
-      }
 
-      &.state_critical {
-        background-color: @colorCritical;
-
-        &.handled {
-          background-color: @colorCriticalHandled;
+        &.state_pending {
+          background-color: @colorPending;
         }
-      }
 
-      &.state_unknown {
-        background-color: @colorUnknown;
+        &.state_warning {
+          background-color: @colorWarning;
 
-        &.handled {
-          background-color: @colorUnknownHandled;
+          &.handled {
+            background-color: @colorWarningHandled;
+          }
+        }
+
+        &.state_critical {
+          background-color: @colorCritical;
+
+          &.handled {
+            background-color: @colorCriticalHandled;
+          }
+        }
+
+        &.state_unknown {
+          background-color: @colorUnknown;
+
+          &.handled {
+            background-color: @colorUnknownHandled;
+          }
         }
       }
     }