diff --git a/src/__tests__/components/__snapshots__/FilledTextInput.test.tsx.snap b/src/__tests__/components/__snapshots__/FilledTextInput.test.tsx.snap
index c68b98ebeae..8804bbbfab2 100644
--- a/src/__tests__/components/__snapshots__/FilledTextInput.test.tsx.snap
+++ b/src/__tests__/components/__snapshots__/FilledTextInput.test.tsx.snap
@@ -1,7 +1,20 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`FilledTextInput should render with some props 1`] = `
-<React.Fragment>
+<View
+  style={
+    {
+      "alignItems": undefined,
+      "flex": undefined,
+      "flexDirection": "column",
+      "justifyContent": undefined,
+      "marginBottom": 0,
+      "marginLeft": 0,
+      "marginRight": 0,
+      "marginTop": 0,
+    }
+  }
+>
   <TouchableWithoutFeedback
     accessible={false}
     onPress={[Function]}
@@ -24,12 +37,6 @@ exports[`FilledTextInput should render with some props 1`] = `
           "value": 1,
         }
       }
-      spaceProps={
-        {
-          "keyboardType": "default",
-          "returnKeyType": "done",
-        }
-      }
     >
       <StyledComponent(View)
         scale={
@@ -163,14 +170,14 @@ exports[`FilledTextInput should render with some props 1`] = `
     </StyledComponent(View)>
   </TouchableWithoutFeedback>
   <StyledComponent(View)>
-    <StyledComponent(WithTheme(EdgeTextComponent))
+    <StyledComponent(Text)
       danger={true}
     >
       string
-    </StyledComponent(WithTheme(EdgeTextComponent))>
-    <StyledComponent(WithTheme(EdgeTextComponent))>
+    </StyledComponent(Text)>
+    <StyledComponent(Text)>
       5
-    </StyledComponent(WithTheme(EdgeTextComponent))>
+    </StyledComponent(Text)>
   </StyledComponent(View)>
-</React.Fragment>
+</View>
 `;
diff --git a/src/__tests__/modals/__snapshots__/CategoryModal.test.tsx.snap b/src/__tests__/modals/__snapshots__/CategoryModal.test.tsx.snap
index 25bbaaf8f27..f9210e11a52 100644
--- a/src/__tests__/modals/__snapshots__/CategoryModal.test.tsx.snap
+++ b/src/__tests__/modals/__snapshots__/CategoryModal.test.tsx.snap
@@ -419,149 +419,195 @@ exports[`CategoryModal should render with a subcategory 1`] = `
         </View>
       </View>
       <View
-        accessibilityState={
-          {
-            "busy": undefined,
-            "checked": undefined,
-            "disabled": undefined,
-            "expanded": undefined,
-            "selected": undefined,
-          }
-        }
-        accessible={false}
-        disableAnimation={
-          {
-            "value": 0,
-          }
-        }
-        focusAnimation={
-          {
-            "value": 0,
-          }
-        }
-        focusable={true}
-        multiline={false}
-        onClick={[Function]}
-        onResponderGrant={[Function]}
-        onResponderMove={[Function]}
-        onResponderRelease={[Function]}
-        onResponderTerminate={[Function]}
-        onResponderTerminationRequest={[Function]}
-        onStartShouldSetResponder={[Function]}
-        scale={
-          {
-            "value": 1,
-          }
-        }
-        spaceProps={
+        style={
           {
-            "returnKeyType": "done",
+            "alignItems": undefined,
+            "flex": undefined,
+            "flexDirection": "column",
+            "justifyContent": undefined,
+            "marginBottom": 0,
+            "marginLeft": 0,
+            "marginRight": 0,
+            "marginTop": 0,
           }
         }
-        style={
-          [
-            {
-              "alignItems": undefined,
-              "flex": undefined,
-              "flexDirection": "column",
-              "justifyContent": undefined,
-              "marginBottom": 0,
-              "marginLeft": 0,
-              "marginRight": 0,
-              "marginTop": 0,
-            },
-            {
-              "alignItems": "center",
-              "borderRadius": 11,
-              "borderWidth": 1,
-              "flex": undefined,
-              "flexDirection": "row",
-              "paddingHorizontal": 9,
-            },
-            {
-              "backgroundColor": undefined,
-              "borderColor": undefined,
-              "marginHorizontal": undefined,
-              "opacity": undefined,
-              "paddingVertical": 16.5,
-            },
-          ]
-        }
       >
         <View
-          scale={
+          accessibilityState={
+            {
+              "busy": undefined,
+              "checked": undefined,
+              "disabled": undefined,
+              "expanded": undefined,
+              "selected": undefined,
+            }
+          }
+          accessible={false}
+          disableAnimation={
             {
               "value": 0,
             }
           }
-          style={
-            [
-              {
-                "alignItems": "stretch",
-                "aspectRatio": 1,
-              },
-              {
-                "opacity": 0,
-                "width": 0,
-              },
-            ]
+          focusAnimation={
+            {
+              "value": 0,
+            }
           }
-        />
-        <View
-          focusValue={
+          focusable={true}
+          multiline={false}
+          onClick={[Function]}
+          onResponderGrant={[Function]}
+          onResponderMove={[Function]}
+          onResponderRelease={[Function]}
+          onResponderTerminate={[Function]}
+          onResponderTerminationRequest={[Function]}
+          onStartShouldSetResponder={[Function]}
+          scale={
             {
               "value": 1,
             }
           }
-          hasPlaceholder={true}
           style={
             [
               {
-                "alignItems": "flex-start",
-                "alignSelf": "flex-start",
-                "flex": 1,
+                "alignItems": "center",
+                "borderRadius": 11,
+                "borderWidth": 1,
+                "flex": undefined,
                 "flexDirection": "row",
-                "left": 0,
+                "paddingHorizontal": 9,
               },
               {
-                "marginBottom": NaN,
-                "marginTop": undefined,
+                "backgroundColor": undefined,
+                "borderColor": undefined,
+                "marginHorizontal": undefined,
+                "opacity": undefined,
+                "paddingVertical": 16.5,
               },
             ]
           }
         >
           <View
-            shift={
+            scale={
+              {
+                "value": 0,
+              }
+            }
+            style={
+              [
+                {
+                  "alignItems": "stretch",
+                  "aspectRatio": 1,
+                },
+                {
+                  "opacity": 0,
+                  "width": 0,
+                },
+              ]
+            }
+          />
+          <View
+            focusValue={
               {
                 "value": 1,
               }
             }
+            hasPlaceholder={true}
             style={
               [
                 {
-                  "alignItems": "center",
-                  "justifyContent": "center",
-                  "left": 8.8,
-                  "margin": 0,
-                  "paddingHorizontal": 0,
-                  "paddingVertical": 0,
-                  "position": "absolute",
-                  "top": 0,
+                  "alignItems": "flex-start",
+                  "alignSelf": "flex-start",
+                  "flex": 1,
+                  "flexDirection": "row",
+                  "left": 0,
                 },
                 {
-                  "transform": [
-                    {
-                      "translateY": undefined,
-                    },
-                    {
-                      "translateX": undefined,
-                    },
-                  ],
+                  "marginBottom": NaN,
+                  "marginTop": undefined,
                 },
               ]
             }
           >
-            <Text
+            <View
+              shift={
+                {
+                  "value": 1,
+                }
+              }
+              style={
+                [
+                  {
+                    "alignItems": "center",
+                    "justifyContent": "center",
+                    "left": 8.8,
+                    "margin": 0,
+                    "paddingHorizontal": 0,
+                    "paddingVertical": 0,
+                    "position": "absolute",
+                    "top": 0,
+                  },
+                  {
+                    "transform": [
+                      {
+                        "translateY": undefined,
+                      },
+                      {
+                        "translateX": undefined,
+                      },
+                    ],
+                  },
+                ]
+              }
+            >
+              <Text
+                disableAnimation={
+                  {
+                    "value": 0,
+                  }
+                }
+                focusAnimation={
+                  {
+                    "value": 0,
+                  }
+                }
+                scale={
+                  {
+                    "value": 1,
+                  }
+                }
+                shift={
+                  {
+                    "value": 1,
+                  }
+                }
+                style={
+                  [
+                    {
+                      "fontFamily": "Quicksand-Regular",
+                      "fontSize": 22,
+                      "includeFontPadding": false,
+                    },
+                    {
+                      "color": undefined,
+                      "fontSize": undefined,
+                    },
+                  ]
+                }
+              >
+                Sub-category
+              </Text>
+            </View>
+            <TextInput
+              accessibilityState={
+                {
+                  "disabled": false,
+                }
+              }
+              accessible={true}
+              animated={true}
+              autoCapitalize="words"
+              autoFocus={true}
               disableAnimation={
                 {
                   "value": 0,
@@ -572,155 +618,114 @@ exports[`CategoryModal should render with a subcategory 1`] = `
                   "value": 0,
                 }
               }
