diff --git a/src/Common/BaseListItem.php b/src/Common/BaseListItem.php
index 4d6b5bf5..66eb1491 100644
--- a/src/Common/BaseListItem.php
+++ b/src/Common/BaseListItem.php
@@ -4,7 +4,6 @@
 
 use ipl\Html\Attributes;
 use ipl\Html\BaseHtmlElement;
-use ipl\Html\Html;
 use ipl\Html\HtmlElement;
 
 /**
@@ -64,7 +63,7 @@ protected function assembleVisual(BaseHtmlElement $visual)
 
     protected function createCaption(): BaseHtmlElement
     {
-        $caption = Html::tag('section', ['class' => 'caption']);
+        $caption = new HtmlElement('section', Attributes::create(['class' => 'caption']));
 
         $this->assembleCaption($caption);
 
@@ -73,7 +72,7 @@ protected function createCaption(): BaseHtmlElement
 
     protected function createHeader(): BaseHtmlElement
     {
-        $header = Html::tag('header');
+        $header = new HtmlElement('header');
 
         $this->assembleHeader($header);
 
@@ -82,7 +81,7 @@ protected function createHeader(): BaseHtmlElement
 
     protected function createMain(): BaseHtmlElement
     {
-        $main = Html::tag('div', ['class' => 'main']);
+        $main = new HtmlElement('div', Attributes::create(['class' => 'main']));
 
         $this->assembleMain($main);
 
@@ -122,7 +121,7 @@ protected function createTimestamp()
 
     protected function createTitle(): BaseHtmlElement
     {
-        $title = HTML::tag('div', ['class' => 'title']);
+        $title = new HtmlElement('div', Attributes::create(['class' => 'title']));
 
         $this->assembleTitle($title);
 
@@ -134,7 +133,7 @@ protected function createTitle(): BaseHtmlElement
      */
     protected function createVisual()
     {
-        $visual = Html::tag('div', ['class' => 'visual']);
+        $visual = new HtmlElement('div', Attributes::create(['class' => 'visual']));
 
         $this->assembleVisual($visual);
 
diff --git a/src/Common/BaseStatusBar.php b/src/Common/BaseStatusBar.php
index ecd46cc9..4fe96cdf 100644
--- a/src/Common/BaseStatusBar.php
+++ b/src/Common/BaseStatusBar.php
@@ -4,7 +4,7 @@
 
 use ipl\Html\Attributes;
 use ipl\Html\BaseHtmlElement;
-use ipl\Html\Html;
+use ipl\Html\HtmlElement;
 use ipl\Stdlib\BaseFilter;
 
 abstract class BaseStatusBar extends BaseHtmlElement
@@ -28,7 +28,7 @@ abstract protected function createStateBadges(): BaseHtmlElement;
 
     protected function createCount(): BaseHtmlElement
     {
-        $total = Html::tag('span', ['class' => 'item-count']);
+        $total = new HtmlElement('span', Attributes::create(['class' => 'item-count']));
 
         $this->assembleTotal($total);