diff --git a/contributingGuides/FORMS.md b/contributingGuides/FORMS.md
index e53be6f6b269..2cfd24f13ab7 100644
--- a/contributingGuides/FORMS.md
+++ b/contributingGuides/FORMS.md
@@ -320,14 +320,17 @@ An example of this can be seen in the [ACHContractStep](https://github.com/Expen
 
 ### Safe Area Padding
 
-Any `FormProvider.js` that has a button will also add safe area padding by default. If the `<FormProvider>` is inside a `<ScreenWrapper>`, we will want to disable the default safe area padding applied there e.g.
+Any `FormProvider.tsx` that has a button at the bottom. If the `<FormProvider>` is inside a `<ScreenWrapper>`, the bottom safe area inset is handled automatically (`includeSafeAreaPaddingBottom` needs to be set to `true`, but its the default).
+If you have custom requirements and can't use `<ScreenWrapper includeSafeAreaPaddingBottom={true}>`, you can use the `useStyledSafeAreaInsets()` hook:
 
 ```jsx
-<ScreenWrapper includeSafeAreaPaddingBottom={false}>
+const { paddingTop, paddingBottom, safeAreaPaddingBottomStyle } = useStyledSafeAreaInsets();
+
+<View styles={[safeAreaPaddingBottomStyle, styles.pb5]}>
     <FormProvider>
         {...}
     </FormProvider>
-</ScreenWrapper>
+</View>
 ```
 
 ### Handling nested Pickers in Form
diff --git a/src/components/CategorySelector/CategorySelectorModal.tsx b/src/components/CategorySelector/CategorySelectorModal.tsx
index 1362de468014..f12a52dbb314 100644
--- a/src/components/CategorySelector/CategorySelectorModal.tsx
+++ b/src/components/CategorySelector/CategorySelectorModal.tsx
@@ -42,7 +42,7 @@ function CategorySelectorModal({policyID, isVisible, currentCategory, onCategory
             <ScreenWrapper
                 style={[styles.pb0]}
                 includePaddingTop={false}
-                includeSafeAreaPaddingBottom={false}
+                includeSafeAreaPaddingBottom
                 shouldEnableKeyboardAvoidingView={false}
                 testID={CategorySelectorModal.displayName}
             >
diff --git a/src/components/DatePicker/CalendarPicker/YearPickerModal.tsx b/src/components/DatePicker/CalendarPicker/YearPickerModal.tsx
index 6170b81073a2..2f6cb408292e 100644
--- a/src/components/DatePicker/CalendarPicker/YearPickerModal.tsx
+++ b/src/components/DatePicker/CalendarPicker/YearPickerModal.tsx
@@ -57,7 +57,7 @@ function YearPickerModal({isVisible, years, currentYear = new Date().getFullYear
             <ScreenWrapper
                 style={[styles.pb0]}
                 includePaddingTop={false}
-                includeSafeAreaPaddingBottom={false}
+                includeSafeAreaPaddingBottom
                 testID={YearPickerModal.displayName}
             >
                 <HeaderWithBackButton
diff --git a/src/components/FixedFooter.tsx b/src/components/FixedFooter.tsx
index c9d60f3ced46..90adaec7a27e 100644
--- a/src/components/FixedFooter.tsx
+++ b/src/components/FixedFooter.tsx
@@ -2,7 +2,6 @@ import type {ReactNode} from 'react';
 import React from 'react';
 import type {StyleProp, ViewStyle} from 'react-native';
 import {View} from 'react-native';
-import useSafeAreaInsets from '@hooks/useSafeAreaInsets';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 type FixedFooterProps = {
@@ -14,16 +13,13 @@ type FixedFooterProps = {
 };
 
 function FixedFooter({style, children}: FixedFooterProps) {
-    const insets = useSafeAreaInsets();
     const styles = useThemeStyles();
 
     if (!children) {
         return null;
     }
 
-    const shouldAddBottomPadding = !insets.bottom;
-
-    return <View style={[styles.ph5, shouldAddBottomPadding && styles.pb5, styles.flexShrink0, style]}>{children}</View>;
+    return <View style={[styles.ph5, styles.pb5, styles.flexShrink0, style]}>{children}</View>;
 }
 
 FixedFooter.displayName = 'FixedFooter';
diff --git a/src/components/Form/FormWrapper.tsx b/src/components/Form/FormWrapper.tsx
index d26276d0418b..64bb2173f5b0 100644
--- a/src/components/Form/FormWrapper.tsx
+++ b/src/components/Form/FormWrapper.tsx
@@ -6,10 +6,9 @@ import {Keyboard} from 'react-native';
 import {useOnyx} from 'react-native-onyx';
 import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
 import FormElement from '@components/FormElement';
-import SafeAreaConsumer from '@components/SafeAreaConsumer';
-import type {SafeAreaChildrenProps} from '@components/SafeAreaConsumer/types';
 import ScrollView from '@components/ScrollView';
 import ScrollViewWithContext from '@components/ScrollViewWithContext';
+import useStyledSafeAreaInsets from '@hooks/useStyledSafeAreaInsets';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import type {OnyxFormKey} from '@src/ONYXKEYS';
@@ -60,6 +59,7 @@ function FormWrapper({
     isSubmitDisabled = false,
 }: FormWrapperProps) {
     const styles = useThemeStyles();
+    const {paddingBottom: safeAreaInsetPaddingBottom} = useStyledSafeAreaInsets();
     const formRef = useRef<RNScrollView>(null);
     const formContentRef = useRef<View>(null);
 
@@ -99,11 +99,12 @@ function FormWrapper({
     }, [errors, formState?.errorFields, inputRefs]);
 
     const scrollViewContent = useCallback(
-        (safeAreaPaddingBottomStyle: SafeAreaChildrenProps['safeAreaPaddingBottomStyle']) => (
+        () => (
             <FormElement
                 key={formID}
                 ref={formContentRef}
-                style={[style, safeAreaPaddingBottomStyle.paddingBottom ? safeAreaPaddingBottomStyle : styles.pb5]}
+                // Note: the paddingBottom is only grater 0 if no parent has applied the inset yet:
+                style={[style, {paddingBottom: safeAreaInsetPaddingBottom + styles.pb5.paddingBottom}]}
             >
                 {children}
                 {isSubmitButtonVisible && (
@@ -128,7 +129,8 @@ function FormWrapper({
         [
             formID,
             style,
-            styles.pb5,
+            safeAreaInsetPaddingBottom,
+            styles.pb5.paddingBottom,
             styles.mh0,
             styles.mt5,
             styles.flex1,
@@ -153,33 +155,27 @@ function FormWrapper({
     );
 
     if (!shouldUseScrollView) {
-        return scrollViewContent({});
+        return scrollViewContent();
     }
 
-    return (
-        <SafeAreaConsumer>
-            {({safeAreaPaddingBottomStyle}) =>
-                scrollContextEnabled ? (
-                    <ScrollViewWithContext
-                        style={[styles.w100, styles.flex1]}
-                        contentContainerStyle={styles.flexGrow1}
-                        keyboardShouldPersistTaps="handled"
-                        ref={formRef}
-                    >
-                        {scrollViewContent(safeAreaPaddingBottomStyle)}
-                    </ScrollViewWithContext>
-                ) : (
-                    <ScrollView
-                        style={[styles.w100, styles.flex1]}
-                        contentContainerStyle={styles.flexGrow1}
-                        keyboardShouldPersistTaps="handled"
-                        ref={formRef}
-                    >
-                        {scrollViewContent(safeAreaPaddingBottomStyle)}
-                    </ScrollView>
-                )
-            }
-        </SafeAreaConsumer>
+    return scrollContextEnabled ? (
+        <ScrollViewWithContext
+            style={[styles.w100, styles.flex1]}
+            contentContainerStyle={styles.flexGrow1}
+            keyboardShouldPersistTaps="handled"
+            ref={formRef}
+        >
+            {scrollViewContent()}
+        </ScrollViewWithContext>
+    ) : (
+        <ScrollView
+            style={[styles.w100, styles.flex1]}
+            contentContainerStyle={styles.flexGrow1}
+            keyboardShouldPersistTaps="handled"
+            ref={formRef}
+        >
+            {scrollViewContent()}
+        </ScrollView>
     );
 }
 
diff --git a/src/components/FormAlertWithSubmitButton.tsx b/src/components/FormAlertWithSubmitButton.tsx
index 205bea93f84a..fabb5e54cb60 100644
--- a/src/components/FormAlertWithSubmitButton.tsx
+++ b/src/components/FormAlertWithSubmitButton.tsx
@@ -2,7 +2,6 @@ import type {Ref} from 'react';
 import React from 'react';
 import type {StyleProp, ViewStyle} from 'react-native';
 import {View} from 'react-native';
-import useSafePaddingBottomStyle from '@hooks/useSafePaddingBottomStyle';
 import useThemeStyles from '@hooks/useThemeStyles';
 import getPlatform from '@libs/getPlatform';
 import CONST from '@src/CONST';
@@ -87,7 +86,6 @@ function FormAlertWithSubmitButton({
 }: FormAlertWithSubmitButtonProps) {
     const styles = useThemeStyles();
     const style = [!footerContent ? {} : styles.mb3, buttonStyles];
-    const safePaddingBottomStyle = useSafePaddingBottomStyle();
 
     // Disable pressOnEnter for Android Native to avoid issues with the Samsung keyboard,
     // where pressing Enter saves the form instead of adding a new line in multiline input.
@@ -97,7 +95,7 @@ function FormAlertWithSubmitButton({
 
     return (
         <FormAlertWrapper
-            containerStyles={[styles.justifyContentEnd, safePaddingBottomStyle, containerStyles]}
+            containerStyles={[styles.justifyContentEnd, containerStyles]}
             isAlertVisible={isAlertVisible}
             isMessageHtml={isMessageHtml}
             message={message}
diff --git a/src/components/InteractiveStepWrapper.tsx b/src/components/InteractiveStepWrapper.tsx
index ec0d2da02108..9d094af0bf26 100644
--- a/src/components/InteractiveStepWrapper.tsx
+++ b/src/components/InteractiveStepWrapper.tsx
@@ -68,7 +68,7 @@ function InteractiveStepWrapper(
         <ScreenWrapper
             ref={ref}
             testID={wrapperID}
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
             shouldEnablePickerAvoiding={shouldEnablePickerAvoiding}
             shouldEnableMaxHeight={shouldEnableMaxHeight}
             shouldShowOfflineIndicator={shouldShowOfflineIndicator}
diff --git a/src/components/SafeAreaConsumer/index.tsx b/src/components/SafeAreaConsumer/index.tsx
index 88770e1f0639..416021242225 100644
--- a/src/components/SafeAreaConsumer/index.tsx
+++ b/src/components/SafeAreaConsumer/index.tsx
@@ -7,6 +7,7 @@ import type SafeAreaConsumerProps from './types';
 /**
  * This component is a light wrapper around the SafeAreaInsetsContext.Consumer. There are several places where we
  * may need not just the insets, but the computed styles so we save a few lines of code with this.
+ * Note: if you're working within a <ScreenWrapper> please use `useStyledSafeAreaInsets` instead.
  */
 function SafeAreaConsumer({children}: SafeAreaConsumerProps) {
     const StyleUtils = useStyleUtils();
diff --git a/src/components/ScreenWrapper.tsx b/src/components/ScreenWrapper.tsx
index ae582867e070..e264b7fd9a55 100644
--- a/src/components/ScreenWrapper.tsx
+++ b/src/components/ScreenWrapper.tsx
@@ -10,6 +10,7 @@ import useInitialDimensions from '@hooks/useInitialWindowDimensions';
 import useKeyboardState from '@hooks/useKeyboardState';
 import useNetwork from '@hooks/useNetwork';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useStyledSafeAreaInsets from '@hooks/useStyledSafeAreaInsets';
 import useTackInputFocus from '@hooks/useTackInputFocus';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
@@ -25,7 +26,6 @@ import HeaderGap from './HeaderGap';
 import ImportedStateIndicator from './ImportedStateIndicator';
 import KeyboardAvoidingView from './KeyboardAvoidingView';
 import OfflineIndicator from './OfflineIndicator';
-import SafeAreaConsumer from './SafeAreaConsumer';
 import withNavigationFallback from './withNavigationFallback';
 
 type ScreenWrapperChildrenProps = {
@@ -105,7 +105,11 @@ type ScreenWrapperProps = {
     focusTrapSettings?: FocusTrapForScreenProps['focusTrapSettings'];
 };
 
-type ScreenWrapperStatusContextType = {didScreenTransitionEnd: boolean};
+type ScreenWrapperStatusContextType = {
+    didScreenTransitionEnd: boolean;
+    isSafeAreaTopPaddingApplied: boolean;
+    isSafeAreaBottomPaddingApplied: boolean;
+};
 
 const ScreenWrapperStatusContext = createContext<ScreenWrapperStatusContextType | undefined>(undefined);
 
@@ -233,96 +237,86 @@ function ScreenWrapper(
         // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
+    const {insets, paddingTop, paddingBottom, safeAreaPaddingBottomStyle} = useStyledSafeAreaInsets();
+    const paddingStyle: StyleProp<ViewStyle> = {};
+
+    const isSafeAreaTopPaddingApplied = includePaddingTop;
+    if (includePaddingTop) {
+        paddingStyle.paddingTop = paddingTop;
+    }
+
+    // We always need the safe area padding bottom if we're showing the offline indicator since it is bottom-docked.
+    const isSafeAreaBottomPaddingApplied = includeSafeAreaPaddingBottom || (isOffline && shouldShowOfflineIndicator);
+    if (isSafeAreaBottomPaddingApplied) {
+        paddingStyle.paddingBottom = paddingBottom;
+    }
+
     const isAvoidingViewportScroll = useTackInputFocus(isFocused && shouldEnableMaxHeight && shouldAvoidScrollOnVirtualViewport && Browser.isMobileWebKit());
-    const contextValue = useMemo(() => ({didScreenTransitionEnd}), [didScreenTransitionEnd]);
+    const contextValue = useMemo(
+        () => ({didScreenTransitionEnd, isSafeAreaTopPaddingApplied, isSafeAreaBottomPaddingApplied}),
+        [didScreenTransitionEnd, isSafeAreaBottomPaddingApplied, isSafeAreaTopPaddingApplied],
+    );
 
     return (
-        <SafeAreaConsumer>
-            {({
-                insets = {
-                    top: 0,
-                    bottom: 0,
-                    left: 0,
-                    right: 0,
-                },
-                paddingTop,
-                paddingBottom,
-                safeAreaPaddingBottomStyle,
-            }) => {
-                const paddingStyle: StyleProp<ViewStyle> = {};
-
-                if (includePaddingTop) {
-                    paddingStyle.paddingTop = paddingTop;
-                }
-
-                // We always need the safe area padding bottom if we're showing the offline indicator since it is bottom-docked.
-                if (includeSafeAreaPaddingBottom || (isOffline && shouldShowOfflineIndicator)) {
-                    paddingStyle.paddingBottom = paddingBottom;
-                }
-
-                return (
-                    <FocusTrapForScreens focusTrapSettings={focusTrapSettings}>
-                        <View
-                            ref={ref}
-                            style={[styles.flex1, {minHeight}]}
-                            // eslint-disable-next-line react/jsx-props-no-spreading
-                            {...panResponder.panHandlers}
-                            testID={testID}
+        <FocusTrapForScreens focusTrapSettings={focusTrapSettings}>
+            <View
+                ref={ref}
+                style={[styles.flex1, {minHeight}]}
+                // eslint-disable-next-line react/jsx-props-no-spreading, react-compiler/react-compiler
+                {...panResponder.panHandlers}
+                testID={testID}
+            >
+                <View
+                    fsClass="fs-unmask"
+                    style={[styles.flex1, paddingStyle, style]}
+                    // eslint-disable-next-line react/jsx-props-no-spreading, react-compiler/react-compiler
+                    {...keyboardDismissPanResponder.panHandlers}
+                >
+                    <KeyboardAvoidingView
+                        style={[styles.w100, styles.h100, {maxHeight}, isAvoidingViewportScroll ? [styles.overflowAuto, styles.overscrollBehaviorContain] : {}]}
+                        behavior={keyboardAvoidingViewBehavior}
+                        enabled={shouldEnableKeyboardAvoidingView}
+                    >
+                        <PickerAvoidingView
+                            style={isAvoidingViewportScroll ? [styles.h100, {marginTop: 1}] : styles.flex1}
+                            enabled={shouldEnablePickerAvoiding}
                         >
-                            <View
-                                fsClass="fs-unmask"
-                                style={[styles.flex1, paddingStyle, style]}
-                                // eslint-disable-next-line react/jsx-props-no-spreading
-                                {...keyboardDismissPanResponder.panHandlers}
-                            >
-                                <KeyboardAvoidingView
-                                    style={[styles.w100, styles.h100, {maxHeight}, isAvoidingViewportScroll ? [styles.overflowAuto, styles.overscrollBehaviorContain] : {}]}
-                                    behavior={keyboardAvoidingViewBehavior}
-                                    enabled={shouldEnableKeyboardAvoidingView}
-                                >
-                                    <PickerAvoidingView
-                                        style={isAvoidingViewportScroll ? [styles.h100, {marginTop: 1}] : styles.flex1}
-                                        enabled={shouldEnablePickerAvoiding}
-                                    >
-                                        <HeaderGap styles={headerGapStyles} />
-                                        {isDevelopment && <CustomDevMenu />}
-                                        <ScreenWrapperStatusContext.Provider value={contextValue}>
-                                            {
-                                                // If props.children is a function, call it to provide the insets to the children.
-                                                typeof children === 'function'
-                                                    ? children({
-                                                          insets,
-                                                          safeAreaPaddingBottomStyle,
-                                                          didScreenTransitionEnd,
-                                                      })
-                                                    : children
-                                            }
-                                            {isSmallScreenWidth && shouldShowOfflineIndicator && (
-                                                <>
-                                                    <OfflineIndicator style={offlineIndicatorStyle} />
-                                                    {/* Since import state is tightly coupled to the offline state, it is safe to display it when showing offline indicator */}
-                                                    <ImportedStateIndicator />
-                                                </>
-                                            )}
-                                            {!shouldUseNarrowLayout && shouldShowOfflineIndicatorInWideScreen && (
-                                                <>
-                                                    <OfflineIndicator
-                                                        containerStyles={[]}
-                                                        style={[styles.pl5, styles.offlineIndicatorRow, offlineIndicatorStyle]}
-                                                    />
-                                                    {/* Since import state is tightly coupled to the offline state, it is safe to display it when showing offline indicator */}
-                                                    <ImportedStateIndicator />
-                                                </>
-                                            )}
-                                        </ScreenWrapperStatusContext.Provider>
-                                    </PickerAvoidingView>
-                                </KeyboardAvoidingView>
-                            </View>
-                        </View>
-                    </FocusTrapForScreens>
-                );
-            }}
-        </SafeAreaConsumer>
+                            <HeaderGap styles={headerGapStyles} />
+                            {isDevelopment && <CustomDevMenu />}
+                            <ScreenWrapperStatusContext.Provider value={contextValue}>
+                                {
+                                    // If props.children is a function, call it to provide the insets to the children.
+                                    typeof children === 'function'
+                                        ? children({
+                                              insets,
+                                              safeAreaPaddingBottomStyle,
+                                              didScreenTransitionEnd,
+                                          })
+                                        : children
+                                }
+                                {isSmallScreenWidth && shouldShowOfflineIndicator && (
+                                    <>
+                                        <OfflineIndicator style={offlineIndicatorStyle} />
+                                        {/* Since import state is tightly coupled to the offline state, it is safe to display it when showing offline indicator */}
+                                        <ImportedStateIndicator />
+                                    </>
+                                )}
+                                {!shouldUseNarrowLayout && shouldShowOfflineIndicatorInWideScreen && (
+                                    <>
+                                        <OfflineIndicator
+                                            containerStyles={[]}
+                                            style={[styles.pl5, styles.offlineIndicatorRow, offlineIndicatorStyle]}
+                                        />
+                                        {/* Since import state is tightly coupled to the offline state, it is safe to display it when showing offline indicator */}
+                                        <ImportedStateIndicator />
+                                    </>
+                                )}
+                            </ScreenWrapperStatusContext.Provider>
+                        </PickerAvoidingView>
+                    </KeyboardAvoidingView>
+                </View>
+            </View>
+        </FocusTrapForScreens>
     );
 }
 
diff --git a/src/components/SelectionList/BaseSelectionList.tsx b/src/components/SelectionList/BaseSelectionList.tsx
index 102c632ec0e4..87d2b2c8af29 100644
--- a/src/components/SelectionList/BaseSelectionList.tsx
+++ b/src/components/SelectionList/BaseSelectionList.tsx
@@ -10,7 +10,6 @@ import Checkbox from '@components/Checkbox';
 import FixedFooter from '@components/FixedFooter';
 import OptionsListSkeletonView from '@components/OptionsListSkeletonView';
 import {PressableWithFeedback} from '@components/Pressable';
-import SafeAreaConsumer from '@components/SafeAreaConsumer';
 import SectionList from '@components/SectionList';
 import ShowMoreButton from '@components/ShowMoreButton';
 import Text from '@components/Text';
@@ -22,6 +21,7 @@ import useKeyboardState from '@hooks/useKeyboardState';
 import useLocalize from '@hooks/useLocalize';
 import usePrevious from '@hooks/usePrevious';
 import useSingleExecution from '@hooks/useSingleExecution';
+import useStyledSafeAreaInsets from '@hooks/useStyledSafeAreaInsets';
 import useThemeStyles from '@hooks/useThemeStyles';
 import getSectionsWithIndexOffset from '@libs/getSectionsWithIndexOffset';
 import Log from '@libs/Log';
@@ -768,91 +768,89 @@ function BaseSelectionList<TItem extends ListItem>(
         },
     );
 
+    const {safeAreaPaddingBottomStyle} = useStyledSafeAreaInsets();
+
+    // TODO: test _every_ component that uses SelectionList
     return (
-        <SafeAreaConsumer>
-            {({safeAreaPaddingBottomStyle}) => (
-                <View style={[styles.flex1, (!isKeyboardShown || !!footerContent || showConfirmButton) && includeSafeAreaPaddingBottom && safeAreaPaddingBottomStyle, containerStyle]}>
-                    {shouldShowTextInput && !shouldShowTextInputAfterHeader && renderInput()}
-                    {/* If we are loading new options we will avoid showing any header message. This is mostly because one of the header messages says there are no options. */}
-                    {/* This is misleading because we might be in the process of loading fresh options from the server. */}
-                    {(!isLoadingNewOptions || headerMessage !== translate('common.noResultsFound') || (flattenedSections.allOptions.length === 0 && !showLoadingPlaceholder)) &&
-                        !!headerMessage && (
-                            <View style={headerMessageStyle ?? [styles.ph5, styles.pb5]}>
-                                <Text style={[styles.textLabel, styles.colorMuted, styles.minHeight5]}>{headerMessage}</Text>
-                            </View>
-                        )}
-                    {!!headerContent && headerContent}
-                    {flattenedSections.allOptions.length === 0 && (showLoadingPlaceholder || shouldShowListEmptyContent) ? (
-                        renderListEmptyContent()
-                    ) : (
-                        <>
-                            {!listHeaderContent && header()}
-                            <SectionList
-                                removeClippedSubviews={removeClippedSubviews}
-                                ref={listRef}
-                                sections={slicedSections}
-                                stickySectionHeadersEnabled={false}
-                                renderSectionHeader={(arg) => (
-                                    <>
-                                        {renderSectionHeader(arg)}
-                                        {listHeaderContent && header()}
-                                    </>
-                                )}
-                                renderItem={renderItem}
-                                getItemLayout={getItemLayout}
-                                onScroll={onScroll}
-                                onScrollBeginDrag={onScrollBeginDrag}
-                                keyExtractor={(item, index) => item.keyForList ?? `${index}`}
-                                extraData={focusedIndex}
-                                // the only valid values on the new arch are "white", "black", and "default", other values will cause a crash
-                                indicatorStyle="white"
-                                keyboardShouldPersistTaps="always"
-                                showsVerticalScrollIndicator={showScrollIndicator}
-                                initialNumToRender={12}
-                                maxToRenderPerBatch={maxToRenderPerBatch}
-                                windowSize={windowSize}
-                                updateCellsBatchingPeriod={updateCellsBatchingPeriod}
-                                viewabilityConfig={{viewAreaCoveragePercentThreshold: 95}}
-                                testID="selection-list"
-                                onLayout={onSectionListLayout}
-                                style={[(!maxToRenderPerBatch || (shouldHideListOnInitialRender && isInitialSectionListRender)) && styles.opacity0, sectionListStyle]}
-                                ListHeaderComponent={
-                                    shouldShowTextInput && shouldShowTextInputAfterHeader ? (
-                                        <>
-                                            {listHeaderContent}
-                                            {renderInput()}
-                                        </>
-                                    ) : (
-                                        listHeaderContent
-                                    )
-                                }
-                                ListFooterComponent={listFooterContent ?? ShowMoreButtonInstance}
-                                onEndReached={onEndReached}
-                                onEndReachedThreshold={onEndReachedThreshold}
-                                scrollEventThrottle={scrollEventThrottle}
-                                contentContainerStyle={contentContainerStyle}
-                                CellRendererComponent={shouldPreventActiveCellVirtualization ? FocusAwareCellRendererComponent : undefined}
-                            />
-                            {children}
-                        </>
-                    )}
-                    {showConfirmButton && (
-                        <FixedFooter style={[styles.mtAuto]}>
-                            <Button
-                                success={!shouldUseDefaultTheme}
-                                large
-                                style={[styles.w100, confirmButtonStyles]}
-                                text={confirmButtonText || translate('common.confirm')}
-                                onPress={onConfirm}
-                                pressOnEnter
-                                enterKeyEventListenerPriority={1}
-                            />
-                        </FixedFooter>
-                    )}
-                    {!!footerContent && <FixedFooter style={[styles.mtAuto]}>{footerContent}</FixedFooter>}
+        <View style={[styles.flex1, (!isKeyboardShown || !!footerContent) && includeSafeAreaPaddingBottom && safeAreaPaddingBottomStyle, containerStyle]}>
+            {shouldShowTextInput && !shouldShowTextInputAfterHeader && renderInput()}
+            {/* If we are loading new options we will avoid showing any header message. This is mostly because one of the header messages says there are no options. */}
+            {/* This is misleading because we might be in the process of loading fresh options from the server. */}
+            {(!isLoadingNewOptions || headerMessage !== translate('common.noResultsFound') || (flattenedSections.allOptions.length === 0 && !showLoadingPlaceholder)) && !!headerMessage && (
+                <View style={headerMessageStyle ?? [styles.ph5, styles.pb5]}>
+                    <Text style={[styles.textLabel, styles.colorMuted, styles.minHeight5]}>{headerMessage}</Text>
                 </View>
             )}
-        </SafeAreaConsumer>
+            {!!headerContent && headerContent}
+            {flattenedSections.allOptions.length === 0 && (showLoadingPlaceholder || shouldShowListEmptyContent) ? (
+                renderListEmptyContent()
+            ) : (
+                <>
+                    {!listHeaderContent && header()}
+                    <SectionList
+                        removeClippedSubviews={removeClippedSubviews}
+                        ref={listRef}
+                        sections={slicedSections}
+                        stickySectionHeadersEnabled={false}
+                        renderSectionHeader={(arg) => (
+                            <>
+                                {renderSectionHeader(arg)}
+                                {listHeaderContent && header()}
+                            </>
+                        )}
+                        renderItem={renderItem}
+                        getItemLayout={getItemLayout}
+                        onScroll={onScroll}
+                        onScrollBeginDrag={onScrollBeginDrag}
+                        keyExtractor={(item, index) => item.keyForList ?? `${index}`}
+                        extraData={focusedIndex}
+                        // the only valid values on the new arch are "white", "black", and "default", other values will cause a crash
+                        indicatorStyle="white"
+                        keyboardShouldPersistTaps="always"
+                        showsVerticalScrollIndicator={showScrollIndicator}
+                        initialNumToRender={12}
+                        maxToRenderPerBatch={maxToRenderPerBatch}
+                        windowSize={windowSize}
+                        updateCellsBatchingPeriod={updateCellsBatchingPeriod}
+                        viewabilityConfig={{viewAreaCoveragePercentThreshold: 95}}
+                        testID="selection-list"
+                        onLayout={onSectionListLayout}
+                        style={[(!maxToRenderPerBatch || (shouldHideListOnInitialRender && isInitialSectionListRender)) && styles.opacity0, sectionListStyle]}
+                        ListHeaderComponent={
+                            shouldShowTextInput && shouldShowTextInputAfterHeader ? (
+                                <>
+                                    {listHeaderContent}
+                                    {renderInput()}
+                                </>
+                            ) : (
+                                listHeaderContent
+                            )
+                        }
+                        ListFooterComponent={listFooterContent ?? ShowMoreButtonInstance}
+                        onEndReached={onEndReached}
+                        onEndReachedThreshold={onEndReachedThreshold}
+                        scrollEventThrottle={scrollEventThrottle}
+                        contentContainerStyle={contentContainerStyle}
+                        CellRendererComponent={shouldPreventActiveCellVirtualization ? FocusAwareCellRendererComponent : undefined}
+                    />
+                    {children}
+                </>
+            )}
+            {showConfirmButton && (
+                <FixedFooter style={[styles.mtAuto]}>
+                    <Button
+                        success={!shouldUseDefaultTheme}
+                        large
+                        style={[styles.w100, confirmButtonStyles]}
+                        text={confirmButtonText || translate('common.confirm')}
+                        onPress={onConfirm}
+                        pressOnEnter
+                        enterKeyEventListenerPriority={1}
+                    />
+                </FixedFooter>
+            )}
+            {!!footerContent && <FixedFooter style={[styles.mtAuto]}>{footerContent}</FixedFooter>}
+        </View>
     );
 }
 
diff --git a/src/components/TextPicker/TextSelectorModal.tsx b/src/components/TextPicker/TextSelectorModal.tsx
index ad3561b0ba26..00692fc501e6 100644
--- a/src/components/TextPicker/TextSelectorModal.tsx
+++ b/src/components/TextPicker/TextSelectorModal.tsx
@@ -11,18 +11,18 @@ import Text from '@components/Text';
 import TextInput from '@components/TextInput';
 import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types';
 import useLocalize from '@hooks/useLocalize';
+import useSafeAreaInsets from '@hooks/useSafeAreaInsets';
 import useThemeStyles from '@hooks/useThemeStyles';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {TextSelectorModalProps} from './types';
-import usePaddingStyle from './usePaddingStyle';
 
 function TextSelectorModal({value, description = '', subtitle, onValueSelected, isVisible, onClose, shouldClearOnClose, ...rest}: TextSelectorModalProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
 
     const [currentValue, setValue] = useState(value);
-    const paddingStyle = usePaddingStyle();
+    const {top} = useSafeAreaInsets();
 
     const inputRef = useRef<BaseTextInputRef | null>(null);
     const inputValueRef = useRef(value);
@@ -82,10 +82,10 @@ function TextSelectorModal({value, description = '', subtitle, onValueSelected,
         >
             <ScreenWrapper
                 includePaddingTop={false}
-                includeSafeAreaPaddingBottom={false}
+                includeSafeAreaPaddingBottom
                 testID={TextSelectorModal.displayName}
                 shouldEnableMaxHeight
-                style={paddingStyle}
+                style={{paddingTop: top}}
             >
                 <HeaderWithBackButton
                     title={description}
diff --git a/src/components/TextPicker/usePaddingStyle/index.android.tsx b/src/components/TextPicker/usePaddingStyle/index.android.tsx
deleted file mode 100644
index 9c881bc70404..000000000000
--- a/src/components/TextPicker/usePaddingStyle/index.android.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import useStyledSafeAreaInsets from '@hooks/useStyledSafeAreaInsets';
-
-export default function usePaddingStyle() {
-    const {paddingTop} = useStyledSafeAreaInsets();
-
-    return {paddingTop};
-}
diff --git a/src/components/TextPicker/usePaddingStyle/index.tsx b/src/components/TextPicker/usePaddingStyle/index.tsx
deleted file mode 100644
index c7f317b27a90..000000000000
--- a/src/components/TextPicker/usePaddingStyle/index.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-import useStyledSafeAreaInsets from '@hooks/useStyledSafeAreaInsets';
-
-export default function usePaddingStyle() {
-    const {paddingTop, paddingBottom} = useStyledSafeAreaInsets();
-    return {paddingTop, paddingBottom};
-}
diff --git a/src/components/ValidateCodeActionModal/index.tsx b/src/components/ValidateCodeActionModal/index.tsx
index 020facff8c9c..f2063f7926f4 100644
--- a/src/components/ValidateCodeActionModal/index.tsx
+++ b/src/components/ValidateCodeActionModal/index.tsx
@@ -5,7 +5,7 @@ import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import Modal from '@components/Modal';
 import ScreenWrapper from '@components/ScreenWrapper';
 import Text from '@components/Text';
-import useSafePaddingBottomStyle from '@hooks/useSafePaddingBottomStyle';
+import useSafeAreaInsets from '@hooks/useSafeAreaInsets';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
 import CONST from '@src/CONST';
@@ -31,9 +31,9 @@ function ValidateCodeActionModal({
     isLoading,
 }: ValidateCodeActionModalProps) {
     const themeStyles = useThemeStyles();
-    const safePaddingBottomStyle = useSafePaddingBottomStyle();
     const firstRenderRef = useRef(true);
     const validateCodeFormRef = useRef<ValidateCodeFormHandle>(null);
+    const {top} = useSafeAreaInsets();
 
     const [validateCodeAction] = useOnyx(ONYXKEYS.VALIDATE_ACTION_CODE);
 
@@ -63,10 +63,11 @@ function ValidateCodeActionModal({
             shouldUseModalPaddingStyle={false}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                includeSafeAreaPaddingBottom
                 shouldEnableMaxHeight
                 testID={ValidateCodeActionModal.displayName}
                 offlineIndicatorStyle={themeStyles.mtAuto}
+                style={{paddingTop: top}}
             >
                 <HeaderWithBackButton
                     title={title}
@@ -84,7 +85,7 @@ function ValidateCodeActionModal({
                         handleSubmitForm={handleSubmitForm}
                         sendValidateCode={sendValidateCode}
                         clearError={clearError}
-                        buttonStyles={[themeStyles.justifyContentEnd, themeStyles.flex1, safePaddingBottomStyle]}
+                        buttonStyles={[themeStyles.justifyContentEnd, themeStyles.flex1]}
                         ref={validateCodeFormRef}
                         hasMagicCodeBeenSent={hasMagicCodeBeenSent}
                     />
diff --git a/src/components/ValuePicker/ValueSelectorModal.tsx b/src/components/ValuePicker/ValueSelectorModal.tsx
index 5d4ced6fe291..733ce738fad9 100644
--- a/src/components/ValuePicker/ValueSelectorModal.tsx
+++ b/src/components/ValuePicker/ValueSelectorModal.tsx
@@ -29,7 +29,7 @@ function ValueSelectorModal({items = [], selectedItem, label = '', isVisible, on
             <ScreenWrapper
                 style={styles.pb0}
                 includePaddingTop={false}
-                includeSafeAreaPaddingBottom={false}
+                includeSafeAreaPaddingBottom
                 testID={ValueSelectorModal.displayName}
             >
                 <HeaderWithBackButton
diff --git a/src/hooks/useSafeAreaInsets.ts b/src/hooks/useSafeAreaInsets.ts
index 4d2dabd26841..f954a6c99e94 100644
--- a/src/hooks/useSafeAreaInsets.ts
+++ b/src/hooks/useSafeAreaInsets.ts
@@ -3,6 +3,13 @@ import type {EdgeInsets} from 'react-native-safe-area-context';
 import {useSafeAreaInsets as useSafeAreaInsetsInternal} from 'react-native-safe-area-context';
 import useStyleUtils from './useStyleUtils';
 
+/**
+ * Note: if you're looking for a hook to implement safe area padding in your screen, please either:
+ * - use a <ScreenWrapper> component and set `includeSafeAreaPaddingBottom` to `true`. Or
+ * - use the `useStyledSafeAreaInsets` hook.
+ *
+ * This hook is only meant for internal use cases where you need to access the raw safe area insets.
+ */
 function useSafeAreaInsets(): EdgeInsets {
     const StyleUtils = useStyleUtils();
     const insets = useSafeAreaInsetsInternal();
diff --git a/src/hooks/useSafePaddingBottomStyle.ts b/src/hooks/useSafePaddingBottomStyle.ts
deleted file mode 100644
index a720d00ab943..000000000000
--- a/src/hooks/useSafePaddingBottomStyle.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import {useEffect, useMemo, useState} from 'react';
-import {KeyboardEvents} from 'react-native-keyboard-controller';
-import useStyledSafeAreaInsets from './useStyledSafeAreaInsets';
-import useThemeStyles from './useThemeStyles';
-
-// This hook is useful for adding extra bottom padding to a component based on the device's safe area
-// If the device's safe area padding bottom is 0, the hook returns 0. Otherwise, it provides a padding bottom of 20.
-// Use this to ensure content visibility and layout consistency across different devices.
-const useSafePaddingBottomStyle = () => {
-    const styles = useThemeStyles();
-    const [willKeyboardShow, setWillKeyboardShow] = useState<boolean>(false);
-    useEffect(() => {
-        const keyboardWillShowListener = KeyboardEvents.addListener('keyboardWillShow', () => {
-            setWillKeyboardShow(true);
-        });
-        const keyboardWillHideListener = KeyboardEvents.addListener('keyboardWillHide', () => {
-            setWillKeyboardShow(false);
-        });
-        return () => {
-            keyboardWillShowListener.remove();
-            keyboardWillHideListener.remove();
-        };
-    }, []);
-
-    const {paddingBottom} = useStyledSafeAreaInsets();
-
-    const extraPaddingBottomStyle = useMemo(() => {
-        // Do not add extra padding at the bottom if the keyboard is open or if there is no safe area bottom padding style.
-        if (willKeyboardShow || !paddingBottom) {
-            return {};
-        }
-        return styles.pb5;
-    }, [willKeyboardShow, paddingBottom, styles.pb5]);
-    return extraPaddingBottomStyle;
-};
-
-export default useSafePaddingBottomStyle;
diff --git a/src/hooks/useStyledSafeAreaInsets.ts b/src/hooks/useStyledSafeAreaInsets.ts
index dd90f833d669..4b6ecd53257b 100644
--- a/src/hooks/useStyledSafeAreaInsets.ts
+++ b/src/hooks/useStyledSafeAreaInsets.ts
@@ -1,8 +1,12 @@
+import {useContext, useMemo} from 'react';
+import {ScreenWrapperStatusContext} from '@components/ScreenWrapper';
 import useSafeAreaInsets from './useSafeAreaInsets';
 import useStyleUtils from './useStyleUtils';
 
 /**
- * Custom hook to get the styled safe area insets.
+ * Custom hook to get the styled safe area insets. The top and bottom padding values are adjusted
+ * so that they will only ever be applied once per <ScreenWrapper>.
+ *
  * This hook utilizes the `SafeAreaInsetsContext` to retrieve the current safe area insets
  * and applies styling adjustments using the `useStyleUtils` hook.
  *
@@ -13,23 +17,43 @@ import useStyleUtils from './useStyleUtils';
  * @returns  .safeAreaPaddingBottomStyle An object containing the bottom padding style adjusted for safe area.
  *
  * @example
- * // How to use this hook in a component
+ * function MyScreen() {
+ *   return (
+ *      <ScreenWrapper>
+ *          <MyComponent />
+ *      </ScreenWrapper>
+ *   );
+ * }
+ *
  * function MyComponent() {
  *     const { paddingTop, paddingBottom, safeAreaPaddingBottomStyle } = useStyledSafeAreaInsets();
  *
  *     // Use these values to style your component accordingly
  * }
  */
-function useStyledSafeAreaInsets(safeAreaInsetsPercentage?: number) {
+function useStyledSafeAreaInsets() {
     const StyleUtils = useStyleUtils();
     const insets = useSafeAreaInsets();
+    const {paddingTop, paddingBottom} = StyleUtils.getSafeAreaPadding(insets);
+
+    const screenWrapperStatusContext = useContext(ScreenWrapperStatusContext);
+    const isSafeAreaTopPaddingApplied = screenWrapperStatusContext?.isSafeAreaTopPaddingApplied ?? false;
+    const isSafeAreaBottomPaddingApplied = screenWrapperStatusContext?.isSafeAreaBottomPaddingApplied ?? false;
+
+    const adaptedInsets = {
+        ...insets,
+        top: isSafeAreaTopPaddingApplied ? 0 : insets?.top,
+        bottom: isSafeAreaBottomPaddingApplied ? 0 : insets?.bottom,
+    };
+    const adaptedPaddingBottom = isSafeAreaBottomPaddingApplied ? 0 : paddingBottom;
+
+    const safeAreaPaddingBottomStyle = useMemo(() => ({paddingBottom: adaptedPaddingBottom}), [adaptedPaddingBottom]);
 
-    const {paddingTop, paddingBottom} = StyleUtils.getSafeAreaPadding(insets, safeAreaInsetsPercentage);
     return {
-        paddingTop,
-        paddingBottom,
-        insets,
-        safeAreaPaddingBottomStyle: {paddingBottom},
+        paddingTop: isSafeAreaTopPaddingApplied ? 0 : paddingTop,
+        paddingBottom: adaptedPaddingBottom,
+        insets: adaptedInsets,
+        safeAreaPaddingBottomStyle,
     };
 }
 
diff --git a/src/pages/AddressPage.tsx b/src/pages/AddressPage.tsx
index 88e52409751b..41661f62b6f4 100644
--- a/src/pages/AddressPage.tsx
+++ b/src/pages/AddressPage.tsx
@@ -78,7 +78,7 @@ function AddressPage({title, address, updateAddress, isLoadingApp = true, backTo
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
             testID={AddressPage.displayName}
         >
             <HeaderWithBackButton
diff --git a/src/pages/EditReportFieldPage.tsx b/src/pages/EditReportFieldPage.tsx
index 25023badbd1e..6b25681fa8e8 100644
--- a/src/pages/EditReportFieldPage.tsx
+++ b/src/pages/EditReportFieldPage.tsx
@@ -93,7 +93,7 @@ function EditReportFieldPage({route}: EditReportFieldPageProps) {
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
             shouldEnableMaxHeight
             testID={EditReportFieldPage.displayName}
         >
diff --git a/src/pages/EnablePayments/EnablePaymentsPage.tsx b/src/pages/EnablePayments/EnablePaymentsPage.tsx
index 1384875fe031..5fdfcca02660 100644
--- a/src/pages/EnablePayments/EnablePaymentsPage.tsx
+++ b/src/pages/EnablePayments/EnablePaymentsPage.tsx
@@ -54,7 +54,7 @@ function EnablePaymentsPage({userWallet}: EnablePaymentsPageProps) {
     return (
         <ScreenWrapper
             shouldShowOfflineIndicator={userWallet?.currentStep !== CONST.WALLET.STEP.ONFIDO}
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
             testID={EnablePaymentsPage.displayName}
         >
             {() => {
diff --git a/src/pages/GroupChatNameEditPage.tsx b/src/pages/GroupChatNameEditPage.tsx
index 100efb69cae1..69d7f6c6f8af 100644
--- a/src/pages/GroupChatNameEditPage.tsx
+++ b/src/pages/GroupChatNameEditPage.tsx
@@ -82,7 +82,7 @@ function GroupChatNameEditPage({groupChatDraft, report}: GroupChatNameEditPagePr
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
             style={[styles.defaultModalContainer]}
             testID={GroupChatNameEditPage.displayName}
             shouldEnableMaxHeight
diff --git a/src/pages/NewChatConfirmPage.tsx b/src/pages/NewChatConfirmPage.tsx
index e8f074ba680a..85e33cf0c598 100644
--- a/src/pages/NewChatConfirmPage.tsx
+++ b/src/pages/NewChatConfirmPage.tsx
@@ -132,10 +132,7 @@ function NewChatConfirmPage({newGroupDraft, allPersonalDetails}: NewChatConfirmP
     }, []);
 
     return (
-        <ScreenWrapper
-            testID={NewChatConfirmPage.displayName}
-            includeSafeAreaPaddingBottom={false}
-        >
+        <ScreenWrapper testID={NewChatConfirmPage.displayName}>
             <HeaderWithBackButton
                 title={translate('common.group')}
                 onBackButtonPress={navigateBack}
diff --git a/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx b/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx
index ed102fa60786..a136695d5eff 100644
--- a/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx
+++ b/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx
@@ -112,7 +112,7 @@ function BaseOnboardingPersonalDetails({currentUserPersonalDetails, shouldUseNat
         <ScreenWrapper
             shouldEnableMaxHeight
             shouldShowOfflineIndicator={false}
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
             testID="BaseOnboardingPersonalDetails"
             style={[styles.defaultModalContainer, shouldUseNativeStyles && styles.pt8]}
         >
diff --git a/src/pages/PrivateNotes/PrivateNotesEditPage.tsx b/src/pages/PrivateNotes/PrivateNotesEditPage.tsx
index bfe534420e0d..a0370ef6cbbd 100644
--- a/src/pages/PrivateNotes/PrivateNotesEditPage.tsx
+++ b/src/pages/PrivateNotes/PrivateNotesEditPage.tsx
@@ -106,7 +106,7 @@ function PrivateNotesEditPage({route, report, accountID}: PrivateNotesEditPagePr
     return (
         <ScreenWrapper
             shouldEnableMaxHeight
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
             testID={PrivateNotesEditPage.displayName}
         >
             <HeaderWithBackButton
diff --git a/src/pages/RoomDescriptionPage.tsx b/src/pages/RoomDescriptionPage.tsx
index 68da1cabf59c..abafa519cb33 100644
--- a/src/pages/RoomDescriptionPage.tsx
+++ b/src/pages/RoomDescriptionPage.tsx
@@ -80,7 +80,7 @@ function RoomDescriptionPage({report, policies}: RoomDescriptionPageProps) {
     return (
         <ScreenWrapper
             shouldEnableMaxHeight
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
             testID={RoomDescriptionPage.displayName}
         >
             <HeaderWithBackButton
diff --git a/src/pages/RoomInvitePage.tsx b/src/pages/RoomInvitePage.tsx
index 1e871ea4c257..fd737ba6ee48 100644
--- a/src/pages/RoomInvitePage.tsx
+++ b/src/pages/RoomInvitePage.tsx
@@ -241,7 +241,7 @@ function RoomInvitePage({
         <ScreenWrapper
             shouldEnableMaxHeight
             testID={RoomInvitePage.displayName}
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
         >
             <FullPageNotFoundView
                 shouldShow={isEmptyObject(report)}
diff --git a/src/pages/Search/SavedSearchRenamePage.tsx b/src/pages/Search/SavedSearchRenamePage.tsx
index ccfc6147d56a..2475c9ea602b 100644
--- a/src/pages/Search/SavedSearchRenamePage.tsx
+++ b/src/pages/Search/SavedSearchRenamePage.tsx
@@ -50,7 +50,7 @@ function SavedSearchRenamePage({route}: {route: {params: {q: string; name: strin
             testID={SavedSearchRenamePage.displayName}
             shouldShowOfflineIndicatorInWideScreen
             offlineIndicatorStyle={styles.mtAuto}
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
         >
             <HeaderWithBackButton title={translate('common.rename')} />
             <FormProvider
diff --git a/src/pages/Search/SearchAdvancedFiltersPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage.tsx
index 687e04c7341b..a9af99958894 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage.tsx
@@ -27,7 +27,7 @@ function SearchAdvancedFiltersPage() {
             testID={SearchAdvancedFiltersPage.displayName}
             shouldShowOfflineIndicatorInWideScreen
             offlineIndicatorStyle={styles.mtAuto}
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
         >
             <HeaderWithBackButton title={translate('search.filtersHeader')}>
                 {shouldShowResetFilters && <TextLink onPress={SearchActions.clearAdvancedFilters}>{translate('search.resetFilters')}</TextLink>}
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersAmountPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersAmountPage.tsx
index 56eb3dce4350..6473da9fc9f5 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersAmountPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersAmountPage.tsx
@@ -43,7 +43,7 @@ function SearchFiltersAmountPage() {
             testID={SearchFiltersAmountPage.displayName}
             shouldShowOfflineIndicatorInWideScreen
             offlineIndicatorStyle={styles.mtAuto}
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
             shouldEnableMaxHeight
         >
             <HeaderWithBackButton
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCategoryPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCategoryPage.tsx
index 8868c02258c5..92a0d5a8478d 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCategoryPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCategoryPage.tsx
@@ -5,7 +5,6 @@ import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import ScreenWrapper from '@components/ScreenWrapper';
 import SearchMultipleSelectionPicker from '@components/Search/SearchMultipleSelectionPicker';
 import useLocalize from '@hooks/useLocalize';
-import useSafePaddingBottomStyle from '@hooks/useSafePaddingBottomStyle';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
 import * as SearchActions from '@userActions/Search';
@@ -41,14 +40,12 @@ function SearchFiltersCategoryPage() {
     }, [allPolicyCategories, singlePolicyCategories, translate]);
 
     const onSaveSelection = useCallback((values: string[]) => SearchActions.updateAdvancedFilters({category: values}), []);
-    const safePaddingBottomStyle = useSafePaddingBottomStyle();
 
     return (
         <ScreenWrapper
             testID={SearchFiltersCategoryPage.displayName}
             shouldShowOfflineIndicatorInWideScreen
             offlineIndicatorStyle={styles.mtAuto}
-            includeSafeAreaPaddingBottom={false}
             shouldEnableMaxHeight
         >
             <HeaderWithBackButton
@@ -57,7 +54,7 @@ function SearchFiltersCategoryPage() {
                     Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS);
                 }}
             />
-            <View style={[styles.flex1, safePaddingBottomStyle]}>
+            <View style={[styles.flex1]}>
                 <SearchMultipleSelectionPicker
                     items={categoryItems}
                     initiallySelectedItems={selectedCategoriesItems}
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCurrencyPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCurrencyPage.tsx
index 3b9b2d6bbb17..61950f9e8f61 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCurrencyPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCurrencyPage.tsx
@@ -45,7 +45,7 @@ function SearchFiltersCurrencyPage() {
             testID={SearchFiltersCurrencyPage.displayName}
             shouldShowOfflineIndicatorInWideScreen
             offlineIndicatorStyle={styles.mtAuto}
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
             shouldEnableMaxHeight
         >
             <HeaderWithBackButton
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersDatePage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersDatePage.tsx
index d4d068d4ba5f..140708feb773 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersDatePage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersDatePage.tsx
@@ -35,7 +35,7 @@ function SearchFiltersDatePage() {
             testID={SearchFiltersDatePage.displayName}
             shouldShowOfflineIndicatorInWideScreen
             offlineIndicatorStyle={styles.mtAuto}
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
             shouldEnableMaxHeight
         >
             <HeaderWithBackButton
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersDescriptionPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersDescriptionPage.tsx
index bebcfe587cc2..af98a26e549d 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersDescriptionPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersDescriptionPage.tsx
@@ -35,7 +35,7 @@ function SearchFiltersDescriptionPage() {
             testID={SearchFiltersDescriptionPage.displayName}
             shouldShowOfflineIndicatorInWideScreen
             offlineIndicatorStyle={styles.mtAuto}
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
             shouldEnableMaxHeight
         >
             <HeaderWithBackButton
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersFromPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersFromPage.tsx
index 3db78bba4518..f1dba80dbea7 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersFromPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersFromPage.tsx
@@ -20,7 +20,7 @@ function SearchFiltersFromPage() {
     return (
         <ScreenWrapper
             testID={SearchFiltersFromPage.displayName}
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
             shouldShowOfflineIndicatorInWideScreen
             offlineIndicatorStyle={styles.mtAuto}
             shouldEnableMaxHeight
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersMerchantPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersMerchantPage.tsx
index 257e9f18177e..1c05a068bf2f 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersMerchantPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersMerchantPage.tsx
@@ -35,7 +35,7 @@ function SearchFiltersMerchantPage() {
             testID={SearchFiltersMerchantPage.displayName}
             shouldShowOfflineIndicatorInWideScreen
             offlineIndicatorStyle={styles.mtAuto}
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
             shouldEnableMaxHeight
         >
             <HeaderWithBackButton
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersReportIDPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersReportIDPage.tsx
index 052490890cf7..226c4d241991 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersReportIDPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersReportIDPage.tsx
@@ -35,7 +35,7 @@ function SearchFiltersReportIDPage() {
             testID={SearchFiltersReportIDPage.displayName}
             shouldShowOfflineIndicatorInWideScreen
             offlineIndicatorStyle={styles.mtAuto}
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
             shouldEnableMaxHeight
         >
             <HeaderWithBackButton
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersToPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersToPage.tsx
index ef972aafa52a..89d5349b8563 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersToPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersToPage.tsx
@@ -20,7 +20,7 @@ function SearchFiltersToPage() {
     return (
         <ScreenWrapper
             testID={SearchFiltersToPage.displayName}
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
             shouldShowOfflineIndicatorInWideScreen
             offlineIndicatorStyle={styles.mtAuto}
             shouldEnableMaxHeight
diff --git a/src/pages/Search/SearchTypeMenuNarrow.tsx b/src/pages/Search/SearchTypeMenuNarrow.tsx
index c0980110469d..5a1aa7024fd6 100644
--- a/src/pages/Search/SearchTypeMenuNarrow.tsx
+++ b/src/pages/Search/SearchTypeMenuNarrow.tsx
@@ -14,6 +14,7 @@ import Text from '@components/Text';
 import ThreeDotsMenu from '@components/ThreeDotsMenu';
 import useDeleteSavedSearch from '@hooks/useDeleteSavedSearch';
 import useLocalize from '@hooks/useLocalize';
+import useSafeAreaInsets from '@hooks/useSafeAreaInsets';
 import useSingleExecution from '@hooks/useSingleExecution';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
@@ -62,6 +63,7 @@ function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, queryJSON, title,
     const [reports = {}] = useOnyx(ONYXKEYS.COLLECTION.REPORT);
     const taxRates = getAllTaxRates();
     const [cardList = {}] = useOnyx(ONYXKEYS.CARD_LIST);
+    const {bottom} = useSafeAreaInsets();
 
     const [isPopoverVisible, setIsPopoverVisible] = useState(false);
     const buttonRef = useRef<HTMLDivElement>(null);
@@ -209,7 +211,7 @@ function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, queryJSON, title,
                 onClose={closeMenu}
                 onItemSelected={closeMenu}
                 anchorRef={buttonRef}
-                innerContainerStyle={styles.pv0}
+                innerContainerStyle={{paddingBottom: bottom}}
                 scrollContainerStyle={styles.pv4}
                 shouldUseScrollView
             />
diff --git a/src/pages/TeachersUnite/IntroSchoolPrincipalPage.tsx b/src/pages/TeachersUnite/IntroSchoolPrincipalPage.tsx
index ca48cf807276..23ea6067c048 100644
--- a/src/pages/TeachersUnite/IntroSchoolPrincipalPage.tsx
+++ b/src/pages/TeachersUnite/IntroSchoolPrincipalPage.tsx
@@ -75,7 +75,7 @@ function IntroSchoolPrincipalPage(props: IntroSchoolPrincipalPageProps) {
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
             testID={IntroSchoolPrincipalPage.displayName}
         >
             <HeaderWithBackButton
diff --git a/src/pages/TeachersUnite/KnowATeacherPage.tsx b/src/pages/TeachersUnite/KnowATeacherPage.tsx
index 449f05763bb6..fbfd0057059d 100644
--- a/src/pages/TeachersUnite/KnowATeacherPage.tsx
+++ b/src/pages/TeachersUnite/KnowATeacherPage.tsx
@@ -81,7 +81,7 @@ function KnowATeacherPage(props: KnowATeacherPageProps) {
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
             testID={KnowATeacherPage.displayName}
         >
             <HeaderWithBackButton
diff --git a/src/pages/iou/HoldReasonFormView.tsx b/src/pages/iou/HoldReasonFormView.tsx
index 197d00b6b0ed..a9e93abb649a 100644
--- a/src/pages/iou/HoldReasonFormView.tsx
+++ b/src/pages/iou/HoldReasonFormView.tsx
@@ -33,7 +33,7 @@ function HoldReasonFormView({backTo, validate, onSubmit}: HoldReasonFormViewProp
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
             shouldEnableMaxHeight
             testID={HoldReasonFormView.displayName}
         >
diff --git a/src/pages/iou/request/IOURequestStartPage.tsx b/src/pages/iou/request/IOURequestStartPage.tsx
index b202f54b29bb..78dac9220742 100644
--- a/src/pages/iou/request/IOURequestStartPage.tsx
+++ b/src/pages/iou/request/IOURequestStartPage.tsx
@@ -111,85 +111,82 @@ function IOURequestStartPage({
             allPolicies={allPolicies}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
                 shouldEnableKeyboardAvoidingView={false}
                 shouldEnableMinHeight={DeviceCapabilities.canUseTouchScreen()}
                 headerGapStyles={isDraggingOver ? [styles.receiptDropHeaderGap] : []}
                 testID={IOURequestStartPage.displayName}
                 focusTrapSettings={{containerElements: focusTrapContainerElements}}
             >
-                {({safeAreaPaddingBottomStyle}) => (
-                    <DragAndDropProvider
-                        setIsDraggingOver={setIsDraggingOver}
-                        isDisabled={selectedTab !== CONST.TAB_REQUEST.SCAN}
-                    >
-                        <View style={[styles.flex1, safeAreaPaddingBottomStyle]}>
+                <DragAndDropProvider
+                    setIsDraggingOver={setIsDraggingOver}
+                    isDisabled={selectedTab !== CONST.TAB_REQUEST.SCAN}
+                >
+                    <View style={styles.flex1}>
+                        <FocusTrapContainerElement
+                            onContainerElementChanged={setHeaderWithBackButtonContainerElement}
+                            style={[styles.w100]}
+                        >
+                            <HeaderWithBackButton
+                                title={tabTitles[iouType]}
+                                onBackButtonPress={navigateBack}
+                            />
+                        </FocusTrapContainerElement>
+
+                        {shouldUseTab ? (
+                            <OnyxTabNavigator
+                                id={CONST.TAB.IOU_REQUEST_TYPE}
+                                defaultSelectedTab={CONST.TAB_REQUEST.SCAN}
+                                onTabSelected={resetIOUTypeIfChanged}
+                                tabBar={TabSelector}
+                                onTabBarFocusTrapContainerElementChanged={setTabBarContainerElement}
+                                onActiveTabFocusTrapContainerElementChanged={setActiveTabContainerElement}
+                            >
+                                <TopTab.Screen name={CONST.TAB_REQUEST.MANUAL}>
+                                    {() => (
+                                        <TabScreenWithFocusTrapWrapper>
+                                            <IOURequestStepAmount
+                                                shouldKeepUserInput
+                                                route={route}
+                                                navigation={navigation}
+                                            />
+                                        </TabScreenWithFocusTrapWrapper>
+                                    )}
+                                </TopTab.Screen>
+                                <TopTab.Screen name={CONST.TAB_REQUEST.SCAN}>
+                                    {() => (
+                                        <TabScreenWithFocusTrapWrapper>
+                                            <IOURequestStepScan
+                                                route={route}
+                                                navigation={navigation}
+                                            />
+                                        </TabScreenWithFocusTrapWrapper>
+                                    )}
+                                </TopTab.Screen>
+                                <TopTab.Screen name={CONST.TAB_REQUEST.DISTANCE}>
+                                    {() => (
+                                        <TabScreenWithFocusTrapWrapper>
+                                            <IOURequestStepDistance
+                                                route={route}
+                                                navigation={navigation}
+                                            />
+                                        </TabScreenWithFocusTrapWrapper>
+                                    )}
+                                </TopTab.Screen>
+                            </OnyxTabNavigator>
+                        ) : (
                             <FocusTrapContainerElement
-                                onContainerElementChanged={setHeaderWithBackButtonContainerElement}
-                                style={[styles.w100]}
+                                onContainerElementChanged={setActiveTabContainerElement}
+                                style={[styles.flexColumn, styles.flex1]}
                             >
-                                <HeaderWithBackButton
-                                    title={tabTitles[iouType]}
-                                    onBackButtonPress={navigateBack}
+                                <IOURequestStepAmount
+                                    route={route}
+                                    navigation={navigation}
+                                    shouldKeepUserInput
                                 />
                             </FocusTrapContainerElement>
-
-                            {shouldUseTab ? (
-                                <OnyxTabNavigator
-                                    id={CONST.TAB.IOU_REQUEST_TYPE}
-                                    defaultSelectedTab={CONST.TAB_REQUEST.SCAN}
-                                    onTabSelected={resetIOUTypeIfChanged}
-                                    tabBar={TabSelector}
-                                    onTabBarFocusTrapContainerElementChanged={setTabBarContainerElement}
-                                    onActiveTabFocusTrapContainerElementChanged={setActiveTabContainerElement}
-                                >
-                                    <TopTab.Screen name={CONST.TAB_REQUEST.MANUAL}>
-                                        {() => (
-                                            <TabScreenWithFocusTrapWrapper>
-                                                <IOURequestStepAmount
-                                                    shouldKeepUserInput
-                                                    route={route}
-                                                    navigation={navigation}
-                                                />
-                                            </TabScreenWithFocusTrapWrapper>
-                                        )}
-                                    </TopTab.Screen>
-                                    <TopTab.Screen name={CONST.TAB_REQUEST.SCAN}>
-                                        {() => (
-                                            <TabScreenWithFocusTrapWrapper>
-                                                <IOURequestStepScan
-                                                    route={route}
-                                                    navigation={navigation}
-                                                />
-                                            </TabScreenWithFocusTrapWrapper>
-                                        )}
-                                    </TopTab.Screen>
-                                    <TopTab.Screen name={CONST.TAB_REQUEST.DISTANCE}>
-                                        {() => (
-                                            <TabScreenWithFocusTrapWrapper>
-                                                <IOURequestStepDistance
-                                                    route={route}
-                                                    navigation={navigation}
-                                                />
-                                            </TabScreenWithFocusTrapWrapper>
-                                        )}
-                                    </TopTab.Screen>
-                                </OnyxTabNavigator>
-                            ) : (
-                                <FocusTrapContainerElement
-                                    onContainerElementChanged={setActiveTabContainerElement}
-                                    style={[styles.flexColumn, styles.flex1]}
-                                >
-                                    <IOURequestStepAmount
-                                        route={route}
-                                        navigation={navigation}
-                                        shouldKeepUserInput
-                                    />
-                                </FocusTrapContainerElement>
-                            )}
-                        </View>
-                    </DragAndDropProvider>
-                )}
+                        )}
+                    </View>
+                </DragAndDropProvider>
             </ScreenWrapper>
         </AccessOrNotFoundWrapper>
     );
diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
index 683fa4d2c14e..cb5b4d626715 100644
--- a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
+++ b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
@@ -602,7 +602,6 @@ function IOURequestStepConfirmation({
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
             shouldEnableMaxHeight={DeviceCapabilities.canUseTouchScreen()}
             testID={IOURequestStepConfirmation.displayName}
         >
diff --git a/src/pages/iou/request/step/IOURequestStepCurrency.tsx b/src/pages/iou/request/step/IOURequestStepCurrency.tsx
index c48bf91986f4..a648b3579357 100644
--- a/src/pages/iou/request/step/IOURequestStepCurrency.tsx
+++ b/src/pages/iou/request/step/IOURequestStepCurrency.tsx
@@ -69,7 +69,7 @@ function IOURequestStepCurrency({
             onBackButtonPress={() => navigateBack()}
             shouldShowWrapper
             testID={IOURequestStepCurrency.displayName}
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
         >
             {({didScreenTransitionEnd}) => (
                 <CurrencySelectionList
diff --git a/src/pages/iou/request/step/IOURequestStepDate.tsx b/src/pages/iou/request/step/IOURequestStepDate.tsx
index b5b7b1d02cea..4536c43c9ae4 100644
--- a/src/pages/iou/request/step/IOURequestStepDate.tsx
+++ b/src/pages/iou/request/step/IOURequestStepDate.tsx
@@ -117,7 +117,7 @@ function IOURequestStepDate({
             shouldShowNotFoundPage={shouldShowNotFound}
             shouldShowWrapper
             testID={IOURequestStepDate.displayName}
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
         >
             <FormProvider
                 style={[styles.flexGrow1, styles.ph5]}
diff --git a/src/pages/iou/request/step/IOURequestStepDescription.tsx b/src/pages/iou/request/step/IOURequestStepDescription.tsx
index b35ee6157708..a39261f08b8c 100644
--- a/src/pages/iou/request/step/IOURequestStepDescription.tsx
+++ b/src/pages/iou/request/step/IOURequestStepDescription.tsx
@@ -140,7 +140,6 @@ function IOURequestStepDescription({
             shouldShowWrapper
             testID={IOURequestStepDescription.displayName}
             shouldShowNotFoundPage={shouldShowNotFoundPage}
-            includeSafeAreaPaddingBottom={false}
         >
             <FormProvider
                 style={[styles.flexGrow1, styles.ph5]}
diff --git a/src/pages/iou/request/step/IOURequestStepMerchant.tsx b/src/pages/iou/request/step/IOURequestStepMerchant.tsx
index 8f3b8801367f..80720b1cbf1c 100644
--- a/src/pages/iou/request/step/IOURequestStepMerchant.tsx
+++ b/src/pages/iou/request/step/IOURequestStepMerchant.tsx
@@ -113,7 +113,6 @@ function IOURequestStepMerchant({
             onBackButtonPress={navigateBack}
             shouldShowWrapper
             testID={IOURequestStepMerchant.displayName}
-            includeSafeAreaPaddingBottom={false}
         >
             <FormProvider
                 style={[styles.flexGrow1, styles.ph5]}
diff --git a/src/pages/iou/request/step/IOURequestStepParticipants.tsx b/src/pages/iou/request/step/IOURequestStepParticipants.tsx
index 36cc683badb6..fb2484ea414f 100644
--- a/src/pages/iou/request/step/IOURequestStepParticipants.tsx
+++ b/src/pages/iou/request/step/IOURequestStepParticipants.tsx
@@ -171,7 +171,6 @@ function IOURequestStepParticipants({
             onBackButtonPress={navigateBack}
             shouldShowWrapper
             testID={IOURequestStepParticipants.displayName}
-            includeSafeAreaPaddingBottom={false}
         >
             {!!skipConfirmation && (
                 <FormHelpMessage
diff --git a/src/pages/iou/request/step/IOURequestStepWaypoint.tsx b/src/pages/iou/request/step/IOURequestStepWaypoint.tsx
index 4fad55e8fc4a..fd647400032e 100644
--- a/src/pages/iou/request/step/IOURequestStepWaypoint.tsx
+++ b/src/pages/iou/request/step/IOURequestStepWaypoint.tsx
@@ -161,7 +161,7 @@ function IOURequestStepWaypoint({
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
             onEntryTransitionEnd={() => textInput.current?.focus()}
             shouldEnableMaxHeight
             testID={IOURequestStepWaypoint.displayName}
diff --git a/src/pages/settings/Profile/Contacts/NewContactMethodPage.tsx b/src/pages/settings/Profile/Contacts/NewContactMethodPage.tsx
index 13db657ad57d..5fc218582205 100644
--- a/src/pages/settings/Profile/Contacts/NewContactMethodPage.tsx
+++ b/src/pages/settings/Profile/Contacts/NewContactMethodPage.tsx
@@ -119,7 +119,7 @@ function NewContactMethodPage({route}: NewContactMethodPageProps) {
     return (
         <ScreenWrapper
             onEntryTransitionEnd={() => loginInputRef.current?.focus()}
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
             shouldEnableMaxHeight
             testID={NewContactMethodPage.displayName}
         >
diff --git a/src/pages/settings/Profile/CustomStatus/SetDatePage.tsx b/src/pages/settings/Profile/CustomStatus/SetDatePage.tsx
index ae0b910dc01f..51dddadbc8d1 100644
--- a/src/pages/settings/Profile/CustomStatus/SetDatePage.tsx
+++ b/src/pages/settings/Profile/CustomStatus/SetDatePage.tsx
@@ -51,7 +51,7 @@ function SetDatePage({customStatus}: SetDatePageProps) {
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
             testID={SetDatePage.displayName}
         >
             <HeaderWithBackButton
diff --git a/src/pages/settings/Profile/CustomStatus/StatusClearAfterPage.tsx b/src/pages/settings/Profile/CustomStatus/StatusClearAfterPage.tsx
index 2d3538b8fbc5..db36e60de4d0 100644
--- a/src/pages/settings/Profile/CustomStatus/StatusClearAfterPage.tsx
+++ b/src/pages/settings/Profile/CustomStatus/StatusClearAfterPage.tsx
@@ -170,7 +170,7 @@ function StatusClearAfterPage({customStatus}: StatusClearAfterPageProps) {
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
             shouldEnableMaxHeight
             testID={StatusClearAfterPage.displayName}
         >
diff --git a/src/pages/settings/Profile/CustomStatus/StatusPage.tsx b/src/pages/settings/Profile/CustomStatus/StatusPage.tsx
index c9858738906d..e99307897315 100644
--- a/src/pages/settings/Profile/CustomStatus/StatusPage.tsx
+++ b/src/pages/settings/Profile/CustomStatus/StatusPage.tsx
@@ -156,7 +156,7 @@ function StatusPage() {
         <ScreenWrapper
             style={[StyleUtils.getBackgroundColorStyle(theme.PAGE_THEMES[SCREENS.SETTINGS.PROFILE.STATUS].backgroundColor)]}
             shouldEnablePickerAvoiding={false}
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
             testID={HeaderPageLayout.displayName}
         >
             <HeaderWithBackButton
diff --git a/src/pages/settings/Profile/DisplayNamePage.tsx b/src/pages/settings/Profile/DisplayNamePage.tsx
index 4c6211bc3e37..10eeeaf06bf5 100644
--- a/src/pages/settings/Profile/DisplayNamePage.tsx
+++ b/src/pages/settings/Profile/DisplayNamePage.tsx
@@ -66,7 +66,7 @@ function DisplayNamePage({currentUserPersonalDetails}: DisplayNamePageProps) {
     };
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
             shouldEnableMaxHeight
             testID={DisplayNamePage.displayName}
         >
diff --git a/src/pages/settings/Profile/PersonalDetails/DateOfBirthPage.tsx b/src/pages/settings/Profile/PersonalDetails/DateOfBirthPage.tsx
index 07d65c710429..8a9e6c0a7d02 100644
--- a/src/pages/settings/Profile/PersonalDetails/DateOfBirthPage.tsx
+++ b/src/pages/settings/Profile/PersonalDetails/DateOfBirthPage.tsx
@@ -43,7 +43,7 @@ function DateOfBirthPage() {
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
             testID={DateOfBirthPage.displayName}
         >
             <HeaderWithBackButton
diff --git a/src/pages/settings/Profile/PersonalDetails/LegalNamePage.tsx b/src/pages/settings/Profile/PersonalDetails/LegalNamePage.tsx
index 505ee55a1ec5..74c7624c6725 100644
--- a/src/pages/settings/Profile/PersonalDetails/LegalNamePage.tsx
+++ b/src/pages/settings/Profile/PersonalDetails/LegalNamePage.tsx
@@ -78,7 +78,7 @@ function LegalNamePage() {
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
             shouldEnableMaxHeight
             testID={LegalNamePage.displayName}
         >
diff --git a/src/pages/settings/Profile/PersonalDetails/PhoneNumberPage.tsx b/src/pages/settings/Profile/PersonalDetails/PhoneNumberPage.tsx
index 12c6f011c6a2..a4718e87d90b 100644
--- a/src/pages/settings/Profile/PersonalDetails/PhoneNumberPage.tsx
+++ b/src/pages/settings/Profile/PersonalDetails/PhoneNumberPage.tsx
@@ -69,7 +69,7 @@ function PhoneNumberPage() {
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
             shouldEnableMaxHeight
             testID={PhoneNumberPage.displayName}
         >
diff --git a/src/pages/settings/Profile/ProfilePage.tsx b/src/pages/settings/Profile/ProfilePage.tsx
index faa399598d05..1ea20a448820 100755
--- a/src/pages/settings/Profile/ProfilePage.tsx
+++ b/src/pages/settings/Profile/ProfilePage.tsx
@@ -16,6 +16,7 @@ import Section from '@components/Section';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useLocalize from '@hooks/useLocalize';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useStyledSafeAreaInsets from '@hooks/useStyledSafeAreaInsets';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -36,6 +37,7 @@ function ProfilePage() {
     const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
     const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const {safeAreaPaddingBottomStyle} = useStyledSafeAreaInsets();
 
     const [loginList] = useOnyx(ONYXKEYS.LOGIN_LIST);
     const [privatePersonalDetails] = useOnyx(ONYXKEYS.PRIVATE_PERSONAL_DETAILS);
@@ -122,7 +124,10 @@ function ProfilePage() {
                 shouldDisplaySearchRouter
                 icon={Illustrations.Profile}
             />
-            <ScrollView style={styles.pt3}>
+            <ScrollView
+                style={styles.pt3}
+                contentContainerStyle={safeAreaPaddingBottomStyle}
+            >
                 <MenuItemGroup>
                     <View style={[styles.flex1, shouldUseNarrowLayout ? styles.workspaceSectionMobile : styles.workspaceSection]}>
                         <Section
diff --git a/src/pages/settings/Report/RoomNamePage.tsx b/src/pages/settings/Report/RoomNamePage.tsx
index ac23f455c635..bc83b2ad0ba1 100644
--- a/src/pages/settings/Report/RoomNamePage.tsx
+++ b/src/pages/settings/Report/RoomNamePage.tsx
@@ -89,7 +89,7 @@ function RoomNamePage({report, reports}: RoomNamePageProps) {
     return (
         <ScreenWrapper
             onEntryTransitionEnd={() => roomNameInputRef.current?.focus()}
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
             testID={RoomNamePage.displayName}
         >
             <FullPageNotFoundView shouldShow={ReportUtils.shouldDisableRename(report)}>
diff --git a/src/pages/settings/Security/CloseAccountPage.tsx b/src/pages/settings/Security/CloseAccountPage.tsx
index 6036512df169..9f4a0858ece6 100644
--- a/src/pages/settings/Security/CloseAccountPage.tsx
+++ b/src/pages/settings/Security/CloseAccountPage.tsx
@@ -71,7 +71,7 @@ function CloseAccountPage() {
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
             testID={CloseAccountPage.displayName}
         >
             <HeaderWithBackButton
diff --git a/src/pages/settings/Wallet/VerifyAccountPage.tsx b/src/pages/settings/Wallet/VerifyAccountPage.tsx
index a12dc03f596a..00da9e948b88 100644
--- a/src/pages/settings/Wallet/VerifyAccountPage.tsx
+++ b/src/pages/settings/Wallet/VerifyAccountPage.tsx
@@ -73,7 +73,7 @@ function VerifyAccountPage({route}: VerifyAccountPageProps) {
     if (isUserValidated || !isValidateCodeActionModalVisible) {
         return (
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                includeSafeAreaPaddingBottom
                 testID={VerifyAccountPage.displayName}
             >
                 <HeaderWithBackButton
diff --git a/src/pages/tasks/NewTaskDescriptionPage.tsx b/src/pages/tasks/NewTaskDescriptionPage.tsx
index fb7e7b9f4617..4b2c08c95fb1 100644
--- a/src/pages/tasks/NewTaskDescriptionPage.tsx
+++ b/src/pages/tasks/NewTaskDescriptionPage.tsx
@@ -57,7 +57,7 @@ function NewTaskDescriptionPage({task, route}: NewTaskDescriptionPageProps) {
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
             shouldEnableMaxHeight
             testID={NewTaskDescriptionPage.displayName}
         >
diff --git a/src/pages/tasks/NewTaskDetailsPage.tsx b/src/pages/tasks/NewTaskDetailsPage.tsx
index 245a3a9893b7..ffb199c6108d 100644
--- a/src/pages/tasks/NewTaskDetailsPage.tsx
+++ b/src/pages/tasks/NewTaskDetailsPage.tsx
@@ -91,7 +91,7 @@ function NewTaskDetailsPage({task, route}: NewTaskDetailsPageProps) {
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
             shouldEnableMaxHeight
             testID={NewTaskDetailsPage.displayName}
         >
diff --git a/src/pages/tasks/NewTaskTitlePage.tsx b/src/pages/tasks/NewTaskTitlePage.tsx
index 55e23f258762..88a44aca8501 100644
--- a/src/pages/tasks/NewTaskTitlePage.tsx
+++ b/src/pages/tasks/NewTaskTitlePage.tsx
@@ -58,7 +58,7 @@ function NewTaskTitlePage({task, route}: NewTaskTitlePageProps) {
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
             shouldEnableMaxHeight
             testID={NewTaskTitlePage.displayName}
         >
diff --git a/src/pages/tasks/TaskDescriptionPage.tsx b/src/pages/tasks/TaskDescriptionPage.tsx
index 97c5cf7f7e16..86a7cbc54a23 100644
--- a/src/pages/tasks/TaskDescriptionPage.tsx
+++ b/src/pages/tasks/TaskDescriptionPage.tsx
@@ -94,7 +94,7 @@ function TaskDescriptionPage({report, currentUserPersonalDetails}: TaskDescripti
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
             shouldEnableMaxHeight
             testID={TaskDescriptionPage.displayName}
         >
diff --git a/src/pages/tasks/TaskTitlePage.tsx b/src/pages/tasks/TaskTitlePage.tsx
index e6c429a44674..d767b5b9da3c 100644
--- a/src/pages/tasks/TaskTitlePage.tsx
+++ b/src/pages/tasks/TaskTitlePage.tsx
@@ -75,7 +75,7 @@ function TaskTitlePage({report, currentUserPersonalDetails}: TaskTitlePageProps)
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
             onEntryTransitionEnd={() => {
                 inputRef?.current?.focus();
             }}
diff --git a/src/pages/workspace/WorkspaceInvitePage.tsx b/src/pages/workspace/WorkspaceInvitePage.tsx
index bf4df56ea528..76dd8e52a78e 100644
--- a/src/pages/workspace/WorkspaceInvitePage.tsx
+++ b/src/pages/workspace/WorkspaceInvitePage.tsx
@@ -301,7 +301,7 @@ function WorkspaceInvitePage({route, policy}: WorkspaceInvitePageProps) {
                 shouldEnableMaxHeight
                 shouldUseCachedViewportHeight
                 testID={WorkspaceInvitePage.displayName}
-                includeSafeAreaPaddingBottom={false}
+                includeSafeAreaPaddingBottom
                 onEntryTransitionEnd={() => setDidScreenTransitionEnd(true)}
             >
                 <HeaderWithBackButton
diff --git a/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx b/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
index 61bd90636e18..aa540f63599e 100644
--- a/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
+++ b/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
@@ -13,6 +13,7 @@ import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import usePermissions from '@hooks/usePermissions';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useStyledSafeAreaInsets from '@hooks/useStyledSafeAreaInsets';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as CardUtils from '@libs/CardUtils';
 import * as ErrorUtils from '@libs/ErrorUtils';
@@ -63,6 +64,7 @@ type SectionObject = {
 function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPageProps) {
     const styles = useThemeStyles();
     const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const {safeAreaPaddingBottomStyle} = useStyledSafeAreaInsets();
     const {translate} = useLocalize();
     const {canUsePerDiem} = usePermissions();
     const hasAccountingConnection = !isEmptyObject(policy?.connections);
@@ -422,7 +424,7 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
                     shouldShowBackButton={shouldUseNarrowLayout}
                 />
 
-                <ScrollView contentContainerStyle={styles.pb2}>
+                <ScrollView contentContainerStyle={safeAreaPaddingBottomStyle}>
                     <Text style={[styles.ph5, styles.mb4, styles.mt3, styles.textSupporting, shouldUseNarrowLayout ? styles.workspaceSectionMobile : styles.workspaceSection]}>
                         {translate('workspace.moreFeatures.subtitle')}
                     </Text>
diff --git a/src/pages/workspace/WorkspaceProfileDescriptionPage.tsx b/src/pages/workspace/WorkspaceProfileDescriptionPage.tsx
index 09c4dce72e51..a72daf2e907e 100644
--- a/src/pages/workspace/WorkspaceProfileDescriptionPage.tsx
+++ b/src/pages/workspace/WorkspaceProfileDescriptionPage.tsx
@@ -76,7 +76,7 @@ function WorkspaceProfileDescriptionPage({policy}: Props) {
             accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                includeSafeAreaPaddingBottom
                 shouldEnableMaxHeight
                 testID={WorkspaceProfileDescriptionPage.displayName}
             >
diff --git a/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx b/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
index 77f1ca49e23b..29474431cd72 100644
--- a/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
+++ b/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
@@ -51,7 +51,7 @@ function EnterSageIntacctCredentialsPage({route}: SageIntacctPrerequisitesPagePr
     );
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
             shouldEnableMaxHeight
             testID={EnterSageIntacctCredentialsPage.displayName}
         >
diff --git a/src/pages/workspace/categories/CategoryDescriptionHintPage.tsx b/src/pages/workspace/categories/CategoryDescriptionHintPage.tsx
index 26bd66833929..e33719596fed 100644
--- a/src/pages/workspace/categories/CategoryDescriptionHintPage.tsx
+++ b/src/pages/workspace/categories/CategoryDescriptionHintPage.tsx
@@ -43,7 +43,7 @@ function CategoryDescriptionHintPage({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                includeSafeAreaPaddingBottom
                 style={[styles.defaultModalContainer]}
                 testID={CategoryDescriptionHintPage.displayName}
                 shouldEnableMaxHeight
diff --git a/src/pages/workspace/categories/CategoryFlagAmountsOverPage.tsx b/src/pages/workspace/categories/CategoryFlagAmountsOverPage.tsx
index dbd491197d37..dd80757749dd 100644
--- a/src/pages/workspace/categories/CategoryFlagAmountsOverPage.tsx
+++ b/src/pages/workspace/categories/CategoryFlagAmountsOverPage.tsx
@@ -54,7 +54,7 @@ function CategoryFlagAmountsOverPage({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                includeSafeAreaPaddingBottom
                 style={[styles.defaultModalContainer]}
                 testID={CategoryFlagAmountsOverPage.displayName}
                 shouldEnableMaxHeight
diff --git a/src/pages/workspace/categories/CategoryGLCodePage.tsx b/src/pages/workspace/categories/CategoryGLCodePage.tsx
index daafc59f5caa..86dc767ef6d0 100644
--- a/src/pages/workspace/categories/CategoryGLCodePage.tsx
+++ b/src/pages/workspace/categories/CategoryGLCodePage.tsx
@@ -56,7 +56,7 @@ function CategoryGLCodePage({route}: EditCategoryPageProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                includeSafeAreaPaddingBottom
                 style={[styles.defaultModalContainer]}
                 testID={CategoryGLCodePage.displayName}
                 shouldEnableMaxHeight
diff --git a/src/pages/workspace/categories/CategoryPayrollCodePage.tsx b/src/pages/workspace/categories/CategoryPayrollCodePage.tsx
index 79f99e26f672..b6e14a3968f9 100644
--- a/src/pages/workspace/categories/CategoryPayrollCodePage.tsx
+++ b/src/pages/workspace/categories/CategoryPayrollCodePage.tsx
@@ -56,7 +56,7 @@ function CategoryPayrollCodePage({route}: EditCategoryPageProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                includeSafeAreaPaddingBottom
                 style={[styles.defaultModalContainer]}
                 testID={CategoryPayrollCodePage.displayName}
                 shouldEnableMaxHeight
diff --git a/src/pages/workspace/categories/CreateCategoryPage.tsx b/src/pages/workspace/categories/CreateCategoryPage.tsx
index a7fa3f3bac5c..f17804a5ddff 100644
--- a/src/pages/workspace/categories/CreateCategoryPage.tsx
+++ b/src/pages/workspace/categories/CreateCategoryPage.tsx
@@ -40,7 +40,7 @@ function CreateCategoryPage({route}: CreateCategoryPageProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                includeSafeAreaPaddingBottom
                 style={[styles.defaultModalContainer]}
                 testID={CreateCategoryPage.displayName}
                 shouldEnableMaxHeight
diff --git a/src/pages/workspace/categories/EditCategoryPage.tsx b/src/pages/workspace/categories/EditCategoryPage.tsx
index dbd5a3664f0d..9576f307b5c6 100644
--- a/src/pages/workspace/categories/EditCategoryPage.tsx
+++ b/src/pages/workspace/categories/EditCategoryPage.tsx
@@ -65,7 +65,7 @@ function EditCategoryPage({route}: EditCategoryPageProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                includeSafeAreaPaddingBottom
                 style={[styles.defaultModalContainer]}
                 testID={EditCategoryPage.displayName}
                 shouldEnableMaxHeight
diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsFeedNamePage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsFeedNamePage.tsx
index 1089bf5475a3..4c2d9c3657a0 100644
--- a/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsFeedNamePage.tsx
+++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsFeedNamePage.tsx
@@ -77,7 +77,7 @@ function WorkspaceCompanyCardsSettingsFeedNamePage({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_COMPANY_CARDS_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                includeSafeAreaPaddingBottom
                 shouldEnableMaxHeight
                 testID={WorkspaceCompanyCardsSettingsFeedNamePage.displayName}
                 style={styles.defaultModalContainer}
diff --git a/src/pages/workspace/companyCards/addNew/CardNameStep.tsx b/src/pages/workspace/companyCards/addNew/CardNameStep.tsx
index 2a0e4fe62ba4..b7f1c438ad6f 100644
--- a/src/pages/workspace/companyCards/addNew/CardNameStep.tsx
+++ b/src/pages/workspace/companyCards/addNew/CardNameStep.tsx
@@ -49,7 +49,7 @@ function CardNameStep() {
     return (
         <ScreenWrapper
             testID={CardNameStep.displayName}
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
             shouldEnablePickerAvoiding={false}
             shouldEnableMaxHeight
         >
diff --git a/src/pages/workspace/companyCards/addNew/DetailsStep.tsx b/src/pages/workspace/companyCards/addNew/DetailsStep.tsx
index 46281ca671a8..368a1ef2a6a7 100644
--- a/src/pages/workspace/companyCards/addNew/DetailsStep.tsx
+++ b/src/pages/workspace/companyCards/addNew/DetailsStep.tsx
@@ -163,7 +163,7 @@ function DetailsStep({policyID}: DetailsStepProps) {
     return (
         <ScreenWrapper
             testID={DetailsStep.displayName}
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
             shouldEnablePickerAvoiding={false}
             shouldEnableMaxHeight
         >
diff --git a/src/pages/workspace/companyCards/assignCard/CardNameStep.tsx b/src/pages/workspace/companyCards/assignCard/CardNameStep.tsx
index 95bfadd23957..d96d15761ed6 100644
--- a/src/pages/workspace/companyCards/assignCard/CardNameStep.tsx
+++ b/src/pages/workspace/companyCards/assignCard/CardNameStep.tsx
@@ -60,7 +60,7 @@ function CardNameStep({policyID}: CardNameStepProps) {
             <ScreenWrapper
                 testID={CardNameStep.displayName}
                 shouldEnablePickerAvoiding={false}
-                includeSafeAreaPaddingBottom={false}
+                includeSafeAreaPaddingBottom
             >
                 <HeaderWithBackButton
                     title={translate('workspace.moreFeatures.companyCards.cardName')}
diff --git a/src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx b/src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx
index 6520d8ac0fc7..c583fa8e2d70 100644
--- a/src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx
+++ b/src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx
@@ -8,7 +8,6 @@ import ScrollView from '@components/ScrollView';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
-import useSafePaddingBottomStyle from '@hooks/useSafePaddingBottomStyle';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as CardUtils from '@libs/CardUtils';
 import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
@@ -34,7 +33,6 @@ function ConfirmationStep({policyID, backTo}: ConfirmationStepProps) {
     const {isOffline} = useNetwork();
 
     const [assignCard] = useOnyx(ONYXKEYS.ASSIGN_CARD);
-    const safePaddingBottomStyle = useSafePaddingBottomStyle();
 
     const data = assignCard?.data;
     const cardholderName = PersonalDetailsUtils.getPersonalDetailByEmail(data?.email ?? '')?.displayName ?? '';
@@ -97,7 +95,7 @@ function ConfirmationStep({policyID, backTo}: ConfirmationStepProps) {
                         isDisabled={isOffline}
                         success
                         large
-                        style={[styles.w100, safePaddingBottomStyle]}
+                        style={styles.w100}
                         onPress={submit}
                         text={translate('workspace.companyCards.assignCard')}
                     />
diff --git a/src/pages/workspace/companyCards/assignCard/TransactionStartDateStep.tsx b/src/pages/workspace/companyCards/assignCard/TransactionStartDateStep.tsx
index cd630d83d36c..fc0feb07848f 100644
--- a/src/pages/workspace/companyCards/assignCard/TransactionStartDateStep.tsx
+++ b/src/pages/workspace/companyCards/assignCard/TransactionStartDateStep.tsx
@@ -9,7 +9,6 @@ import SelectionList from '@components/SelectionList';
 import RadioListItem from '@components/SelectionList/RadioListItem';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
-import useSafePaddingBottomStyle from '@hooks/useSafePaddingBottomStyle';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
 import * as CompanyCards from '@userActions/CompanyCards';
@@ -20,7 +19,6 @@ import TransactionStartDateSelectorModal from './TransactionStartDateSelectorMod
 function TransactionStartDateStep() {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
-    const safePaddingBottomStyle = useSafePaddingBottomStyle();
 
     const [assignCard] = useOnyx(ONYXKEYS.ASSIGN_CARD);
     const isEditing = assignCard?.isEditing;
@@ -129,7 +127,7 @@ function TransactionStartDateStep() {
                 pressOnEnter
                 text={translate(isEditing ? 'common.confirm' : 'common.next')}
                 onPress={submit}
-                style={[styles.m5, safePaddingBottomStyle]}
+                style={styles.m5}
             />
         </InteractiveStepWrapper>
     );
diff --git a/src/pages/workspace/distanceRates/CreateDistanceRatePage.tsx b/src/pages/workspace/distanceRates/CreateDistanceRatePage.tsx
index df64bb609e9b..af1b8aaaa501 100644
--- a/src/pages/workspace/distanceRates/CreateDistanceRatePage.tsx
+++ b/src/pages/workspace/distanceRates/CreateDistanceRatePage.tsx
@@ -65,7 +65,7 @@ function CreateDistanceRatePage({route}: CreateDistanceRatePageProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_DISTANCE_RATES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                includeSafeAreaPaddingBottom
                 style={[styles.defaultModalContainer]}
                 testID={CreateDistanceRatePage.displayName}
                 shouldEnableMaxHeight
diff --git a/src/pages/workspace/distanceRates/PolicyDistanceRateEditPage.tsx b/src/pages/workspace/distanceRates/PolicyDistanceRateEditPage.tsx
index b9f269ffc853..eaac88431088 100644
--- a/src/pages/workspace/distanceRates/PolicyDistanceRateEditPage.tsx
+++ b/src/pages/workspace/distanceRates/PolicyDistanceRateEditPage.tsx
@@ -67,7 +67,7 @@ function PolicyDistanceRateEditPage({route}: PolicyDistanceRateEditPageProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_DISTANCE_RATES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                includeSafeAreaPaddingBottom
                 style={[styles.defaultModalContainer]}
                 testID={PolicyDistanceRateEditPage.displayName}
                 shouldEnableMaxHeight
diff --git a/src/pages/workspace/distanceRates/PolicyDistanceRateTaxReclaimableEditPage.tsx b/src/pages/workspace/distanceRates/PolicyDistanceRateTaxReclaimableEditPage.tsx
index fe52b4220336..bb45e0273a5e 100644
--- a/src/pages/workspace/distanceRates/PolicyDistanceRateTaxReclaimableEditPage.tsx
+++ b/src/pages/workspace/distanceRates/PolicyDistanceRateTaxReclaimableEditPage.tsx
@@ -67,7 +67,7 @@ function PolicyDistanceRateTaxReclaimableEditPage({route, policy}: PolicyDistanc
             featureName={CONST.POLICY.MORE_FEATURES.ARE_DISTANCE_RATES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                includeSafeAreaPaddingBottom
                 style={[styles.defaultModalContainer]}
                 testID={PolicyDistanceRateTaxReclaimableEditPage.displayName}
                 shouldEnableMaxHeight
diff --git a/src/pages/workspace/reportFields/CreateReportFieldsPage.tsx b/src/pages/workspace/reportFields/CreateReportFieldsPage.tsx
index 357f3291cfcc..8266405a88e5 100644
--- a/src/pages/workspace/reportFields/CreateReportFieldsPage.tsx
+++ b/src/pages/workspace/reportFields/CreateReportFieldsPage.tsx
@@ -102,7 +102,7 @@ function CreateReportFieldsPage({
             shouldBeBlocked={PolicyUtils.hasAccountingConnections(policy)}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                includeSafeAreaPaddingBottom
                 style={styles.defaultModalContainer}
                 testID={CreateReportFieldsPage.displayName}
                 shouldEnableMaxHeight
diff --git a/src/pages/workspace/reportFields/ReportFieldsAddListValuePage.tsx b/src/pages/workspace/reportFields/ReportFieldsAddListValuePage.tsx
index dd483b466d63..ed2f834b6a19 100644
--- a/src/pages/workspace/reportFields/ReportFieldsAddListValuePage.tsx
+++ b/src/pages/workspace/reportFields/ReportFieldsAddListValuePage.tsx
@@ -76,7 +76,7 @@ function ReportFieldsAddListValuePage({
             shouldBeBlocked={PolicyUtils.hasAccountingConnections(policy)}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                includeSafeAreaPaddingBottom
                 style={styles.defaultModalContainer}
                 testID={ReportFieldsAddListValuePage.displayName}
                 shouldEnableMaxHeight
diff --git a/src/pages/workspace/reportFields/ReportFieldsEditValuePage.tsx b/src/pages/workspace/reportFields/ReportFieldsEditValuePage.tsx
index 5ce2461bab16..214ac043622b 100644
--- a/src/pages/workspace/reportFields/ReportFieldsEditValuePage.tsx
+++ b/src/pages/workspace/reportFields/ReportFieldsEditValuePage.tsx
@@ -70,7 +70,7 @@ function ReportFieldsEditValuePage({
             shouldBeBlocked={PolicyUtils.hasAccountingConnections(policy)}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                includeSafeAreaPaddingBottom
                 style={styles.defaultModalContainer}
                 testID={ReportFieldsEditValuePage.displayName}
                 shouldEnableMaxHeight
diff --git a/src/pages/workspace/reportFields/ReportFieldsInitialValuePage.tsx b/src/pages/workspace/reportFields/ReportFieldsInitialValuePage.tsx
index 13b1afb7e3d7..14638116cb49 100644
--- a/src/pages/workspace/reportFields/ReportFieldsInitialValuePage.tsx
+++ b/src/pages/workspace/reportFields/ReportFieldsInitialValuePage.tsx
@@ -103,7 +103,7 @@ function ReportFieldsInitialValuePage({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_REPORT_FIELDS_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                includeSafeAreaPaddingBottom
                 style={styles.defaultModalContainer}
                 testID={ReportFieldsInitialValuePage.displayName}
                 shouldEnableMaxHeight
diff --git a/src/pages/workspace/rules/RulesAutoApproveReportsUnderPage.tsx b/src/pages/workspace/rules/RulesAutoApproveReportsUnderPage.tsx
index c628a3ad135d..b256cf92c1d4 100644
--- a/src/pages/workspace/rules/RulesAutoApproveReportsUnderPage.tsx
+++ b/src/pages/workspace/rules/RulesAutoApproveReportsUnderPage.tsx
@@ -43,7 +43,7 @@ function RulesAutoApproveReportsUnderPage({route}: RulesAutoApproveReportsUnderP
             shouldBeBlocked={!policy?.shouldShowAutoApprovalOptions || workflowApprovalsUnavailable}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                includeSafeAreaPaddingBottom
                 shouldEnableMaxHeight
                 testID={RulesAutoApproveReportsUnderPage.displayName}
             >
diff --git a/src/pages/workspace/rules/RulesAutoPayReportsUnderPage.tsx b/src/pages/workspace/rules/RulesAutoPayReportsUnderPage.tsx
index 8a63f2e303ec..053cf296b7d5 100644
--- a/src/pages/workspace/rules/RulesAutoPayReportsUnderPage.tsx
+++ b/src/pages/workspace/rules/RulesAutoPayReportsUnderPage.tsx
@@ -52,7 +52,7 @@ function RulesAutoPayReportsUnderPage({route}: RulesAutoPayReportsUnderPageProps
             shouldBeBlocked={!policy?.shouldShowAutoReimbursementLimitOption || autoPayApprovedReportsUnavailable}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                includeSafeAreaPaddingBottom
                 shouldEnableMaxHeight
                 testID={RulesAutoPayReportsUnderPage.displayName}
             >
diff --git a/src/pages/workspace/rules/RulesCustomNamePage.tsx b/src/pages/workspace/rules/RulesCustomNamePage.tsx
index 394960ef80fb..c58b1ea2e96c 100644
--- a/src/pages/workspace/rules/RulesCustomNamePage.tsx
+++ b/src/pages/workspace/rules/RulesCustomNamePage.tsx
@@ -58,7 +58,7 @@ function RulesCustomNamePage({route}: RulesCustomNamePageProps) {
             shouldBeBlocked={!policy?.shouldShowCustomReportTitleOption}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                includeSafeAreaPaddingBottom
                 shouldEnableMaxHeight
                 testID={RulesCustomNamePage.displayName}
             >
diff --git a/src/pages/workspace/rules/RulesMaxExpenseAgePage.tsx b/src/pages/workspace/rules/RulesMaxExpenseAgePage.tsx
index 345bf96d94a6..06f97a2f554d 100644
--- a/src/pages/workspace/rules/RulesMaxExpenseAgePage.tsx
+++ b/src/pages/workspace/rules/RulesMaxExpenseAgePage.tsx
@@ -51,7 +51,7 @@ function RulesMaxExpenseAgePage({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_RULES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                includeSafeAreaPaddingBottom
                 shouldEnableMaxHeight
                 testID={RulesMaxExpenseAgePage.displayName}
             >
diff --git a/src/pages/workspace/rules/RulesMaxExpenseAmountPage.tsx b/src/pages/workspace/rules/RulesMaxExpenseAmountPage.tsx
index 3d59833db9d8..e2eb6ccc5791 100644
--- a/src/pages/workspace/rules/RulesMaxExpenseAmountPage.tsx
+++ b/src/pages/workspace/rules/RulesMaxExpenseAmountPage.tsx
@@ -46,7 +46,7 @@ function RulesMaxExpenseAmountPage({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_RULES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                includeSafeAreaPaddingBottom
                 shouldEnableMaxHeight
                 testID={RulesMaxExpenseAmountPage.displayName}
             >
diff --git a/src/pages/workspace/rules/RulesRandomReportAuditPage.tsx b/src/pages/workspace/rules/RulesRandomReportAuditPage.tsx
index 19e9d79ba8e6..409b07c8582a 100644
--- a/src/pages/workspace/rules/RulesRandomReportAuditPage.tsx
+++ b/src/pages/workspace/rules/RulesRandomReportAuditPage.tsx
@@ -41,7 +41,7 @@ function RulesRandomReportAuditPage({route}: RulesRandomReportAuditPageProps) {
             shouldBeBlocked={!policy?.shouldShowAutoApprovalOptions || workflowApprovalsUnavailable}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                includeSafeAreaPaddingBottom
                 shouldEnableMaxHeight
                 testID={RulesRandomReportAuditPage.displayName}
             >
diff --git a/src/pages/workspace/rules/RulesReceiptRequiredAmountPage.tsx b/src/pages/workspace/rules/RulesReceiptRequiredAmountPage.tsx
index 27df41c4c371..646722e44d9d 100644
--- a/src/pages/workspace/rules/RulesReceiptRequiredAmountPage.tsx
+++ b/src/pages/workspace/rules/RulesReceiptRequiredAmountPage.tsx
@@ -46,7 +46,7 @@ function RulesReceiptRequiredAmountPage({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_RULES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                includeSafeAreaPaddingBottom
                 shouldEnableMaxHeight
                 testID={RulesReceiptRequiredAmountPage.displayName}
             >
diff --git a/src/pages/workspace/tags/EditTagPage.tsx b/src/pages/workspace/tags/EditTagPage.tsx
index 9ee8f9d35d00..dbf60f245243 100644
--- a/src/pages/workspace/tags/EditTagPage.tsx
+++ b/src/pages/workspace/tags/EditTagPage.tsx
@@ -77,7 +77,7 @@ function EditTagPage({route}: EditTagPageProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_TAGS_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                includeSafeAreaPaddingBottom
                 style={[styles.defaultModalContainer]}
                 testID={EditTagPage.displayName}
                 shouldEnableMaxHeight
diff --git a/src/pages/workspace/tags/TagGLCodePage.tsx b/src/pages/workspace/tags/TagGLCodePage.tsx
index ad6841b7fe18..f6227619b712 100644
--- a/src/pages/workspace/tags/TagGLCodePage.tsx
+++ b/src/pages/workspace/tags/TagGLCodePage.tsx
@@ -65,7 +65,7 @@ function TagGLCodePage({route}: EditTagGLCodePageProps) {
             shouldBeBlocked={PolicyUtils.hasAccountingConnections(policy)}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                includeSafeAreaPaddingBottom
                 style={[styles.defaultModalContainer]}
                 testID={TagGLCodePage.displayName}
                 shouldEnableMaxHeight
diff --git a/src/pages/workspace/tags/WorkspaceCreateTagPage.tsx b/src/pages/workspace/tags/WorkspaceCreateTagPage.tsx
index 5614e3a501b4..57a4286561e9 100644
--- a/src/pages/workspace/tags/WorkspaceCreateTagPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceCreateTagPage.tsx
@@ -72,7 +72,7 @@ function CreateTagPage({route}: CreateTagPageProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_TAGS_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                includeSafeAreaPaddingBottom
                 style={[styles.defaultModalContainer]}
                 testID={CreateTagPage.displayName}
                 shouldEnableMaxHeight
diff --git a/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx b/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx
index 6911bf7a13f6..3b94a5f1de86 100644
--- a/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx
@@ -69,7 +69,7 @@ function WorkspaceEditTagsPage({route}: WorkspaceEditTagsPageProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_TAGS_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                includeSafeAreaPaddingBottom
                 shouldEnableMaxHeight
                 testID={WorkspaceEditTagsPage.displayName}
             >
diff --git a/src/pages/workspace/taxes/NamePage.tsx b/src/pages/workspace/taxes/NamePage.tsx
index cc3a22fa4ef9..dd18229102ef 100644
--- a/src/pages/workspace/taxes/NamePage.tsx
+++ b/src/pages/workspace/taxes/NamePage.tsx
@@ -75,7 +75,7 @@ function NamePage({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_TAXES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                includeSafeAreaPaddingBottom
                 shouldEnableMaxHeight
                 testID={NamePage.displayName}
             >
diff --git a/src/pages/workspace/taxes/ValuePage.tsx b/src/pages/workspace/taxes/ValuePage.tsx
index 1da36229a7be..8369e9c35018 100644
--- a/src/pages/workspace/taxes/ValuePage.tsx
+++ b/src/pages/workspace/taxes/ValuePage.tsx
@@ -63,7 +63,7 @@ function ValuePage({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_TAXES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                includeSafeAreaPaddingBottom
                 shouldEnableMaxHeight
                 testID={ValuePage.displayName}
             >
diff --git a/src/pages/workspace/taxes/WorkspaceTaxCodePage.tsx b/src/pages/workspace/taxes/WorkspaceTaxCodePage.tsx
index 05536a4257e4..04775ed67c16 100644
--- a/src/pages/workspace/taxes/WorkspaceTaxCodePage.tsx
+++ b/src/pages/workspace/taxes/WorkspaceTaxCodePage.tsx
@@ -68,7 +68,7 @@ function WorkspaceTaxCodePage({route}: WorkspaceTaxCodePageProps) {
             featureName={CONST.POLICY.MORE_FEATURES.ARE_TAXES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                includeSafeAreaPaddingBottom
                 shouldEnableMaxHeight
                 testID={WorkspaceTaxCodePage.displayName}
             >
diff --git a/src/pages/workspace/taxes/WorkspaceTaxesSettingsCustomTaxName.tsx b/src/pages/workspace/taxes/WorkspaceTaxesSettingsCustomTaxName.tsx
index 88edc1f25797..b7927692f4f3 100644
--- a/src/pages/workspace/taxes/WorkspaceTaxesSettingsCustomTaxName.tsx
+++ b/src/pages/workspace/taxes/WorkspaceTaxesSettingsCustomTaxName.tsx
@@ -63,7 +63,7 @@ function WorkspaceTaxesSettingsCustomTaxName({
             featureName={CONST.POLICY.MORE_FEATURES.ARE_TAXES_ENABLED}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                includeSafeAreaPaddingBottom
                 shouldEnableMaxHeight
                 testID={WorkspaceTaxesSettingsCustomTaxName.displayName}
                 style={styles.defaultModalContainer}