diff --git a/src/components/AmountPicker/AmountSelectorModal.tsx b/src/components/AmountPicker/AmountSelectorModal.tsx
index 9a1d3ac0cbdd..2e96dba1f27e 100644
--- a/src/components/AmountPicker/AmountSelectorModal.tsx
+++ b/src/components/AmountPicker/AmountSelectorModal.tsx
@@ -21,7 +21,7 @@ function AmountSelectorModal({value, description = '', onValueSelected, isVisibl
         <Modal
             type={CONST.MODAL.MODAL_TYPE.RIGHT_DOCKED}
             isVisible={isVisible}
-            onClose={() => onClose?.()}
+            onClose={onClose}
             onModalHide={onClose}
             hideModalContentWhileAnimating
             useNativeDriver
@@ -47,6 +47,7 @@ function AmountSelectorModal({value, description = '', onValueSelected, isVisibl
                     </View>
                     <Button
                         success
+                        large
                         pressOnEnter
                         text={translate('common.save')}
                         onPress={() => onValueSelected?.(currentValue ?? '')}
diff --git a/src/components/AmountPicker/types.ts b/src/components/AmountPicker/types.ts
index 79faaa07e501..5f28a318ae58 100644
--- a/src/components/AmountPicker/types.ts
+++ b/src/components/AmountPicker/types.ts
@@ -24,9 +24,8 @@ type AmountSelectorModalProps = {
     onValueSelected?: (value: string) => void;
 
     /** Function to call when the user closes the modal */
-    onClose?: () => void;
-} & Pick<MenuItemBaseProps, 'description'> &
-    AmountFormProps;
+    onClose: () => void;
+} & Pick<MenuItemBaseProps, 'description'>;
 
 type AmountPickerProps = {
     /** Item to display */
diff --git a/src/components/TextPicker/TextSelectorModal.tsx b/src/components/TextPicker/TextSelectorModal.tsx
index bb48477bf51f..66503bff5521 100644
--- a/src/components/TextPicker/TextSelectorModal.tsx
+++ b/src/components/TextPicker/TextSelectorModal.tsx
@@ -46,6 +46,7 @@ function TextSelectorModal({value, description = '', onValueSelected, isVisible,
                     </View>
                     <Button
                         success
+                        large
                         pressOnEnter
                         text={translate('common.save')}
                         onPress={() => onValueSelected?.(currentValue ?? '')}
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 819080c7c6c8..d708091f2285 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -1883,6 +1883,7 @@ export default {
             errors: {
                 taxRatealreadyExists: 'Ya existe un impuesto con este nombre',
                 valuePercentageRange: 'Introduzca un porcentaje válido entre 0 y 100',
+                genericFailureMessage: 'Se produjo un error al actualizar el tipo impositivo, inténtelo nuevamente.',
             },
         },
         emptyWorkspace: {
diff --git a/src/pages/workspace/taxes/WorkspaceNewTaxPage.tsx b/src/pages/workspace/taxes/WorkspaceNewTaxPage.tsx
index a95434c08171..1086765a846c 100644
--- a/src/pages/workspace/taxes/WorkspaceNewTaxPage.tsx
+++ b/src/pages/workspace/taxes/WorkspaceNewTaxPage.tsx
@@ -71,7 +71,10 @@ function WorkspaceNewTaxPage({
     return (
         <AdminPolicyAccessOrNotFoundWrapper policyID={policyID}>
             <PaidPolicyAccessOrNotFoundWrapper policyID={policyID}>
-                <ScreenWrapper testID={WorkspaceNewTaxPage.displayName}>
+                <ScreenWrapper
+                    testID={WorkspaceNewTaxPage.displayName}
+                    includeSafeAreaPaddingBottom={false}
+                >
                     <View style={[styles.h100, styles.flex1, styles.justifyContentBetween]}>
                         <HeaderWithBackButton title={translate('workspace.taxes.addRate')} />
                         <FormProvider