diff --git a/app/_locales/am/messages.json b/app/_locales/am/messages.json
index 1d11f9a3572f..f059d1a6773b 100644
--- a/app/_locales/am/messages.json
+++ b/app/_locales/am/messages.json
@@ -663,12 +663,6 @@
   "settings": {
     "message": "ቅንብሮች"
   },
-  "showAdvancedGasInline": {
-    "message": "የላቁ የነዳጅ ቁጥጥሮች"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "በላክ እና አረጋግጥ ማያዎች ላይ የነዳጅ ዋጋን ለማሳየትና ቁጥጥሮችን ለመገደብ ይህን ይምረጡ።"
-  },
   "showFiatConversionInTestnets": {
     "message": "ልወጣን በ Testnets ላይ አሳይ"
   },
diff --git a/app/_locales/ar/messages.json b/app/_locales/ar/messages.json
index aac31f24665e..b9e3782be274 100644
--- a/app/_locales/ar/messages.json
+++ b/app/_locales/ar/messages.json
@@ -675,12 +675,6 @@
   "settings": {
     "message": "الإعدادات"
   },
-  "showAdvancedGasInline": {
-    "message": "أدوات التحكم المتقدمة للغاز"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "حدد هذا لإظهار سعر عملة جاس والحد من الضوابط مباشرة على شاشات الإرسال والتأكيد."
-  },
   "showFiatConversionInTestnets": {
     "message": "عرض التحويل على Testnets"
   },
diff --git a/app/_locales/bg/messages.json b/app/_locales/bg/messages.json
index eea674ea692a..80f5990d66e3 100644
--- a/app/_locales/bg/messages.json
+++ b/app/_locales/bg/messages.json
@@ -674,12 +674,6 @@
   "settings": {
     "message": "Настройки"
   },
-  "showAdvancedGasInline": {
-    "message": "Разширено управление на газа"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Изберете това, за да покажете цените на газа и ограничите контрола директно на екраните за изпращане и потвърждение."
-  },
   "showFiatConversionInTestnets": {
     "message": "Показване на преобразуването на Testnets"
   },
diff --git a/app/_locales/bn/messages.json b/app/_locales/bn/messages.json
index 736c1f72f4e9..d0efb575a723 100644
--- a/app/_locales/bn/messages.json
+++ b/app/_locales/bn/messages.json
@@ -672,12 +672,6 @@
   "settings": {
     "message": "সেটিংস"
   },
-  "showAdvancedGasInline": {
-    "message": "উন্নত গ্যাস নিয়ন্ত্রণসমূহ"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "গ্যাসের মূল্য দেখাতে এটি নির্বাচন করুন এবং পাঠানোর এবং নিশ্চিতকরণের স্ক্রিনগুলিতে নিয়ন্ত্রণগুলি সরাসরি সীমিত করুন।"
-  },
   "showFiatConversionInTestnets": {
     "message": "Testnets এ রূপান্তর দেখান"
   },
diff --git a/app/_locales/ca/messages.json b/app/_locales/ca/messages.json
index c382f3619b1e..bae6a1d6a15d 100644
--- a/app/_locales/ca/messages.json
+++ b/app/_locales/ca/messages.json
@@ -656,12 +656,6 @@
   "settings": {
     "message": "Configuració"
   },
-  "showAdvancedGasInline": {
-    "message": "Controls de gas avançats"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Selecciona això per a mostrar el preu del gas i els controls de límit directament a les pantalles d'enviament i confirmació."
-  },
   "showFiatConversionInTestnets": {
     "message": "Mostra Conversió a Testnets"
   },
diff --git a/app/_locales/da/messages.json b/app/_locales/da/messages.json
index 68974f4e7966..5c8056d60c69 100644
--- a/app/_locales/da/messages.json
+++ b/app/_locales/da/messages.json
@@ -656,12 +656,6 @@
   "settings": {
     "message": "Indstillinger "
   },
-  "showAdvancedGasInline": {
-    "message": "Avanceret Gas-styring"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Vælg dette for at vise brændstofprisen og begræns styringen direkte på afsendelses- og bekræftelseskærmene."
-  },
   "showFiatConversionInTestnets": {
     "message": "Vis konvertering på testnet"
   },
diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index a920e0116afe..125c3b7de194 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -3250,12 +3250,6 @@
   "show": {
     "message": "Zeigen"
   },
-  "showAdvancedGasInline": {
-    "message": "Erweiterte Gaskontrollen"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Wählen Sie dies aus, um den Gaspreis und die Limitkontrollen direkt auf den Senden- und Bestätigen-Bildschirmen anzuzeigen."
-  },
   "showFiatConversionInTestnets": {
     "message": "Umwandlung auf Testnets anzeigen"
   },
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
index 6a97d9d71ceb..c546cc525af9 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -3250,12 +3250,6 @@
   "show": {
     "message": "Εμφάνιση"
   },
-  "showAdvancedGasInline": {
-    "message": "Προωθημένος έλεγχος gas"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Επιλέξτε αυτό για να εμφανίσετε τις τιμές αερίου και να περιορίσετε τα στοιχεία ελέγχου απευθείας στις οθόνες αποστολής και επιβεβαίωσης."
-  },
   "showFiatConversionInTestnets": {
     "message": "Εμφάνιση Μετατροπής σε Δοκιμαστικά Δίκτυα"
   },
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 1aca00b814d9..5770bc805974 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -3423,12 +3423,6 @@
   "show": {
     "message": "Show"
   },
-  "showAdvancedGasInline": {
-    "message": "Advanced gas controls"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Select this to show gas price and limit controls directly on the send and confirm screens."
-  },
   "showFiatConversionInTestnets": {
     "message": "Show conversion on test networks"
   },
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index a2dc1a9fe61b..97a44bba6f63 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -3250,12 +3250,6 @@
   "show": {
     "message": "Mostrar"
   },
-  "showAdvancedGasInline": {
-    "message": "Controles avanzados de gas"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Seleccione esta opción para mostrar el precio del gas y limitar los controles directamente en las pantallas de envío y confirmación."
-  },
   "showFiatConversionInTestnets": {
     "message": "Mostrar conversión en redes de prueba"
   },
diff --git a/app/_locales/es_419/messages.json b/app/_locales/es_419/messages.json
index 5e90a0c91aa7..acf0766c93e8 100644
--- a/app/_locales/es_419/messages.json
+++ b/app/_locales/es_419/messages.json
@@ -2070,12 +2070,6 @@
   "show": {
     "message": "Mostrar"
   },
-  "showAdvancedGasInline": {
-    "message": "Controles avanzados de gas"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Seleccione esta opción para mostrar el precio del gas y limitar los controles directamente en las pantallas de envío y confirmación."
-  },
   "showFiatConversionInTestnets": {
     "message": "Mostrar conversión en redes de prueba"
   },
