diff --git a/asset/css/list/item-list.less b/asset/css/list/item-list.less
index 7f1a7721..c5c0bd28 100644
--- a/asset/css/list/item-list.less
+++ b/asset/css/list/item-list.less
@@ -2,11 +2,6 @@
 
 .item-list {
   list-style-type: none;
-
-  > .empty-state {
-    .rounded-corners();
-    background-color: @empty-state-bg-in-lists;
-  }
 }
 
 // Layout
@@ -55,10 +50,8 @@
     }
   }
 
-  > .empty-state {
+  > .empty-state-bar {
     margin: 0 1em;
-    padding: 1em;
-    text-align: center;
   }
 }
 
diff --git a/asset/css/list/item-table.less b/asset/css/list/item-table.less
index db9170a8..68b7d2f1 100644
--- a/asset/css/list/item-table.less
+++ b/asset/css/list/item-table.less
@@ -4,13 +4,6 @@ ul.item-table {
   list-style-type: none;
 }
 
-div.item-table {
-  > .empty-state {
-    .rounded-corners();
-    background-color: @empty-state-bg-in-lists;
-  }
-}
-
 .table-row {
   color: @default-text-color-light;
 
@@ -87,10 +80,8 @@ ul.item-table {
 }
 
 div.item-table {
-  > .empty-state {
+  > .empty-state-bar {
     margin: 0 1em;
-    padding: 1em;
-    text-align: center;
   }
 }
 
diff --git a/asset/css/variables.less b/asset/css/variables.less
index 4b2e2972..883159b2 100644
--- a/asset/css/variables.less
+++ b/asset/css/variables.less
@@ -124,7 +124,6 @@
 @empty-state-color: @base-disabled;
 @empty-state-bar-bg: @base-gray-lighter;
 
-@empty-state-bg-in-lists: @base-gray-lighter;
 @list-item-title-hover-color: @base-primary-color;
 @list-item-separation-bg: @base-gray-light;
 
@@ -210,7 +209,6 @@
     --empty-state-color: var(--base-disabled);
     --empty-state-bar-bg: var(--base-gray-lighter);
 
-    --empty-state-bg-in-lists: var(--base-gray-lighter);
     --list-item-title-hover-color: var(--base-primary-color);
     --list-item-separation-bg: var(--base-gray-light);
   }
diff --git a/src/Common/BaseItemList.php b/src/Common/BaseItemList.php
index 530cc151..ce0946c8 100644
--- a/src/Common/BaseItemList.php
+++ b/src/Common/BaseItemList.php
@@ -6,7 +6,7 @@
 use ipl\Html\BaseHtmlElement;
 use ipl\Orm\ResultSet;
 use ipl\Stdlib\BaseFilter;
-use ipl\Web\Widget\EmptyState;
+use ipl\Web\Widget\EmptyStateBar;
 
 /**
  * Base class for item lists
@@ -67,7 +67,7 @@ protected function assemble(): void
 
         if ($this->isEmpty()) {
             $this->setTag('div');
-            $this->addHtml(new EmptyState(t('No items found.')));
+            $this->addHtml(new EmptyStateBar(t('No items found.')));
         }
     }
 }
diff --git a/src/Common/BaseItemTable.php b/src/Common/BaseItemTable.php
index 6cf61f76..f6ca2126 100644
--- a/src/Common/BaseItemTable.php
+++ b/src/Common/BaseItemTable.php
@@ -6,7 +6,7 @@
 use ipl\Html\BaseHtmlElement;
 use ipl\Orm\ResultSet;
 use ipl\Stdlib\BaseFilter;
-use ipl\Web\Widget\EmptyState;
+use ipl\Web\Widget\EmptyStateBar;
 
 /**
  * Base class for item tables
@@ -82,7 +82,7 @@ protected function assemble(): void
 
         if ($this->isEmpty()) {
             $this->setTag('div');
-            $this->addHtml(new EmptyState(t('No items found.')));
+            $this->addHtml(new EmptyStateBar(t('No items found.')));
         }
     }
 }
diff --git a/src/Common/BaseOrderedItemList.php b/src/Common/BaseOrderedItemList.php
index e5308704..c141fc5a 100644
--- a/src/Common/BaseOrderedItemList.php
+++ b/src/Common/BaseOrderedItemList.php
@@ -2,7 +2,7 @@
 
 namespace ipl\Web\Common;
 
-use ipl\Web\Widget\EmptyState;
+use ipl\Web\Widget\EmptyStateBar;
 
 /**
  * @method BaseOrderedListItem getItemClass()
@@ -25,7 +25,7 @@ protected function assemble(): void
 
         if ($this->isEmpty()) {
             $this->setTag('div');
-            $this->addHtml(new EmptyState(t('No items found.')));
+            $this->addHtml(new EmptyStateBar(t('No items found.')));
         }
     }
 }