diff --git a/application/views/scripts/services/grid-flipped.phtml b/application/views/scripts/services/grid-flipped.phtml
index d3050aab..0642eb2c 100644
--- a/application/views/scripts/services/grid-flipped.phtml
+++ b/application/views/scripts/services/grid-flipped.phtml
@@ -9,7 +9,7 @@ if (! $this->compact): ?>
 <div class="content" data-base-target="_next" id="<?= $this->protectId('content') ?>">
     <?php if (empty($pivotData)): ?>
     <div class="item-list">
-        <div class="empty-state"><?= $this->translate('No services found matching the filter.') ?></div>
+        <div class="empty-state-bar"><?= $this->translate('No services found matching the filter.') ?></div>
     </div>
 </div>
 <?php return; endif;
diff --git a/application/views/scripts/services/grid.phtml b/application/views/scripts/services/grid.phtml
index c1479f68..f00ce8e5 100644
--- a/application/views/scripts/services/grid.phtml
+++ b/application/views/scripts/services/grid.phtml
@@ -9,7 +9,7 @@ if (! $this->compact): ?>
 <div class="content" data-base-target="_next" id="<?= $this->protectId('content') ?>">
 <?php if (empty($pivotData)): ?>
     <div class="item-list">
-        <div class="empty-state"><?= $this->translate('No services found matching the filter.') ?></div>
+        <div class="empty-state-bar"><?= $this->translate('No services found matching the filter.') ?></div>
     </div>
 </div>
 <?php return; endif;
diff --git a/library/Icingadb/Widget/ItemTable/StateItemTable.php b/library/Icingadb/Widget/ItemTable/StateItemTable.php
index 8d7b5f77..f392322a 100644
--- a/library/Icingadb/Widget/ItemTable/StateItemTable.php
+++ b/library/Icingadb/Widget/ItemTable/StateItemTable.php
@@ -13,7 +13,7 @@ use ipl\Html\HtmlString;
 use ipl\Orm\Common\SortUtil;
 use ipl\Orm\Query;
 use ipl\Web\Control\SortControl;
-use ipl\Web\Widget\EmptyState;
+use ipl\Web\Widget\EmptyStateBar;
 use ipl\Web\Widget\Icon;
 
 /** @todo Figure out what this might (should) have in common with the new BaseItemTable implementation */
@@ -187,7 +187,7 @@ abstract class StateItemTable extends BaseHtmlElement
                 new HtmlElement(
                     'td',
                     Attributes::create(['colspan' => count($this->columns)]),
-                    new EmptyState(t('No items found.'))
+                    new EmptyStateBar(t('No items found.'))
                 )
             ));
         }
diff --git a/public/css/common.less b/public/css/common.less
index db4639a3..4cf5cfcd 100644
--- a/public/css/common.less
+++ b/public/css/common.less
@@ -25,10 +25,6 @@
   word-break: break-word;
 }
 
-.empty-state {
-  color: @gray-semilight;
-}
-
 div.show-more {
   .clearfix();
   float: right;
diff --git a/public/css/list/state-item-table.less b/public/css/list/state-item-table.less
index be9c8c89..9c2ee62c 100644
--- a/public/css/list/state-item-table.less
+++ b/public/css/list/state-item-table.less
@@ -50,12 +50,6 @@
     }
   }
 
-  > .empty-state,
-  > tbody > tr:first-child .empty-state {
-    .rounded-corners();
-    background-color: @gray-lightest;
-  }
-
   .list-item:not(:last-child) > *:not(.visual),
   .row-item:not(:last-child) {
     border-bottom: 1px solid @gray-light;
@@ -148,11 +142,9 @@ table.state-item-table {
     padding: .5em 1em 0 0;
   }
 
-  > .empty-state,
-  > tbody > tr:first-child .empty-state {
+  > .empty-state-bar,
+  > tbody > tr:first-child .empty-state-bar {
     margin: 0 1em;
-    padding: 1em;
-    text-align: center;
   }
 }