diff --git a/app/_locales/et/messages.json b/app/_locales/et/messages.json
index 1efe138a8db1..1df00a604197 100644
--- a/app/_locales/et/messages.json
+++ b/app/_locales/et/messages.json
@@ -668,12 +668,6 @@
   "settings": {
     "message": "Seaded"
   },
-  "showAdvancedGasInline": {
-    "message": "Täiustatud gaasijuhikud"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Valige see, et kuvada gaasi hinda ja piirangut otse saatmise ning kinnitamise kuval."
-  },
   "showFiatConversionInTestnets": {
     "message": "Kuva teisendus Testnetsis"
   },
diff --git a/app/_locales/fa/messages.json b/app/_locales/fa/messages.json
index ccf627d31540..6c623ffff0d7 100644
--- a/app/_locales/fa/messages.json
+++ b/app/_locales/fa/messages.json
@@ -678,12 +678,6 @@
   "settings": {
     "message": "تنظیمات"
   },
-  "showAdvancedGasInline": {
-    "message": "کنترول های پیشرفته گاز"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "این را انتخاب نمایید تا قیمت گاز را نشان داده و کنترول ها را بصورت مستقیم در صفحات ارسال و تأیید محدود نماید."
-  },
   "showFiatConversionInTestnets": {
     "message": "نمایش تغییرات Testnets"
   },
diff --git a/app/_locales/fi/messages.json b/app/_locales/fi/messages.json
index b43b0bc46caa..c651f2ce2532 100644
--- a/app/_locales/fi/messages.json
+++ b/app/_locales/fi/messages.json
@@ -675,12 +675,6 @@
   "settings": {
     "message": "Asetukset"
   },
-  "showAdvancedGasInline": {
-    "message": "Bensan lisävalvonta"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Valitse tämä näyttääksesi gas-hinta ja rajoittaaksesi  säätimiä suoraan lähetä- ja vahvista-ruuduissa."
-  },
   "showFiatConversionInTestnets": {
     "message": "Näytä vaihtokurssi koeverkoissa"
   },
diff --git a/app/_locales/fil/messages.json b/app/_locales/fil/messages.json
index 158a9b6dc5a7..db1a1563dc09 100644
--- a/app/_locales/fil/messages.json
+++ b/app/_locales/fil/messages.json
@@ -602,12 +602,6 @@
   "settings": {
     "message": "Mga Setting"
   },
-  "showAdvancedGasInline": {
-    "message": "Mga advanced na kontrol sa gas"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Piliin ito para ipakita ang presyo ng gas at limitahan ang mga kontrol nang direkta sa screen ng pagpapadala at pagkumpirma."
-  },
   "showFiatConversionInTestnets": {
     "message": "Ipakita ang Conversion sa mga Testnet"
   },
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index 1906a3a1f8f8..97de591ebb04 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -3250,12 +3250,6 @@
   "show": {
     "message": "Afficher"
   },
-  "showAdvancedGasInline": {
-    "message": "Contrôles de carburant avancés"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Sélectionnez cette option pour afficher le prix du carburant et les contrôles des limites directement sur les écrans d’envoi et de confirmation."
-  },
   "showFiatConversionInTestnets": {
     "message": "Afficher la conversion sur les testnets"
   },
diff --git a/app/_locales/he/messages.json b/app/_locales/he/messages.json
index ac025101079d..c260a1450696 100644
--- a/app/_locales/he/messages.json
+++ b/app/_locales/he/messages.json
@@ -675,12 +675,6 @@
   "settings": {
     "message": "הגדרות"
   },
-  "showAdvancedGasInline": {
-    "message": "אמצעי שליטה מתקדמים בדלק"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "בחר/י באפשרות זו כדי להציג אמצעי שליטה במחיר הדלק וההגבלה (limit) ישירות במסכי השליחה והאישור."
-  },
   "showFiatConversionInTestnets": {
     "message": "הצג המרה -Testnets"
   },
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
index 03307179f588..5b7fe87f558a 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -3250,12 +3250,6 @@
   "show": {
     "message": "दिखाएं"
   },
-  "showAdvancedGasInline": {
-    "message": "उन्नत गैस नियंत्रण"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "गैस मूल्य और सीमा नियंत्रण को सीधे भेजने और पुष्टि करने की स्क्रीन पर दिखाने के लिए इसका चयन करें।"
-  },
   "showFiatConversionInTestnets": {
     "message": "टेस्ट नेटवर्क पर रूपांतरण दिखाएं"
   },
diff --git a/app/_locales/hr/messages.json b/app/_locales/hr/messages.json
index decdfbb9cb94..20f834514560 100644
--- a/app/_locales/hr/messages.json
+++ b/app/_locales/hr/messages.json
@@ -671,12 +671,6 @@
   "settings": {
     "message": "Postavke"
   },
-  "showAdvancedGasInline": {
-    "message": "Napredno upravljanje gorivom"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Odaberite ovu stavku za prikaz cijene goriva i izravno ograničite kontrole prilikom slanja i potvrđivanja zaslona."
-  },
   "showFiatConversionInTestnets": {
     "message": "Prikaži konverziju na usluzi Testnets"
   },
diff --git a/app/_locales/hu/messages.json b/app/_locales/hu/messages.json
index 340e7e7c1f02..970578cc2c8b 100644
--- a/app/_locales/hu/messages.json
+++ b/app/_locales/hu/messages.json
@@ -671,12 +671,6 @@
   "settings": {
     "message": "Beállítások"
   },
-  "showAdvancedGasInline": {
-    "message": "Speciális gázszabályzók"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Jelöld meg ezt a gázárak és korlátozásellenőrzés mutatásához közvetlenül a küldési és megerősítési képernyőkön."
-  },
   "showFiatConversionInTestnets": {
     "message": "Konverzió mutatása Testnetsen"
   },
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
index 07aae2ce06e4..f9e095eb27d3 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -3250,12 +3250,6 @@
   "show": {
     "message": "Tampil"
   },
-  "showAdvancedGasInline": {
-    "message": "Kontrol gas lanjutan"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Pilih ini untuk menampilkan biaya gas dan kontrol batas secara langsung di layar kirim dan konfirmasi."
-  },
   "showFiatConversionInTestnets": {
     "message": "Tampilkan konversi di jaringan uji"
   },
diff --git a/app/_locales/it/messages.json b/app/_locales/it/messages.json
index 8e6e396831c3..c9de9fef8d67 100644
--- a/app/_locales/it/messages.json
+++ b/app/_locales/it/messages.json
@@ -1470,12 +1470,6 @@
   "settings": {
     "message": "Impostazioni"
   },
-  "showAdvancedGasInline": {
-    "message": "Controlli gas avanzati"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Seleziona per visualizzare i controlli su prezzo e limite del gas nelle schermate di invio e conferma."
-  },
   "showFiatConversionInTestnets": {
     "message": "Mostra conversione nelle reti di test"
   },
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index 3320c1442012..8ad925bfa40c 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -3250,12 +3250,6 @@
   "show": {
     "message": "表示"
   },
