diff --git a/doc/Icinga-Design/documentation.html b/doc/Icinga-Design/documentation.html
index fc9cd9897..3e2ff269a 100644
--- a/doc/Icinga-Design/documentation.html
+++ b/doc/Icinga-Design/documentation.html
@@ -113,6 +113,7 @@
               </a>
           </span>          
           <div>
+
           <b>Up</b><br />
             Since&nbsp;
             30.09.
diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index bbea98652..b6f5fc0a5 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -116,7 +116,9 @@ class Monitoring_ListController extends MonitoringController
                 'host_notes_url',
                 'host_last_comment',
                 'host_active_checks_enabled',
-                'host_passive_checks_enabled'
+                'host_passive_checks_enabled',
+                'host_current_check_attempt',
+                'host_max_check_attempts'
             )
         )->getQuery();
         $this->view->hosts = $query->paginate();
diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index 2374e72d1..f795aa7a6 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -15,37 +15,42 @@ $viewHelper = $this->getHelper('MonitoringState');
     <tr>
       <th colspan="3">Status</th>
       <th>Host</th>
-      <th>Output</th>
     </tr>
     </thead>
     <tbody>
 
     <?php foreach($hosts as $host): ?>
+      <?php $hostStateName = strtolower($this->util()->getHostStateName($host->host_state)); ?>
       <?php $hostLink = $this->href('monitoring/show/host', array('host' => $host->host_name)); ?>
       <tr <?= ($this->activeRowHref === $hostLink) ? 'class="active"' : ''; ?> >
-        <td>
+
+        <!-- Color column -->
+        <td class="tacheader-status-<?= $hostStateName; ?>">
           <a style="visibility:hidden" href="<?= $hostLink; ?>"></a>
+          <!--
           <?php if ($host->host_icon_image) : ?>
             <img src="<?= $host->host_icon_image; ?>"/>
           <?php endif; ?>
+          -->
         </td>
 
+        <!-- Icons -->
         <td>
           <?php if (!$host->host_handled && $host->host_state > 0): ?>
           <a href="#" title="Unhandled">
-            <i>{{UNHANDLED_ICON}}</i>
+            <i class="icon-table icinga-icon-unhandled"></i>
           </a>
           <?php endif; ?>
 
           <?php if ($host->host_acknowledged && !$host->host_in_downtime): ?>
           <a href="#" title="Acknowledged">
-            <i>{{ACKNOWLEDGED_ICON}}</i>
+            <i class="icon-table icinga-icon-acknowledgement"></i>
           </a>
           <?php endif; ?>
 
           <?php if ($host->host_is_flapping): ?>
           <a href="#" title="Flapping">
-            <i>{{FLAPPING_ICON}}</i>
+              <i class="icon-table icinga-icon-flapping"></i>
           </a>
           <?php endif; ?>
 
@@ -57,7 +62,7 @@ $viewHelper = $this->getHelper('MonitoringState');
 
           <?php if ($host->host_in_downtime): ?>
           <a href="#" title="In Downtime">
-            <i>{{IN_DOWNTIME_ICON}}</i>
+              <i class="icon-table icinga-icon-in-downtime"></i>
           </a>
           <?php endif; ?>
 
@@ -68,43 +73,38 @@ $viewHelper = $this->getHelper('MonitoringState');
               </a>
             <?php else: ?>
               <a href="#" title="Active Checks Disabled">
-               <i>{{ACTIVE_CHECKS_DISABLED_ICON}}</i>
+                  <i class="icon-table icinga-icon-disabled"></i>
               </a>
             <?php endif; ?>
           <?php endif; ?>
 
           <?php if ($host->host_last_comment !== null): ?>
           <a href="#" title="Comments">
-            <i>{{COMMENT_ICON}}</i>
+              <i class="icon-table icinga-icon-comment"></i>
           </a>
           <?php endif; ?>
         </td>
 
+        <!-- State -->
         <td title="<?= $viewHelper->getStateTitle($host, 'host'); ?>">
           <div>
-            <?php if ($host->host_state_type == 0): ?>
-            <a href="#" title="Soft State">
-              <i>{{SOFTSTATE_ICON}}</i>
-            </a>
-            <?php endif; ?>
-            <b><?= ucfirst($viewHelper->monitoringState($host, 'host')); ?></b>
-            Since&nbsp;
-            <?= $this->timeSince($host->host_last_state_change); ?>
-          </div>
-        </td>
-
-        <td>
-          <?php if ($host->host_unhandled_service_count): ?>
-            <span class="badge pull-right">
+            <?php if ($host->host_unhandled_service_count): ?>
+              <span class="badge pull-right">
               <a href="<?= $this->href('monitoring/list/services', array('host' => $host->host_name, 'service_problems' => 1)); ?>">
                 <?= $host->host_unhandled_service_count; ?>
               </a>
             </span>
-          <?php endif; ?>
+            <?php endif; ?>
 
