diff --git a/package-lock.json b/package-lock.json
index 68f5724..4617fd6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8586,7 +8586,7 @@
                 "@types/bn.js": "^4.11.3",
                 "bn.js": "^4.11.0",
                 "create-hash": "^1.1.2",
-                "elliptic": "^6.5.3",
+                "elliptic": "^6.5.2",
                 "ethereum-cryptography": "^0.1.3",
                 "ethjs-util": "0.1.6",
                 "rlp": "^2.2.3"
@@ -8617,7 +8617,7 @@
           "requires": {
             "bn.js": "^4.11.0",
             "create-hash": "^1.1.2",
-            "elliptic": "^6.5.3",
+            "elliptic": "^6.5.2",
             "ethereum-cryptography": "^0.1.3",
             "ethjs-util": "^0.1.3",
             "rlp": "^2.0.0",
@@ -8727,7 +8727,7 @@
                 "@types/bn.js": "^4.11.3",
                 "bn.js": "^4.11.0",
                 "create-hash": "^1.1.2",
-                "elliptic": "^6.5.3",
+                "elliptic": "^6.5.2",
                 "ethereum-cryptography": "^0.1.3",
                 "ethjs-util": "0.1.6",
                 "rlp": "^2.2.3"
@@ -8758,7 +8758,7 @@
           "requires": {
             "bn.js": "^4.11.0",
             "create-hash": "^1.1.2",
-            "elliptic": "^6.5.3",
+            "elliptic": "^6.5.2",
             "ethereum-cryptography": "^0.1.3",
             "ethjs-util": "^0.1.3",
             "rlp": "^2.0.0",
@@ -19795,6 +19795,22 @@
             "servify": "^0.1.12",
             "ws": "^3.0.0",
             "xhr-request-promise": "^0.1.2"
+          },
+          "dependencies": {
+            "elliptic": {
+              "version": "6.5.4",
+              "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+              "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+              "requires": {
+                "bn.js": "^4.11.9",
+                "brorand": "^1.1.0",
+                "hash.js": "^1.0.0",
+                "hmac-drbg": "^1.0.1",
+                "inherits": "^2.0.4",
+                "minimalistic-assert": "^1.0.1",
+                "minimalistic-crypto-utils": "^1.0.1"
+              }
+            }
           }
         },
         "fs-extra": {
@@ -21555,6 +21571,22 @@
             "ethereum-cryptography": "^0.1.3",
             "ethjs-util": "0.1.6",
             "rlp": "^2.2.3"
+          },
+          "dependencies": {
+            "elliptic": {
+              "version": "6.5.4",
+              "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+              "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+              "requires": {
+                "bn.js": "^4.11.9",
+                "brorand": "^1.1.0",
+                "hash.js": "^1.0.0",
+                "hmac-drbg": "^1.0.1",
+                "inherits": "^2.0.4",
+                "minimalistic-assert": "^1.0.1",
+                "minimalistic-crypto-utils": "^1.0.1"
+              }
+            }
           }
         },
         "uuid": {
@@ -21837,7 +21869,7 @@
                 "@types/bn.js": "^4.11.3",
                 "bn.js": "^4.11.0",
                 "create-hash": "^1.1.2",
-                "elliptic": "^6.5.3",
+                "elliptic": "^6.5.2",
                 "ethereum-cryptography": "^0.1.3",
                 "ethjs-util": "0.1.6",
                 "rlp": "^2.2.3"
@@ -21868,7 +21900,7 @@
           "requires": {
             "bn.js": "^4.11.0",
             "create-hash": "^1.1.2",
-            "elliptic": "^6.5.3",
+            "elliptic": "^6.5.2",
             "ethereum-cryptography": "^0.1.3",
             "ethjs-util": "^0.1.3",
             "rlp": "^2.0.0",
diff --git a/src/components/alert/Alert.module.scss b/src/components/alert/Alert.module.scss
index 691adf4..86ed831 100644
--- a/src/components/alert/Alert.module.scss
+++ b/src/components/alert/Alert.module.scss
@@ -1,2 +1,2 @@
-@import 'index.scss';
+@import 'index.module.scss';
 
diff --git a/src/components/button/Button.module.scss b/src/components/button/Button.module.scss
index e921381..0747d11 100644
--- a/src/components/button/Button.module.scss
+++ b/src/components/button/Button.module.scss
@@ -1,4 +1,4 @@
-@import 'index.scss';
+@import 'index.module.scss';
 
 .Button {
   display: flex;
diff --git a/src/components/copy/Copy.module.scss b/src/components/copy/Copy.module.scss
index ea1165a..aff4f0c 100644
--- a/src/components/copy/Copy.module.scss
+++ b/src/components/copy/Copy.module.scss
@@ -1,4 +1,4 @@
-@import 'index.scss';
+@import 'index.module.scss';
 
 .Copy {
   .icon {
diff --git a/src/components/gaspicker/GasPicker.module.scss b/src/components/gaspicker/GasPicker.module.scss
index d630fc8..07d9ba7 100644
--- a/src/components/gaspicker/GasPicker.module.scss
+++ b/src/components/gaspicker/GasPicker.module.scss
@@ -1,4 +1,4 @@
-@import 'index.scss';
+@import 'index.module.scss';
 
 .GasPicker {
   display: flex;
diff --git a/src/components/info/Info.module.scss b/src/components/info/Info.module.scss
index a9e8de2..32c3070 100644
--- a/src/components/info/Info.module.scss
+++ b/src/components/info/Info.module.scss
@@ -1,4 +1,4 @@
-@import 'index.scss';
+@import 'index.module.scss';
 
 .Info {
   display: flex;
diff --git a/src/components/input/Input.module.scss b/src/components/input/Input.module.scss
index f0796cc..1f568e7 100644
--- a/src/components/input/Input.module.scss
+++ b/src/components/input/Input.module.scss
@@ -1,4 +1,4 @@
-@import 'index.scss';
+@import 'index.module.scss';
 
 .Input {
   display: flex;
diff --git a/src/components/inputselect/InputSelect.module.scss b/src/components/inputselect/InputSelect.module.scss
index 0e16966..eafda08 100644
--- a/src/components/inputselect/InputSelect.module.scss
+++ b/src/components/inputselect/InputSelect.module.scss
@@ -1,4 +1,4 @@
-@import 'index.scss';
+@import 'index.module.scss';
 
 .selectContainer {
   height: 46px;
diff --git a/src/components/mobileheader/MobileHeader.module.scss b/src/components/mobileheader/MobileHeader.module.scss
index 8325b16..23a77c0 100644
--- a/src/components/mobileheader/MobileHeader.module.scss
+++ b/src/components/mobileheader/MobileHeader.module.scss
@@ -1,4 +1,4 @@
-@import 'index.scss';
+@import 'index.module.scss';
 
 .MobileHeader {
   display: none;
diff --git a/src/components/mobilemenu/MobileMenu.module.scss b/src/components/mobilemenu/MobileMenu.module.scss
index 0616110..2416401 100644
--- a/src/components/mobilemenu/MobileMenu.module.scss
+++ b/src/components/mobilemenu/MobileMenu.module.scss
@@ -1,4 +1,4 @@
-@import 'index.scss';
+@import 'index.module.scss';
 
 .menu {
   background-color: $gray1;
diff --git a/src/components/modal/Modal.js b/src/components/modal/Modal.js
index 4ac5503..a728ec7 100644
--- a/src/components/modal/Modal.js
+++ b/src/components/modal/Modal.js
@@ -21,7 +21,7 @@ import {
   Fade
 } from '@material-ui/core';
 
-import { gray6, gray3, gray1 } from 'index.scss';
+import { gray6, gray3, gray1 } from 'index.module.scss';
 
 const useStyles = makeStyles({
   modal: {
diff --git a/src/components/pager/Pager.module.scss b/src/components/pager/Pager.module.scss
index 42c5249..2f1984a 100644
--- a/src/components/pager/Pager.module.scss
+++ b/src/components/pager/Pager.module.scss
@@ -1,4 +1,4 @@
-@import 'index.scss';
+@import 'index.module.scss';
 
 .Pager {
   display: flex;
diff --git a/src/components/select/Select.module.scss b/src/components/select/Select.module.scss
index c7b26f1..b0b7aec 100644
--- a/src/components/select/Select.module.scss
+++ b/src/components/select/Select.module.scss
@@ -1,4 +1,4 @@
-@import 'index.scss';
+@import 'index.module.scss';
 
 .Select {
   display: flex;
diff --git a/src/components/tabs/Tabs.module.scss b/src/components/tabs/Tabs.module.scss
index f3cd3e9..96e9cc6 100644
--- a/src/components/tabs/Tabs.module.scss
+++ b/src/components/tabs/Tabs.module.scss
@@ -1,4 +1,4 @@
-@import 'index.scss';
+@import 'index.module.scss';
 
 .Tabs {
   display: flex;
diff --git a/src/components/transaction/Transaction.module.scss b/src/components/transaction/Transaction.module.scss
index b0a095d..702a98d 100644
--- a/src/components/transaction/Transaction.module.scss
+++ b/src/components/transaction/Transaction.module.scss
@@ -1,4 +1,4 @@
-@import 'index.scss';
+@import 'index.module.scss';
 
 .Transaction {
   display: flex;
diff --git a/src/components/walletpicker/WalletPicker.module.scss b/src/components/walletpicker/WalletPicker.module.scss
index 6da381b..b69703e 100644
--- a/src/components/walletpicker/WalletPicker.module.scss
+++ b/src/components/walletpicker/WalletPicker.module.scss
@@ -1,4 +1,4 @@
-@import 'index.scss';
+@import 'index.module.scss';
 
 .WalletPicker {
   display: flex;
diff --git a/src/containers/account/Account.module.scss b/src/containers/account/Account.module.scss
index 00bfe5a..05f53ff 100644
--- a/src/containers/account/Account.module.scss
+++ b/src/containers/account/Account.module.scss
@@ -1,4 +1,4 @@
-@import 'index.scss';
+@import 'index.module.scss';
 
 .Account {
   margin-bottom: 20px;
diff --git a/src/containers/app/App.module.scss b/src/containers/app/App.module.scss
index 3da392a..f6242b7 100644
--- a/src/containers/app/App.module.scss
+++ b/src/containers/app/App.module.scss
@@ -1,4 +1,4 @@
-@import 'index.scss';
+@import 'index.module.scss';
 
 .App {
   display: flex;
diff --git a/src/containers/home/Home.module.scss b/src/containers/home/Home.module.scss
index baf6c85..52c8109 100644
--- a/src/containers/home/Home.module.scss
+++ b/src/containers/home/Home.module.scss
@@ -1,4 +1,4 @@
-@import 'index.scss';
+@import 'index.module.scss';
 
 .Home {
   display: flex;
diff --git a/src/containers/modals/deposit/DepositModal.module.scss b/src/containers/modals/deposit/DepositModal.module.scss
index 56c243b..423f10f 100644
--- a/src/containers/modals/deposit/DepositModal.module.scss
+++ b/src/containers/modals/deposit/DepositModal.module.scss
@@ -1,4 +1,4 @@
-@import 'index.scss';
+@import 'index.module.scss';
 
 .buttons {
   display: flex;
diff --git a/src/containers/modals/exit/ExitModal.module.scss b/src/containers/modals/exit/ExitModal.module.scss
index cfef20a..27356ca 100644
--- a/src/containers/modals/exit/ExitModal.module.scss
+++ b/src/containers/modals/exit/ExitModal.module.scss
@@ -1,4 +1,4 @@
-@import 'index.scss';
+@import 'index.module.scss';
 
 .buttons {
   display: flex;
diff --git a/src/containers/modals/ledger/LedgerConnect.module.scss b/src/containers/modals/ledger/LedgerConnect.module.scss
index 7a0be4e..fbfec27 100644
--- a/src/containers/modals/ledger/LedgerConnect.module.scss
+++ b/src/containers/modals/ledger/LedgerConnect.module.scss
@@ -1,4 +1,4 @@
-@import 'index.scss';
+@import 'index.module.scss';
 
 .buttons {
   display: flex;
diff --git a/src/containers/modals/ledger/LedgerPrompt.module.scss b/src/containers/modals/ledger/LedgerPrompt.module.scss
index 32cd024..b1a963c 100644
--- a/src/containers/modals/ledger/LedgerPrompt.module.scss
+++ b/src/containers/modals/ledger/LedgerPrompt.module.scss
@@ -1,4 +1,4 @@
-@import 'index.scss';
+@import 'index.module.scss';
 
 .buttons {
   display: flex;
diff --git a/src/containers/modals/merge/MergeModal.module.scss b/src/containers/modals/merge/MergeModal.module.scss
index 59ea585..810853e 100644
--- a/src/containers/modals/merge/MergeModal.module.scss
+++ b/src/containers/modals/merge/MergeModal.module.scss
@@ -1,4 +1,4 @@
-@import 'index.scss';
+@import 'index.module.scss';
 
 .buttons {
   display: flex;
diff --git a/src/containers/modals/processexit/ProcessExitsModal.module.scss b/src/containers/modals/processexit/ProcessExitsModal.module.scss
index 5bc91d8..21194ad 100644
--- a/src/containers/modals/processexit/ProcessExitsModal.module.scss
+++ b/src/containers/modals/processexit/ProcessExitsModal.module.scss
@@ -1,4 +1,4 @@
-@import 'index.scss';
+@import 'index.module.scss';
 
 .buttons {
   display: flex;
diff --git a/src/containers/modals/transfer/TransferModal.module.scss b/src/containers/modals/transfer/TransferModal.module.scss
index 8c9f4e9..ea2b25b 100644
--- a/src/containers/modals/transfer/TransferModal.module.scss
+++ b/src/containers/modals/transfer/TransferModal.module.scss
@@ -1,4 +1,4 @@
-@import 'index.scss';
+@import 'index.module.scss';
 
 .disclaimer {
   font-family: 'Messina';
diff --git a/src/containers/modals/wrongnetwork/WrongNetworkModal.module.scss b/src/containers/modals/wrongnetwork/WrongNetworkModal.module.scss
index 556c3e3..4a09533 100644
--- a/src/containers/modals/wrongnetwork/WrongNetworkModal.module.scss
+++ b/src/containers/modals/wrongnetwork/WrongNetworkModal.module.scss
@@ -1,4 +1,4 @@
-@import 'index.scss';
+@import 'index.module.scss';
 
 .WrongNetworkModal {
   display: flex;
diff --git a/src/containers/status/Status.module.scss b/src/containers/status/Status.module.scss
index 749e906..ccf3f21 100644
--- a/src/containers/status/Status.module.scss
+++ b/src/containers/status/Status.module.scss
@@ -1,4 +1,4 @@
-@import 'index.scss';
+@import 'index.module.scss';
 
 .Status {
   display: flex;
diff --git a/src/containers/transactions/Transactions.module.scss b/src/containers/transactions/Transactions.module.scss
index 85101f0..41744d2 100644
--- a/src/containers/transactions/Transactions.module.scss
+++ b/src/containers/transactions/Transactions.module.scss
@@ -1,4 +1,4 @@
-@import 'index.scss';
+@import 'index.module.scss';
 
 .container {
   display: flex;
diff --git a/src/index.js b/src/index.js
index 5c94fcd..edcf9a1 100644
--- a/src/index.js
+++ b/src/index.js
@@ -23,7 +23,8 @@ import store from 'store';
 
 import App from 'containers/app/App';
 
-import './index.scss';
+// Renamed due to https://github.com/facebook/create-react-app/issues/10047
+import './index.module.scss';
 
 if (config.gtmId) {
   TagManager.initialize({ gtmId: config.gtmId });
diff --git a/src/index.scss b/src/index.module.scss
similarity index 100%
rename from src/index.scss
rename to src/index.module.scss