-  "showAdvancedGasInline": {
-    "message": "高度なガスコントロール"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "これを選択すると、ガス代と限度額のコントロールが送金画面と確認画面に直接表示されます。"
-  },
   "showFiatConversionInTestnets": {
     "message": "テストネット上に変換を表示"
   },
diff --git a/app/_locales/kn/messages.json b/app/_locales/kn/messages.json
index b1ab67888b3a..4a99bac7b3d0 100644
--- a/app/_locales/kn/messages.json
+++ b/app/_locales/kn/messages.json
@@ -678,12 +678,6 @@
   "settings": {
     "message": "ಸೆಟ್ಟಿಂಗ್‌ಗಳು"
   },
-  "showAdvancedGasInline": {
-    "message": "ಸುಧಾರಿತ ಗ್ಯಾಸ್ ನಿಯಂತ್ರಣಗಳು"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "ಕಳುಹಿಸುವ ಮತ್ತು ಖಚಿತಪಡಿಸುವ ಪರದೆಯ ಮೇಲೆ ನೇರವಾಗಿ ಗ್ಯಾಸ್ ಬೆಲೆ ಮತ್ತು ಮಿತಿಯ ನಿಯಂತ್ರಣಗಳನ್ನು ತೋರಿಸಲು ಇದನ್ನು ಆಯ್ಕೆಮಾಡಿ."
-  },
   "showFiatConversionInTestnets": {
     "message": "Testnets ನಲ್ಲಿ ಪರಿವರ್ತನೆಯನ್ನು ತೋರಿಸಿ"
   },
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index 01f792772edd..08e8f864e714 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -3250,12 +3250,6 @@
   "show": {
     "message": "보기"
   },
-  "showAdvancedGasInline": {
-    "message": "고급 가스 제어 기능"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "이 항목을 선택하면 보내기 및 확인 화면에서 바로 가스 가격과 한도 조절을 확인할 수 있습니다."
-  },
   "showFiatConversionInTestnets": {
     "message": "테스트넷에 전환 표시"
   },
diff --git a/app/_locales/lt/messages.json b/app/_locales/lt/messages.json
index d39141facc2d..699c2ddb8d02 100644
--- a/app/_locales/lt/messages.json
+++ b/app/_locales/lt/messages.json
@@ -678,12 +678,6 @@
   "settings": {
     "message": "Nustatymai"
   },
-  "showAdvancedGasInline": {
-    "message": "Išplėstiniai dujų valdikliai"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Pasirinkite tai, kad būtų rodoma dujų kaina, ir ribokite valdymo elementus tiesiogiai siuntimo ir patvirtinimo ekranuose."
-  },
   "showFiatConversionInTestnets": {
     "message": "Rodyti keitimą „Testnet“"
   },
diff --git a/app/_locales/lv/messages.json b/app/_locales/lv/messages.json
index d174f8442d1e..bf6a65327439 100644
--- a/app/_locales/lv/messages.json
+++ b/app/_locales/lv/messages.json
@@ -674,12 +674,6 @@
   "settings": {
     "message": "Iestatījumi"
   },
-  "showAdvancedGasInline": {
-    "message": "Papildu Gas vadīklas"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Atlasiet šo, lai parādītu Gas cenu un ierobežotu kontroles iespējas tieši sūtīšanas un apstiprināšanas ekrānos."
-  },
   "showFiatConversionInTestnets": {
     "message": "Rādīt konversiju testa tīklos"
   },
diff --git a/app/_locales/ms/messages.json b/app/_locales/ms/messages.json
index 5dd5a821699e..c40ac453f9d3 100644
--- a/app/_locales/ms/messages.json
+++ b/app/_locales/ms/messages.json
@@ -658,12 +658,6 @@
   "settings": {
     "message": "Tetapan"
   },
-  "showAdvancedGasInline": {
-    "message": "Kawalan gas lanjutan"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Pilih ini untuk menunjukkan harga gas dan kawalan had terus di skrin hantar dan sahkan."
-  },
   "showFiatConversionInTestnets": {
     "message": "Tunjukkan Penukaran di Testnets"
   },
diff --git a/app/_locales/no/messages.json b/app/_locales/no/messages.json
index 5e904cf861f2..dd803372cd11 100644
--- a/app/_locales/no/messages.json
+++ b/app/_locales/no/messages.json
@@ -659,12 +659,6 @@
   "settings": {
     "message": "Innstillinger"
   },
-  "showAdvancedGasInline": {
-    "message": "Avanserte datakraftskontroller"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Velg dette for å vise bensinpris og begrensningskontroller direkte på send- og bekreftskjermbildene."
-  },
   "showFiatConversionInTestnets": {
     "message": "Vis konvertering på Testnets "
   },
diff --git a/app/_locales/ph/messages.json b/app/_locales/ph/messages.json
index 48f21c3c4baf..4fc1c3f086fd 100644
--- a/app/_locales/ph/messages.json
+++ b/app/_locales/ph/messages.json
@@ -1320,12 +1320,6 @@
   "settings": {
     "message": "Mga Setting"
   },
-  "showAdvancedGasInline": {
-    "message": "Mga advanced na kontrol sa gas"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Piliin ito para direktang maipakita ang presyo ng gas at mga kontrol sa limitasyon sa mga screen ng pagpapadala at pagkumpirma."
-  },
   "showFiatConversionInTestnets": {
     "message": "Ipakita ang Conversion sa Testnets"
   },
diff --git a/app/_locales/pl/messages.json b/app/_locales/pl/messages.json
index 531164a020e8..0e10fedfd569 100644
--- a/app/_locales/pl/messages.json
+++ b/app/_locales/pl/messages.json
@@ -672,12 +672,6 @@
   "settings": {
     "message": "Ustawienia"
   },
-  "showAdvancedGasInline": {
-    "message": "Zaawansowana kontrola gazu"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Wybierz tę opcję, aby móc zmienić cenę i limit gazu bezpośrednio na ekranach wysyłania i potwierdzania."
-  },
   "showFiatConversionInTestnets": {
     "message": "Pokaż przeliczanie w sieciach testowych"
   },
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index 544cc1998a2d..8da0e5df6a48 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -3250,12 +3250,6 @@
   "show": {
     "message": "Exibir"
   },
-  "showAdvancedGasInline": {
-    "message": "Controles avançados de gás"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Selecione isso para mostrar o preço do gás e limitar os controles diretamente nas telas de envio e de confirmação."
-  },
   "showFiatConversionInTestnets": {
     "message": "Mostrar conversão nas redes de teste"
   },
diff --git a/app/_locales/pt_BR/messages.json b/app/_locales/pt_BR/messages.json
index e051519b879b..f4bf0e889b1c 100644
--- a/app/_locales/pt_BR/messages.json
+++ b/app/_locales/pt_BR/messages.json
@@ -2070,12 +2070,6 @@
   "show": {
     "message": "Mostrar"
   },