+              multiline={false}
+              onBlur={[Function]}
+              onChangeText={[Function]}
+              onFocus={[Function]}
+              onSubmitEditing={[Function]}
+              returnKeyType="done"
               scale={
                 {
                   "value": 1,
                 }
               }
-              shift={
-                {
-                  "value": 1,
-                }
-              }
+              secureTextEntry={false}
+              selectionColor="#FFFFFF"
               style={
                 [
                   {
+                    "color": "hsla(0, 0%, 100%, 0.20)",
+                    "flexGrow": 1,
+                    "flexShrink": 1,
                     "fontFamily": "Quicksand-Regular",
-                    "fontSize": 22,
-                    "includeFontPadding": false,
+                    "margin": 0,
+                    "paddingHorizontal": 0,
+                    "paddingVertical": 0,
+                    "transform": [
+                      {
+                        "translateY": -0,
+                      },
+                    ],
                   },
                   {
                     "color": undefined,
-                    "fontSize": undefined,
+                    "fontSize": 22,
                   },
                 ]
               }
-            >
-              Sub-category
-            </Text>
+              testID="undefined.textInput"
+              textAlignVertical="top"
+              value="Paycheck"
+            />
           </View>
-          <TextInput
+          <View
             accessibilityState={
               {
-                "disabled": false,
-              }
-            }
-            accessible={true}
-            animated={true}
-            autoCapitalize="words"
-            autoFocus={true}
-            disableAnimation={
-              {
-                "value": 0,
+                "busy": undefined,
+                "checked": undefined,
+                "disabled": undefined,
+                "expanded": undefined,
+                "selected": undefined,
               }
             }
-            focusAnimation={
+            accessibilityValue={
               {
-                "value": 0,
-              }
-            }
-            multiline={false}
-            onBlur={[Function]}
-            onChangeText={[Function]}
-            onFocus={[Function]}
-            onSubmitEditing={[Function]}
-            returnKeyType="done"
-            scale={
-              {
-                "value": 1,
+                "max": undefined,
+                "min": undefined,
+                "now": undefined,
+                "text": undefined,
               }
             }
-            secureTextEntry={false}
-            selectionColor="#FFFFFF"
+            accessible={true}
+            collapsable={false}
+            focusable={true}
+            onClick={[Function]}
+            onResponderGrant={[Function]}
+            onResponderMove={[Function]}
+            onResponderRelease={[Function]}
+            onResponderTerminate={[Function]}
+            onResponderTerminationRequest={[Function]}
+            onStartShouldSetResponder={[Function]}
             style={
-              [
-                {
-                  "color": "hsla(0, 0%, 100%, 0.20)",
-                  "flexGrow": 1,
-                  "flexShrink": 1,
-                  "fontFamily": "Quicksand-Regular",
-                  "margin": 0,
-                  "paddingHorizontal": 0,
-                  "paddingVertical": 0,
-                },
-                {
-                  "color": undefined,
-                  "fontSize": 22,
-                },
-              ]
-            }
-            testID="undefined.textInput"
-            textAlignVertical="top"
-            value="Paycheck"
-          />
-        </View>
-        <View
-          accessibilityState={
-            {
-              "busy": undefined,
-              "checked": undefined,
-              "disabled": undefined,
-              "expanded": undefined,
-              "selected": undefined,
-            }
-          }
-          accessibilityValue={
-            {
-              "max": undefined,
-              "min": undefined,
-              "now": undefined,
-              "text": undefined,
-            }
-          }
-          accessible={true}
-          collapsable={false}
-          focusable={true}
-          onClick={[Function]}
-          onResponderGrant={[Function]}
-          onResponderMove={[Function]}
-          onResponderRelease={[Function]}
-          onResponderTerminate={[Function]}
-          onResponderTerminationRequest={[Function]}
-          onStartShouldSetResponder={[Function]}
-          style={
-            {
-              "opacity": 1,
-            }
-          }
-          testID="undefined.clearIcon"
-        >
-          <View
-            scale={
               {
-                "value": 22,
+                "opacity": 1,
               }
             }
-            style={
-              [
-                {
-                  "alignItems": "stretch",
-                  "aspectRatio": 1,
-                },
-                {
-                  "opacity": 22,
-                  "width": 22,
-                },
-              ]
-            }
+            testID="undefined.clearIcon"
           >
-            <Text
-              style={
+            <View
+              scale={
                 {
-                  "color": "#FFFFFF",
-                  "fontFamily": "anticon",
-                  "fontSize": 22,
-                  "fontStyle": "normal",
-                  "fontWeight": "normal",
+                  "value": 22,
                 }
               }
+              style={
+                [
+                  {
+                    "alignItems": "stretch",
+                    "aspectRatio": 1,
+                  },
+                  {
+                    "opacity": 22,
+                    "width": 22,
+                  },
+                ]
+              }
             >
-              
-            </Text>
+              <Text
+                style={
+                  {
+                    "color": "#FFFFFF",
+                    "fontFamily": "anticon",
+                    "fontSize": 22,
+                    "fontStyle": "normal",
+                    "fontWeight": "normal",
+                  }
+                }
+              >
+                
+              </Text>
+            </View>
           </View>
         </View>
       </View>
@@ -1844,119 +1849,76 @@ exports[`CategoryModal should render with an empty subcategory 1`] = `
         </View>
       </View>
       <View
-        accessibilityState={
-          {
-            "busy": undefined,
-            "checked": undefined,
-            "disabled": undefined,
-            "expanded": undefined,
-            "selected": undefined,
-          }
-        }
-        accessible={false}
-        disableAnimation={
-          {
-            "value": 0,
-          }
-        }
-        focusAnimation={
-          {
-            "value": 0,
-          }
-        }
-        focusable={true}
-        multiline={false}
-        onClick={[Function]}
-        onResponderGrant={[Function]}
-        onResponderMove={[Function]}
-        onResponderRelease={[Function]}
-        onResponderTerminate={[Function]}
-        onResponderTerminationRequest={[Function]}
-        onStartShouldSetResponder={[Function]}
-        scale={
-          {
-            "value": 1,
-          }
-        }
-        spaceProps={
+        style={
           {
-            "returnKeyType": "done",
+            "alignItems": undefined,
+            "flex": undefined,
+            "flexDirection": "column",
+            "justifyContent": undefined,
+            "marginBottom": 0,
+            "marginLeft": 0,
+            "marginRight": 0,
+            "marginTop": 0,
           }
         }
-        style={
-          [
-            {
-              "alignItems": undefined,
-              "flex": undefined,
-              "flexDirection": "column",
-              "justifyContent": undefined,
-              "marginBottom": 0,
-              "marginLeft": 0,
-              "marginRight": 0,
-              "marginTop": 0,
-            },
-            {
-              "alignItems": "center",
-              "borderRadius": 11,
-              "borderWidth": 1,
-              "flex": undefined,
-              "flexDirection": "row",
-              "paddingHorizontal": 9,
-            },
-            {
-              "backgroundColor": undefined,
-              "borderColor": undefined,
-              "marginHorizontal": undefined,
-              "opacity": undefined,
-              "paddingVertical": 16.5,
-            },
-          ]
-        }
       >
         <View
-          scale={
+          accessibilityState={
             {
-              "value": 0,
+              "busy": undefined,
+              "checked": undefined,
+              "disabled": undefined,
+              "expanded": undefined,
+              "selected": undefined,
             }
           }
-          style={
-            [
-              {
-                "alignItems": "stretch",
-                "aspectRatio": 1,
-              },
-              {
-                "opacity": 0,
-                "width": 0,
-              },
-            ]
+          accessible={false}
+          disableAnimation={
+            {
+              "value": 0,
+            }
           }
-        />
-        <View
-          focusValue={
+          focusAnimation={
             {
               "value": 0,
             }
           }
-          hasPlaceholder={true}
+          focusable={true}
+          multiline={false}
+          onClick={[Function]}
+          onResponderGrant={[Function]}
+          onResponderMove={[Function]}
+          onResponderRelease={[Function]}
+          onResponderTerminate={[Function]}
+          onResponderTerminationRequest={[Function]}
+          onStartShouldSetResponder={[Function]}
+          scale={
+            {
+              "value": 1,
+            }
+          }
           style={
             [
               {
-                "alignItems": "flex-start",
-                "alignSelf": "flex-start",
-                "flex": 1,
+                "alignItems": "center",
+                "borderRadius": 11,
+                "borderWidth": 1,
+                "flex": undefined,
                 "flexDirection": "row",
-                "left": 0,
+                "paddingHorizontal": 9,
               },
               {
-                "marginBottom": NaN,
-                "marginTop": undefined,
+                "backgroundColor": undefined,
+                "borderColor": undefined,
+                "marginHorizontal": undefined,
+                "opacity": undefined,
+                "paddingVertical": 16.5,
               },
             ]
           }
         >
           <View
-            shift={
+            scale={
               {
                 "value": 0,
               }
@@ -1964,29 +1926,118 @@ exports[`CategoryModal should render with an empty subcategory 1`] = `
             style={
               [
                 {
-                  "alignItems": "center",
-                  "justifyContent": "center",
-                  "left": 8.8,
-                  "margin": 0,
-                  "paddingHorizontal": 0,
-                  "paddingVertical": 0,
-                  "position": "absolute",
-                  "top": 0,
+                  "alignItems": "stretch",
+                  "aspectRatio": 1,
                 },
                 {
-                  "transform": [
-                    {
-                      "translateY": undefined,
-                    },
-                    {
-                      "translateX": undefined,
-                    },
-                  ],
+                  "opacity": 0,
+                  "width": 0,
+                },
+              ]
+            }
+          />
+          <View
+            focusValue={
+              {
+                "value": 0,
+              }
+            }
+            hasPlaceholder={true}
+            style={
+              [
+                {
+                  "alignItems": "flex-start",
+                  "alignSelf": "flex-start",
+                  "flex": 1,
+                  "flexDirection": "row",
+                  "left": 0,
+                },
+                {
+                  "marginBottom": NaN,
+                  "marginTop": undefined,
                 },
               ]
             }
           >
-            <Text
+            <View
+              shift={
+                {
+                  "value": 0,
+                }
+              }
+              style={
+                [
+                  {
+                    "alignItems": "center",
+                    "justifyContent": "center",
+                    "left": 8.8,
+                    "margin": 0,
+                    "paddingHorizontal": 0,
+                    "paddingVertical": 0,
+                    "position": "absolute",
+                    "top": 0,
+                  },
+                  {
+                    "transform": [
+                      {
+                        "translateY": undefined,
+                      },
+                      {
+                        "translateX": undefined,
+                      },
+                    ],
+                  },
+                ]
+              }
+            >
+              <Text
+                disableAnimation={
+                  {
+                    "value": 0,
+                  }
+                }
+                focusAnimation={
+                  {
+                    "value": 0,
+                  }
+                }
+                scale={
+                  {
+                    "value": 1,
+                  }
+                }
+                shift={
+                  {
+                    "value": 0,
+                  }
+                }
+                style={
+                  [
+                    {
+                      "fontFamily": "Quicksand-Regular",
+                      "fontSize": 22,
+                      "includeFontPadding": false,
+                    },
+                    {
+                      "color": undefined,
+                      "fontSize": undefined,
+                    },
+                  ]
+                }
+              >
+                Sub-category
+              </Text>
+            </View>
+            <TextInput
+              accessibilityState={
+                {
+                  "disabled": false,
+                }
+              }
+              accessible={true}
+              animated={true}
+              autoCapitalize="words"
+              autoFocus={true}
               disableAnimation={
                 {
                   "value": 0,
@@ -1997,155 +2048,114 @@ exports[`CategoryModal should render with an empty subcategory 1`] = `
                   "value": 0,
                 }
               }
+              multiline={false}
+              onBlur={[Function]}
+              onChangeText={[Function]}
+              onFocus={[Function]}
+              onSubmitEditing={[Function]}
+              returnKeyType="done"
               scale={
                 {
                   "value": 1,
                 }
               }
-              shift={
-                {
-                  "value": 0,
-                }
-              }
+              secureTextEntry={false}
+              selectionColor="#FFFFFF"
               style={
                 [
                   {
+                    "color": "hsla(0, 0%, 100%, 0.20)",
+                    "flexGrow": 1,
+                    "flexShrink": 1,
                     "fontFamily": "Quicksand-Regular",
-                    "fontSize": 22,
-                    "includeFontPadding": false,
+                    "margin": 0,
+                    "paddingHorizontal": 0,
+                    "paddingVertical": 0,
+                    "transform": [
+                      {
+                        "translateY": -0,
+                      },
+                    ],
                   },
                   {
                     "color": undefined,
-                    "fontSize": undefined,
+                    "fontSize": 22,
                   },
                 ]
               }
-            >
-              Sub-category
-            </Text>
+              testID="undefined.textInput"
+              textAlignVertical="top"
+              value=""
+            />
           </View>
-          <TextInput
+          <View
             accessibilityState={
               {
-                "disabled": false,
-              }
-            }
-            accessible={true}
-            animated={true}
-            autoCapitalize="words"
-            autoFocus={true}
-            disableAnimation={
-              {
-                "value": 0,
-              }
-            }
-            focusAnimation={
-              {
-                "value": 0,
+                "busy": undefined,
+                "checked": undefined,
+                "disabled": undefined,
+                "expanded": undefined,
+                "selected": undefined,
               }
             }
-            multiline={false}
-            onBlur={[Function]}
-            onChangeText={[Function]}
-            onFocus={[Function]}
-            onSubmitEditing={[Function]}
-            returnKeyType="done"
-            scale={
+            accessibilityValue={
               {
-                "value": 1,
+                "max": undefined,
+                "min": undefined,
+                "now": undefined,
+                "text": undefined,
               }
             }
-            secureTextEntry={false}
-            selectionColor="#FFFFFF"
+            accessible={true}
+            collapsable={false}
+            focusable={true}
+            onClick={[Function]}
+            onResponderGrant={[Function]}
+            onResponderMove={[Function]}
+            onResponderRelease={[Function]}
+            onResponderTerminate={[Function]}
+            onResponderTerminationRequest={[Function]}
+            onStartShouldSetResponder={[Function]}
             style={
-              [
-                {
-                  "color": "hsla(0, 0%, 100%, 0.20)",
-                  "flexGrow": 1,
-                  "flexShrink": 1,
-                  "fontFamily": "Quicksand-Regular",
-                  "margin": 0,
-                  "paddingHorizontal": 0,
-                  "paddingVertical": 0,
-                },
-                {
-                  "color": undefined,
-                  "fontSize": 22,
-                },
-              ]
-            }
-            testID="undefined.textInput"
-            textAlignVertical="top"
-            value=""
-          />
-        </View>
-        <View
-          accessibilityState={
-            {
-              "busy": undefined,
-              "checked": undefined,
-              "disabled": undefined,
-              "expanded": undefined,
-              "selected": undefined,
-            }
-          }
-          accessibilityValue={
-            {
-              "max": undefined,
-              "min": undefined,
-              "now": undefined,
-              "text": undefined,
-            }
-          }
-          accessible={true}
-          collapsable={false}
-          focusable={true}
-          onClick={[Function]}
-          onResponderGrant={[Function]}
-          onResponderMove={[Function]}
-          onResponderRelease={[Function]}
-          onResponderTerminate={[Function]}
-          onResponderTerminationRequest={[Function]}
-          onStartShouldSetResponder={[Function]}
-          style={
-            {
-              "opacity": 1,
-            }
-          }
-          testID="undefined.clearIcon"
-        >
-          <View
-            scale={
               {
-                "value": 0,
+                "opacity": 1,
               }
             }
-            style={
-              [
-                {
-                  "alignItems": "stretch",
-                  "aspectRatio": 1,
-                },
-                {
-                  "opacity": 0,
-                  "width": 0,
-                },
-              ]
-            }
+            testID="undefined.clearIcon"
           >
-            <Text
-              style={
+            <View
+              scale={
                 {
-                  "color": "#FFFFFF",
-                  "fontFamily": "anticon",
-                  "fontSize": 0,
-                  "fontStyle": "normal",
-                  "fontWeight": "normal",
+                  "value": 0,
                 }
               }
+              style={
+                [
+                  {
+                    "alignItems": "stretch",
+                    "aspectRatio": 1,
+                  },
+                  {
+                    "opacity": 0,
+                    "width": 0,
+                  },
+                ]
+              }
             >
-              
-            </Text>
+              <Text
+                style={
+                  {
+                    "color": "#FFFFFF",
+                    "fontFamily": "anticon",
+                    "fontSize": 0,
+                    "fontStyle": "normal",
+                    "fontWeight": "normal",
+                  }
+                }
+              >
+                
+              </Text>
+            </View>
           </View>
         </View>
       </View>
diff --git a/src/__tests__/modals/__snapshots__/WalletListModal.test.tsx.snap b/src/__tests__/modals/__snapshots__/WalletListModal.test.tsx.snap
index cb6961ddc29..f0f9e9fe631 100644
--- a/src/__tests__/modals/__snapshots__/WalletListModal.test.tsx.snap
+++ b/src/__tests__/modals/__snapshots__/WalletListModal.test.tsx.snap
@@ -184,7 +184,7 @@ exports[`WalletListModal should render with loading props 1`] = `
             "borderColor": undefined,
             "marginHorizontal": undefined,
             "opacity": undefined,
-            "paddingVertical": 17.6,
+            "paddingVertical": 16.5,
           },
         ]
       }
diff --git a/src/__tests__/scenes/__snapshots__/CreateWalletAccountSetupScene.test.tsx.snap b/src/__tests__/scenes/__snapshots__/CreateWalletAccountSetupScene.test.tsx.snap
index 981e03ceda7..e31af0fb32d 100644
--- a/src/__tests__/scenes/__snapshots__/CreateWalletAccountSetupScene.test.tsx.snap
+++ b/src/__tests__/scenes/__snapshots__/CreateWalletAccountSetupScene.test.tsx.snap
@@ -350,121 +350,76 @@ exports[`CreateWalletAccountSelect renders 1`] = `
 
       </Text>
       <View
-        accessibilityState={
-          {
-            "busy": undefined,
-            "checked": undefined,
-            "disabled": undefined,
-            "expanded": undefined,
-            "selected": undefined,
-          }
-        }
-        accessible={false}
-        disableAnimation={
-          {
-            "value": 0,
-          }
-        }
-        focusAnimation={
-          {
-            "value": 0,
-          }
-        }
-        focusable={true}
-        multiline={false}
-        onClick={[Function]}
-        onResponderGrant={[Function]}
-        onResponderMove={[Function]}
-        onResponderRelease={[Function]}
-        onResponderTerminate={[Function]}
-        onResponderTerminationRequest={[Function]}
-        onStartShouldSetResponder={[Function]}
-        scale={
-          {
-            "value": 1,
-          }
-        }
-        spaceProps={
+        style={
           {
-            "around": 1,
-            "bottom": 2,
-            "returnKeyType": "next",
+            "alignItems": undefined,
+            "flex": undefined,
+            "flexDirection": "column",
+            "justifyContent": undefined,
+            "marginBottom": 45,
+            "marginLeft": 22,
+            "marginRight": 22,
+            "marginTop": 22,
           }
         }
-        style={
-          [
-            {
-              "alignItems": undefined,
-              "flex": undefined,
-              "flexDirection": "column",
-              "justifyContent": undefined,
-              "marginBottom": 45,
-              "marginLeft": 22,
-              "marginRight": 22,
-              "marginTop": 22,
-            },
-            {
-              "alignItems": "center",
-              "borderRadius": 11,
-              "borderWidth": 1,
-              "flex": undefined,
-              "flexDirection": "row",
-              "paddingHorizontal": 9,
-            },
-            {
-              "backgroundColor": undefined,
-              "borderColor": undefined,
-              "marginHorizontal": undefined,
-              "opacity": undefined,
-              "paddingVertical": 16.5,
-            },
-          ]
-        }
       >
         <View
-          scale={
+          accessibilityState={
             {
-              "value": 0,
+              "busy": undefined,
+              "checked": undefined,
+              "disabled": undefined,
+              "expanded": undefined,
+              "selected": undefined,
             }
           }
-          style={
-            [
-              {
-                "alignItems": "stretch",
-                "aspectRatio": 1,
-              },
-              {
-                "opacity": 0,
-                "width": 0,
-              },
-            ]
+          accessible={false}
+          disableAnimation={
+            {
+              "value": 0,
+            }
           }
-        />
-        <View
-          focusValue={
+          focusAnimation={
             {
               "value": 0,
             }
           }
-          hasPlaceholder={true}
+          focusable={true}
+          multiline={false}
+          onClick={[Function]}
+          onResponderGrant={[Function]}
+          onResponderMove={[Function]}
+          onResponderRelease={[Function]}
+          onResponderTerminate={[Function]}
+          onResponderTerminationRequest={[Function]}
+          onStartShouldSetResponder={[Function]}
+          scale={
+            {
+              "value": 1,
+            }
+          }
           style={
             [
               {
-                "alignItems": "flex-start",
-                "alignSelf": "flex-start",
-                "flex": 1,
+                "alignItems": "center",
+                "borderRadius": 11,
+                "borderWidth": 1,
+                "flex": undefined,
                 "flexDirection": "row",
-                "left": 0,
+                "paddingHorizontal": 9,
               },
               {
-                "marginBottom": NaN,
-                "marginTop": undefined,
+                "backgroundColor": undefined,
+                "borderColor": undefined,
+                "marginHorizontal": undefined,
+                "opacity": undefined,
+                "paddingVertical": 16.5,
               },
             ]
           }
         >
           <View
-            shift={
+            scale={
               {
                 "value": 0,
               }
@@ -472,29 +427,119 @@ exports[`CreateWalletAccountSelect renders 1`] = `
             style={
               [
                 {
-                  "alignItems": "center",
-                  "justifyContent": "center",
-                  "left": 8.8,
-                  "margin": 0,
-                  "paddingHorizontal": 0,
-                  "paddingVertical": 0,
-                  "position": "absolute",
-                  "top": 0,
+                  "alignItems": "stretch",
+                  "aspectRatio": 1,
                 },
                 {
-                  "transform": [
-                    {
-                      "translateY": undefined,
-                    },
-                    {
-                      "translateX": undefined,
-                    },
-                  ],
+                  "opacity": 0,
+                  "width": 0,
+                },
+              ]
+            }
+          />
+          <View
+            focusValue={
+              {
+                "value": 0,
+              }
+            }
+            hasPlaceholder={true}
+            style={
+              [
+                {
+                  "alignItems": "flex-start",
+                  "alignSelf": "flex-start",
+                  "flex": 1,
+                  "flexDirection": "row",
+                  "left": 0,
+                },
+                {
+                  "marginBottom": NaN,
+                  "marginTop": undefined,
                 },
               ]
             }
           >
-            <Text
+            <View
+              shift={
+                {
+                  "value": 0,
+                }
+              }
+              style={
+                [
+                  {
+                    "alignItems": "center",
+                    "justifyContent": "center",
+                    "left": 8.8,
+                    "margin": 0,
+                    "paddingHorizontal": 0,
+                    "paddingVertical": 0,
+                    "position": "absolute",
+                    "top": 0,
+                  },
+                  {
+                    "transform": [
+                      {
+                        "translateY": undefined,
+                      },
+                      {
+                        "translateX": undefined,
+                      },
+                    ],
+                  },
+                ]
+              }
+            >
+              <Text
+                disableAnimation={
+                  {
+                    "value": 0,
+                  }
+                }
+                focusAnimation={
+                  {
+                    "value": 0,
+                  }
+                }
+                scale={
+                  {
+                    "value": 1,
+                  }
+                }
+                shift={
+                  {
+                    "value": 0,
+                  }
+                }
+                style={
+                  [
+                    {
+                      "fontFamily": "Quicksand-Regular",
+                      "fontSize": 22,
+                      "includeFontPadding": false,
+                    },
+                    {
+                      "color": undefined,
+                      "fontSize": undefined,
+                    },
+                  ]
+                }
+              >
+                Account Handle
+              </Text>
+            </View>
+            <TextInput
+              accessibilityState={
+                {
+                  "disabled": false,
+                }
+              }
+              accessible={true}
+              animated={true}
+              autoCapitalize="none"
+              autoCorrect={false}
+              autoFocus={true}
               disableAnimation={
                 {
                   "value": 0,
@@ -505,216 +550,154 @@ exports[`CreateWalletAccountSelect renders 1`] = `
                   "value": 0,
                 }
               }
+              maxLength={12}
+              multiline={false}
+              onBlur={[Function]}
+              onChangeText={[Function]}
+              onFocus={[Function]}
+              onSubmitEditing={[Function]}
+              returnKeyType="next"
               scale={
                 {
                   "value": 1,
                 }
               }
-              shift={
-                {
-                  "value": 0,
-                }
-              }
+              secureTextEntry={false}
+              selectionColor="#FFFFFF"
               style={
                 [
                   {
+                    "color": "hsla(0, 0%, 100%, 0.20)",
+                    "flexGrow": 1,
+                    "flexShrink": 1,
                     "fontFamily": "Quicksand-Regular",
-                    "fontSize": 22,
-                    "includeFontPadding": false,
+                    "margin": 0,
+                    "paddingHorizontal": 0,
+                    "paddingVertical": 0,
+                    "transform": [
+                      {
+                        "translateY": -0,
+                      },
+                    ],
                   },
                   {
                     "color": undefined,
-                    "fontSize": undefined,
+                    "fontSize": 22,
                   },
                 ]
               }
-            >
-              Account Handle
-            </Text>
+              testID="undefined.textInput"
+              textAlignVertical="top"
+              value=""
+            />
           </View>
-          <TextInput
+          <View
             accessibilityState={
               {
-                "disabled": false,
-              }
-            }
-            accessible={true}
-            animated={true}
-            autoCapitalize="none"
-            autoCorrect={false}
-            autoFocus={true}
-            disableAnimation={
-              {
-                "value": 0,
+                "busy": undefined,
+                "checked": undefined,
+                "disabled": undefined,
+                "expanded": undefined,
+                "selected": undefined,
               }
             }
-            focusAnimation={
+            accessibilityValue={
               {
-                "value": 0,
+                "max": undefined,
+                "min": undefined,
+                "now": undefined,
+                "text": undefined,
               }
             }
-            maxLength={12}
-            multiline={false}
-            onBlur={[Function]}
-            onChangeText={[Function]}
-            onFocus={[Function]}
-            onSubmitEditing={[Function]}
-            returnKeyType="next"
-            scale={
+            accessible={true}
+            collapsable={false}
+            focusable={true}
+            onClick={[Function]}
+            onResponderGrant={[Function]}
+            onResponderMove={[Function]}
+            onResponderRelease={[Function]}
+            onResponderTerminate={[Function]}
+            onResponderTerminationRequest={[Function]}
+            onStartShouldSetResponder={[Function]}
+            style={
               {
-                "value": 1,
+                "opacity": 1,
               }
             }
-            secureTextEntry={false}
-            selectionColor="#FFFFFF"
-            style={
-              [
-                {
-                  "color": "hsla(0, 0%, 100%, 0.20)",
-                  "flexGrow": 1,
-                  "flexShrink": 1,
-                  "fontFamily": "Quicksand-Regular",
-                  "margin": 0,
-                  "paddingHorizontal": 0,
-                  "paddingVertical": 0,
-                },
+            testID="undefined.clearIcon"
+          >
+            <View
+              scale={
                 {
-                  "color": undefined,
-                  "fontSize": 22,
-                },
-              ]
-            }
-            testID="undefined.textInput"
-            textAlignVertical="top"
-            value=""
-          />
+                  "value": 0,
+                }
+              }
+              style={
+                [
+                  {
+                    "alignItems": "stretch",
+                    "aspectRatio": 1,
+                  },
+                  {
+                    "opacity": 0,
+                    "width": 0,
+                  },
+                ]
+              }
+            >
+              <Text
+                style={
+                  {
+                    "color": "#FFFFFF",
+                    "fontFamily": "anticon",
+                    "fontSize": 0,
+                    "fontStyle": "normal",
+                    "fontWeight": "normal",
+                  }
+                }
+              >
+                
+              </Text>
+            </View>
+          </View>
         </View>
         <View
-          accessibilityState={
-            {
-              "busy": undefined,
-              "checked": undefined,
-              "disabled": undefined,
-              "expanded": undefined,
-              "selected": undefined,
-            }
-          }
-          accessibilityValue={
-            {
-              "max": undefined,
-              "min": undefined,
-              "now": undefined,
-              "text": undefined,
-            }
-          }
-          accessible={true}
-          collapsable={false}
-          focusable={true}
-          onClick={[Function]}
-          onResponderGrant={[Function]}
-          onResponderMove={[Function]}
-          onResponderRelease={[Function]}
-          onResponderTerminate={[Function]}
-          onResponderTerminationRequest={[Function]}
-          onStartShouldSetResponder={[Function]}
           style={
             {
-              "opacity": 1,
+              "flexDirection": "row",
+              "justifyContent": "space-between",
+              "paddingHorizontal": 11,
             }
           }
-          testID="undefined.clearIcon"
         >
-          <View
-            scale={
-              {
-                "value": 0,
-              }
-            }
+          <Text
+            danger={false}
             style={
               [
                 {
-                  "alignItems": "stretch",
-                  "aspectRatio": 1,
-                },
-                {
-                  "opacity": 0,
-                  "width": 0,
+                  "color": "#3dd9f4",
+                  "fontFamily": "Quicksand-Regular",
+                  "fontSize": 17,
+                  "includeFontPadding": false,
                 },
               ]
             }
-          >
-            <Text
-              style={
-                {
-                  "color": "#FFFFFF",
-                  "fontFamily": "anticon",
-                  "fontSize": 0,
-                  "fontStyle": "normal",
-                  "fontWeight": "normal",
-                }
-              }
-            >
-              
-            </Text>
-          </View>
-        </View>
-      </View>
-      <View
-        style={
-          {
-            "flexDirection": "row",
-            "justifyContent": "space-between",
-            "paddingHorizontal": 11,
-          }
-        }
-      >
-        <Text
-          adjustsFontSizeToFit={true}
-          danger={false}
-          minimumFontScale={0.65}
-          numberOfLines={1}
-          style={
-            [
-              {
-                "color": "#FFFFFF",
-                "fontFamily": "Quicksand-Regular",
-                "fontSize": 22,
-                "includeFontPadding": false,
-              },
-              [
-                {
-                  "color": "#3dd9f4",
-                  "fontSize": 18,
-                },
-              ],
-              null,
-            ]
-          }
-        />
-        <Text
-          adjustsFontSizeToFit={true}
-          minimumFontScale={0.65}
-          numberOfLines={1}
-          style={
-            [
-              {
-                "color": "#FFFFFF",
-                "fontFamily": "Quicksand-Regular",
-                "fontSize": 22,
-                "includeFontPadding": false,
-              },
+          />
+          <Text
+            style={
               [
                 {
                   "color": "#3dd9f4",
-                  "fontSize": 18,
+                  "fontFamily": "Quicksand-Regular",
+                  "fontSize": 17,
+                  "includeFontPadding": false,
                 },
-              ],
-              null,
-            ]
-          }
-        >
-          12
-        </Text>
+              ]
+            }
+          >
+            12
+          </Text>
+        </View>
       </View>
       <View
         accessibilityState={
diff --git a/src/__tests__/scenes/__snapshots__/CreateWalletImportScene.test.tsx.snap b/src/__tests__/scenes/__snapshots__/CreateWalletImportScene.test.tsx.snap
index 53ec54422b8..8221b0da4b2 100644
--- a/src/__tests__/scenes/__snapshots__/CreateWalletImportScene.test.tsx.snap
+++ b/src/__tests__/scenes/__snapshots__/CreateWalletImportScene.test.tsx.snap
@@ -324,122 +324,76 @@ exports[`CreateWalletImportScene should render with loading props 1`] = `
       Enter your private seed, private key, or active key to verify and restore the associated wallet
     </Text>
     <View
-      accessibilityState={
-        {
-          "busy": undefined,
-          "checked": undefined,
-          "disabled": undefined,
-          "expanded": undefined,
-          "selected": undefined,
-        }
-      }
-      accessible={false}
-      disableAnimation={
-        {
-          "value": 0,
-        }
-      }
-      focusAnimation={
-        {
-          "value": 0,
-        }
-      }
-      focusable={true}
-      multiline={false}
-      onClick={[Function]}
-      onResponderGrant={[Function]}
-      onResponderMove={[Function]}
-      onResponderRelease={[Function]}
-      onResponderTerminate={[Function]}
-      onResponderTerminationRequest={[Function]}
-      onStartShouldSetResponder={[Function]}
-      scale={
-        {
-          "value": 1,
-        }
-      }
-      spaceProps={
+      style={
         {
-          "bottom": 1.25,
-          "horizontal": 0.75,
-          "returnKeyType": "next",
-          "top": 1,
+          "alignItems": undefined,
+          "flex": undefined,
+          "flexDirection": "column",
+          "justifyContent": undefined,
+          "marginBottom": 28,
+          "marginLeft": 17,
+          "marginRight": 17,
+          "marginTop": 22,
         }
       }
-      style={
-        [
-          {
-            "alignItems": undefined,
-            "flex": undefined,
-            "flexDirection": "column",
-            "justifyContent": undefined,
-            "marginBottom": 28,
-            "marginLeft": 17,
-            "marginRight": 17,
-            "marginTop": 22,
-          },
-          {
-            "alignItems": "center",
-            "borderRadius": 11,
-            "borderWidth": 1,
-            "flex": undefined,
-            "flexDirection": "row",
-            "paddingHorizontal": 9,
-          },
-          {
-            "backgroundColor": undefined,
-            "borderColor": undefined,
-            "marginHorizontal": undefined,
-            "opacity": undefined,
-            "paddingVertical": 16.5,
-          },
-        ]
-      }
     >
       <View
-        scale={
+        accessibilityState={
           {
-            "value": 0,
+            "busy": undefined,
+            "checked": undefined,
+            "disabled": undefined,
+            "expanded": undefined,
+            "selected": undefined,
           }
         }
-        style={
-          [
-            {
-              "alignItems": "stretch",
-              "aspectRatio": 1,
-            },
-            {
-              "opacity": 0,
-              "width": 0,
-            },
-          ]
+        accessible={false}
+        disableAnimation={
+          {
+            "value": 0,
+          }
         }
-      />
-      <View
-        focusValue={
+        focusAnimation={
           {
             "value": 0,
           }
         }
-        hasPlaceholder={true}
+        focusable={true}
+        multiline={false}
+        onClick={[Function]}
+        onResponderGrant={[Function]}
+        onResponderMove={[Function]}
+        onResponderRelease={[Function]}
+        onResponderTerminate={[Function]}
+        onResponderTerminationRequest={[Function]}
+        onStartShouldSetResponder={[Function]}
+        scale={
+          {
+            "value": 1,
+          }
+        }
         style={
           [
             {
-              "alignItems": "flex-start",
-              "alignSelf": "flex-start",
-              "flex": 1,
+              "alignItems": "center",
+              "borderRadius": 11,
+              "borderWidth": 1,
+              "flex": undefined,
               "flexDirection": "row",
-              "left": 0,
+              "paddingHorizontal": 9,
             },
             {
-              "marginBottom": NaN,
-              "marginTop": undefined,
+              "backgroundColor": undefined,
+              "borderColor": undefined,
+              "marginHorizontal": undefined,
+              "opacity": undefined,
+              "paddingVertical": 16.5,
             },
           ]
         }
       >
         <View
-          shift={
+          scale={
             {
               "value": 0,
             }
@@ -447,29 +401,119 @@ exports[`CreateWalletImportScene should render with loading props 1`] = `
           style={
             [
               {
-                "alignItems": "center",
-                "justifyContent": "center",
-                "left": 8.8,
-                "margin": 0,
-                "paddingHorizontal": 0,
-                "paddingVertical": 0,
-                "position": "absolute",
-                "top": 0,
+                "alignItems": "stretch",
+                "aspectRatio": 1,
               },
               {
-                "transform": [
-                  {
-                    "translateY": undefined,
-                  },
-                  {
-                    "translateX": undefined,
-                  },
-                ],
+                "opacity": 0,
+                "width": 0,
+              },
+            ]
+          }
+        />
+        <View
+          focusValue={
+            {
+              "value": 0,
+            }
+          }
+          hasPlaceholder={true}
+          style={
+            [
+              {
+                "alignItems": "flex-start",
+                "alignSelf": "flex-start",
+                "flex": 1,
+                "flexDirection": "row",
+                "left": 0,
+              },
+              {
+                "marginBottom": NaN,
+                "marginTop": undefined,
               },
             ]
           }
         >
-          <Text
+          <View
+            shift={
+              {
+                "value": 0,
+              }
+            }
+            style={
+              [
+                {
+                  "alignItems": "center",
+                  "justifyContent": "center",
+                  "left": 8.8,
+                  "margin": 0,
+                  "paddingHorizontal": 0,
+                  "paddingVertical": 0,
+                  "position": "absolute",
+                  "top": 0,
+                },
+                {
+                  "transform": [
+                    {
+                      "translateY": undefined,
+                    },
+                    {
+                      "translateX": undefined,
+                    },
+                  ],
+                },
+              ]
+            }
+          >
+            <Text
+              disableAnimation={
+                {
+                  "value": 0,
+                }
+              }
+              focusAnimation={
+                {
+                  "value": 0,
+                }
+              }
+              scale={
+                {
+                  "value": 1,
+                }
+              }
+              shift={
+                {
+                  "value": 0,
+                }
+              }
+              style={
+                [
+                  {
+                    "fontFamily": "Quicksand-Regular",
+                    "fontSize": 22,
+                    "includeFontPadding": false,
+                  },
+                  {
+                    "color": undefined,
+                    "fontSize": undefined,
+                  },
+                ]
+              }
+            >
+              Private Key or Private Seed
+            </Text>
+          </View>
+          <TextInput
+            accessibilityState={
+              {
+                "disabled": false,
+              }
+            }
+            accessible={true}
+            animated={true}
+            autoCapitalize="none"
+            autoCorrect={false}
+            autoFocus={false}
             disableAnimation={
               {
                 "value": 0,
@@ -480,156 +524,114 @@ exports[`CreateWalletImportScene should render with loading props 1`] = `
                 "value": 0,
               }
             }
+            multiline={false}
+            onBlur={[Function]}
+            onChangeText={[Function]}
+            onFocus={[Function]}
+            onSubmitEditing={[Function]}
+            returnKeyType="next"
             scale={
               {
                 "value": 1,
               }
             }
-            shift={
-              {
-                "value": 0,
-              }
-            }
+            secureTextEntry={false}
+            selectionColor="#FFFFFF"
             style={
               [
                 {
+                  "color": "hsla(0, 0%, 100%, 0.20)",
+                  "flexGrow": 1,
+                  "flexShrink": 1,
                   "fontFamily": "Quicksand-Regular",
-                  "fontSize": 22,
-                  "includeFontPadding": false,
+                  "margin": 0,
+                  "paddingHorizontal": 0,
+                  "paddingVertical": 0,
+                  "transform": [
+                    {
+                      "translateY": -0,
+                    },
+                  ],
                 },
                 {
                   "color": undefined,
-                  "fontSize": undefined,
+                  "fontSize": 22,
                 },
               ]
             }
-          >
-            Private Key or Private Seed
-          </Text>
+            testID="undefined.textInput"
+            textAlignVertical="top"
+            value=""
+          />
         </View>
-        <TextInput
+        <View
           accessibilityState={
             {
-              "disabled": false,
-            }
-          }
-          accessible={true}
-          animated={true}
-          autoCapitalize="none"
-          autoCorrect={false}
-          autoFocus={false}
-          disableAnimation={
-            {
-              "value": 0,
+              "busy": undefined,
+              "checked": undefined,
+              "disabled": undefined,
+              "expanded": undefined,
+              "selected": undefined,
             }
           }
-          focusAnimation={
+          accessibilityValue={
             {
-              "value": 0,
+              "max": undefined,
+              "min": undefined,
+              "now": undefined,
+              "text": undefined,
             }
           }
-          multiline={false}
-          onBlur={[Function]}
-          onChangeText={[Function]}
-          onFocus={[Function]}
-          onSubmitEditing={[Function]}
-          returnKeyType="next"
-          scale={
-            {
-              "value": 1,
-            }
-          }
-          secureTextEntry={false}
-          selectionColor="#FFFFFF"
+          accessible={true}
+          collapsable={false}
+          focusable={true}
+          onClick={[Function]}
+          onResponderGrant={[Function]}
+          onResponderMove={[Function]}
+          onResponderRelease={[Function]}
+          onResponderTerminate={[Function]}
+          onResponderTerminationRequest={[Function]}
+          onStartShouldSetResponder={[Function]}
           style={
-            [
-              {
-                "color": "hsla(0, 0%, 100%, 0.20)",
-                "flexGrow": 1,
-                "flexShrink": 1,
-                "fontFamily": "Quicksand-Regular",
-                "margin": 0,
-                "paddingHorizontal": 0,
-                "paddingVertical": 0,
-              },
-              {
-                "color": undefined,
-                "fontSize": 22,
-              },
-            ]
-          }
-          testID="undefined.textInput"
-          textAlignVertical="top"
-          value=""
-        />
-      </View>
-      <View
-        accessibilityState={
-          {
-            "busy": undefined,
-            "checked": undefined,
-            "disabled": undefined,
-            "expanded": undefined,
-            "selected": undefined,
-          }
-        }
-        accessibilityValue={
-          {
-            "max": undefined,
-            "min": undefined,
-            "now": undefined,
-            "text": undefined,
-          }
-        }
-        accessible={true}
-        collapsable={false}
-        focusable={true}
-        onClick={[Function]}
-        onResponderGrant={[Function]}
-        onResponderMove={[Function]}
-        onResponderRelease={[Function]}
-        onResponderTerminate={[Function]}
-        onResponderTerminationRequest={[Function]}
-        onStartShouldSetResponder={[Function]}
-        style={
-          {
-            "opacity": 1,
-          }
-        }
-        testID="undefined.clearIcon"
-      >
-        <View
-          scale={
             {
-              "value": 0,
+              "opacity": 1,
             }
           }
-          style={
-            [
-              {
-                "alignItems": "stretch",
-                "aspectRatio": 1,
-              },
-              {
-                "opacity": 0,
-                "width": 0,
-              },
-            ]
-          }
+          testID="undefined.clearIcon"
         >
-          <Text
-            style={
+          <View
+            scale={
               {
-                "color": "#FFFFFF",
-                "fontFamily": "anticon",
-                "fontSize": 0,
-                "fontStyle": "normal",
-                "fontWeight": "normal",
+                "value": 0,
               }
             }
+            style={
+              [
+                {
+                  "alignItems": "stretch",
+                  "aspectRatio": 1,
+                },
+                {
+                  "opacity": 0,
+                  "width": 0,
+                },
+              ]
+            }
           >
-            
-          </Text>
+            <Text
+              style={
+                {
+                  "color": "#FFFFFF",
+                  "fontFamily": "anticon",
+                  "fontSize": 0,
+                  "fontStyle": "normal",
+                  "fontWeight": "normal",
+                }
+              }
+            >
+              
+            </Text>
+          </View>
         </View>
       </View>
     </View>
diff --git a/src/__tests__/scenes/__snapshots__/CreateWalletSelectCryptoScene.test.tsx.snap b/src/__tests__/scenes/__snapshots__/CreateWalletSelectCryptoScene.test.tsx.snap
index dd2a2c839ac..4af5eb8fa48 100644
--- a/src/__tests__/scenes/__snapshots__/CreateWalletSelectCryptoScene.test.tsx.snap
+++ b/src/__tests__/scenes/__snapshots__/CreateWalletSelectCryptoScene.test.tsx.snap
@@ -354,7 +354,7 @@ exports[`CreateWalletSelectCrypto should render with loading props 1`] = `
               "borderColor": undefined,
               "marginHorizontal": undefined,
               "opacity": undefined,
-              "paddingVertical": 17.6,
+              "paddingVertical": 16.5,
             },
           ]
         }
diff --git a/src/components/scenes/InputTesterScene.tsx b/src/components/scenes/InputTesterScene.tsx
index bcd8a33e8a7..8c14b9b46bf 100644
--- a/src/components/scenes/InputTesterScene.tsx
+++ b/src/components/scenes/InputTesterScene.tsx
@@ -29,6 +29,7 @@ export function InputTesterScene() {
   const [filledTextInputValue2, setFilledTextInputValue2] = useState<string>('')
   const [filledTextInputValue3, setFilledTextInputValue3] = useState<string>('')
   const [filledTextInputValue4, setFilledTextInputValue4] = useState<string>('')
+  const [filledTextInputValue5, setFilledTextInputValue5] = useState<string>('')
   const walletId = selectedWallet?.wallet.id ?? ''
   const tokenId = selectedWallet?.tokenId ?? null
   const exchangedFlipInputRef = React.useRef<ExchangedFlipInputRef>(null)
@@ -81,13 +82,13 @@ export function InputTesterScene() {
     <SceneWrapper scroll hasTabs hasHeader={false}>
       <View style={styles.headerContainer}>
         <FilledTextInput
-          vertical={1}
           value={filledTextInputValue}
           onChangeText={setFilledTextInputValue}
           autoFocus={false}
           placeholder="Test FilledTextInput"
           maxLength={100}
         />
+        <View style={{ height: theme.rem(1) }} />
         <FilledTextInput
           vertical={1}
           prefix="PRE"
@@ -97,6 +98,7 @@ export function InputTesterScene() {
           placeholder="Test FilledTextInput"
           maxLength={100}
         />
+        <View style={{ height: theme.rem(1) }} />
         <FilledTextInput
           numeric
           vertical={1}
@@ -104,8 +106,8 @@ export function InputTesterScene() {
           onChangeText={setFilledTextInputValue3}
           autoFocus={false}
           placeholder="Test FilledTextInput num"
-          maxLength={100}
         />
+        <View style={{ height: theme.rem(1) }} />
         <FilledTextInput
           numeric
           vertical={1}
@@ -115,8 +117,22 @@ export function InputTesterScene() {
           onChangeText={setFilledTextInputValue4}
           autoFocus={false}
           placeholder="Test FilledTextInput num"
+          error="Error"
+          maxLength={100}
+        />
+        <View style={{ height: theme.rem(1) }} />
+        <FilledTextInput
+          vertical={1}
+          prefix="USD"
+          suffix="BTC"
+          value={filledTextInputValue5}
+          onChangeText={setFilledTextInputValue5}
+          autoFocus={false}
+          placeholder="Test FilledTextInput"
+          error="Error"
           maxLength={100}
         />
+        <View style={{ height: theme.rem(1) }} />
         <CardUi4>
           <ExchangedFlipInput2
             ref={exchangedFlipInputRef}
diff --git a/src/components/themed/FilledTextInput.tsx b/src/components/themed/FilledTextInput.tsx
index 84fb1afde94..40e8ae3331e 100644
--- a/src/components/themed/FilledTextInput.tsx
+++ b/src/components/themed/FilledTextInput.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { useMemo } from 'react'
-import { ActivityIndicator, Platform, TextInput, TouchableOpacity, TouchableWithoutFeedback, View } from 'react-native'
+import { ActivityIndicator, Platform, Text, TextInput, TouchableOpacity, TouchableWithoutFeedback, View } from 'react-native'
 import Animated, {
   interpolate,
   interpolateColor,
@@ -18,7 +18,6 @@ import { SpaceProps, useSpaceStyle } from '../../hooks/useSpaceStyle'
 import { styled, styledWithRef } from '../hoc/styled'
 import { AnimatedIconComponent, CloseIconAnimated, EyeIconAnimated } from '../icons/ThemedIcons'
 import { useTheme } from '../services/ThemeContext'
-import { EdgeText } from './EdgeText'
 import { NumericInput } from './NumericInput'
 
 const AnimatedTextInput = Animated.createAnimatedComponent(TextInput)
@@ -133,6 +132,8 @@ export const FilledTextInput = React.forwardRef<FilledTextInputRef, FilledTextIn
   const hasIcon = LeftIcon != null
   const hasValue = value !== ''
 
+  const spaceStyle = useSpaceStyle(spaceProps)
+
   // Show/Hide password input:
   const [hidePassword, setHidePassword] = React.useState(secureTextEntry ?? false)
   const handleHidePassword = () => setHidePassword(!hidePassword)
@@ -208,9 +209,9 @@ export const FilledTextInput = React.forwardRef<FilledTextInputRef, FilledTextIn
   const InputComponent = numeric ? StyledNumericInput : StyledAnimatedTextInput
 
   return (
-    <>
+    <View style={spaceStyle}>
       <TouchableWithoutFeedback accessible={false} testID={testID} onPress={() => focus()}>
-        <Container disableAnimation={disableAnimation} focusAnimation={focusAnimation} multiline={multiline} scale={scale} spaceProps={spaceProps}>
+        <Container disableAnimation={disableAnimation} focusAnimation={focusAnimation} multiline={multiline} scale={scale}>
           <SideContainer scale={leftIconSize}>{LeftIcon == null ? null : <LeftIcon color={iconColor} size={leftIconSize} />}</SideContainer>
 
           <InnerContainer focusValue={focusValue} hasPlaceholder={placeholder != null}>
@@ -281,7 +282,7 @@ export const FilledTextInput = React.forwardRef<FilledTextInputRef, FilledTextIn
           <Message>{charactersLeft}</Message>
         </MessagesContainer>
       ) : null}
-    </>
+    </View>
   )
 })
 
@@ -290,8 +291,7 @@ const Container = styled(Animated.View)<{
   focusAnimation: SharedValue<number>
   multiline: boolean
   scale: SharedValue<number>
-  spaceProps: SpaceProps
-}>(theme => ({ disableAnimation, focusAnimation, multiline, scale, spaceProps }) => {
+}>(theme => ({ disableAnimation, focusAnimation, multiline, scale }) => {
   const rem = theme.rem(1)
   const interpolateInputBackgroundColor = useAnimatedColorInterpolateFn(
     theme.textInputBackgroundColor,
@@ -303,10 +303,8 @@ const Container = styled(Animated.View)<{
     theme.textInputBorderColorFocused,
     theme.textInputBorderColorDisabled
   )
-  const spaceStyle = useSpaceStyle(spaceProps)
 
   return [
-    spaceStyle,
     {
       flex: multiline ? 1 : undefined,
       alignItems: multiline ? 'stretch' : 'center',
@@ -347,6 +345,8 @@ const InnerContainer = styled(Animated.View)<{
   hasPlaceholder: boolean
 }>(theme => ({ hasPlaceholder, focusValue }) => {
   const rem = theme.rem(1)
+
+  // Need 2 pixels of shift given a 16 point rem settings
   const androidHShift = isAndroid ? rem / 8 : 0
 
   return [
@@ -369,33 +369,29 @@ const InnerContainer = styled(Animated.View)<{
 
 const PrefixAnimatedText = styled(Animated.Text)<{ visibility: SharedValue<number> }>(theme => ({ visibility }) => {
   const rem = theme.rem(1)
-  const androidVShift = isAndroid ? rem / 16 : 0
 
   return [
     {
       color: theme.secondaryText,
       fontFamily: theme.fontFaceDefault,
+      fontSize: theme.rem(1),
       includeFontPadding: false
     },
     useAnimatedStyle(() => {
       return {
         opacity: visibility.value,
-        top: androidVShift,
         transform: [{ translateY: (1 - visibility.value) * rem }, { scale: visibility.value }]
       }
     })
   ]
 })
 
-const SuffixText = styled(EdgeText)(theme => {
-  const rem3 = theme.rem(3)
-  const androidVShift = isAndroid ? rem3 / 16 : 0
-
+const SuffixText = styled(Text)(theme => {
   return {
     color: theme.secondaryText,
     fontFamily: theme.fontFaceDefault,
+    fontSize: theme.rem(1),
     includeFontPadding: false,
-    marginTop: androidVShift,
     marginRight: theme.rem(0.5)
   }
 })
@@ -417,7 +413,7 @@ const Placeholder = styled(Animated.View)<{ shift: SharedValue<number> }>(theme
     useAnimatedStyle(() => ({
       transform: [
         {
-          translateY: interpolate(shift.value, [0, 1], [0, -0.9 * rem])
+          translateY: interpolate(shift.value, [0, 1], [0, -1 * rem])
         },
         {
           translateX: interpolate(shift.value, [0, 1], [0, -0.4 * rem])
@@ -462,6 +458,10 @@ const StyledAnimatedTextInput = styledWithRef(AnimatedTextInput)<{
 }>(theme => ({ disableAnimation, focusAnimation, scale }) => {
   const rem = theme.rem(1)
   const interpolateTextColor = useAnimatedColorInterpolateFn(theme.textInputTextColor, theme.textInputTextColorFocused, theme.textInputTextColorDisabled)
+  // Need 2 pixels of shift given a 16 point rem settings
+  // This is due to Android rendering a text input vertically lower
+  // than a Text field by ~2 pixels
+  const androidVShift = isAndroid ? rem / 8 : 0
 
   return [
     {
@@ -471,6 +471,7 @@ const StyledAnimatedTextInput = styledWithRef(AnimatedTextInput)<{
       fontFamily: theme.fontFaceDefault,
       paddingHorizontal: 0,
       paddingVertical: 0,
+      transform: [{ translateY: -androidVShift }],
       margin: 0
     },
     useAnimatedStyle(() => ({
@@ -487,6 +488,10 @@ const StyledNumericInput = styledWithRef(NumericInput)<{
 }>(theme => ({ disableAnimation, focusAnimation, scale }) => {
   const rem = theme.rem(1)
   const interpolateTextColor = useAnimatedColorInterpolateFn(theme.textInputTextColor, theme.textInputTextColorFocused, theme.textInputTextColorDisabled)
+  // Need 2 pixels of shift given a 16 point rem settings
+  // This is due to Android rendering a text input vertically lower
+  // than a Text field by ~2 pixels
+  const androidVShift = isAndroid ? rem / 8 : 0
 
   return [
     {
@@ -496,6 +501,7 @@ const StyledNumericInput = styledWithRef(NumericInput)<{
       fontFamily: theme.fontFaceDefault,
       paddingHorizontal: 0,
       paddingVertical: 0,
+      transform: [{ translateY: -androidVShift }],
       margin: 0
     },
     useAnimatedStyle(() => ({
@@ -511,10 +517,12 @@ const MessagesContainer = styled(Animated.View)(theme => ({
   paddingHorizontal: theme.rem(0.5)
 }))
 
-const Message = styled(EdgeText)<{ danger?: boolean }>(theme => props => [
+const Message = styled(Text)<{ danger?: boolean }>(theme => props => [
   {
     color: props.danger === true ? theme.dangerText : theme.secondaryText,
-    fontSize: theme.rem(0.8)
+    fontFamily: theme.fontFaceDefault,
+    fontSize: theme.rem(0.75),
+    includeFontPadding: false
   }
 ])
 
diff --git a/src/components/themed/SimpleTextInput.tsx b/src/components/themed/SimpleTextInput.tsx
index 489aeef2a65..74f3471d8fd 100644
--- a/src/components/themed/SimpleTextInput.tsx
+++ b/src/components/themed/SimpleTextInput.tsx
@@ -257,7 +257,7 @@ const Container = styled(Animated.View)<{
       borderColor: interpolateOutlineColor(focusAnimation, disableAnimation),
       opacity: interpolate(scale.value, [1, 0.5], [1, 0]),
       marginHorizontal: interpolate(scale.value, [1, 0], [0, 2 * rem]),
-      paddingVertical: scale.value * 0.8 * rem
+      paddingVertical: scale.value * 0.75 * rem
     }))
   ]
 })