diff --git a/app/components/Views/OnboardingSheet/index.tsx b/app/components/Views/OnboardingSheet/index.tsx
index 4e259fee119..a321c0b7499 100644
--- a/app/components/Views/OnboardingSheet/index.tsx
+++ b/app/components/Views/OnboardingSheet/index.tsx
@@ -2,7 +2,6 @@ import React, { useCallback, useRef } from 'react';
 import { strings } from '../../../../locales/i18n';
 import { useTheme } from '../../../util/theme';
 import { AppThemeKey } from '../../../util/theme/models';
-import { useElevatedSurface } from '../../../util/theme/themeUtils';
 
 import GoogleIcon from 'images/google.svg';
 import AppleIcon from 'images/apple.svg';
@@ -58,7 +57,7 @@ const OnboardingSheet = () => {
     onPressContinueWithTelegram,
     createWallet = false,
   } = params ?? {};
-  const { colors } = useTheme();
+  const { colors, themeAppearance } = useTheme();
   const tw = useTailwind();
   const onPressCreateAction = () => {
     if (onPressCreate) {
@@ -110,16 +109,10 @@ const OnboardingSheet = () => {
     goTo(url, strings('onboarding.privacy_notice'));
   };
 
-  const { themeAppearance } = useTheme();
-  const surfaceClass = useElevatedSurface();
   const isDark = themeAppearance === AppThemeKey.dark;
 
   return (
-    <BottomSheet
-      goBack={navigation.goBack}
-      ref={sheetRef}
-      twClassName={surfaceClass}
-    >
+    <BottomSheet goBack={navigation.goBack} ref={sheetRef}>
       <Box
         flexDirection={BoxFlexDirection.Column}
         alignItems={BoxAlignItems.Center}
diff --git a/app/components/Views/SelectSRP/SelectSRPBottomSheet.tsx b/app/components/Views/SelectSRP/SelectSRPBottomSheet.tsx
index 33b707de9f1..f675730d081 100644
--- a/app/components/Views/SelectSRP/SelectSRPBottomSheet.tsx
+++ b/app/components/Views/SelectSRP/SelectSRPBottomSheet.tsx
@@ -11,22 +11,16 @@ import SelectSRP from './SelectSRP';
 import { strings } from '../../../../locales/i18n';
 import { SelectSRPBottomSheetTestIds } from './SelectSRPBottomSheet.testIds';
 import { goBackIfFocused } from './SelectSRPBottomSheet.utils';
-import { useElevatedSurface } from '../../../util/theme/themeUtils';
 
 export const SelectSRPBottomSheet = () => {
   const bottomSheetRef = useRef<BottomSheetRef>(null);
   const navigation = useNavigation();
-  const surfaceClass = useElevatedSurface();
   const goBack = useCallback(() => {
     goBackIfFocused(navigation);
   }, [navigation]);
 
   return (
-    <BottomSheet
-      ref={bottomSheetRef}
-      goBack={goBack}
-      twClassName={surfaceClass}
-    >
+    <BottomSheet ref={bottomSheetRef} goBack={goBack}>
       <BottomSheetHeader
         onBack={goBack}
         backButtonProps={{