diff --git a/library/Director/Dashboard/Dashboard.php b/library/Director/Dashboard/Dashboard.php
index fbee2eb4..dcb12344 100644
--- a/library/Director/Dashboard/Dashboard.php
+++ b/library/Director/Dashboard/Dashboard.php
@@ -2,7 +2,7 @@
 
 namespace Icinga\Module\Director\Dashboard;
 
-use Countable;
+use dipl\Html\HtmlDocument;
 use Exception;
 use Icinga\Authentication\Auth;
 use Icinga\Module\Director\Objects\IcingaObject;
@@ -16,7 +16,7 @@ use dipl\Translation\TranslationHelper;
 use dipl\Web\Widget\Tabs;
 use Zend_Db_Select as ZfSelect;
 
-abstract class Dashboard extends Html implements Countable
+abstract class Dashboard extends HtmlDocument
 {
     use TranslationHelper;
 
diff --git a/library/Director/Web/Widget/AdditionalTableActions.php b/library/Director/Web/Widget/AdditionalTableActions.php
index b1719f1c..fe6a7dc5 100644
--- a/library/Director/Web/Widget/AdditionalTableActions.php
+++ b/library/Director/Web/Widget/AdditionalTableActions.php
@@ -3,6 +3,7 @@
 namespace Icinga\Module\Director\Web\Widget;
 
 use dipl\Html\Html;
+use dipl\Html\HtmlDocument;
 use dipl\Html\Icon;
 use dipl\Html\Link;
 use dipl\Translation\TranslationHelper;
@@ -31,7 +32,7 @@ class AdditionalTableActions
         $this->table = $table;
     }
 
-    public function appendTo(Html $parent)
+    public function appendTo(HtmlDocument $parent)
     {
         $links = [];
         if ($this->hasPermission('director/admin')) {
diff --git a/library/vendor/ipl/Web/Controller/Extension/ControlsAndContentHelper.php b/library/vendor/ipl/Web/Controller/Extension/ControlsAndContentHelper.php
index b205a4b9..62e0fc65 100644
--- a/library/vendor/ipl/Web/Controller/Extension/ControlsAndContentHelper.php
+++ b/library/vendor/ipl/Web/Controller/Extension/ControlsAndContentHelper.php
@@ -2,7 +2,7 @@
 
 namespace dipl\Web\Controller\Extension;
 
-use dipl\Html\Html;
+use dipl\Html\HtmlDocument;
 use dipl\Web\Widget\Content;
 use dipl\Web\Widget\Controls;
 use dipl\Web\Widget\Tabs;
@@ -53,10 +53,10 @@ trait ControlsAndContentHelper
     }
 
     /**
-     * @param Html|null $actionBar
-     * @return Html
+     * @param HtmlDocument|null $actionBar
+     * @return HtmlDocument
      */
-    public function actions(Html $actionBar = null)
+    public function actions(HtmlDocument $actionBar = null)
     {
         if ($actionBar === null) {
             return $this->controls()->getActionBar();
diff --git a/library/vendor/ipl/Web/Widget/Controls.php b/library/vendor/ipl/Web/Widget/Controls.php
index 525580b3..9809616d 100644
--- a/library/vendor/ipl/Web/Widget/Controls.php
+++ b/library/vendor/ipl/Web/Widget/Controls.php
@@ -5,6 +5,7 @@ namespace dipl\Web\Widget;
 use dipl\Html\BaseHtmlElement;
 use dipl\Html\Container;
 use dipl\Html\Html;
+use dipl\Html\HtmlDocument;
 
 class Controls extends Container
 {
@@ -112,7 +113,7 @@ class Controls extends Container
         return $this->actions;
     }
 
-    public function setActionBar(Html $actionBar)
+    public function setActionBar(HtmlDocument $actionBar)
     {
         if ($this->actions !== null) {
             $this->remove($this->actions);
diff --git a/library/vendor/ipl/Web/Widget/ControlsAndContent.php b/library/vendor/ipl/Web/Widget/ControlsAndContent.php
index b6b700b1..42e97234 100644
--- a/library/vendor/ipl/Web/Widget/ControlsAndContent.php
+++ b/library/vendor/ipl/Web/Widget/ControlsAndContent.php
@@ -2,7 +2,7 @@
 
 namespace dipl\Web\Widget;
 
-use dipl\Html\Html;
+use dipl\Html\HtmlDocument;
 use dipl\Web\Url;
 
 interface ControlsAndContent
@@ -18,9 +18,9 @@ interface ControlsAndContent
     public function tabs();
 
     /**
-     * @return Html
+     * @return HtmlDocument
      */
-    public function actions(Html $actionBar = null);
+    public function actions(HtmlDocument $actionBar = null);
 
     /**
      * @return Content