diff --git a/vector/src/main/res/layout/activity_filtered_rooms.xml b/vector/src/main/res/layout/activity_filtered_rooms.xml
index 22561ddbcd..270de8f514 100644
--- a/vector/src/main/res/layout/activity_filtered_rooms.xml
+++ b/vector/src/main/res/layout/activity_filtered_rooms.xml
@@ -23,7 +23,6 @@
 
                 <androidx.appcompat.widget.SearchView
                     android:id="@+id/filteredRoomsSearchView"
-                    style="@style/VectorSearchView"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:queryHint="@string/room_filtering_filter_hint"
diff --git a/vector/src/main/res/layout/activity_incoming_share.xml b/vector/src/main/res/layout/activity_incoming_share.xml
index 58b5fec860..f0e0c0a485 100644
--- a/vector/src/main/res/layout/activity_incoming_share.xml
+++ b/vector/src/main/res/layout/activity_incoming_share.xml
@@ -23,7 +23,6 @@
 
                 <androidx.appcompat.widget.SearchView
                     android:id="@+id/incomingShareSearchView"
-                    style="@style/VectorSearchView"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:queryHint="@string/room_filtering_filter_hint"
diff --git a/vector/src/main/res/layout/activity_search.xml b/vector/src/main/res/layout/activity_search.xml
index bc6136ed4c..7c71217f64 100644
--- a/vector/src/main/res/layout/activity_search.xml
+++ b/vector/src/main/res/layout/activity_search.xml
@@ -23,7 +23,6 @@
 
                 <androidx.appcompat.widget.SearchView
                     android:id="@+id/searchView"
-                    style="@style/VectorSearchView"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:backgroundTint="@color/base_color"
diff --git a/vector/src/main/res/layout/fragment_incoming_share.xml b/vector/src/main/res/layout/fragment_incoming_share.xml
index d183f86af7..ee92e7c353 100644
--- a/vector/src/main/res/layout/fragment_incoming_share.xml
+++ b/vector/src/main/res/layout/fragment_incoming_share.xml
@@ -24,7 +24,6 @@
 
                 <androidx.appcompat.widget.SearchView
                     android:id="@+id/incomingShareSearchView"
-                    style="@style/VectorSearchView"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:queryHint="@string/room_filtering_filter_hint"
diff --git a/vector/src/main/res/layout/fragment_public_rooms.xml b/vector/src/main/res/layout/fragment_public_rooms.xml
index 51685c04b7..94a5b84d78 100644
--- a/vector/src/main/res/layout/fragment_public_rooms.xml
+++ b/vector/src/main/res/layout/fragment_public_rooms.xml
@@ -28,7 +28,6 @@
 
             <androidx.appcompat.widget.SearchView
                 android:id="@+id/publicRoomsFilter"
-                style="@style/VectorSearchView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 app:queryHint="@string/room_directory_search_hint" />
diff --git a/vector/src/main/res/layout/fragment_recyclerview_with_search.xml b/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
index 2e5d9841c5..e6be096fb5 100644
--- a/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
+++ b/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
@@ -67,7 +67,6 @@
 
         <androidx.appcompat.widget.SearchView
             android:id="@+id/memberNameFilter"
-            style="@style/VectorSearchView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
diff --git a/vector/src/main/res/layout/fragment_room_setting_generic.xml b/vector/src/main/res/layout/fragment_room_setting_generic.xml
index 432fc4d8ba..947aa30255 100644
--- a/vector/src/main/res/layout/fragment_room_setting_generic.xml
+++ b/vector/src/main/res/layout/fragment_room_setting_generic.xml
@@ -100,7 +100,6 @@
 
                 <androidx.appcompat.widget.SearchView
                     android:id="@+id/searchView"
-                    style="@style/VectorSearchView"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="4dp"
diff --git a/vector/src/main/res/layout/fragment_space_add_rooms.xml b/vector/src/main/res/layout/fragment_space_add_rooms.xml
index 96cff8ea54..3dd57f6101 100644
--- a/vector/src/main/res/layout/fragment_space_add_rooms.xml
+++ b/vector/src/main/res/layout/fragment_space_add_rooms.xml
@@ -65,7 +65,6 @@
 
         <androidx.appcompat.widget.SearchView
             android:id="@+id/publicRoomsFilter"
-            style="@style/VectorSearchView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
diff --git a/vector/src/main/res/values/styles_riot.xml b/vector/src/main/res/values/styles_riot.xml
index 0dadef5645..a74a809bda 100644
--- a/vector/src/main/res/values/styles_riot.xml
+++ b/vector/src/main/res/values/styles_riot.xml
@@ -53,13 +53,6 @@
         <item name="android:textSize">16sp</item>
     </style>
 
-
-    <style name="VectorSearchView" parent="Widget.AppCompat.SearchView">
-        <item name="searchIcon">@drawable/ic_search</item>
-        <item name="closeIcon">@drawable/ic_x_gray</item>
-        <item name="iconifiedByDefault">false</item>
-    </style>
-
     <style name="TimelineContentStubBaseParams">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
diff --git a/vector/src/main/res/values/styles_search_view.xml b/vector/src/main/res/values/styles_search_view.xml
new file mode 100644
index 0000000000..5cf6db538f
--- /dev/null
+++ b/vector/src/main/res/values/styles_search_view.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="VectorSearchView" parent="Widget.AppCompat.SearchView">
+        <item name="searchIcon">@drawable/ic_search</item>
+        <item name="closeIcon">@drawable/ic_x_gray</item>
+        <item name="iconifiedByDefault">false</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml
index 4d200149ed..58e26695e4 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -69,6 +69,7 @@
         <item name="toolbarStyle">@style/VectorToolbar</item>
         <item name="materialAlertDialogTheme">@style/VectorAlertDialogStyleDark</item>
         <item name="bottomNavigationStyle">@style/VectorBottomNavigation</item>
+        <item name="searchViewStyle">@style/VectorSearchView</item>
 
         <!-- Default style for text input -->
         <item name="textInputStyle">@style/VectorTextInputLayout</item>
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index 1b46d09726..e104e23f0c 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -69,6 +69,7 @@
         <item name="toolbarStyle">@style/VectorToolbar</item>
         <item name="materialAlertDialogTheme">@style/VectorAlertDialogStyleLight</item>
         <item name="bottomNavigationStyle">@style/VectorBottomNavigation</item>
+        <item name="searchViewStyle">@style/VectorSearchView</item>
 
         <!-- Default style for text input -->
         <item name="textInputStyle">@style/VectorTextInputLayout</item>