diff --git a/modules/monitoring/application/views/scripts/list/servicegroups.phtml b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
index 3c874fa03..fea6457e5 100644
--- a/modules/monitoring/application/views/scripts/list/servicegroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
@@ -1,4 +1,6 @@
-<?php if (! $this->compact): ?>
+<?php use Icinga\Module\Monitoring\Web\Widget\StateBadges;
+
+if (! $this->compact): ?>
 <div class="controls">
   <?= $this->tabs ?>
   <?= $this->sortBox ?>
@@ -36,216 +38,121 @@ foreach ($servicegroups as  $serviceGroup): ?>
           <?=  $serviceGroup->services_total ?>
         </td>
         <td>
-        <?php if ( $serviceGroup->services_ok): ?>
-          <span class="state ok">
-            <?= $this->qlink(
-               $serviceGroup->services_ok,
-              'monitoring/list/services',
-              array(
-                'service_state'     => 0,
-                'servicegroup_name' =>  $serviceGroup->servicegroup_name,
-                'sort'              => 'service_severity'
-              ),
-              array(
-                'title' => sprintf(
-                  $this->translatePlural(
-                    'List %s service that is currently in state OK in service group "%s"',
-                    'List %s services which are currently in state OK in service group "%s"',
-                     $serviceGroup->services_ok
+          <?php
+          $stateBadges = new StateBadges();
+          $stateBadges
+              ->setUrl('monitoring/list/services')
+              ->add(
+                  StateBadges::STATE_OK,
+                  $serviceGroup->services_ok,
+                  array(
+                      'service_state'     => 0,
+                      'servicegroup_name' => $serviceGroup->servicegroup_name,
+                      'sort'              => 'service_severity'
                   ),
-                   $serviceGroup->services_ok,
-                   $serviceGroup->servicegroup_alias
-                )
+                  'List %s service that is currently in state OK in service group "%s"',
+                  'List %s services which are currently in state OK in service group "%s"',
+                  array($serviceGroup->services_ok, $serviceGroup->servicegroup_alias)
               )
-            ) ?>
-          </span>
-        <?php endif ?>
-        <?php if ( $serviceGroup->services_critical_unhandled): ?>
-          <span class="state critical">
-            <?= $this->qlink(
-               $serviceGroup->services_critical_unhandled,
-              'monitoring/list/services',
-              array(
-                'service_state'         => 2,
-                'service_acknowledged'  => 0,
-                'service_in_downtime'   => 0,
-                'host_problem'          => 0,
-                'servicegroup_name'     =>  $serviceGroup->servicegroup_name,
-                'sort'                  => 'service_severity'
-              ),
-              array(
-                  'title' => sprintf(
-                  $this->translatePlural(
-                    'List %s service that is currently in state CRITICAL in service group "%s"',
-                    'List %s services which are currently in state CRITICAL in service group "%s"',
-                     $serviceGroup->services_critical_unhandled
+              ->add(
+                  StateBadges::STATE_CRITICAL,
+                  $serviceGroup->services_critical_unhandled,
+                  array(
+                      'service_state'         => 2,
+                      'service_acknowledged'  => 0,
+                      'service_in_downtime'   => 0,
+                      'host_problem'          => 0,
+                      'servicegroup_name'     => $serviceGroup->servicegroup_name,
+                      'sort'                  => 'service_severity'
                   ),
-                   $serviceGroup->services_critical_unhandled,
-                   $serviceGroup->servicegroup_alias
-                )
+                  'List %s service that is currently in state CRITICAL in service group "%s"',
+                  'List %s services which are currently in state CRITICAL in service group "%s"',
+                  array($serviceGroup->services_critical_unhandled, $serviceGroup->servicegroup_alias)
               )
-            ) ?>
-        <?php endif ?>
-          <?php if ( $serviceGroup->services_critical_handled): ?>
-            <span class="state critical handled">
-              <?= $this->qlink(
-                 $serviceGroup->services_critical_handled,
-                'monitoring/list/services',
-                array(
-                  'service_state'     => 2,
-                  'service_handled'   => 1,
-                  'servicegroup_name' =>  $serviceGroup->servicegroup_name,
-                  'sort'              => 'service_severity'
-                ),
-                array(
-                  'title' => sprintf(
-                    $this->translatePlural(
-                      'List %s service that is currently in state CRITICAL (Acknowledged) in service group "%s"',
-                      'List %s services which are currently in state CRITICAL (Acknowledged) in service group "%s"',
-                       $serviceGroup->services_critical_handled
-                    ),
-                     $serviceGroup->services_critical_handled,
-                     $serviceGroup->servicegroup_alias
-                  )
-                )
-              ) ?>
-            </span>
-          <?php endif ?>
-        <?php if ( $serviceGroup->services_critical_unhandled): ?>
-          </span>
-        <?php endif ?>
-        <?php if ( $serviceGroup->services_unknown_unhandled): ?>
-          <span class="state unknown">
-            <?= $this->qlink(
-               $serviceGroup->services_unknown_unhandled,
-              'monitoring/list/services',
-              array(
-                'service_state'         => 3,
-                'service_acknowledged'  => 0,
-                'service_in_downtime'   => 0,
-                'host_problem'          => 0,
-                'servicegroup_name'     =>  $serviceGroup->servicegroup_name,
-                'sort'                  => 'service_severity'
-              ),
-              array(
-                'title' => sprintf(
-                  $this->translatePlural(
-                    'List %s service that is currently in state UNKNOWN in service group "%s"',
-                    'List %s services which are currently in state UNKNOWN in service group "%s"',
-                     $serviceGroup->services_unknown_unhandled
+              ->add(
+                  StateBadges::STATE_CRITICAL_HANDLED,
+                  $serviceGroup->services_critical_handled,
+                  array(
+                      'service_state'     => 2,
+                      'service_handled'   => 1,
+                      'servicegroup_name' => $serviceGroup->servicegroup_name,
+                      'sort'              => 'service_severity'
                   ),
-                   $serviceGroup->services_unknown_unhandled,
-                   $serviceGroup->servicegroup_alias
-                )
+                  'List %s service that is currently in state CRITICAL (Acknowledged) in service group "%s"',
+                  'List %s services which are currently in state CRITICAL (Acknowledged) in service group "%s"',
+                  array($serviceGroup->services_critical_unhandled, $serviceGroup->servicegroup_alias)
               )
-            ) ?>
-        <?php endif ?>
-          <?php if ( $serviceGroup->services_unknown_handled): ?>
-            <span class="state unknown handled">
-              <?= $this->qlink(
-                 $serviceGroup->services_unknown_handled,
-                'monitoring/list/services',
-                array(
-                  'service_state'     => 3,
-                  'service_handled'   => 1,
-                  'servicegroup_name' =>  $serviceGroup->servicegroup_name,
-                  'sort'              => 'service_severity'
-                ),
-                array(
-                  'title' => sprintf(
-                    $this->translatePlural(
-                      'List %s service that is currently in state UNKNOWN (Acknowledged) in service group "%s"',
-                      'List %s services which are currently in state UNKNOWN (Acknowledged) in service group "%s"',
-                       $serviceGroup->services_unknown_handled
-                    ),
-                     $serviceGroup->services_unknown_handled,
-                     $serviceGroup->servicegroup_alias
-                  )
-                )
-              ) ?>
-            </span>
-          <?php endif ?>
-        <?php if ( $serviceGroup->services_unknown_unhandled): ?>
-          </span>
-        <?php endif ?>
-        <?php if ( $serviceGroup->services_warning_unhandled): ?>
-          <span class="state warning">
-            <?= $this->qlink(
-               $serviceGroup->services_warning_unhandled,
-              'monitoring/list/services',
-              array(
-                'service_state'         => 1,
-                'service_acknowledged'  => 0,
-                'service_in_downtime'   => 0,
-                'host_problem'          => 0,
-                'servicegroup_name'     =>  $serviceGroup->servicegroup_name,
-                'sort'                  => 'service_severity'
-              ),
-              array(
-                'title' => sprintf(
-                  $this->translatePlural(
-                    'List %s service that is currently in state WARNING in service group "%s"',
-                    'List %s services which are currently in state WARNING in service group "%s"',
-                     $serviceGroup->services_warning_unhandled
+              ->add(
+                  StateBadges::STATE_UNKNOWN,
+                  $serviceGroup->services_unknown_unhandled,
+                  array(
+                      'service_state'         => 3,
+                      'service_acknowledged'  => 0,
+                      'service_in_downtime'   => 0,
+                      'host_problem'          => 0,
+                      'servicegroup_name'     => $serviceGroup->servicegroup_name,
+                      'sort'                  => 'service_severity'
                   ),
-                   $serviceGroup->services_warning_unhandled,
-                   $serviceGroup->servicegroup_alias
-                )
+                  'List %s service that is currently in state UNKNOWN in service group "%s"',
+                  'List %s services which are currently in state UNKNOWN in service group "%s"',
+                  array($serviceGroup->services_unknown_unhandled, $serviceGroup->servicegroup_alias)
               )
-            ) ?>
-        <?php endif ?>
-          <?php if ( $serviceGroup->services_warning_handled): ?>
-            <span class="state warning handled">
-              <?= $this->qlink(
-                 $serviceGroup->services_warning_handled,
-                'monitoring/list/services',
-                array(
-                    'service_state'     => 1,
-                    'service_handled'   => 1,
-                    'servicegroup_name' =>  $serviceGroup->servicegroup_name,
-                    'sort'              => 'service_severity'
-                ),
-                array(
-                  'title' => sprintf(
-                    $this->translatePlural(
-                      'List %s service that is currently in state WARNING (Acknowledged) in service group "%s"',
-                      'List %s services which are currently in state WARNING (Acknowledged) in service group "%s"',
-                       $serviceGroup->services_warning_handled
-                    ),
-                     $serviceGroup->services_warning_handled,
-                     $serviceGroup->servicegroup_alias
-                  )
-                )
-              ) ?>
-            </span>
-          <?php endif ?>
-        <?php if ( $serviceGroup->services_warning_unhandled): ?>
-          </span>
-        <?php endif ?>
-        <?php if ( $serviceGroup->services_pending): ?>
-          <span class="state pending">
-            <?= $this->qlink(
-               $serviceGroup->services_pending,
-              'monitoring/list/services',
-              array(
-                'service_state'     => 99,
-                'servicegroup_name' =>  $serviceGroup->servicegroup_name,
-                'sort'              => 'service_severity'
-              ),
-              array(
-                'title' => sprintf(
-                  $this->translatePlural(
-                    'List %s service that is currenlty in state PENDING in service group "%s"',
-                    'List %s services which are currently in state PENDING in service group "%s"',
-                     $serviceGroup->services_pending
+              ->add(
+                  StateBadges::STATE_UNKNOWN_HANDLED,
+                  $serviceGroup->services_unknown_handled,
+                  array(
+                      'service_state'     => 3,
+                      'service_handled'   => 1,
+                      'servicegroup_name' => $serviceGroup->servicegroup_name,
+                      'sort'              => 'service_severity'
                   ),
-                   $serviceGroup->services_pending,
-                   $serviceGroup->servicegroup_alias
-                )
+                  'List %s service that is currently in state UNKNOWN (Acknowledged) in service group "%s"',
+                  'List %s services which are currently in state UNKNOWN (Acknowledged) in service group "%s"',
+                  array($serviceGroup->services_unknown_handled, $serviceGroup->servicegroup_alias)
+
               )
-            ) ?>
-          </span>
-        <?php endif ?>
+              ->add(
+                  StateBadges::STATE_WARNING,
+                  $serviceGroup->services_warning_unhandled,
+                  array(
+                      'service_state'         => 1,
+                      'service_acknowledged'  => 0,
+                      'service_in_downtime'   => 0,
+                      'host_problem'          => 0,
+                      'servicegroup_name'     => $serviceGroup->servicegroup_name,
+                      'sort'                  => 'service_severity'
+                  ),
+                  'List %s service that is currently in state WARNING in service group "%s"',
+                  'List %s services which are currently in state WARNING in service group "%s"',
+                  array($serviceGroup->services_warning_unhandled, $serviceGroup->servicegroup_alias)
+              )
+              ->add(
+                  StateBadges::STATE_WARNING_HANDLED,
+                  $serviceGroup->services_warning_handled,
+                  array(
+                      'service_state'     => 1,
+                      'service_handled'   => 1,
+                      'servicegroup_name' => $serviceGroup->servicegroup_name,
+                      'sort'              => 'service_severity'
+                  ),
+                  'List %s service that is currently in state WARNING (Acknowledged) in service group "%s"',
+                  'List %s services which are currently in state WARNING (Acknowledged) in service group "%s"',
+                  array($serviceGroup->services_warning_handled, $serviceGroup->servicegroup_alias)
+              )
+              ->add(
+                  StateBadges::STATE_PENDING,
+                  $serviceGroup->services_pending,
+                  array(
+                      'service_state'     => 99,
+                      'servicegroup_name' => $serviceGroup->servicegroup_name,
+                      'sort'              => 'service_severity'
+                  ),
+                  'List %s service that is currenlty in state PENDING in service group "%s"',
+                  'List %s services which are currently in state PENDING in service group "%s"',
+                  array($serviceGroup->services_pending, $serviceGroup->servicegroup_alias)
+              );
+          echo $stateBadges->render();
+          ?>
         </td>
       </tr>
 <?php endforeach ?>