diff --git a/src/pages/signin/SignInPageLayout/index.native.js b/src/pages/signin/SignInPageLayout/index.native.js
deleted file mode 100644
index 775b3cd9fc53..000000000000
--- a/src/pages/signin/SignInPageLayout/index.native.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import SignInPageLayoutNarrow from './SignInPageLayoutNarrow';
-
-export default SignInPageLayoutNarrow;
diff --git a/src/pages/signin/TermsAndLicenses.js b/src/pages/signin/TermsAndLicenses.js
new file mode 100644
index 000000000000..8cfd5df12a7d
--- /dev/null
+++ b/src/pages/signin/TermsAndLicenses.js
@@ -0,0 +1,70 @@
+import React from 'react';
+import {View} from 'react-native';
+import styles from '../../styles/styles';
+import CONST from '../../CONST';
+import Text from '../../components/Text';
+import TextLink from '../../components/TextLink';
+import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
+import LogoWordmark from '../../../assets/images/expensify-wordmark.svg';
+import LocalePicker from '../../components/LocalePicker';
+
+const TermsAndLicenses = ({translate}) => (
+    <>
+        <View
+            style={[
+                styles.dFlex,
+                styles.flexRow,
+                styles.flexWrap,
+                styles.textAlignCenter,
+                styles.alignItemsCenter,
+            ]}
+        >
+            <Text style={[styles.textAlignCenter, styles.textExtraSmallSupporting]}>
+                {translate('termsOfUse.phrase1')}
+            </Text>
+            <TextLink
+                style={[styles.textExtraSmallSupporting, styles.link]}
+                href={CONST.TERMS_URL}
+            >
+                {' '}
+                {translate('termsOfUse.phrase2')}
+                {' '}
+            </TextLink>
+            <Text style={[styles.textAlignCenter, styles.textExtraSmallSupporting]}>
+                {translate('termsOfUse.phrase3')}
+            </Text>
+            <TextLink
+                style={[styles.textExtraSmallSupporting, styles.link]}
+                href={CONST.PRIVACY_URL}
+            >
+                {' '}
+                {translate('termsOfUse.phrase4')}
+            </TextLink>
+            <Text style={[styles.textAlignCenter, styles.textExtraSmallSupporting]}>.</Text>
+            <Text style={[styles.textAlignCenter, styles.textExtraSmallSupporting]}>
+                {translate('termsOfUse.phrase5')}
+                {' '}
+            </Text>
+            <Text style={[styles.textAlignCenter, styles.textExtraSmallSupporting]}>
+                {translate('termsOfUse.phrase6')}
+            </Text>
+            <TextLink
+                style={[styles.textExtraSmallSupporting, styles.link]}
+                href={CONST.LICENSES_URL}
+            >
+                {' '}
+                {translate('termsOfUse.phrase7')}
+            </TextLink>
+            <Text style={[styles.textAlignCenter, styles.textExtraSmallSupporting]}>.</Text>
+        </View>
+        <View style={[styles.mt4, styles.alignItemsCenter, styles.mb2, styles.flexRow, styles.justifyContentBetween]}>
+            <LogoWordmark height={30} width={80} />
+            <LocalePicker size="small" />
+        </View>
+    </>
+);
+
+TermsAndLicenses.propTypes = {...withLocalizePropTypes};
+TermsAndLicenses.displayName = 'TermsAndLicenses';
+
+export default withLocalize(TermsAndLicenses);
diff --git a/src/pages/signin/TermsAndLicenses/TermsWithLicenses/index.android.js b/src/pages/signin/TermsAndLicenses/TermsWithLicenses/index.android.js
deleted file mode 100644
index 4ef064130e71..000000000000
--- a/src/pages/signin/TermsAndLicenses/TermsWithLicenses/index.android.js
+++ /dev/null
@@ -1,72 +0,0 @@
-import React from 'react';
-import {Text, View} from 'react-native';
-import styles from '../../../../styles/styles';
-import CONST from '../../../../CONST';
-import TextLink from '../../../../components/TextLink';
-import withLocalize, {
-    withLocalizePropTypes,
-} from '../../../../components/withLocalize';
-import LogoWordmark from '../../../../../assets/images/expensify-wordmark.svg';
-import LocalePicker from '../../../../components/LocalePicker';
-
-const TermsWithLicenses = ({translate}) => (
-    <View>
-        <View
-            style={[
-                styles.dFlex,
-                styles.flexRow,
-                styles.flexWrap,
-                styles.textAlignCenter,
-                styles.alignItemsCenter,
-            ]}
-        >
-            <Text style={[styles.textAlignCenter, styles.loginTermsText]}>
-                {translate('termsOfUse.phrase1')}
-            </Text>
-            <TextLink
-                style={[styles.loginTermsText, styles.termsLinkNative]}
-                href={CONST.TERMS_URL}
-            >
-                {' '}
-                {translate('termsOfUse.phrase2')}
-                {' '}
-            </TextLink>
-            <Text style={[styles.textAlignCenter, styles.loginTermsText]}>
-                {translate('termsOfUse.phrase3')}
-            </Text>
-            <TextLink
-                style={[styles.loginTermsText, styles.termsLinkNative]}
-                href={CONST.PRIVACY_URL}
-            >
-                {' '}
-                {translate('termsOfUse.phrase4')}
-            </TextLink>
-            <Text style={[styles.textAlignCenter, styles.loginTermsText]}>.</Text>
-            <Text style={[styles.textAlignCenter, styles.loginTermsText]}>
-                {translate('termsOfUse.phrase5')}
-                {' '}
-            </Text>
-            <Text style={[styles.textAlignCenter, styles.loginTermsText]}>
-                {translate('termsOfUse.phrase6')}
-            </Text>
-            <TextLink
-                style={[styles.loginTermsText, styles.termsLinkNative]}
-                href={CONST.LICENSES_URL}
-            >
-                {' '}
-                {translate('termsOfUse.phrase7')}
-            </TextLink>
-            <Text style={[styles.textAlignCenter, styles.loginTermsText]}>.</Text>
-        </View>
-        <View style={[
-            styles.mt4, styles.alignItemsCenter, styles.mb2, styles.flexRow, styles.justifyContentBetween]}
-        >
-            <LogoWordmark height={30} width={80} />
-            <LocalePicker size="small" />
-        </View>
-    </View>
-);
-
-TermsWithLicenses.propTypes = {...withLocalizePropTypes};
-
-export default withLocalize(TermsWithLicenses);
diff --git a/src/pages/signin/TermsAndLicenses/TermsWithLicenses/index.ios.js b/src/pages/signin/TermsAndLicenses/TermsWithLicenses/index.ios.js
deleted file mode 100644
index 6314e7ae4485..000000000000
--- a/src/pages/signin/TermsAndLicenses/TermsWithLicenses/index.ios.js
+++ /dev/null
@@ -1,78 +0,0 @@
-import React from 'react';
-import {Text, View} from 'react-native';
-import styles from '../../../../styles/styles';
-import CONST from '../../../../CONST';
-import TextLink from '../../../../components/TextLink';
-import withLocalize, {
-    withLocalizePropTypes,
-} from '../../../../components/withLocalize';
-import LogoWordmark from '../../../../../assets/images/expensify-wordmark.svg';
-import LocalePicker from '../../../../components/LocalePicker';
-
-const TermsWithLicenses = ({translate}) => (
-    <View>
-        <View
-            style={[
-                styles.dFlex,
-                styles.flexColumn,
-                styles.flexWrap,
-                styles.textAlignCenter,
-                styles.justifyContentCenter,
-            ]}
-        >
-            <View style={[styles.dFlex, styles.flexRow, styles.flexWrap, styles.alignItemsCenter]}>
-                <Text style={[styles.textAlignCenter, styles.loginTermsText]}>
-                    {translate('termsOfUse.phrase1')}
-                </Text>
-                <TextLink
-                    style={[styles.loginTermsText, styles.termsLinkNative]}
-                    href={CONST.TERMS_URL}
-                >
-                    {' '}
-                    {translate('termsOfUse.phrase2')}
-                    {' '}
-                </TextLink>
-                <Text style={[styles.textAlignCenter, styles.loginTermsText]}>
-                    {translate('termsOfUse.phrase3')}
-                </Text>
-                <TextLink
-                    style={[styles.loginTermsText, styles.termsLinkNative]}
-                    href={CONST.PRIVACY_URL}
-                >
-                    {' '}
-                    {translate('termsOfUse.phrase4')}
-                </TextLink>
-                <Text style={[styles.textAlignCenter, styles.loginTermsText]}>
-                    .
-                </Text>
-            </View>
-            <Text style={[styles.textAlignCenter, styles.loginTermsText]}>
-                {translate('termsOfUse.phrase5')}
-                {' '}
-            </Text>
-            <View style={[styles.dFlex, styles.flexRow, styles.alignItemsCenter]}>
-                <Text style={[styles.textAlignCenter, styles.loginTermsText]}>
-                    {translate('termsOfUse.phrase6')}
-                    {' '}
-                </Text>
-                <TextLink
-                    style={[styles.loginTermsText, styles.termsLinkNative]}
-                    href={CONST.LICENSES_URL}
-                >
-                    {translate('termsOfUse.phrase7')}
-                </TextLink>
-                <Text style={[styles.textAlignCenter, styles.loginTermsText]}>.</Text>
-            </View>
-        </View>
-        <View style={[
-            styles.mt4, styles.alignItemsCenter, styles.mb2, styles.flexRow, styles.justifyContentBetween]}
-        >
-            <LogoWordmark height={30} width={80} />
-            <LocalePicker size="small" />
-        </View>
-    </View>
-);
-
-TermsWithLicenses.propTypes = {...withLocalizePropTypes};
-
-export default withLocalize(TermsWithLicenses);
diff --git a/src/pages/signin/TermsAndLicenses/TermsWithLicenses/index.js b/src/pages/signin/TermsAndLicenses/TermsWithLicenses/index.js
deleted file mode 100755
index a022e771f31b..000000000000
--- a/src/pages/signin/TermsAndLicenses/TermsWithLicenses/index.js
+++ /dev/null
@@ -1,55 +0,0 @@
-import React from 'react';
-import {Text, View} from 'react-native';
-import styles from '../../../../styles/styles';
-import CONST from '../../../../CONST';
-import TextLink from '../../../../components/TextLink';
-import withLocalize, {
-    withLocalizePropTypes,
-} from '../../../../components/withLocalize';
-import LogoWordmark from '../../../../../assets/images/expensify-wordmark.svg';
-import LocalePicker from '../../../../components/LocalePicker';
-
-const TermsWithLicenses = ({translate}) => (
-    <View>
-        <Text style={[styles.loginTermsText]}>
-            {translate('termsOfUse.phrase1')}
-            {' '}
-            <TextLink
-                style={[styles.loginTermsText, styles.termsLink]}
-                href={CONST.TERMS_URL}
-            >
-                {translate('termsOfUse.phrase2')}
-            </TextLink>
-            {' '}
-            {translate('termsOfUse.phrase3')}
-            {' '}
-            <TextLink
-                style={[styles.loginTermsText, styles.termsLink]}
-                href={CONST.PRIVACY_URL}
-            >
-                {translate('termsOfUse.phrase4')}
-            </TextLink>
-            .
-            {'\n'}
-            {translate('termsOfUse.phrase5')}
-            {' '}
-            {translate('termsOfUse.phrase6')}
-            {' '}
-            <TextLink
-                style={[styles.loginTermsText, styles.termsLink]}
-                href={CONST.LICENSES_URL}
-            >
-                {translate('termsOfUse.phrase7')}
-            </TextLink>
-            .
-        </Text>
-        <View style={[styles.mt4, styles.alignItemsCenter, styles.mb2, styles.flexRow, styles.justifyContentBetween]}>
-            <LogoWordmark height={30} width={80} />
-            <LocalePicker size="small" />
-        </View>
-    </View>
-);
-
-TermsWithLicenses.propTypes = {...withLocalizePropTypes};
-
-export default withLocalize(TermsWithLicenses);
diff --git a/src/pages/signin/TermsAndLicenses/index.js b/src/pages/signin/TermsAndLicenses/index.js
deleted file mode 100644
index 77d96e01f64c..000000000000
--- a/src/pages/signin/TermsAndLicenses/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import TermsWithLicenses from './TermsWithLicenses';
-
-export default TermsWithLicenses;
diff --git a/src/styles/styles.js b/src/styles/styles.js
index 2691418ccb39..0b9bbc829e9a 100644
--- a/src/styles/styles.js
+++ b/src/styles/styles.js
@@ -113,6 +113,12 @@ const styles = {
         lineHeight: 14,
     },
 
+    textExtraSmallSupporting: {
+        color: themeColors.textSupporting,
+        fontFamily: fontFamily.GTA,
+        fontSize: variables.fontSizeExtraSmall,
+    },
+
     textLarge: {
         fontSize: variables.fontSizeLarge,
     },
@@ -730,21 +736,6 @@ const styles = {
         ...wordBreak.breakWord,
     },
 
-    loginTermsText: {
-        color: themeColors.textSupporting,
-        fontFamily: fontFamily.GTA,
-        fontSize: variables.fontSizeExtraSmall,
-    },
-
-    termsLink: {
-        color: themeColors.link,
-    },
-
-    termsLinkNative: {
-        color: themeColors.link,
-        margin: 0,
-    },
-
     // Sidebar Styles
     sidebar: {
         backgroundColor: themeColors.sidebar,