-  "showAdvancedGasInline": {
-    "message": "Controles avançados de gás"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Selecione isso para mostrar o preço do gás e limitar os controles diretamente nas telas de envio e de confirmação."
-  },
   "showFiatConversionInTestnets": {
     "message": "Mostrar conversão nas redes de teste"
   },
diff --git a/app/_locales/ro/messages.json b/app/_locales/ro/messages.json
index 4fc35628625c..7c452f913cc2 100644
--- a/app/_locales/ro/messages.json
+++ b/app/_locales/ro/messages.json
@@ -665,12 +665,6 @@
   "settings": {
     "message": "Setări"
   },
-  "showAdvancedGasInline": {
-    "message": "Controale avansate pentru gas"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Selectați aceasta pentru a arăta prețul gasului și comenzile de limitare direct pe ecranele de trimitere și confirmare."
-  },
   "showFiatConversionInTestnets": {
     "message": "Afișează conversiile pe rețelele de test (testnets)"
   },
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index 89293012dc4a..d9ca247589d6 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -3250,12 +3250,6 @@
   "show": {
     "message": "Показать"
   },
-  "showAdvancedGasInline": {
-    "message": "Расширенное управление газом"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Выберите это, чтобы отображать цену газа и управление лимитами непосредственно на экранах отправки и подтверждения."
-  },
   "showFiatConversionInTestnets": {
     "message": "Показывать конвертацию в тестовых сетях"
   },
diff --git a/app/_locales/sk/messages.json b/app/_locales/sk/messages.json
index 7ab10cf1e29e..0bfcaff588ea 100644
--- a/app/_locales/sk/messages.json
+++ b/app/_locales/sk/messages.json
@@ -650,12 +650,6 @@
   "settings": {
     "message": "Nastavení"
   },
-  "showAdvancedGasInline": {
-    "message": "Pokročilé ovládacie prvky GAS"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Vyberte túto možnosť vtedy, keď chcete priamo na obrazovke odosielania a potvrdenia zobraziť ceny za GAS a ovládacie prvky limitov."
-  },
   "showFiatConversionInTestnets": {
     "message": "Zobraziť konverziu na Testnets"
   },
diff --git a/app/_locales/sl/messages.json b/app/_locales/sl/messages.json
index 2c774019e850..31c068ce2289 100644
--- a/app/_locales/sl/messages.json
+++ b/app/_locales/sl/messages.json
@@ -666,12 +666,6 @@
   "settings": {
     "message": "Nastavitve"
   },
-  "showAdvancedGasInline": {
-    "message": "Napredno krmiljenje plina"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Izberite to možnost, če želite prikazati ceno plina in omejiti nadzor neposredno na zaslonih za pošiljanje in potrditev."
-  },
   "showFiatConversionInTestnets": {
     "message": "Pokažite pretvorbo na testnih omrežjih"
   },
diff --git a/app/_locales/sr/messages.json b/app/_locales/sr/messages.json
index c87c6972c1f0..125ac7882828 100644
--- a/app/_locales/sr/messages.json
+++ b/app/_locales/sr/messages.json
@@ -669,12 +669,6 @@
   "settings": {
     "message": "Podešavanja"
   },
-  "showAdvancedGasInline": {
-    "message": "Napredne kontrole gasa"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Izaberite ovo kako biste prikazali cenu gasa i kontrole limita direktno na ekranima za slanje i potvrđivanje."
-  },
   "showFiatConversionInTestnets": {
     "message": "Prikažite konverzije na Testnet"
   },
diff --git a/app/_locales/sv/messages.json b/app/_locales/sv/messages.json
index f8912daa6e42..216e01787ae5 100644
--- a/app/_locales/sv/messages.json
+++ b/app/_locales/sv/messages.json
@@ -662,12 +662,6 @@
   "settings": {
     "message": "Inställningar"
   },
-  "showAdvancedGasInline": {
-    "message": "Avancerade gaskontroller"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Välj detta för att visa gas-pris och gränskontroller direkt på skicka och bekräfta-skärmarna."
-  },
   "showFiatConversionInTestnets": {
     "message": "Visa omvandling på testnätverk"
   },
diff --git a/app/_locales/sw/messages.json b/app/_locales/sw/messages.json
index c50e6e0bc774..e49fb4d89f7a 100644
--- a/app/_locales/sw/messages.json
+++ b/app/_locales/sw/messages.json
@@ -656,12 +656,6 @@
   "settings": {
     "message": "Mipangilio"
   },
-  "showAdvancedGasInline": {
-    "message": "Udhibiti wa juu wa gesi"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Chagua hii ili uonyeshe bei ya gesi na punguza vidhibiti moja kwa moja kwenye skrini za tuma na thibitisha."
-  },
   "showFiatConversionInTestnets": {
     "message": "Onyesha Ubadilishaji kwenye Testnets"
   },
diff --git a/app/_locales/th/messages.json b/app/_locales/th/messages.json
index 42b71a318fd0..273340d23052 100644
--- a/app/_locales/th/messages.json
+++ b/app/_locales/th/messages.json
@@ -344,9 +344,6 @@
   "settings": {
     "message": "การตั้งค่า"
   },
-  "showAdvancedGasInline": {
-    "message": "การควบคุม Gas ขั้นสูง"
-  },
   "showPrivateKeys": {
     "message": "แสดงคีย์ส่วนตัว"
   },
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
index ef944e308713..10886a0cc157 100644
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@@ -3250,12 +3250,6 @@
   "show": {
     "message": "Ipakita"
   },
-  "showAdvancedGasInline": {
-    "message": "Mga advanced na kontrol sa gas"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Piliin ito para direktang maipakita ang presyo ng gas at mga kontrol sa limitasyon sa mga screen ng pagpapadala at pagkumpirma."
-  },
   "showFiatConversionInTestnets": {
     "message": "Ipakita ang Conversion sa Testnets"
   },
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index eb3841356acd..cf3cb89ce046 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -3250,12 +3250,6 @@
   "show": {
     "message": "Göster"
   },
-  "showAdvancedGasInline": {
-    "message": "Gelişmiş gaz kontrolleri"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Gaz fiyatı ve limit kontrollerini doğrudan gönder ve onayla ekranlarında göstermek için bunu seçin."
-  },
   "showFiatConversionInTestnets": {
     "message": "Test ağlarında dönüşümü göster"
   },
diff --git a/app/_locales/uk/messages.json b/app/_locales/uk/messages.json
index 83f6857dee85..082257a30516 100644
--- a/app/_locales/uk/messages.json
+++ b/app/_locales/uk/messages.json
@@ -678,12 +678,6 @@
   "settings": {
     "message": "Налаштування"
   },
-  "showAdvancedGasInline": {
-    "message": "Розширене керування газом"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Виберіть цей параметр, щоб відображати регулятори ціни й ліміту газу на екранах надсилання й підтвердження."
-  },
   "showFiatConversionInTestnets": {
     "message": "Показати бесіду у Testnet"
   },
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index 1aebc6b67c6c..05ccf3799cd5 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -3250,12 +3250,6 @@
   "show": {
     "message": "Hiển thị"
   },
