diff --git a/app/screens/edit_server/form.tsx b/app/screens/edit_server/form.tsx
index b0f300933..3b18d2b9a 100644
--- a/app/screens/edit_server/form.tsx
+++ b/app/screens/edit_server/form.tsx
@@ -183,6 +183,7 @@ const EditServerForm = ({
             <Button
                 containerStyle={styles.connectButton}
                 buttonStyle={styleButtonBackground}
+                disabledStyle={styleButtonBackground}
                 disabled={buttonDisabled}
                 onPress={onUpdate}
                 testID={saveButtonTestId}
diff --git a/app/screens/forgot_password/index.tsx b/app/screens/forgot_password/index.tsx
index 01d0f5e85..24a64a1ff 100644
--- a/app/screens/forgot_password/index.tsx
+++ b/app/screens/forgot_password/index.tsx
@@ -234,7 +234,8 @@ const ForgotPassword = ({componentId, serverUrl, theme}: Props) => {
                         />
                         <Button
                             testID='forgot.password.button'
-                            buttonStyle={[styles.returnButton, buttonBackgroundStyle(theme, 'lg', 'primary', email ? 'default' : 'disabled'), error ? styles.error : undefined]}
+                            buttonStyle={[styles.returnButton, buttonBackgroundStyle(theme, 'lg', 'primary', 'default'), error ? styles.error : undefined]}
+                            disabledStyle={[styles.returnButton, buttonBackgroundStyle(theme, 'lg', 'primary', 'disabled'), error ? styles.error : undefined]}
                             disabled={!email}
                             onPress={submitResetPassword}
                         >
diff --git a/app/screens/login/form.tsx b/app/screens/login/form.tsx
index cf3eb49fd..ac33fc61d 100644
--- a/app/screens/login/form.tsx
+++ b/app/screens/login/form.tsx
@@ -274,6 +274,7 @@ const LoginForm = ({config, extra, serverDisplayName, launchError, launchType, l
                 disabled={buttonDisabled}
                 onPress={onLogin}
                 buttonStyle={[styles.loginButton, styleButtonBackground]}
+                disabledStyle={[styles.loginButton, styleButtonBackground]}
                 testID={signinButtonTestId}
             >
                 {buttonIcon}
diff --git a/app/screens/mfa/index.tsx b/app/screens/mfa/index.tsx
index 2ab54d3e6..4b5b6ea3c 100644
--- a/app/screens/mfa/index.tsx
+++ b/app/screens/mfa/index.tsx
@@ -236,7 +236,8 @@ const MFA = ({componentId, config, goToHome, license, loginId, password, serverD
                             />
                             <Button
                                 testID='login_mfa.submit'
-                                buttonStyle={[styles.proceedButton, buttonBackgroundStyle(theme, 'lg', 'primary', token ? 'default' : 'disabled'), error ? styles.error : undefined]}
+                                buttonStyle={[styles.proceedButton, buttonBackgroundStyle(theme, 'lg', 'primary', 'default'), error ? styles.error : undefined]}
+                                disabledStyle={[styles.proceedButton, buttonBackgroundStyle(theme, 'lg', 'primary', 'disabled'), error ? styles.error : undefined]}
                                 disabled={!token}
                                 onPress={submit}
                             >
diff --git a/app/screens/server/form.tsx b/app/screens/server/form.tsx
index c847ba3bd..c63f637cc 100644
--- a/app/screens/server/form.tsx
+++ b/app/screens/server/form.tsx
@@ -224,6 +224,7 @@ const ServerForm = ({
                 onPress={onConnect}
                 testID={connectButtonTestId}
                 buttonStyle={styleButtonBackground}
+                disabledStyle={styleButtonBackground}
             >
                 {buttonIcon}
                 <FormattedText