diff --git a/src/status_im/components/button/styles.cljs b/src/status_im/components/button/styles.cljs
index d70eb905b9..7c003554a8 100644
--- a/src/status_im/components/button/styles.cljs
+++ b/src/status_im/components/button/styles.cljs
@@ -23,16 +23,20 @@
     (case position
       :first {:border-bottom-left-radius radius
               :border-top-left-radius    radius
-              :ios {:border-width 1}}
-      :last  {:border-bottom-right-radius radius
-              :border-top-right-radius    radius
-              :ios {:border-width 1}}
+              :ios                       {:border-top-width    1
+                                          :border-left-width   1
+                                          :border-bottom-width 1}}
+      :last {:border-bottom-right-radius radius
+             :border-top-right-radius    radius
+             :ios                        {:border-top-width    1
+                                          :border-right-width  1
+                                          :border-bottom-width 1}}
       {:android {:border-left-width  1
                  :border-right-width 1}
        :ios     {:border-width 1}})))
 
 (defnstyle button-bar [position]
-  (merge {:border-color  border-color}
+  (merge {:border-color border-color}
          (border position)))
 
 (defnstyle button-text [disabled?]
@@ -40,9 +44,9 @@
    :color              styles/color-white
    :padding-horizontal 16
    :android            (merge
-                         {:font-size          14
-                          :padding-vertical   10
-                          :letter-spacing     0.5}
+                         {:font-size        14
+                          :padding-vertical 10
+                          :letter-spacing   0.5}
                          (when disabled? {:opacity 0.4}))
    :ios                (merge
                          {:font-size        15
diff --git a/src/status_im/ui/screens/wallet/components/styles.cljs b/src/status_im/ui/screens/wallet/components/styles.cljs
index 86a4f3ba15..b7e609a236 100644
--- a/src/status_im/ui/screens/wallet/components/styles.cljs
+++ b/src/status_im/ui/screens/wallet/components/styles.cljs
@@ -121,8 +121,7 @@
 (def separator
   {:height            1
    :margin-horizontal 15
-   :background-color  styles/color-white-transparent-1
-   :margin-top        16})
+   :background-color  styles/color-white-transparent-1})
 
 (def button-text
   {:color          :white
diff --git a/src/status_im/ui/screens/wallet/main/styles.cljs b/src/status_im/ui/screens/wallet/main/styles.cljs
index ab573a5eb7..3383e9343c 100644
--- a/src/status_im/ui/screens/wallet/main/styles.cljs
+++ b/src/status_im/ui/screens/wallet/main/styles.cljs
@@ -101,7 +101,7 @@
 (defstyle buttons
   {:margin-top 34
    :android    {:margin-horizontal 21}
-   :ios        {:margin-horizontal 29}})
+   :ios        {:margin-horizontal 30}})
 
 (defstyle main-button-text
   {:padding-vertical   13
diff --git a/src/status_im/ui/screens/wallet/send/views.cljs b/src/status_im/ui/screens/wallet/send/views.cljs
index 423ecdb335..ed4431f535 100644
--- a/src/status_im/ui/screens/wallet/send/views.cljs
+++ b/src/status_im/ui/screens/wallet/send/views.cljs
@@ -101,14 +101,16 @@
      (re-frame/dispatch [:navigate-to :choose-recipient]))))
 
 (defview send-transaction []
-  (letsubs [transaction [:wallet.send/transaction]]
+  (letsubs [transaction [:wallet.send/transaction]
+            scroll      (atom nil)]
     (let [{:keys [amount amount-error signing? to-address to-name in-progress? sufficient-funds?]} transaction]
       [react/keyboard-avoiding-view wallet.styles/wallet-modal-container
        [react/view components.styles/flex
         [status-bar/status-bar {:type :wallet}]
         [toolbar-view signing?]
         [common/network-info {:text-color :white}]
-        [react/scroll-view {:keyboardShouldPersistTaps :always}
+        [react/scroll-view {:keyboardShouldPersistTaps :always
+                            :ref #(reset! scroll %)}
          [react/view components.styles/flex
           [react/view wallet.styles/choose-participant-container
            [components/choose-recipient {:address  to-address
@@ -121,6 +123,7 @@
             {:error         (or amount-error
                                 (when-not sufficient-funds? (i18n/label :t/wallet-insufficient-funds)))
              :input-options {:auto-focus     true
+                             :on-focus       (fn [] (when @scroll (js/setTimeout #(.scrollToEnd @scroll) 100)))
                              :default-value  amount
                              :on-change-text #(re-frame/dispatch [:wallet/set-and-validate-amount %])}}]
            [react/view wallet.styles/choose-currency-container
diff --git a/src/status_im/ui/screens/wallet/styles.cljs b/src/status_im/ui/screens/wallet/styles.cljs
index 17a69cb772..0423d23865 100644
--- a/src/status_im/ui/screens/wallet/styles.cljs
+++ b/src/status_im/ui/screens/wallet/styles.cljs
@@ -64,6 +64,7 @@
 
 (def amount-container
   {:margin-top        16
+   :margin-bottom     16
    :margin-horizontal 15
    :flex-direction    :row})