+            <b><?= ucfirst($viewHelper->monitoringState($host, 'host')); ?></b><br />Since
+            <?= $this->timeSince($host->host_last_state_change); ?> (<?= $host->host_current_check_attempt; ?>/<?= $host->host_max_check_attempts; ?>)
+          </div>
+        </td>
+
+        <!-- Host / Status / Output -->
+        <td>
           <a href="<?= $this->href('monitoring/list/services', array('host' => $host->host_name)) ?>">
-            <b><?= $host->host_name ?></b><br/>
-            <i><?= $host->host_address ?></i>
+            <b><?= $host->host_name ?></b> (<i><?= $host->host_address ?></i>)
           </a>
 
           <?php if (!empty($host->host_action_url)): ?>
@@ -113,10 +113,8 @@ $viewHelper = $this->getHelper('MonitoringState');
           <?php if (!empty($host->host_notes_url)): ?>
             <a href="<?= $host->host_notes_url; ?>">Notes</a>
           <?php endif; ?>
-        </td>
 
-        <td>
-          <?= $this->escape(substr(strip_tags($host->host_output), 0, 10000)); ?>
+          <br /><?= $this->escape(substr(strip_tags($host->host_output), 0, 10000)); ?>
         </td>
       </tr>
     <?php endforeach; ?>
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
index 9c4c700ac..8738f3e3d 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
@@ -41,6 +41,8 @@ class HoststatusQuery extends AbstractQuery
             'host_last_time_up'           => 'hs.last_time_up',
             'host_last_time_down'         => 'hs.last_time_down',
             'host_last_time_unreachable'  => 'hs.last_time_unreachable',
+            'host_current_check_attempt'  => 'hs.current_check_attempt',
+            'host_max_check_attempts'     => 'hs.max_check_attempts',
 
             'host_severity' => 'CASE WHEN hs.current_state = 0
             THEN
diff --git a/modules/monitoring/library/Monitoring/Object/Host.php b/modules/monitoring/library/Monitoring/Object/Host.php
index 59f32cf32..4b1c275b1 100644
--- a/modules/monitoring/library/Monitoring/Object/Host.php
+++ b/modules/monitoring/library/Monitoring/Object/Host.php
@@ -59,8 +59,8 @@ class Host extends AbstractObject
             'event_handler_enabled'     => 'host_event_handler_enabled',
             'flap_detection_enabled'    => 'host_flap_detection_enabled',
             'active_checks_enabled'     => 'host_active_checks_enabled',
-            'current_check_attempt' => 'host_current_check_attempt',
-            'max_check_attempts'    => 'host_max_check_attempts',
+            'current_check_attempt'     => 'host_current_check_attempt',
+            'max_check_attempts'        => 'host_max_check_attempts'
             'last_notification' => 'host_last_notification',
             'current_notification_number'   => 'host_current_notification_number',
             'percent_state_change' => 'host_percent_state_change',
diff --git a/modules/monitoring/library/Monitoring/View/HoststatusView.php b/modules/monitoring/library/Monitoring/View/HoststatusView.php
index b2c0aa1e6..ae499b455 100644
--- a/modules/monitoring/library/Monitoring/View/HoststatusView.php
+++ b/modules/monitoring/library/Monitoring/View/HoststatusView.php
@@ -37,6 +37,8 @@ class HoststatusView extends AbstractView
         'host_last_time_up',
         'host_last_time_down',
         'host_last_time_unreachable',
+        'host_current_check_attempt',
+        'host_max_check_attempts',
 
         // Services
         'services_cnt',
