diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/HomeModule.kt b/vector/src/main/java/im/vector/riotredesign/features/home/HomeModule.kt
index c5779816..8e06637f 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/HomeModule.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/home/HomeModule.kt
@@ -70,12 +70,13 @@ class HomeModule {
             val eventHtmlRenderer = EventHtmlRenderer(GlideApp.with(fragment), fragment.requireContext(), get())
             val noticeEventFormatter = get<NoticeEventFormatter>(parameters = { parametersOf(fragment) })
             val timelineMediaSizeProvider = TimelineMediaSizeProvider()
-            val colorProvider = get<ColorProvider>()
+            val colorProvider = ColorProvider(fragment.requireContext())
             val timelineDateFormatter = get<TimelineDateFormatter>()
 
-            val timelineItemFactory = TimelineItemFactory(messageItemFactory = MessageItemFactory(colorProvider, timelineMediaSizeProvider, timelineDateFormatter, eventHtmlRenderer),
-                                                          noticeItemFactory = NoticeItemFactory(noticeEventFormatter),
-                                                          defaultItemFactory = DefaultItemFactory()
+            val timelineItemFactory = TimelineItemFactory(
+                    messageItemFactory = MessageItemFactory(colorProvider, timelineMediaSizeProvider, timelineDateFormatter, eventHtmlRenderer),
+                    noticeItemFactory = NoticeItemFactory(noticeEventFormatter),
+                    defaultItemFactory = DefaultItemFactory()
             )
             TimelineEventController(timelineDateFormatter, timelineItemFactory, timelineMediaSizeProvider)
         }
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupListViewModel.kt b/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupListViewModel.kt
index 47534b8b..38fff5c5 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupListViewModel.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupListViewModel.kt
@@ -85,16 +85,13 @@ class GroupListViewModel(initialState: GroupListViewState,
         session
                 .rx().liveGroupSummaries()
                 .map {
-                    if (it.isEmpty()) {
-                        it
-                    } else {
-                        val myUser = session.getUser(session.sessionParams.credentials.userId)
-                        val allCommunityGroup = GroupSummary(
-                                groupId = ALL_COMMUNITIES_GROUP_ID,
-                                displayName = "All Communities",
-                                avatarUrl = myUser?.avatarUrl ?: "")
-                        listOf(allCommunityGroup) + it
-                    }
+                    val myUser = session.getUser(session.sessionParams.credentials.userId)
+                    val allCommunityGroup = GroupSummary(
+                            groupId = ALL_COMMUNITIES_GROUP_ID,
+                            // TODO i18n
+                            displayName = "All Communities",
+                            avatarUrl = myUser?.avatarUrl ?: "")
+                    listOf(allCommunityGroup) + it
                 }
                 .execute { async ->
                     val newSelectedGroup = selectedGroup ?: async()?.firstOrNull()