diff --git a/src/status_im/subs.cljs b/src/status_im/subs.cljs
index cbd79722cb..dd1b191ccc 100644
--- a/src/status_im/subs.cljs
+++ b/src/status_im/subs.cljs
@@ -39,7 +39,6 @@
             [status-im.chat.models.mentions :as mentions]
             [status-im.notifications.core :as notifications]
             [status-im.utils.currency :as currency]
-            [status-im.signing.eip1559 :as eip1559]
             [clojure.set :as clojure.set]
             [status-im.ui.components.colors :as colors]))
 
@@ -2686,14 +2685,14 @@
  (fn [[_ address] _]
    [(re-frame/subscribe [:signing/tx])
     (re-frame/subscribe [:balance address])])
- (fn [[{:keys [amount token gas gasPrice approve? gas-error-message]} balance]]
-   (when-not (eip1559/sync-enabled?)
+ (fn [[{:keys [amount token gas gasPrice maxFeePerGas approve? gas-error-message]} balance]]
+   (let [gas-price (or maxFeePerGas gasPrice)]
      (if (and amount token (not approve?))
        (let [amount-bn (money/formatted->internal (money/bignumber amount) (:symbol token) (:decimals token))
              amount-error (or (get-amount-error amount (:decimals token))
                               (get-sufficient-funds-error balance (:symbol token) amount-bn))]
-         (merge amount-error (get-sufficient-gas-error gas-error-message balance (:symbol token) amount-bn gas gasPrice)))
-       (get-sufficient-gas-error gas-error-message balance nil nil gas gasPrice)))))
+         (merge amount-error (get-sufficient-gas-error gas-error-message balance (:symbol token) amount-bn gas gas-price)))
+       (get-sufficient-gas-error gas-error-message balance nil nil gas gas-price)))))
 
 (re-frame/reg-sub
  :wallet.send/prepare-transaction-with-balance
diff --git a/src/status_im/ui/screens/signing/sheets.cljs b/src/status_im/ui/screens/signing/sheets.cljs
index bba88087ff..02c7e33a85 100644
--- a/src/status_im/ui/screens/signing/sheets.cljs
+++ b/src/status_im/ui/screens/signing/sheets.cljs
@@ -112,39 +112,42 @@
        :margin-top        4
        :margin-bottom     26}
       [quo/text-input
-       {:label          (i18n/label :t/gas-amount-limit)
-        :error          (:error gas-edit)
-        :default-value  (:value gas-edit)
-        :on-change-text #(re-frame/dispatch [:signing.edit-fee.ui/edit-value :gas %])
-        :show-cancel    false}]]
+       {:label               (i18n/label :t/gas-amount-limit)
+        :accessibility-label :gas-amount-limit
+        :error               (:error gas-edit)
+        :default-value       (:value gas-edit)
+        :on-change-text      #(re-frame/dispatch [:signing.edit-fee.ui/edit-value :gas %])
+        :show-cancel         false}]]
      [react/view
       {:margin-horizontal 16
        :margin-top        4
        :margin-bottom     26}
       [quo/text-input
-       {:label          (i18n/label :t/per-gas-tip-limit)
-        :error          (or (:error max-priority-fee-per-gas-edit)
-                            (get-in max-priority-fee-per-gas-edit [:fee-error :label]))
-        :default-value  (str (:value max-priority-fee-per-gas-edit))
-        :on-change-text #(re-frame/dispatch [:signing.edit-fee.ui/edit-value :maxPriorityFeePerGas %])
-        :show-cancel    false
-        :after          {:component [quo/text
-                                     {:style {:color (quo-colors/get-color :text-02)}}
-                                     (i18n/label :t/gwei)]}}]]
+       {:label               (i18n/label :t/per-gas-tip-limit)
+        :accessibility-label :per-gas-tip-limit
+        :error               (or (:error max-priority-fee-per-gas-edit)
+                                 (get-in max-priority-fee-per-gas-edit [:fee-error :label]))
+        :default-value       (str (:value max-priority-fee-per-gas-edit))
+        :on-change-text      #(re-frame/dispatch [:signing.edit-fee.ui/edit-value :maxPriorityFeePerGas %])
+        :show-cancel         false
+        :after               {:component [quo/text
+                                          {:style {:color (quo-colors/get-color :text-02)}}
+                                          (i18n/label :t/gwei)]}}]]
      [react/view
       {:margin-horizontal 16
        :margin-top        4
        :margin-bottom     12}
       [quo/text-input
-       {:label          (i18n/label :t/per-gas-price-limit)
-        :error          (or (:error max-fee-per-gas-edit)
-                            (get-in max-fee-per-gas-edit [:fee-error :label]))
-        :default-value  (str (:value max-fee-per-gas-edit))
-        :on-change-text #(re-frame/dispatch [:signing.edit-fee.ui/edit-value :maxFeePerGas %])
-        :show-cancel    false
-        :after          {:component [quo/text
-                                     {:style {:color (quo-colors/get-color :text-02)}}
-                                     (i18n/label :t/gwei)]}}]]
+       {:label               (i18n/label :t/per-gas-price-limit)
+        :accessibility-label :per-gas-price-limit
+        :error               (or (:error max-fee-per-gas-edit)
+                                 (get-in max-fee-per-gas-edit [:fee-error :label]))
+        :default-value       (str (:value max-fee-per-gas-edit))
+        :on-change-text      #(re-frame/dispatch [:signing.edit-fee.ui/edit-value :maxFeePerGas %])
+        :show-cancel         false
+        :after               {:component [quo/text
+                                          {:style {:color (quo-colors/get-color :text-02)}}
+                                          (i18n/label :t/gwei)]}}]]
      [react/view {:margin-vertical  12
                   :height           1
                   :background-color colors/gray-lighter}]
@@ -187,10 +190,11 @@
              :content-height 270}])}
        "" #_(i18n/label :t/see-suggestions)]
       [quo/button
-       {:type     :primary
-        :disabled error?
-        :on-press #(re-frame/dispatch [:signing.edit-fee.ui/submit])
-        :theme    :accent}
+       {:type                :primary
+        :accessibility-label :save-fees
+        :disabled            error?
+        :on-press            #(re-frame/dispatch [:signing.edit-fee.ui/submit])
+        :theme               :accent}
        (i18n/label :t/save)]]]))
 
 (defn fee-bottom-sheet-eip1559 [fee-display-symbol]