diff --git a/.prettierignore b/.prettierignore
index 0f15035ec..c2dd4a632 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -4,3 +4,5 @@ builds/**
 test-*/**
 coverage/
 app/vendor/**
+.nyc_output/**
+.vscode/**
diff --git a/app/_locales/am/messages.json b/app/_locales/am/messages.json
index c0ccc9352..a017b21a3 100644
--- a/app/_locales/am/messages.json
+++ b/app/_locales/am/messages.json
@@ -448,7 +448,7 @@
   "gasLimit": {
     "message": "የነዳጅ ገደብ"
   },
-  "gasLimitInfoModalContent": {
+  "gasLimitInfoTooltipContent": {
     "message": "የነዳጅ ገደብ እርስዎ ወጪ ለማድረግ ዝግጁ የሆኑት ከፍተኛው የነዳጅ መጠን ማለት ነው።"
   },
   "gasLimitTooLow": {
@@ -463,12 +463,9 @@
   "gasPriceExtremelyLow": {
     "message": "የነዳጅ ዋጋ እጅግ በጣም ዝቅ ያለ ነው"
   },
-  "gasPriceInfoModalContent": {
+  "gasPriceInfoTooltipContent": {
     "message": "የነዳጅ ዋጋ እርስዎ ለእያንዳንዱ የነዳጅ መጠን መክፈል የሚፈልጉትን የ Ether መጠን ይገልጻል።"
   },
-  "gasPriceNoDenom": {
-    "message": "የነዳጅ ዋጋ"
-  },
   "general": {
     "message": "አጠቃላይ"
   },
diff --git a/app/_locales/ar/messages.json b/app/_locales/ar/messages.json
index 40815b680..e59abf808 100644
--- a/app/_locales/ar/messages.json
+++ b/app/_locales/ar/messages.json
@@ -444,7 +444,7 @@
   "gasLimit": {
     "message": "الحد الأقصى لوحدات جاس"
   },
-  "gasLimitInfoModalContent": {
+  "gasLimitInfoTooltipContent": {
     "message": "حد عملة جاس هو الحد الأقصى لمقدار وحدات جاس التي ترغب في إنفاقها."
   },
   "gasLimitTooLow": {
@@ -459,12 +459,9 @@
   "gasPriceExtremelyLow": {
     "message": "سعر الجاس منخفض للغاية"
   },
-  "gasPriceInfoModalContent": {
+  "gasPriceInfoTooltipContent": {
     "message": "يحدد سعر الغاز مقدار الإيثر الذي تكون على استعداد لدفعه لكل وحدة غاز."
   },
-  "gasPriceNoDenom": {
-    "message": "سعر عملة جاس"
-  },
   "general": {
     "message": "عام"
   },
diff --git a/app/_locales/bg/messages.json b/app/_locales/bg/messages.json
index 21b285807..357247ece 100644
--- a/app/_locales/bg/messages.json
+++ b/app/_locales/bg/messages.json
@@ -444,7 +444,7 @@
   "gasLimit": {
     "message": "Ограничение на газ"
   },
-  "gasLimitInfoModalContent": {
+  "gasLimitInfoTooltipContent": {
     "message": "Ограничението за газ е максималното количество единици газ, което сте готови да похарчите."
   },
   "gasLimitTooLow": {
@@ -459,12 +459,9 @@
   "gasPriceExtremelyLow": {
     "message": "Цена на газа е изключително ниска"
   },
-  "gasPriceInfoModalContent": {
+  "gasPriceInfoTooltipContent": {
     "message": "Цената на газа определя количеството етер, което сте готови да платите за всяка единица газ."
   },
-  "gasPriceNoDenom": {
-    "message": "Цена на газа"
-  },
   "general": {
     "message": "Общ"
   },
diff --git a/app/_locales/bn/messages.json b/app/_locales/bn/messages.json
index 773217e6d..f8cc23a62 100644
--- a/app/_locales/bn/messages.json
+++ b/app/_locales/bn/messages.json
@@ -448,7 +448,7 @@
   "gasLimit": {
     "message": "গ্যাসের সীমা"
   },
-  "gasLimitInfoModalContent": {
+  "gasLimitInfoTooltipContent": {
     "message": "গ্যাসের সীমা হল আপনি যে পরিমাণ গ্যাস খরচ করতে চান তার সর্বোচ্চ ইউনিটের পরিমাণ।"
   },
   "gasLimitTooLow": {
@@ -463,12 +463,9 @@
   "gasPriceExtremelyLow": {
     "message": "গ্যাসের মূল্য অত্যন্ত কম"
   },
-  "gasPriceInfoModalContent": {
+  "gasPriceInfoTooltipContent": {
     "message": "গ্যাসের মূল্য আপনি প্রতি একক গ্যাসের জন্য যে পরিমাণ ইথার প্রদান করতে চান সেটি নির্দেশ করে।"
   },
-  "gasPriceNoDenom": {
-    "message": "গ্যাসের মূল্য"
-  },
   "general": {
     "message": "সাধারণ"
   },
diff --git a/app/_locales/ca/messages.json b/app/_locales/ca/messages.json
index e948bc86e..eda12c8e2 100644
--- a/app/_locales/ca/messages.json
+++ b/app/_locales/ca/messages.json
@@ -441,7 +441,7 @@
   "gasLimit": {
     "message": "Límit de gas"
   },
-  "gasLimitInfoModalContent": {
+  "gasLimitInfoTooltipContent": {
     "message": "El límit de gas és la màxima quantitat d'unitats de gas que estàs disposat a gastar."
   },
   "gasLimitTooLow": {
@@ -456,12 +456,9 @@
   "gasPriceExtremelyLow": {
     "message": "Preu del Gas Extremadament Baix"
   },
-  "gasPriceInfoModalContent": {
+  "gasPriceInfoTooltipContent": {
     "message": "El preu del gas especifica la quantitat d'Ether que estàs disposat a pagar per cada unitat de gas."
   },
-  "gasPriceNoDenom": {
-    "message": "Preu del Gas"
-  },
   "generalSettingsDescription": {
     "message": "Conversió de divises, divisa principal, idioma, icones d'identificació única"
   },
diff --git a/app/_locales/da/messages.json b/app/_locales/da/messages.json
index f6f6b0559..c889b5c8e 100644
--- a/app/_locales/da/messages.json
+++ b/app/_locales/da/messages.json
@@ -444,7 +444,7 @@
   "gasLimit": {
     "message": "Gas-grænse"
   },
-  "gasLimitInfoModalContent": {
+  "gasLimitInfoTooltipContent": {
     "message": "Gasgrænse er den maksimale mængde gasenheder, du er villig til at bruge."
   },
   "gasLimitTooLow": {
@@ -459,12 +459,9 @@
   "gasPriceExtremelyLow": {
     "message": "Ekstremt Lav Brændstofspris"
   },
-  "gasPriceInfoModalContent": {
+  "gasPriceInfoTooltipContent": {
     "message": "Brændstofpris specificerer den mængde Ether, du er villig til at betale for hver brændstofenhed."
   },
-  "gasPriceNoDenom": {
-    "message": "Brændstofpris"
-  },
   "general": {
     "message": "Generelt"
   },
diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index 26920266f..22f32f101 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -433,7 +433,7 @@
   "gasLimit": {
     "message": "Gaslimit"
   },
-  "gasLimitInfoModalContent": {
+  "gasLimitInfoTooltipContent": {
     "message": "Die Gasgrenze ist die Höchstmenge an Gaseinheiten, die Sie auszugeben bereit sind."
   },
   "gasLimitTooLow": {
@@ -448,12 +448,9 @@
   "gasPriceExtremelyLow": {
     "message": "Gaspreis extrem niedrig"
   },
-  "gasPriceInfoModalContent": {
+  "gasPriceInfoTooltipContent": {
     "message": "Der Gaspreis gibt die Menge Ether an, die Sie für jede Einheit Gas zu zahlen bereit sind."
   },
-  "gasPriceNoDenom": {
-    "message": "Gaspreis"
-  },
   "general": {
     "message": "Allgemein"
   },
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
index ca3af0a61..8d20a8824 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -445,7 +445,7 @@
   "gasLimit": {
     "message": "Όριο Καυσίμου"
   },
-  "gasLimitInfoModalContent": {
+  "gasLimitInfoTooltipContent": {
     "message": "Το όριο αερίου είναι το μέγιστο ποσό μονάδων αερίου τι οποίες είστε διατεθειμένοι να δαπανήσετε."
   },
   "gasLimitTooLow": {
@@ -460,12 +460,9 @@
   "gasPriceExtremelyLow": {
     "message": "Τιμή Καυσίμου Εξαιρετικά Χαμηλή"
   },
-  "gasPriceInfoModalContent": {
+  "gasPriceInfoTooltipContent": {
     "message": "Η τιμή καυσίμου καθορίζει το ποσό των Ether που είστε διατεθειμένοι να πληρώσετε για κάθε μονάδα καυσίμου."
   },
-  "gasPriceNoDenom": {
-    "message": "Τιμή Gas"
-  },
   "general": {
     "message": "Γενικά"
   },
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 38830726c..c01d85f6a 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -685,7 +685,7 @@
   "gasLimit": {
     "message": "Gas Limit"
   },
-  "gasLimitInfoModalContent": {
+  "gasLimitInfoTooltipContent": {
     "message": "Gas limit is the maximum amount of units of gas you are willing to spend."
   },
   "gasLimitTooLow": {
@@ -700,12 +700,9 @@
   "gasPriceExtremelyLow": {
     "message": "Gas Price Extremely Low"
   },
-  "gasPriceInfoModalContent": {
+  "gasPriceInfoTooltipContent": {
     "message": "Gas price specifies the amount of Ether you are willing to pay for each unit of gas."
   },
-  "gasPriceNoDenom": {
-    "message": "Gas Price"
-  },
   "gdprMessage": {
     "message": "This data is aggregated and is therefore anonymous for the purposes of General Data Protection Regulation (EU) 2016/679. For more information in relation to our privacy practices, please see our $1.",
     "description": "$1 refers to the gdprMessagePrivacyPolicy message, the translation of which is meant to be used exclusively in the context of gdprMessage"
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index 97576dba7..20525bf57 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -378,9 +378,6 @@
   "gasPriceExtremelyLow": {
     "message": "Precio de Gas excesivamente bajo"
   },
-  "gasPriceNoDenom": {
-    "message": "Precio de Gas"
-  },
   "generalSettingsDescription": {
     "message": "Conversión de divisas, divisa principal, idioma, blockies identicon"
   },
diff --git a/app/_locales/es_419/messages.json b/app/_locales/es_419/messages.json
index a856b7e88..ae28ae6f9 100644
--- a/app/_locales/es_419/messages.json
+++ b/app/_locales/es_419/messages.json
@@ -445,7 +445,7 @@
   "gasLimit": {
     "message": "Limite de gas"
   },
-  "gasLimitInfoModalContent": {
+  "gasLimitInfoTooltipContent": {
     "message": "El límite de gas es la cantidad máxima de unidades de gas que estás dispuesto a gastar."
   },
   "gasLimitTooLow": {
@@ -460,12 +460,9 @@
   "gasPriceExtremelyLow": {
     "message": "El precio del gas es extremadamente bajo"
   },
-  "gasPriceInfoModalContent": {
+  "gasPriceInfoTooltipContent": {
     "message": "El precio del gas especifica la cantidad de Ethers que estás dispuesto a pagar por cada unidad de gas."
   },
-  "gasPriceNoDenom": {
-    "message": "Precio del gas"
-  },
   "generalSettingsDescription": {
     "message": "Conversión de moneda, moneda principal, idioma, blockies identicon"
   },
diff --git a/app/_locales/et/messages.json b/app/_locales/et/messages.json
index 28c7cb3b7..30cdc6cda 100644
--- a/app/_locales/et/messages.json
+++ b/app/_locales/et/messages.json
@@ -444,7 +444,7 @@
   "gasLimit": {
     "message": "Gaasi ülemmäär"
   },
-  "gasLimitInfoModalContent": {
+  "gasLimitInfoTooltipContent": {
     "message": "Gaasi ülemmäär on maksimaalne gaasiühikute hulk, mida olete nõus kulutama."
   },
   "gasLimitTooLow": {
@@ -459,12 +459,9 @@
   "gasPriceExtremelyLow": {
     "message": "Gaasi hind on äärmiselt madal"
   },
-  "gasPriceInfoModalContent": {
+  "gasPriceInfoTooltipContent": {
     "message": "Gaasi hind näitab eetri hulka, mida olete nõus iga gaasiühiku eest tasuma."
   },
-  "gasPriceNoDenom": {
-    "message": "Gaasi hind"
-  },
   "general": {
     "message": "Üldine teave"
   },
diff --git a/app/_locales/fa/messages.json b/app/_locales/fa/messages.json
index 30bb2e2a4..2168f8c0a 100644
--- a/app/_locales/fa/messages.json
+++ b/app/_locales/fa/messages.json
@@ -448,7 +448,7 @@
   "gasLimit": {
     "message": "محدوده گاز"
   },
-  "gasLimitInfoModalContent": {
+  "gasLimitInfoTooltipContent": {
     "message": "محدوده گاز حد اکثر تعداد واحدات گاز است که میخواهید مصرف نمایید."
   },
   "gasLimitTooLow": {
@@ -463,12 +463,9 @@
   "gasPriceExtremelyLow": {
     "message": "قیمت گاز خیلی کم است"
   },
-  "gasPriceInfoModalContent": {
+  "gasPriceInfoTooltipContent": {
     "message": "قیمت گاز مبلغ ایتر را که تصمیم پرداخت برای هر واحد گاز را داشته باشید، مشخص میکند."
   },
-  "gasPriceNoDenom": {
-    "message": "قیمت گاز"
-  },
   "general": {
     "message": "عمومی"
   },
diff --git a/app/_locales/fi/messages.json b/app/_locales/fi/messages.json
index 62ac9fd9e..bcc6aa82e 100644
--- a/app/_locales/fi/messages.json
+++ b/app/_locales/fi/messages.json
@@ -445,7 +445,7 @@
   "gasLimit": {
     "message": "Gas-raja"
   },
-  "gasLimitInfoModalContent": {
+  "gasLimitInfoTooltipContent": {
     "message": "Polttoaineraja tarkoittaa suurinta mahdollista polttoainemäärää, jonka olet valmis kuluttamaan."
   },
   "gasLimitTooLow": {
@@ -460,12 +460,9 @@
   "gasPriceExtremelyLow": {
     "message": "Gas-hinta erittäin alhainen"
   },
-  "gasPriceInfoModalContent": {
+  "gasPriceInfoTooltipContent": {
     "message": "Polttoaineen hinta määrittää Ether-määrän, jonka olet valmis maksamaan jokaisesta polttoaineyksiköstä."
   },
-  "gasPriceNoDenom": {
-    "message": "Bensan hinta"
-  },
   "general": {
     "message": "Yleistä"
   },
diff --git a/app/_locales/fil/messages.json b/app/_locales/fil/messages.json
index a1c6a9faa..1792b647c 100644
--- a/app/_locales/fil/messages.json
+++ b/app/_locales/fil/messages.json
@@ -414,7 +414,7 @@
   "gasLimit": {
     "message": "Limitasyon sa Gas"
   },
-  "gasLimitInfoModalContent": {
+  "gasLimitInfoTooltipContent": {
     "message": "Ang limitasyon sa gas ay ang maximum na dami ng mga unit ng gas na handa kang gastusin."
   },
   "gasLimitTooLow": {
@@ -429,12 +429,9 @@
   "gasPriceExtremelyLow": {
     "message": "Napakababa ng Presyo ng Gas"
   },
-  "gasPriceInfoModalContent": {
+  "gasPriceInfoTooltipContent": {
     "message": "Tinutukoy ng presyo ng gas ang halaga ng Ether na handa kang ibayad para sa bawat unit ng gas."
   },
-  "gasPriceNoDenom": {
-    "message": "Presyo ng Gas"
-  },
   "general": {
     "message": "Pangkalahatan"
   },
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index 3b5e665cd..6d716cc4f 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -436,7 +436,7 @@
   "gasLimit": {
     "message": "Quantité max. de gaz"
   },
-  "gasLimitInfoModalContent": {
+  "gasLimitInfoTooltipContent": {
     "message": "La limite d'essence est la quantité maximale d'unités d'essence que vous êtes prêt à dépenser."
   },
   "gasLimitTooLow": {
@@ -451,12 +451,9 @@
   "gasPriceExtremelyLow": {
     "message": "Prix de l'essence extrêmement bas"
   },
-  "gasPriceInfoModalContent": {
+  "gasPriceInfoTooltipContent": {
     "message": "Le prix du gaz spécifie la quantité d'Ethers que vous acceptez de payer pour chaque unité de gaz."
   },
-  "gasPriceNoDenom": {
-    "message": "Prix du gaz"
-  },
   "general": {
     "message": "Général"
   },
diff --git a/app/_locales/he/messages.json b/app/_locales/he/messages.json
index 02c7a496c..79868fead 100644
--- a/app/_locales/he/messages.json
+++ b/app/_locales/he/messages.json
@@ -448,7 +448,7 @@
   "gasLimit": {
     "message": "הגבלת דלק"
   },
-  "gasLimitInfoModalContent": {
+  "gasLimitInfoTooltipContent": {
     "message": "הגבלת דלק היא המספר המרבי של יחידות דלק שהנך מוכנ/ה להוציא."
   },
   "gasLimitTooLow": {
@@ -463,12 +463,9 @@
   "gasPriceExtremelyLow": {
     "message": "מחיר הדלק נמוך במיוחד"
   },
-  "gasPriceInfoModalContent": {
+  "gasPriceInfoTooltipContent": {
     "message": "מחיר הדלק מציין את כמות האת'ר שהנך מוכנ/ה לשלם עבור כל יחידת דלק."
   },
-  "gasPriceNoDenom": {
-    "message": "מחיר הדלק"
-  },
   "general": {
     "message": "כללי"
   },
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
index aad074d70..15773d29a 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -448,7 +448,7 @@
   "gasLimit": {
     "message": "गैस की सीमा"
   },
-  "gasLimitInfoModalContent": {
+  "gasLimitInfoTooltipContent": {
     "message": "गैस की सीमा गैस के यूनिट की अधिकतम राशि है जिसे आप खर्च करना चाहते हैं।"
   },
   "gasLimitTooLow": {
@@ -463,12 +463,9 @@
   "gasPriceExtremelyLow": {
     "message": "गैस मूल्य बहुत कम है"
   },
-  "gasPriceInfoModalContent": {
+  "gasPriceInfoTooltipContent": {
     "message": "गैस की कीमत, उस ईथर की मात्रा को निर्दिष्ट करती है जिसे आप गैस की प्रत्येक इकाई के लिए भुगतान करने के इच्छुक हैं।"
   },
-  "gasPriceNoDenom": {
-    "message": "गैस का मूल्य"
-  },
   "general": {
     "message": "सामान्य"
   },
diff --git a/app/_locales/hr/messages.json b/app/_locales/hr/messages.json
index a818b79a6..7e8b1761c 100644
--- a/app/_locales/hr/messages.json
+++ b/app/_locales/hr/messages.json
@@ -444,7 +444,7 @@
   "gasLimit": {
     "message": "Ograničenje goriva"
   },
-  "gasLimitInfoModalContent": {
+  "gasLimitInfoTooltipContent": {
     "message": "Ograničenje za gorivo predstavlja najveći broj jedinica goriva koje ste spremi potrošiti."
   },
   "gasLimitTooLow": {
@@ -459,12 +459,9 @@
   "gasPriceExtremelyLow": {
     "message": "Iznimno niska cijena goriva"
   },
-  "gasPriceInfoModalContent": {
+  "gasPriceInfoTooltipContent": {
     "message": "Cijena goriva odnosi se na vrijednost Ether koju ste spremni platiti za svaku jedinicu goriva."
   },
-  "gasPriceNoDenom": {
-    "message": "Cijena goriva"
-  },
   "general": {
     "message": "Opće"
   },
diff --git a/app/_locales/hu/messages.json b/app/_locales/hu/messages.json
index 73d19f975..eb6f219f4 100644
--- a/app/_locales/hu/messages.json
+++ b/app/_locales/hu/messages.json
@@ -444,7 +444,7 @@
   "gasLimit": {
     "message": "Gáz határértéke"
   },
-  "gasLimitInfoModalContent": {
+  "gasLimitInfoTooltipContent": {
     "message": "A gázkorlátozás az elkölthető gázegységek maximális mennyisége."
   },
   "gasLimitTooLow": {
@@ -459,12 +459,9 @@
   "gasPriceExtremelyLow": {
     "message": "Üzemanyag ár Különösen alacsony"
   },
-  "gasPriceInfoModalContent": {
+  "gasPriceInfoTooltipContent": {
     "message": "A gáz ára meghatározza, hogy ön mennyi Ethert hajlandó fizetni minden egyes gázegységért."
   },
-  "gasPriceNoDenom": {
-    "message": "Gázár"
-  },
   "general": {
     "message": "Általános"
   },
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
index 267c5c079..5a04dcca5 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -435,7 +435,7 @@
   "gasLimit": {
     "message": "Batas Gas"
   },
-  "gasLimitInfoModalContent": {
+  "gasLimitInfoTooltipContent": {
     "message": "Limit Bensin adalah jumlah maksimal satuan bensin yang Anda bersedia gunakan."
   },
   "gasLimitTooLow": {
@@ -450,12 +450,9 @@
   "gasPriceExtremelyLow": {
     "message": "Harga Bensin Amat Rendah"
   },
-  "gasPriceInfoModalContent": {
+  "gasPriceInfoTooltipContent": {
     "message": "Harga gas menentukan jumlah Ether yang bersedia Anda bayarkan untuk setiap unit gas."
   },
-  "gasPriceNoDenom": {
-    "message": "Harga Bensin"
-  },
   "general": {
     "message": "Umum"
   },
diff --git a/app/_locales/it/messages.json b/app/_locales/it/messages.json
index ebe1e54e2..7b368134d 100644
--- a/app/_locales/it/messages.json
+++ b/app/_locales/it/messages.json
@@ -685,7 +685,7 @@
   "gasLimit": {
     "message": "Gas Limite"
   },
-  "gasLimitInfoModalContent": {
+  "gasLimitInfoTooltipContent": {
     "message": "Il gas limite è il massimo importo di unità di gas che sei disposto a spendere."
   },
   "gasLimitTooLow": {
@@ -700,12 +700,9 @@
   "gasPriceExtremelyLow": {
     "message": "Prezzo del gas troppo basso"
   },
-  "gasPriceInfoModalContent": {
+  "gasPriceInfoTooltipContent": {
     "message": "Il prezzo del gas specifica il totale di Ether che sei disposto a pagare per ogni unità di gas."
   },
-  "gasPriceNoDenom": {
-    "message": "Prezzo del Gas"
-  },
   "gdprMessage": {
     "message": "Questi dati sono aggregati e sono quindi anonimi per le finalità del Regolamento generale sulla protezione dei dati (UE) 2016/679. Per maggiori informazioni sulla nostra politica sulla privacy, vedi $1.",
     "description": "$1 refers to the gdprMessagePrivacyPolicy message, the translation of which is meant to be used exclusively in the context of gdprMessage"
diff --git a/app/_locales/kn/messages.json b/app/_locales/kn/messages.json
index 207dccfb7..f0464fedf 100644
--- a/app/_locales/kn/messages.json
+++ b/app/_locales/kn/messages.json
@@ -448,7 +448,7 @@
   "gasLimit": {
     "message": "ಗ್ಯಾಸ್ ಮಿತಿ"
   },
-  "gasLimitInfoModalContent": {
+  "gasLimitInfoTooltipContent": {
     "message": "ಗ್ಯಾಸ್‌ ಮಿತಿ ಎಂದರೆ ನೀವು ಖರ್ಚು ಮಾಡಲು ಸಿದ್ಧವಿರುವ ಗ್ಯಾಸ್‌ನ ಗರಿಷ್ಠ ಪ್ರಮಾಣ."
   },
   "gasLimitTooLow": {
@@ -463,12 +463,9 @@
   "gasPriceExtremelyLow": {
     "message": "ಗ್ಯಾಸ್ ದರವು ಅತ್ಯಂತ ಕಡಿಮೆಯಿದೆ"
   },
-  "gasPriceInfoModalContent": {
+  "gasPriceInfoTooltipContent": {
     "message": "ಗ್ಯಾಸ್ ದರವು ಪ್ರತಿ ಯೂನಿಟ್ ಗ್ಯಾಸ್‌ಗೆ ನೀವು ಪಾವತಿಸಲು ಸಿದ್ಧವಿರುವ ಎಥರ್‌ನ ಪ್ರಮಾಣವನ್ನು ಸೂಚಿಸುತ್ತದೆ."
   },
-  "gasPriceNoDenom": {
-    "message": "ಗ್ಯಾಸ್ ದರ"
-  },
   "general": {
     "message": "ಸಾಮಾನ್ಯ"
   },
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index 8b73492f8..1bf8c1b95 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -445,7 +445,7 @@
   "gasLimit": {
     "message": "가스 한도"
   },
-  "gasLimitInfoModalContent": {
+  "gasLimitInfoTooltipContent": {
     "message": "가스 한도는 당신이 기꺼이 소비할 수 있는 가스의 최대 수량입니다."
   },
   "gasLimitTooLow": {
@@ -460,12 +460,9 @@
   "gasPriceExtremelyLow": {
     "message": "가스 가격 매우 낮음"
   },
-  "gasPriceInfoModalContent": {
+  "gasPriceInfoTooltipContent": {
     "message": "가스 가격은 가스 1당 지불할 gwei 단위의 이더 수량을 명시합니다."
   },
-  "gasPriceNoDenom": {
-    "message": "가스 가격"
-  },
   "general": {
     "message": "일반"
   },
diff --git a/app/_locales/lt/messages.json b/app/_locales/lt/messages.json
index 00d1cdb7e..8ed5a9cae 100644
--- a/app/_locales/lt/messages.json
+++ b/app/_locales/lt/messages.json
@@ -448,7 +448,7 @@
   "gasLimit": {
     "message": "Dujų apribojimas"
   },
-  "gasLimitInfoModalContent": {
+  "gasLimitInfoTooltipContent": {
     "message": "Dujų apribojimas yra maksimalus dujų vienetų, kuriuos pageidaujate išleisti, skaičius."
   },
   "gasLimitTooLow": {
@@ -463,12 +463,9 @@
   "gasPriceExtremelyLow": {
     "message": "Dujų kaina ypatingai maža"
   },
-  "gasPriceInfoModalContent": {
+  "gasPriceInfoTooltipContent": {
     "message": "Dujų kaina nurodo eterių sumą, kurią pageidaujate sumokėti už kiekvieną dujų vienetą."
   },
-  "gasPriceNoDenom": {
-    "message": "Dujų kaina"
-  },
   "general": {
     "message": "Bendra"
   },
diff --git a/app/_locales/lv/messages.json b/app/_locales/lv/messages.json
index 7d2906c49..eb635069a 100644
--- a/app/_locales/lv/messages.json
+++ b/app/_locales/lv/messages.json
@@ -444,7 +444,7 @@
   "gasLimit": {
     "message": "Gas robežvērtība"
   },
-  "gasLimitInfoModalContent": {
+  "gasLimitInfoTooltipContent": {
     "message": "Gas robežvērtība ir maksimālais Gas vienību skaits, ko vēlaties tērēt."
   },
   "gasLimitTooLow": {
@@ -459,12 +459,9 @@
   "gasPriceExtremelyLow": {
     "message": "Ārkārtīgi zema Gas cena"
   },
-  "gasPriceInfoModalContent": {
+  "gasPriceInfoTooltipContent": {
     "message": "Gas cena norāda Ether summu, ko vēlaties maksāt par katru Gas vienību."
   },
-  "gasPriceNoDenom": {
-    "message": "Gas cena"
-  },
   "general": {
     "message": "Vispārīgi"
   },
diff --git a/app/_locales/ms/messages.json b/app/_locales/ms/messages.json
index c4d2b538e..141524f57 100644
--- a/app/_locales/ms/messages.json
+++ b/app/_locales/ms/messages.json
@@ -432,7 +432,7 @@
   "gasLimit": {
     "message": "Had Gas"
   },
-  "gasLimitInfoModalContent": {
+  "gasLimitInfoTooltipContent": {
     "message": "Had gas ialah jumlah maksimum unit gas yang anda sedia belanjakan."
   },
   "gasLimitTooLow": {
@@ -447,12 +447,9 @@
   "gasPriceExtremelyLow": {
     "message": "Harga Gas Teramat Rendah"
   },
-  "gasPriceInfoModalContent": {
+  "gasPriceInfoTooltipContent": {
     "message": "Harga gas menentukan jumlah Ether yang anda sedia bayar untuk setiap unit gas."
   },
-  "gasPriceNoDenom": {
-    "message": "Harga Gas"
-  },
   "general": {
     "message": "Am"
   },
diff --git a/app/_locales/no/messages.json b/app/_locales/no/messages.json
index 54d2319b9..361f2a353 100644
--- a/app/_locales/no/messages.json
+++ b/app/_locales/no/messages.json
@@ -441,7 +441,7 @@
   "gasLimit": {
     "message": "Datakraftsgrense "
   },
-  "gasLimitInfoModalContent": {
+  "gasLimitInfoTooltipContent": {
     "message": "Datakraftgrense er det maksimale antall datakraft du er vilig til å benytte. "
   },
   "gasLimitTooLow": {
@@ -456,12 +456,9 @@
   "gasPriceExtremelyLow": {
     "message": "Datakraftspris ekstremt lav "
   },
-  "gasPriceInfoModalContent": {
+  "gasPriceInfoTooltipContent": {
     "message": "Datakraftpris angir mengden Ether du er villig til å betale for hver datakraftenhet."
   },
-  "gasPriceNoDenom": {
-    "message": "Datakraft"
-  },
   "general": {
     "message": "Generell"
   },
diff --git a/app/_locales/pl/messages.json b/app/_locales/pl/messages.json
index b057d1642..861e5e6a6 100644
--- a/app/_locales/pl/messages.json
+++ b/app/_locales/pl/messages.json
@@ -445,7 +445,7 @@
   "gasLimit": {
     "message": "Limit gazu"
   },
-  "gasLimitInfoModalContent": {
+  "gasLimitInfoTooltipContent": {
     "message": "Limit gazu to maksymalna ilość jednostek gazu, którą jesteś skłonny użyć w transakcji."
   },
   "gasLimitTooLow": {
@@ -460,12 +460,9 @@
   "gasPriceExtremelyLow": {
     "message": "Bardzo niska cena gazu"
   },
-  "gasPriceInfoModalContent": {
+  "gasPriceInfoTooltipContent": {
     "message": "Cena gazu to ilość kryptowaluty Ether, którą jesteś gotów zapłacić za każdą jednostkę gazu."
   },
-  "gasPriceNoDenom": {
-    "message": "Cena gazu"
-  },
   "general": {
     "message": "Ogólne"
   },
diff --git a/app/_locales/pt_BR/messages.json b/app/_locales/pt_BR/messages.json
index 2eda26024..460fccdb0 100644
--- a/app/_locales/pt_BR/messages.json
+++ b/app/_locales/pt_BR/messages.json
@@ -442,7 +442,7 @@
   "gasLimit": {
     "message": "Limite de Gás"
   },
-  "gasLimitInfoModalContent": {
+  "gasLimitInfoTooltipContent": {
     "message": "O limite de gás é a quantidade máxima de unidades de gás que você está disposto a gastar."
   },
   "gasLimitTooLow": {
@@ -457,12 +457,9 @@
   "gasPriceExtremelyLow": {
     "message": "Preço de Gas extremamente baixo"
   },
-  "gasPriceInfoModalContent": {
+  "gasPriceInfoTooltipContent": {
     "message": "O preço do gás especifica a quantidade de Ether que você está disposto a pagar por cada unidade de gás."
   },
-  "gasPriceNoDenom": {
-    "message": "Preço do Gás"
-  },
   "general": {
     "message": "Geral"
   },
diff --git a/app/_locales/ro/messages.json b/app/_locales/ro/messages.json
index 96e94f9f4..11b58377b 100644
--- a/app/_locales/ro/messages.json
+++ b/app/_locales/ro/messages.json
@@ -444,7 +444,7 @@
   "gasLimit": {
     "message": "Limită gas"
   },
-  "gasLimitInfoModalContent": {
+  "gasLimitInfoTooltipContent": {
     "message": "Limita gaz este numărul maxim de unități de gaz pe care sunteți dispus(ă) să le cheltuiți."
   },
   "gasLimitTooLow": {
@@ -459,12 +459,9 @@
   "gasPriceExtremelyLow": {
     "message": "Prețul gaz este foarte scăzut"
   },
-  "gasPriceInfoModalContent": {
+  "gasPriceInfoTooltipContent": {
     "message": "Prețul în gas indică suma Ether pe care doriți să o plătiți pentru fiecare unitate gas."
   },
-  "gasPriceNoDenom": {
-    "message": "Preț gas"
-  },
   "generalSettingsDescription": {
     "message": "Schimb valutar, moneda principală, limba, blockies identicon"
   },
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index 24ea1aa24..c25b6a1c5 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -766,7 +766,7 @@
   "functionType": {
     "message": "Тип функции"
   },
-  "gasLimitInfoModalContent": {
+  "gasLimitInfoTooltipContent": {
     "message": "Лимит газа - это максимальное количество единиц газа, которое вы готовы потратить."
   },
   "gasUsed": {
@@ -775,12 +775,9 @@
   "gasPriceExtremelyLow": {
     "message": "Цена на газ слишком низкая"
   },
-  "gasPriceInfoModalContent": {
+  "gasPriceInfoTooltipContent": {
     "message": "Цена на газ указывает количество эфира, которое вы готовы платить за каждую единицу газа."
   },
-  "gasPriceNoDenom": {
-    "message": "Цена на газ"
-  },
   "general": {
     "message": "Основное"
   },
diff --git a/app/_locales/sk/messages.json b/app/_locales/sk/messages.json
index 5973c82cb..1d2e00b2b 100644
--- a/app/_locales/sk/messages.json
+++ b/app/_locales/sk/messages.json
@@ -439,7 +439,7 @@
   "gasLimit": {
     "message": "Limit paliva"
   },
-  "gasLimitInfoModalContent": {
+  "gasLimitInfoTooltipContent": {
     "message": "Limit GAS je maximálne množstvo jednotiek GAS, ktoré ste ochotní minúť."
   },
   "gasLimitTooLow": {
@@ -454,12 +454,9 @@
   "gasPriceExtremelyLow": {
     "message": "Cena za GAS je mimoriadne nízka"
   },
-  "gasPriceInfoModalContent": {
+  "gasPriceInfoTooltipContent": {
     "message": "Cena za GAS určuje množstvo Ether, ktoré ste ochotní zaplatiť za každú jednotku GAS."
   },
-  "gasPriceNoDenom": {
-    "message": "Cena GAS"
-  },
   "general": {
     "message": "Všeobecne"
   },
diff --git a/app/_locales/sl/messages.json b/app/_locales/sl/messages.json
index c5659aaa6..fa3601515 100644
--- a/app/_locales/sl/messages.json
+++ b/app/_locales/sl/messages.json
@@ -445,7 +445,7 @@
   "functionType": {
     "message": "Vrsta funkcije"
   },
-  "gasLimitInfoModalContent": {
+  "gasLimitInfoTooltipContent": {
     "message": "Omejitev plina je največja količina enot plina, ki ste jo pripravljeni porabiti."
   },
   "gasLimitTooLow": {
@@ -460,12 +460,9 @@
   "gasPriceExtremelyLow": {
     "message": "Gas Price zelo nizkek"
   },
-  "gasPriceInfoModalContent": {
+  "gasPriceInfoTooltipContent": {
     "message": "Cena plina določa količino etra, ki ste ga pripravljeni plačati za vsako enoto plina."
   },
-  "gasPriceNoDenom": {
-    "message": "Gas price"
-  },
   "general": {
     "message": "Splošno"
   },
diff --git a/app/_locales/sr/messages.json b/app/_locales/sr/messages.json
index 468b55d6c..65a3acf68 100644
--- a/app/_locales/sr/messages.json
+++ b/app/_locales/sr/messages.json
@@ -445,7 +445,7 @@
   "gasLimit": {
     "message": "Limit gasa"
   },
-  "gasLimitInfoModalContent": {
+  "gasLimitInfoTooltipContent": {
     "message": "Granica gasa je maksimalni iznos jedinica gasa koje ste voljni da potrošite."
   },
   "gasLimitTooLow": {
@@ -460,12 +460,9 @@
   "gasPriceExtremelyLow": {
     "message": "Cena gasa izuzetno niska"
   },
-  "gasPriceInfoModalContent": {
+  "gasPriceInfoTooltipContent": {
     "message": "Cena gasa određuje količinu Ethera koju ste spremni da platite za svaku jedinicu gasa."
   },
-  "gasPriceNoDenom": {
-    "message": "Cena gas-a"
-  },
   "general": {
     "message": "Opšte"
   },
diff --git a/app/_locales/sv/messages.json b/app/_locales/sv/messages.json
index 2907ab6f6..a2d6d8430 100644
--- a/app/_locales/sv/messages.json
+++ b/app/_locales/sv/messages.json
@@ -438,7 +438,7 @@
   "gasLimit": {
     "message": "Gasgräns"
   },
-  "gasLimitInfoModalContent": {
+  "gasLimitInfoTooltipContent": {
     "message": "Gasgräns innebär det maximala antalet gasenheter som du är villig att spendera."
   },
   "gasLimitTooLow": {
@@ -453,12 +453,9 @@
   "gasPriceExtremelyLow": {
     "message": "Gaspris extremt lågt"
   },
-  "gasPriceInfoModalContent": {
+  "gasPriceInfoTooltipContent": {
     "message": "Gaspriset anger den summa Ether som du är villig att betala för varje gasenhet."
   },
-  "gasPriceNoDenom": {
-    "message": "Gaspris"
-  },
   "general": {
     "message": "Allmänt"
   },
diff --git a/app/_locales/sw/messages.json b/app/_locales/sw/messages.json
index aa0c03cd9..da5965dff 100644
--- a/app/_locales/sw/messages.json
+++ b/app/_locales/sw/messages.json
@@ -438,7 +438,7 @@
   "gasLimit": {
     "message": "Kikomo cha Gesi"
   },
-  "gasLimitInfoModalContent": {
+  "gasLimitInfoTooltipContent": {
     "message": "Ukomo wa gesi ni kiwango cha juu kabisa cha cha vizio vya gesi ambavyo upo tayari kutumia."
   },
   "gasLimitTooLow": {
@@ -453,12 +453,9 @@
   "gasPriceExtremelyLow": {
     "message": "Bei ya Gesi Ipo Chini Kupita Kiasi"
   },
-  "gasPriceInfoModalContent": {
+  "gasPriceInfoTooltipContent": {
     "message": "Bei ya gesi hubainisha kiwango cha Ether ambacho upo radhi kulipia kila kizio cha gesi."
   },
-  "gasPriceNoDenom": {
-    "message": "Bei ya Gesi"
-  },
   "general": {
     "message": "Jumla"
   },
diff --git a/app/_locales/uk/messages.json b/app/_locales/uk/messages.json
index 3de08a5ac..8c4381ef6 100644
--- a/app/_locales/uk/messages.json
+++ b/app/_locales/uk/messages.json
@@ -448,7 +448,7 @@
   "gasLimit": {
     "message": "Ліміт газу"
   },
-  "gasLimitInfoModalContent": {
+  "gasLimitInfoTooltipContent": {
     "message": "Ліміт газу – максимальна кількість одиниць газу, яку ви бажаєте витратити."
   },
   "gasLimitTooLow": {
@@ -463,12 +463,9 @@
   "gasPriceExtremelyLow": {
     "message": "Ціна газу дуже низька"
   },
-  "gasPriceInfoModalContent": {
+  "gasPriceInfoTooltipContent": {
     "message": "Ціна на пальне визначає кількість Ether, яку ви готові заплатити за кожну одиницю пального."
   },
-  "gasPriceNoDenom": {
-    "message": "Ціна Газу"
-  },
   "general": {
     "message": "Загальні"
   },
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index bd13f3ac1..267b85c75 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -445,7 +445,7 @@
   "functionType": {
     "message": "功能类型"
   },
-  "gasLimitInfoModalContent": {
+  "gasLimitInfoTooltipContent": {
     "message": "天然气限制即您个人希望购买的最大单位数量。"
   },
   "gasLimitTooLow": {
@@ -457,12 +457,9 @@
   "gasPriceExtremelyLow": {
     "message": "天然气价格极低"
   },
-  "gasPriceInfoModalContent": {
+  "gasPriceInfoTooltipContent": {
     "message": "天然气价格将详细列明每个付费天然气单位的以太币金额。"
   },
-  "gasPriceNoDenom": {
-    "message": "天然气价格"
-  },
   "general": {
     "message": "通用"
   },
diff --git a/app/_locales/zh_TW/messages.json b/app/_locales/zh_TW/messages.json
index 3e2e5d834..4d8680fa4 100644
--- a/app/_locales/zh_TW/messages.json
+++ b/app/_locales/zh_TW/messages.json
@@ -445,7 +445,7 @@
   "gasLimit": {
     "message": "Gas 上限"
   },
-  "gasLimitInfoModalContent": {
+  "gasLimitInfoTooltipContent": {
     "message": "Gas 上限代表願意為交易手續費所付出的最高總價"
   },
   "gasLimitTooLow": {
@@ -460,12 +460,9 @@
   "gasPriceExtremelyLow": {
     "message": "Gas 價格極低"
   },
-  "gasPriceInfoModalContent": {
+  "gasPriceInfoTooltipContent": {
     "message": "Gas 價格代表願意為交易手續費付出的單位價格，價格越高交易處理速度越快"
   },
-  "gasPriceNoDenom": {
-    "message": "Gas 價格"
-  },
   "general": {
     "message": "一般"
   },
diff --git a/ui/app/components/app/gas-customization/advanced-gas-inputs/advanced-gas-inputs.component.js b/ui/app/components/app/gas-customization/advanced-gas-inputs/advanced-gas-inputs.component.js
index a3d97c035..d3ba70630 100644
--- a/ui/app/components/app/gas-customization/advanced-gas-inputs/advanced-gas-inputs.component.js
+++ b/ui/app/components/app/gas-customization/advanced-gas-inputs/advanced-gas-inputs.component.js
@@ -2,6 +2,7 @@ import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 import classnames from 'classnames'
 import { debounce } from 'lodash'
+import Tooltip from '../../../ui/tooltip'
 
 export default class AdvancedGasInputs extends Component {
   static contextTypes = {
@@ -16,8 +17,6 @@ export default class AdvancedGasInputs extends Component {
     insufficientBalance: PropTypes.bool,
     customPriceIsSafe: PropTypes.bool,
     isSpeedUp: PropTypes.bool,
-    showGasPriceInfoModal: PropTypes.func,
-    showGasLimitInfoModal: PropTypes.func,
   }
 
   constructor (props) {
@@ -102,12 +101,14 @@ export default class AdvancedGasInputs extends Component {
     return {}
   }
 
-  renderGasInput ({ value, onChange, errorComponent, errorType, infoOnClick, label }) {
+  renderGasInput ({ value, onChange, errorComponent, errorType, label, tooltipTitle }) {
     return (
       <div className="advanced-gas-inputs__gas-edit-row">
         <div className="advanced-gas-inputs__gas-edit-row__label">
           { label }
-          <i className="fa fa-info-circle" onClick={infoOnClick} />
+          <Tooltip title={tooltipTitle} position="top" arrow>
+            <i className="fa fa-info-circle" />
+          </Tooltip>
         </div>
         <div className="advanced-gas-inputs__gas-edit-row__input-wrapper">
           <input
@@ -150,8 +151,6 @@ export default class AdvancedGasInputs extends Component {
       insufficientBalance,
       customPriceIsSafe,
       isSpeedUp,
-      showGasPriceInfoModal,
-      showGasLimitInfoModal,
     } = this.props
     const {
       gasPrice,
@@ -182,19 +181,19 @@ export default class AdvancedGasInputs extends Component {
       <div className="advanced-gas-inputs__gas-edit-rows">
         { this.renderGasInput({
           label: this.context.t('gasPrice'),
+          tooltipTitle: this.context.t('gasPriceInfoTooltipContent'),
           value: this.state.gasPrice,
           onChange: this.onChangeGasPrice,
           errorComponent: gasPriceErrorComponent,
           errorType: gasPriceErrorType,
-          infoOnClick: showGasPriceInfoModal,
         }) }
         { this.renderGasInput({
           label: this.context.t('gasLimit'),
+          tooltipTitle: this.context.t('gasLimitInfoTooltipContent'),
           value: this.state.gasLimit,
           onChange: this.onChangeGasLimit,
           errorComponent: gasLimitErrorComponent,
           errorType: gasLimitErrorType,
-          infoOnClick: showGasLimitInfoModal,
         }) }
       </div>
     )
diff --git a/ui/app/components/app/gas-customization/advanced-gas-inputs/advanced-gas-inputs.container.js b/ui/app/components/app/gas-customization/advanced-gas-inputs/advanced-gas-inputs.container.js
index 61c73bcf1..2b17a7847 100644
--- a/ui/app/components/app/gas-customization/advanced-gas-inputs/advanced-gas-inputs.container.js
+++ b/ui/app/components/app/gas-customization/advanced-gas-inputs/advanced-gas-inputs.container.js
@@ -1,5 +1,4 @@
 import { connect } from 'react-redux'
-import { showModal } from '../../../../store/actions'
 import {
   decGWEIToHexWEI,
   decimalToHex,
@@ -15,13 +14,6 @@ function convertGasLimitForInputs (gasLimitInHexWEI) {
   return parseInt(gasLimitInHexWEI, 16) || 0
 }
 
-const mapDispatchToProps = (dispatch) => {
-  return {
-    showGasPriceInfoModal: () => dispatch(showModal({ name: 'GAS_PRICE_INFO_MODAL' })),
-    showGasLimitInfoModal: () => dispatch(showModal({ name: 'GAS_LIMIT_INFO_MODAL' })),
-  }
-}
-
 const mergeProps = (stateProps, dispatchProps, ownProps) => {
   const { customGasPrice, customGasLimit, updateCustomGasPrice, updateCustomGasLimit } = ownProps
   return {
@@ -35,4 +27,4 @@ const mergeProps = (stateProps, dispatchProps, ownProps) => {
   }
 }
 
-export default connect(null, mapDispatchToProps, mergeProps)(AdvancedGasInputs)
+export default connect(null, null, mergeProps)(AdvancedGasInputs)
diff --git a/ui/app/components/app/modals/index.scss b/ui/app/components/app/modals/index.scss
index b6232aa16..0a48e41c4 100644
--- a/ui/app/components/app/modals/index.scss
+++ b/ui/app/components/app/modals/index.scss
@@ -9,7 +9,6 @@
 @import 'hide-token-confirmation-modal/index';
 @import 'metametrics-opt-in-modal/index';
 @import 'new-account-modal/index';
-@import 'notification-modal/index';
 @import 'qr-scanner/index';
 @import 'transaction-confirmed/index';
 
diff --git a/ui/app/components/app/modals/modal.js b/ui/app/components/app/modals/modal.js
index d8e6ef214..bc747f529 100644
--- a/ui/app/components/app/modals/modal.js
+++ b/ui/app/components/app/modals/modal.js
@@ -14,7 +14,6 @@ import DepositEtherModal from './deposit-ether-modal'
 import AccountDetailsModal from './account-details-modal'
 import ExportPrivateKeyModal from './export-private-key-modal'
 import HideTokenConfirmationModal from './hide-token-confirmation-modal'
-import NotifcationModal from './notification-modal'
 import QRScanner from './qr-scanner'
 
 import ConfirmRemoveAccount from './confirm-remove-account'
@@ -205,30 +204,6 @@ const MODALS = {
     },
   },
 
-  GAS_PRICE_INFO_MODAL: {
-    contents: <NotifcationModal header="gasPriceNoDenom" message="gasPriceInfoModalContent" />,
-    mobileModalStyle: {
-      width: '95%',
-      top: getEnvironmentType() === ENVIRONMENT_TYPE_POPUP ? '52vh' : '36.5vh',
-    },
-    laptopModalStyle: {
-      width: '449px',
-      top: 'calc(33% + 45px)',
-    },
-  },
-
-  GAS_LIMIT_INFO_MODAL: {
-    contents: <NotifcationModal header="gasLimit" message="gasLimitInfoModalContent" />,
-    mobileModalStyle: {
-      width: '95%',
-      top: getEnvironmentType() === ENVIRONMENT_TYPE_POPUP ? '52vh' : '36.5vh',
-    },
-    laptopModalStyle: {
-      width: '449px',
-      top: 'calc(33% + 45px)',
-    },
-  },
-
   CONFIRM_RESET_ACCOUNT: {
     contents: <ConfirmResetAccount />,
     mobileModalStyle: {
diff --git a/ui/app/components/app/modals/notification-modal/index.js b/ui/app/components/app/modals/notification-modal/index.js
deleted file mode 100644
index a2aab7c1d..000000000
--- a/ui/app/components/app/modals/notification-modal/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './notification-modal'
diff --git a/ui/app/components/app/modals/notification-modal/index.scss b/ui/app/components/app/modals/notification-modal/index.scss
deleted file mode 100644
index 93e085496..000000000
--- a/ui/app/components/app/modals/notification-modal/index.scss
+++ /dev/null
@@ -1,56 +0,0 @@
-.notification-modal {
-  &__wrapper {
-    display: flex;
-    flex-direction: column;
-    justify-content: flex-start;
-    align-items: center;
-    position: relative;
-    border: 1px solid $alto;
-    box-shadow: 0 0 2px 2px $alto;
-  }
-
-  &__header {
-    background: $wild-sand;
-    width: 100%;
-    display: flex;
-    justify-content: center;
-    padding: 30px;
-    font-size: 22px;
-    color: $nile-blue;
-  }
-
-  &__message {
-    padding: 20px;
-    width: 100%;
-    display: flex;
-    justify-content: center;
-    font-size: 17px;
-    color: $nile-blue;
-  }
-
-  &__buttons {
-    display: flex;
-    justify-content: space-evenly;
-    width: 100%;
-    margin-bottom: 24px;
-    padding: 0 42px;
-
-    &__btn {
-      cursor: pointer;
-    }
-  }
-
-  &__link {
-    color: $primary-blue;
-  }
-
-  .modal-close-x::after {
-    content: '\00D7';
-    font-size: 2em;
-    color: $dusty-gray;
-    position: absolute;
-    top: 25px;
-    right: 17.5px;
-    cursor: pointer;
-  }
-}
diff --git a/ui/app/components/app/modals/notification-modal/notification-modal.js b/ui/app/components/app/modals/notification-modal/notification-modal.js
deleted file mode 100644
index 2cda61428..000000000
--- a/ui/app/components/app/modals/notification-modal/notification-modal.js
+++ /dev/null
@@ -1,89 +0,0 @@
-import PropTypes from 'prop-types'
-import React, { Component } from 'react'
-import { connect } from 'react-redux'
-import { hideModal } from '../../../../store/actions'
-
-class NotificationModal extends Component {
-  static contextProps = {
-    t: PropTypes.func.isRequired,
-  }
-
-  render () {
-    const {
-      header,
-      message,
-      showCancelButton = false,
-      showConfirmButton = false,
-      // eslint-disable-next-line no-shadow
-      hideModal,
-      onConfirm,
-    } = this.props
-
-    const { t } = this.context
-
-    const showButtons = showCancelButton || showConfirmButton
-
-    return (
-      <div>
-        <div className="notification-modal__wrapper">
-          <div className="notification-modal__header">
-            {this.context.t(header)}
-          </div>
-          <div className="notification-modal__message-wrapper">
-            <div className="notification-modal__message">
-              {this.context.t(message)}
-            </div>
-          </div>
-          <div className="modal-close-x" onClick={hideModal} />
-          {showButtons && (
-            <div className="notification-modal__buttons">
-              {showCancelButton && (
-                <div
-                  className="btn-default notification-modal__buttons__btn"
-                  onClick={hideModal}
-                >
-                  {t('cancel')}
-                </div>
-              )}
-              {showConfirmButton && (
-                <div
-                  className="button btn-secondary notification-modal__buttons__btn"
-                  onClick={() => {
-                    onConfirm()
-                    hideModal()
-                  }}
-                >
-                  {t('confirm')}
-                </div>
-              )}
-            </div>
-          )}
-        </div>
-      </div>
-    )
-  }
-}
-
-NotificationModal.propTypes = {
-  hideModal: PropTypes.func,
-  header: PropTypes.string,
-  message: PropTypes.node,
-  showCancelButton: PropTypes.bool,
-  showConfirmButton: PropTypes.bool,
-  onConfirm: PropTypes.func,
-}
-
-const mapDispatchToProps = (dispatch) => {
-  return {
-    hideModal: () => {
-      dispatch(hideModal())
-    },
-  }
-}
-
-NotificationModal.contextTypes = {
-  t: PropTypes.func,
-}
-
-export default connect(null, mapDispatchToProps)(NotificationModal)
-