diff --git a/src/components/HeaderWithCloseButton.js b/src/components/HeaderWithCloseButton.js
index 68597013db72..4da0b6ccb1c4 100755
--- a/src/components/HeaderWithCloseButton.js
+++ b/src/components/HeaderWithCloseButton.js
@@ -128,7 +128,7 @@ class HeaderWithCloseButton extends Component {
 
     render() {
         return (
-            <View style={[styles.headerBar, this.props.shouldShowBorderBottom && styles.borderBottom]}>
+            <View style={[styles.headerBar, this.props.shouldShowBorderBottom && styles.borderBottom, this.props.shouldShowBackButton && styles.pl2]}>
                 <View style={[
                     styles.dFlex,
                     styles.flexRow,
@@ -139,7 +139,6 @@ class HeaderWithCloseButton extends Component {
                 ]}
                 >
                     {this.props.shouldShowBackButton && (
-                    <View style={[styles.mr2]}>
                         <Tooltip text={this.props.translate('common.back')}>
                             <Pressable
                                 onPress={() => {
@@ -153,7 +152,6 @@ class HeaderWithCloseButton extends Component {
                                 <Icon src={Expensicons.BackArrow} />
                             </Pressable>
                         </Tooltip>
-                    </View>
                     )}
                     <Header
                         title={this.props.title}
diff --git a/src/components/MenuItem.js b/src/components/MenuItem.js
index 8c555085712c..b97a1fa070c3 100644
--- a/src/components/MenuItem.js
+++ b/src/components/MenuItem.js
@@ -54,11 +54,16 @@ const defaultProps = {
 const MenuItem = (props) => {
     const titleTextStyle = StyleUtils.combineStyles([
         styles.popoverMenuText,
-        styles.ml3,
+        (props.icon ? styles.ml3 : undefined),
         (props.shouldShowBasicTitle ? undefined : styles.textStrong),
         (props.interactive && props.disabled ? {...styles.disabledText, ...styles.userSelectNone} : undefined),
     ], props.style);
-    const descriptionTextStyle = StyleUtils.combineStyles([styles.textLabelSupporting, styles.ml3, styles.breakAll, styles.lineHeightNormal], props.style);
+    const descriptionTextStyle = StyleUtils.combineStyles([
+        styles.textLabelSupporting,
+        (props.icon ? styles.ml3 : undefined),
+        styles.breakAll,
+        styles.lineHeightNormal,
+    ], props.style);
 
     return (
         <Pressable
diff --git a/src/pages/settings/Preferences/PreferencesPage.js b/src/pages/settings/Preferences/PreferencesPage.js
index 86345c16f7bd..953b6de8dd66 100755
--- a/src/pages/settings/Preferences/PreferencesPage.js
+++ b/src/pages/settings/Preferences/PreferencesPage.js
@@ -59,10 +59,10 @@ const PreferencesPage = (props) => {
             />
             <ScrollView style={[styles.flex1, styles.mt3]}>
                 <View style={styles.mb6}>
-                    <Text style={[styles.textLabelSupporting, styles.mb2, styles.ml8, styles.mr8]} numberOfLines={1}>
+                    <Text style={[styles.textLabelSupporting, styles.mb2, styles.ml5, styles.mr8]} numberOfLines={1}>
                         {props.translate('common.notifications')}
                     </Text>
-                    <View style={[styles.flexRow, styles.mb4, styles.justifyContentBetween, styles.mh8]}>
+                    <View style={[styles.flexRow, styles.mb4, styles.justifyContentBetween, styles.ml5, styles.mr8]}>
                         <View style={styles.flex4}>
                             <Text>
                                 {props.translate('preferencesPage.receiveRelevantFeatureUpdatesAndExpensifyNews')}
@@ -87,7 +87,7 @@ const PreferencesPage = (props) => {
                         description={props.translate('languagePage.language')}
                         onPress={() => Navigation.navigate(ROUTES.SETTINGS_LANGUAGE)}
                     />
-                    {shouldShowTestToolMenu && <View style={[styles.mh8, styles.mt6]}><TestToolMenu /></View>}
+                    {shouldShowTestToolMenu && <View style={[styles.ml5, styles.mr8, styles.mt6]}><TestToolMenu /></View>}
                 </View>
             </ScrollView>
         </ScreenWrapper>
diff --git a/src/pages/settings/Profile/PersonalDetails/PersonalDetailsInitialPage.js b/src/pages/settings/Profile/PersonalDetails/PersonalDetailsInitialPage.js
index 4da6ec6134e5..88e886ae0e6d 100644
--- a/src/pages/settings/Profile/PersonalDetails/PersonalDetailsInitialPage.js
+++ b/src/pages/settings/Profile/PersonalDetails/PersonalDetailsInitialPage.js
@@ -104,21 +104,18 @@ const PersonalDetailsInitialPage = (props) => {
                         title={legalName}
                         description={props.translate('privatePersonalDetails.legalName')}
                         shouldShowRightIcon
-                        wrapperStyle={[styles.ph2]}
                         onPress={() => Navigation.navigate(ROUTES.SETTINGS_PERSONAL_DETAILS_LEGAL_NAME)}
                     />
                     <MenuItemWithTopDescription
                         title={privateDetails.dob || ''}
                         description={props.translate('common.dob')}
                         shouldShowRightIcon
-                        wrapperStyle={[styles.ph2]}
                         onPress={() => Navigation.navigate(ROUTES.SETTINGS_PERSONAL_DETAILS_DATE_OF_BIRTH)}
                     />
                     <MenuItemWithTopDescription
                         title={getFormattedAddress()}
                         description={props.translate('privatePersonalDetails.homeAddress')}
                         shouldShowRightIcon
-                        wrapperStyle={[styles.ph2]}
                         onPress={() => Navigation.navigate(ROUTES.SETTINGS_PERSONAL_DETAILS_ADDRESS)}
                     />
                 </View>
diff --git a/src/pages/settings/Profile/TimezoneInitialPage.js b/src/pages/settings/Profile/TimezoneInitialPage.js
index a96244501779..c2162af65118 100644
--- a/src/pages/settings/Profile/TimezoneInitialPage.js
+++ b/src/pages/settings/Profile/TimezoneInitialPage.js
@@ -54,7 +54,7 @@ const TimezoneInitialPage = (props) => {
                     <Text style={[styles.mb5]}>
                         {props.translate('timezonePage.isShownOnProfile')}
                     </Text>
-                    <View style={[styles.flexRow, styles.mb5, styles.alignItemsCenter, styles.justifyContentBetween]}>
+                    <View style={[styles.flexRow, styles.mb5, styles.mr2, styles.alignItemsCenter, styles.justifyContentBetween]}>
                         <Text>
                             {props.translate('timezonePage.getLocationAutomatically')}
                         </Text>
@@ -68,7 +68,6 @@ const TimezoneInitialPage = (props) => {
                     title={timezone.selected}
                     description={props.translate('timezonePage.timezone')}
                     shouldShowRightIcon
-                    wrapperStyle={[styles.ph2, styles.mb3]}
                     disabled={timezone.automatic}
                     onPress={() => Navigation.navigate(ROUTES.SETTINGS_TIMEZONE_SELECT)}
                 />