diff --git a/ReactNativeClient/lib/components/screens/config.js b/ReactNativeClient/lib/components/screens/config.js
index ee05a40ce..516ed5045 100644
--- a/ReactNativeClient/lib/components/screens/config.js
+++ b/ReactNativeClient/lib/components/screens/config.js
@@ -83,10 +83,10 @@ class ConfigScreenComponent extends BaseScreenComponent {
 			},
 		}
 
-		if (Platform.OS === 'ios') {
+		// if (Platform.OS === 'ios') {
 			styles.settingControl.borderBottomWidth = 1;
-			styles.settingControl.borderBottomColor = theme.dividerColor;
-		}
+			styles.settingControl.borderBottomColor = theme.strongDividerColor;
+		// }
 
 		styles.switchSettingText = Object.assign({}, styles.settingText);
 		styles.switchSettingText.width = '80%';
diff --git a/ReactNativeClient/lib/components/screens/dropbox-login.js b/ReactNativeClient/lib/components/screens/dropbox-login.js
index 7349f564b..ba69f37b3 100644
--- a/ReactNativeClient/lib/components/screens/dropbox-login.js
+++ b/ReactNativeClient/lib/components/screens/dropbox-login.js
@@ -62,8 +62,8 @@ class DropboxLoginScreenComponent extends BaseScreenComponent {
 						</TouchableOpacity>
 					</View>
 					<Text style={this.styles().stepText}>{_('Step 2: Enter the code provided by Dropbox:')}</Text>
-					<TextInput selectionColor={theme.textSelectionColor} value={this.state.authCode} onChangeText={this.shared_.authCodeInput_change} style={theme.lineInput}/>
-
+					<TextInput placeholder={_('Enter code here')} placeholderTextColor={theme.colorFaded} selectionColor={theme.textSelectionColor} value={this.state.authCode} onChangeText={this.shared_.authCodeInput_change} style={theme.lineInput}/>
+					<View style={{height:10}}></View>
 					<Button disabled={this.state.checkingAuthToken} title={_("Submit")} onPress={this.shared_.submit_click}></Button>
 
 					{/* Add this extra padding to make sure the view is scrollable when the keyboard is visible on small screens (iPhone SE) */}
diff --git a/ReactNativeClient/lib/components/screens/encryption-config.js b/ReactNativeClient/lib/components/screens/encryption-config.js
index e512167da..ba416a937 100644
--- a/ReactNativeClient/lib/components/screens/encryption-config.js
+++ b/ReactNativeClient/lib/components/screens/encryption-config.js
@@ -110,12 +110,9 @@ class EncryptionConfigScreenComponent extends BaseScreenComponent {
 		const active = this.props.activeMasterKeyId === mk.id ? '✔' : '';
 
 		const inputStyle = {flex:1, marginRight: 10, color: theme.color};
-
-		if (Platform.OS === 'ios') {
-			inputStyle.borderBottomWidth = 1;
-			inputStyle.borderBottomColor = theme.dividerColor;
-		}
-
+		inputStyle.borderBottomWidth = 1;
+		inputStyle.borderBottomColor = theme.strongDividerColor;
+		
 		return (
 			<View key={mk.id}>
 				<Text style={this.styles().titleText}>{_('Master Key %s', mk.id.substr(0,6))}</Text>
diff --git a/ReactNativeClient/lib/components/screens/note.js b/ReactNativeClient/lib/components/screens/note.js
index 7970e5c99..43b450572 100644
--- a/ReactNativeClient/lib/components/screens/note.js
+++ b/ReactNativeClient/lib/components/screens/note.js
@@ -156,7 +156,7 @@ class NoteScreenComponent extends BaseScreenComponent {
 		this.resourceFetcher_downloadComplete = async (resource) => {
 			if (!this.state.note || !this.state.note.body) return;
 			const resourceIds = await Note.linkedResourceIds(this.state.note.body);
-			if (resourceIds.indexOf(resource.id) >= 0) {
+			if (resourceIds.indexOf(resource.id) >= 0 && this.refs.noteBodyViewer) {
 				this.refs.noteBodyViewer.rebuildMd();
 			}
 		}
diff --git a/ReactNativeClient/lib/components/screens/notes.js b/ReactNativeClient/lib/components/screens/notes.js
index 3f99d9cd7..ac99bb5e1 100644
--- a/ReactNativeClient/lib/components/screens/notes.js
+++ b/ReactNativeClient/lib/components/screens/notes.js
@@ -203,7 +203,7 @@ class NotesScreenComponent extends BaseScreenComponent {
 		let title = parent ? parent.title : null;
 		const addFolderNoteButtons = this.props.selectedFolderId && this.props.selectedFolderId != Folder.conflictFolderId();
 		const thisComp = this;
-		const actionButtonComp = this.props.noteSelectionEnabled ? null : <ActionButton addFolderNoteButtons={addFolderNoteButtons} parentFolderId={this.props.selectedFolderId}></ActionButton>
+		const actionButtonComp = this.props.noteSelectionEnabled || !this.props.visible ? null : <ActionButton addFolderNoteButtons={addFolderNoteButtons} parentFolderId={this.props.selectedFolderId}></ActionButton>
 
 		return (
 			<View style={rootStyle}>