diff --git a/ui-admin/src/js/components/common/form/Button.jsx b/ui-admin/src/js/components/common/form/Button.jsx
index affbf1e309b073666fa8aa6cc0805401be2002c0..64d08c401052d3cc905996a84e57034b8e1748c0 100644
--- a/ui-admin/src/js/components/common/form/Button.jsx
+++ b/ui-admin/src/js/components/common/form/Button.jsx
@@ -33,7 +33,9 @@ class FormButton extends React.Component {
       href,
       styles,
       classes,
-      onClick
+      onClick,
+      startIcon,
+      endIcon,
     } = this.props
 
     let theColor = null
@@ -67,6 +69,8 @@ class FormButton extends React.Component {
         onClick={onClick}
         disabled={disabled}
         size='small'
+        startIcon={startIcon}
+        endIcon={endIcon}
       >
         {label}
       </Button>
diff --git a/ui-admin/src/js/components/database/data-browser/DataBrowser.jsx b/ui-admin/src/js/components/database/data-browser/DataBrowser.jsx
index 556ce4dacfd178c87ff6615c028c5e017f23950e..4a7e73bc4054efc28437ed9485772632a20be3bc 100644
--- a/ui-admin/src/js/components/database/data-browser/DataBrowser.jsx
+++ b/ui-admin/src/js/components/database/data-browser/DataBrowser.jsx
@@ -118,7 +118,8 @@ class DataBrowser extends React.Component {
         }
       ],
       selectedFile: null,
-      multiselectedFiles: new Set([])
+      multiselectedFiles: new Set([]),
+      showInfo: false
     }
   }
 
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 a7cdd4ccedcd5bbfced82f2c93d3a516f5091aaa..314eb292250385d2a146be137d1545078b532298 100644
--- a/ui-admin/src/js/components/database/data-browser/Toolbar.jsx
+++ b/ui-admin/src/js/components/database/data-browser/Toolbar.jsx
@@ -34,13 +34,13 @@ class Toolbar extends React.Component {
     const { viewType, onViewTypeChange, classes } = this.props
     return (
       <>
-        <Button styles={{ root: classes.button }} label={<><CreateNewFolderIcon /> New folder</>} />
-        <Button styles={{ root: classes.button }} label={<InfoIcon />} />
-        <Button styles={{ root: classes.button }} label={<><SearchIcon /> Search</>} />
+        <Button styles={{ root: classes.button }} label='New folder' startIcon={<CreateNewFolderIcon />} />
+        <Button styles={{ root: classes.button }} startIcon={<InfoIcon />} />
+        <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={<SettingsIcon />} />
-        <Button styles={{ root: classes.button }} label={<><PublishIcon /> {messages.get(messages.UPLOAD)}</>} />
+        <Button styles={{ root: classes.button }} label={messages.get(messages.UPLOAD)} startIcon={<PublishIcon />} />
       </>
     )
   }