diff --git a/src/fireedge/src/client/components/Tabs/index.js b/src/fireedge/src/client/components/Tabs/index.js
index f8f7e53ee7..6bd4302751 100644
--- a/src/fireedge/src/client/components/Tabs/index.js
+++ b/src/fireedge/src/client/components/Tabs/index.js
@@ -89,6 +89,7 @@ const Tabs = ({
       <MTabs
         value={tabSelected}
         variant="scrollable"
+        allowScrollButtonsMobile
         scrollButtons="auto"
         onChange={(_, tab) => setTab(tab)}
         sx={{
@@ -104,6 +105,7 @@ const Tabs = ({
             <MTab
               key={`tab-${id}`}
               id={`tab-${id}`}
+              iconPosition="start"
               icon={error ? <WarningIcon /> : Icon && <Icon />}
               value={value ?? idx}
               label={label ?? id}
diff --git a/src/fireedge/src/client/theme/defaults.js b/src/fireedge/src/client/theme/defaults.js
index d5e9173ec1..1a0f60bc18 100644
--- a/src/fireedge/src/client/theme/defaults.js
+++ b/src/fireedge/src/client/theme/defaults.js
@@ -423,6 +423,11 @@ const createAppTheme = (appTheme, mode = SCHEMES.DARK) => {
             backgroundColor: background.paper,
             borderRadius: `8px 8px 0 0`,
             border: `thin solid ${secondary.main}`,
+            paddingInline: '1rem',
+          },
+          flexContainer: {
+            height: '100%',
+            paddingBlock: '0.5em',
           },
         },
       },
@@ -432,8 +437,18 @@ const createAppTheme = (appTheme, mode = SCHEMES.DARK) => {
             color: 'text.secondary',
             textTransform: 'capitalize',
             fontSize: '1rem',
+            padding: '0 1rem',
+            minHeight: '100%',
+            border: 0,
+            borderRadius: 6,
+            '&:hover': {
+              background: defaultTheme.palette.action.selected,
+              transition: 'background .12s ease-in-out',
+            },
             '&.Mui-selected': {
-              color: isDarkMode ? secondary.main : 'text.primary',
+              color: isDarkMode
+                ? secondary.main
+                : defaultTheme.palette.text.primary,
             },
           },
         },