2 files changed, 13 insertions, 6 deletions
diff --git a/src/view/screens/Search.tsx b/src/view/screens/Search.tsx
index 2e176d98f..93539e29a 100644
--- a/src/view/screens/Search.tsx
+++ b/src/view/screens/Search.tsx
@@ -81,6 +81,7 @@ export const Search = observer(({navIdx, visible, params}: ScreenParams) => {
   const onPressCancelSearch = () => {
     setQuery('')
     autocompleteView.setActive(false)
+    textInput.current?.blur()
   }
 
   return (
@@ -127,10 +128,10 @@ export const Search = observer(({navIdx, visible, params}: ScreenParams) => {
               onChangeText={onChangeQuery}
             />
           </View>
-          {query ? (
+          {query || isInputFocused ? (
             <View style={styles.headerCancelBtn}>
               <TouchableOpacity onPress={onPressCancelSearch}>
-                <Text>Cancel</Text>
+                <Text style={pal.text}>Cancel</Text>
               </TouchableOpacity>
             </View>
           ) : undefined}
diff --git a/src/view/screens/Settings.tsx b/src/view/screens/Settings.tsx
index f5db81127..9332b5150 100644
--- a/src/view/screens/Settings.tsx
+++ b/src/view/screens/Settings.tsx
@@ -5,7 +5,10 @@ import {
   TouchableOpacity,
   View,
 } from 'react-native'
-import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
+import {
+  FontAwesomeIcon,
+  FontAwesomeIconStyle,
+} from '@fortawesome/react-native-fontawesome'
 import {observer} from 'mobx-react-lite'
 import * as AppInfo from 'lib/app-info'
 import {useStores} from 'state/index'
@@ -151,7 +154,10 @@ export const Settings = observer(function Settings({
               isSwitching && styles.dimmed,
             ]}
             onPress={isSwitching ? undefined : onPressAddAccount}>
-            <FontAwesomeIcon icon="plus" />
+            <FontAwesomeIcon
+              icon="plus"
+              style={pal.text as FontAwesomeIconStyle}
+            />
             <View style={[s.ml5]}>
               <Text type="md-medium" style={pal.text}>
                 Add account
@@ -160,7 +166,7 @@ export const Settings = observer(function Settings({
           </TouchableOpacity>
 
           <View style={styles.spacer} />
-          <Text type="sm-medium" style={[s.mb5]}>
+          <Text type="sm-medium" style={[s.mb5, pal.text]}>
             Danger zone
           </Text>
           <TouchableOpacity
@@ -168,7 +174,7 @@ export const Settings = observer(function Settings({
             onPress={onPressDeleteAccount}>
             <Text style={pal.textLight}>Delete my account</Text>
           </TouchableOpacity>
-          <Text type="sm-medium" style={[s.mt10, s.mb5]}>
+          <Text type="sm-medium" style={[s.mt10, s.mb5, pal.text]}>
             Developer tools
           </Text>
           <Link