-  "showAdvancedGasInline": {
-    "message": "Quyền kiểm soát gas nâng cao"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "Chọn tùy chọn này để hiển thị các quyền kiểm soát giá gas và giới hạn ngay trên màn hình gửi và xác nhận."
-  },
   "showFiatConversionInTestnets": {
     "message": "Hiển thị tỷ lệ quy đổi trên các mạng thử nghiệm"
   },
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index 78d5099ef13e..702241f88f80 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -3250,12 +3250,6 @@
   "show": {
     "message": "显示"
   },
-  "showAdvancedGasInline": {
-    "message": "高级燃料控制"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "选择此项可直接在发送和确认界面显示燃料价格和上限控制。"
-  },
   "showFiatConversionInTestnets": {
     "message": "在测试网络上显示转换"
   },
diff --git a/app/_locales/zh_TW/messages.json b/app/_locales/zh_TW/messages.json
index ccb72664bb66..ae2f8f666071 100644
--- a/app/_locales/zh_TW/messages.json
+++ b/app/_locales/zh_TW/messages.json
@@ -1245,12 +1245,6 @@
   "settings": {
     "message": "設定"
   },
-  "showAdvancedGasInline": {
-    "message": "顯示進階 gas 控制選項"
-  },
-  "showAdvancedGasInlineDescription": {
-    "message": "選擇此項會在傳送或確認畫面顯示可微調 gas 價格以及 gas 上限的功能"
-  },
   "showFiatConversionInTestnets": {
     "message": "在測試網上顯示匯率"
   },
