diff --git a/packages/files-ui/src/Components/Modules/Settings/Profile.tsx b/packages/files-ui/src/Components/Modules/Settings/Profile.tsx
index 07a94c5f11..d8a48e6b28 100644
--- a/packages/files-ui/src/Components/Modules/Settings/Profile.tsx
+++ b/packages/files-ui/src/Components/Modules/Settings/Profile.tsx
@@ -185,8 +185,6 @@ const ProfileView = () => {
       <Grid
         item
         xs={12}
-        sm={10}
-        md={8}
       >
         <div className={classes.container}>
           <div
@@ -322,7 +320,7 @@ const ProfileView = () => {
               </Button>
             </div>
           </div> */}
-          <div>
+          <div className={classes.profileBox}>
             <Typography
               variant='h4'
               component='h4'
@@ -339,8 +337,8 @@ const ProfileView = () => {
             <Grid container>
               <Grid item
                 xs={12}
-                sm={12}
-                md={6}>
+                lg={6}
+              >
                 <label className={clsx(classes.themeBox, classes.themeBoxDark)}>
                   <RadioInput
                     value='dark'
@@ -355,8 +353,8 @@ const ProfileView = () => {
               </Grid>
               <Grid item
                 xs={12}
-                sm={12}
-                md={6}>
+                lg={6}
+              >
                 <label className={clsx(classes.themeBox, classes.themeBoxLight)}>
                   <RadioInput
                     value='light'
diff --git a/packages/files-ui/src/Components/Modules/Settings/index.tsx b/packages/files-ui/src/Components/Modules/Settings/index.tsx
index 6e4e3de285..ad1a36e61a 100644
--- a/packages/files-ui/src/Components/Modules/Settings/index.tsx
+++ b/packages/files-ui/src/Components/Modules/Settings/index.tsx
@@ -64,7 +64,7 @@ const useStyles = makeStyles(({ constants, breakpoints, palette }: ITheme) =>
     },
     tabPane: {
       flex: 1,
-      padding: `${constants.generalUnit * 2}px ${constants.generalUnit * 5}px`,
+      padding: `${constants.generalUnit * 4}px ${constants.generalUnit * 4}px`,
       "&.securityPane": {
         [breakpoints.down("lg")]: {
           paddingLeft: constants.generalUnit,
@@ -72,7 +72,10 @@ const useStyles = makeStyles(({ constants, breakpoints, palette }: ITheme) =>
         }
       },
       [breakpoints.down("md")]: {
-        padding: 0
+        padding: `${constants.generalUnit * 2}px`
+      },
+      [breakpoints.down("md")]: {
+        padding: `${constants.generalUnit * 2}px 0`
       }
     },
     lockIcon : {