diff --git a/app/containers/ConnectionBadge.js b/app/containers/ConnectionBadge.js
index fdfbc7203..680aa7e0c 100644
--- a/app/containers/ConnectionBadge.js
+++ b/app/containers/ConnectionBadge.js
@@ -129,7 +129,7 @@ class ConnectionBadge extends Component {
 
 		const translateY = this.animatedValue.interpolate({
 			inputRange: [0, 1],
-			outputRange: [-41, 0]
+			outputRange: [-42, 0]
 		});
 
 		if (connecting) {
diff --git a/app/lib/rocketchat.js b/app/lib/rocketchat.js
index 2732966aa..c6097003c 100644
--- a/app/lib/rocketchat.js
+++ b/app/lib/rocketchat.js
@@ -496,7 +496,7 @@ const RocketChat = {
 		AsyncStorage.removeItem(`${ TOKEN_KEY }-${ server }`);
 		setTimeout(() => {
 			database.deleteAll();
-		}, 1000);
+		}, 1500);
 	},
 	disconnect() {
 		try {
diff --git a/app/views/index.js b/app/views/index.js
index 318171c0f..c48953fdf 100644
--- a/app/views/index.js
+++ b/app/views/index.js
@@ -1,4 +1,3 @@
-import { Platform } from 'react-native';
 import { Navigation } from 'react-native-navigation';
 import { Provider } from 'react-redux';
 import { gestureHandlerRootHOC } from 'react-native-gesture-handler';
@@ -6,6 +5,7 @@ import { gestureHandlerRootHOC } from 'react-native-gesture-handler';
 import OnboardingView from './OnboardingView';
 import ProfileView from './ProfileView';
 import RoomsListHeaderView from './RoomsListView/Header';
+import RoomsListSearchView from './RoomsListView/Search';
 import RoomsListView from './RoomsListView';
 import RoomView from './RoomView';
 import SettingsView from './SettingsView';
@@ -15,12 +15,7 @@ export const registerScreens = (store) => {
 	Navigation.registerComponent('OnboardingView', () => OnboardingView, store, Provider);
 	Navigation.registerComponent('ProfileView', () => ProfileView, store, Provider);
 	Navigation.registerComponent('RoomsListHeaderView', () => RoomsListHeaderView, store, Provider);
-
-	if (Platform.OS === 'android') {
-		const RoomsListSearchView = require('./RoomsListView/Search');
-		Navigation.registerComponent('RoomsListSearchView', () => RoomsListSearchView, store, Provider);
-	}
-
+	Navigation.registerComponent('RoomsListSearchView', () => RoomsListSearchView, store, Provider);
 	Navigation.registerComponent('RoomsListView', () => gestureHandlerRootHOC(RoomsListView), store, Provider);
 	Navigation.registerComponent('RoomView', () => gestureHandlerRootHOC(RoomView), store, Provider);
 	Navigation.registerComponent('SettingsView', () => SettingsView, store, Provider);