diff --git a/typo3/sysext/backend/Classes/Tree/View/AbstractTreeView.php b/typo3/sysext/backend/Classes/Tree/View/AbstractTreeView.php
index a1fd88e4b2cf944286c78145188e2516414c821e..afd4c79cb85a8e7cd82c70918c287a8602ff1474 100644
--- a/typo3/sysext/backend/Classes/Tree/View/AbstractTreeView.php
+++ b/typo3/sysext/backend/Classes/Tree/View/AbstractTreeView.php
@@ -689,7 +689,8 @@ abstract class AbstractTreeView
         }
         $title = $this->showDefaultTitleAttribute ? htmlspecialchars('UID: ' . $row['uid']) : $this->getTitleAttrib($row);
         $iconFactory = GeneralUtility::makeInstance(IconFactory::class);
-        $icon = '<span title="' . $title . '">' . $iconFactory->getIconForRecord($this->table, $row, Icon::SIZE_SMALL)->render() . '</span>';
+        $icon = $row['pid'] === 0 ? $iconFactory->getIcon('apps-pagetree-folder-root', Icon::SIZE_SMALL) : $iconFactory->getIconForRecord($this->table, $row, Icon::SIZE_SMALL);
+        $icon = '<span title="' . $title . '">' . $icon->render() . '</span>';
         return $this->wrapIcon($icon, $row);
     }
 
diff --git a/typo3/sysext/beuser/Classes/Controller/PermissionController.php b/typo3/sysext/beuser/Classes/Controller/PermissionController.php
index 6317dedf09e57c9afdeb9b401d171326d9f4ac80..e731d9c4279889b40028e5a094363d61fb6cd3cd 100644
--- a/typo3/sysext/beuser/Classes/Controller/PermissionController.php
+++ b/typo3/sysext/beuser/Classes/Controller/PermissionController.php
@@ -210,7 +210,7 @@ class PermissionController extends ActionController
     public function indexAction()
     {
         if (!$this->id) {
-            $this->pageInfo = ['title' => '[root-level]', 'uid' => 0, 'pid' => 0];
+            $this->pageInfo = ['title' => $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'], 'uid' => 0, 'pid' => 0];
         }
 
         if ($this->getBackendUser()->workspace != 0) {
@@ -280,7 +280,7 @@ class PermissionController extends ActionController
         $this->view->assign('depth', $this->depth);
 
         if (!$this->id) {
-            $this->pageInfo = ['title' => '[root-level]', 'uid' => 0, 'pid' => 0];
+            $this->pageInfo = ['title' => $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'], 'uid' => 0, 'pid' => 0];
         }
         if ($this->getBackendUser()->workspace != 0) {
             // Adding FlashMessage with the permission setting matrix: