diff --git a/app/containers/TextInput.tsx b/app/containers/TextInput.tsx
index ae11dcc17..f9c2236a8 100644
--- a/app/containers/TextInput.tsx
+++ b/app/containers/TextInput.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { StyleSheet, Text, View } from 'react-native';
-import { BorderlessButton } from 'react-native-gesture-handler';
+import Touchable from 'react-native-platform-touchable';
 
 import sharedStyles from '../views/Styles';
 import TextInput from '../presentation/TextInput';
@@ -95,9 +95,9 @@ export default class RCTextInput extends React.PureComponent<IRCTextInputProps,
 	get iconRight() {
 		const { iconRight, onIconRightPress, theme } = this.props;
 		return (
-			<BorderlessButton onPress={onIconRightPress} style={[styles.iconContainer, styles.iconRight]}>
+			<Touchable onPress={onIconRightPress} style={[styles.iconContainer, styles.iconRight]}>
 				<CustomIcon name={iconRight} style={{ color: themes[theme].bodyText }} size={20} />
-			</BorderlessButton>
+			</Touchable>
 		);
 	}
 
@@ -105,14 +105,14 @@ export default class RCTextInput extends React.PureComponent<IRCTextInputProps,
 		const { showPassword } = this.state;
 		const { testID, theme } = this.props;
 		return (
-			<BorderlessButton onPress={this.tooglePassword} style={[styles.iconContainer, styles.iconRight]}>
+			<Touchable onPress={this.tooglePassword} style={[styles.iconContainer, styles.iconRight]}>
 				<CustomIcon
 					name={showPassword ? 'unread-on-top' : 'unread-on-top-disabled'}
 					testID={testID ? `${testID}-icon-right` : null}
 					style={{ color: themes[theme].auxiliaryText }}
 					size={20}
 				/>
-			</BorderlessButton>
+			</Touchable>
 		);
 	}