diff --git a/secant/Features/SendFlow/Views/CreateTransactionView.swift b/secant/Features/SendFlow/Views/CreateTransactionView.swift
index ba2db60..7ea4017 100644
--- a/secant/Features/SendFlow/Views/CreateTransactionView.swift
+++ b/secant/Features/SendFlow/Views/CreateTransactionView.swift
@@ -48,6 +48,8 @@ struct CreateTransaction: View {
                     label: { Text(L10n.General.send) }
                 )
                 .activeButtonStyle
+                .disabled(viewStore.isValidForm)
+                .opacity(viewStore.isValidForm ? 1.0 : 0.5)
 
                 Spacer()
             }
diff --git a/secant/UI Components/TextFields/TransactionAddress/TransactionAddressTextField.swift b/secant/UI Components/TextFields/TransactionAddress/TransactionAddressTextField.swift
index 7d5f4f0..ae1f51d 100644
--- a/secant/UI Components/TextFields/TransactionAddress/TransactionAddressTextField.swift	
+++ b/secant/UI Components/TextFields/TransactionAddress/TransactionAddressTextField.swift	
@@ -21,20 +21,8 @@ struct TransactionAddressTextField: View {
                         state: \.textFieldState,
                         action: TransactionAddressTextFieldReducer.Action.textField
                     ),
-                    titleAccessoryView: {
-                        if !viewStore.textFieldState.text.data.isEmpty {
-                            Button(
-                                action: {
-                                    viewStore.send(.clearAddress)
-                                },
-                                label: {
-                                    Text(L10n.General.clear)
-                                }
-                            )
-                            .textFieldTitleAccessoryButtonStyle
-                        }
-                    },
-                    inputPrefixView: { EmptyView() },
+                    titleAccessoryView: { },
+                    inputPrefixView: { },
                     inputAccessoryView: {
                         Button {
                             viewStore.send(.scanQR)