diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListFragment.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListFragment.kt
index 4e8fe28407..c0df7a8f43 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListFragment.kt
@@ -121,7 +121,7 @@ class RoomListFragment : VectorBaseFragment(), RoomSummaryController.Listener, O
 
                         when (newState) {
                             RecyclerView.SCROLL_STATE_IDLE     -> {
-                                createChatFabMenu.postDelayed(showFabRunnable, 1000)
+                                createChatFabMenu.postDelayed(showFabRunnable, 250)
                             }
                             RecyclerView.SCROLL_STATE_DRAGGING,
                             RecyclerView.SCROLL_STATE_SETTLING -> {
diff --git a/vector/src/main/res/layout/fragment_create_direct_room.xml b/vector/src/main/res/layout/fragment_create_direct_room.xml
index 41109b1446..66a040b935 100644
--- a/vector/src/main/res/layout/fragment_create_direct_room.xml
+++ b/vector/src/main/res/layout/fragment_create_direct_room.xml
@@ -127,6 +127,7 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:fastScrollEnabled="true"
+            android:overScrollMode="always"
             android:scrollbars="vertical"
             app:layout_behavior="@string/appbar_scrolling_view_behavior"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml b/vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml
index 8416f35dfa..4082109638 100644
--- a/vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml
+++ b/vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml
@@ -95,6 +95,7 @@
             android:layout_height="0dp"
             android:layout_marginTop="16dp"
             android:fastScrollEnabled="true"
+            android:overScrollMode="always"
             android:scrollbars="vertical"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/fragment_group_list.xml b/vector/src/main/res/layout/fragment_group_list.xml
index c371b465b6..5ccd63a210 100644
--- a/vector/src/main/res/layout/fragment_group_list.xml
+++ b/vector/src/main/res/layout/fragment_group_list.xml
@@ -9,6 +9,7 @@
         android:id="@+id/groupListEpoxyRecyclerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:overScrollMode="always"
         tools:listitem="@layout/item_group" />
 
 </im.vector.riotx.core.platform.StateView>
diff --git a/vector/src/main/res/layout/fragment_public_rooms.xml b/vector/src/main/res/layout/fragment_public_rooms.xml
index 99fbd89611..ceb45b275b 100644
--- a/vector/src/main/res/layout/fragment_public_rooms.xml
+++ b/vector/src/main/res/layout/fragment_public_rooms.xml
@@ -12,6 +12,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="?riotx_header_panel_background"
+        android:overScrollMode="always"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         tools:listitem="@layout/item_public_room" />
 
diff --git a/vector/src/main/res/layout/fragment_room_detail.xml b/vector/src/main/res/layout/fragment_room_detail.xml
index dee37e9d0f..7b1793237c 100644
--- a/vector/src/main/res/layout/fragment_room_detail.xml
+++ b/vector/src/main/res/layout/fragment_room_detail.xml
@@ -98,6 +98,7 @@
         android:id="@+id/recyclerView"
         android:layout_width="0dp"
         android:layout_height="0dp"
+        android:overScrollMode="always"
         app:layout_constraintBottom_toTopOf="@+id/recyclerViewBarrier"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/fragment_room_list.xml b/vector/src/main/res/layout/fragment_room_list.xml
index c3fa4530e2..0259ca1ea2 100644
--- a/vector/src/main/res/layout/fragment_room_list.xml
+++ b/vector/src/main/res/layout/fragment_room_list.xml
@@ -10,7 +10,8 @@
     <com.airbnb.epoxy.EpoxyRecyclerView
         android:id="@+id/roomListEpoxyRecyclerView"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        android:overScrollMode="always" />
 
     <im.vector.riotx.features.home.room.list.widget.FabMenuView
         android:id="@+id/createChatFabMenu"
diff --git a/vector/src/main/res/values/theme_black.xml b/vector/src/main/res/values/theme_black.xml
index d2b12e78bc..7b582e20dc 100644
--- a/vector/src/main/res/values/theme_black.xml
+++ b/vector/src/main/res/values/theme_black.xml
@@ -59,7 +59,7 @@
         <item name="android:textColorLink">@color/riotx_links</item>
 
         <!-- Menu text color -->
-        <!--item name="android:actionMenuTextColor">#FFFFFFFF</item-->
+        <item name="android:actionMenuTextColor">?colorAccent</item>
 
         <!-- list colors -->
         <!--Header/Panel Background-->
diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml
index 11184539dc..b5796eb9db 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -61,7 +61,7 @@
         <item name="android:textColorLink">@color/riotx_links</item>
 
         <!-- Menu text color -->
-        <!--item name="android:actionMenuTextColor">#FFFFFFFF</item-->
+        <item name="android:actionMenuTextColor">?colorAccent</item>
 
         <!-- default background color -->
         <item name="vctr_bottom_nav_background_color">@color/primary_color_dark</item>
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index d55148e71f..56f2b90be9 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -60,7 +60,7 @@
         <item name="android:textColorLink">@color/riotx_links</item>
 
         <!-- Menu text color -->
-        <!--item name="android:actionMenuTextColor">#FFFFFFFF</item-->
+        <item name="android:actionMenuTextColor">?colorAccent</item>
 
         <!-- default background color -->
         <item name="vctr_bottom_nav_background_color">#FFF3F8FD</item>
diff --git a/vector/src/main/res/values/theme_status.xml b/vector/src/main/res/values/theme_status.xml
index 6ad65f6a1f..322522c723 100644
--- a/vector/src/main/res/values/theme_status.xml
+++ b/vector/src/main/res/values/theme_status.xml
@@ -16,9 +16,8 @@
 
         <item name="android:textColorLink">@color/link_color_status</item>
 
-
         <!-- Menu text color -->
-        <item name="android:actionMenuTextColor">#FFFFFFFF</item>
+        <item name="android:actionMenuTextColor">?colorAccent</item>
 
         <!-- default background color -->
         <item name="android:colorBackground">@color/riot_primary_background_color_status</item>