diff --git a/typo3/sysext/backend/Classes/Form/Element/SelectTreeElement.php b/typo3/sysext/backend/Classes/Form/Element/SelectTreeElement.php
index 1e1e0fbe93977be7373139b50d1b2c801ce9fc72..9b2b01a1c8a71ac58430c4f6b6ce9ce3c4d122b3 100644
--- a/typo3/sysext/backend/Classes/Form/Element/SelectTreeElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/SelectTreeElement.php
@@ -83,6 +83,10 @@ class SelectTreeElement extends AbstractFormElement
 
         $resultArray['html'] = implode(LF, $html);
 
+        // add necessary labels for tree header
+        if ($showHeader) {
+            $resultArray['additionalInlineLanguageLabelFiles'][] = 'EXT:lang/locallang_csh_corebe.xlf';
+        }
         $resultArray['requireJsModules']['selectTreeElement'] = 'TYPO3/CMS/Backend/FormEngine/Element/SelectTreeElement';
 
         return $resultArray;
diff --git a/typo3/sysext/backend/Classes/Form/FormResultCompiler.php b/typo3/sysext/backend/Classes/Form/FormResultCompiler.php
index 75de9b5205503837f73917450ce3ca418562d388..d4cb2157b94e9bfe3de029112538f90348fc5d61 100644
--- a/typo3/sysext/backend/Classes/Form/FormResultCompiler.php
+++ b/typo3/sysext/backend/Classes/Form/FormResultCompiler.php
@@ -231,8 +231,6 @@ class FormResultCompiler
         }
         $pageRenderer->loadJquery();
         $pageRenderer->loadExtJS();
-        // Load tree stuff here
-        $pageRenderer->addInlineLanguageLabelFile('EXT:lang/locallang_csh_corebe.xlf', 'tcatree');
         $pageRenderer->addJsFile($backendRelPath . 'Resources/Public/JavaScript/notifications.js');
         $beUserAuth = $this->getBackendUserAuthentication();
 
diff --git a/typo3/sysext/backend/Resources/Public/JavaScript/FormEngine/Element/TreeToolbar.js b/typo3/sysext/backend/Resources/Public/JavaScript/FormEngine/Element/TreeToolbar.js
index 5772514809ce41bb398b5bd7310737fb5239b716..87df1e92366a0a4b503fe864deec99026cd33e3e 100644
--- a/typo3/sysext/backend/Resources/Public/JavaScript/FormEngine/Element/TreeToolbar.js
+++ b/typo3/sysext/backend/Resources/Public/JavaScript/FormEngine/Element/TreeToolbar.js
@@ -54,13 +54,13 @@ define(['jquery', 'TYPO3/CMS/Backend/Icons', 'TYPO3/CMS/Backend/FormEngine/Eleme
             '<div class="tree-toolbar btn-toolbar">'+
                 '<div class="input-group">' +
                     '<span class="input-group-addon input-group-icon filter"></span>' +
-                    '<input type="text" class="form-control search-input" placeholder="' + TYPO3.l10n.localize('tcatree.findItem') + '">' +
+                    '<input type="text" class="form-control search-input" placeholder="' + TYPO3.lang['tcatree.findItem'] + '">' +
                 '</div>' +
                 '<div class="btn-group">' +
-                    '<button type="button" class="btn btn-default expand-all-btn" title="' + TYPO3.l10n.localize('tcatree.expandAll') + '"></button>' +
+                    '<button type="button" class="btn btn-default expand-all-btn" title="' + TYPO3.lang['tcatree.expandAll'] + '"></button>' +
                 '</div>' +
                 '<div class="btn-group">' +
-                    '<button type="button" class="btn btn-default collapse-all-btn" title="' + TYPO3.l10n.localize('tcatree.collapseAll') + '"></button>' +
+                    '<button type="button" class="btn btn-default collapse-all-btn" title="' + TYPO3.lang['tcatree.collapseAll'] + '"></button>' +
                 '</div>' +
             '</div>'
         )