diff --git a/application/controllers/DashboardsController.php b/application/controllers/DashboardsController.php
new file mode 100644
index 0000000000..eec5f6b0a4
--- /dev/null
+++ b/application/controllers/DashboardsController.php
@@ -0,0 +1,520 @@
+<?php
+
+/* Icinga Web 2 | (c) 2022 Icinga GmbH | GPLv2+ */
+
+namespace Icinga\Controllers;
+
+use Icinga\Forms\Dashboard\DashletForm;
+use Icinga\Forms\Dashboard\HomePaneForm;
+use Icinga\Forms\Dashboard\NewHomePaneForm;
+use Icinga\Forms\Dashboard\RemoveDashletForm;
+use Icinga\Forms\Dashboard\RemoveHomePaneForm;
+use Icinga\Forms\Dashboard\SetupNewDashboardForm;
+use Icinga\Forms\Dashboard\WelcomeForm;
+use Icinga\Util\Json;
+use Icinga\Web\Dashboard\Dashboard;
+use Icinga\Web\Dashboard\DashboardHome;
+use Icinga\Web\Dashboard\Pane;
+use Icinga\Web\Dashboard\Settings;
+use Icinga\Web\Notification;
+use Icinga\Web\Widget\Tabextension\DashboardSettings;
+use ipl\Web\Compat\CompatController;
+use ipl\Web\Url;
+use ipl\Web\Widget\ActionLink;
+
+class DashboardsController extends CompatController
+{
+    /** @var Dashboard */
+    protected $dashboard;
+
+    public function init()
+    {
+        parent::init();
+
+        $this->dashboard = new Dashboard();
+        $this->dashboard->setUser($this->Auth()->getUser());
+        $this->dashboard->setTabs($this->getTabs());
+    }
+
+    public function indexAction()
+    {
+        $this->dashboard->load(DashboardHome::DEFAULT_HOME);
+
+        $this->createTabs();
+
+        $activeHome = $this->dashboard->getActiveHome();
+        if (! $activeHome || ! $activeHome->hasEntries()) {
+            $this->addTitleTab(t('Welcome'));
+
+            // Setup dashboard introduction form
+            $welcomeForm = new WelcomeForm($this->dashboard);
+            $welcomeForm->on(WelcomeForm::ON_SUCCESS, function () use ($welcomeForm) {
+                $this->redirectNow($welcomeForm->getRedirectUrl());
+            })->handleRequest($this->getServerRequest());
+
+            $this->content->getAttributes()->add('class', 'welcome-view');
+            $this->dashboard->setWelcomeForm($welcomeForm);
+        } else {
+            $pane = $this->getParam('pane');
+            if (! $pane) {
+                $pane = $this->dashboard->getActivePane()->getName();
+            }
+
+            $this->dashboard->activate($pane);
+        }
+
+        $this->addContent($this->dashboard);
+    }
+
+    /**
+     * Display all the dashboards assigned to a Home set in the `home` request param
+     *
+     * If no pane param is submitted, the default pane is displayed (usually the first one)
+     */
+    public function homeAction()
+    {
+        $this->dashboard->load($this->params->getRequired('home'));
+
+        $activeHome = $this->dashboard->getActiveHome();
+        if (! $activeHome->getEntries()) {
+            $this->addTitleTab($activeHome->getTitle());
+        }
+
+        // Not to render the cog icon before the above tab
+        $this->createTabs();
+
+        if ($activeHome->hasEntries()) {
+            $pane = $this->getParam('pane');
+            if (! $pane) {
+                $pane = $this->dashboard->getActivePane()->getName();
+            }
+
+            $this->dashboard->activate($pane);
+        }
+
+        $this->addContent($this->dashboard);
+    }
+
+    public function newHomeAction()
+    {
+        $this->setTitle(t('Add new Dashboard Home'));
+        $this->dashboard->load();
+
+        $paneForm = (new NewHomePaneForm($this->dashboard))
+            ->on(NewHomePaneForm::ON_SUCCESS, function () {
+                $this->redirectNow(Url::fromPath(Dashboard::BASE_ROUTE . '/settings'));
+            })
+            ->handleRequest($this->getServerRequest());
+
+        $this->addContent($paneForm);
+    }
+
+    public function editHomeAction()
+    {
+        $this->setTitle(t('Update Home'));
+        $this->dashboard->load();
+
+        $home = $this->params->getRequired('home');
+        if (! $this->dashboard->hasEntry($home)) {
+            $this->httpNotFound(sprintf(t('Home "%s" not found'), $home));
+        }
+
+        // TODO: Shouldn't be necessary. load() should get the name already and
+        //       the form should otherwise ensure it has the required data
+        $this->dashboard->activateHome($this->dashboard->getEntry($home));
+
+        $homeForm = (new HomePaneForm($this->dashboard))
+            ->on(HomePaneForm::ON_SUCCESS, function () {
+                $this->redirectNow(Url::fromPath(Dashboard::BASE_ROUTE . '/settings'));
+            })
+            ->handleRequest($this->getServerRequest());
+
+        $homeForm->load($this->dashboard->getActiveHome());
+        $this->addContent($homeForm);
+    }
+
+    public function removeHomeAction()
+    {
+        $this->setTitle(t('Remove Home'));
+        $this->dashboard->load();
+
+        $home = $this->params->getRequired('home');
+        if (! $this->dashboard->hasEntry($home)) {
+            $this->httpNotFound(sprintf(t('Home "%s" not found'), $home));
+        }
+
+        // TODO: Shouldn't be necessary. load() should get the name already and
+        //       the form should otherwise ensure it has the required data
+        $this->dashboard->activateHome($this->dashboard->getEntry($home));
+
+        $homeForm = (new RemoveHomePaneForm($this->dashboard))
+            ->on(RemoveHomePaneForm::ON_SUCCESS, function () {
+                $this->redirectNow(Url::fromPath(Dashboard::BASE_ROUTE . '/settings'));
+            })
+            ->handleRequest($this->getServerRequest());
+
+        $this->addContent($homeForm);
+    }
+
+    public function newPaneAction()
+    {
+        $this->setTitle(t('Add new Dashboard'));
+        $this->dashboard->load();
+
+        $home = $this->params->getRequired('home');
+        if (! $this->dashboard->hasEntry($home)) {
+            $this->httpNotFound(sprintf(t('Home "%s" not found'), $home));
+        }
+
+        // TODO: Shouldn't be necessary. load() should get the name already and
+        //       the form should otherwise ensure it has the required data
+        $this->dashboard->activateHome($this->dashboard->getEntry($home));
+
+        $paneForm = (new NewHomePaneForm($this->dashboard))
+            ->on(NewHomePaneForm::ON_SUCCESS, function () {
+                $this->redirectNow(Url::fromPath(Dashboard::BASE_ROUTE . '/settings'));
+            })
+            ->handleRequest($this->getServerRequest());
+
+        $this->addContent($paneForm);
+    }
+
+    public function editPaneAction()
+    {
+        $this->setTitle(t('Update Pane'));
+        $this->dashboard->load();
+
+        $pane = $this->params->getRequired('pane');
+        $home = $this->params->getRequired('home');
+
+        if (! $this->dashboard->hasEntry($home)) {
+            $this->httpNotFound(sprintf(t('Home "%s" not found'), $home));
+        }
+
+        // TODO: Shouldn't be necessary. load() should get the name already and
+        //       the form should otherwise ensure it has the required data
+        $this->dashboard->activateHome($this->dashboard->getEntry($home));
+
+        if (! $this->dashboard->getActiveHome()->hasEntry($pane)) {
+            $this->httpNotFound(sprintf(t('Pane "%s" not found'), $pane));
+        }
+
+        $paneForm = (new HomePaneForm($this->dashboard))
+            ->on(HomePaneForm::ON_SUCCESS, function () {
+                $this->redirectNow(Url::fromPath(Dashboard::BASE_ROUTE . '/settings'));
+            })
+            ->handleRequest($this->getServerRequest());
+
+        $paneForm->load($this->dashboard->getActiveHome()->getEntry($pane));
+
+        $this->addContent($paneForm);
+    }
+
+    public function removePaneAction()
+    {
+        $this->setTitle(t('Remove Pane'));
+        $this->dashboard->load();
+
+        $home = $this->params->getRequired('home');
+        $paneParam = $this->params->getRequired('pane');
+
+        if (! $this->dashboard->hasEntry($home)) {
+            $this->httpNotFound(sprintf(t('Home "%s" not found'), $home));
+        }
+
+        // TODO: Shouldn't be necessary. load() should get the name already and
+        //       the form should otherwise ensure it has the required data
+        $this->dashboard->activateHome($this->dashboard->getEntry($home));
+
+        if (! $this->dashboard->getActiveHome()->hasEntry($paneParam)) {
+            $this->httpNotFound(sprintf(t('Pane "%s" not found'), $paneParam));
+        }
+
+        $paneForm = new RemoveHomePaneForm($this->dashboard);
+        $paneForm->populate(['org_name' => $paneParam]);
+        $paneForm->on(RemoveHomePaneForm::ON_SUCCESS, function () {
+            $this->redirectNow(Url::fromPath(Dashboard::BASE_ROUTE . '/settings'));
+        })->handleRequest($this->getServerRequest());
+
+        $this->addContent($paneForm);
+    }
+
+    public function newDashletAction()
+    {
+        if (isset($this->getRequest()->getPost()['btn_next'])) {
+            $this->setTitle(t('Add Dashlet To Dashboard'));
+        } else {
+            $this->setTitle(t('Select Dashlets'));
+        }
+
+        $this->dashboard->load();
+
+        $home = $this->params->getRequired('home');
+        // TODO: Shouldn't be necessary. load() should get the name already and
+        //       the form should otherwise ensure it has the required data
+        $this->dashboard->activateHome($this->dashboard->getEntry($home));
+
+        $dashletForm = new DashletForm($this->dashboard);
+        $dashletForm->populate($this->getRequest()->getPost());
+        $dashletForm->on(DashletForm::ON_SUCCESS, function () {
+            $this->redirectNow(Url::fromPath(Dashboard::BASE_ROUTE . '/settings'));
+        })->handleRequest($this->getServerRequest());
+
+        $this->addContent($dashletForm);
+    }
+
+    public function editDashletAction()
+    {
+        $this->setTitle(t('Edit Dashlet'));
+        $this->dashboard->load();
+
+        $pane = $this->validateDashletParams();
+        $dashlet = $pane->getEntry($this->getParam('dashlet'));
+
+        $dashletForm = (new DashletForm($this->dashboard))
+            ->on(DashletForm::ON_SUCCESS, function () {
+                $this->redirectNow(Url::fromPath(Dashboard::BASE_ROUTE . '/settings'));
+            })
+            ->handleRequest($this->getServerRequest());
+
+        $dashletForm->getElement('submit')->setLabel(t('Update Dashlet'));
+
+        $dashletForm->load($dashlet);
+        $this->addContent($dashletForm);
+    }
+
+    public function removeDashletAction()
+    {
+        $this->setTitle(t('Remove Dashlet'));
+        $this->dashboard->load();
+
+        $this->validateDashletParams();
+
+        $removeForm = (new RemoveDashletForm($this->dashboard))
+            ->on(RemoveDashletForm::ON_SUCCESS, function () {
+                $this->redirectNow(Url::fromPath(Dashboard::BASE_ROUTE . '/settings'));
+            })
+            ->handleRequest($this->getServerRequest());
+
+        $this->addContent($removeForm);
+    }
+
+    /**
+     * Handles all widgets drag and drop requests
+     */
+    public function reorderWidgetsAction()
+    {
+        $this->assertHttpMethod('post');
+        $dashboards = $this->getRequest()->getPost();
+        if (! isset($dashboards['dashboardData'])) {
+            $this->httpBadRequest(t('Invalid request data'));
+        }
+
+        $dashboards = Json::decode($dashboards['dashboardData'], true);
+        $originals = $dashboards['originals'];
+        unset($dashboards['originals']);
+
+        $this->dashboard->load();
+
+        $orgHome = null;
+        $orgPane = null;
+        if ($originals && isset($originals['originalHome'])) {
+            /** @var DashboardHome $orgHome */
+            $orgHome = $this->dashboard->getEntry($originals['originalHome']);
+            $orgHome->setActive()->loadDashboardEntries();
+
+            if (isset($originals['originalPane'])) {
+                $orgPane = $orgHome->getEntry($originals['originalPane']);
+                $orgHome->setEntries([$orgPane->getName() => $orgPane]);
+            }
+        }
+
+        $duplicatedError = false;
+        foreach ($dashboards as $home => $value) {
+            if (! $this->dashboard->hasEntry($home)) {
+                Notification::error(sprintf(t('Dashboard home "%s" not found'), $home));
+                break;
+            }
+
+            $home = $this->dashboard->getEntry($home);
+            /** @var DashboardHome $home */
+            if (! is_array($value)) {
+                $this->dashboard->reorderWidget($home, (int) $value);
+
+                Notification::success(sprintf(t('Updated dashboard home "%s" successfully'), $home->getTitle()));
+                break;
+            }
+
+            $home->setActive()->loadDashboardEntries();
+            foreach ($value as $pane => $indexOrValues) {
+                if (! $home->hasEntry($pane) && (! $orgHome || ! $orgHome->hasEntry($pane))) {
+                    Notification::error(sprintf(t('Dashboard pane "%s" not found'), $pane));
+                    break;
+                }
+
+                $pane = $home->hasEntry($pane) ? $home->getEntry($pane) : $orgHome->getEntry($pane);
+                /** @var Pane $pane */
+                if (! is_array($indexOrValues)) {
+                    if ($orgHome && $orgHome->hasEntry($pane->getName()) && $home->hasEntry($pane->getName())) {
+                        Notification::error(sprintf(
+                            t('Dashboard "%s" already exists within "%s" home'),
+                            $pane->getTitle(),
+                            $home->getTitle()
+                        ));
+
+                        $duplicatedError = true;
+                        break;
+                    }
+
+                    // Perform DB updates
+                    $home->reorderWidget($pane, (int) $indexOrValues, $orgHome);
+                    if ($orgHome) {
+                        // In order to properly update the dashlets id (user + home + pane + dashlet)
+                        $pane->manageEntry($pane->getEntries());
+                    }
+
+                    Notification::success(sprintf(
+                        t('%s dashboard pane "%s" successfully'),
+                        $orgHome ? 'Moved' : 'Updated',
+                        $pane->getTitle()
+                    ));
+                    break;
+                }
+
+                foreach ($indexOrValues as $dashlet => $index) {
+                    if (! $pane->hasEntry($dashlet) && (! $orgPane || ! $orgPane->hasEntry($dashlet))) {
+                        Notification::error(sprintf(t('Dashlet "%s" not found'), $dashlet));
+                        break;
+                    }
+
+                    if ($orgPane && $orgPane->hasEntry($dashlet) && $pane->hasEntry($dashlet)) {
+                        Notification::error(sprintf(
+                            t('Dashlet "%s" already exists within "%s" dashboard pane'),
+                            $dashlet,
+                            $pane->getTitle()
+                        ));
+
+                        $duplicatedError = true;
+                        break;
+                    }
+
+                    $dashlet = $pane->hasEntry($dashlet) ? $pane->getEntry($dashlet) : $orgPane->getEntry($dashlet);
+                    $pane->reorderWidget($dashlet, (int) $index, $orgPane);
+
+                    Notification::success(sprintf(
+                        t('%s dashlet "%s" successfully'),
+                        $orgPane ? 'Moved' : 'Updated',
+                        $dashlet->getTitle()
+                    ));
+                }
+            }
+        }
+
+        if ($duplicatedError) {
+            // Even though the drop action couldn't be performed successfully from our server, Sortable JS has
+            // already dropped the draggable element though, so we need to redirect here to undo it.
+            $this->redirectNow(Dashboard::BASE_ROUTE . '/settings');
+        }
+
+        $this->createTabs();
+        $this->getTabs()->setRefreshUrl(Url::fromPath(Dashboard::BASE_ROUTE . '/settings'));
+        $this->dashboard->activate('dashboard_settings');
+        $this->sendMultipartUpdate();
+    }
+
+    /**
+     * Provides a mini wizard which guides a new user through the dashboard creation
+     * process and helps them get a first impression of Icinga Web 2.
+     */
+    public function setupDashboardAction()
+    {
+        if (isset($this->getRequest()->getPost()['btn_next'])) {
+            // Set compact view to prevent the controls from being
+            // rendered in the modal view when redirecting
+            $this->view->compact = true;
+
+            $this->setTitle(t('Configure Dashlets'));
+        } else {
+            $this->setTitle(t('Add Dashlet'));
+        }
+
+        $this->dashboard->load();
+
+        $setupForm = new SetupNewDashboardForm($this->dashboard);
+        $setupForm->on(SetupNewDashboardForm::ON_SUCCESS, function () use ($setupForm) {
+            $this->redirectNow($setupForm->getRedirectUrl());
+        })->handleRequest($this->getServerRequest());
+
+        $this->addContent($setupForm);
+    }
+
+    public function settingsAction()
+    {
+        $this->dashboard->load();
+        $this->createTabs();
+
+        $activeHome = $this->dashboard->getActiveHome();
+        // We can't grant access the user to the dashboard manager if there aren't any dashboards to manage
+        if (! $activeHome || (! $activeHome->hasEntries() && count($this->dashboard->getEntries()) === 1)) {
+            $this->redirectNow(Dashboard::BASE_ROUTE);
+        }
+
+        $this->dashboard->activate('dashboard_settings');
+
+        $this->addControl(new ActionLink(
+            t('Add new Home'),
+            Url::fromPath(Dashboard::BASE_ROUTE . '/new-home'),
+            'plus',
+            [
+                'class'               => 'add-home',
+                'data-icinga-modal'   => true,
+                'data-no-icinga-ajax' => true
+            ]
+        ));
+
+        $this->content->getAttributes()->add('class', 'dashboard-manager');
+        $this->controls->getAttributes()->add('class', 'dashboard-manager-controls');
+
+        $this->addContent(new Settings($this->dashboard));
+    }
+
+    /**
+     * Create tab aggregation
+     */
+    private function createTabs()
+    {
+        $tabs = $this->dashboard->getTabs();
+        $activeHome = $this->dashboard->getActiveHome();
+        if ($activeHome && ($activeHome->getName() !== DashboardHome::DEFAULT_HOME || $activeHome->hasEntries())) {
+            $tabs->extend(new DashboardSettings());
+        }
+
+        return $tabs;
+    }
+
+    private function validateDashletParams()
+    {
+        $home = $this->params->getRequired('home');
+        $pane = $this->params->getRequired('pane');
+        $dashlet = $this->params->getRequired('dashlet');
+
+        if (! $this->dashboard->hasEntry($home)) {
+            $this->httpNotFound(sprintf(t('Home "%s" not found'), $home));
+        }
+
+        // TODO: Shouldn't be necessary. load() should get the name already and
+        //       the form should otherwise ensure it has the required data
+        $this->dashboard->activateHome($this->dashboard->getEntry($home));
+
+        if (! $this->dashboard->getActiveHome()->hasEntry($pane)) {
+            $this->httpNotFound(sprintf(t('Pane "%s" not found'), $pane));
+        }
+
+        $pane = $this->dashboard->getActiveHome()->getEntry($pane);
+        if (! $pane->hasEntry($dashlet)) {
+            $this->httpNotFound(sprintf(t('Dashlet "%s" not found'), $dashlet));
+        }
+
+        return $pane;
+    }
+}
diff --git a/application/controllers/SearchController.php b/application/controllers/SearchController.php
index 92aeabe54d..2fdba56621 100644
--- a/application/controllers/SearchController.php
+++ b/application/controllers/SearchController.php
@@ -3,23 +3,21 @@
 
 namespace Icinga\Controllers;
 
-use Icinga\Web\Controller\ActionController;
-use Icinga\Web\Widget;
 use Icinga\Web\Widget\SearchDashboard;
+use ipl\Web\Compat\CompatController;
 
 /**
  * Search controller
  */
