diff --git a/app/views/NewServerView.js b/app/views/NewServerView.js
index 0d5468222..11acda713 100644
--- a/app/views/NewServerView.js
+++ b/app/views/NewServerView.js
@@ -41,9 +41,9 @@ const styles = StyleSheet.create({
 	},
 	certificatePicker: {
 		flex: 1,
-		marginTop: 40,
+		marginBottom: 32,
 		alignItems: 'center',
-		justifyContent: 'center'
+		justifyContent: 'flex-end'
 	},
 	chooseCertificateTitle: {
 		fontSize: 15,
@@ -264,8 +264,8 @@ class NewServerView extends React.Component {
 		const { text } = this.state;
 		return (
 			<FormContainer theme={theme}>
-				<Text style={[styles.title, { color: themes[theme].titleText }]}>{I18n.t('Join_your_workspace')}</Text>
 				<View style={isTablet && sharedStyles.tabletScreenContent}>
+					<Text style={[styles.title, { color: themes[theme].titleText }]}>{I18n.t('Join_your_workspace')}</Text>
 					<TextInput
 						label='Enter workspace URL'
 						placeholder='Ex. your-company.rocket.chat'
diff --git a/app/views/OnboardingView/index.js b/app/views/OnboardingView/index.js
index 0e709eca5..5b8137179 100644
--- a/app/views/OnboardingView/index.js
+++ b/app/views/OnboardingView/index.js
@@ -11,9 +11,8 @@ import { appStart as appStartAction } from '../../actions';
 import I18n from '../../i18n';
 import Button from '../../containers/Button';
 import styles from './styles';
-import { isIOS, isNotch, isTablet } from '../../utils/deviceInfo';
+import { isTablet } from '../../utils/deviceInfo';
 import EventEmitter from '../../utils/events';
-import { CustomIcon } from '../../lib/Icons';
 import { themes } from '../../constants/colors';
 import { withTheme } from '../../theme';
 import sharedStyles from '../Styles';
@@ -107,30 +106,6 @@ class OnboardingView extends React.Component {
 		}
 	}
 
-	renderClose = () => {
-		const { theme } = this.props;
-		if (this.previousServer) {
-			let top = 15;
-			if (isIOS) {
-				top = isNotch ? 45 : 30;
-			}
-			return (
-				<TouchableOpacity
-					style={[styles.closeModal, { top }]}
-					onPress={this.close}
-					testID='onboarding-close'
-				>
-					<CustomIcon
-						name='cross'
-						size={30}
-						color={themes[theme].actionTintColor}
-					/>
-				</TouchableOpacity>
-			);
-		}
-		return null;
-	}
-
 	render() {
 		const { theme } = this.props;
 		return (
@@ -156,7 +131,6 @@ class OnboardingView extends React.Component {
 						/>
 					</View>
 				</View>
-				{this.renderClose()}
 			</FormContainer>
 		);
 	}