diff --git a/library/ui-styles/src/main/res/values/styles_bottom_sheet.xml b/library/ui-styles/src/main/res/values/styles_bottom_sheet.xml
index 7b704a6331..f6c30040d9 100644
--- a/library/ui-styles/src/main/res/values/styles_bottom_sheet.xml
+++ b/library/ui-styles/src/main/res/values/styles_bottom_sheet.xml
@@ -14,7 +14,6 @@
         <!-- Default color for text View -->
         <item name="android:textColorTertiary">@color/element_content_primary_light</item>
         <item name="android:textColorLink">@color/element_link_light</item>
-        <item name="bottomSheetStyle">@style/BottomSheetStyle</item>
     </style>
 
     <style name="Theme.Vector.BottomSheetDialog.Dark" parent="Theme.MaterialComponents.BottomSheetDialog">
@@ -29,7 +28,6 @@
         <!-- Default color for text View -->
         <item name="android:textColorTertiary">@color/element_content_primary_dark</item>
         <item name="android:textColorLink">@color/element_link_dark</item>
-        <item name="bottomSheetStyle">@style/BottomSheetStyle</item>
     </style>
 
     <style name="Theme.Vector.BottomSheetDialog.Black" parent="Theme.Vector.BottomSheetDialog.Dark">
@@ -37,15 +35,6 @@
     </style>
 
     <!-- BottomSheet style -->
-    <style name="BottomSheetStyle" parent="Widget.MaterialComponents.BottomSheet.Modal">
-        <item name="shapeAppearance">@style/BottomSheetShapeAppearance</item>
-    </style>
-
-    <style name="BottomSheetShapeAppearance" parent="">
-        <item name="cornerFamily">rounded</item>
-        <item name="cornerSize">20dp</item>
-    </style>
-
     <style name="BottomSheetItemTextMain">
         <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:layout_width">0dp</item>
diff --git a/vector/src/main/res/layout/bottom_sheet_attachment_type_selector.xml b/vector/src/main/res/layout/bottom_sheet_attachment_type_selector.xml
index 559673716e..3aec5b5c20 100644
--- a/vector/src/main/res/layout/bottom_sheet_attachment_type_selector.xml
+++ b/vector/src/main/res/layout/bottom_sheet_attachment_type_selector.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?colorSurface"
     android:orientation="vertical">
 
     <androidx.core.widget.NestedScrollView
diff --git a/vector/src/main/res/layout/view_bottom_sheet_action_button.xml b/vector/src/main/res/layout/view_bottom_sheet_action_button.xml
index 05a99fe8ae..f8521c7eba 100644
--- a/vector/src/main/res/layout/view_bottom_sheet_action_button.xml
+++ b/vector/src/main/res/layout/view_bottom_sheet_action_button.xml
@@ -10,6 +10,7 @@
         android:id="@+id/bottomSheetActionClickableZone"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="?colorSurface"
         android:clickable="true"
         android:focusable="true"
         android:foreground="?attr/selectableItemBackground"
@@ -92,4 +93,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</merge>
+</merge>
\ No newline at end of file