diff --git a/public/css/icons.css b/public/css/icons.css
new file mode 100644
index 000000000..f5508b888
--- /dev/null
+++ b/public/css/icons.css
@@ -0,0 +1,104 @@
+
+.icinga-icon-acknowledgement {
+    background: transparent url("../img/images/acknowledgement.png") center center no-repeat;
+    display: inline-block;
+    width: 16px;
+    height: 16px;
+}
+
+.icinga-icon-comment {
+    background: transparent url("../img/images/comment.png") center center no-repeat;
+    display: inline-block;
+    width: 16px;
+    height: 16px;
+}
+
+.icinga-icon-create {
+    background: transparent url("../img/images/create.png") center center no-repeat;
+    display: inline-block;
+    width: 16px;
+    height: 16px;
+}
+
+.icinga-icon-dashboard {
+    background: transparent url("../img/images/dashboard.png") center center no-repeat;
+    display: inline-block;
+    width: 16px;
+    height: 16px;
+}
+
+.icinga-icon-disabled {
+    background: transparent url("../img/images/disabled.png") center center no-repeat;
+    display: inline-block;
+    width: 16px;
+    height: 16px;
+}
+.icinga-icon-edit {
+    background: transparent url("../img/images/edit.png") center center no-repeat;
+    display: inline-block;
+    width: 16px;
+    height: 16px;
+}
+
+.icinga-icon-error {
+    background: transparent url("../img/images/error.png") center center no-repeat;
+    display: inline-block;
+    width: 16px;
+    height: 16px;
+}
+
+.icinga-icon-flapping {
+    background: transparent url("../img/images/flapping.png") center center no-repeat;
+    display: inline-block;
+    width: 16px;
+    height: 16px;
+}
+
+.icinga-icon-in-downtime {
+    background: transparent url("../img/images/in_downtime.png") center center no-repeat;
+    display: inline-block;
+    width: 16px;
+    height: 16px;
+}
+
+.icinga-icon-remove {
+    background: transparent url("../img/images/remove.png") center center no-repeat;
+    display: inline-block;
+    width: 16px;
+    height: 16px;
+}
+
+.icinga-icon-save {
+    background: transparent url("../img/images/save.png") center center no-repeat;
+    display: inline-block;
+    width: 16px;
+    height: 16px;
+}
+
+.icinga-icon-service {
+    background: transparent url("../img/images/service.png") center center no-repeat;
+    display: inline-block;
+    width: 16px;
+    height: 16px;
+}
+
+.icinga-icon-submit {
+    background: transparent url("../img/images/submit.png") center center no-repeat;
+    display: inline-block;
+    width: 16px;
+    height: 16px;
+}
+
+.icinga-icon-unhandled {
+    background: transparent url("../img/images/unhandled.png") center center no-repeat;
+    display: inline-block;
+    width: 16px;
+    height: 16px;
+}
+
+.icinga-icon-user {
+    background: transparent url("../img/images/user.png") center center no-repeat;
+    display: inline-block;
+    width: 16px;
+    height: 16px;
+}
diff --git a/public/css/main.css b/public/css/main.css
index fe8017166..2c1c64bd1 100644
--- a/public/css/main.css
+++ b/public/css/main.css
@@ -1,3 +1,5 @@
+@import url("icons.css");
+
 body { padding-top: 70px; }
 
 .load-indicator .mask {
@@ -298,7 +300,7 @@ select.input-sm {
 }
 
 .tacheader-status-ok {
-    background-color: #00CC33;
+    /* background-color: #00CC33; */
 }
 
 .tacheader-status-warning {
@@ -320,7 +322,7 @@ select.input-sm {
 }
 
 .tacheader-status-up {
-    background-color: #00CC33;
+    /* background-color: #00CC33; */
 }
 
 
diff --git a/public/img/images/acknowledgement.png b/public/img/images/acknowledgement.png
new file mode 100644
index 000000000..eb03d2db9
Binary files /dev/null and b/public/img/images/acknowledgement.png differ
diff --git a/public/img/images/comment.png b/public/img/images/comment.png
new file mode 100644
index 000000000..b7d88a0ac
Binary files /dev/null and b/public/img/images/comment.png differ
diff --git a/public/img/images/create.png b/public/img/images/create.png
new file mode 100644
index 000000000..b9bedf82a
Binary files /dev/null and b/public/img/images/create.png differ
diff --git a/public/img/images/dashboard.png b/public/img/images/dashboard.png
new file mode 100644
index 000000000..e5f9c09f3
Binary files /dev/null and b/public/img/images/dashboard.png differ
diff --git a/public/img/images/disabled.png b/public/img/images/disabled.png
new file mode 100644
index 000000000..54d036410
Binary files /dev/null and b/public/img/images/disabled.png differ
diff --git a/public/img/images/edit.png b/public/img/images/edit.png
new file mode 100644
index 000000000..00d8e291f
Binary files /dev/null and b/public/img/images/edit.png differ
diff --git a/public/img/images/error.png b/public/img/images/error.png
new file mode 100644
index 000000000..62458999f
Binary files /dev/null and b/public/img/images/error.png differ
diff --git a/public/img/images/flapping.png b/public/img/images/flapping.png
new file mode 100644
index 000000000..4b253e09c
Binary files /dev/null and b/public/img/images/flapping.png differ
diff --git a/public/img/images/in_downtime.png b/public/img/images/in_downtime.png
new file mode 100644
index 000000000..d609df62e
Binary files /dev/null and b/public/img/images/in_downtime.png differ
diff --git a/public/img/images/remove.png b/public/img/images/remove.png
new file mode 100644
index 000000000..98ada7447
Binary files /dev/null and b/public/img/images/remove.png differ
diff --git a/public/img/images/save.png b/public/img/images/save.png
new file mode 100644
index 000000000..2db271920
Binary files /dev/null and b/public/img/images/save.png differ
diff --git a/public/img/images/service.png b/public/img/images/service.png
new file mode 100644
index 000000000..9df3b4840
Binary files /dev/null and b/public/img/images/service.png differ
diff --git a/public/img/images/submit.png b/public/img/images/submit.png
new file mode 100644
index 000000000..40e482600
Binary files /dev/null and b/public/img/images/submit.png differ
diff --git a/public/img/images/unhandled.png b/public/img/images/unhandled.png
new file mode 100644
index 000000000..59dab8445
Binary files /dev/null and b/public/img/images/unhandled.png differ
diff --git a/public/img/images/user.png b/public/img/images/user.png
new file mode 100644
index 000000000..694ddfcd6
Binary files /dev/null and b/public/img/images/user.png differ