diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt
index 5fb867853c..1ceba3d5cd 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt
@@ -139,11 +139,6 @@ class HomeActivity : VectorBaseActivity(), ToolbarConfigurable {
             }
             // TODO Temporary code here to create a room
             R.id.tmp_menu_create_room         -> {
-                homeActivityViewModel.createRoom()
-                return true
-            }
-            // TODO Temporary code here to open room directory
-            R.id.tmp_menu_open_room_directory -> {
                 // Start Activity for now
                 startActivity(Intent(this, RoomDirectoryActivity::class.java))
                 return true
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsFragment.kt b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsFragment.kt
index 2e61425ac8..aca1e30c10 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsFragment.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsFragment.kt
@@ -78,6 +78,8 @@ class PublicRoomsFragment : VectorBaseFragment(), PublicRoomsController.Callback
                 .disposeOnDestroy()
 
         publicRoomsCreateNewRoom.setOnClickListener {
+            // TODO homeActivityViewModel.createRoom()
+
             vectorBaseActivity.notImplemented()
         }
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryPickerController.kt b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryPickerController.kt
index 36952b6b2b..5b758e287e 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryPickerController.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryPickerController.kt
@@ -69,9 +69,12 @@ class RoomDirectoryPickerController(private val stringProvider: StringProvider,
             directoryName(roomDirectoryData.displayName)
 
             val description = when {
-                roomDirectoryData.includeAllNetworks      -> stringProvider.getString(R.string.directory_server_all_rooms_on_server, roomDirectoryData.displayName)
-                "Matrix" == roomDirectoryData.displayName -> stringProvider.getString(R.string.directory_server_native_rooms, roomDirectoryData.displayName)
-                else                                      -> null
+                roomDirectoryData.includeAllNetworks      ->
+                    stringProvider.getString(R.string.directory_server_all_rooms_on_server, roomDirectoryData.displayName)
+                "Matrix" == roomDirectoryData.displayName ->
+                    stringProvider.getString(R.string.directory_server_native_rooms, roomDirectoryData.displayName)
+                else                                      ->
+                    null
             }
 
             directoryDescription(description)
diff --git a/vector/src/main/res/layout/fragment_public_rooms.xml b/vector/src/main/res/layout/fragment_public_rooms.xml
index 238ecf35f1..a369496d81 100644
--- a/vector/src/main/res/layout/fragment_public_rooms.xml
+++ b/vector/src/main/res/layout/fragment_public_rooms.xml
@@ -93,7 +93,7 @@
                         android:layout_alignParentEnd="true"
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
-                        android:text="Change" />
+                        android:text="@string/action_change" />
 
 
                 </RelativeLayout>
diff --git a/vector/src/main/res/layout/view_button_state.xml b/vector/src/main/res/layout/view_button_state.xml
index 4a708f7bb2..008db5eca3 100644
--- a/vector/src/main/res/layout/view_button_state.xml
+++ b/vector/src/main/res/layout/view_button_state.xml
@@ -12,8 +12,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
         app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomBottomSeparator"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/vector/src/main/res/menu/home.xml b/vector/src/main/res/menu/home.xml
index b19acc72ee..2c8e3c0b30 100644
--- a/vector/src/main/res/menu/home.xml
+++ b/vector/src/main/res/menu/home.xml
@@ -16,9 +16,4 @@
         android:id="@+id/tmp_menu_create_room"
         android:title="@string/room_recents_create_room" />
 
-    <!-- TODO Temporary code -->
-    <item
-        android:id="@+id/tmp_menu_open_room_directory"
-        android:title="Open room directory" />
-
 </menu>
\ No newline at end of file
diff --git a/vector/src/main/res/values/strings_riotX.xml b/vector/src/main/res/values/strings_riotX.xml
index 09071efd23..5a37c39307 100644
--- a/vector/src/main/res/values/strings_riotX.xml
+++ b/vector/src/main/res/values/strings_riotX.xml
@@ -22,4 +22,6 @@
 
     <string name="error_no_network">No network. Please check your Internet connection.</string>
 
+    <string name="action_change">"Change"</string>
+
 </resources>
\ No newline at end of file