diff --git a/ui-admin/src/js/components/database/data-browser/NavigationBar.jsx b/ui-admin/src/js/components/database/data-browser/NavigationBar.jsx
index ad2d1a821dc49f17f8821d559efb3ccf985bc551..7a28b401826a1464f114318c921d18d858909c6b 100644
--- a/ui-admin/src/js/components/database/data-browser/NavigationBar.jsx
+++ b/ui-admin/src/js/components/database/data-browser/NavigationBar.jsx
@@ -39,18 +39,20 @@ const styles = theme => ({
     alignItems: 'center',
     '&>*': {
       minWidth: 'auto',
+      height: theme.spacing(4),
       fontSize: '1.125rem',
       textTransform: 'none',
-      padding: '0 0.25rem',
-      margin: '0.25rem'
+      padding: '0 ' + theme.spacing(1),
+      margin: theme.spacing(0.5)
     },
     '&>*:first-child':  {
       padding: '0 0',
-      margin: '0.25rem 0.5rem 0.25rem 0.25rem'
+      margin: theme.spacing(1) + ' ' + theme.spacing(2) + ' ' +
+        theme.spacing(1) + ' ' + theme.spacing(1)
     },
     '&>*:first-child svg': {
-      width: '31.5px',
-      height: '31.5px'
+      width: theme.spacing(4),
+      height: theme.spacing(4)
     },
     '&>*:not(:first-child):last-child':  {
       pointerEvents: 'none',