-class SearchController extends ActionController
+class SearchController extends CompatController
 {
     public function indexAction()
     {
         $searchDashboard = new SearchDashboard();
         $searchDashboard->setUser($this->Auth()->getUser());
-        $this->view->dashboard = $searchDashboard->search($this->params->get('q'));
 
-        // NOTE: This renders the dashboard twice. Remove this once we can catch exceptions thrown in view scripts.
-        $this->view->dashboard->render();
+        $this->controls->setTabs($searchDashboard->getTabs());
+        $this->addContent($searchDashboard->search($this->getParam('q')));
     }
 
     public function hintAction()
diff --git a/application/forms/Authentication/LoginForm.php b/application/forms/Authentication/LoginForm.php
index 8a71ecf554..fd7173b7ea 100644
--- a/application/forms/Authentication/LoginForm.php
+++ b/application/forms/Authentication/LoginForm.php
@@ -11,6 +11,7 @@
 use Icinga\Authentication\User\ExternalBackend;
 use Icinga\Common\Database;
 use Icinga\User;
+use Icinga\Web\Dashboard\Dashboard;
 use Icinga\Web\Form;
 use Icinga\Web\RememberMe;
 use Icinga\Web\Url;
@@ -27,7 +28,7 @@ class LoginForm extends Form
     /**
      * Redirect URL
      */
-    const REDIRECT_URL = 'dashboard';
+    const REDIRECT_URL = Dashboard::BASE_ROUTE;
 
     public static $defaultElementDecorators = [
         ['ViewHelper', ['separator' => '']],
diff --git a/application/forms/Dashboard/BaseDashboardForm.php b/application/forms/Dashboard/BaseDashboardForm.php
new file mode 100644
index 0000000000..0bd1ab9874
--- /dev/null
+++ b/application/forms/Dashboard/BaseDashboardForm.php
@@ -0,0 +1,128 @@
+<?php
+
+/* Icinga Web 2 | (c) 2022 Icinga GmbH | GPLv2+ */
+
+namespace Icinga\Forms\Dashboard;
+
+use Icinga\Web\Dashboard\Common\BaseDashboard;
+use Icinga\Web\Dashboard\Dashboard;
+use ipl\Html\Contract\FormElement;
+use ipl\Html\HtmlElement;
+use ipl\Html\ValidHtml;
+use ipl\Web\Compat\CompatForm;
+use ipl\Web\Url;
+use ipl\Web\Widget\Icon;
+
+/**
+ * Base Form for all kinds of dashboard types
+ */
+abstract class BaseDashboardForm extends CompatForm
+{
+    const CREATE_NEW_HOME = 'Create new Home';
+
+    const CREATE_NEW_PANE = 'Create new Dashboard';
+
+    /**
+     * Dashboard instance for which this form is being rendered
+     *
+     * @var Dashboard
+     */
+    protected $dashboard;
+
+    /**
+     * Create a new Dashboard Form
+     *
+     * @param Dashboard $dashboard
+     */
+    public function __construct(Dashboard $dashboard)
+    {
+        $this->dashboard = $dashboard;
+
+        $this->init();
+    }
+
+    /**
+     * Initialize this form
+     *
+     * @return void
+     */
+    protected function init()
+    {
+        // This is needed for the modal views
+        $this->setAction((string) Url::fromRequest());
+    }
+
+    public function hasBeenSubmitted()
+    {
+        // We don't use addElement() for the form controls, so the form has no way of knowing
+        // that we do have a submit button and will always be submitted with autosubmit elements
+        return $this->hasBeenSent() && $this->getPopulatedValue('submit');
+    }
+
+    /**
+     * Populate form data from config
+     *
+     * @param BaseDashboard $dashboard
+     *
+     * @return void
+     */
+    public function load(BaseDashboard $dashboard)
+    {
+    }
+
+    /**
+     * Create custom form controls
+     *
+     * @return HtmlElement
+     */
+    protected function createFormControls(): ValidHtml
+    {
+        return HtmlElement::create('div', ['class' => ['control-group', 'form-controls']]);
+    }
+
+    /**
+     * Create a cancel button
+     *
+     * @return HtmlElement
+     */
+    protected function createCancelButton(): ValidHtml
+    {
+        return HtmlElement::create('button', [
+            'type'                     => 'button',
+            'class'                    => 'btn-cancel',
+            'data-icinga-modal-cancel' => true
+        ])->setContent(t('Cancel'));
+    }
+
+    /**
+     * Create a remove button
+     *
+     * @param Url $action
+     * @param string $label
+     *
+     * @return FormElement
+     */
+    protected function createRemoveButton(Url $action, string $label): ValidHtml
+    {
+        return $this->createElement('submitButton', 'btn_remove', [
+            'class'      => 'btn-remove',
+            'label'      => [new Icon('trash'), $label],
+            'formaction' => (string) $action
+        ]);
+    }
+
+    /**
+     * Create and register a submit button
+     *
+     * @param string $label
+     *
+     * @return FormElement
+     */
+    protected function registerSubmitButton(string $label): ValidHtml
+    {
+        $submitElement = $this->createElement('submit', 'submit', ['class' => 'btn-primary', 'label' => $label]);
+        $this->registerElement($submitElement);
+
+        return $submitElement;
+    }
+}
diff --git a/application/forms/Dashboard/DashletForm.php b/application/forms/Dashboard/DashletForm.php
index 1af65a954a..68e07225a7 100644
--- a/application/forms/Dashboard/DashletForm.php
+++ b/application/forms/Dashboard/DashletForm.php
@@ -3,169 +3,329 @@
 
 namespace Icinga\Forms\Dashboard;
 
-use Icinga\Web\Form;
-use Icinga\Web\Form\Validator\InternalUrlValidator;
-use Icinga\Web\Form\Validator\UrlValidator;
-use Icinga\Web\Url;
-use Icinga\Web\Widget\Dashboard;
-use Icinga\Web\Widget\Dashboard\Dashlet;
-
-/**
- * Form to add an url a dashboard pane
- */
-class DashletForm extends Form
+use Exception;
+use Icinga\Application\Logger;
+use Icinga\Web\Dashboard\Common\BaseDashboard;
+use Icinga\Web\Dashboard\Dashboard;
+use Icinga\Web\Dashboard\DashboardHome;
+use Icinga\Web\Notification;
+use Icinga\Web\Dashboard\Dashlet;
+use Icinga\Web\Dashboard\Pane;
+use ipl\Html\HtmlElement;
+use ipl\Web\Url;
+
+class DashletForm extends SetupNewDashboardForm
 {
-    /**
-     * @var Dashboard
-     */
-    private $dashboard;
-
-    /**
-     * Initialize this form
-     */
-    public function init()
+    protected function init()
     {
-        $this->setName('form_dashboard_addurl');
-        if (! $this->getSubmitLabel()) {
-            $this->setSubmitLabel($this->translate('Add To Dashboard'));
-        }
-        $this->setAction(Url::fromRequest());
+        parent::init();
+
+        $this->setAction((string) Url::fromRequest());
+    }
+
+    public function load(BaseDashboard $dashboard)
+    {
+        $home = Url::fromRequest()->getParam('home');
+        /** @var Dashlet $dashboard */
+        $this->populate(array(
+            'org_home'    => $home,
+            'org_pane'    => $dashboard->getPane()->getName(),
+            'org_dashlet' => $dashboard->getName(),
+            'dashlet'     => $dashboard->getTitle(),
+            'url'         => $dashboard->getUrl()->getRelativeUrl()
+        ));
     }
 
-    /**
-     * Build AddUrl form elements
-     *
-     * @see Form::createElements()
-     */
-    public function createElements(array $formData)
+    protected function assembleNextPageDashboardPart()
     {
-        $groupElements  = array();
-        $panes          = array();
+        $requestUrl = Url::fromRequest();
 
-        if ($this->dashboard) {
-            $panes = $this->dashboard->getPaneKeyTitleArray();
-        }
+        $homes = $this->dashboard->getEntryKeyTitleArr();
+        $activeHome = $this->dashboard->getActiveHome();
+        $currentHome = $requestUrl->getParam('home', reset($homes));
+        $populatedHome = $this->getPopulatedValue('home', $currentHome);
+
+        $panes = [];
+        if ($currentHome === $populatedHome && $populatedHome !== self::CREATE_NEW_HOME) {
+            if (! $currentHome || ! $activeHome) {
+                // Home param isn't passed through, so let's try to load based on the first home
+                $firstHome = $this->dashboard->rewindEntries();
+                if ($firstHome) {
+                    $this->dashboard->loadDashboardEntries($firstHome->getName());
 
-        $sectionNameValidator = ['Callback', true, [
-            'callback'  => function ($value) {
-                if (strpos($value, '[') === false && strpos($value, ']') === false) {
-                    return true;
+                    $panes = $firstHome->getEntryKeyTitleArr();
                 }
-            },
-            'messages'  => [
-                'callbackValue' => $this->translate('Brackets ([, ]) cannot be used here')
-            ]
-        ]];
-
-        $this->addElement(
-            'hidden',
-            'org_pane',
-            array(
-                'required' => false
-            )
-        );
-
-        $this->addElement(
-            'hidden',
-            'org_dashlet',
-            array(
-                'required' => false
-            )
-        );
-
-        $this->addElement(
-            'textarea',
-            'url',
-            array(
-                'required'      => true,
-                'label'         => $this->translate('Url'),
-                'description'   => $this->translate(
-                    'Enter url to be loaded in the dashlet. You can paste the full URL, including filters.'
-                ),
-                'validators'    => array(new UrlValidator(), new InternalUrlValidator())
-            )
-        );
-        $this->addElement(
-            'text',
-            'dashlet',
-            array(
-                'required'      => true,
-                'label'         => $this->translate('Dashlet Title'),
-                'description'   => $this->translate('Enter a title for the dashlet.'),
-                'validators'    => [$sectionNameValidator]
-            )
-        );
-        $this->addElement(
-            'note',
-            'note',
-            array(
-                'decorators' => array(
-                    array('HtmlTag', array('tag' => 'hr'))
-                )
-            )
-        );
-        $this->addElement(
-            'checkbox',
-            'create_new_pane',
-            array(
-                'autosubmit'    => true,
-                'required'      => false,
-                'label'         => $this->translate('New dashboard'),
-                'description'   => $this->translate('Check this box if you want to add the dashlet to a new dashboard')
-            )
-        );
-        if (empty($panes) || ((isset($formData['create_new_pane']) && $formData['create_new_pane'] != false))) {
-            $this->addElement(
-                'text',
-                'pane',
-                array(
-                    'required'      => true,
-                    'label'         => $this->translate('New Dashboard Title'),
-                    'description'   => $this->translate('Enter a title for the new dashboard'),
-                    'validators'    => [$sectionNameValidator]
-                )
-            );
-        } else {
-            $this->addElement(
-                'select',
-                'pane',
-                array(
-                    'required'      => true,
-                    'label'         => $this->translate('Dashboard'),
-                    'multiOptions'  => $panes,
-                    'description'   => $this->translate('Select a dashboard you want to add the dashlet to')
-                )
-            );
+            } else {
+                $panes = $activeHome->loadDashboardEntries()->getEntryKeyTitleArr();
+            }
+        } elseif ($this->dashboard->hasEntry($populatedHome)) {
+            $this->dashboard->loadDashboardEntries($populatedHome);
+
+            $panes = $this->dashboard->getActiveHome()->getEntryKeyTitleArr();
         }
-    }
 
-    /**
-     * @param \Icinga\Web\Widget\Dashboard $dashboard
-     */
-    public function setDashboard(Dashboard $dashboard)
-    {
-        $this->dashboard = $dashboard;
+        $this->addElement('hidden', 'org_pane', ['required' => false]);
+        $this->addElement('hidden', 'org_home', ['required' => false]);
+        $this->addElement('hidden', 'org_dashlet', ['required' => false]);
+
+        if ($this->isUpdatingADashlet()) {
+            $this->assembleDashletElements();
+
+            $this->addHtml(new HtmlElement('hr'));
+        }
+
+        $this->addElement('select', 'home', [
+            'class'        => 'autosubmit',
+            'required'     => true,
+            'disabled'     => empty($homes) ?: null,
+            'value'        => $populatedHome,
+            'multiOptions' => array_merge([self::CREATE_NEW_HOME => self::CREATE_NEW_HOME], $homes),
+            'label'        => t('Select Home'),
+            'description'  => t('Select a dashboard home you want to add the dashboard pane to.')
+        ]);
+
+        if (empty($homes) || $populatedHome === self::CREATE_NEW_HOME) {
+            $this->addElement('text', 'new_home', [
+                'required'    => true,
+                'label'       => t('Home Title'),
+                'placeholder' => t('Enter dashboard home title'),
+                'description' => t('Enter a title for the new dashboard home.')
+            ]);
+        }
+
+        $populatedPane = $this->getPopulatedValue('pane');
+        // Pane element's values are depending on the home element's value
+        if ($populatedPane !== self::CREATE_NEW_PANE && ! in_array($populatedPane, $panes)) {
+            $this->clearPopulatedValue('pane');
+        }
+
+        $populatedPane = $this->getPopulatedValue('pane', $requestUrl->getParam('pane', reset($panes)));
+        $disable = empty($panes) || $populatedHome === self::CREATE_NEW_HOME;
+        $this->addElement('select', 'pane', [
+            'class'        => 'autosubmit',
+            'required'     => true,
+            'disabled'     => $disable ?: null,
+            'value'        => ! $disable ? $populatedPane : self::CREATE_NEW_PANE,
+            'multiOptions' => array_merge([self::CREATE_NEW_PANE => self::CREATE_NEW_PANE], $panes),
+            'label'        => t('Select Dashboard'),
+            'description'  => t('Select a dashboard you want to add the dashlet to.'),
+        ]);
+
+        if ($disable || $this->getPopulatedValue('pane') === self::CREATE_NEW_PANE) {
+            $this->addElement('text', 'new_pane', [
+                'required'    => true,
+                'label'       => t('Dashboard Title'),
+                'placeholder' => t('Enter dashboard title'),
+                'description' => t('Enter a title for the new dashboard.'),
+            ]);
+        }
     }
 
-    /**
-     * @return \Icinga\Web\Widget\Dashboard
-     */
-    public function getDashboard()
+    protected function assemble()
     {
-        return $this->dashboard;
+        if ($this->isUpdatingADashlet() || $this->getPopulatedValue('btn_next') || $this->hasBeenSent()) {
+            $this->assembleNextPage();
+
+            if ($this->isUpdatingADashlet()) {
+                $targetUrl = (clone Url::fromRequest())->setPath(Dashboard::BASE_ROUTE . '/remove-dashlet');
+                $removeButton = $this->createRemoveButton($targetUrl, t('Remove Dashlet'));
+
+                $formControls = $this->createFormControls();
+                $formControls->add([
+                    $this->registerSubmitButton(t('Add to Dashboard')),
+                    $removeButton,
+                    $this->createCancelButton()
+                ]);
+
+                $this->addHtml($formControls);
+            } else {
+                $formControls = $this->createFormControls();
+                $formControls->add([
+                    $this->registerSubmitButton(t('Add to Dashboard')),
+                    $this->createCancelButton()
+                ]);
+
+                $this->addHtml($formControls);
+            }
+        } else {
+            // Just setup the initial view of the modal view
+            parent::assemble();
+        }
     }
 
-    /**
-     * @param Dashlet $dashlet
-     */
-    public function load(Dashlet $dashlet)
+    protected function onSuccess()
     {
-        $this->populate(array(
-            'pane'          => $dashlet->getPane()->getTitle(),
-            'org_pane'      => $dashlet->getPane()->getName(),
-            'dashlet'       => $dashlet->getTitle(),
-            'org_dashlet'   => $dashlet->getName(),
-            'url'           => $dashlet->getUrl()->getRelativeUrl()
-        ));
+        $conn = Dashboard::getConn();
+        $dashboard = $this->dashboard;
+
+        $selectedHome = $this->getPopulatedValue('home');
+        if (! $selectedHome || $selectedHome === self::CREATE_NEW_HOME) {
+            $selectedHome = $this->getPopulatedValue('new_home');
+        }
+
+        $selectedPane = $this->getPopulatedValue('pane');
+        // If "pane" element is disabled, there will be no populated value for it
+        if (! $selectedPane || $selectedPane === self::CREATE_NEW_PANE) {
+            $selectedPane = $this->getPopulatedValue('new_pane');
+        }
+
+        if (! $this->isUpdatingADashlet()) {
+            $currentHome = new DashboardHome($selectedHome);
+            if ($dashboard->hasEntry($currentHome->getName())) {
+                $currentHome = clone $dashboard->getEntry($currentHome->getName());
+                if ($currentHome->getName() !== $dashboard->getActiveHome()->getName()) {
+                    $currentHome->setActive();
+                    $currentHome->loadDashboardEntries();
+                }
+            }
+
+            $currentPane = new Pane($selectedPane);
+            if ($currentHome->hasEntry($currentPane->getName())) {
+                $currentPane = clone $currentHome->getEntry($currentPane->getName());
+            }
+
+            $customDashlet = null;
+            if (($dashlet = $this->getPopulatedValue('dashlet')) && ($url = $this->getPopulatedValue('url'))) {
+                $customDashlet = new Dashlet($dashlet, $url, $currentPane);
+
+                if ($currentPane->hasEntry($customDashlet->getName()) || $this->duplicateCustomDashlet) {
+                    Notification::error(sprintf(
+                        t('Dashlet "%s" already exists within the "%s" dashboard pane'),
+                        $customDashlet->getTitle(),
+                        $currentPane->getTitle()
+                    ));
+
+                    return;
+                }
+            }
+
+            $conn->beginTransaction();
+
+            try {
+                $dashboard->manageEntry($currentHome);
+                $currentHome->manageEntry($currentPane);
+
+                if ($customDashlet) {
+                    $currentPane->manageEntry($customDashlet);
+                }
+
+                $this->dumpArbitaryDashlets(false);
+                // Avoid the hassle of iterating through the module dashlets each time to check if exits,
+                // even though the current pane doesn't have any entries
+                if (! $this->getPopulatedValue('new_pane') && $currentPane->hasEntries()) {
+                    foreach (self::$moduleDashlets as $_ => $dashlets) {
+                        /** @var Dashlet $dashlet */
+                        foreach ($dashlets as $dashlet) {
+                            if ($currentPane->hasEntry($dashlet->getName()) || $this->duplicateCustomDashlet) {
+                                Notification::error(sprintf(
+                                    t('Dashlet "%s" already exists within the "%s" dashboard pane'),
+                                    $dashlet->getTitle(),
+                                    $currentPane->getTitle()
+                                ));
+
+                                return;
+                            }
+
+                            $currentPane->manageEntry($dashlet);
+                        }
+                    }
+                } else {
+                    $currentPane->manageEntry(self::$moduleDashlets);
+                }
+
+                $conn->commitTransaction();
+            } catch (Exception $err) {
+                Logger::error($err);
+                $conn->rollBackTransaction();
+
+                throw $err;
+            }
+
+            Notification::success(t('Created dashlet(s) successfully'));
+        } else {
+            $orgHome = $dashboard->getEntry($this->getValue('org_home'));
+            $orgPane = $orgHome->getEntry($this->getValue('org_pane'));
+            $orgDashlet = $orgPane->getEntry($this->getValue('org_dashlet'));
+
+            $currentHome = new DashboardHome($selectedHome);
+            if ($dashboard->hasEntry($currentHome->getName())) {
+                $currentHome = clone $dashboard->getEntry($currentHome->getName());
+                $activeHome = $dashboard->getActiveHome();
+                if ($currentHome->getName() !== $activeHome->getName()) {
+                    $currentHome->setActive();
+                    $currentHome->loadDashboardEntries();
+                }
+            }
+
+            $currentPane = new Pane($selectedPane);
+            if ($currentHome->hasEntry($currentPane->getName())) {
+                $currentPane = clone $currentHome->getEntry($currentPane->getName());
+            }
+
+            $currentPane->setHome($currentHome);
+            // When the user wishes to create a new dashboard pane, we have to explicitly reset the dashboard panes
+            // of the original home, so that it isn't considered as we want to move the pane even though it isn't
+            // supposed to when the original home contains a dashboard with the same name
+            // @see DashboardHome::manageEntries() for details
+            $selectedPane = $this->getPopulatedValue('pane');
+            if ((! $selectedPane || $selectedPane === self::CREATE_NEW_PANE)
+                && ! $currentHome->hasEntry($currentPane->getName())) {
+                $orgHome->setEntries([]);
+            }
+
+            $currentDashlet = clone $orgDashlet;
+            $currentDashlet
+                ->setPane($currentPane)
+                ->setUrl($this->getValue('url'))
+                ->setTitle($this->getValue('dashlet'));
+
+            if ($orgPane->getName() !== $currentPane->getName()
+                && $currentPane->hasEntry($currentDashlet->getName())) {
+                Notification::error(sprintf(
+                    t('Failed to move dashlet "%s": Dashlet already exists within the "%s" dashboard pane'),
+                    $currentDashlet->getTitle(),
+                    $currentPane->getTitle()
+                ));
+
+                return;
+            }
+
+            $paneDiff = array_filter(array_diff_assoc($currentPane->toArray(), $orgPane->toArray()));
+            $dashletDiff = array_filter(
+                array_diff_assoc($currentDashlet->toArray(), $orgDashlet->toArray()),
+                function ($val) {
+                    return $val !== null;
+                }
+            );
+
+            // Prevent meaningless updates when there weren't any changes,
+            // e.g. when the user just presses the update button without changing anything
+            if (empty($dashletDiff) && empty($paneDiff)) {
+                return;
+            }
+
+            if (empty($paneDiff)) {
+                // No dashboard diff means the dashlet is still in the same pane, so just
+                // reset the dashlets of the original pane
+                $orgPane->setEntries([]);
+            }
+
+            $conn->beginTransaction();
+
+            try {
+                $dashboard->manageEntry($currentHome);
+                $currentHome->manageEntry($currentPane, $orgHome);
+                $currentPane->manageEntry($currentDashlet, $orgPane);
+
+                $conn->commitTransaction();
+            } catch (Exception $err) {
+                Logger::error($err);
+                $conn->rollBackTransaction();
+
+                throw $err;
+            }
+
+            Notification::success(sprintf(t('Updated dashlet "%s" successfully'), $currentDashlet->getTitle()));
+        }
     }
 }
diff --git a/application/forms/Dashboard/HomePaneForm.php b/application/forms/Dashboard/HomePaneForm.php
new file mode 100644
index 0000000000..d17f909f48
--- /dev/null
+++ b/application/forms/Dashboard/HomePaneForm.php
@@ -0,0 +1,151 @@
+<?php
+
+/* Icinga Web 2 | (c) 2022 Icinga GmbH | GPLv2+ */
+
+namespace Icinga\Forms\Dashboard;
+
+use Icinga\Application\Logger;
+use Icinga\Web\Dashboard\Common\BaseDashboard;
+use Icinga\Web\Dashboard\DashboardHome;
+use Icinga\Web\Notification;
+use Icinga\Web\Dashboard\Dashboard;
+use ipl\Web\Url;
+
+class HomePaneForm extends BaseDashboardForm
+{
+    protected function assemble()
+    {
+        $titleDesc = t('Edit the title of this dashboard home');
+        $buttonLabel = t('Update Home');
+        $removeButtonLabel = t('Remove Home');
+
+        $activeHome = $this->dashboard->getActiveHome();
+        $requestUrl = Url::fromRequest();
+        $removeTargetUrl = (clone $requestUrl)->setPath(Dashboard::BASE_ROUTE . '/remove-home');
+
+        $this->addElement('hidden', 'org_name', ['required' => false]);
+        $this->addElement('hidden', 'org_title', ['required' => false]);
+
+        if ($requestUrl->getPath() === Dashboard::BASE_ROUTE . '/edit-pane') {
+            $titleDesc = t('Edit the title of this dashboard pane');
+            $buttonLabel = t('Update Pane');
+            $removeButtonLabel = t('Remove Pane');
+        }
+
+        $this->addElement('text', 'title', [
+            'required'    => true,
+            'label'       => t('Title'),
+            'description' => $titleDesc
+        ]);
+
+        if ($requestUrl->getPath() === Dashboard::BASE_ROUTE . '/edit-pane') {
+            $removeTargetUrl = (clone $requestUrl)->setPath(Dashboard::BASE_ROUTE . '/remove-pane');
+
+            $homes = $this->dashboard->getEntryKeyTitleArr();
+            $populatedHome = $this->getPopulatedValue('home', $activeHome->getName());
+
+            $this->addElement('select', 'home', [
+                'class'        => 'autosubmit',
+                'required'     => true,
+                'value'        => $populatedHome,
+                'multiOptions' => array_merge([self::CREATE_NEW_HOME => self::CREATE_NEW_HOME], $homes),
+                'label'        => t('Assign to Home'),
+                'description'  => t('Select a dashboard home you want to move the dashboard to.'),
+            ]);
+
+            if (empty($homes) || $this->getPopulatedValue('home') === self::CREATE_NEW_HOME) {
+                $this->addElement('text', 'new_home', [
+                    'required'    => true,
+                    'label'       => t('Dashboard Home'),
+                    'placeholder' => t('Enter dashboard home title'),
+                    'description' => t('Enter a title for the new dashboard home.'),
+                ]);
+            }
+        }
+
+        $formControls = $this->createFormControls();
+        $formControls->add([
+            $this->registerSubmitButton($buttonLabel),
+            $this->createRemoveButton($removeTargetUrl, $removeButtonLabel),
+            $this->createCancelButton()
+        ]);
+
+        $this->addHtml($formControls);
+    }
+
+    protected function onSuccess()
+    {
+        $requestUrl = Url::fromRequest();
+        if ($requestUrl->getPath() === Dashboard::BASE_ROUTE . '/edit-pane') {
+            $orgHome = $this->dashboard->getEntry($requestUrl->getParam('home'));
+
+            $selectedHome = $this->getPopulatedValue('home');
+            if (! $selectedHome || $selectedHome === self::CREATE_NEW_HOME) {
+                $selectedHome = $this->getPopulatedValue('new_home');
+            }
+
+            $currentHome = new DashboardHome($selectedHome);
+            if ($this->dashboard->hasEntry($currentHome->getName())) {
+                /** @var DashboardHome $currentHome */
+                $currentHome = clone $this->dashboard->getEntry($currentHome->getName());
+                $activeHome = $this->dashboard->getActiveHome();
+                if ($currentHome->getName() !== $activeHome->getName()) {
+                    $currentHome->setActive()->loadDashboardEntries();
+                }
+            }
+
+            $currentPane = clone $orgHome->getEntry($this->getValue('org_name'));
+            $currentPane
+                ->setHome($currentHome)
+                ->setTitle($this->getValue('title'));
+
+            if ($orgHome->getName() !== $currentHome->getName() && $currentHome->hasEntry($currentPane->getName())) {
+                Notification::error(sprintf(
+                    t('Failed to move dashboard "%s": Dashbaord pane already exists within the "%s" dashboard home'),
+                    $currentPane->getTitle(),
+                    $currentHome->getTitle()
+                ));
+
+                return;
+            }
+
+            if ($currentHome->getName() === $orgHome->getName()) {
+                // There is no dashboard home diff so clear all the dashboard pane
+                // of the org home
+                $orgHome->setEntries([]);
+            }
+
+            $conn = Dashboard::getConn();
+            $conn->beginTransaction();
+
+            try {
+                $this->dashboard->manageEntry($currentHome);
+                $currentHome->manageEntry($currentPane, $orgHome);
+                // We have to update all the dashlet ids too sha1(username + home + pane + dashlet)
+                $currentPane->manageEntry($currentPane->getEntries());
+
+                $conn->commitTransaction();
+            } catch (\Exception $err) {
+                Logger::error($err);
+                $conn->rollBackTransaction();
+            }
+
+            Notification::success(sprintf(t('Updated dashboard pane "%s" successfully'), $currentPane->getTitle()));
+        } else {
+            $home = $this->dashboard->getActiveHome();
+            $home->setTitle($this->getValue('title'));
+
+            $this->dashboard->manageEntry($home);
+            Notification::success(sprintf(t('Updated dashboard home "%s" successfully'), $home->getTitle()));
+        }
+    }
+
+    public function load(BaseDashboard $dashboard)
+    {
+        $this->populate([
+            'org_title' => $dashboard->getTitle(),
+            'title'     => $dashboard->getTitle(),
+            'org_name'  => $dashboard->getName()
+        ]);
+    }
+}
diff --git a/application/forms/Dashboard/NewHomePaneForm.php b/application/forms/Dashboard/NewHomePaneForm.php
new file mode 100644
index 0000000000..f686c61d37
--- /dev/null
+++ b/application/forms/Dashboard/NewHomePaneForm.php
@@ -0,0 +1,123 @@
+<?php
+
+/* Icinga Web 2 | (c) 2022 Icinga GmbH | GPLv2+ */
+
+namespace Icinga\Forms\Dashboard;
+
+use Icinga\Web\Dashboard\Dashboard;
+use Icinga\Web\Dashboard\DashboardHome;
+use Icinga\Web\Dashboard\Pane;
+use Icinga\Web\Notification;
+use ipl\Web\Url;
+
+class NewHomePaneForm extends BaseDashboardForm
+{
+    public function __construct(Dashboard $dashboard)
+    {
+        parent::__construct($dashboard);
+
+        $requestUrl = Url::fromRequest();
+        if ($requestUrl->hasParam('home')) {
+            $this->populate(['home' => $requestUrl->getParam('home')]);
+        }
+    }
+
+    protected function assemble()
+    {
+        $requestUrl = Url::fromRequest();
+        if ($requestUrl->getPath() === Dashboard::BASE_ROUTE . '/new-pane') {
+            $placeHolder = t('Create new Dashboard');
+            $description = t('Add new dashboard to this home.');
+            $btnLabel = t('Add Dashboard');
+        } else {
+            $placeHolder = t('Create new Dashboard Home');
+            $description = t('Add new dashboard home.');
+            $btnLabel = t('Add Home');
+        }
+
+        $this->addElement('text', 'title', [
+            'required'    => true,
+            'label'       => t('Title'),
+            'placeholder' => $placeHolder,
+            'description' => $description
+        ]);
+
+        if ($requestUrl->getPath() === Dashboard::BASE_ROUTE . '/new-pane') {
+            $homes = array_merge(
+                [self::CREATE_NEW_HOME => self::CREATE_NEW_HOME],
+                $this->dashboard->getEntryKeyTitleArr()
+            );
+            $this->addElement('select', 'home', [
+                'required'     => true,
+                'class'        => 'autosubmit',
+                'value'        => $requestUrl->getParam('home', reset($homes)),
+                'multiOptions' => $homes,
+                'label'        => t('Assign to Home'),
+                'description'  => t('A dashboard home you want to assign the new dashboard to.'),
+            ]);
+
+            if ($this->getPopulatedValue('home') === self::CREATE_NEW_HOME) {
+                $this->addElement('text', 'new_home', [
+                    'required'    => true,
+                    'label'       => t('Dashboard Home'),
+                    'placeholder' => t('Enter dashboard home title'),
+                    'description' => t('Enter a title for the new dashboard home.'),
+                ]);
+            }
+        }
+
+        $formControls = $this->createFormControls();
+        $formControls->add([
+            $this->registerSubmitButton($btnLabel),
+            $this->createCancelButton()
+        ]);
+
+        $this->addHtml($formControls);
+    }
+
+    protected function onSuccess()
+    {
+        $requestUrl = Url::fromRequest();
+        $conn = Dashboard::getConn();
+
+        if ($requestUrl->getPath() === Dashboard::BASE_ROUTE . '/new-pane') {
+            $selectedHome = $this->getPopulatedValue('home');
+            if (! $selectedHome || $selectedHome === self::CREATE_NEW_HOME) {
+                $selectedHome = $this->getPopulatedValue('new_home');
+            }
+
+            $currentHome = new DashboardHome($selectedHome);
+            if ($this->dashboard->hasEntry($currentHome->getName())) {
+                $currentHome = clone $this->dashboard->getEntry($currentHome->getName());
+                if ($currentHome->getName() !== $this->dashboard->getActiveHome()->getName()) {
+                    $currentHome->setActive()->loadDashboardEntries();
+                }
+            }
+
+            $pane = new Pane($this->getPopulatedValue('title'));
+            $conn->beginTransaction();
+
+            try {
+                $this->dashboard->manageEntry($currentHome);
+                $currentHome->manageEntry($pane);
+
+                $conn->commitTransaction();
+            } catch (\Exception $err) {
+                $conn->rollBackTransaction();
+                throw $err;
+            }
+
+            Notification::success('Added dashboard successfully');
+        } else { // New home
+            $home = new DashboardHome($this->getPopulatedValue('title'));
+            if ($this->dashboard->hasEntry($home->getName())) {
+                Notification::error(sprintf(t('Dashboard home "%s" already exists'), $home->getName()));
+                return;
+            }
+
+            $this->dashboard->manageEntry($home);
+
+            Notification::success('Added dashboard home successfully');
+        }
+    }
+}
diff --git a/application/forms/Dashboard/RemoveDashletForm.php b/application/forms/Dashboard/RemoveDashletForm.php
new file mode 100644
index 0000000000..3aad587166
--- /dev/null
+++ b/application/forms/Dashboard/RemoveDashletForm.php
@@ -0,0 +1,42 @@
+<?php
+
+/* Icinga Web 2 | (c) 2022 Icinga GmbH | GPLv2+ */
+
+namespace Icinga\Forms\Dashboard;
+
+use Icinga\Web\Notification;
+use ipl\Html\HtmlElement;
+use ipl\Web\Url;
+
+class RemoveDashletForm extends BaseDashboardForm
+{
+    public function hasBeenSubmitted()
+    {
+        return $this->hasBeenSent() && $this->getPopulatedValue('btn_remove');
+    }
+
+    protected function assemble()
+    {
+        $this->addHtml(HtmlElement::create('h1', null, sprintf(
+            t('Please confirm removal of dashlet "%s"'),
+            Url::fromRequest()->getParam('dashlet')
+        )));
+
+        $submit = $this->registerSubmitButton(t('Remove Dashlet'));
+        $submit->setName('btn_remove');
+
+        $this->addHtml($submit);
+    }
+
+    protected function onSuccess()
+    {
+        $requestUrl = Url::fromRequest();
+        $home = $this->dashboard->getActiveHome();
+        $pane = $home->getEntry($requestUrl->getParam('pane'));
+
+        $dashlet = $requestUrl->getParam('dashlet');
+        $pane->removeEntry($dashlet);
+
+        Notification::success(sprintf(t('Removed dashlet "%s" successfully'), $dashlet));
+    }
+}
diff --git a/application/forms/Dashboard/RemoveHomePaneForm.php b/application/forms/Dashboard/RemoveHomePaneForm.php
new file mode 100644
index 0000000000..8116da81bc
--- /dev/null
+++ b/application/forms/Dashboard/RemoveHomePaneForm.php
@@ -0,0 +1,53 @@
+<?php
+
+/* Icinga Web 2 | (c) 2022 Icinga GmbH | GPLv2+ */
+
+namespace Icinga\Forms\Dashboard;
+
+use Icinga\Web\Notification;
+use Icinga\Web\Dashboard\Dashboard;
+use ipl\Html\HtmlElement;
+use ipl\Web\Url;
+
+class RemoveHomePaneForm extends BaseDashboardForm
+{
+    public function hasBeenSubmitted()
+    {
+        return $this->hasBeenSent() && $this->getPopulatedValue('btn_remove');
+    }
+
+    protected function assemble()
+    {
+        $requestRoute = Url::fromRequest();
+        $label = t('Remove Home');
+        $message = sprintf(t('Please confirm removal of dashboard home "%s"'), $requestRoute->getParam('home'));
+        if ($requestRoute->getPath() === Dashboard::BASE_ROUTE . '/remove-pane') {
+            $label = t('Remove Pane');
+            $message = sprintf(t('Please confirm removal of dashboard pane "%s"'), $requestRoute->getParam('pane'));
+        }
+
+        $this->addHtml(HtmlElement::create('h1', null, $message));
+
+        $submit = $this->registerSubmitButton($label);
+        $submit->setName('btn_remove');
+
+        $this->addHtml($submit);
+    }
+
+    protected function onSuccess()
+    {
+        $requestUrl = Url::fromRequest();
+        $home = $this->dashboard->getActiveHome();
+
+        if ($requestUrl->getPath() === Dashboard::BASE_ROUTE . '/remove-home') {
+            $this->dashboard->removeEntry($home);
+
+            Notification::success(sprintf(t('Removed dashboard home "%s" successfully'), $home->getTitle()));
+        } else {
+            $pane = $home->getEntry($requestUrl->getParam('pane'));
+            $home->removeEntry($pane);
+
+            Notification::success(sprintf(t('Removed dashboard pane "%s" successfully'), $pane->getTitle()));
+        }
+    }
+}
diff --git a/application/forms/Dashboard/SetupNewDashboardForm.php b/application/forms/Dashboard/SetupNewDashboardForm.php
new file mode 100644
index 0000000000..43df2d84ba
--- /dev/null
+++ b/application/forms/Dashboard/SetupNewDashboardForm.php
@@ -0,0 +1,320 @@
+<?php
+
+namespace Icinga\Forms\Dashboard;
+
+use Icinga\Web\Dashboard\Dashboard;
+use Icinga\Web\Dashboard\DashboardHome;
+use Icinga\Web\Dashboard\Dashlet;
+use Icinga\Web\Dashboard\ItemList\DashletListMultiSelect;
+use Icinga\Web\Dashboard\ItemList\EmptyDashlet;
+use Icinga\Web\Dashboard\Pane;
+use Icinga\Web\Notification;
+use ipl\Html\HtmlElement;
+use ipl\Html\ValidHtml;
+use ipl\Web\Url;
+use ipl\Web\Widget\Icon;
+
+class SetupNewDashboardForm extends BaseDashboardForm
+{
+    const DATA_TOGGLE_ELEMENT = 'dashlets-list-info';
+
+    /**
+     * Caches all module dashlets
+     *
+     * @var array
+     */
+    protected static $moduleDashlets = [];
+
+    protected $duplicateCustomDashlet = false;
+
+    protected function init()
+    {
+        parent::init();
+
+        if (empty(self::$moduleDashlets)) {
+            self::$moduleDashlets = Dashboard::getModuleDashlets();
+        }
+
+        $this->setRedirectUrl((string) Url::fromPath(Dashboard::BASE_ROUTE));
+        $this->setAction($this->getRedirectUrl() . '/setup-dashboard');
+    }
+
+    /**
+     * Dump all module dashlets which are not selected by the user
+     * from the member variable
+     *
+     * @param bool $strict Whether to match populated of the dashlet against a 'y'
+     *
+     * @return void
+     */
+    protected function dumpArbitaryDashlets(bool $strict = true): void
+    {
+        $chosenDashlets = [];
+        foreach (self::$moduleDashlets as $module => $dashlets) {
+            /** @var Dashlet $dashlet */
+            foreach ($dashlets as $dashlet) {
+                $element = str_replace(' ', '_', $module . '|' . $dashlet->getName());
+                if ($this->getPopulatedValue($element) === 'y' || (! $strict && $this->getPopulatedValue($element))) {
+                    $title = $this->getPopulatedValue($element);
+                    $url = $this->getPopulatedValue($element . '_url');
+
+                    if (! $strict && $title && $url) {
+                        $dashlet
+                            ->setUrl($url)
+                            ->setName($title)
+                            ->setTitle($title);
+                    }
+
+                    $chosenDashlets[$module][$dashlet->getName()] = $dashlet;
+                }
+            }
+
+            if (isset($chosenDashlets[$module]) && ! $this->duplicateCustomDashlet) {
+                $this->duplicateCustomDashlet = array_key_exists(
+                    $this->getPopulatedValue('dashlet'),
+                    $chosenDashlets[$module]
+                );
+            }
+        }
+
+        self::$moduleDashlets = $chosenDashlets;
+    }
+
+    /**
+     * Get whether we are updating an existing dashlet
+     *
+     * @return bool
+     */
+    protected function isUpdatingADashlet()
+    {
+        return Url::fromRequest()->getPath() === Dashboard::BASE_ROUTE . '/edit-dashlet';
+    }
+
+    /**
+     * Assemble the next page of the modal view
+     *
+     * @return void
+     */
+    protected function assembleNextPage()
+    {
+        $strict = $this->isUpdatingADashlet() || $this->getPopulatedValue('btn_next') || ! $this->hasBeenSent();
+        $this->dumpArbitaryDashlets($strict);
+        $this->assembleNextPageDashboardPart();
+        $this->assembleNexPageDashletPart();
+    }
+
+    /**
+     * Assemble the browsed module dashlets on the initial view
+     *
+     * @return void
+     */
+    protected function assembleSelectDashletView()
+    {
+        if ($this->getPopulatedValue('btn_next')) {
+            return;
+        }
+
+        $emptyList = new EmptyDashlet();
+        $emptyList->setCheckBox($this->createElement('checkbox', 'custom_url', ['class' => 'sr-only']));
+
+        $listControl = $this->createFormListControls();
+        $listControl->addHtml($emptyList);
+
+        $this->addHtml($listControl);
+
+        foreach (self::$moduleDashlets as $module => $dashlets) {
+            $listControl = $this->createFormListControls(true);
+            $list = HtmlElement::create('ul', ['class' => 'dashlet-item-list']);
+            $listControl->addHtml(HtmlElement::create('span', null, ucfirst($module)));
+
+            /** @var Dashlet $dashlet */
+            foreach ($dashlets as $dashlet) {
+                $multi = new DashletListMultiSelect($dashlet);
+                $multi->setCheckBox($this->createElement(
+                    'checkbox',
+                    $module . '|' . $dashlet->getName(),
+                    ['class' => 'sr-only']
+                ));
+
+                $list->addHtml($multi);
+            }
+
+            $this->addHtml($listControl->addHtml($list));
+        }
+    }
+
+    /**
+     * Assemble the dashboard part of elements on the next page
+     *
+     * @return void
+     */
+    protected function assembleNextPageDashboardPart()
+    {
+        $this->addElement('text', 'pane', [
+            'required'    => true,
+            'label'       => t('Dashboard Title'),
+            'description' => t('Enter a title for the new dashboard you want to add the dashlets to')
+        ]);
+    }
+
+    /**
+     * Assemble the dashlet part of elements on the next page
+     *
+     * @return void
+     */
+    protected function assembleNexPageDashletPart()
+    {
+        if ($this->getPopulatedValue('custom_url') === 'y') {
+            $this->addHtml(HtmlElement::create('hr'));
+            $this->assembleDashletElements();
+        }
+
+        if (! empty(self::$moduleDashlets)) {
+            foreach (self::$moduleDashlets as $module => $dashlets) {
+                /** @var Dashlet $dashlet */
+                foreach ($dashlets as $dashlet) {
+                    $listControl = $this->createFormListControls(true);
+                    $listControl->getAttributes()->add('class', 'multi-dashlets');
+
+                    $dashletName = $this->createElement('text', $module . '|' . $dashlet->getName(), [
+                        'required'    => true,
+                        'label'       => t('Dashlet Title'),
+                        'value'       => $dashlet->getTitle(),
+                        'description' => t('Enter a title for the dashlet'),
+                    ]);
+
+                    $dashletUrl = $this->createElement('textarea', $module . '|' . $dashlet->getName() . '_url', [
+                        'required'    => true,
+                        'label'       => t('Url'),
+                        'value'       => $dashlet->getUrl()->getRelativeUrl(),
+                        'description' => t(
+                            'Enter url to be loaded in the dashlet. You can paste the full URL, including filters'
+                        )
+                    ]);
+
+                    $this->registerElement($dashletName)->decorate($dashletName);
+                    $this->registerElement($dashletUrl)->decorate($dashletUrl);
+
+                    $listControl->addHtml(HtmlElement::create('span', null, t($dashlet->getTitle())));
+
+                    $listControl->addHtml($dashletName);
+                    $listControl->addHtml($dashletUrl);
+
+                    $this->addHtml($listControl);
+                }
+            }
+        }
+    }
+
+    protected function assembleDashletElements()
+    {
+        $this->addElement('hidden', 'custom_url', ['required' => false, 'value' => 'y']);
+        $this->addElement('text', 'dashlet', [
+            'required'    => true,
+            'label'       => t('Dashlet Title'),
+            'placeholder' => t('Enter a dashlet title'),
+            'description' => t('Enter a title for the dashlet.'),
+        ]);
+
+        $this->addElement('textarea', 'url', [
+            'required'    => true,
+            'label'       => t('Url'),
+            'placeholder' => t('Enter dashlet url'),
+            'description' => t(
+                'Enter url to be loaded in the dashlet. You can paste the full URL, including filters.'
+            ),
+        ]);
+    }
+
+    protected function assemble()
+    {
+        if ($this->getPopulatedValue('btn_next')) { // Configure Dashlets
+            $submitButtonLabel = t('Add Dashlets');
+            $this->assembleNextPage();
+        } else {
+            $submitButtonLabel = t('Next');
+            $this->assembleSelectDashletView();
+        }
+
+        $submitButton = $this->registerSubmitButton($submitButtonLabel);
+        if (! $this->getPopulatedValue('btn_next')) {
+            $submitButton
+                ->setName('btn_next')
+                ->getAttributes()->add('class', 'autosubmit');
+        }
+
+        $formControls = $this->createFormControls();
+        $formControls->add([$submitButton, $this->createCancelButton()]);
+
+        $this->addHtml($formControls);
+    }
+
+    protected function onSuccess()
+    {
+        if ($this->getPopulatedValue('submit')) {
+            $conn = Dashboard::getConn();
+            $pane = new Pane($this->getPopulatedValue('pane'));
+            $home = $this->dashboard->getEntry(DashboardHome::DEFAULT_HOME);
+
+            $conn->beginTransaction();
+
+            try {
+                $this->dashboard->manageEntry($home);
+                $home->manageEntry($pane);
+
+                $this->dumpArbitaryDashlets(false);
+
+                if (($name = $this->getPopulatedValue('dashlet')) && ($url = $this->getPopulatedValue('url'))) {
+                    if ($this->duplicateCustomDashlet) {
+                        Notification::error(sprintf(
+                            t('Failed to create new dahlets. Dashlet "%s" exists within the selected one'),
+                            $name
+                        ));
+
+                        return;
+                    }
+
+                    $dashlet = new Dashlet($name, $url, $pane);
+                    $pane->manageEntry($dashlet);
+                }
+
+                $pane->manageEntry(self::$moduleDashlets);
+
+                $conn->commitTransaction();
+            } catch (\Exception $err) {
+                $conn->rollBackTransaction();
+                throw $err;
+            }
+
+            Notification::success(t('Added new dashlet(s) successfully'));
+        }
+    }
+
+    /**
+     * Create form list controls (can be collapsible if you want)
+     *
+     * @param bool $makeCollapsible
+     *
+     * @return ValidHtml
+     */
+    protected function createFormListControls(bool $makeCollapsible = false): ValidHtml
+    {
+        $listControls = HtmlElement::create('div', [
+            'class' => ['control-group', 'form-list-control'],
+        ]);
+
+        if ($makeCollapsible) {
+            $listControls
+                ->getAttributes()
+                ->add('data-toggle-element', '.' . self::DATA_TOGGLE_ELEMENT)
+                ->add('class', 'collapsible');
+
+            $listControls->addHtml(HtmlElement::create('div', ['class' => self::DATA_TOGGLE_ELEMENT], [
+                new Icon('angle-down', ['class' => 'expand-icon', 'title' => t('Expand')]),
+                new Icon('angle-up', ['class' => 'collapse-icon', 'title' => t('Collapse')])
+            ]));
+        }
+
+        return $listControls;
+    }
+}
diff --git a/application/forms/Dashboard/WelcomeForm.php b/application/forms/Dashboard/WelcomeForm.php
new file mode 100644
index 0000000000..4951d900de
--- /dev/null
+++ b/application/forms/Dashboard/WelcomeForm.php
@@ -0,0 +1,62 @@
+<?php
+
+/* Icinga Web 2 | (c) 2022 Icinga GmbH | GPLv2+ */
+
+namespace Icinga\Forms\Dashboard;
+
+use Icinga\Web\Dashboard\Dashboard;
+use Icinga\Web\Dashboard\DashboardHome;
+use ipl\Web\Compat\CompatForm;
+use ipl\Web\Url;
+
+class WelcomeForm extends CompatForm
+{
+    /** @var Dashboard */
+    protected $dashboard;
+
+    public function __construct(Dashboard $dashboard)
+    {
+        $this->dashboard = $dashboard;
+        $this->setRedirectUrl((string) Url::fromPath(Dashboard::BASE_ROUTE));
+    }
+
+    public function hasBeenSubmitted()
+    {
+        return parent::hasBeenSubmitted() || $this->getPressedSubmitElement();
+    }
+
+    protected function assemble()
+    {
+        $element = $this->createElement('submit', 'btn_use_defaults', ['label' => t('Use System Defaults')]);
+        $this->registerElement($element)->decorate($element);
+
+        $this->addElement('submit', 'btn_customize_dashlets', [
+            'label'               => t('Add Dashlets Now'),
+            'href'                => Url::fromPath(Dashboard::BASE_ROUTE . '/setup-dashboard'),
+            'data-icinga-modal'   => true,
+            'data-no-icinga-ajax' => true
+        ]);
+
+        $this->getElement('btn_customize_dashlets')->setWrapper($element->getWrapper());
+    }
+
+    protected function onSuccess()
+    {
+        if ($this->getPopulatedValue('btn_use_defaults')) {
+            $home = $this->dashboard->getEntry(DashboardHome::DEFAULT_HOME);
+            $conn = Dashboard::getConn();
+            $conn->beginTransaction();
+
+            try {
+                // Default Home might have been disabled, so we have to update it first
+                $this->dashboard->manageEntry($home);
+                $home->manageEntry($this->dashboard->getSystemDefaults(), null, true);
+
+                $conn->commitTransaction();
+            } catch (\Exception $err) {
+                $conn->rollBackTransaction();
+                throw $err;
+            }
+        }
+    }
+}
diff --git a/application/layouts/scripts/body.phtml b/application/layouts/scripts/body.phtml
index 87b570bfe5..fea90ee7bc 100644
--- a/application/layouts/scripts/body.phtml
+++ b/application/layouts/scripts/body.phtml
@@ -1,5 +1,6 @@
 <?php
 
+use Icinga\Web\Dashboard\Dashboard;
 use Icinga\Web\Url;
 use Icinga\Web\Notification;
 use Icinga\Authentication\Auth;
@@ -36,7 +37,7 @@ if ($this->layout()->inlineLayout) {
         <div id="header-logo-container">
             <?= $this->qlink(
                 '',
-                Auth::getInstance()->isAuthenticated() ? 'dashboard' : '',
+                Auth::getInstance()->isAuthenticated() ? Dashboard::BASE_ROUTE : '',
                 null,
                 array(
                     'aria-hidden'       => 'true',
diff --git a/application/layouts/scripts/layout.phtml b/application/layouts/scripts/layout.phtml
index 1800f2c157..c4417c6c95 100644
--- a/application/layouts/scripts/layout.phtml
+++ b/application/layouts/scripts/layout.phtml
@@ -87,7 +87,7 @@ $innerLayoutScript = $this->layout()->innerLayout . '.phtml';
         <section class="modal-window">
             <div class="modal-header">
                 <h1></h1>
-                <button type="button"><?= $this->icon('cancel') ?></button>
+                <button type="button" data-icinga-modal-cancel><?= $this->icon('cancel') ?></button>
             </div>
             <div class="modal-area">
                 <div id="modal-content" data-base-target="modal-content" tabindex data-no-icinga-ajax></div>
diff --git a/application/views/scripts/layout/menu.phtml b/application/views/scripts/layout/menu.phtml
index c82d5cc846..20188fdc43 100644
--- a/application/views/scripts/layout/menu.phtml
+++ b/application/views/scripts/layout/menu.phtml
@@ -5,7 +5,8 @@ use Icinga\Web\Widget\SearchDashboard;
 $searchDashboard = new SearchDashboard();
 $searchDashboard->setUser($this->Auth()->getUser());
 
-if ($searchDashboard->search('dummy')->getPane('search')->hasDashlets()): ?>
+$searchPane = $searchDashboard->search('dummy')->getActiveHome()->getEntry(SearchDashboard::SEARCH_PANE);
+if ($searchPane->hasEntries()): ?>
     <form action="<?= $this->href('search') ?>" method="get" role="search" class="search-control">
         <input type="text" name="q" id="search" class="search search-input" required
                placeholder="<?= $this->translate('Search') ?> &hellip;"
diff --git a/application/views/scripts/search/index.phtml b/application/views/scripts/search/index.phtml
deleted file mode 100644
index 321597e701..0000000000
--- a/application/views/scripts/search/index.phtml
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="controls">
-<?= $this->dashboard->getTabs() ?>
-</div>
-
-<div class="content dashboard">
-<?= $this->dashboard ?>
-</div>
diff --git a/etc/schema/mysql-upgrades/2.11.sql b/etc/schema/mysql-upgrades/2.11.sql
new file mode 100644
index 0000000000..8f367f8c55
--- /dev/null
+++ b/etc/schema/mysql-upgrades/2.11.sql
@@ -0,0 +1,63 @@
+CREATE TABLE `icingaweb_dashboard_home` (
+    `id`        int(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+    `name`      varchar(64) NOT NULL COLLATE utf8mb4_unicode_ci,
+    `label`     varchar(64) NOT NULL COLLATE utf8mb4_unicode_ci,
+    `username`  varchar(254) NOT NULL COLLATE utf8mb4_unicode_ci,
+    `priority`  tinyint NOT NULL,
+    `disabled`  tinyint DEFAULT 0,
+    `type`      enum('public', 'private', 'shared') DEFAULT 'private',
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `idx_dashboard_home_name` (`name`, `username`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
+
+CREATE TABLE `icingaweb_dashboard` (
+    `id`        binary(20) NOT NULL,
+    `home_id`   int(10) UNSIGNED NOT NULL,
+    `username`  varchar(254) NOT NULL COLLATE utf8mb4_unicode_ci,
+    `name`      varchar(64) NOT NULL COLLATE utf8mb4_unicode_ci,
+    `label`     varchar(64) NOT NULL COLLATE utf8mb4_unicode_ci,
+    `priority`  tinyint NOT NULL,
+    PRIMARY KEY (`id`),
+    KEY `fk_dashboard_dashboard_home` (`home_id`),
+    CONSTRAINT `fk_dashboard_dashboard_home` FOREIGN KEY (`home_id`)
+      REFERENCES  `icingaweb_dashboard_home` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
+
+CREATE TABLE `icingaweb_dashlet` (
+    `id`            binary(20) NOT NULL,
+    `dashboard_id`  binary(20) NOT NULL,
+    `name`          varchar(64) NOT NULL COLLATE utf8mb4_unicode_ci,
+    `label`         varchar(254) NOT NULL COLLATE utf8mb4_unicode_ci,
+    `url`           varchar(2048) NOT NULL COLLATE utf8mb4_bin,
+    `priority`      tinyint NOT NULL,
+    PRIMARY KEY (`id`),
+    KEY `fk_dashlet_dashboard` (`dashboard_id`),
+    CONSTRAINT `fk_dashlet_dashboard` FOREIGN KEY (`dashboard_id`)
+      REFERENCES `icingaweb_dashboard` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
+
+CREATE TABLE `icingaweb_module_dashlet` (
+    `id`            binary(20) NOT NULL,
+    `name`          varchar(64) NOT NULL COLLATE utf8mb4_unicode_ci,
+    `label`         varchar(64) NOT NULL COLLATE utf8mb4_unicode_ci,
+    `module`        varchar(64) NOT NULL COLLATE utf8mb4_unicode_ci,
+    `pane`          varchar(64) DEFAULT NULL COLLATE utf8mb4_unicode_ci,
+    `url`           varchar(2048) NOT NULL COLLATE utf8mb4_bin,
+    `description`   text DEFAULT NULL COLLATE utf8mb4_unicode_ci,
+    `priority`      int(10) DEFAULT 0,
+    PRIMARY KEY (`id`),
+    INDEX `idx_module_dashlet_name` (`name`),
+    INDEX `idx_module_dashlet_pane` (`pane`),
+    INDEX `idx_module_dashlet_module` (`module`),
+    INDEX `idx_module_dashlet_priority` (`priority`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
+
+CREATE TABLE `icingaweb_system_dashlet` (
+    `id`                int(10) NOT NULL PRIMARY KEY AUTO_INCREMENT,
+    `dashlet_id`        binary(20) NOT NULL,
+    `module_dashlet_id` binary(20) NOT NULL,
+    CONSTRAINT `fk_dashlet_system_dashlet` FOREIGN KEY (`dashlet_id`)
+      REFERENCES `icingaweb_dashlet` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+    CONSTRAINT `fk_dashlet_system_module_dashlet` FOREIGN KEY (`module_dashlet_id`)
+      REFERENCES `icingaweb_module_dashlet` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
diff --git a/etc/schema/mysql.schema.sql b/etc/schema/mysql.schema.sql
index 62168c39d7..55feef38eb 100644
--- a/etc/schema/mysql.schema.sql
+++ b/etc/schema/mysql.schema.sql
@@ -52,3 +52,70 @@ CREATE TABLE `icingaweb_rememberme`(
   mtime             timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (id)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
+
+
+# Icinga Web 2 Dashboards
+
+CREATE TABLE `icingaweb_dashboard_home` (
+    `id`        int(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+    `name`      varchar(64) NOT NULL COLLATE utf8mb4_unicode_ci,
+    `label`     varchar(64) NOT NULL COLLATE utf8mb4_unicode_ci,
+    `username`  varchar(254) NOT NULL COLLATE utf8mb4_unicode_ci,
+    `priority`  tinyint NOT NULL,
+    `type`      enum('public', 'private', 'shared') DEFAULT 'private',
+    `disabled`  tinyint DEFAULT 0,
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `idx_dashboard_home_name` (`name`, `username`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
+
+CREATE TABLE `icingaweb_dashboard` (
+    `id`        binary(20) NOT NULL,
+    `home_id`   int(10) UNSIGNED NOT NULL,
+    `username`  varchar(254) NOT NULL COLLATE utf8mb4_unicode_ci,
+    `name`      varchar(64) NOT NULL COLLATE utf8mb4_unicode_ci,
+    `label`     varchar(64) NOT NULL COLLATE utf8mb4_unicode_ci,
+    `priority`  tinyint NOT NULL,
+    PRIMARY KEY (`id`),
+    KEY `fk_dashboard_dashboard_home` (`home_id`),
+    CONSTRAINT `fk_dashboard_dashboard_home` FOREIGN KEY (`home_id`)
+      REFERENCES  `icingaweb_dashboard_home` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
+
+CREATE TABLE `icingaweb_dashlet` (
+    `id`            binary(20) NOT NULL,
+    `dashboard_id`  binary(20) NOT NULL,
+    `name`          varchar(64) NOT NULL COLLATE utf8mb4_unicode_ci,
+    `label`         varchar(254) NOT NULL COLLATE utf8mb4_unicode_ci,
+    `url`           varchar(2048) NOT NULL COLLATE utf8mb4_bin,
+    `priority`      tinyint NOT NULL,
+    PRIMARY KEY (`id`),
+    KEY `fk_dashlet_dashboard` (`dashboard_id`),
+    CONSTRAINT `fk_dashlet_dashboard` FOREIGN KEY (`dashboard_id`)
+      REFERENCES `icingaweb_dashboard` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
+
+CREATE TABLE `icingaweb_module_dashlet` (
+    `id`            binary(20) NOT NULL,
+    `name`          varchar(64) NOT NULL COLLATE utf8mb4_unicode_ci,
+    `label`         varchar(64) NOT NULL COLLATE utf8mb4_unicode_ci,
+    `module`        varchar(64) NOT NULL COLLATE utf8mb4_unicode_ci,
+    `pane`          varchar(64) DEFAULT NULL COLLATE utf8mb4_unicode_ci,
+    `url`           varchar(2048) NOT NULL COLLATE utf8mb4_bin,
+    `description`   text DEFAULT NULL COLLATE utf8mb4_unicode_ci,
+    `priority`      int(10) DEFAULT 0,
+    PRIMARY KEY (`id`),
+    INDEX `idx_module_dashlet_name` (`name`),
+    INDEX `idx_module_dashlet_pane` (`pane`),
+    INDEX `idx_module_dashlet_module` (`module`),
+    INDEX `idx_module_dashlet_priority` (`priority`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
+
+CREATE TABLE `icingaweb_system_dashlet` (
+    `id`                int(10) NOT NULL PRIMARY KEY AUTO_INCREMENT,
+    `dashlet_id`        binary(20) NOT NULL,
+    `module_dashlet_id` binary(20) NOT NULL,
+    CONSTRAINT `fk_dashlet_system_dashlet` FOREIGN KEY (`dashlet_id`)
+      REFERENCES `icingaweb_dashlet` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+    CONSTRAINT `fk_dashlet_system_module_dashlet` FOREIGN KEY (`module_dashlet_id`)
+      REFERENCES `icingaweb_module_dashlet` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
diff --git a/library/Icinga/Application/Modules/DashboardContainer.php b/library/Icinga/Application/Modules/DashboardContainer.php
index f3c8bc671f..0f49f0eddf 100644
--- a/library/Icinga/Application/Modules/DashboardContainer.php
+++ b/library/Icinga/Application/Modules/DashboardContainer.php
@@ -13,7 +13,7 @@ class DashboardContainer extends NavigationItemContainer
      *
      * @var array
      */
-    protected $dashlets;
+    protected $dashlets = [];
 
     /**
      * Set this dashboard's dashlets
@@ -35,7 +35,11 @@ public function setDashlets(array $dashlets)
      */
     public function getDashlets()
     {
-        return $this->dashlets ?: array();
+        uasort($this->dashlets, function (array $x, array $y) {
+            return $x['priority'] <=> $y['priority'];
+        });
+
+        return $this->dashlets;
     }
 
     /**
diff --git a/library/Icinga/Application/Modules/DashletContainer.php b/library/Icinga/Application/Modules/DashletContainer.php
new file mode 100644
index 0000000000..17771f0594
--- /dev/null
+++ b/library/Icinga/Application/Modules/DashletContainer.php
@@ -0,0 +1,58 @@
+<?php
+
+/* Icinga Web 2 | (c) 2022 Icinga GmbH | GPLv2+ */
+
+namespace Icinga\Application\Modules;
+
+use ipl\Web\Url;
+
+/**
+ * Container for module dashlets
+ */
+class DashletContainer extends NavigationItemContainer
+{
+    /**
+     * Url of this dashlet item
+     *
+     * @var Url|string
+     */
+    protected $url;
+
+    /**
+     * Create a new Dashlet container
+     *
+     * @param string $name
+     * @param Url|string $url
+     * @param array $properties
+     */
+    public function __construct($name, $url, array $properties = [])
+    {
+        parent::__construct($name, $properties);
+
+        $this->url = $url;
+    }
+
+    /**
+     * Get url of this dashlet item
+     *
+     * @return Url|string
+     */
+    public function getUrl()
+    {
+        return $this->url;
+    }
+
+    /**
+     * Set url of this dashlet item
+     *
+     * @param Url|string $url
+     *
+     * @return $this
+     */
+    public function setUrl($url)
+    {
+        $this->url = $url;
+
+        return $this;
+    }
+}
diff --git a/library/Icinga/Application/Modules/Module.php b/library/Icinga/Application/Modules/Module.php
index a4af342204..a4f5aec970 100644
--- a/library/Icinga/Application/Modules/Module.php
+++ b/library/Icinga/Application/Modules/Module.php
@@ -18,6 +18,9 @@
 use ipl\I18n\GettextTranslator;
 use ipl\I18n\StaticTranslator;
 use ipl\I18n\Translation;
+use ipl\Web\Url;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
 use Zend_Controller_Router_Route;
 use Zend_Controller_Router_Route_Abstract;
 use Zend_Controller_Router_Route_Regex;
@@ -204,6 +207,9 @@ class Module
      */
     protected $routes = array();
 
+    /** @var string[] Framework parameters of this module */
+    protected $frameworkParams = [];
+
     /**
      * A set of menu elements
      *
@@ -214,9 +220,16 @@ class Module
     /**
      * A set of Pane elements
      *
-     * @var array
+     * @var DashboardContainer[]
+     */
+    protected $paneItems = [];
+
+    /**
+     * A set of Dashlet elements
+     *
+     * @var DashletContainer[]
      */
-    protected $paneItems = array();
+    protected $dashletItems = [];
 
     /**
      * A set of objects representing a searchUrl configuration
@@ -273,6 +286,18 @@ public function __construct(ApplicationBootstrap $app, $name, $basedir)
         $this->translationDomain = $name;
     }
 
+    /**
+     * Get this module's framework parameters
+     *
+     * @return string[]
+     */
+    public function getFrameworkParams(): array
+    {
+        $this->launchConfigScript();
+
+        return $this->frameworkParams;
+    }
+
     /**
      * Provide a search URL
      *
@@ -307,49 +332,12 @@ public function getSearchUrls()
     /**
      * Return this module's dashboard
      *
-     * @return  Navigation
+     * @return DashboardContainer[]
      */
     public function getDashboard()
     {
         $this->launchConfigScript();
-        return $this->createDashboard($this->paneItems);
-    }
-
-    /**
-     * Create and return a new navigation for the given dashboard panes
-     *
-     * @param   DashboardContainer[]    $panes
-     *
-     * @return  Navigation
-     */
-    public function createDashboard(array $panes)
-    {
-        $navigation = new Navigation();
-        foreach ($panes as $pane) {
-            /** @var DashboardContainer $pane */
-            $dashlets = [];
-            foreach ($pane->getDashlets() as $dashletName => $dashletConfig) {
-                $dashlets[$dashletName] = [
-                    'label'     => $this->translate($dashletName),
-                    'url'       => $dashletConfig['url'],
-                    'priority'  => $dashletConfig['priority']
-                ];
-            }
-
-            $navigation->addItem(
-                $pane->getName(),
-                array_merge(
-                    $pane->getProperties(),
-                    array(
-                        'label'     => $this->translate($pane->getName()),
-                        'type'      => 'dashboard-pane',
-                        'children'  => $dashlets
-                    )
-                )
-            );
-        }
-
-        return $navigation;
+        return $this->paneItems;
     }
 
     /**
@@ -371,6 +359,37 @@ protected function dashboard($name, array $properties = array())
         return $this->paneItems[$name];
     }
 
+    /**
+     * Get this module's provided dashlets
+     *
+     * @return DashletContainer[]
+     */
+    public function getDashlets()
+    {
+        $this->launchConfigScript();
+        return $this->dashletItems;
+    }
+
+    /**
+     * Add or get a dashlet
+     *
+     * @param string $name
+     * @param Url|string $url
+     * @param array $properties
+     *
+     * @return DashletContainer
+     */
+    protected function provideDashlet(string $name, $url, array $properties = [])
+    {
+        if (array_key_exists($name, $this->dashletItems)) {
+            $this->dashletItems[$name]->setProperties($properties);
+        } else {
+            $this->dashletItems[$name] = new DashletContainer($name, $url, $properties);
+        }
+
+        return $this->dashletItems[$name];
+    }
+
     /**
      * Return this module's menu
      *
@@ -1457,4 +1476,18 @@ protected function addRoute($name, Zend_Controller_Router_Route_Abstract $route)
         $this->routes[$name] = $route;
         return $this;
     }
+
+    /**
+     * Register URL parameters which should be ignored by various URL handlers
+     *
+     * @param string ...$params
+     *
+     * @return $this
+     */
+    protected function addFrameworkParams(string ...$params): self
+    {
+        $this->frameworkParams = array_merge($this->frameworkParams, $params);
+
+        return $this;
+    }
 }
diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php
index 3cf6faeac5..49bfc9f536 100644
--- a/library/Icinga/Application/Web.php
+++ b/library/Icinga/Application/Web.php
@@ -133,6 +133,33 @@ public function getThemes()
         return array_combine($themes, $themes);
     }
 
+    /**
+     * Get default framework parameters and those of the current module
+     *
+     * @return string[]
+     */
+    public function getFrameworkParams(): array
+    {
+        $defaultParams = [
+            'isIframe',
+            'showFullscreen',
+            'showCompact',
+            'renderLayout',
+            '_disableLayout',
+            '_dashlet',
+            '_dev',
+            // TODO: is this really a "framework" param? or should the all be called differently, widgetyUrlFlags perhaps?
+            'page'
+        ];
+
+        $moduleParams = [];
+        if (($moduleName = $this->getRequest()->getModuleName()) !== 'default') {
+            $moduleParams = $this->getModuleManager()->getModule($moduleName)->getFrameworkParams();
+        }
+
+        return array_merge($defaultParams, $moduleParams);
+    }
+
     /**
      * Prepare routing
      *
diff --git a/library/Icinga/Model/Dashlet.php b/library/Icinga/Model/Dashlet.php
new file mode 100644
index 0000000000..ffb05e471b
--- /dev/null
+++ b/library/Icinga/Model/Dashlet.php
@@ -0,0 +1,66 @@
+<?php
+
+/* Icinga Web 2 | (c) 2022 Icinga GmbH | GPLv2+ */
+
+namespace Icinga\Model;
+
+use Icinga\Web\Dashboard;
+use ipl\Orm\Model;
+use ipl\Orm\Relations;
+
+class Dashlet extends Model
+{
+    public function getTableName()
+    {
+        return Dashboard\Dashlet::TABLE;
+    }
+
+    public function getKeyName()
+    {
+        return 'id';
+    }
+
+    public function getColumns()
+    {
+        return [
+            'dashboard_id',
+            'name',
+            'label',
+            'url',
+            'priority'
+        ];
+    }
+
+    public function getMetaData()
+    {
+        return [
+            'dashboard_id' => t('Dashboard Id'),
+            'name'         => t('Dashlet Name'),
+            'label'        => t('Dashlet Title'),
+            'url'          => t('Dashlet Url'),
+            'priority'     => t('Dashlet Order Priority')
+        ];
+    }
+
+    public function getSearchColumns()
+    {
+        return ['name'];
+    }
+
+    public function getDefaultSort()
+    {
+        return 'priority';
+    }
+
+    public function createRelations(Relations $relations)
+    {
+        $relations->belongsTo(Dashboard\Pane::TABLE, Pane::class)
+            ->setCandidateKey('dashboard_id');
+        //$relations->belongsTo(Dashboard\DashboardHome::TABLE, Home::class);
+
+        $relations->belongsToMany('icingaweb_module_dashlet', ModuleDashlet::class)
+            ->through(SystemDashlet::class)
+            ->setForeignKey('dashlet_id')
+            ->setJoinType('LEFT');
+    }
+}
diff --git a/library/Icinga/Model/Home.php b/library/Icinga/Model/Home.php
new file mode 100644
index 0000000000..703e3509cf
--- /dev/null
+++ b/library/Icinga/Model/Home.php
@@ -0,0 +1,61 @@
+<?php
+
+/* Icinga Web 2 | (c) 2022 Icinga GmbH | GPLv2+ */
+
+namespace Icinga\Model;
+
+use Icinga\Web\Dashboard\DashboardHome;
+use Icinga\Web\Dashboard;
+use ipl\Orm\Model;
+use ipl\Orm\Relations;
+
+class Home extends Model
+{
+    public function getTableName()
+    {
+        return DashboardHome::TABLE;
+    }
+
+    public function getKeyName()
+    {
+        return 'id';
+    }
+
+    public function getColumns()
+    {
+        return [
+            'name',
+            'label',
+            'username',
+            'type',
+            'priority',
+            'disabled',
+        ];
+    }
+
+    public function getMetaData()
+    {
+        return [
+            'name'     => t('Dashboard Home Name'),
+            'label'    => t('Dashboard Home Title'),
+            'priority' => t('Dashboard Order Priority')
+        ];
+    }
+
+    public function getSearchColumns()
+    {
+        return ['name'];
+    }
+
+    public function getDefaultSort()
+    {
+        return 'name';
+    }
+
+    public function createRelations(Relations $relations)
+    {
+        $relations->hasMany(Dashboard\Pane::TABLE, Pane::class);
+
+        //$relations->hasMany(Dashboard\Dashlet::TABLE, Dashlet::class);
+    }
+}
diff --git a/library/Icinga/Model/ModuleDashlet.php b/library/Icinga/Model/ModuleDashlet.php
new file mode 100644
index 0000000000..1a712a2f30
--- /dev/null
+++ b/library/Icinga/Model/ModuleDashlet.php
@@ -0,0 +1,66 @@
+<?php
+
+/* Icinga Web 2 | (c) 2022 Icinga GmbH | GPLv2+ */
+
+namespace Icinga\Model;
+
+use Icinga\Web\Dashboard;
+use ipl\Orm\Model;
+use ipl\Orm\Relations;
+
+class ModuleDashlet extends Model
+{
+    public function getTableName()
+    {
+        return 'icingaweb_module_dashlet';
+    }
+
+    public function getKeyName()
+    {
+        return 'id';
+    }
+
+    public function getColumns()
+    {
+        return [
+            'name',
+            'label',
+            'module',
+            'pane',
+            'url',
+            'description',
+            'priority'
+        ];
+    }
+
+    public function getMetaData()
+    {
+        return [
+            'name'        => t('Dashlet Name'),
+            'label'       => t('Dashlet Title'),
+            'module'      => t('Module Name'),
+            'pane'        => t('Dashboard Pane Name'),
+            'url'         => t('Dashlet Url'),
+            'description' => t('Dashlet Description'),
+            'priority'    => t('Dashlet Order Priority')
+        ];
+    }
+
+    public function getSearchColumns()
+    {
+        return ['name'];
+    }
+
+    public function getDefaultSort()
+    {
+        return ['name', 'priority'];
+    }
+
+    public function createRelations(Relations $relations)
+    {
+        $relations->belongsToMany(Dashboard\Dashlet::TABLE, Dashlet::class)
+            ->through(SystemDashlet::class)
+            ->setForeignKey('module_dashlet_id')
+            ->setJoinType('LEFT');
+    }
+}
diff --git a/library/Icinga/Model/Pane.php b/library/Icinga/Model/Pane.php
new file mode 100644
index 0000000000..2974d68ba3
--- /dev/null
+++ b/library/Icinga/Model/Pane.php
@@ -0,0 +1,63 @@
+<?php
+
+/* Icinga Web 2 | (c) 2022 Icinga GmbH | GPLv2+ */
+
+namespace Icinga\Model;
+
+use Icinga\Web\Dashboard;
+use ipl\Orm\Model;
+use ipl\Orm\Relations;
+
+class Pane extends Model
+{
+    public function getTableName()
+    {
+        return Dashboard\Pane::TABLE;
+    }
+
+    public function getKeyName()
+    {
+        return 'id';
+    }
+
+    public function getColumns()
+    {
+        return [
+            'home_id',
+            'name',
+            'label',
+            'username',
+            'priority'
+        ];
+    }
+
+    public function getMetaData()
+    {
+        return [
+            'home_id'  => t('Dashboard Home Id'),
+            'name'     => t('Dashboard Name'),
+            'label'    => t('Dashboard Title'),
+            'username' => t('Username'),
+        ];
+    }
+
+    public function getSearchColumns()
+    {
+        return ['name'];
+    }
+
+    public function getDefaultSort()
+    {
+        return 'icingaweb_dashboard.name';
+    }
+
+    public function createRelations(Relations $relations)
+    {
+        $relations->belongsTo(Dashboard\DashboardHome::TABLE, Home::class)
+            ->setCandidateKey('home_id');
+
+        $relations->hasMany(Dashboard\Dashlet::TABLE, Dashlet::class)
+            ->setForeignKey('dashboard_id')
+            ->setJoinType('LEFT');
+    }
+}
diff --git a/library/Icinga/Model/SystemDashlet.php b/library/Icinga/Model/SystemDashlet.php
new file mode 100644
index 0000000000..bc64a967c5
--- /dev/null
+++ b/library/Icinga/Model/SystemDashlet.php
@@ -0,0 +1,38 @@
+<?php
+
+/* Icinga Web 2 | (c) 2022 Icinga GmbH | GPLv2+ */
+
+namespace Icinga\Model;
+
+use Icinga\Web\Dashboard;
+use ipl\Orm\Model;
+use ipl\Orm\Relations;
+
+class SystemDashlet extends Model
+{
+    public function getTableName()
+    {
+        return 'icingaweb_system_dashlet';
+    }
+
+    public function getKeyName()
+    {
+        return 'id';
+    }
+
+    public function getColumns()
+    {
+        return [
+            'dashlet_id',
+            'module_dashlet_id',
+            'username'
+        ];
+    }
+
+    public function createRelations(Relations $relations)
+    {
+        $relations->belongsTo(Dashboard\Dashlet::TABLE, Dashlet::class);
+        $relations->belongsTo('icingaweb_module_dashlet', ModuleDashlet::class)
+            ->setCandidateKey('module_dashlet_id');
+    }
+}
diff --git a/library/Icinga/Web/Controller.php b/library/Icinga/Web/Controller.php
index a2730d5fc1..90cff36b51 100644
--- a/library/Icinga/Web/Controller.php
+++ b/library/Icinga/Web/Controller.php
@@ -3,6 +3,7 @@
 
 namespace Icinga\Web;
 
+use Icinga\Application\Icinga;
 use Icinga\Data\Filterable;
 use Icinga\Data\Sortable;
 use Icinga\Data\QueryInterface;
@@ -234,16 +235,17 @@ protected function setupFilterControl(
             'limit', // setupPaginationControl()
             'sort', // setupSortControl()
             'dir', // setupSortControl()
-            'backend', // Framework
-            'showCompact', // Framework
-            '_dev' // Framework
         );
 
         $editor = Widget::create('filterEditor');
         /** @var \Icinga\Web\Widget\FilterEditor $editor */
         call_user_func_array(
             array($editor, 'preserveParams'),
-            array_merge($defaultPreservedParams, $preserveParams ?: array())
+            array_merge(
+                Icinga::app()->getFrameworkParams(),
+                $defaultPreservedParams,
+                $preserveParams ?: array()
+            )
         );
 
         $editor
diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index 6081599710..8ae4cd0189 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -3,10 +3,15 @@
 
 namespace Icinga\Web\Controller;
 
+use Icinga\Application\Icinga;
 use Icinga\Application\Modules\Module;
 use Icinga\Common\PdfExport;
+use Icinga\Exception\Http\HttpBadRequestException;
 use Icinga\File\Pdf;
+use Icinga\Model\Dashlet;
+use Icinga\Web\Dashboard\Dashboard;
 use ipl\I18n\Translation;
+use ipl\Stdlib\Filter;
 use Zend_Controller_Action;
 use Zend_Controller_Action_HelperBroker;
 use Zend_Controller_Request_Abstract;
@@ -157,6 +162,11 @@ public function __construct(
             $this->_helper->layout()->disableLayout();
         }
 
+        if (($dashletId = $this->params->shift('_dashlet')) !== null) {
+            // Not removed from the request's url because GET requests for the same url should still be tracked
+            $this->Window()->setDashletId(hex2bin($dashletId));
+        }
+
         // $auth->authenticate($request, $response, $this->requiresLogin());
         if ($this->requiresLogin()) {
             if (! $request->isXmlHttpRequest() && $request->isApiRequest()) {
@@ -443,6 +453,28 @@ public function preDispatch()
             $form->handleRequest();
         }
         $this->_helper->layout()->autoRefreshForm = $form;
+
+        // Load associated dashlet into the session
+        if ($this->isXhr() && ($dashletId = $this->Window()->getDashletId()) !== null) {
+            $sessionStorage = Session::getSession()->getNamespace('dashboard.dashlets');
+
+            $dashletData = $sessionStorage->get($dashletId, []);
+            if (empty($dashletData)) {
+                $dashlet = Dashlet::on(Dashboard::getConn())
+                    ->filter(Filter::equal('id', $dashletId))
+                    ->first();
+                if ($dashlet !== null) {
+                    $dashletData['storedUrl'] = $dashlet->url;
+
+                    $sessionStorage->set($dashletId, $dashletData);
+                } elseif ($this->getRequest()->isGet()) {
+                    $this->redirectNow($this->getRequest()->getUrl()->without('_dashlet'));
+                } else {
+                    // TODO: Really? What if the dashlet is removed in the meantime and the user changes e.g. the view mode?
+                    throw new HttpBadRequestException('Invalid dashlet ID');
+                }
+            }
+        }
     }
 
     /**
@@ -523,6 +555,76 @@ protected function postDispatchXhr()
         if ($this->autorefreshInterval !== null) {
             $resp->setAutoRefreshInterval($this->autorefreshInterval);
         }
+
+        // TODO: Doesn't detect multipart update changes (no GET (redirect) involved)
+        if (($dashletId = $this->Window()->getDashletId()) !== null) {
+            $sessionStorage = Session::getSession()->getNamespace('dashboard.dashlets');
+            $dashletData = $sessionStorage->get($dashletId);
+            $dashletUrl = Url::fromPath($dashletData['storedUrl']);
+
+            $frameworkParams = array_flip(Icinga::app()->getFrameworkParams());
+
+            $newParams = [];
+            if (($locationQuery = $resp->getHeader('X-Icinga-Location-Query', true))) {
+                foreach (UrlParams::fromQueryString($locationQuery)->toArray() as $newParam) {
+                    if (isset($newParams[$newParam[0]])) {
+                        $newParams[$newParam[0]][] = $newParam[1];
+                    } else {
+                        $newParams[$newParam[0]] = [$newParam[1]];
+                    }
+                }
+            } else {
+                foreach ($this->getRequest()->getUrl()->getParams()->toArray() as $newParam) {
+                    if (isset($newParams[$newParam[0]])) {
+                        $newParams[$newParam[0]][] = $newParam[1];
+                    } else {
+                        $newParams[$newParam[0]] = [$newParam[1]];
+                    }
+                }
+            }
+
+            $oldParams = [];
+            foreach ($dashletUrl->getParams()->toArray() as $oldParam) {
+                if (isset($oldParams[$oldParam[0]])) {
+                    $oldParams[$oldParam[0]][] = $oldParam[1];
+                } else {
+                    $oldParams[$oldParam[0]] = [$oldParam[1]];
+                }
+            }
+
+            $changed = false;
+            foreach ($newParams as $name => $values) {
+                if (array_key_exists($name, $frameworkParams)) {
+                    if (isset($oldParams[$name])) {
+                        $newParams[$name] = $oldParams[$name];
+                    } else {
+                        unset($newParams[$name]);
+                    }
+                } elseif (! isset($oldParams[$name])) {
+                    $changed = true;
+                } elseif (! $changed) {
+                    $changed = ! empty(array_diff($values, $oldParams[$name]));
+                }
+            }
+
+            if ($changed) {
+                $urlParams = $dashletUrl->setParams([])->getParams();
+                foreach ($newParams as $name => $values) {
+                    $urlParams->addValues($name, array_map('rawurldecode', $values));
+                }
+
+                $changedUrl = $dashletUrl->getRelativeUrl();
+                if (! isset($dashletData['changedUrl']) || $dashletData['changedUrl'] !== $changedUrl) {
+                    $dashletData['changedUrl'] = $changedUrl;
+                    $sessionStorage->set($dashletId, $dashletData);
+                }
+
+                $resp->setHeader('X-Icinga-Extra-Updates', '#col1');
+            } elseif (isset($dashletData['changedUrl'])) {
+                unset($dashletData['changedUrl']);
+                $sessionStorage->set($dashletId, $dashletData);
+            }
+        }
     }
 
     protected function sendAsPdf()
diff --git a/library/Icinga/Web/Dashboard/Common/BaseDashboard.php b/library/Icinga/Web/Dashboard/Common/BaseDashboard.php
new file mode 100644
index 0000000000..7ba78fcf24
--- /dev/null
+++ b/library/Icinga/Web/Dashboard/Common/BaseDashboard.php
@@ -0,0 +1,300 @@
+<?php
+
+/* Icinga Web 2 | (c) 2022 Icinga GmbH | GPLv2+ */
+
+namespace Icinga\Web\Dashboard\Common;
+
+/**
+ * Base class for all dashboard widget types
+ *
+ * All Icinga Web dashboard widgets should extend this class
+ */
+abstract class BaseDashboard implements DashboardEntry
+{
+    /**
+     * Not translatable name of this widget
+     *
+     * @var string
+     */
+    protected $name;
+
+    /**
+     * The title of this widget
+     *
+     * @var string
+     */
+    protected $title;
+
+    /**
+     * Unique identifier of this widget
+     *
+     * @var int|string
+     */
+    protected $uuid;
+
+    /**
+     * The widget's description
+     *
+     * @var string
+     */
+    protected $description;
+
+    /**
+     * The priority order of this widget
+     *
+     * @var int
+     */
+    protected $order = 0;
+
+    /**
+     * Name of the owner/creator of this widget
+     *
+     * @var string
+     */
+    protected $owner;
+
+    /**
+     * Create a new widget
+     *
+     * @param string $name
+     * @param array $properties
+     */
+    public function __construct(string $name, array $properties = [])
+    {
+        $this->name = $name;
+        $this->title = $name;
+
+        if (! empty($properties)) {
+            $this->setProperties($properties);
+        }
+    }
+
+    /**
+     * Set this widget's unique identifier
+     *
+     * @param int|string $uuid
+     *
+     * @return $this
+     */
+    public function setUuid($uuid): self
+    {
+        $this->uuid = $uuid;
+
+        return $this;
+    }
+
+    /**
+     * Get this widget's unique identifier
+     *
+     * @return string|int
+     */
+    public function getUuid()
+    {
+        return $this->uuid;
+    }
+
+    /**
+     * Set the name of this widget
+     *
+     * @param string $name
+     *
+     * @return $this
+     */
+    public function setName(string $name): self
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    /**
+     * Returns the name of this widget
+     *
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * Set the title of this widget
+     *
+     * @param string $title
+     *
+     * @return $this
+     */
+    public function setTitle(string $title): self
+    {
+        $this->title = $title;
+
+        return $this;
+    }
+
+    /**
+     * Returns the title of this widget
+     *
+     * @return string
+     */
+    public function getTitle(): string
+    {
+        return $this->title !== null ? $this->title : $this->getName();
+    }
+
+    /**
+     * Set the owner of this widget
+     *
+     * @param string $owner
+     *
+     * @return $this
+     */
+    public function setOwner(string $owner): self
+    {
+        $this->owner = $owner;
+
+        return $this;
+    }
+
+    /**
+     * Get owner of this widget
+     *
+     * @return ?string
+     */
+    public function getOwner()
+    {
+        return $this->owner;
+    }
+
+    /**
+     * Get the widget's description
+     *
+     * @return ?string
+     */
+    public function getDescription()
+    {
+        return $this->description;
+    }
+
+    /**
+     * Set the widget's description
+     *
+     * @param ?string $description
+     *
+     * @return  $this
+     */
+    public function setDescription(string $description = null): self
+    {
+        $this->description = $description;
+
+        return $this;
+    }
+
+    /**
+     * Set the priority order of this widget
+     *
+     * @param int $order
+     *
+     * @return $this
+     */
+    public function setPriority(int $order): self
+    {
+        $this->order = $order;
+
+        return $this;
+    }
+
+    /**
+     * Get the priority order of this widget
+     *
+     * @return int
+     */
+    public function getPriority(): int
+    {
+        return $this->order;
+    }
+
+    /**
+     * Set properties from the given list (no matching setter) are ignored
+     *
+     * @param array $data
+     *
+     * @return $this
+     */
+    public function setProperties(array $data): self
+    {
+        foreach ($data as $name => $value) {
+            $func = 'set' . ucfirst($name);
+            if (method_exists($this, $func)) {
+                $this->$func($value);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get this class's structure as array
+     *
+     * Stringifies the attrs or set to null if it doesn't have a value, when $stringify is true
+     *
+     * @param bool $stringify Whether, the attributes should be returned unmodified
+     *
+     * @return array
+     */
+    public function toArray(bool $stringify = true): array
+    {
+        return [];
+    }
+
+    public function hasEntries()
+    {
+    }
+
+    public function getEntry(string $name)
+    {
+    }
+
+    public function hasEntry(string $name)
+    {
+    }
+
+    public function getEntries()
+    {
+    }
+
+    public function setEntries(array $entries)
+    {
+    }
+
+    public function addEntry(BaseDashboard $dashboard)
+    {
+    }
+
+    public function createEntry(string $name, $url = null)
+    {
+    }
+
+    public function getEntryKeyTitleArr()
+    {
+    }
+
+    public function removeEntry($entry)
+    {
+    }
+
+    public function removeEntries(array $entries = [])
+    {
+    }
+
+    public function manageEntry($entry, BaseDashboard $origin = null, bool $manageRecursive = false)
+    {
+    }
+
+    public function loadDashboardEntries(string $name = '')
+    {
+    }
+
+    public function rewindEntries()
+    {
+    }
+}
diff --git a/library/Icinga/Web/Dashboard/Common/DashboardEntries.php b/library/Icinga/Web/Dashboard/Common/DashboardEntries.php
new file mode 100644
index 0000000000..3bd85e2d99
--- /dev/null
+++ b/library/Icinga/Web/Dashboard/Common/DashboardEntries.php
@@ -0,0 +1,147 @@
+<?php
+
+/* Icinga Web 2 | (c) 2022 Icinga GmbH | GPLv2+ */
+
+namespace Icinga\Web\Dashboard\Common;
+
+use Icinga\Exception\ProgrammingError;
+
+use Icinga\Web\Dashboard\Dashboard;
+use function ipl\Stdlib\get_php_type;
+
+trait DashboardEntries
+{
+    /**
+     * A list of @see BaseDashboard assigned to this dashboard widget
+     *
+     * @var BaseDashboard
+     */
+    private $dashboards = [];
+
+    /**
+     * Whether to sort the entries when retrieving using getEntries()
+     *
+     * @var bool
+     */
+    private $sortEntries = false;
+
+    public function hasEntries()
+    {
+        return ! empty($this->dashboards);
+    }
+
+    public function getEntry(string $name)
+    {
+        if (! $this->hasEntry($name)) {
+            throw new ProgrammingError('Trying to retrieve invalid dashboard entry "%s"', $name);
+        }
+
+        return $this->dashboards[$name];
+    }
+
+    public function hasEntry(string $name)
+    {
+        return array_key_exists($name, $this->dashboards);
+    }
+
+    public function getEntries()
+    {
+        if ($this->sortEntries) {
+            $this->sortEntries = false;
+
+            // An entry can be added individually afterwards, it might be the case that the priority
+            // order gets mixed up, so we have to sort things here before being able to render them
+            uasort($this->dashboards, function (BaseDashboard $x, BaseDashboard $y) {
+                return $x->getPriority() <=> $y->getPriority();
+            });
+        }
+
+        return $this->dashboards;
+    }
+
+    public function setEntries(array $entries)
+    {
+        $this->dashboards = $entries;
+        $this->sortEntries = true;
+
+        return $this;
+    }
+
+    public function addEntry(BaseDashboard $dashboard)
+    {
+        if ($this->hasEntry($dashboard->getName())) {
+            $this->getEntry($dashboard->getName())->fromArray($dashboard->toArray(false));
+        } else {
+            $this->dashboards[$dashboard->getName()] = $dashboard;
+            $this->sortEntries = true;
+        }
+
+        return $this;
+    }
+
+    public function getEntryKeyTitleArr()
+    {
+        $dashboards = [];
+        foreach ($this->getEntries() as $dashboard) {
+            $dashboards[$dashboard->getName()] = $dashboard->getTitle();
+        }
+
+        return $dashboards;
+    }
+
+    public function removeEntries(array $entries = [])
+    {
+        $dashboards = ! empty($entries) ? $entries : $this->getEntries();
+        foreach ($dashboards as $dashboard) {
+            $this->removeEntry($dashboard);
+        }
+
+        return $this;
+    }
+
+    public function createEntry(string $name, $url = null)
+    {
+    }
+
+    public function rewindEntries()
+    {
+        $dashboards = $this->dashboards;
+        if ($this instanceof Dashboard) {
+            $dashboards = array_filter($dashboards, function ($home) {
+                return ! $home->isDisabled();
+            });
+        }
+
+        return reset($dashboards);
+    }
+
+    public function reorderWidget(BaseDashboard $dashboard, int $position, Sortable $origin = null)
+    {
+        if ($origin && ! $origin instanceof $this) {
+            throw new \InvalidArgumentException(sprintf(
+                __METHOD__ . ' expects parameter "$origin" to be an instance of "%s". Got "%s" instead.',
+                get_php_type($this),
+                get_php_type($origin)
+            ));
+        }
+
+        if (! $this->hasEntry($dashboard->getName())) {
+            $dashboard->setPriority($position);
+            $data = [$dashboard];
+        } else {
+            $data = array_values($this->getEntries());
+            array_splice($data, array_search($dashboard->getName(), array_keys($this->getEntries())), 1);
+            array_splice($data, $position, 0, [$dashboard]);
+        }
+
+        foreach ($data as $index => $item) {
+            if (count($data) !== 1) {
+                $item->setPriority($index);
+            }
+
+            $this->manageEntry($item, $dashboard->getName() === $item->getName() ? $origin : null);
+        }
+
+        return $this;
+    }
+}
diff --git a/library/Icinga/Web/Dashboard/Common/DashboardEntry.php b/library/Icinga/Web/Dashboard/Common/DashboardEntry.php
new file mode 100644
index 0000000000..9b59dfe4ee
--- /dev/null
+++ b/library/Icinga/Web/Dashboard/Common/DashboardEntry.php
@@ -0,0 +1,132 @@
+<?php
+
+/* Icinga Web 2 | (c) 2022 Icinga GmbH | GPLv2+ */
+
+namespace Icinga\Web\Dashboard\Common;
+
+use ipl\Web\Url;
+
+/**
+ * Represents a dashboard widget types
+ */
+interface DashboardEntry
+{
+    /**
+     * Check whether this widget doesn't contain any dashboard entries
+     *
+     * @return bool
+     */
+    public function hasEntries();
+
+    /**
+     * Get a dashboard entry by the given name if exists
+     *
+     * @param string $name
+     *
+     * @return BaseDashboard
+     */
+    public function getEntry(string $name);
+
+    /**
+     * Get whether the given dashboard entry exists
+     *
+     * @param string $name
+     *
+     * @return bool
+     */
+    public function hasEntry(string $name);
+
+    /**
+     * Get all dashboard entries of this widget
+     *
+     * @return BaseDashboard[]
+     */
+    public function getEntries();
+
+    /**
+     * Set dashboard entries of this widget
+     *
+     * @param BaseDashboard[] $entries
+     *
+     * @return $this
+     */
+    public function setEntries(array $entries);
+
+    /**
+     * Add a new dashboard entry to this widget
+     *
+     * @param BaseDashboard $dashboard
+     *
+     * @return $this
+     */
+    public function addEntry(BaseDashboard $dashboard);
+
+    /**
+     * Create and add a new entry to this widget
+     *
+     * @param string $name
+     * @param ?string|Url $url
+     *
+     * @return $this
+     */
+    public function createEntry(string $name, $url = null);
+
+    /**
+     * Get an array with entry name=>title format
+     *
+     * @return string[]
+     */
+    public function getEntryKeyTitleArr();
+
+    /**
+     * Remove the given entry from this widget
+     *
+     * @param BaseDashboard|string $entry
+     *
+     * @return $this
+     */
+    public function removeEntry($entry);
+
+    /**
+     * Removes the given list of entries from this widget
+     *
+     * If there is no entries passed, all the available entries of this widget will be removed
+     *
+     * @param BaseDashboard[] $entries
+     *
+     * @return $this
+     */
+    public function removeEntries(array $entries = []);
+
+    /**
+     * Manage the given widget(s)
+     *
+     * Performs all kinds of database actions for the given widget(s) except the DELETE action. If you want to
+     * move pane(s)|dashlet(s) from another to this widget you have to also provide the origin from which the
+     * given entry(ies) originated
+     *
+     * @param BaseDashboard|BaseDashboard[] $entry The actual dashboard entry to be managed
+     * @param ?BaseDashboard $origin The original widget from which the given entry originates
+     * @param bool $manageRecursive Whether the given entry should be managed recursively e.g if the given entry
+     *                              is a Pane type, all its dashlets can be managed recursively
+     *
+     * @return $this
+     */
+    public function manageEntry($entry, BaseDashboard $origin = null, bool $manageRecursive = false);
+
+    /**
+     * Load all the assigned entries to this widget
+     *
+     * @param ?string $name Name of the dashboard widget you want to load the dashboard entries for
+     *
+     * @return $this
+     */
+    public function loadDashboardEntries(string $name = '');
+
+    /**
+     * Reset the current position of the internal dashboard entries pointer
+     *
+     * @return false|BaseDashboard
+     */
+    public function rewindEntries();
+}
diff --git a/library/Icinga/Web/Dashboard/Common/DashboardManager.php b/library/Icinga/Web/Dashboard/Common/DashboardManager.php
new file mode 100644
index 0000000000..5e9063ed67
--- /dev/null
+++ b/library/Icinga/Web/Dashboard/Common/DashboardManager.php
@@ -0,0 +1,402 @@
+<?php
+
+/* Icinga Web 2 | (c) 2022 Icinga GmbH | GPLv2+ */
+
+namespace Icinga\Web\Dashboard\Common;
+
+use Icinga\Application\Icinga;
+use Icinga\Authentication\Auth;
+use Icinga\Common\Database;
+use Icinga\Exception\Http\HttpNotFoundException;
+use Icinga\Exception\ProgrammingError;
+use Icinga\Model;
+use Icinga\User;
+use Icinga\Web\Dashboard\Dashboard;
+use Icinga\Web\Dashboard\DashboardHome;
+use Icinga\Web\Dashboard\Dashlet;
+use Icinga\Web\Dashboard\Pane;
+use ipl\Sql\Connection;
+use ipl\Sql\Expression;
+use ipl\Stdlib\Filter;
+
+trait DashboardManager
+{
+    use Database;
+
+    /** @var User */
+    private static $user;
+
+    /** @var Connection */
+    private static $conn;
+
+    /**
+     * A list of default panes loaded from monitoring|icingadb module
+     *
+     * @var Pane[]
+     */
+    private static $defaultPanes = [];
+
+    /**
+     * Load the given or all homes (null)
+     *
+     * @param ?string $name
+     *
+     * @return void
+     */
+    public function load(string $name = null)
+    {
+        $query = Model\Home::on(self::getConn());
+        $query->filter(Filter::equal('username', $this::getUser()->getUsername()));
+
+        if ($name !== null) {
+            $query->filter(Filter::equal('name', $name));
+
+            /** @var Model\Home $row */
+            if (($row = $query->first()) === null) {
+                if ($name === DashboardHome::DEFAULT_HOME) {
+                    $home = $this->initGetDefaultHome();
+                } else {
+                    throw new HttpNotFoundException(t('Home "%s" not found'), $name);
+                }
+            } else {
+                $home = DashboardHome::create($row);
+                $this->addEntry($home);
+            }
+
+            $this->activateHome($home);
+            $home->loadDashboardEntries();
+        } else {
+            foreach ($query as $row) {
+                $this->addEntry(DashboardHome::create($row));
+            }
+
+            if (($firstHome = $this->rewindEntries())) {
+                $this->activateHome($firstHome);
+                $firstHome->loadDashboardEntries();
+            }
+        }
+
+        self::deployModuleDashlets();
+    }
+
+    /**
+     * Get Database connection
+     *
+     * This is needed because we don't want to always initiate a new DB connection when calling $this->getDb().
+     * And as we are using PDO transactions to manage the dashboards, this wouldn't work if $this->getDb()
+     * is called over again after a transaction has been initiated
+     *
+     * @return Connection
+     */
+    public static function getConn(): Connection
+    {
+        if (self::$conn === null) {
+            self::$conn = (new self())->getDb();
+        }
+
+        return self::$conn;
+    }
+
+    /**
+     * Generate the sha1 hash of the provided string
+     *
+     * @param string $name
+     *
+     * @return string
+     */
+    public static function getSHA1(string $name): string
+    {
+        return sha1($name, true);
+    }
+
+    public function loadDashboardEntries(string $name = '')
+    {
+        $home = $this->getEntry($name);
+        $this->activateHome($home);
+        $home->loadDashboardEntries();
+
+        return $this;
+    }
+
+    /**
+     * Activates the given home and deactivates all other active homes
+     *
+     * @param DashboardHome $home
+     *
+     * @return $this
+     */
+    public function activateHome(DashboardHome $home): self
+    {
+        $activeHome = $this->getActiveHome();
+        if ($activeHome && $activeHome->getName() !== $home->getName()) {
+            $activeHome->setActive(false);
+        }
+
+        $home->setActive();
+
+        return $this;
+    }
+
+    /**
+     * Get the active home currently being loaded
+     *
+     * @return ?DashboardHome
+     */
+    public function getActiveHome()
+    {
+        /** @var DashboardHome $home */
+        foreach ($this->getEntries() as $home) {
+            if ($home->getActive()) {
+                return $home;
+            }
+        }
+
+        return null;
+    }
+
+    public function removeEntry($home)
+    {
+        $name = $home instanceof DashboardHome ? $home->getName() : $home;
+        if (! $this->hasEntry($name)) {
+            throw new ProgrammingError('Trying to remove invalid dashboard home "%s"', $name);
+        }
+
+        $home = $home instanceof DashboardHome ? $home : $this->getEntry($home);
+        $home->removeEntries();
+        if ($home->getName() !== DashboardHome::DEFAULT_HOME) {
+            self::getConn()->delete(DashboardHome::TABLE, ['id = ?' => $home->getUuid()]);
+        } elseif (! $home->isDisabled()) {
+            self::getConn()->update(DashboardHome::TABLE, ['disabled' => 1], [
+                'id = ?' => $home->getUuid()
+            ]);
+        }
+
+        return $this;
+    }
+
+    public function manageEntry($entry, BaseDashboard $origin = null, $manageRecursive = false)
+    {
+        $conn = self::getConn();
+        $homes = is_array($entry) ? $entry : [$entry];
+
+        /** @var DashboardHome $home */
+        foreach ($homes as $home) {
+            if (! $this->hasEntry($home->getName())) {
+                // Highest priority is 0, so count($entries) are always lowest prio + 1
+                $priority = $home->getName() === DashboardHome::DEFAULT_HOME ? 0 : count($this->getEntries());
+                $conn->insert(DashboardHome::TABLE, [
+                    'name'     => $home->getName(),
+                    'label'    => $home->getTitle(),
+                    'username' => self::getUser()->getUsername(),
+                    'priority' => $priority,
+                    'type'     => $home->getType() !== Dashboard::SYSTEM ? $home->getType() : Dashboard::PRIVATE_DS
+                ]);
+
+                $home->setUuid($conn->lastInsertId());
+            } else {
+                $conn->update(DashboardHome::TABLE, [
+                    'label'    => $home->getTitle(),
+                    'priority' => $home->getPriority(),
+                    'disabled' => 0
+                ], ['id = ?' => $home->getUuid()]);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get and|or init the default dashboard home
+     *
+     * @return DashboardHome
+     */
+    public function initGetDefaultHome(): DashboardHome
+    {
+        if ($this->hasEntry(DashboardHome::DEFAULT_HOME)) {
+            return $this->getEntry(DashboardHome::DEFAULT_HOME);
+        }
+
+        $default = new DashboardHome(DashboardHome::DEFAULT_HOME);
+        $this->manageEntry($default);
+        $this->addEntry($default);
+
+        return $default;
+    }
+
+    /**
+     * Set this dashboard's user
+     *
+     * @param User $user
+     *
+     * @return $this
+     */
+    public function setUser(User $user): self
+    {
+        self::$user = $user;
+
+        return $this;
+    }
+
+    /**
+     * Get this dashboard's user
+     *
+     * @return User
+     */
+    public static function getUser(): User
+    {
+        if (self::$user === null) {
+            self::$user = Auth::getInstance()->getUser();
+        }
+
+        return self::$user;
+    }
+
+    /**
+     * Get system defaults which are normally being
+     * provided by icingadb or monitoring module
+     *
+     * @return Pane[]
+     */
+    public static function getSystemDefaults(): array
+    {
+        return self::$defaultPanes;
+    }
+
+    /**
+     * Browse all enabled modules configuration file and import all dashboards
+     * provided by them into the DB table `icingaweb_module_dashlet`
+     *
+     * @return void
+     */
+    public static function deployModuleDashlets(): void
+    {
+        $mg = Icinga::app()->getModuleManager();
+        foreach ($mg->getLoadedModules() as $module) {
+            foreach ($module->getDashboard() as $dashboard) {
+                $pane = new Pane($dashboard->getName());
+                $pane->setProperties($dashboard->getProperties());
+
+                $priority = 0;
+                foreach ($dashboard->getDashlets() as $name => $configPart) {
+                    $uuid = self::getSHA1($module->getName() . $pane->getName() . $name);
+                    $dashlet = new Dashlet($name, $configPart['url'], $pane);
+                    $dashlet->setProperties($configPart);
+                    $dashlet
+                        ->setUuid($uuid)
+                        ->setModuleDashlet(true)
+                        ->setPriority($priority++)
+                        ->setModule($module->getName());
+
+                    // As we don't have a setter for labels, this might be ignored by the data extractor
+                    if (isset($configPart['label'])) {
+                        $dashlet->setTitle($configPart['label']);
+                    }
+
+                    self::updateOrInsertModuleDashlet($dashlet);
+                    $pane->addEntry($dashlet);
+                }
+
+                if (in_array($module->getName(), ['monitoring', 'icingadb'], true)) {
+                    self::$defaultPanes[$pane->getName()] = $pane;
+                }
+            }
+
+            $priority = 0;
+            foreach ($module->getDashlets() as $dashlet) {
+                $identifier = self::getSHA1($module->getName() . $dashlet->getName());
+                $newDashlet = new Dashlet($dashlet->getName(), $dashlet->getUrl());
+                $newDashlet->setProperties($dashlet->getProperties());
+                $newDashlet
+                    ->setUuid($identifier)
+                    ->setModule($module->getName())
+                    ->setPriority($priority++)
+                    ->setModuleDashlet(true);
+
+                self::updateOrInsertModuleDashlet($newDashlet);
+                $priority++;
+            }
+        }
+    }
+
+    /**
+     * Get whether the given module Dashlet already exists
+     *
+     * @param Dashlet $dashlet
+     *
+     * @return bool
+     */
+    public static function moduleDashletExist(Dashlet $dashlet): bool
+    {
+        $query = Model\ModuleDashlet::on(self::getConn())->filter(Filter::equal('id', $dashlet->getUuid()));
+        $query->getSelectBase()->columns(new Expression('1'));
+
+        return $query->execute()->hasResult();
+    }
+
+    /**
+     * Insert or update the given module dashlet
+     *
+     * @param Dashlet $dashlet
+     *
+     * @return void
+     */
+    public static function updateOrInsertModuleDashlet(Dashlet $dashlet): void
+    {
+        if (! $dashlet->isModuleDashlet()) {
+            return;
+        }
+
+        if (! self::moduleDashletExist($dashlet)) {
+            self::getConn()->insert('icingaweb_module_dashlet', [
+                'id'          => $dashlet->getUuid(),
+                'name'        => $dashlet->getName(),
+                'label'       => $dashlet->getTitle(),
+                'pane'        => $dashlet->getPane() ? $dashlet->getPane()->getName() : null,
+                'module'      => $dashlet->getModule(),
+                'url'         => $dashlet->getUrl()->getRelativeUrl(),
+                'description' => $dashlet->getDescription(),
+                'priority'    => $dashlet->getPriority()
+            ]);
+        } else {
+            self::getConn()->update('icingaweb_module_dashlet', [
+                'label'       => $dashlet->getTitle(),
+                'url'         => $dashlet->getUrl()->getRelativeUrl(),
+                'description' => $dashlet->getDescription(),
+                'priority'    => $dashlet->getPriority()
+            ], ['id = ?' => $dashlet->getUuid()]);
+        }
+    }
+
+    /**
+     * Get module dashlets from the database
+     *
+     * @return array
+     */
+    public static function getModuleDashlets(): array
+    {
+        $dashlets = [];
+        $query = Model\ModuleDashlet::on(self::getConn());
+        foreach ($query as $moduleDashlet) {
+            $dashlet = new Dashlet($moduleDashlet->name, $moduleDashlet->url);
+            if ($moduleDashlet->description) {
+                $dashlet->setDescription(t($moduleDashlet->description));
+            }
+
+            $dashlet->setProperties([
+                'label'    => t($moduleDashlet->label),
+                'priority' => $moduleDashlet->priority,
+                'uuid'     => $moduleDashlet->id,
+                'module'   => $moduleDashlet->module
+            ]);
+
+            if (($pane = $moduleDashlet->pane)) {
+                $dashlet->setPane(new Pane($pane));
+            }
+
+            $dashlet->setModuleDashlet(true);
+            $dashlets[$dashlet->getModule()][$dashlet->getName()] = $dashlet;
+        }
+
+        return $dashlets;
+    }
+}
diff --git a/library/Icinga/Web/Dashboard/Common/ItemListControl.php b/library/Icinga/Web/Dashboard/Common/ItemListControl.php
new file mode 100644
index 0000000000..1b8571e5f0
--- /dev/null
+++ b/library/Icinga/Web/Dashboard/Common/ItemListControl.php
@@ -0,0 +1,99 @@
+<?php
+
+/* Icinga Web 2 | (c) 2022 Icinga GmbH | GPLv2+ */
+
+namespace Icinga\Web\Dashboard\Common;
+
+use ipl\Html\BaseHtmlElement;
+use ipl\Html\HtmlElement;
+use ipl\Html\ValidHtml;
+use ipl\Web\Url;
+use ipl\Web\Widget\Icon;
+use ipl\Web\Widget\Link;
+
+abstract class ItemListControl extends BaseHtmlElement
+{
+    protected $tag = 'div';
+
+    /**
+     * Get this item's unique html identifier
+     *
+     * @return string
+     */
+    abstract protected function getHtmlId(): string;
+
+    /**
+     * Get a class name for the collapsible control
+     *
+     * @return string
+     */
+    abstract protected function getCollapsibleControlClass(): string;
+
+    /**
+     * Create an action link to be added at the end of the list
+     *
+     * @return BaseHtmlElement
+     */
+    abstract protected function createActionLink(): BaseHtmlElement;
+
+    /**
+     * Create the appropriate item list of this control
+     *
+     * @return BaseHtmlElement
+     */
+    abstract protected function createItemList(): BaseHtmlElement;
+
+    /**
+     * Get a drag initiator for this widget item
+     *
+     * @return ValidHtml
+     */
+    public static function createDragInitiator()
+    {
+        return new Icon('bars', ['class' => 'widget-drag-initiator']);
+    }
+
+    /**
+     * Assemble a header element for this item list
+     *
+     * @param Url $url
+     * @param string $title
+     *
+     * @return void
+     */
+    protected function assembleHeader(Url $url, string $title)
+    {
+        $header = HtmlElement::create('h1', ['class' => 'collapsible-header'], $title);
+        $header->addHtml(new Link(t('Edit'), $url, [
+            'data-icinga-modal'   => true,
+            'data-no-icinga-ajax' => true
+        ]));
+
+        $header->addHtml(self::createDragInitiator());
+        $this->addHtml($header);
+    }
+
+    protected function assemble()
+    {
+        $this->getAttributes()->add([
+            'id'                  => $this->getHtmlId(),
+            'class'               => 'collapsible',
+            'data-toggle-element' => '.dashboard-list-info',
+        ]);
+
+        $this->addHtml(HtmlElement::create('div', ['class' => $this->getCollapsibleControlClass()], [
+            new Icon('angle-down', ['class' => 'expand-icon', 'title' => t('Expand')]),
+            new Icon('angle-up', ['class' => 'collapse-icon', 'title' => t('Collapse')])
+        ]));
+
+        $this->addHtml($this->createItemList());
+
+        $actionLink = $this->createActionLink();
+        $actionLink->getAttributes()->add([
+            'data-icinga-modal'   => true,
+            'data-no-icinga-ajax' => true
+        ]);
+
+        $this->addHtml($actionLink);
+    }
+}
diff --git a/library/Icinga/Web/Dashboard/Common/Sortable.php b/library/Icinga/Web/Dashboard/Common/Sortable.php
new file mode 100644
index 0000000000..468d277688
--- /dev/null
+++ b/library/Icinga/Web/Dashboard/Common/Sortable.php
@@ -0,0 +1,23 @@
+<?php
+
+/* Icinga Web 2 | (c) 2022 Icinga GmbH | GPLv2+ */
+
+namespace Icinga\Web\Dashboard\Common;
+
+/**
+ * Sortable interface that allows to reorder the provided dashboard entry
+ * and update the database accordingly
+ */
+interface Sortable
+{
+    /**
+     * Insert the dashboard entry at the given position within this dashboard entries
+     *
+     * @param BaseDashboard $dashboard
+     * @param int $position
+     * @param Sortable|null $origin
+     *
+     * @return $this
+     */
+    public function reorderWidget(BaseDashboard $dashboard, int $position, Sortable $origin = null);
+}
diff --git a/library/Icinga/Web/Dashboard/Dashboard.php b/library/Icinga/Web/Dashboard/Dashboard.php
new file mode 100644
index 0000000000..6e87ceec4c
--- /dev/null
+++ b/library/Icinga/Web/Dashboard/Dashboard.php
@@ -0,0 +1,270 @@
+<?php
+
+/* Icinga Web 2 | (c) 2022 Icinga GmbH | GPLv2+ */
+
+namespace Icinga\Web\Dashboard;
+
+use Icinga\Exception\ConfigurationError;
+use Icinga\Exception\ProgrammingError;
+use Icinga\Web\Dashboard\Common\DashboardEntries;
+use Icinga\Web\Dashboard\Common\DashboardEntry;
+use Icinga\Web\Dashboard\Common\DashboardManager;
+use ipl\Html\BaseHtmlElement;
+use ipl\Html\Form;
+use ipl\Html\HtmlElement;
+use ipl\Web\Url;
+use ipl\Web\Widget\Tabs;
+
+/**
+ * Dashboards display multiple views on a single page
+ *
+ * The terminology is as follows:
+ * - Dashlet:           A single view showing a specific url
+ * - Pane:              Aggregates one or more dashlets on one page, displays its title as a tab
+ * - Dashboard/Home:    Shows all panes belonging to this home
+ *
+ */
+class Dashboard extends BaseHtmlElement implements DashboardEntry
+{
+    use DashboardManager;
+    use DashboardEntries;
+
+    /**
+     * Base path of our new dashboards controller
+     *
+     * @var string
+     */
+    const BASE_ROUTE = 'dashboards';
+
+    /**
+     * System dashboards are provided by the modules in PHP code and are available to all users
+     *
+     * @var string
+     */
+    const SYSTEM = 'system';
+
+    /**
+     * Public dashboards are created by authorized users and are available
+     * to specific users, groups, roles or everybody
+     *
+     * @var string
+     */
+    const PUBLIC_DS = 'public';
+
+    /**
+     * Private dashboards are created by any user and are only available to this user
+     *
+     * @var string
+     */
+    const PRIVATE_DS = 'private';
+
+    /**
+     * Shared dashboards are available to users who have accepted a share or who
+     * have been assigned the dashboard by their Admin
+     *
+     * @var string
+     */
+    const SHARED = 'shared';
+
+    protected $tag = 'div';
+
+    protected $defaultAttributes = ['class' => 'dashboard'];
+
+    /**
+     * The @see Tabs object for displaying displayable panes
+     *
+     * @var Tabs
+     */
+    protected $tabs;
+
+    /**
+     * The parameter that will be added to identify panes
+     *
+     * @var string
+     */
+    private $tabParam = 'pane';
+
+    /**
+     * A welcome form rendered when there is no dashboard panes
+     *
+     * @var Form
+     */
+    private $welcomeForm;
+
+    /**
+     * Set the given tab name as active
+     *
+     * @param string $name The tab name to activate
+     *
+     */
+    public function activate(string $name)
+    {
+        $this->getTabs()->activate($name);
+    }
+
+    /**
+     * Set this dashboard's tabs
+     *
+     * @param Tabs $tabs
+     *
+     * @return $this
+     */
+    public function setTabs(Tabs $tabs)
+    {
+        $this->tabs = $tabs;
+
+        return $this;
+    }
+
+    /**
+     * Return the tab object used to navigate through this dashboard
+     *
+     * @return Tabs
+     */
+    public function getTabs()
+    {
+        $activeHome = $this->getActiveHome();
+        if ($activeHome && $activeHome->getName() !== DashboardHome::DEFAULT_HOME) {
+            $url = Url::fromPath(self::BASE_ROUTE . '/home')->getUrlWithout(['home', $this->tabParam]);
+            $url->addParams(['home' => $activeHome->getName()]);
+        } else {
+            $url = Url::fromPath(self::BASE_ROUTE)->getUrlWithout($this->tabParam);
+        }
+
+        if ($this->tabs === null) {
+            $this->tabs = new Tabs();
+        }
+
+        $this->tabs->disableLegacyExtensions();
+        if (! $activeHome) {
+            return $this->tabs;
+        }
+
+        /*** @var Pane $pane */
+        foreach ($activeHome->getEntries() as $pane) {
+            if (! $this->tabs->get($pane->getName())) {
+                $this->tabs->add(
+                    $pane->getName(),
+                    [
+                        'title'     => sprintf(
+                            t('Show %s', 'dashboard.pane.tooltip'),
+                            $pane->getTitle()
+                        ),
+                        'label'     => $pane->getTitle(),
+                        'url'       => clone($url),
+                        'urlParams' => [$this->tabParam => $pane->getName()]
+                    ]
+                );
+            }
+        }
+
+        return $this->tabs;
+    }
+
+    /**
+     * Activate the default pane of this dashboard and returns its name
+     *
+     * @return ?string
+     */
+    private function setDefaultPane()
+    {
+        $active = $this->getActiveHome()->rewindEntries();
+        if ($active) {
+            $active = $active->getName();
+            $this->activate($active);
+        }
+
+        return $active;
+    }
+
+    /**
+     * @see determineActivePane()
+     */
+    public function getActivePane()
+    {
+        return $this->determineActivePane();
+    }
+
+    /**
+     * Determine the active pane either by the selected tab or the current request
+     *
+     * @return Pane The currently active pane
+     * @throws \Icinga\Exception\ProgrammingError
+     *
+     * @throws \Icinga\Exception\ConfigurationError
+     */
+    public function determineActivePane()
+    {
+        $active = $this->getTabs()->getActiveTab();
+        $activeHome = $this->getActiveHome();
+
+        if (! $active) {
+            if ($active = Url::fromRequest()->getParam($this->tabParam)) {
+                if ($activeHome->hasEntry($active)) {
+                    $this->activate($active);
+                } else {
+                    throw new ProgrammingError('Try to get an inexistent pane.');
+                }
+            } else {
+                $active = $this->setDefaultPane();
+            }
+        } else {
+            $active = $active->getName();
+        }
+
+        if ($activeHome->hasEntry($active)) {
+            return $activeHome->getEntry($active);
+        }
+
+        throw new ConfigurationError('Could not determine active pane');
+    }
+
+    public function setWelcomeForm(Form $form)
+    {
+        $this->welcomeForm = $form;
+
+        return $this;
+    }
+
+    protected function assemble()
+    {
+        $activeHome = $this->getActiveHome();
+        if (! $activeHome || (! $activeHome->hasEntries() && $activeHome->getName() === DashboardHome::DEFAULT_HOME)) {
+            $this->setAttribute('class', 'dashboard-introduction');
+
+            $this->addHtml(HtmlElement::create('h1', null, t('Welcome to Icinga Web 2!')));
+            $this->addHtml(HtmlElement::create(
+                'p',
+                null,
+                t('You will see this screen every time you log in and haven\'t created any dashboards yet.')
+            ));
+
+            $message = t(
+                'At the moment this view is empty, but you can populate it with small portions of'
+                . ' information called Dashlets.'
+            );
+            $this->addHtml(HtmlElement::create('p', null, $message));
+
+            $message = t(
+                'Now you can either customize which dashlets to display, or use the system default dashlets.'
+                . ' You will be always able to edit them afterwards.'
+            );
+            $this->addHtml(HtmlElement::create('p', null, $message));
+
+            $this->addHtml($this->welcomeForm);
+            //$this->addHtml($wrapper);
+        } elseif (! $activeHome->hasEntries()) {
+            $this->addHtml(HtmlElement::create('h1', null, t('No dashboard added to this dashboard home')));
+        } else {
+            $activePane = $this->getActivePane();
+
+            if (! $activePane->hasEntries()) {
+                $this->addHtml(HtmlElement::create('h1', null, t('No dashlet added to this pane.')));
+            } else {
+                foreach ($activePane->getEntries() as $dashlet) {
+                    $this->addHtml($dashlet->getHtml());
+                }
+            }
+        }
+    }
+}
diff --git a/library/Icinga/Web/Dashboard/DashboardHome.php b/library/Icinga/Web/Dashboard/DashboardHome.php
new file mode 100644
index 0000000000..aeda4971de
--- /dev/null
+++ b/library/Icinga/Web/Dashboard/DashboardHome.php
@@ -0,0 +1,279 @@
+<?php
+
+/* Icinga Web 2 | (c) 2022 Icinga GmbH | GPLv2+ */
+
+namespace Icinga\Web\Dashboard;
+
+use Icinga\Exception\ProgrammingError;
+use Icinga\Model\Home;
+use Icinga\Web\Dashboard\Common\BaseDashboard;
+use Icinga\Web\Dashboard\Common\DashboardEntries;
+use Icinga\Web\Dashboard\Common\Sortable;
+use ipl\Stdlib\Filter;
+
+use function ipl\Stdlib\get_php_type;
+
+class DashboardHome extends BaseDashboard implements Sortable
+{
+    use DashboardEntries;
+
+    /**
+     * Name of the default home
+     *
+     * @var string
+     */
+    const DEFAULT_HOME = 'Default Home';
+
+    /**
+     * Database table name
+     *
+     * @var string
+     */
+    const TABLE = 'icingaweb_dashboard_home';
+
+    /**
+     * A type of this dashboard home
+     *
+     * @var string
+     */
+    protected $type = Dashboard::SYSTEM;
+
+    /**
+     * A flag whether this home has been activated
+     *
+     * @var bool
+     */
+    protected $active = false;
+
+    /**
+     * A flag whether a home has been disabled (affects only default home)
+     *
+     * @var bool
+     */
+    protected $disabled = false;
+
+    /**
+     * Create a new dashboard home from the given model
+     *
+     * @param Home $home
+     *
+     * @return DashboardHome
+     */
+    public static function create(Home $home): self
+    {
+        $self = new self($home->name);
+        $self
+            ->setTitle($home->label)
+            ->setPriority($home->priority)
+            ->setType($home->type)
+            ->setUuid($home->id)
+            ->setDisabled((bool) $home->disabled);
+
+        return $self;
+    }
+
+    /**
+     * Set whether this home is active
+     *
+     * DB dashboards will load only when this home has been activated
+     *
+     * @param bool $active
+     *
+     * @return $this
+     */
+    public function setActive(bool $active = true): self
+    {
+        $this->active = $active;
+
+        return $this;
+    }
+
+    /**
+     * Get whether this home has been activated
+     *
+     * @return bool
+     */
+    public function getActive(): bool
+    {
+        return $this->active;
+    }
+
+    /**
+     * Set the type of this dashboard home
+     *
+     * @param string $type
+     *
+     * @return $this
+     */
+    public function setType(string $type): self
+    {
+        $this->type = $type;
+
+        return $this;
+    }
+
+    /**
+     * Get the type of this dashboard home
+     *
+     * @return string
+     */
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    /**
+     * Set whether this home should be disabled
+     *
+     * @param bool $disabled
+     *
+     * @return $this
+     */
+    public function setDisabled(bool $disabled): self
+    {
+        $this->disabled = $disabled;
+
+        return $this;
+    }
+
+    /**
+     * Get whether this home has been disabled
+     *
+     * @return bool
+     */
+    public function isDisabled(): bool
+    {
+        return $this->disabled;
+    }
+
+    public function removeEntry($pane)
+    {
+        $name = $pane instanceof Pane ? $pane->getName() : $pane;
+        if (! $this->hasEntry($name)) {
+            throw new ProgrammingError('Trying to remove invalid dashboard pane "%s"', $name);
+        }
+
+        $pane = $pane instanceof Pane ? $pane : $this->getEntry($pane);
+        $pane->removeEntries();
+
+        Dashboard::getConn()->delete(Pane::TABLE, [
+            'id = ?'      => $pane->getUuid(),
+            'home_id = ?' => $this->getUuid()
+        ]);
+
+        return $this;
+    }
+
+    public function loadDashboardEntries(string $name = '')
+    {
+        if (! $this->getActive()) {
+            return $this;
+        }
+
+        $this->setEntries([]);
+        $panes = \Icinga\Model\Pane::on(Dashboard::getConn())->utilize(self::TABLE);
+        $panes
+            ->filter(Filter::equal('home_id', $this->getUuid()))
+            ->filter(Filter::equal('username', Dashboard::getUser()->getUsername()));
+
+        foreach ($panes as $pane) {
+            $newPane = new Pane($pane->name);
+            $newPane
+                ->setHome($this)
+                ->setUuid($pane->id)
+                ->setTitle($pane->label)
+                ->setPriority($pane->priority);
+
+            $newPane->loadDashboardEntries($name);
+            $this->addEntry($newPane);
+        }
+
+        return $this;
+    }
+
+    public function createEntry(string $name, $url = null)
+    {
+        $entry = new Pane($name);
+        $entry->setHome($this);
+
+        $this->addEntry($entry);
+
+        return $this;
+    }
+
+    public function manageEntry($entry, BaseDashboard $origin = null, bool $manageRecursive = false)
+    {
+        $user = Dashboard::getUser();
+        $conn = Dashboard::getConn();
+
+        $panes = is_array($entry) ? $entry : [$entry];
+        // highest priority is 0, so count($entries) are all always lowest prio + 1
+        $order = count($this->getEntries());
+
+        if ($origin && ! $origin instanceof DashboardHome) {
+            throw new \InvalidArgumentException(sprintf(
+                __METHOD__ . ' expects parameter "$origin" to be an instance of "%s". Got "%s" instead.',
+                get_php_type($this),
+                get_php_type($origin)
+            ));
+        }
+
+        /** @var Pane $pane */
+        foreach ($panes as $pane) {
+            $uuid = Dashboard::getSHA1($user->getUsername() . $this->getName() . $pane->getName());
+            if (! $this->hasEntry($pane->getName()) && (! $origin || ! $origin->hasEntry($pane->getName()))) {
+                $conn->insert(Pane::TABLE, [
+                    'id'       => $uuid,
+                    'home_id'  => $this->getUuid(),
+                    'name'     => $pane->getName(),
+                    'label'    => $pane->getTitle(),
+                    'username' => $user->getUsername(),
+                    'priority' => $order++
+                ]);
+            } elseif (! $this->hasEntry($pane->getName()) || ! $origin || ! $origin->hasEntry($pane->getName())) {
+                $filterCondition = [
+                    'id = ?'      => $pane->getUuid(),
+                    'home_id = ?' => $this->getUuid()
+                ];
+
+                if ($origin && $origin->hasEntry($pane->getName())) {
+                    $filterCondition = [
+                        'id = ?'      => $origin->getEntry($pane->getName())->getUuid(),
+                        'home_id = ?' => $origin->getUuid()
+                    ];
+                }
+
+                $conn->update(Pane::TABLE, [
+                    'id'       => $uuid,
+                    'home_id'  => $this->getUuid(),
+                    'label'    => $pane->getTitle(),
+                    'priority' => $pane->getPriority()
+                ], $filterCondition);
+            } else {
+                // Failed to move the pane! Should have been handled already by the caller
+                break;
+            }
+
+            $pane->setHome($this);
+            $pane->setUuid($uuid);
+
+            if ($manageRecursive) {
+                // Those dashboard panes are usually system defaults and go up when
+                // the user is clicking on the "Use System Defaults" button
+                $dashlets = $pane->getEntries();
+                $pane->setEntries([]);
+                $pane->manageEntry($dashlets);
+            }
+        }
+    }
+
+    public function toArray(bool $stringify = true): array
+    {
+        return [
+            'id'       => $this->getUuid(),
+            'name'     => $this->getName(),
+            'title'    => $this->getTitle(),
+            'priority' => $this->getPriority()
+        ];
+    }
+}
diff --git a/library/Icinga/Web/Dashboard/Dashlet.php b/library/Icinga/Web/Dashboard/Dashlet.php
new file mode 100644
index 0000000000..bede56e0d9
--- /dev/null
+++ b/library/Icinga/Web/Dashboard/Dashlet.php
@@ -0,0 +1,263 @@
+<?php
+
+/* Icinga Web 2 | (c) 2022 Icinga GmbH | GPLv2+ */
+
+namespace Icinga\Web\Dashboard;
+
+use Icinga\Application\Icinga;
+use Icinga\Web\Dashboard\Common\BaseDashboard;
+use Icinga\Web\Request;
+use Icinga\Web\Url;
+use ipl\Html\BaseHtmlElement;
+use ipl\Html\HtmlElement;
+use ipl\Web\Widget\Link;
+
+/**
+ * A dashboard pane dashlet
+ *
+ * This is the new element being used for the Dashlets view
+ */
+class Dashlet extends BaseDashboard
+{
+    /** @var string Database table name */
+    const TABLE = 'icingaweb_dashlet';
+
+    /**
+     * The url of this Dashlet
+     *
+     * @var Url|null
+     */
+    protected $url;
+
+    /**
+     * The pane this dashlet belongs to
+     *
+     * @var Pane
+     */
+    protected $pane;
+
+    /**
+     * The progress label being used
+     *
+     * @var string
+     */
+    protected $progressLabel;
+
+    /**
+     * A flag to identify whether this dashlet widget originates from a module
+     *
+     * @var bool
+     */
+    protected $moduleDashlet = false;
+
+    /**
+     * The name of the module this dashlet comes from
+     *
+     * @var string
+     */
+    protected $module;
+
+    /**
+     * Create a new dashlet displaying the given url in the provided pane
+     *
+     * @param string $name The title to use for this dashlet
+     * @param Url|string $url The url this dashlet uses for displaying information
+     * @param Pane|null $pane The pane this Dashlet will be added to
+     */
+    public function __construct(string $name, $url, Pane $pane = null)
+    {
+        parent::__construct($name);
+
+        $this->pane = $pane;
+        $this->url = $url;
+    }
+
+    /**
+     * Retrieve the dashlets url
+     *
+     * @return ?Url
+     */
+    public function getUrl()
+    {
+        if ($this->url !== null && ! $this->url instanceof Url) {
+            if (Icinga::app()->isCli()) {
+                $this->url = Url::fromPath($this->url, [], new Request());
+            } else {
+                $this->url = Url::fromPath($this->url);
+            }
+        }
+
+        return $this->url;
+    }
+
+    /**
+     * Set the dashlets URL
+     *
+     * @param string|Url $url The url to use, either as an Url object or as a path
+     *
+     * @return $this
+     */
+    public function setUrl($url): self
+    {
+        $this->url = $url;
+
+        return $this;
+    }
+
+    /**
+     * Set the progress label to use
+     *
+     * @param string $label
+     *
+     * @return  $this
+     */
+    public function setProgressLabel(string $label): self
+    {
+        $this->progressLabel = $label;
+
+        return $this;
+    }
+
+    /**
+     * Return the progress label to use
+     *
+     * @return  string
+     */
+    public function getProgressLabel(): string
+    {
+        if ($this->progressLabel === null) {
+            return $this->progressLabel = t('Loading');
+        }
+
+        return $this->progressLabel;
+    }
+
+    /**
+     * Set the Pane of this dashlet
+     *
+     * @param Pane $pane
+     *
+     * @return Dashlet
+     */
+    public function setPane(Pane $pane): self
+    {
+        $this->pane = $pane;
+
+        return $this;
+    }
+
+    /**
+     * Get the pane of this dashlet
+     *
+     * @return ?Pane
+     */
+    public function getPane()
+    {
+        return $this->pane;
+    }
+
+    /**
+     * Get the name of the module which provides this dashlet
+     *
+     * @return ?string
+     */
+    public function getModule()
+    {
+        return $this->module;
+    }
+
+    /**
+     * Set the name of the module which provides this dashlet
+     *
+     * @param string $module
+     *
+     * @return $this
+     */
+    public function setModule(string $module): self
+    {
+        $this->module = $module;
+
+        return $this;
+    }
+
+    /**
+     * Get whether this widget originates from a module
+     *
+     * @return bool
+     */
+    public function isModuleDashlet(): bool
+    {
+        return $this->moduleDashlet;
+    }
+
+    /**
+     * Set whether this dashlet widget is provided by a module
+     *
+     * @param bool $moduleDashlet
+     *
+     * @return $this
+     */
+    public function setModuleDashlet(bool $moduleDashlet): self
+    {
+        $this->moduleDashlet = $moduleDashlet;
+
+        return $this;
+    }
+
+    /**
+     * Generate a html widget for this dashlet
+     *
+     * @return BaseHtmlElement
+     */
+    public function getHtml(): BaseHtmlElement
+    {
+        $dashletHtml = HtmlElement::create('div', ['class' => 'container']);
+        if (! $this->getUrl()) {
+            $dashletHtml->addHtml(HtmlElement::create('h1', null, t($this->getTitle())));
+            $dashletHtml->addHtml(HtmlElement::create(
+                'p',
+                ['class' => 'error-message'],
+                sprintf(t('Cannot create dashboard dashlet "%s" without valid URL'), t($this->getTitle()))
+            ));
+        } else {
+            $url = $this->getUrl();
+
+            $dashletHtml->setAttribute('data-icinga-url', $url->with('showCompact', true));
+            $dashletHtml->addHtml(new HtmlElement('h1', null, new Link(
+                t($this->getTitle()),
+                $url->without(['limit', 'view'])->getRelativeUrl(),
+                [
+                    'aria-label'       => t($this->getTitle()),
+                    'title'            => t($this->getTitle()),
+                    'data-base-target' => 'col1'
+                ]
+            )));
+
+            $dashletHtml->addHtml(HtmlElement::create(
+                'p',
+                ['class' => 'progress-label'],
+                [
+                    $this->getProgressLabel(),
+                    HtmlElement::create('span', null, '.'),
+                    HtmlElement::create('span', null, '.'),
+                    HtmlElement::create('span', null, '.'),
+                ]
+            ));
+        }
+
+        return $dashletHtml;
+    }
+
+    public function toArray(bool $stringify = true): array
+    {
+        $pane = $this->getPane();
+        return [
+            'id'    => $this->getUuid(),
+            'pane'  => ! $stringify ? $pane : ($pane ? $pane->getName() : null),
+            'name'  => $this->getName(),
+            'url'   => $this->getUrl()->getRelativeUrl(),
+            'label' => $this->getTitle(),
+            'order' => $this->getPriority(),
+        ];
+    }
+}
diff --git a/library/Icinga/Web/Dashboard/ItemList/DashboardHomeList.php b/library/Icinga/Web/Dashboard/ItemList/DashboardHomeList.php
new file mode 100644
index 0000000000..ab4aa97ba5
--- /dev/null
+++ b/library/Icinga/Web/Dashboard/ItemList/DashboardHomeList.php
@@ -0,0 +1,69 @@
+<?php
+
+/* Icinga Web 2 | (c) 2022 Icinga GmbH | GPLv2+ */
+
+namespace Icinga\Web\Dashboard\ItemList;
+
+use Icinga\Web\Dashboard\Common\ItemListControl;
+use Icinga\Web\Dashboard\Dashboard;
+use Icinga\Web\Dashboard\DashboardHome;
+use ipl\Html\BaseHtmlElement;
+use ipl\Html\HtmlElement;
+use ipl\Web\Url;
+use ipl\Web\Widget\ActionLink;
+
+class DashboardHomeList extends ItemListControl
+{
+    /** @var DashboardHome */
+    protected $home;
+
+    protected $defaultAttributes = ['class' => 'home-list-control'];
+
+    public function __construct(DashboardHome $home)
+    {
+        $this->home = $home;
+        $this->home->setActive();
+        $this->home->loadDashboardEntries();
+
+        $this->getAttributes()
+            ->registerAttributeCallback('data-icinga-home', function () {
+                return $this->home->getName();
+            });
+    }
+
+    protected function getHtmlId(): string
+    {
+        return $this->home->getUuid();
+    }
+
+    protected function getCollapsibleControlClass(): string
+    {
+        return 'dashboard-list-info';
+    }
+
+    protected function createItemList(): BaseHtmlElement
+    {
+        $url = Url::fromPath(Dashboard::BASE_ROUTE . '/edit-home')
+            ->setParams(['home' => $this->home->getName()]);
+
+        $this->assembleHeader($url, $this->home->getTitle());
+
+        $list = HtmlElement::create('ul', ['class' => 'dashboard-item-list']);
+        // List all dashboard panes
+        foreach ($this->home->getEntries() as $pane) {
+            $pane->setHome($this->home); // In case it's not set
+
+            $list->addHtml(new DashboardList($pane));
+        }
+
+        return $list;
+    }
+
+    protected function createActionLink(): BaseHtmlElement
+    {
+        $url = Url::fromPath(Dashboard::BASE_ROUTE . '/new-pane');
+        $url->setParams(['home' => $this->home->getName()]);
+
+        return new ActionLink(t('Add Dashboard'), $url, 'plus', ['class' => 'add-dashboard']);
+    }
+}
diff --git a/library/Icinga/Web/Dashboard/ItemList/DashboardList.php b/library/Icinga/Web/Dashboard/ItemList/DashboardList.php
new file mode 100644
index 0000000000..f264fbe3ca
--- /dev/null
+++ b/library/Icinga/Web/Dashboard/ItemList/DashboardList.php
@@ -0,0 +1,75 @@
+<?php
+
+/* Icinga Web 2 | (c) 2022 Icinga GmbH | GPLv2+ */
+
+namespace Icinga\Web\Dashboard\ItemList;
+
+use Icinga\Web\Dashboard\Common\ItemListControl;
+use Icinga\Web\Dashboard\Dashboard;
+use Icinga\Web\Dashboard\Pane;
+use ipl\Html\BaseHtmlElement;
+use ipl\Html\HtmlElement;
+use ipl\Web\Url;
+use ipl\Web\Widget\ActionLink;
+
+class DashboardList extends ItemListControl
+{
+    /** @var Pane */
+    protected $pane;
+
+    protected $defaultAttributes = ['class' => 'dashboard-list-control'];
+
+    public function __construct(Pane $pane)
+    {
+        $this->pane = $pane;
+
+        $this->getAttributes()
+            ->registerAttributeCallback('data-icinga-pane', function () {
+                return $this->pane->getName();
+            });
+    }
+
+    protected function getHtmlId(): string
+    {
+        return bin2hex($this->pane->getUuid());
+    }
+
+    protected function getCollapsibleControlClass(): string
+    {
+        return 'dashlets-list-info';
+    }
+
+    protected function createItemList(): BaseHtmlElement
+    {
+        $pane = $this->pane;
+        $this->getAttributes()->set('data-toggle-element', '.dashlets-list-info');
+        $url = Url::fromPath(Dashboard::BASE_ROUTE . '/edit-pane')
+            ->setParams(['home' => $pane->getHome()->getName(), 'pane' => $pane->getName()]);
+
+        $this->assembleHeader($url, $pane->getTitle());
+
+        $list = HtmlElement::create('ul', ['class' => 'dashlet-item-list']);
+        $url = Url::fromPath(Dashboard::BASE_ROUTE . '/new-dashlet');
+        $url->setParams([
+            'home' => $pane->getHome()->getName(),
+            'pane' => $pane->getName()
+        ]);
+
+        foreach ($pane->getEntries() as $dashlet) {
+            $list->addHtml(new DashletListItem($dashlet, true));
+        }
+
+        return $list;
+    }
+
+    protected function createActionLink(): BaseHtmlElement
+    {
+        $url = Url::fromPath(Dashboard::BASE_ROUTE . '/new-dashlet');
+        $url->setParams([
+            'home' => $this->pane->getHome()->getName(),
+            'pane' => $this->pane->getName()
+        ]);
+
+        return new ActionLink(t('Add Dashlet'), $url, 'plus', ['class' => 'add-dashlet']);
+    }
+}
diff --git a/library/Icinga/Web/Dashboard/ItemList/DashletListItem.php b/library/Icinga/Web/Dashboard/ItemList/DashletListItem.php
new file mode 100644
index 0000000000..72f87c204e
--- /dev/null
+++ b/library/Icinga/Web/Dashboard/ItemList/DashletListItem.php
@@ -0,0 +1,120 @@
+<?php
+
+/* Icinga Web 2 | (c) 2022 Icinga GmbH | GPLv2+ */
+
+namespace Icinga\Web\Dashboard\ItemList;
+
+use Icinga\Web\Dashboard\Common\ItemListControl;
+use Icinga\Web\Dashboard\Dashboard;
+use Icinga\Web\Dashboard\Dashlet;
+use ipl\Html\BaseHtmlElement;
+use ipl\Html\HtmlElement;
+use ipl\Html\ValidHtml;
+use ipl\Web\Url;
+use ipl\Web\Widget\Link;
+
+class DashletListItem extends BaseHtmlElement
+{
+    protected $defaultAttributes = ['class' => 'dashlet-list-item',];
+
+    protected $tag = 'li';
+
+    /** @var Dashlet */
+    protected $dashlet;
+
+    /** @var bool Whether to render the detail actions for this dashlet item */
+    protected $renderDetailActions;
+
+    public function __construct(Dashlet $dashlet = null, $renderDetailActions = false)
+    {
+        $this->dashlet = $dashlet;
+        $this->renderDetailActions = $renderDetailActions;
+
+        if ($this->dashlet && $renderDetailActions) {
+            $this->getAttributes()
+                ->registerAttributeCallback('data-icinga-dashlet', function () {
+                    return $this->dashlet->getName();
+                })
+                ->registerAttributeCallback('id', function () {
+                    return bin2hex($this->dashlet->getUuid());
+                });
+        }
+    }
+
+    /**
+     * Set whether to render the detail actions for this dashlet
+     *
+     * @param bool $value
+     *
+     * @return $this
+     */
+    protected function setRenderDetailActions(bool $value): self
+    {
+        $this->renderDetailActions = $value;
+
+        return $this;
+    }
+
+    /**
+     * Assemble header of this dashlet item
+     *
+     * @return ValidHtml
+     */
+    protected function assembleHeader(): ValidHtml
+    {
+        $header = HtmlElement::create('h1', ['class' => 'dashlet-header']);
+
+        if ($this->renderDetailActions) {
+            $header->addHtml(new Link(
+                t($this->dashlet->getTitle()),
+                $this->dashlet->getUrl()->with('_dashlet', bin2hex($this->dashlet->getUuid()))->getRelativeUrl(),
+                [
+                    'class'            => 'dashlet-title',
+                    'aria-label'       => t($this->dashlet->getTitle()),
+                    'title'            => t($this->dashlet->getTitle()),
+                    'data-base-target' => '_next'
+                ]
+            ));
+
+            $pane = $this->dashlet->getPane();
+            $url = Url::fromPath(Dashboard::BASE_ROUTE . '/edit-dashlet');
+            $url->setParams([
+                'home'    => $pane->getHome()->getName(),
+                'pane'    => $pane->getName(),
+                'dashlet' => $this->dashlet->getName()
+            ]);
+
+            $header->addHtml(new Link(t('Edit'), $url, [
+                'data-icinga-modal'   => true,
+                'data-no-icinga-ajax' => true
+            ]));
+
+            $header->addHtml(ItemListControl::createDragInitiator());
+        } else {
+            $header->add($this->dashlet->getTitle());
+            $header->getAttributes()->set('title', $this->dashlet->getTitle());
+        }
+
+        return $header;
+    }
+
+    protected function assembleSummary()
+    {
+        $section = HtmlElement::create('section', ['class' => 'caption']);
+
+        if ($this->dashlet) {
+            $description = $this->dashlet->getDescription() ?: t('There is no provided description.');
+            $section->getAttributes()->set('title', $description);
+
+            $section->add($description);
+        }
+
+        return $section;
+    }
+
+    protected function assemble()
+    {
+        $this->addHtml($this->assembleHeader());
+        $this->addHtml($this->assembleSummary());
+    }
+}
diff --git a/library/Icinga/Web/Dashboard/ItemList/DashletListMultiSelect.php b/library/Icinga/Web/Dashboard/ItemList/DashletListMultiSelect.php
new file mode 100644
index 0000000000..97636fa796
--- /dev/null
+++ b/library/Icinga/Web/Dashboard/ItemList/DashletListMultiSelect.php
@@ -0,0 +1,43 @@
+<?php
+
+/* Icinga Web 2 | (c) 2022 Icinga GmbH | GPLv2+ */
+
+namespace Icinga\Web\Dashboard\ItemList;
+
+use ipl\Html\Contract\FormElement;
+use ipl\Html\HtmlElement;
+
+class DashletListMultiSelect extends DashletListItem
+{
+    /** @var FormElement */
+    protected $checkbox;
+
+    /**
+     * Set a checkbox to be applied to the dashlet to enable multiselect
+     *
+     * @param FormElement $checkbox
+     *
+     * @return $this
+     */
+    public function setCheckBox(FormElement $checkbox): self
+    {
+        $this->checkbox = $checkbox;
+
+        return $this;
+    }
+
+    protected function createLabel(): HtmlElement
+    {
+        $label = HtmlElement::create('label');
+        $label->addHtml($this->checkbox);
+
+        return $label;
+    }
+
+    protected function assemble()
+    {
+        parent::assemble();
+
+        $this->addWrapper($this->createLabel());
+    }
+}
diff --git a/library/Icinga/Web/Dashboard/ItemList/EmptyDashlet.php b/library/Icinga/Web/Dashboard/ItemList/EmptyDashlet.php
new file mode 100644
index 0000000000..f6ea74db8e
--- /dev/null
+++ b/library/Icinga/Web/Dashboard/ItemList/EmptyDashlet.php
@@ -0,0 +1,41 @@
+<?php
+
+/* Icinga Web 2 | (c) 2022 Icinga GmbH | GPLv2+ */
+
+namespace Icinga\Web\Dashboard\ItemList;
+
+use ipl\Html\HtmlElement;
+use ipl\Html\ValidHtml;
+
+class EmptyDashlet extends DashletListMultiSelect
+{
+    protected function createEmptyList()
+    {
+        return HtmlElement::create('ul', ['class' => 'dashlet-item-list empty-list']);
+    }
+
+    protected function assembleHeader(): ValidHtml
+    {
+        $header = HtmlElement::create('h1', ['class' => 'dashlet-header']);
+        $header->add(t('Custom Url'));
+
+        return $header;
+    }
+
+    protected function assembleSummary()
+    {
+        $section = HtmlElement::create('section', ['class' => 'caption']);
+        $section->add(t('Create a dashlet with custom url and filter'));
+
+        return $section;
+    }
+
+    protected function assemble()
+    {
+        $this->addHtml($this->assembleHeader());
+        $this->addHtml($this->assembleSummary());
+
+        $this->addWrapper($this->createLabel());
+        $this->addWrapper($this->createEmptyList());
+    }
+}
diff --git a/library/Icinga/Web/Dashboard/Pane.php b/library/Icinga/Web/Dashboard/Pane.php
new file mode 100644
index 0000000000..c2498bea5b
--- /dev/null
+++ b/library/Icinga/Web/Dashboard/Pane.php
@@ -0,0 +1,216 @@
+<?php
+
+/* Icinga Web 2 | (c) 2022 Icinga GmbH | GPLv2+ */
+
+namespace Icinga\Web\Dashboard;
+
+use Icinga\Web\Dashboard\Common\BaseDashboard;
+use Icinga\Exception\ProgrammingError;
+use Icinga\Exception\ConfigurationError;
+use Icinga\Model;
+use Icinga\Web\Dashboard\Common\DashboardEntries;
+use Icinga\Web\Dashboard\Common\Sortable;
+use ipl\Stdlib\Filter;
+use ipl\Web\Url;
+
+use function ipl\Stdlib\get_php_type;
+
+/**
+ * A pane, displaying different Dashboard dashlets
+ */
+class Pane extends BaseDashboard implements Sortable
+{
+    use DashboardEntries;
+
+    const TABLE = 'icingaweb_dashboard';
+
+    /**
+     * A dashboard home this pane is a part of
+     *
+     * @var DashboardHome
+     */
+    protected $home;
+
+    /**
+     * Get the dashboard home this pane is a part of
+     *
+     * This may return null if it wasn't set before (should never happen for DB dashboards)
+     *
+     * @return ?DashboardHome
+     */
+    public function getHome()
+    {
+        return $this->home;
+    }
+
+    /**
+     * Set the dashboard home this pane is a part of
+     *
+     * @param DashboardHome $home
+     *
+     * @return $this
+     */
+    public function setHome(DashboardHome $home): self
+    {
+        $this->home = $home;
+
+        return $this;
+    }
+
+    public function createEntry(string $name, $url = null)
+    {
+        if ($url === null) {
+            throw new ConfigurationError('Can\'t create a dashlet "%s" without a valid url', $name);
+        }
+
+        $dashlet = new Dashlet($name, $url, $this);
+        $this->addEntry($dashlet);
+
+        return $this;
+    }
+
+    public function removeEntry($dashlet)
+    {
+        $name = $dashlet instanceof Dashlet ? $dashlet->getName() : $dashlet;
+        if (! $this->hasEntry($name)) {
+            throw new ProgrammingError('Trying to remove invalid dashlet: %s', $name);
+        }
+
+        if (! $dashlet instanceof Dashlet) {
+            $dashlet = $this->getEntry($dashlet);
+        }
+
+        Dashboard::getConn()->delete(Dashlet::TABLE, [
+            'id = ?'           => $dashlet->getUuid(),
+            'dashboard_id = ?' => $this->getUuid()
+        ]);
+
+        return $this;
+    }
+
+    public function loadDashboardEntries(string $name = '')
+    {
+        $dashlets = Model\Dashlet::on(Dashboard::getConn())
+            ->utilize(self::TABLE)
+            ->with('icingaweb_module_dashlet');
+        $dashlets->filter(Filter::equal('dashboard_id', $this->getUuid()));
+
+        $this->setEntries([]);
+        foreach ($dashlets as $dashlet) {
+            $newDashlet = new Dashlet($dashlet->name, $dashlet->url, $this);
+            $newDashlet
+                ->setPane($this)
+                ->setUuid($dashlet->id)
+                ->setTitle($dashlet->label)
+                ->setPriority($dashlet->priority)
+                ->setDescription($dashlet->icingaweb_module_dashlet->description);
+
+            $this->addEntry($newDashlet);
+        }
+
+        return $this;
+    }
+
+    public function manageEntry($entry, BaseDashboard $origin = null, bool $manageRecursive = false)
+    {
+        if ($origin && ! $origin instanceof Pane) {
+            throw new \InvalidArgumentException(sprintf(
+                __METHOD__ . ' expects parameter "$origin" to be an instance of "%s". Got "%s" instead.',
+                get_php_type($this),
+                get_php_type($origin)
+            ));
+        }
+
+        if (! $this->getHome()) {
+            throw new \LogicException(
+                'Dashlets cannot be managed. Please make sure to set the current dashboard home beforehand.'
+            );
+        }
+
+        $home = $this->getHome();
+        $user = Dashboard::getUser()->getUsername();
+        $conn = Dashboard::getConn();
+
+        $dashlets = is_array($entry) ? $entry : [$entry];
+        // Highest priority is 0, so count($entries) are always lowest prio + 1
+        $order = count($this->getEntries());
+        foreach ($dashlets as $dashlet) {
+            if (is_array($dashlet)) {
+                $this->manageEntry($dashlet, $origin);
+            }
+
+            if (! $dashlet instanceof Dashlet) {
+                break;
+            }
+
+            $uuid = Dashboard::getSHA1($user . $home->getName() . $this->getName() . $dashlet->getName());
+            if (! $this->hasEntry($dashlet->getName()) && (! $origin || ! $origin->hasEntry($dashlet->getName()))) {
+                $conn->insert(Dashlet::TABLE, [
+                    'id'           => $uuid,
+                    'dashboard_id' => $this->getUuid(),
+                    'name'         => $dashlet->getName(),
+                    'label'        => $dashlet->getTitle(),
+                    'url'          => $dashlet->getUrl()->getRelativeUrl(),
+                    'priority'     => $order++
+                ]);
+
+                if ($dashlet->isModuleDashlet()) {
+                    $systemUuid = $dashlet->getUuid();
+                    if (! $systemUuid) {
+                        $data = $dashlet->getModule();
+                        if (($pane = $dashlet->getPane())) {
+                            $data .= $pane->getName();
+                        }
+
+                        $systemUuid = Dashboard::getSHA1($data . $dashlet->getName());
+                    }
+
+                    $conn->insert('icingaweb_system_dashlet', [
+                        'dashlet_id'        => $uuid,
+                        'module_dashlet_id' => $systemUuid
+                    ]);
+                }
+            } elseif (! $this->hasEntry($dashlet->getName()) || ! $origin
+                || ! $origin->hasEntry($dashlet->getName())) {
+                $filterCondition = [
+                    'id = ?'           => $dashlet->getUuid(),
+                    'dashboard_id = ?' => $this->getUuid()
+                ];
+
+                if ($origin && $origin->hasEntry($dashlet->getName())) {
+                    $filterCondition = [
+                        'id = ?'           => $origin->getEntry($dashlet->getName())->getUuid(),
+                        'dashboard_id = ?' => $origin->getUuid()
+                    ];
+                }
+
+                $conn->update(Dashlet::TABLE, [
+                    'id'           => $uuid,
+                    'dashboard_id' => $this->getUuid(),
+                    'label'        => $dashlet->getTitle(),
+                    'url'          => $dashlet->getUrl()->getRelativeUrl(),
+                    'priority'     => $dashlet->getPriority()
+                ], $filterCondition);
+            } else {
+                // This should have already been handled by the caller
+                break;
+            }
+
+            $dashlet->setPane($this);
+        }
+
+        return $this;
+    }
+
+    public function toArray(bool $stringify = true): array
+    {
+        $home = $this->getHome();
+        return [
+            'id'       => $this->getUuid(),
+            'name'     => $this->getName(),
+            'label'    => $this->getTitle(),
+            'home'     => ! $stringify ? $home : ($home ? $home->getName() : null),
+            'priority' => $this->getPriority(),
+        ];
+    }
+}
diff --git a/library/Icinga/Web/Dashboard/Settings.php b/library/Icinga/Web/Dashboard/Settings.php
new file mode 100644
index 0000000000..3bbd7db3ef
--- /dev/null
+++ b/library/Icinga/Web/Dashboard/Settings.php
@@ -0,0 +1,58 @@
+<?php
+
+/* Icinga Web 2 | (c) 2022 Icinga GmbH | GPLv2+ */
+
+namespace Icinga\Web\Dashboard;
+
+use Icinga\Web\Dashboard\ItemList\DashboardHomeList;
+use Icinga\Web\Dashboard\ItemList\DashboardList;
+use ipl\Html\BaseHtmlElement;
+use ipl\Web\Url;
+use ipl\Web\Widget\ActionLink;
+
+class Settings extends BaseHtmlElement
+{
+    protected $defaultAttributes = ['class' => 'dashboard-settings'];
+
+    protected $tag = 'div';
+
+    /** @var Dashboard */
+    protected $dashboard;
+
+    public function __construct(Dashboard $dashboard)
+    {
+        $this->dashboard = $dashboard;
+    }
+
+    protected function assemble()
+    {
+        $activeHome = $this->dashboard->getActiveHome();
+        if (count($this->dashboard->getEntries()) === 1 && $activeHome->getName() === DashboardHome::DEFAULT_HOME) {
+            $this->setAttribute('data-icinga-home', DashboardHome::DEFAULT_HOME);
+
+            foreach ($activeHome->getEntries() as $pane) {
+                $pane->setHome($activeHome);
+
+                $this->addHtml(new DashboardList($pane));
+            }
+
+            $url = Url::fromPath(Dashboard::BASE_ROUTE . '/new-pane')
+                ->setParams(['home' => $activeHome->getName()]);
+
+            $this->addHtml(new ActionLink(t('Add Dashboard'), $url, 'plus', [
+                'class'               => 'add-dashboard',
+                'data-icinga-modal'   => true,
+                'data-no-icinga-ajax' => true
+            ]));
+        } else {
+            // Make a list of dashboard homes
+            foreach ($this->dashboard->getEntries() as $home) {
+                if ($home->isDisabled()) {
+                    continue;
+                }
+
+                $this->addHtml(new DashboardHomeList($home));
+            }
+        }
+    }
+}
diff --git a/library/Icinga/Web/JavaScript.php b/library/Icinga/Web/JavaScript.php
index 7d0eed8ec1..d5dd1cbae0 100644
--- a/library/Icinga/Web/JavaScript.php
+++ b/library/Icinga/Web/JavaScript.php
@@ -42,7 +42,8 @@ class JavaScript
         'js/icinga/behavior/selectable.js',
         'js/icinga/behavior/modal.js',
         'js/icinga/behavior/input-enrichment.js',
-        'js/icinga/behavior/datetime-picker.js'
+        'js/icinga/behavior/datetime-picker.js',
+        'js/icinga/behavior/dashboards.js'
     ];
 
     protected static $vendorFiles = [
diff --git a/library/Icinga/Web/Menu.php b/library/Icinga/Web/Menu.php
index 3289b56d98..689bc1f242 100644
--- a/library/Icinga/Web/Menu.php
+++ b/library/Icinga/Web/Menu.php
@@ -5,7 +5,11 @@
 
 use Icinga\Application\Logger;
 use Icinga\Authentication\Auth;
+use Icinga\Model\Home;
+use Icinga\Web\Dashboard\DashboardHome;
 use Icinga\Web\Navigation\Navigation;
+use Icinga\Web\Dashboard\Dashboard;
+use ipl\Stdlib\Filter;
 
 /**
  * Main menu for Icinga Web 2
@@ -28,9 +32,10 @@ public function init()
     {
         $this->addItem('dashboard', [
             'label'     => t('Dashboard'),
-            'url'       => 'dashboard',
+            'url'       => Dashboard::BASE_ROUTE,
             'icon'      => 'dashboard',
-            'priority'  => 10
+            'priority'  => 10,
+            'children'  => $this->fetchDashboardHomes()
         ]);
         $this->addItem('system', [
             'label'     => t('System'),
@@ -147,4 +152,34 @@ public function init()
             ]));
         }
     }
+
+    protected function fetchDashboardHomes()
+    {
+        $dashboardHomes = [];
+
+        try {
+            $homes = Home::on(Dashboard::getConn());
+            $homes->filter(Filter::equal('username', Auth::getInstance()->getUser()->getUsername()));
+
+            foreach ($homes as $home) {
+                if ($home->name === DashboardHome::DEFAULT_HOME) {
+                    continue;
+                }
+
+                $dashboardHomes[$home->name] = [
+                    'label'    => $home->label,
+                    'priority' => $home->priority,
+                    'url'      => Url::fromPath(Dashboard::BASE_ROUTE . '/home', [
+                        'home' => $home->name
+                    ])
+                ];
+            }
+        } catch (\Exception $_) {
+            // Nothing to do
+            // Any database issue will be noticed soon enough, so prevent the Menu
+            // from being ruined in any case.
+        }
+
+        return $dashboardHomes;
+    }
 }
diff --git a/library/Icinga/Web/Response.php b/library/Icinga/Web/Response.php
index df0b842d54..e59697ed06 100644
--- a/library/Icinga/Web/Response.php
+++ b/library/Icinga/Web/Response.php
@@ -317,28 +317,44 @@ protected function prepare()
     {
         $redirectUrl = $this->getRedirectUrl();
         if ($this->getRequest()->isXmlHttpRequest()) {
+            $window = Window::getInstance();
+            $dashletId = $window->getDashletId();
+
             if ($redirectUrl !== null) {
                 if ($this->getRequest()->isGet() && Icinga::app()->getViewRenderer()->view->compact) {
                     $redirectUrl->getParams()->set('showCompact', true);
                 }
 
+                if ($dashletId !== null && $this->getRequest()->getUrl()->getPath() === $redirectUrl->getPath()) {
+                    $redirectUrl->getParams()->set('_dashlet', bin2hex($dashletId));
+                }
+
                 $this->setHeader('X-Icinga-Redirect', rawurlencode($redirectUrl->getAbsoluteUrl()), true);
                 if ($this->getRerenderLayout()) {
                     $this->setHeader('X-Icinga-Rerender-Layout', 'yes', true);
                 }
+            } else {
+                if ($dashletId !== null) {
+                    $this->setHeader('X-Icinga-DashletId', bin2hex($dashletId));
+                }
             }
+
             if ($this->getOverrideWindowId()) {
-                $this->setHeader('X-Icinga-WindowId', Window::getInstance()->getId(), true);
+                $this->setHeader('X-Icinga-WindowId', $window->getId(), true);
             }
+
             if ($this->getRerenderLayout()) {
                 $this->setHeader('X-Icinga-Container', 'layout', true);
             }
+
             if ($this->isWindowReloaded()) {
                 $this->setHeader('X-Icinga-Reload-Window', 'yes', true);
             }
+
             if ($this->isReloadCss()) {
                 $this->setHeader('X-Icinga-Reload-Css', 'now', true);
             }
+
             if (($autoRefreshInterval = $this->getAutoRefreshInterval()) !== null) {
                 $this->setHeader('X-Icinga-Refresh', $autoRefreshInterval, true);
             }
diff --git a/library/Icinga/Web/StyleSheet.php b/library/Icinga/Web/StyleSheet.php
index aba89b4cc3..d231bd9bc9 100644
--- a/library/Icinga/Web/StyleSheet.php
+++ b/library/Icinga/Web/StyleSheet.php
@@ -79,7 +79,8 @@ class StyleSheet
         'css/icinga/modal.less',
         'css/icinga/audit.less',
         'css/icinga/health.less',
-        'css/icinga/php-diff.less'
+        'css/icinga/php-diff.less',
+        'css/icinga/dashboards.less'
     ];
 
     /**
diff --git a/library/Icinga/Web/Widget/SearchDashboard.php b/library/Icinga/Web/Widget/SearchDashboard.php
index 1ce4c464b2..5b12060ac7 100644
--- a/library/Icinga/Web/Widget/SearchDashboard.php
+++ b/library/Icinga/Web/Widget/SearchDashboard.php
@@ -3,15 +3,24 @@
 
 namespace Icinga\Web\Widget;
 
-use Zend_Controller_Action_Exception;
+use Icinga\Exception\Http\HttpNotFoundException;
 use Icinga\Application\Icinga;
+use Icinga\Web\Dashboard\DashboardHome;
+use Icinga\Web\Dashboard\Dashlet;
 use Icinga\Web\Url;
 
 /**
  * Class SearchDashboard display multiple search views on a single search page
  */
-class SearchDashboard extends Dashboard
+class SearchDashboard extends \Icinga\Web\Dashboard\Dashboard
 {
+    /**
+     * Name for the search home
+     *
+     * @var string
+     */
+    const SEARCH_HOME = 'Search Home';
+
     /**
      * Name for the search pane
      *
@@ -20,12 +29,22 @@ class SearchDashboard extends Dashboard
     const SEARCH_PANE = 'search';
 
     /**
-     * {@inheritdoc}
+     * Dashboard home of this search dashboard
+     *
+     * @var DashboardHome
      */
+    protected $searchHome;
+
+    public function __construct()
+    {
+        $this->searchHome = new DashboardHome(self::SEARCH_HOME);
+    }
+
     public function getTabs()
     {
         if ($this->tabs === null) {
-            $this->tabs = new Tabs();
+            $this->tabs = new \ipl\Web\Widget\Tabs();
+
             $this->tabs->add(
                 'search',
                 array(
@@ -35,9 +54,15 @@ public function getTabs()
                 )
             );
         }
+
         return $this->tabs;
     }
 
+    public function getActiveHome()
+    {
+        return $this->searchHome;
+    }
+
     /**
      * Load all available search dashlets from modules
      *
@@ -47,18 +72,19 @@ public function getTabs()
      */
     public function search($searchString = '')
     {
-        $pane = $this->createPane(self::SEARCH_PANE)->getPane(self::SEARCH_PANE)->setTitle(t('Search'));
+        $pane = $this->searchHome->createEntry(self::SEARCH_PANE)->getEntry(self::SEARCH_PANE);
+        $pane->setTitle(t('Search'));
         $this->activate(self::SEARCH_PANE);
 
         $manager = Icinga::app()->getModuleManager();
         $searchUrls = array();
 
         foreach ($manager->getLoadedModules() as $module) {
-            if ($this->getUser()->can($manager::MODULE_PERMISSION_NS . $module->getName())) {
+            if (self::getUser()->can($manager::MODULE_PERMISSION_NS . $module->getName())) {
                 $moduleSearchUrls = $module->getSearchUrls();
                 if (! empty($moduleSearchUrls)) {
                     if ($searchString === '') {
-                        $pane->add(t('Ready to search'), 'search/hint');
+                        $pane->createEntry(t('Ready to search'), 'search/hint');
                         return $this;
                     }
                     $searchUrls = array_merge($searchUrls, $moduleSearchUrls);
@@ -69,28 +95,24 @@ public function search($searchString = '')
         usort($searchUrls, array($this, 'compareSearchUrls'));
 
         foreach (array_reverse($searchUrls) as $searchUrl) {
-            $pane->createDashlet(
-                $searchUrl->title . ': ' . $searchString,
-                Url::fromPath($searchUrl->url, array('q' => $searchString))
-            )->setProgressLabel(t('Searching'));
+            $title = $searchUrl->title . ': ' . $searchString;
+            $pane->createEntry($title, Url::fromPath($searchUrl->url, array('q' => $searchString)));
+            $pane->getEntry($title)->setProgressLabel(t('Searching'));
         }
 
         return $this;
     }
 
-    /**
-     * Renders the output
-     *
-     * @return  string
-     *
-     * @throws  Zend_Controller_Action_Exception
-     */
-    public function render()
+    protected function assemble()
     {
-        if (! $this->getPane(self::SEARCH_PANE)->hasDashlets()) {
-            throw new Zend_Controller_Action_Exception(t('Page not found'), 404);
+        if (! $this->searchHome->getEntry(self::SEARCH_PANE)->hasEntries()) {
+            throw new HttpNotFoundException(t('Page not found'));
+        }
+
+        /** @var Dashlet $dashlet */
+        foreach ($this->searchHome->getEntry(self::SEARCH_PANE)->getEntries() as $dashlet) {
+            $this->addHtml($dashlet->getHtml());
         }
-        return parent::render();
     }
 
     /**
diff --git a/library/Icinga/Web/Widget/Tabextension/DashboardSettings.php b/library/Icinga/Web/Widget/Tabextension/DashboardSettings.php
index fc7412aec5..5d0f618741 100644
--- a/library/Icinga/Web/Widget/Tabextension/DashboardSettings.php
+++ b/library/Icinga/Web/Widget/Tabextension/DashboardSettings.php
@@ -4,13 +4,29 @@
 namespace Icinga\Web\Widget\Tabextension;
 
 use Icinga\Web\Url;
+use Icinga\Web\Dashboard\Dashboard;
 use Icinga\Web\Widget\Tabs;
+use ipl\Web\Widget\Icon;
+use ipl\Web\Widget\Link;
 
 /**
  * Dashboard settings
  */
 class DashboardSettings implements Tabextension
 {
+    /** @var array|null url params to be attached to the cog icon being rendered on the dashboard tab */
+    private $urlParams;
+
+    /**
+     * DashboardSettings constructor.
+     *
+     * @param array $urlParams
+     */
+    public function __construct(array $urlParams = [])
+    {
+        $this->urlParams = $urlParams;
+    }
+
     /**
      * Apply this tabextension to the provided tabs
      *
@@ -18,22 +34,10 @@ class DashboardSettings implements Tabextension
      */
     public function apply(Tabs $tabs)
     {
-        $tabs->addAsDropdown(
-            'dashboard_add',
-            array(
-                'icon'      => 'dashboard',
-                'label'     => t('Add Dashlet'),
-                'url'       => Url::fromPath('dashboard/new-dashlet')
-            )
-        );
-
-        $tabs->addAsDropdown(
-            'dashboard_settings',
-            array(
-                'icon'      => 'dashboard',
-                'label'     => t('Settings'),
-                'url'       => Url::fromPath('dashboard/settings')
-            )
-        );
+        $url = Url::fromPath(Dashboard::BASE_ROUTE . '/settings')->addParams($this->urlParams);
+        $tabs->add('dashboard_settings', [
+            'icon' => 'service',
+            'url'  => (string) $url,
+        ]);
     }
 }
diff --git a/library/Icinga/Web/Window.php b/library/Icinga/Web/Window.php
index 158483a064..89555ad5c9 100644
--- a/library/Icinga/Web/Window.php
+++ b/library/Icinga/Web/Window.php
@@ -19,6 +19,9 @@ class Window
     /** @var string */
     protected $containerId;
 
+    /** @var ?string A dashlet's UUID which the current request is associated with */
+    protected $dashletId;
+
     public function __construct($id)
     {
         $parts = explode('_', $id, 2);
@@ -60,6 +63,28 @@ public function getContainerId()
         return $this->containerId ?: $this->id;
     }
 
+    /**
+     * Get the dashlet's UUID which the current request is associated with
+     *
+     * @return ?string
+     */
+    public function getDashletId(): ?string
+    {
+        return $this->dashletId;
+    }
+
+    /**
+     * Associate the current request with a specific dashlet
+     *
+     * @param ?string $dashletId The dashlet's UUID
+     *
+     * @return void
+     */
+    public function setDashletId(?string $dashletId): void
+    {
+        $this->dashletId = $dashletId;
+    }
+
     /**
      * Return a window-aware session by using the given prefix
      *
@@ -111,13 +136,18 @@ public static function generateId()
     public static function getInstance()
     {
         if (! isset(static::$window)) {
-            $id = Icinga::app()->getRequest()->getHeader('X-Icinga-WindowId');
+            $request = Icinga::app()->getRequest();
+            $id = $request->getHeader('X-Icinga-WindowId');
             if (empty($id) || $id === static::UNDEFINED) {
                 Icinga::app()->getResponse()->setOverrideWindowId();
                 $id = static::generateId();
             }
 
             static::$window = new Window($id);
+
+            if (($dashletId = $request->getHeader('X-Icinga-DashletId'))) {
+                static::$window->setDashletId(hex2bin($dashletId));
+            }
         }
 
         return static::$window;
diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 397b68325d..d44a61da80 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -729,7 +729,6 @@ public function servicegridAction()
     protected function filterQuery(DataView $dataView)
     {
         $this->setupFilterControl($dataView, null, null, array(
-            'format', // handleFormatRequest()
             'stateType', // hostsAction() and servicesAction()
             'addColumns', // addColumns()
             'problems', // servicegridAction()
diff --git a/modules/monitoring/configuration.php b/modules/monitoring/configuration.php
index 8415f889ca..90df4febf3 100644
--- a/modules/monitoring/configuration.php
+++ b/modules/monitoring/configuration.php
@@ -120,6 +120,8 @@
 $this->provideSearchUrl($this->translate('Hostgroups'), 'monitoring/list/hostgroups?limit=10', 97);
 $this->provideSearchUrl($this->translate('Servicegroups'), 'monitoring/list/servicegroups?limit=10', 96);
 
+$this->addFrameworkParams('backend', 'format');
+
 /*
  * Available navigation items
  */
diff --git a/public/css/icinga/dashboards.less b/public/css/icinga/dashboards.less
new file mode 100644
index 0000000000..4049930286
--- /dev/null
+++ b/public/css/icinga/dashboards.less
@@ -0,0 +1,329 @@
+.welcome-view {
+  position: relative;
+}
+
+.dashboard-introduction {
+  top: 40%;
+  right: 50%;
+  position: absolute;
+  transform: translate(50%, -50%);
+  color: @text-color;
+
+  h1, p {
+    color: inherit;
+    text-align: center;
+  }
+
+  h1 {
+    border-bottom: none;
+  }
+
+  p {
+    opacity: .9;
+    width: 58em;
+    font-size: 1.1em;
+    line-height: 1.5em;
+  }
+
+  // Welcome page form controls
+  form.icinga-form .form-controls {
+    margin-left: 13em;
+    margin-top: 1.8em;
+    justify-content: center;
+  }
+}
+
+// Collapse/Expand icons wrapper
+.dashboard-list-info, .dashlets-list-info {
+  float: left;
+  width: 1.5%;
+  height: 6%;
+  cursor: pointer;
+
+  .collapse-icon, .expand-icon {
+    top: 0;
+    position: absolute;
+
+    &:before {
+      font-size: 2em;
+    }
+  }
+
+  .collapse-icon {
+    display: block;
+  }
+
+  .expand-icon {
+    display: none;
+  }
+}
+
+.collapsed .dashboard-list-info, .collapsed .dashlets-list-info {
+  .collapse-icon {
+    display: none;
+  }
+
+  .expand-icon {
+    display: block;
+  }
+}
+
+.collapsed .dashlet-list-item {
+  margin-top: 1.3em;
+}
+
+// All the dashboard item lists
+.dashboard-item-list, .dashlet-item-list {
+  padding: 0;
+  margin: 1em 0 0;
+  width: 100%;
+  display: flex;
+  flex-flow: row wrap;
+  list-style-type: none;
+
+  label {
+    width: 49.5%; // (100% % 2) - .5em aka (margin-right)
+    margin-bottom: .5em;
+  }
+
+  label:nth-child(odd) {
+    margin-right: .5em;
+  }
+
+  .dashlet-list-item {
+    display: flex;
+    flex-direction: column;
+    background: @gray-lightest;
+    border: 1px solid @gray-light;
+    .rounded-corners();
+
+    section.caption, h1 {
+      padding-left: .5em;
+      font-weight: 500;
+      overflow: hidden;
+      display: -webkit-box;
+      -webkit-box-orient: vertical;
+    }
+
+    h1 {
+      border-bottom: 1px solid @gray-light;
+      -webkit-line-clamp: 1;
+    }
+
+    .caption {
+      height: 3em;
+      font-size: 1.1em;
+      color: @text-color-light;
+      -webkit-line-clamp: 2;
+    }
+  }
+
+  .dashlet-list-item:hover {
+    background-color: @tr-hover-color;
+    cursor: pointer;
+  }
+
+  // Simulate a multiselect based on the checkbox state
+  input[type="checkbox"]:checked + li {
+    outline-offset: -2px;
+    outline: 2px solid @icinga-blue;
+    background-color: @tr-active-color;
+  }
+}
+
+.dashlet-item-list.empty-list {
+  margin: 0 0 .9em;
+}
+
+// Dashboard manager
+:not(.dashboard) > .container > .content.dashboard-manager {
+  padding-top: 0;
+}
+
+.dashboard-manager-controls {
+  padding-bottom: .5em;
+}
+
+.dashboard-settings {
+  display: flex;
+  flex-direction: column;
+  margin-top: .6em;
+  margin-right: 1em;
+}
+
+.dashboard-manager-controls,
+.home-list-control .collapsible-header,
+.dashboard-list-control .collapsible-header {
+  border-bottom: 1px solid @gray-light;
+}
+
+// Add new home button of the dashboard manager
+.controls .add-home {
+  .button();
+  float: right;
+  margin-right: 1.15em;
+  font-size: 1.2em;
+  font-weight: 500;
+  color: @text-color-on-icinga-blue;
+  background-color: @icinga-blue;
+}
+
+.collapsed .action-link.add-dashlet, .collapsed .action-link.add-dashboard {
+  display: none;
+}
+
+.action-link.add-dashboard {
+  margin: .5em 0 0;
+}
+
+.action-link.add-dashlet, .action-link.add-dashboard {
+  .rounded-corners();
+  order: 1;
+  font-size: 1.2em;
+  font-weight: 500;
+  padding: .6em 1em;
+  text-decoration: none;
+  background-color: @low-sat-blue;
+}
+
+.dashboard-list-control .dashlet-item-list {
+  display: flex;
+  margin-left: 2.2em;
+  width: 97.8%; // 100% - 2.2em margin-left
+
+  .dashlet-list-item {
+    width: 49.7%;
+    cursor: default;
+    margin-bottom: .5em;
+    background: transparent;
+  }
+
+  .dashlet-list-item:nth-child(odd) {
+    margin-right: .5em;
+  }
+}
+
+.dashboard-list-control {
+  width: inherit;
+
+  h1.collapsible-header {
+    margin-left: 1.5em;
+  }
+
+  .action-link.add-dashlet {
+    width: 97.8%;
+    margin-left: 1.8em;
+  }
+}
+
+.home-list-control, .dashboard-list-control {
+  margin: 0;
+  padding: 0;
+  display: flex;
+  flex-direction: column;
+
+  h1.collapsible-header a:not(.dashlet-title), h1.dashlet-header a:not(.dashlet-title) {
+    margin-left: .3em;
+    font-weight: normal;
+    color: @icinga-blue;
+  }
+
+  h1.dashlet-header a.dashlet-title {
+    color: @text-color;
+  }
+
+  h1.collapsible-header {
+    margin-right: .3em;
+  }
+
+  .dashlets-list-info, .dashboard-list-info {
+    .expand-icon {
+      margin-top: .9em;
+    }
+
+    .collapse-icon {
+      margin-top: .6em;
+    }
+  }
+}
+
+// Dashboard home list controls only
+.home-list-control {
+  width: 100%;
+
+  & > h1.collapsible-header {
+    margin-left: 1.5em;
+    margin-bottom: -1em;
+  }
+
+  .dashboard-list-control, .action-link.add-dashboard {
+    margin-left: 1.4em;
+  }
+
+  .dashboard-list-control {
+    .dashboard-item-list, .dashlet-item-list {
+      margin-bottom: 0;
+      margin-top: 0;
+    }
+
+    .dashlet-item-list {
+      width: inherit;
+      margin-left: 2em;
+      padding-right: 2em;
+    }
+
+    .action-link.add-dashlet {
+      margin-left: 1.6em;
+      width: calc((49.74% * 2) - 1.2em); // 2x flex columns - own size
+    }
+  }
+}
+
+// Add dashlets mini wizard
+.form-list-control {
+  span {
+    font-size: 1.3em;
+    opacity: .8;
+    font-weight: 500;
+  }
+}
+
+.form-list-control.multi-dashlets {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  border-top: 2px solid @gray-light;
+
+  .control-group {
+    width: 100%;
+  }
+}
+
+.form-list-control.multi-dashlets:not(.collapsed) span {
+  margin-left: 1.4em;
+}
+
+// Drag and drop
+.draggable-widget-chosen {
+  .box-shadow();
+  background: fade(@icinga-blue, 20);
+  border: .5em @body-bg-color dashed;
+}
+
+// Handle icon
+.widget-drag-initiator {
+  cursor: grab;
+  float: right;
+  font-size: 1.4em;
+  margin-top: -.05em;
+  display: none;
+
+  &:before {
+    color: @base-gray-light;
+  }
+}
+
+h1.collapsible-header:hover .widget-drag-initiator,
+.dashlet-list-item:hover .widget-drag-initiator {
+  display: block;
+}
diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index aa1087204f..8d07749dbd 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -293,6 +293,10 @@ form.icinga-form .form-controls {
   .btn-primary {
     order: 99;
   }
+
+  .btn-remove {
+    margin-right: auto;
+  }
 }
 
 // Button styles
@@ -305,11 +309,13 @@ form.icinga-form .form-controls {
     .button();
   }
 
-  input[type="submit"].btn-remove {
+  input[type="submit"].btn-remove,
+  button[type="submit"].btn-remove {
     .button(@body-bg-color, @color-critical, @color-critical-accentuated);
   }
 
-  input[type="submit"].btn-cancel {
+  input[type="submit"].btn-cancel,
+  button[type="button"].btn-cancel {
     .button(@body-bg-color, @gray, @black);
   }
 
diff --git a/public/css/icinga/layout.less b/public/css/icinga/layout.less
index f2a97e1002..09d49f80fe 100644
--- a/public/css/icinga/layout.less
+++ b/public/css/icinga/layout.less
@@ -183,11 +183,8 @@
 // Dashboard grid
 
 .dashboard {
-  letter-spacing: -0.417em;
-
   > .container {
     display: inline-block;
-    letter-spacing: normal;
     vertical-align: top;
     // Column width controlled by #layout
     width: 100%;
diff --git a/public/css/icinga/widgets.less b/public/css/icinga/widgets.less
index 8015537eb0..20f32b8e62 100644
--- a/public/css/icinga/widgets.less
+++ b/public/css/icinga/widgets.less
@@ -119,7 +119,7 @@
   }
 }
 
-.dashboard.content > .container {
+.dashboard > .container {
   overflow-x: auto;
 }
 
diff --git a/public/js/icinga/behavior/dashboards.js b/public/js/icinga/behavior/dashboards.js
new file mode 100644
index 0000000000..70f6a82e4d
--- /dev/null
+++ b/public/js/icinga/behavior/dashboards.js
@@ -0,0 +1,179 @@
+/*! Icinga Web 2 | (c) 2022 Icinga GmbH | GPLv2+ */
+
+;(function (Icinga, $) {
+
+    'use strict';
+
+    /**
+     * Behavior for the enhanced Icinga Web 2 dashboards
+     *
+     * @param {Icinga} icinga The current Icinga Object
+     */
+    class Dashboard extends Icinga.EventListener {
+        constructor(icinga) {
+            super(icinga);
+
+            try {
+                this.Sortable = require('icinga/icinga-php-library/vendor/Sortable');
+            } catch (e) {
+                console.warn('Unable to provide Sortable. Library not available:', e);
+                return;
+            }
+
+            /**
+             * Possible type of widgets this behavior is being applied to
+             *
+             * @type {object}
+             */
+            this.widgetTypes = { Dashlet : 'Dashlets', Dashboard : 'Dashboards', DashboardHome : 'Homes' };
+
+            this.on('rendered', '#main > .container', this.onRendered, this);
+            // Registers the drop event for all the widget types
+            this.on('end', '.dashboard-settings', this.elementDropped, this);
+        }
+
+        /**
+         * Get the widget type of the given element
+         *
+         * @param {HTMLElement} target
+         *
+         * @returns {null|string}
+         */
+        getTypeFor(target) {
+            if (target.matches('.dashboard-settings')) {
+                if (! target.querySelector('.home-list-control:first-child')) {
+                    return this.widgetTypes.Dashboard;
+                }
+
+                return this.widgetTypes.DashboardHome;
+            } else if (target.matches('.dashboard-item-list')) {
+                return this.widgetTypes.Dashboard;
+            } else if (target.matches('.dashlet-item-list')) {
+                return this.widgetTypes.Dashlet;
+            }
+
+            return null;
+        }
+
+        /**
+         * Set up a request with the reordered widget and post the data to the controller
+         *
+         * @param event
+         *
+         * @returns {boolean}
+         */
+        elementDropped(event) {
+            let _this = event.data.self,
+                orgEvt = event.originalEvent,
+                data = {};
+
+            if (orgEvt.to === orgEvt.from && orgEvt.newIndex === orgEvt.oldIndex) {
+                return false;
+            }
+
+            let item = orgEvt.item;
+            switch (_this.getTypeFor(orgEvt.to)) {
+                case _this.widgetTypes.DashboardHome: {
+                    let home = item.dataset.icingaHome;
+                    data[home] = orgEvt.newIndex;
+                    break;
+                }
+                case _this.widgetTypes.Dashboard: {
+                    let pane = item.dataset.icingaPane,
+                        home = orgEvt.to.closest('.home-list-control, .dashboard-settings').dataset.icingaHome;
+                    if (orgEvt.to !== orgEvt.from) {
+                        let homeList = orgEvt.from.closest('.home-list-control, .dashboard-settings');
+                        data.originals = {
+                            originalHome : homeList.dataset.icingaHome,
+                            originalPane : pane
+                        };
+                    }
+
+                    data[home] = { [pane] : orgEvt.newIndex };
+                    break;
+                }
+                case _this.widgetTypes.Dashlet: {
+                    let dashlet = item.dataset.icingaDashlet;
+
+                    let parent = orgEvt.to.closest('.dashboard-list-control');
+                    let pane = parent.dataset.icingaPane;
+                    // If there is only default home in the dashboard manager view, there won't be rendered a
+                    // ".home-list-control", so we need to look for an alternative
+                    let home = parent.closest('.home-list-control, .dashboard-settings').dataset.icingaHome;
+
+                    if (orgEvt.to !== orgEvt.from) {
+                        let parent = orgEvt.from.closest('.dashboard-list-control');
+                        let orgHome = parent.closest('.home-list-control, .dashboard-settings').dataset.icingaHome;
+                        data.originals = {
+                            originalHome : orgHome,
+                            originalPane : parent.dataset.icingaPane
+                        }
+                    }
+
+                    dashlet = { [dashlet] : orgEvt.newIndex };
+                    data[home] = { [pane] : dashlet };
+                }
+            }
+
+            if (Object.keys(data).length) {
+                if (! data.originals) {
+                    data.originals = null;
+                }
+
+                data = { dashboardData : JSON.stringify(data) };
+                let url = _this.icinga.config.baseUrl + '/dashboards/reorder-widgets';
+                let req = _this.icinga.loader.loadUrl(url, $('#col1'), data, 'post');
+
+                req.addToHistory = false;
+                req.scripted = true;
+            }
+        }
+
+        onRendered(e) {
+            let _this = e.data.self;
+
+            if (e.currentTarget !== e.target || ! e.target.querySelector(':scope > .dashboard-manager')) {
+                // This is for the editor only, which has no nested .containers but a .dashboard-manager
+                return;
+            }
+
+            e.target.querySelectorAll('.dashboard-settings, .dashboard-item-list, .dashlet-item-list')
+                .forEach(sortable => {
+                    let groupName = _this.getTypeFor(sortable),
+                        draggable;
+
+                    switch (groupName) {
+                        case _this.widgetTypes.DashboardHome:
+                            groupName = _this.widgetTypes.DashboardHome;
+                            draggable = '.home-list-control';
+                            break;
+                        case _this.widgetTypes.Dashboard:
+                            groupName = _this.widgetTypes.Dashboard;
+                            draggable = '.dashboard-list-control';
+                            break;
+                        case _this.widgetTypes.Dashlet:
+                            groupName = _this.widgetTypes.Dashlet;
+                            draggable = '.dashlet-list-item';
+                    }
+
+                    let options = {
+                        scroll      : true,
+                        invertSwap  : true,
+                        dataIdAttr  : 'id',
+                        direction   : 'vertical',
+                        draggable   : draggable,
+                        handle      : 'h1 > .widget-drag-initiator',
+                        group       : { name : groupName },
+                        chosenClass : 'draggable-widget-chosen'
+                    };
+
+                    _this.Sortable.create(sortable, options);
+                });
+        }
+    }
+
+    Icinga.Behaviors = Icinga.Behaviors || {};
+
+    Icinga.Behaviors.Dashboard = Dashboard;
+
+})(Icinga, jQuery);
diff --git a/public/js/icinga/behavior/modal.js b/public/js/icinga/behavior/modal.js
index a575e01eab..1d59fbb64a 100644
--- a/public/js/icinga/behavior/modal.js
+++ b/public/js/icinga/behavior/modal.js
@@ -23,7 +23,7 @@
         this.on('change', '#modal form input.autosubmit', this.onFormAutoSubmit, this);
         this.on('click', '[data-icinga-modal]', this.onModalToggleClick, this);
         this.on('mousedown', '#layout > #modal', this.onModalLeave, this);
-        this.on('click', '.modal-header > button', this.onModalClose, this);
+        this.on('click', '#modal [data-icinga-modal-cancel]', this.onModalClose, this);
         this.on('keydown', this.onKeyDown, this);
     };
 
diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 186a41c7cc..88cca4e190 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -165,15 +165,13 @@
             var _this = event.data.self;
             var $target = $(event.target);
 
-            if ($target.children('.dashboard').length) {
-                $target.find('.dashboard > .container').each(function () {
-                    var $dashlet = $(this);
-                    var url = $dashlet.data('icingaUrl');
-                    if (typeof url !== 'undefined') {
-                        _this.icinga.loader.loadUrl(url, $dashlet).autorefresh = true;
-                    }
-                });
-            }
+            $target.find('.dashboard > .container').each(function () {
+                var $dashlet = $(this);
+                var url = $dashlet.data('icingaUrl');
+                if (typeof url !== 'undefined') {
+                    _this.icinga.loader.loadUrl(url, $dashlet).autorefresh = true;
+                }
+            });
         },
 
         rememberSubmitButton: function(e) {
diff --git a/public/js/icinga/history.js b/public/js/icinga/history.js
index 1a38921878..150be7ca3e 100644
--- a/public/js/icinga/history.js
+++ b/public/js/icinga/history.js
@@ -224,57 +224,60 @@
          * Read the pane url from the current URL and load the corresponding panes into containers to
          * match the current history state.
          *
-         * @param   {Boolean|Null}  onload  Set to true when the main pane should not be updated, defaults to false
+         * @param   {Boolean}  onload  Set to true when the main pane should not be updated, defaults to false
          */
-        applyLocationBar: function (onload) {
-            var icinga = this.icinga,
-                main,
-                parts;
+        applyLocationBar: function (onload = false) {
+            let col2State = this.getCol2State();
 
-            if (typeof onload === 'undefined') {
-                onload = false;
+            if (onload && document.querySelector('#layout > #login')) {
+                // The user landed on the login
+                let redirectInput = document.querySelector('#login form input[name=redirect]');
+                redirectInput.value = redirectInput.value + col2State;
+                return;
             }
 
-            // TODO: Still hardcoding col1/col2, shall be dynamic soon
-            main = document.location.pathname + document.location.search;
-            if (! onload && $('#col1').data('icingaUrl') !== main) {
-                icinga.loader.loadUrl(
-                    main,
-                    $('#col1')
-                ).addToHistory = false;
+            let col1 = document.getElementById('col1'),
+                col2 = document.getElementById('col2'),
+                col1Url = document.location.pathname + document.location.search;
+
+            let col2Url;
+            if (col2State && col2State.match(/^#!/)) {
+                col2Url = col2State.split(/#!/)[1];
             }
 
-            if (this.getPaneAnchor(0)) {
-                $('#col1').data('icingaUrl', $('#col1').data('icingaUrl') + '#' + this.getPaneAnchor(0));
+            // This uses jQuery only because of its internal data attribute cache -.-
+            let currentCol1Url = $(col1).data('icingaUrl'),
+                currentCol2Url = $(col2).data('icingaUrl');
+
+            let loadCol1 = ! onload,
+                loadCol2 = !! col2Url;
+            if (currentCol2Url === col1Url) {
+                // User navigated forward
+                this.icinga.ui.moveToLeft();
+                loadCol1 = false;
+            } else if (currentCol1Url === col2Url) {
+                // User navigated back
+                this.icinga.ui.moveToRight();
+                loadCol2 = false;
             }
 
-            var hash = this.getCol2State();
-            if (hash && hash.match(/^#!/)) {
-                parts = hash.split(/#!/);
-
-                if ($('#layout > #login').length) {
-                    // We are on the login page
-                    var redirect = $('#login form input[name=redirect]').first();
-                    redirect.val(
-                        redirect.val() + '#!' + parts[1]
-                    );
-                } else {
-                    if ($('#col2').data('icingaUrl') !== parts[1]) {
-                        var req = icinga.loader.loadUrl(
-                            parts[1],
-                            $('#col2')
-                        );
-                        req.addToHistory = false;
-                        req.scripted = onload;
-                    }
+            if (loadCol1 && currentCol1Url !== col1Url) {
+                let anchor = this.getPaneAnchor(0);
+                if (anchor) {
+                    col1Url += '#' + anchor;
                 }
 
-                // TODO: Replace with dynamic columns
-                icinga.ui.layout2col();
+                this.icinga.loader.loadUrl(col1Url, $(col1)).addToHistory = false;
+            }
 
-            } else {
-                // TODO: Replace with dynamic columns
-                icinga.ui.layout1col();
+            if (loadCol2 && currentCol2Url !== col2Url) {
+                let col2Req = this.icinga.loader.loadUrl(col2Url, $(col2));
+                col2Req.addToHistory = false;
+                col2Req.scripted = onload;
+
+                this.icinga.ui.layout2col();
+            } else if (! loadCol2 && ! col2Url) {
+                this.icinga.ui.layout1col();
             }
         },
 
diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index f038dc7c8f..994d854684 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -89,6 +89,11 @@
                 $target = this.getLinkTargetFor($form);
             }
 
+            // Overwrite the URL only if the form is not auto submitted
+            if ($button.hasAttr('formaction') && ! $autoSubmittedBy) {
+                url = $button.attr('formaction');
+            }
+
             if (! url) {
                 // Use the URL of the target container if the form's action is not set
                 url = $target.closest('.container').data('icinga-url');
@@ -261,6 +266,15 @@
                 headers['X-Icinga-Container'] = id;
             }
 
+            if (method !== 'GET' && $target[0].dataset.icingaDashletId) {
+                let currentUrlPath = this.icinga.utils.parseUrl($target.data('icingaUrl')).path;
+                let newUrlPath = this.icinga.utils.parseUrl(url).path;
+
+                if (newUrlPath === currentUrlPath) {
+                    headers['X-Icinga-DashletId'] = $target[0].dataset.icingaDashletId;
+                }
+            }
+
             if (autorefresh) {
                 headers['X-Icinga-Autorefresh'] = '1';
             }
@@ -771,6 +785,14 @@
                 this.icinga.ui.setWindowId(windowId);
             }
 
+            // Preserve the dashlet identifier if available, clean up if not
+            let dashletId = req.getResponseHeader('X-Icinga-DashletId');
+            if (dashletId) {
+                req.$target[0].dataset.icingaDashletId = decodeURIComponent(dashletId);
+            } else {
+                delete req.$target[0].dataset.icingaDashletId;
+            }
+
             // Handle search requests, still hardcoded.
             if (req.url.match(/^\/search/) && req.$target.data('icingaUrl').match(/^\/search/)) {
                 var $resp = $('<div>' + req.responseText + '</div>'); // div helps getting an XML tree
@@ -981,9 +1003,10 @@
             var extraUpdates = req.getResponseHeader('X-Icinga-Extra-Updates');
             if (!! extraUpdates && req.getResponseHeader('X-Icinga-Redirect-Http') !== 'yes') {
                 $.each(extraUpdates.split(','), function (idx, el) {
-                    var parts = el.trim().split(';');
-                    var $target;
-                    var url;
+                    let parts = el.trim().split(';'),
+                        refreshesView,
+                        $target,
+                        url;
                     if (parts.length === 2) {
                         $target = $('#' + parts[0]);
                         if (! $target.length) {
@@ -992,6 +1015,7 @@
                         }
 
                         url = parts[1];
+                        refreshesView = false;
                     } else if (parts.length === 1) {
                         $target = $(parts[0]).closest(".container").not(req.$target);
                         if (! $target.length) {
@@ -1000,12 +1024,17 @@
                         }
 
                         url = $target.data('icingaUrl');
+                        refreshesView = true;
                     } else {
                         _this.icinga.logger.error('Invalid extra update', el);
                         return;
                     }
 
-                    _this.loadUrl(url, $target).addToHistory = false;
+                    let extraReq = _this.loadUrl(url, $target, undefined, undefined, undefined, refreshesView);
+                    if (extraReq) {
+                        extraReq.addToHistory = false;
+                        extraReq.scripted = true;
+                    }
                 });
             }
 
diff --git a/public/js/icinga/ui.js b/public/js/icinga/ui.js
index 66fed28ef8..cad552dac1 100644
--- a/public/js/icinga/ui.js
+++ b/public/js/icinga/ui.js
@@ -212,6 +212,16 @@
             this.icinga.behaviors.navigation.trySetActiveAndSelectedByUrl($('#col1').data('icingaUrl'));
         },
 
+        moveToRight: function () {
+            let col1 = document.getElementById('col1'),
+                col2 = document.getElementById('col2'),
+                col1Backup = this.cutContainer($(col1));
+
+            this.cutContainer($(col2)); // Clear col2 states
+            this.pasteContainer($(col2), col1Backup);
+            this.layout2col();
+        },
+
         cutContainer: function ($col) {
             var props = {
               'elements': $('#' + $col.attr('id') + ' > *').detach(),
@@ -221,7 +231,8 @@
                 'data-icinga-refresh': $col.data('icingaRefresh'),
                 'data-last-update': $col.data('lastUpdate'),
                 'data-icinga-module': $col.data('icingaModule'),
-                'data-icinga-container-id': $col[0].dataset.icingaContainerId
+                'data-icinga-container-id': $col[0].dataset.icingaContainerId,
+                'data-icinga-dashlet-id': $col[0].dataset.icingaDashletId
               },
               'class': $col.attr('class')
             };
@@ -232,6 +243,7 @@
             $col.removeData('lastUpdate');
             $col.removeData('icingaModule');
             delete $col[0].dataset.icingaContainerId;
+            delete $col[0].dataset.icingaDashletId;
             $col.removeAttr('class').attr('class', 'container');
             return props;
         },
@@ -245,6 +257,10 @@
             $col.data('lastUpdate', backup['data']['data-last-update']);
             $col.data('icingaModule', backup['data']['data-icinga-module']);
             $col[0].dataset.icingaContainerId = backup['data']['data-icinga-container-id'];
+
+            if (backup['data']['data-icinga-dashlet-id']) {
+                $col[0].dataset.icingaDashletId = backup['data']['data-icinga-dashlet-id'];
+            }
         },
 
         triggerWindowResize: function () {
@@ -331,6 +347,9 @@
             $c.removeData('icingaRefresh');
             $c.removeData('lastUpdate');
             $c.removeData('icingaModule');
+            delete $c[0].dataset.icingaContainerId;
+            delete $c[0].dataset.icingaDashletId;
+            $c.removeAttr('class').attr('class', 'container');
             this.icinga.loader.stopPendingRequestsFor($c);
             $c.trigger('close-column');
             $c.html('');