diff --git a/e2e/screenshots/simulator/recurring/Recurring_limit_limit/form.png b/e2e/screenshots/simulator/recurring/Recurring_limit_limit/form.png
index db3e35ebd..2d1f29108 100644
Binary files a/e2e/screenshots/simulator/recurring/Recurring_limit_limit/form.png and b/e2e/screenshots/simulator/recurring/Recurring_limit_limit/form.png differ
diff --git a/e2e/screenshots/simulator/recurring/Recurring_limit_limit/simulator-input-price.png b/e2e/screenshots/simulator/recurring/Recurring_limit_limit/simulator-input-price.png
index 8629403e5..2c5f8765c 100644
Binary files a/e2e/screenshots/simulator/recurring/Recurring_limit_limit/simulator-input-price.png and b/e2e/screenshots/simulator/recurring/Recurring_limit_limit/simulator-input-price.png differ
diff --git a/e2e/screenshots/simulator/recurring/Recurring_limit_range/form.png b/e2e/screenshots/simulator/recurring/Recurring_limit_range/form.png
index 54cbc496d..2b8d82142 100644
Binary files a/e2e/screenshots/simulator/recurring/Recurring_limit_range/form.png and b/e2e/screenshots/simulator/recurring/Recurring_limit_range/form.png differ
diff --git a/e2e/screenshots/simulator/recurring/Recurring_range_limit/form.png b/e2e/screenshots/simulator/recurring/Recurring_range_limit/form.png
index 1fc30a32a..f11577039 100644
Binary files a/e2e/screenshots/simulator/recurring/Recurring_range_limit/form.png and b/e2e/screenshots/simulator/recurring/Recurring_range_limit/form.png differ
diff --git a/e2e/screenshots/simulator/recurring/Recurring_range_range/form.png b/e2e/screenshots/simulator/recurring/Recurring_range_range/form.png
index 23fa689cf..de54620a1 100644
Binary files a/e2e/screenshots/simulator/recurring/Recurring_range_range/form.png and b/e2e/screenshots/simulator/recurring/Recurring_range_range/form.png differ
diff --git a/e2e/screenshots/simulator/recurring/Recurring_range_range/simulator-input-price.png b/e2e/screenshots/simulator/recurring/Recurring_range_range/simulator-input-price.png
index 6a056ab1a..5d55a6e28 100644
Binary files a/e2e/screenshots/simulator/recurring/Recurring_range_range/simulator-input-price.png and b/e2e/screenshots/simulator/recurring/Recurring_range_range/simulator-input-price.png differ
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/form.png
index a38048d44..5146d262d 100644
Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/form.png differ
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/deposit/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/deposit/form.png
index 5e77fad47..3cb6ee5b3 100644
Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/deposit/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/deposit/form.png differ
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/duplicate/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/duplicate/form.png
index 4a60aa919..0fc0705c2 100644
Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/duplicate/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/duplicate/form.png differ
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/editPrices/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/editPrices/form.png
index 42e681bf0..592b1acb0 100644
Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/editPrices/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/editPrices/form.png differ
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/undercut/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/undercut/form.png
index f5d89df50..f21736a9b 100644
Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/undercut/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/undercut/form.png differ
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/withdraw/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/withdraw/form.png
index fd3c7db39..dc39ea584 100644
Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/withdraw/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/withdraw/form.png differ
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/form.png
index e980f8273..88672578c 100644
Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/form.png differ
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_range/deposit/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_range/deposit/form.png
index cfd70d864..dab418d93 100644
Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_range/deposit/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_range/deposit/form.png differ
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_range/duplicate/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_range/duplicate/form.png
index 5055e9ee6..096da1647 100644
Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_range/duplicate/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_range/duplicate/form.png differ
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_range/editPrices/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_range/editPrices/form.png
index 3a2f1384c..d450a8f2f 100644
Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_range/editPrices/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_range/editPrices/form.png differ
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_range/undercut/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_range/undercut/form.png
index 735007060..4f6bca8b6 100644
Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_range/undercut/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_range/undercut/form.png differ
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_range/withdraw/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_range/withdraw/form.png
index cc2c2cfa1..8ce908e29 100644
Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_range/withdraw/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_range/withdraw/form.png differ
diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/create/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/create/form.png
index 39eb13a8d..2d788fad3 100644
Binary files a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/create/form.png and b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/create/form.png differ
diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/deposit/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/deposit/form.png
index 13d1f5a8d..a2f1f093b 100644
Binary files a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/deposit/form.png and b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/deposit/form.png differ
diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/duplicate/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/duplicate/form.png
index 2f9f7fa3a..59c7da910 100644
Binary files a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/duplicate/form.png and b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/duplicate/form.png differ
diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/editPrices/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/editPrices/form.png
index 3f9f36c17..b5c0e087d 100644
Binary files a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/editPrices/form.png and b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/editPrices/form.png differ
diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/undercut/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/undercut/form.png
index 704485f27..73a12d777 100644
Binary files a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/undercut/form.png and b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/undercut/form.png differ
diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/withdraw/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/withdraw/form.png
index d0bc9e5ca..e84aa6be9 100644
Binary files a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/withdraw/form.png and b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/withdraw/form.png differ
diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_range/create/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_range/create/form.png
index 23f214318..50d5cae71 100644
Binary files a/e2e/screenshots/strategy/disposable/Disposable_sell_range/create/form.png and b/e2e/screenshots/strategy/disposable/Disposable_sell_range/create/form.png differ
diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_range/deposit/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_range/deposit/form.png
index 680f3177f..ad06f7f2c 100644
Binary files a/e2e/screenshots/strategy/disposable/Disposable_sell_range/deposit/form.png and b/e2e/screenshots/strategy/disposable/Disposable_sell_range/deposit/form.png differ
diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_range/duplicate/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_range/duplicate/form.png
index 1e003777b..2159b9610 100644
Binary files a/e2e/screenshots/strategy/disposable/Disposable_sell_range/duplicate/form.png and b/e2e/screenshots/strategy/disposable/Disposable_sell_range/duplicate/form.png differ
diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_range/editPrices/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_range/editPrices/form.png
index f37458af8..b0b373111 100644
Binary files a/e2e/screenshots/strategy/disposable/Disposable_sell_range/editPrices/form.png and b/e2e/screenshots/strategy/disposable/Disposable_sell_range/editPrices/form.png differ
diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_range/undercut/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_range/undercut/form.png
index ae79358ac..52d497610 100644
Binary files a/e2e/screenshots/strategy/disposable/Disposable_sell_range/undercut/form.png and b/e2e/screenshots/strategy/disposable/Disposable_sell_range/undercut/form.png differ
diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_range/withdraw/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_range/withdraw/form.png
index 4aa36181b..b0730eeab 100644
Binary files a/e2e/screenshots/strategy/disposable/Disposable_sell_range/withdraw/form.png and b/e2e/screenshots/strategy/disposable/Disposable_sell_range/withdraw/form.png differ
diff --git a/e2e/screenshots/strategy/overlapping/Overlapping/create/form.png b/e2e/screenshots/strategy/overlapping/Overlapping/create/form.png
index 5642c5de8..46ada1e6b 100644
Binary files a/e2e/screenshots/strategy/overlapping/Overlapping/create/form.png and b/e2e/screenshots/strategy/overlapping/Overlapping/create/form.png differ
diff --git a/e2e/screenshots/strategy/overlapping/Overlapping/deposit/form.png b/e2e/screenshots/strategy/overlapping/Overlapping/deposit/form.png
index a5901c44b..f0190bb0b 100644
Binary files a/e2e/screenshots/strategy/overlapping/Overlapping/deposit/form.png and b/e2e/screenshots/strategy/overlapping/Overlapping/deposit/form.png differ
diff --git a/e2e/screenshots/strategy/overlapping/Overlapping/duplicate/form.png b/e2e/screenshots/strategy/overlapping/Overlapping/duplicate/form.png
index 81def4fae..2db24fa9c 100644
Binary files a/e2e/screenshots/strategy/overlapping/Overlapping/duplicate/form.png and b/e2e/screenshots/strategy/overlapping/Overlapping/duplicate/form.png differ
diff --git a/e2e/screenshots/strategy/overlapping/Overlapping/editPrices/form.png b/e2e/screenshots/strategy/overlapping/Overlapping/editPrices/form.png
index e7f300675..628d6f5d4 100644
Binary files a/e2e/screenshots/strategy/overlapping/Overlapping/editPrices/form.png and b/e2e/screenshots/strategy/overlapping/Overlapping/editPrices/form.png differ
diff --git a/e2e/screenshots/strategy/overlapping/Overlapping/undercut/form.png b/e2e/screenshots/strategy/overlapping/Overlapping/undercut/form.png
index 2c051bdfd..bf37494b7 100644
Binary files a/e2e/screenshots/strategy/overlapping/Overlapping/undercut/form.png and b/e2e/screenshots/strategy/overlapping/Overlapping/undercut/form.png differ
diff --git a/e2e/screenshots/strategy/overlapping/Overlapping/withdraw/form.png b/e2e/screenshots/strategy/overlapping/Overlapping/withdraw/form.png
index 05a5d4470..4ca819451 100644
Binary files a/e2e/screenshots/strategy/overlapping/Overlapping/withdraw/form.png and b/e2e/screenshots/strategy/overlapping/Overlapping/withdraw/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/create/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/create/form.png
index e32e85115..e3d2458ed 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/create/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/create/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/deposit/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/deposit/form.png
index 34ef7c3e0..42f5544f5 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/deposit/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/deposit/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/duplicate/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/duplicate/form.png
index 939ce015e..c6741172c 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/duplicate/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/duplicate/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/editPrices/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/editPrices/form.png
index 35417251b..a01849527 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/editPrices/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/editPrices/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/renew/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/renew/form.png
index a7335b278..f550d1b64 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/renew/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/renew/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/undercut/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/undercut/form.png
index e39698410..b16587f34 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/undercut/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/undercut/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/withdraw/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/withdraw/form.png
index b08c6975e..747d10e85 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/withdraw/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/withdraw/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_range/create/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_range/create/form.png
index 64f442ea7..b97c220ca 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_range/create/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_range/create/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_range/deposit/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_range/deposit/form.png
index c32a016d6..517e7151e 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_range/deposit/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_range/deposit/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_range/duplicate/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_range/duplicate/form.png
index 534c451e0..a964a3163 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_range/duplicate/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_range/duplicate/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_range/editPrices/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_range/editPrices/form.png
index 5117d40b1..840a1d0f6 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_range/editPrices/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_range/editPrices/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_range/renew/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_range/renew/form.png
index cb0af50da..fe92fd439 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_range/renew/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_range/renew/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_range/undercut/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_range/undercut/form.png
index 80adb31d6..e5490c185 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_range/undercut/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_range/undercut/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_range/withdraw/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_range/withdraw/form.png
index 7268ef3e6..d6706368e 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_range/withdraw/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_range/withdraw/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_limit/create/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_limit/create/form.png
index 228c75d28..d7555bf98 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_limit/create/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_limit/create/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_limit/deposit/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_limit/deposit/form.png
index a49c517b5..c5d01bcd5 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_limit/deposit/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_limit/deposit/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_limit/duplicate/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_limit/duplicate/form.png
index 68f49cc6b..48da93a78 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_limit/duplicate/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_limit/duplicate/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_limit/editPrices/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_limit/editPrices/form.png
index 63eee871a..a7c2b1466 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_limit/editPrices/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_limit/editPrices/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_limit/renew/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_limit/renew/form.png
index c75e01d4d..1b5b8004e 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_limit/renew/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_limit/renew/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_limit/undercut/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_limit/undercut/form.png
index cfa103abc..63ff0bf44 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_limit/undercut/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_limit/undercut/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_limit/withdraw/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_limit/withdraw/form.png
index b040c5046..51bbc6a67 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_limit/withdraw/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_limit/withdraw/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_range/create/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_range/create/form.png
index c6dec19f6..4b4882e87 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_range/create/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_range/create/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_range/deposit/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_range/deposit/form.png
index 8e37ce347..1cbddaeb1 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_range/deposit/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_range/deposit/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_range/duplicate/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_range/duplicate/form.png
index 147e36ddd..f545c3681 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_range/duplicate/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_range/duplicate/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_range/editPrices/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_range/editPrices/form.png
index 50fcbfdea..4796165da 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_range/editPrices/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_range/editPrices/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_range/renew/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_range/renew/form.png
index 9b8d1e9f7..96522b826 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_range/renew/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_range/renew/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_range/undercut/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_range/undercut/form.png
index d3e1ee55a..3aa493ad8 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_range/undercut/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_range/undercut/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_range/withdraw/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_range/withdraw/form.png
index 24a40d8f4..0961447d3 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_range/withdraw/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_range/withdraw/form.png differ
diff --git a/src/components/common/approval/ApproveToken.tsx b/src/components/common/approval/ApproveToken.tsx
index 15c653b0b..621435e29 100644
--- a/src/components/common/approval/ApproveToken.tsx
+++ b/src/components/common/approval/ApproveToken.tsx
@@ -206,7 +206,7 @@ export const ApproveToken: FC<Props> = ({
 
               <Button
                 type="submit"
-                variant="white"
+                variant="success"
                 size="sm"
                 className="text-14 px-10"
                 data-testid={`approve-${token.symbol}`}
diff --git a/src/components/common/button/buttonStyles.ts b/src/components/common/button/buttonStyles.ts
index f0875563b..6e494350b 100644
--- a/src/components/common/button/buttonStyles.ts
+++ b/src/components/common/button/buttonStyles.ts
@@ -51,7 +51,7 @@ const variants = {
 
 if (import.meta.env.VITE_USE_GRADIENT_BRANDING) {
   variants.variant.success = [
-    'transition-all duration-500 bg-[length:200%] bg-gradient-to-r from-primaryGradient-first via-primaryGradient-middle to-primaryGradient-last text-black',
+    'transition-all duration-500! bg-[length:200%] bg-gradient-to-r from-primaryGradient-first via-primaryGradient-middle to-primaryGradient-last text-black',
     'hover:bg-right hover:disabled:bg-left',
   ];
 }
diff --git a/src/components/common/datePicker/DateRangePicker.tsx b/src/components/common/datePicker/DateRangePicker.tsx
index 20153edeb..744f8b782 100644
--- a/src/components/common/datePicker/DateRangePicker.tsx
+++ b/src/components/common/datePicker/DateRangePicker.tsx
@@ -226,6 +226,7 @@ const Content = (props: Props) => {
           type="button"
           disabled={props.required && !hasDates}
           size="sm"
+          variant="success"
           className="col-span-2 justify-self-end"
           data-testid="date-picker-confirm"
           onClick={onConfirm}
diff --git a/src/components/core/error/ErrorUnsupportedNetwork.tsx b/src/components/core/error/ErrorUnsupportedNetwork.tsx
index e755c1fa6..2a3225dd9 100644
--- a/src/components/core/error/ErrorUnsupportedNetwork.tsx
+++ b/src/components/core/error/ErrorUnsupportedNetwork.tsx
@@ -16,7 +16,7 @@ export const ErrorUnsupportedNetwork = () => {
       text={`Please connect to ${networkName} using your wallet or the button below`}
       variant="error"
     >
-      <Button variant="white" fullWidth onClick={switchNetwork}>
+      <Button variant="success" fullWidth onClick={switchNetwork}>
         Change Network
       </Button>
       <Button variant="black" fullWidth onClick={disconnect}>
diff --git a/src/components/strategies/create/CreateForm.tsx b/src/components/strategies/create/CreateForm.tsx
index d3507f0aa..e4139c723 100644
--- a/src/components/strategies/create/CreateForm.tsx
+++ b/src/components/strategies/create/CreateForm.tsx
@@ -27,8 +27,6 @@ export const CreateForm: FC<FormProps> = (props) => {
   const { openModal } = useModal();
   const { user } = useWagmi();
   const search = useSearch({ strict: false }) as any;
-  const isSell =
-    type === 'disposable' && search.direction !== 'buy';
 
   const { isLoading, isProcessing, isAwaiting, createStrategy } =
     useCreateStrategy({ type, base, quote, order0, order1 });
@@ -91,7 +89,7 @@ export const CreateForm: FC<FormProps> = (props) => {
         <Button
           className="shrink-0"
           type="submit"
-          variant={isSell ? 'sell' : 'buy'}
+          variant="success"
           size="lg"
           fullWidth
           loading={loading}
diff --git a/src/components/strategies/edit/EditStrategyForm.tsx b/src/components/strategies/edit/EditStrategyForm.tsx
index 25ec2e4f1..1d099b4ae 100644
--- a/src/components/strategies/edit/EditStrategyForm.tsx
+++ b/src/components/strategies/edit/EditStrategyForm.tsx
@@ -248,7 +248,7 @@ export const EditStrategyForm: FC<Props> = (props) => {
         disabled={!hasChanged}
         loading={isLoading}
         loadingChildren={loadingChildren}
-        variant="white"
+        variant="success"
         size="lg"
         fullWidth
         data-testid="edit-submit"
diff --git a/src/components/strategies/overview/strategyBlock/StrategyBlockCreate.tsx b/src/components/strategies/overview/strategyBlock/StrategyBlockCreate.tsx
index 4b1a0f617..193f562e6 100644
--- a/src/components/strategies/overview/strategyBlock/StrategyBlockCreate.tsx
+++ b/src/components/strategies/overview/strategyBlock/StrategyBlockCreate.tsx
@@ -3,6 +3,7 @@ import { carbonEvents } from 'services/events';
 import { Link } from 'libs/routing';
 import { ReactComponent as IconPlus } from 'assets/icons/plus.svg';
 import { cn } from 'utils/helpers';
+import { buttonStyles } from 'components/common/button/buttonStyles';
 
 type Props = {
   title?: string;
@@ -12,6 +13,7 @@ export const StrategyBlockCreate: FC<Props> = ({
   title = 'Create Strategy',
   className = '',
 }) => {
+  console.log(`DEBUG: ${buttonStyles({ variant: 'success' })}`);
   return (
     <Link
       onClick={() => carbonEvents.strategy.newStrategyCreateClick(undefined)}
@@ -21,8 +23,13 @@ export const StrategyBlockCreate: FC<Props> = ({
         className
       )}
     >
-      <div className="bg-primary/15 group-hover:bg-primary/25 size-72 rounded-full md:size-80">
-        <IconPlus className="text-primary md:p-26 p-24" />
+      <div
+        className={cn(
+          buttonStyles({ variant: 'success' }),
+          'size-72 rounded-full px-0 md:size-80'
+        )}
+      >
+        <IconPlus className="md:p-26 p-24" />
       </div>
       <h1 className="w-[200px] text-center leading-9 md:w-[250px]">{title}</h1>
     </Link>
diff --git a/src/libs/modals/modals/ModalConfirm/ModalConfirm.tsx b/src/libs/modals/modals/ModalConfirm/ModalConfirm.tsx
index 4c4aaf25b..73cb53680 100644
--- a/src/libs/modals/modals/ModalConfirm/ModalConfirm.tsx
+++ b/src/libs/modals/modals/ModalConfirm/ModalConfirm.tsx
@@ -67,7 +67,7 @@ export const ModalConfirm: ModalFC<ModalCreateConfirmData> = ({
       </ul>
       <Button
         size="lg"
-        variant="white"
+        variant="success"
         fullWidth
         disabled={approvalRequired}
         onClick={async () => {
diff --git a/src/libs/modals/modals/ModalConfirmStrategy/ModalConfirmDelete.tsx b/src/libs/modals/modals/ModalConfirmStrategy/ModalConfirmDelete.tsx
index b35818147..dab5cf688 100644
--- a/src/libs/modals/modals/ModalConfirmStrategy/ModalConfirmDelete.tsx
+++ b/src/libs/modals/modals/ModalConfirmStrategy/ModalConfirmDelete.tsx
@@ -59,7 +59,7 @@ export const ModalConfirmDelete: ModalFC<ModalConfirmDeleteData> = ({
       />
       {!isOverlapping && (
         <article className="bg-background-800 grid grid-cols-[1fr_auto] grid-rows-[auto_auto] gap-8 rounded p-16">
-          <h3 className="text-14 font-weight-500">Did you know ?</h3>
+          <h3 className="text-14 font-weight-500">Did you know?</h3>
           <Link
             onClick={editPrices}
             disabled={isAwaiting || isProcessing}
@@ -68,7 +68,7 @@ export const ModalConfirmDelete: ModalFC<ModalConfirmDeleteData> = ({
             search={{ editType: 'editPrices' }}
             className={cn(
               'row-span-2 self-center',
-              buttonStyles({ variant: 'white' })
+              buttonStyles({ variant: 'success' })
             )}
           >
             Edit Prices
@@ -80,7 +80,7 @@ export const ModalConfirmDelete: ModalFC<ModalConfirmDeleteData> = ({
       )}
 
       <Button
-        variant="white"
+        variant="success"
         onClick={onClick}
         loading={isPending}
         loadingChildren={loadingChildren}
diff --git a/src/libs/modals/modals/ModalConfirmStrategy/ModalConfirmPause.tsx b/src/libs/modals/modals/ModalConfirmStrategy/ModalConfirmPause.tsx
index 128c9f178..42d4e0405 100644
--- a/src/libs/modals/modals/ModalConfirmStrategy/ModalConfirmPause.tsx
+++ b/src/libs/modals/modals/ModalConfirmStrategy/ModalConfirmPause.tsx
@@ -47,7 +47,7 @@ export const ModalConfirmPause: ModalFC<ModalConfirmPauseData> = ({
         onClick={handleOnActionClick}
         loading={isLoading}
         loadingChildren={loadingChildren}
-        variant="white"
+        variant="success"
         size="lg"
         fullWidth
         data-testid="pause-strategy-btn"
diff --git a/src/libs/modals/modals/ModalConfirmStrategy/ModalConfirmWithdraw.tsx b/src/libs/modals/modals/ModalConfirmStrategy/ModalConfirmWithdraw.tsx
index 68d7e386f..dc0510045 100644
--- a/src/libs/modals/modals/ModalConfirmStrategy/ModalConfirmWithdraw.tsx
+++ b/src/libs/modals/modals/ModalConfirmStrategy/ModalConfirmWithdraw.tsx
@@ -43,7 +43,7 @@ export const ModalConfirmWithdraw: ModalFC<ModalConfirmWithdrawData> = ({
         title="Are you sure you would like to withdraw your funds?"
       />
       <article className="grid grid-cols-[1fr_auto] grid-rows-[auto_auto] gap-8 rounded bg-white/10 p-16">
-        <h3 className="text-14 font-weight-500">Did you know ?</h3>
+        <h3 className="text-14 font-weight-500">Did you know?</h3>
         <Link
           onClick={edit}
           to={editPrices.to}
@@ -51,7 +51,7 @@ export const ModalConfirmWithdraw: ModalFC<ModalConfirmWithdrawData> = ({
           params={{ strategyId: strategy.id }}
           className={cn(
             'row-span-2 self-center',
-            buttonStyles({ variant: 'white' })
+            buttonStyles({ variant: 'success' })
           )}
         >
           Edit Prices
@@ -65,7 +65,7 @@ export const ModalConfirmWithdraw: ModalFC<ModalConfirmWithdrawData> = ({
         to={withdraw.to}
         search={withdraw.search}
         params={{ strategyId: strategy.id }}
-        className={buttonStyles({ variant: 'white' })}
+        className={buttonStyles({ variant: 'success' })}
         data-testid="withdraw-strategy-btn"
       >
         Withdraw Funds
diff --git a/src/libs/modals/modals/ModalDuplicateStrategy/ModalDuplicateStrategy.tsx b/src/libs/modals/modals/ModalDuplicateStrategy/ModalDuplicateStrategy.tsx
index 74a8d71a1..7bb90ced1 100644
--- a/src/libs/modals/modals/ModalDuplicateStrategy/ModalDuplicateStrategy.tsx
+++ b/src/libs/modals/modals/ModalDuplicateStrategy/ModalDuplicateStrategy.tsx
@@ -95,7 +95,7 @@ export const ModalDuplicateStrategy: ModalFC<ModalDuplicateStrategyData> = ({
             </div>
             <h3 className="text-14 font-weight-500">{title}</h3>
             <Button
-              variant="white"
+              variant="success"
               onClick={onClick}
               className="row-span-2 self-center"
               data-testid={testId}
diff --git a/src/libs/modals/modals/ModalSimulatorDisclaimer.tsx b/src/libs/modals/modals/ModalSimulatorDisclaimer.tsx
index 77c4e9c2d..08860501c 100644
--- a/src/libs/modals/modals/ModalSimulatorDisclaimer.tsx
+++ b/src/libs/modals/modals/ModalSimulatorDisclaimer.tsx
@@ -43,7 +43,7 @@ export const ModalSimulatorDisclaimer: ModalFC<
       </p>
 
       <Button
-        variant="white"
+        variant="success"
         fullWidth
         onClick={() => {
           onConfirm();
diff --git a/src/libs/modals/modals/ModalWithdrawOrDelete.tsx b/src/libs/modals/modals/ModalWithdrawOrDelete.tsx
index a79363b3c..6a9cd7d79 100644
--- a/src/libs/modals/modals/ModalWithdrawOrDelete.tsx
+++ b/src/libs/modals/modals/ModalWithdrawOrDelete.tsx
@@ -27,7 +27,7 @@ export const ModalWithdrawOrDelete: ModalFC<ModalWithdrawOrDeleteData> = ({
         />
       </div>
       <Button
-        variant="white"
+        variant="success"
         fullWidth
         onClick={() => {
           closeModal(id);
diff --git a/src/libs/modals/modals/WalletModal/ModalWalletError.tsx b/src/libs/modals/modals/WalletModal/ModalWalletError.tsx
index 47c0b7e45..dfc9c4e45 100644
--- a/src/libs/modals/modals/WalletModal/ModalWalletError.tsx
+++ b/src/libs/modals/modals/WalletModal/ModalWalletError.tsx
@@ -22,7 +22,7 @@ export const ModalWalletError: FC<Props> = ({
       <output className="rounded-10 bg-error/20 font-weight-500 text-error px-20 py-10">
         {error}
       </output>
-      <Button variant="white" onClick={onClick} fullWidth>
+      <Button variant="success" onClick={onClick} fullWidth>
         Back
       </Button>
     </>
diff --git a/src/pages/simulator/overlapping/index.tsx b/src/pages/simulator/overlapping/index.tsx
index d9ec5f78e..0af0cb78a 100644
--- a/src/pages/simulator/overlapping/index.tsx
+++ b/src/pages/simulator/overlapping/index.tsx
@@ -109,6 +109,7 @@ export const SimulatorInputOverlappingPage = () => {
         <Button
           type="submit"
           data-testid="start-simulation-btn"
+          variant="success"
           fullWidth
           size="lg"
           disabled={btnDisabled}
diff --git a/src/pages/simulator/recurring/index.tsx b/src/pages/simulator/recurring/index.tsx
index 95f7ac7c9..474a33d97 100644
--- a/src/pages/simulator/recurring/index.tsx
+++ b/src/pages/simulator/recurring/index.tsx
@@ -160,6 +160,7 @@ export const SimulatorInputRecurringPage = () => {
         <Button
           type="submit"
           data-testid="start-simulation-btn"
+          variant="success"
           fullWidth
           size="lg"
           disabled={btnDisabled}