diff --git a/vector/src/main/res/values/styles_bottom_sheet.xml b/vector/src/main/res/values/styles_bottom_sheet.xml
new file mode 100644
index 0000000000..f244a80969
--- /dev/null
+++ b/vector/src/main/res/values/styles_bottom_sheet.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- BottomSheet theming -->
+    <style name="Vector.BottomSheet.Light" parent="Theme.MaterialComponents.Light.BottomSheetDialog">
+        <item name="colorPrimary">@color/element_accent_light</item>
+        <item name="colorSecondary">@color/palette_element_green</item>
+        <item name="colorSurface">@color/element_background_light</item>
+        <item name="colorOnSurface">@color/element_content_primary_light</item>
+        <item name="colorError">@color/element_alert_light</item>
+        <!-- Default color for text View -->
+        <item name="android:textColorTertiary">@color/element_content_primary_light</item>
+        <item name="android:textColorLink">@color/element_link_light</item>
+    </style>
+
+    <style name="Vector.BottomSheet.Dark" parent="Theme.MaterialComponents.BottomSheetDialog">
+        <item name="colorPrimary">@color/element_accent_dark</item>
+        <item name="colorSecondary">@color/palette_element_green</item>
+        <item name="colorSurface">@color/element_background_dark</item>
+        <item name="colorOnSurface">@color/element_content_primary_dark</item>
+        <item name="colorError">@color/element_alert_dark</item>
+        <!-- Default color for text View -->
+        <item name="android:textColorTertiary">@color/element_content_primary_dark</item>
+        <item name="android:textColorLink">@color/element_link_dark</item>
+    </style>
+
+    <style name="Vector.BottomSheet.Black" parent="Vector.BottomSheet.Dark">
+        <item name="colorSurface">@color/element_background_black</item>
+    </style>
+
+    <!-- BottomSheet style -->
+    <style name="BottomSheetItemTextMain">
+        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:ellipsize">end</item>
+        <item name="android:lines">1</item>
+        <item name="android:textColor">?vctr_content_primary</item>
+        <item name="android:textSize">16sp</item>
+    </style>
+
+    <style name="BottomSheetItemTextSecondary">
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:ellipsize">end</item>
+        <item name="android:maxLines">2</item>
+        <item name="android:textColor">?vctr_content_secondary</item>
+        <item name="android:textSize">14sp</item>
+    </style>
+
+    <style name="BottomSheetItemTime">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:lines">1</item>
+        <item name="android:textColor">?vctr_content_secondary</item>
+        <item name="android:textSize">12sp</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/styles_riot.xml b/vector/src/main/res/values/styles_riot.xml
index adcecb656a..0dadef5645 100644
--- a/vector/src/main/res/values/styles_riot.xml
+++ b/vector/src/main/res/values/styles_riot.xml
@@ -60,33 +60,6 @@
         <item name="iconifiedByDefault">false</item>
     </style>
 
-    <!-- BottomSheet theming -->
-    <style name="Vector.BottomSheet.Light" parent="Theme.MaterialComponents.Light.BottomSheetDialog">
-        <item name="colorPrimary">@color/element_accent_light</item>
-        <item name="colorSecondary">@color/palette_element_green</item>
-        <item name="colorSurface">@color/element_background_light</item>
-        <item name="colorOnSurface">@color/element_content_primary_light</item>
-        <item name="colorError">@color/element_alert_light</item>
-        <!-- Default color for text View -->
-        <item name="android:textColorTertiary">@color/element_content_primary_light</item>
-        <item name="android:textColorLink">@color/element_link_light</item>
-    </style>
-
-    <style name="Vector.BottomSheet.Dark" parent="Theme.MaterialComponents.BottomSheetDialog">
-        <item name="colorPrimary">@color/element_accent_dark</item>
-        <item name="colorSecondary">@color/palette_element_green</item>
-        <item name="colorSurface">@color/element_background_dark</item>
-        <item name="colorOnSurface">@color/element_content_primary_dark</item>
-        <item name="colorError">@color/element_alert_dark</item>
-        <!-- Default color for text View -->
-        <item name="android:textColorTertiary">@color/element_content_primary_dark</item>
-        <item name="android:textColorLink">@color/element_link_dark</item>
-    </style>
-
-    <style name="Vector.BottomSheet.Black" parent="Vector.BottomSheet.Dark">
-        <item name="colorSurface">@color/element_background_black</item>
-    </style>
-
     <style name="TimelineContentStubBaseParams">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
@@ -110,37 +83,6 @@
         <item name="android:background">@drawable/vector_label_background</item>
     </style>
 
-    <style name="BottomSheetItemTextMain">
-        <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="android:layout_width">0dp</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:ellipsize">end</item>
-        <item name="android:lines">1</item>
-        <item name="android:textColor">?vctr_content_primary</item>
-        <item name="android:textSize">16sp</item>
-    </style>
-
-    <style name="BottomSheetItemTextSecondary">
-        <item name="android:fontFamily">sans-serif</item>
-        <item name="android:layout_width">0dp</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:ellipsize">end</item>
-        <item name="android:maxLines">2</item>
-        <item name="android:textColor">?vctr_content_secondary</item>
-        <item name="android:textSize">14sp</item>
-    </style>
-
-    <style name="BottomSheetItemTime">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:lines">1</item>
-        <item name="android:textColor">?vctr_content_secondary</item>
-        <item name="android:textSize">12sp</item>
-    </style>
-
-
     <style name="AttachmentTypeSelectorButton">
         <item name="android:layout_width">56dp</item>
         <item name="android:layout_height">56dp</item>