diff --git a/test/e2e/metamask-ui.spec.js b/test/e2e/metamask-ui.spec.js
index 6f3754bd8879..6cc81b4008d7 100644
--- a/test/e2e/metamask-ui.spec.js
+++ b/test/e2e/metamask-ui.spec.js
@@ -346,13 +346,10 @@ describe('MetaMask', function () {
     });
 
     it('finds the transaction in the transactions list', async function () {
-      await driver.waitForSelector(
-        {
-          css: '.transaction-list__completed-transactions .transaction-list-item__primary-currency',
-          text: '-1 TST',
-        },
-        { timeout: 10000 },
-      );
+      await driver.waitForSelector({
+        css: '.transaction-list__completed-transactions .transaction-list-item__primary-currency',
+        text: '-1 TST',
+      });
 
       await driver.waitForSelector({
         css: '.list-item__heading',
@@ -380,13 +377,10 @@ describe('MetaMask', function () {
       await driver.delay(largeDelayMs);
 
       await driver.findElements('.transaction-list__pending-transactions');
-      await driver.waitForSelector(
-        {
-          css: '.transaction-list-item__primary-currency',
-          text: '-1.5 TST',
-        },
-        { timeout: 10000 },
-      );
+      await driver.waitForSelector({
+        css: '.transaction-list-item__primary-currency',
+        text: '-1.5 TST',
+      });
       await driver.clickElement('.transaction-list-item__primary-currency');
       await driver.delay(regularDelayMs);
 
diff --git a/test/e2e/nft/erc721-interaction.spec.js b/test/e2e/nft/erc721-interaction.spec.js
index 967c33f1e6bd..6e9a9e959669 100644
--- a/test/e2e/nft/erc721-interaction.spec.js
+++ b/test/e2e/nft/erc721-interaction.spec.js
@@ -59,7 +59,6 @@ describe('ERC721 NFTs testdapp interaction', function () {
         await driver.clickElement('[data-testid="home__activity-tab"]');
         await driver.waitForSelector(
           '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
-          { timeout: 10000 },
         );
 
         // Verify transaction
@@ -130,7 +129,6 @@ describe('ERC721 NFTs testdapp interaction', function () {
         await driver.clickElement('[data-testid="home__activity-tab"]');
         await driver.waitForSelector(
           '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
-          { timeout: 10000 },
         );
 
         // Verify transaction
@@ -202,7 +200,6 @@ describe('ERC721 NFTs testdapp interaction', function () {
         await driver.clickElement('[data-testid="home__activity-tab"]');
         await driver.waitForSelector(
           '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
-          { timeout: 10000 },
         );
 
         // Verify transaction
@@ -277,7 +274,6 @@ describe('ERC721 NFTs testdapp interaction', function () {
         await driver.clickElement('[data-testid="home__activity-tab"]');
         await driver.waitForSelector(
           '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
-          { timeout: 10000 },
         );
 
         // Verify transaction
diff --git a/test/e2e/tests/address-book.spec.js b/test/e2e/tests/address-book.spec.js
index 9184afb04a60..af1214521712 100644
--- a/test/e2e/tests/address-book.spec.js
+++ b/test/e2e/tests/address-book.spec.js
@@ -63,13 +63,10 @@ describe('Address Book', function () {
           return confirmedTxes.length === 1;
         }, 10000);
 
-        await driver.waitForSelector(
-          {
-            css: '.transaction-list-item__primary-currency',
-            text: '-2 ETH',
-          },
-          { timeout: 10000 },
-        );
+        await driver.waitForSelector({
+          css: '.transaction-list-item__primary-currency',
+          text: '-2 ETH',
+        });
       },
     );
   });
diff --git a/test/e2e/tests/clear-activity.spec.js b/test/e2e/tests/clear-activity.spec.js
index 12903510c414..a16254c9cc0c 100644
--- a/test/e2e/tests/clear-activity.spec.js
+++ b/test/e2e/tests/clear-activity.spec.js
@@ -34,14 +34,14 @@ describe('Clear account activity', function () {
 
         // Check send transaction and receive transaction history are all displayed
         await driver.clickElement('[data-testid="home__activity-tab"]');
-        await driver.waitForSelector(
-          { css: '.list-item__title', text: 'Send' },
-          { timeout: 10000 },
-        );
-        await driver.waitForSelector(
-          { css: '.list-item__title', text: 'Receive' },
-          { timeout: 10000 },
-        );
+        await driver.waitForSelector({
+          css: '.list-item__title',
+          text: 'Send',
+        });
+        await driver.waitForSelector({
+          css: '.list-item__title',
+          text: 'Receive',
+        });
 
         // Clear activity and nonce data
         await driver.clickElement('.account-menu__icon');
diff --git a/test/e2e/tests/contract-interactions.spec.js b/test/e2e/tests/contract-interactions.spec.js
index b13fe9826915..dbfcd525951f 100644
--- a/test/e2e/tests/contract-interactions.spec.js
+++ b/test/e2e/tests/contract-interactions.spec.js
@@ -63,15 +63,11 @@ describe('Deploy contract and call contract methods', function () {
         await driver.clickElement({ text: 'Activity', tag: 'button' });
         await driver.waitForSelector(
           '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
-          { timeout: 10000 },
-        );
-        await driver.waitForSelector(
-          {
-            css: '.transaction-list-item__primary-currency',
-            text: '-4 ETH',
-          },
-          { timeout: 10000 },
         );
+        await driver.waitForSelector({
+          css: '.transaction-list-item__primary-currency',
+          text: '-4 ETH',
+        });
 
         // calls and confirms a contract method where ETH is received
         await driver.switchToWindow(dapp);
@@ -87,26 +83,19 @@ describe('Deploy contract and call contract methods', function () {
         await driver.switchToWindow(extension);
         await driver.waitForSelector(
           '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(2)',
-          { timeout: 10000 },
-        );
-        await driver.waitForSelector(
-          {
-            css: '.transaction-list-item__primary-currency',
-            text: '-0 ETH',
-          },
-          { timeout: 10000 },
         );
+        await driver.waitForSelector({
+          css: '.transaction-list-item__primary-currency',
+          text: '-0 ETH',
+        });
 
         // renders the correct ETH balance
         await driver.switchToWindow(extension);
         const balance = await ganacheServer.getBalance();
-        const balanceElement = await driver.waitForSelector(
-          {
-            css: '[data-testid="eth-overview__primary-currency"]',
-            text: balance,
-          },
-          { timeout: 10000 },
-        );
+        const balanceElement = await driver.waitForSelector({
+          css: '[data-testid="eth-overview__primary-currency"]',
+          text: balance,
+        });
         assert.equal(`${balance}\nETH`, await balanceElement.getText());
       },
     );
diff --git a/test/e2e/tests/failing-contract.spec.js b/test/e2e/tests/failing-contract.spec.js
index 3391d878ee65..7f0dd766e3f1 100644
--- a/test/e2e/tests/failing-contract.spec.js
+++ b/test/e2e/tests/failing-contract.spec.js
@@ -71,7 +71,6 @@ describe('Failing contract interaction ', function () {
         await driver.clickElement({ text: 'Activity', tag: 'button' });
         await driver.waitForSelector(
           '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
-          { timeout: 10000 },
         );
 
         // display the transaction status
@@ -157,7 +156,6 @@ describe('Failing contract interaction on non-EIP1559 network', function () {
         await driver.clickElement({ text: 'Activity', tag: 'button' });
         await driver.waitForSelector(
           '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
-          { timeout: 10000 },
         );
 
         // display the transaction status
diff --git a/test/e2e/tests/from-import-ui.spec.js b/test/e2e/tests/from-import-ui.spec.js
index e56882c05728..892453c17b35 100644
--- a/test/e2e/tests/from-import-ui.spec.js
+++ b/test/e2e/tests/from-import-ui.spec.js
@@ -267,13 +267,10 @@ describe('MetaMask Import UI', function () {
         await driver.clickElement({ text: 'Remove', tag: 'button' });
 
         // Wait until selected account switches away from removed account to first account
-        await driver.waitForSelector(
-          {
-            css: '.selected-account__name',
-            text: 'Account 1',
-          },
-          { timeout: 10000 },
-        );
+        await driver.waitForSelector({
+          css: '.selected-account__name',
+          text: 'Account 1',
+        });
 
         await driver.delay(regularDelayMs);
         await driver.clickElement('.account-menu__icon');
diff --git a/test/e2e/tests/metamask-responsive-ui.spec.js b/test/e2e/tests/metamask-responsive-ui.spec.js
index 36811bc38660..4c83081c2ba8 100644
--- a/test/e2e/tests/metamask-responsive-ui.spec.js
+++ b/test/e2e/tests/metamask-responsive-ui.spec.js
@@ -163,13 +163,10 @@ describe('MetaMask Responsive UI', function () {
           return confirmedTxes.length === 1;
         }, 10000);
 
-        await driver.waitForSelector(
-          {
-            css: '.transaction-list-item__primary-currency',
-            text: '-1 ETH',
-          },
-          { timeout: 10000 },
-        );
+        await driver.waitForSelector({
+          css: '.transaction-list-item__primary-currency',
+          text: '-1 ETH',
+        });
       },
     );
   });
diff --git a/test/e2e/tests/navigate-transactions.spec.js b/test/e2e/tests/navigate-transactions.spec.js
index 3e272838d385..9a0011b34e2b 100644
--- a/test/e2e/tests/navigate-transactions.spec.js
+++ b/test/e2e/tests/navigate-transactions.spec.js
@@ -136,13 +136,10 @@ describe('Navigate transactions', function () {
         const windowHandles = await driver.getAllWindowHandles();
         const extension = windowHandles[0];
         await driver.switchToWindow(extension);
-        navigationElement = await driver.waitForSelector(
-          {
-            css: '.confirm-page-container-navigation',
-            text: '2 of 5',
-          },
-          { timeout: 10000 },
-        );
+        navigationElement = await driver.waitForSelector({
+          css: '.confirm-page-container-navigation',
+          text: '2 of 5',
+        });
         navigationText = await navigationElement.getText();
         assert.equal(
           navigationText.includes('2 of 5'),
@@ -169,13 +166,10 @@ describe('Navigate transactions', function () {
 
         // reject transaction
         await driver.clickElement({ text: 'Reject', tag: 'button' });
-        const navigationElement = await driver.waitForSelector(
-          {
-            css: '.confirm-page-container-navigation',
-            text: '1 of 3',
-          },
-          { timeout: 10000 },
-        );
+        const navigationElement = await driver.waitForSelector({
+          css: '.confirm-page-container-navigation',
+          text: '1 of 3',
+        });
         const navigationText = await navigationElement.getText();
         assert.equal(
           navigationText.includes('1 of 3'),
@@ -202,13 +196,10 @@ describe('Navigate transactions', function () {
 
         // confirm transaction
         await driver.clickElement({ text: 'Confirm', tag: 'button' });
-        const navigationElement = await driver.waitForSelector(
-          {
-            css: '.confirm-page-container-navigation',
-            text: '1 of 3',
-          },
-          { timeout: 10000 },
-        );
+        const navigationElement = await driver.waitForSelector({
+          css: '.confirm-page-container-navigation',
+          text: '1 of 3',
+        });
         const navigationText = await navigationElement.getText();
         assert.equal(
           navigationText.includes('1 of 3'),
diff --git a/test/e2e/tests/personal-sign.spec.js b/test/e2e/tests/personal-sign.spec.js
index 1a6d904f2f65..86f798c6734c 100644
--- a/test/e2e/tests/personal-sign.spec.js
+++ b/test/e2e/tests/personal-sign.spec.js
@@ -57,13 +57,10 @@ describe('Personal sign', function () {
         const verifySigUtil = await driver.findElement(
           '#personalSignVerifySigUtilResult',
         );
-        const verifyECRecover = await driver.waitForSelector(
-          {
-            css: '#personalSignVerifyECRecoverResult',
-            text: publicAddress,
-          },
-          { timeout: 10000 },
-        );
+        const verifyECRecover = await driver.waitForSelector({
+          css: '#personalSignVerifyECRecoverResult',
+          text: publicAddress,
+        });
         assert.equal(await verifySigUtil.getText(), publicAddress);
         assert.equal(await verifyECRecover.getText(), publicAddress);
       },
diff --git a/test/e2e/tests/send-eth.spec.js b/test/e2e/tests/send-eth.spec.js
index d5005dcf3974..dbe952963517 100644
--- a/test/e2e/tests/send-eth.spec.js
+++ b/test/e2e/tests/send-eth.spec.js
@@ -196,13 +196,10 @@ describe('Send ETH from inside MetaMask using advanced gas modal', function () {
           return confirmedTxes.length === 1;
         }, 10000);
 
-        await driver.waitForSelector(
-          {
-            css: '.transaction-list-item__primary-currency',
-            text: '-1 ETH',
-          },
-          { timeout: 10000 },
-        );
+        await driver.waitForSelector({
+          css: '.transaction-list-item__primary-currency',
+          text: '-1 ETH',
+        });
       },
     );
   });
@@ -275,7 +272,6 @@ describe('Send ETH from dapp using advanced gas controls', function () {
         await driver.clickElement('[data-testid="home__activity-tab"]');
         await driver.waitForSelector(
           '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
-          { timeout: 10000 },
         );
         await driver.waitForSelector({
           css: '.transaction-list-item__primary-currency',
@@ -345,7 +341,6 @@ describe('Send ETH from dapp using advanced gas controls', function () {
         await driver.clickElement('[data-testid="home__activity-tab"]');
         await driver.waitForSelector(
           '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
-          { timeout: 10000 },
         );
         await driver.waitForSelector({
           css: '.transaction-list-item__primary-currency',
diff --git a/test/e2e/tests/send-hex-address.spec.js b/test/e2e/tests/send-hex-address.spec.js
index 3e03dfd3157b..08d7b2c1d992 100644
--- a/test/e2e/tests/send-hex-address.spec.js
+++ b/test/e2e/tests/send-hex-address.spec.js
@@ -168,7 +168,6 @@ describe('Send ERC20 to a 40 character hexadecimal address', function () {
         await driver.clickElement('[data-testid="home__activity-tab"]');
         await driver.waitForSelector(
           '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
-          { timeout: 10000 },
         );
         const sendTransactionListItem = await driver.waitForSelector(
           '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
@@ -234,7 +233,6 @@ describe('Send ERC20 to a 40 character hexadecimal address', function () {
         await driver.clickElement('[data-testid="home__activity-tab"]');
         await driver.waitForSelector(
           '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
-          { timeout: 10000 },
         );
         const sendTransactionListItem = await driver.waitForSelector(
           '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
diff --git a/ui/helpers/constants/settings.js b/ui/helpers/constants/settings.js
index 75cdab2decd1..6a62b1c786da 100644
--- a/ui/helpers/constants/settings.js
+++ b/ui/helpers/constants/settings.js
@@ -77,13 +77,6 @@ export const SETTINGS_CONSTANTS = [
     route: `${ADVANCED_ROUTE}#clear-activity`,
     icon: 'fas fa-sliders-h',
   },
-  {
-    tabMessage: (t) => t('advanced'),
-    sectionMessage: (t) => t('showAdvancedGasInline'),
-    descriptionMessage: (t) => t('showAdvancedGasInlineDescription'),
-    route: `${ADVANCED_ROUTE}#advanced-gascontrols`,
-    icon: 'fas fa-sliders-h',
-  },
   {
     tabMessage: (t) => t('advanced'),
     sectionMessage: (t) => t('showHexData'),
diff --git a/ui/helpers/utils/settings-search.test.js b/ui/helpers/utils/settings-search.test.js
index ec4839b0754e..1c8a3ed443d9 100644
--- a/ui/helpers/utils/settings-search.test.js
+++ b/ui/helpers/utils/settings-search.test.js
@@ -33,8 +33,6 @@ const t = (key) => {
       return 'Clear activity and nonce data';
     case 'clearActivityDescription':
       return "This resets the account's nonce and erases data from the activity tab in your wallet. Only the current account and network will be affected. Your balances and incoming transactions won't change.";
-    case 'showAdvancedGasInline':
-      return 'Advanced gas controls';
     case 'showAdvancedGasInlineDescription':
       return 'Select this to show gas price and limit controls directly on the send and confirm screens.';
     case 'showHexData':
@@ -159,7 +157,7 @@ describe('Settings Search Utils', () => {
     });
 
     it('should get good advanced section number', () => {
-      expect(getNumberOfSettingsInSection(t, t('advanced'))).toStrictEqual(14);
+      expect(getNumberOfSettingsInSection(t, t('advanced'))).toStrictEqual(13);
     });
 
     it('should get good contact section number', () => {
diff --git a/ui/pages/settings/advanced-tab/advanced-tab.component.js b/ui/pages/settings/advanced-tab/advanced-tab.component.js
index dcb0d47ce1b7..4c4dd79e0ef6 100644
--- a/ui/pages/settings/advanced-tab/advanced-tab.component.js
+++ b/ui/pages/settings/advanced-tab/advanced-tab.component.js
@@ -41,8 +41,6 @@ export default class AdvancedTab extends PureComponent {
     warning: PropTypes.string,
     history: PropTypes.object,
     sendHexData: PropTypes.bool,
-    setAdvancedInlineGasFeatureFlag: PropTypes.func,
-    advancedInlineGas: PropTypes.bool,
     showFiatInTestnets: PropTypes.bool,
     showTestNetworks: PropTypes.bool,
     autoLockTimeLimit: PropTypes.number,
@@ -262,43 +260,13 @@ export default class AdvancedTab extends PureComponent {
     );
   }
 
-  renderAdvancedGasInputInline() {
-    const { t } = this.context;
-    const { advancedInlineGas, setAdvancedInlineGasFeatureFlag } = this.props;
-
-    return (
-      <div
-        ref={this.settingsRefs[3]}
-        className="settings-page__content-row"
-        data-testid="advanced-setting-advanced-gas-inline"
-      >
-        <div className="settings-page__content-item">
-          <span>{t('showAdvancedGasInline')}</span>
-          <div className="settings-page__content-description">
-            {t('showAdvancedGasInlineDescription')}
-          </div>
-        </div>
-        <div className="settings-page__content-item">
-          <div className="settings-page__content-item-col">
-            <ToggleButton
-              value={advancedInlineGas}
-              onToggle={(value) => setAdvancedInlineGasFeatureFlag(!value)}
-              offLabel={t('off')}
-              onLabel={t('on')}
-            />
-          </div>
-        </div>
-      </div>
-    );
-  }
-
   renderHexDataOptIn() {
     const { t } = this.context;
     const { sendHexData, setHexDataFeatureFlag } = this.props;
 
     return (
       <div
-        ref={this.settingsRefs[4]}
+        ref={this.settingsRefs[3]}
         className="settings-page__content-row"
         data-testid="advanced-setting-hex-data"
       >
@@ -329,7 +297,7 @@ export default class AdvancedTab extends PureComponent {
 
     return (
       <div
-        ref={this.settingsRefs[5]}
+        ref={this.settingsRefs[4]}
         className="settings-page__content-row"
         data-testid="advanced-setting-show-testnet-conversion"
       >
@@ -361,7 +329,7 @@ export default class AdvancedTab extends PureComponent {
 
     return (
       <div
-        ref={this.settingsRefs[6]}
+        ref={this.settingsRefs[5]}
         className="settings-page__content-row"
         data-testid="advanced-setting-show-testnet-conversion"
       >
@@ -391,7 +359,7 @@ export default class AdvancedTab extends PureComponent {
 
     return (
       <div
-        ref={this.settingsRefs[7]}
+        ref={this.settingsRefs[6]}
         className="settings-page__content-row"
         data-testid="advanced-setting-custom-nonce"
       >
@@ -422,7 +390,7 @@ export default class AdvancedTab extends PureComponent {
 
     return (
       <div
-        ref={this.settingsRefs[8]}
+        ref={this.settingsRefs[7]}
         className="settings-page__content-row"
         data-testid="advanced-setting-auto-lock"
       >
@@ -510,7 +478,7 @@ export default class AdvancedTab extends PureComponent {
 
     return (
       <div
-        ref={this.settingsRefs[9]}
+        ref={this.settingsRefs[8]}
         className="settings-page__content-row"
         data-testId="ledger-live-control"
       >
@@ -576,7 +544,7 @@ export default class AdvancedTab extends PureComponent {
 
     return (
       <div
-        ref={this.settingsRefs[10]}
+        ref={this.settingsRefs[9]}
         className="settings-page__content-row"
         data-testid="advanced-setting-dismiss-reminder"
       >
@@ -754,7 +722,6 @@ export default class AdvancedTab extends PureComponent {
         {this.renderStateLogs()}
         {this.renderMobileSync()}
         {this.renderResetAccount()}
-        {this.renderAdvancedGasInputInline()}
         {this.renderHexDataOptIn()}
         {this.renderShowConversionInTestnets()}
         {this.renderToggleTestNetworks()}
diff --git a/ui/pages/settings/advanced-tab/advanced-tab.component.test.js b/ui/pages/settings/advanced-tab/advanced-tab.component.test.js
index c5f52a12db70..06bd51011d67 100644
--- a/ui/pages/settings/advanced-tab/advanced-tab.component.test.js
+++ b/ui/pages/settings/advanced-tab/advanced-tab.component.test.js
@@ -48,7 +48,7 @@ describe('AdvancedTab Component', () => {
   it('should toggle show test networks', () => {
     const { queryAllByRole } = renderWithProvider(<AdvancedTab />, mockStore);
 
-    const testNetworkToggle = queryAllByRole('checkbox')[3];
+    const testNetworkToggle = queryAllByRole('checkbox')[2];
 
     fireEvent.click(testNetworkToggle);
 
diff --git a/ui/pages/settings/advanced-tab/advanced-tab.container.js b/ui/pages/settings/advanced-tab/advanced-tab.container.js
index 80b781f68744..95ce14e4a591 100644
--- a/ui/pages/settings/advanced-tab/advanced-tab.container.js
+++ b/ui/pages/settings/advanced-tab/advanced-tab.container.js
@@ -25,7 +25,7 @@ export const mapStateToProps = (state) => {
     metamask,
   } = state;
   const {
-    featureFlags: { sendHexData, advancedInlineGas } = {},
+    featureFlags: { sendHexData } = {},
     disabledRpcMethodPreferences,
     useNonceField,
     ledgerTransportType,
@@ -45,7 +45,6 @@ export const mapStateToProps = (state) => {
   return {
     warning,
     sendHexData,
-    advancedInlineGas,
     showFiatInTestnets,
     showTestNetworks,
     autoLockTimeLimit,
@@ -69,8 +68,6 @@ export const mapDispatchToProps = (dispatch) => {
     displayWarning: (warning) => dispatch(displayWarning(warning)),
     showResetAccountConfirmationModal: () =>
       dispatch(showModal({ name: 'CONFIRM_RESET_ACCOUNT' })),
-    setAdvancedInlineGasFeatureFlag: (shouldShow) =>
-      dispatch(setFeatureFlag('advancedInlineGas', shouldShow)),
     setUseNonceField: (value) => dispatch(setUseNonceField(value)),
     setShowFiatConversionOnTestnetsPreference: (value) => {
       return dispatch(setShowFiatConversionOnTestnetsPreference(value));
diff --git a/ui/pages/settings/advanced-tab/advanced-tab.stories.js b/ui/pages/settings/advanced-tab/advanced-tab.stories.js
index f2508300b7f3..a6c3f7eb2632 100644
--- a/ui/pages/settings/advanced-tab/advanced-tab.stories.js
+++ b/ui/pages/settings/advanced-tab/advanced-tab.stories.js
@@ -9,7 +9,6 @@ export default {
     warning: { control: 'text' },
     useNonceField: { control: 'boolean' },
     sendHexData: { control: 'boolean' },
-    advancedInlineGas: { control: 'boolean' },
     showFiatInTestnets: { control: 'boolean' },
     useLedgerLive: { control: 'boolean' },
     dismissSeedBackUpReminder: { control: 'boolean' },
@@ -28,9 +27,6 @@ export default {
     showResetAccountConfirmationModal: {
       action: 'showResetAccountConfirmationModal',
     },
-    setAdvancedInlineGasFeatureFlag: {
-      action: 'setAdvancedInlineGasFeatureFlag',
-    },
   },
 };
 
@@ -39,7 +35,6 @@ export const DefaultStory = (args) => {
     {
       useNonceField,
       sendHexData,
-      advancedInlineGas,
       showFiatInTestnets,
       dismissSeedBackUpReminder,
     },
@@ -58,12 +53,6 @@ export const DefaultStory = (args) => {
     });
   };
 
-  const handleAdvancedInlineGas = () => {
-    updateArgs({
-      advancedInlineGas: !advancedInlineGas,
-    });
-  };
-
   const handleShowFiatInTestnets = () => {
     updateArgs({
       showFiatInTestnets: !showFiatInTestnets,
@@ -83,8 +72,6 @@ export const DefaultStory = (args) => {
         setUseNonceField={handleUseNonceField}
         sendHexData={sendHexData}
         setHexDataFeatureFlag={handleSendHexData}
-        advancedInlineGas={advancedInlineGas}
-        setAdvancedInlineGasFeatureFlag={handleAdvancedInlineGas}
         showFiatInTestnets={showFiatInTestnets}
         setShowFiatConversionOnTestnetsPreference={handleShowFiatInTestnets}
         dismissSeedBackUpReminder={dismissSeedBackUpReminder}
@@ -100,7 +87,6 @@ DefaultStory.args = {
   warning: 'Warning Sample',
   useNonceField: false,
   sendHexData: false,
-  advancedInlineGas: false,
   showFiatInTestnets: false,
   useLedgerLive: false,
   dismissSeedBackUpReminder: false,