diff --git a/ui-admin/src/js/common/messages.js b/ui-admin/src/js/common/messages.js
index df3b2e10eac02777116671ffb7e988a5cdc34dbe..94e5bc8564149da17662e633abda06d0487fb644 100644
--- a/ui-admin/src/js/common/messages.js
+++ b/ui-admin/src/js/common/messages.js
@@ -123,6 +123,7 @@ const keys = {
   IMPORT_FILE: 'IMPORT_FILE',
   IMPORT_FILE_DESCRIPTION: 'IMPORT_FILE_DESCRIPTION',
   INCLUDE_DEPENDENCIES: 'INCLUDE_DEPENDENCIES',
+  INFO: 'INFO',
   INHERITED_FROM: 'INHERITED_FROM',
   INITIAL_VALUE: 'INITIAL_VALUE',
   INTERNAL: 'INTERNAL',
@@ -151,6 +152,7 @@ const keys = {
   NEW_DATA_SET_TYPE: 'NEW_DATA_SET_TYPE',
   NEW_DYNAMIC_PROPERTY_PLUGIN: 'NEW_DYNAMIC_PROPERTY_PLUGIN',
   NEW_ENTITY_VALIDATION_PLUGIN: 'NEW_ENTITY_VALIDATION_PLUGIN',
+  NEW_FOLDER: 'NEW_FOLDER',
   NEW_GROUP: 'NEW_GROUP',
   NEW_MATERIAL_TYPE: 'NEW_MATERIAL_TYPE',
   NEW_OBJECT_TYPE: 'NEW_OBJECT_TYPE',
@@ -423,6 +425,7 @@ const messages_en = {
   [keys.IMPORT_FILE]: 'XLS or ZIP File',
   [keys.IMPORT_FILE_DESCRIPTION]: 'Excel or zip file that contains the data to import. The import accepts both master data (i.e. entity types, property types and vocabulary types) as well as entities (i.e. spaces, projects, collections and objects).',
   [keys.INCLUDE_DEPENDENCIES]: 'Include dependencies',
+  [keys.INFO]: 'Info',
   [keys.INHERITED_FROM]: 'Inherited From',
   [keys.INITIAL_VALUE]: 'Initial Value',
   [keys.INTERNAL]: 'Internal',
@@ -451,6 +454,7 @@ const messages_en = {
   [keys.NEW_DATA_SET_TYPE]: 'New Data Set Type',
   [keys.NEW_DYNAMIC_PROPERTY_PLUGIN]: 'New Dynamic Property Plugin',
   [keys.NEW_ENTITY_VALIDATION_PLUGIN]: 'New Entity Validation Plugin',
+  [keys.NEW_FOLDER]: 'New Folder',
   [keys.NEW_GROUP]: 'New Group',
   [keys.NEW_MATERIAL_TYPE]: 'New Material Type',
   [keys.NEW_OBJECT_TYPE]: 'New Object Type',
diff --git a/ui-admin/src/js/components/database/data-browser/Toolbar.jsx b/ui-admin/src/js/components/database/data-browser/Toolbar.jsx
index f561fc791f57062d5a169bb2ad4336fe4d11aeae..b6cfbe2a4fc1f4c0fcf53dfbf909777b565ab8cf 100644
--- a/ui-admin/src/js/components/database/data-browser/Toolbar.jsx
+++ b/ui-admin/src/js/components/database/data-browser/Toolbar.jsx
@@ -39,24 +39,50 @@ class Toolbar extends React.Component {
   }
 
   render() {
-    const {
-      viewType,
-      onViewTypeChange,
-      classes,
-      showInfo,
-      onShowInfoChange
-    } = this.props
+    const { viewType, onViewTypeChange, classes, showInfo, onShowInfoChange } =
+      this.props
     return (
       <>
-        <ToggleButton styles={{ root: classes.button }} selected={showInfo} onChange={onShowInfoChange} value='Info' aria-label='Info' size='small'>
+        <ToggleButton
+          styles={{ root: classes.button }}
+          selected={showInfo}
+          onChange={onShowInfoChange}
+          value={messages.get(messages.INFO)}
+          aria-label={messages.get(messages.INFO)}
+          size='small'
+        >
           <InfoIcon />
         </ToggleButton>
-        <Button styles={{ root: classes.button }} label='New folder' startIcon={<CreateNewFolderIcon />} />
-        <Button styles={{ root: classes.button }} label='Search' startIcon={<SearchIcon />} />
-        {viewType === 'list' && <Button styles={{ root: classes.button }} label={<ViewComfyIcon />} onClick={() => onViewTypeChange('grid')} />}
-        {viewType === 'grid' && <Button styles={{ root: classes.button }} label={<ViewListIcon />} onClick={() => onViewTypeChange('list')} />}
+        <Button
+          styles={{ root: classes.button }}
+          label={messages.get(messages.NEW_FOLDER)}
+          startIcon={<CreateNewFolderIcon />}
+        />
+        <Button
+          styles={{ root: classes.button }}
+          label={messages.get(messages.SEARCH)}
+          startIcon={<SearchIcon />}
+        />
+        {viewType === 'list' && (
+          <Button
+            styles={{ root: classes.button }}
+            label={<ViewComfyIcon />}
+            onClick={() => onViewTypeChange('grid')}
+          />
+        )}
+        {viewType === 'grid' && (
+          <Button
+            styles={{ root: classes.button }}
+            label={<ViewListIcon />}
+            onClick={() => onViewTypeChange('list')}
+          />
+        )}
         <Button styles={{ root: classes.button }} label={<SettingsIcon />} />
-        <Button styles={{ root: classes.button }} label={messages.get(messages.UPLOAD)} startIcon={<PublishIcon />} />
+        <Button
+          styles={{ root: classes.button }}
+          label={messages.get(messages.UPLOAD)}
+          startIcon={<PublishIcon />}
+        />
       </>
     )
   }