diff --git a/src/components/virtuoso/StyledGroupHeader.tsx b/src/components/virtuoso/StyledGroupHeader.tsx
index 09303883..45b03c1a 100644
--- a/src/components/virtuoso/StyledGroupHeader.tsx
+++ b/src/components/virtuoso/StyledGroupHeader.tsx
@@ -7,20 +7,21 @@
  */
 
 import { styled } from '@mui/material/styles';
-import Typography from '@mui/material/Typography';
+import Typography, { TypographyProps } from '@mui/material/Typography';
 
-export const StyledGroupHeader = styled(Typography, { shouldForwardProp: (prop) => prop !== 'isFirstItem' })<{
-    isFirstItem: boolean;
-}>(({ theme, isFirstItem }) => ({
-    paddingLeft: '24px',
+export const StyledGroupHeader = styled(Typography, { shouldForwardProp: (prop) => prop !== 'isFirstItem' })<
+    {
+        isFirstItem: boolean;
+    } & TypographyProps
+>(({ theme, isFirstItem }) => ({
+    paddingLeft: theme.spacing(3),
     // 16px - 10px (bottom padding of the group items)
-    paddingTop: '6px',
-    paddingBottom: '16px',
-    fontWeight: 700,
-    textTransform: 'uppercase',
+    paddingTop: theme.spacing(0.75),
+    paddingBottom: theme.spacing(2),
+    fontWeight: 'bold',
     backgroundColor: theme.palette.background.default,
     [theme.breakpoints.down('sm')]: {
         // 16px - 8px (margin of header)
-        paddingTop: isFirstItem ? '8px' : '6px',
+        paddingTop: isFirstItem ? theme.spacing(1) : theme.spacing(0.75),
     },
 }));
diff --git a/src/screens/Extensions.tsx b/src/screens/Extensions.tsx
index 43e8d2b7..63221236 100644
--- a/src/screens/Extensions.tsx
+++ b/src/screens/Extensions.tsx
@@ -285,7 +285,7 @@ export function Extensions({ tabsMenuHeight }: { tabsMenuHeight: number }) {
                     const [groupName] = filteredGroupedExtensions[index];
 
                     return (
-                        <StyledGroupHeader key={groupName} variant="h4" isFirstItem={index === 0}>
+                        <StyledGroupHeader key={groupName} variant="h5" component="h2" isFirstItem={index === 0}>
                             {translateExtensionLanguage(groupName)}
                         </StyledGroupHeader>
                     );
diff --git a/src/screens/Sources.tsx b/src/screens/Sources.tsx
index 3efbb1ec..4a560576 100644
--- a/src/screens/Sources.tsx
+++ b/src/screens/Sources.tsx
@@ -140,11 +140,12 @@ export function Sources() {
                             <Fragment key={lang}>
                                 <Typography
                                     key={lang}
-                                    variant="h4"
-                                    style={{
-                                        paddingLeft: '24px',
-                                        paddingTop: '6px',
-                                        paddingBottom: '16px',
+                                    variant="h5"
+                                    component="h2"
+                                    sx={{
+                                        paddingLeft: 3,
+                                        paddingTop: 1,
+                                        paddingBottom: 2,
                                         fontWeight: 'bold',
                                     }}
                                 >
diff --git a/src/screens/Updates.tsx b/src/screens/Updates.tsx
index ec9d7418..ea7f9df3 100644
--- a/src/screens/Updates.tsx
+++ b/src/screens/Updates.tsx
@@ -156,7 +156,7 @@ export const Updates: React.FC = () => {
                 endReached={loadMore}
                 groupCounts={groupCounts}
                 groupContent={(index) => (
-                    <StyledGroupHeader variant="h5" isFirstItem={index === 0}>
+                    <StyledGroupHeader variant="h5" component="h2" isFirstItem={index === 0}>
                         {groupedUpdates[index][0]}
                     </StyledGroupHeader>
                 )}