diff --git a/vector/src/main/res/values/styles_toolbar.xml b/vector/src/main/res/values/styles_toolbar.xml
index a33d621bfa..faca4feb25 100644
--- a/vector/src/main/res/values/styles_toolbar.xml
+++ b/vector/src/main/res/values/styles_toolbar.xml
@@ -52,7 +52,7 @@
     </style>
 
     <!-- Action mode style -->
-    <style name="ActionModeTheme" parent="Widget.AppCompat.ActionMode">
+    <style name="VectorActionMode" parent="Widget.AppCompat.ActionMode">
         <item name="background">?android:colorBackground</item>
         <item name="titleTextStyle">@style/Vector.Toolbar.Title</item>
         <item name="subtitleTextStyle">@style/Vector.Toolbar.SubTitle</item>
diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml
index 58e26695e4..6fac94c600 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -70,12 +70,14 @@
         <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>
-
-        <!-- Default style for AppBarLayout -->
         <item name="appBarLayoutStyle">@style/VectorAppBarLayoutStyle</item>
+        <item name="popupMenuStyle">@style/Vector.PopupMenu</item>
+        <item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.Dark</item>
+        <item name="snackbarStyle">@style/VectorSnackBarStyle</item>
+        <item name="snackbarButtonStyle">@style/VectorSnackBarButton</item>
+        <item name="snackbarTextViewStyle">@style/VectorSnackBarText</item>
+        <item name="actionModeStyle">@style/VectorActionMode</item>
 
         <item name="android:textColorLink">@color/element_link_dark</item>
 
@@ -95,24 +97,11 @@
         <!-- remove the shadow under the actionbar -->
         <item name="android:windowContentOverlay">@null</item>
 
-        <item name="popupMenuStyle">@style/Vector.PopupMenu</item>
-
         <!-- no divider -->
         <item name="android:actionBarDivider">@null</item>
 
-        <!-- Preference -->
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
 
-        <item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.Dark</item>
-
-        <!-- SnackBar -->
-        <!-- Style to use for SnackBars in this theme. -->
-        <item name="snackbarStyle">@style/VectorSnackBarStyle</item>
-        <!-- Style to use for action button within a SnackBar in this theme. -->
-        <item name="snackbarButtonStyle">@style/VectorSnackBarButton</item>
-        <!-- Style to use for message text within a SnackBar in this theme. -->
-        <item name="snackbarTextViewStyle">@style/VectorSnackBarText</item>
-
         <item name="pf_lock_screen">@style/PinCodeScreenStyle</item>
         <item name="pf_key_button">@style/PinCodeKeyButtonStyle</item>
         <item name="pf_title">@style/PinCodeTitleStyle</item>
@@ -138,8 +127,6 @@
         <item name="vctr_social_login_button_twitter_style">@style/WidgetButtonSocialLogin.Twitter.Dark</item>
         <item name="vctr_social_login_button_apple_style">@style/WidgetButtonSocialLogin.Apple.Dark</item>
         <item name="vctr_social_login_button_gitlab_style">@style/WidgetButtonSocialLogin.Gitlab.Dark</item>
-
-        <item name="actionModeStyle">@style/ActionModeTheme</item>
     </style>
 
     <style name="AppTheme.Dark" parent="AppTheme.Base.Dark" />
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index e104e23f0c..0f52a80e66 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -70,12 +70,14 @@
         <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>
-
-        <!-- Default style for AppBarLayout -->
         <item name="appBarLayoutStyle">@style/VectorAppBarLayoutStyle</item>
+        <item name="popupMenuStyle">@style/Vector.PopupMenu</item>
+        <item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.Light</item>
+        <item name="snackbarStyle">@style/VectorSnackBarStyle</item>
+        <item name="snackbarButtonStyle">@style/VectorSnackBarButton</item>
+        <item name="snackbarTextViewStyle">@style/VectorSnackBarText</item>
+        <item name="actionModeStyle">@style/VectorActionMode</item>
 
         <item name="android:textColorLink">@color/element_link_light</item>
 
@@ -95,24 +97,12 @@
         <!-- remove the shadow under the actionbar -->
         <item name="android:windowContentOverlay">@null</item>
 
-        <item name="popupMenuStyle">@style/Vector.PopupMenu</item>
 
         <!-- no divider -->
         <item name="android:actionBarDivider">@null</item>
 
-        <!-- Preference -->
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
 
-        <item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.Light</item>
-
-        <!-- SnackBar -->
-        <!-- Style to use for SnackBars in this theme. -->
-        <item name="snackbarStyle">@style/VectorSnackBarStyle</item>
-        <!-- Style to use for action button within a SnackBar in this theme. -->
-        <item name="snackbarButtonStyle">@style/VectorSnackBarButton</item>
-        <!-- Style to use for message text within a SnackBar in this theme. -->
-        <item name="snackbarTextViewStyle">@style/VectorSnackBarText</item>
-
         <item name="pf_lock_screen">@style/PinCodeScreenStyle</item>
         <item name="pf_key_button">@style/PinCodeKeyButtonStyle</item>
         <item name="pf_title">@style/PinCodeTitleStyle</item>
@@ -140,8 +130,6 @@
         <item name="vctr_social_login_button_twitter_style">@style/WidgetButtonSocialLogin.Twitter.Light</item>
         <item name="vctr_social_login_button_apple_style">@style/WidgetButtonSocialLogin.Apple.Light</item>
         <item name="vctr_social_login_button_gitlab_style">@style/WidgetButtonSocialLogin.Gitlab.Light</item>
-
-        <item name="actionModeStyle">@style/ActionModeTheme</item>
     </style>
 
     <style name="AppTheme.Light" parent="AppTheme.Base.Light" />