diff --git a/.babelrc b/.babelrc
index 5002b6a5a1..dc8709ed5e 100644
--- a/.babelrc
+++ b/.babelrc
@@ -4,8 +4,8 @@
         ["@babel/preset-react",{ "targets": { "node": "current"}}]
     ],
     "plugins": [
-        "react-hot-loader/babel",
-        "lodash"
+      "react-hot-loader/babel",
+      "lodash"
     ],
     "env": {
         "test": {
diff --git a/.eslintignore b/.eslintignore
index 4b163c52ef..e69de29bb2 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1 +0,0 @@
-bloom_filter
diff --git a/.eslintrc b/.eslintrc
index 5ec2210563..215c5b5344 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -3,7 +3,7 @@
         "react", "json"
     ],
     "extends": ["plugin:react/recommended"],
-    "parser": "babel-eslint",
+    "parser": "@babel/eslint-parser",
     "env": {
         "browser": true,
         "node": true,
diff --git a/app/App.jsx b/app/App.jsx
index a2d8de9109..32d9a487a1 100644
--- a/app/App.jsx
+++ b/app/App.jsx
@@ -30,19 +30,25 @@ import Page404 from "./components/Page404/Page404";
 
 const Invoice = Loadable({
     loader: () =>
-        import(/* webpackChunkName: "exchange" */ "./components/Transfer/Invoice"),
+        import(
+            /* webpackChunkName: "exchange" */ "./components/Transfer/Invoice"
+        ),
     loading: LoadingIndicator
 });
 
 const Exchange = Loadable({
     loader: () =>
-        import(/* webpackChunkName: "exchange" */ "./components/Exchange/ExchangeContainer"),
+        import(
+            /* webpackChunkName: "exchange" */ "./components/Exchange/ExchangeContainer"
+        ),
     loading: LoadingIndicator
 });
 
 const Explorer = Loadable({
     loader: () =>
-        import(/* webpackChunkName: "explorer" */ "./components/Explorer/Explorer"),
+        import(
+            /* webpackChunkName: "explorer" */ "./components/Explorer/Explorer"
+        ),
     loading: LoadingIndicator
 });
 
@@ -54,19 +60,25 @@ const Bots = Loadable({
 
 const PredictionMarketsPage = Loadable({
     loader: () =>
-        import(/* webpackChunkName: "pm" */ "./components/PredictionMarkets/PMAssetsContainer"),
+        import(
+            /* webpackChunkName: "pm" */ "./components/PredictionMarkets/PMAssetsContainer"
+        ),
     loading: LoadingIndicator
 });
 
 const AccountPage = Loadable({
     loader: () =>
-        import(/* webpackChunkName: "account" */ "./components/Account/AccountPage"),
+        import(
+            /* webpackChunkName: "account" */ "./components/Account/AccountPage"
+        ),
     loading: LoadingIndicator
 });
 
 const AccountDepositWithdraw = Loadable({
     loader: () =>
-        import(/* webpackChunkName: "deposit-withdraw" */ "./components/Account/AccountDepositWithdraw"),
+        import(
+            /* webpackChunkName: "deposit-withdraw" */ "./components/Account/AccountDepositWithdraw"
+        ),
     loading: LoadingIndicator
 });
 
@@ -77,7 +89,9 @@ const News = Loadable({
 
 const Settings = Loadable({
     loader: () =>
-        import(/* webpackChunkName: "settings" */ "./components/Settings/SettingsContainer"),
+        import(
+            /* webpackChunkName: "settings" */ "./components/Settings/SettingsContainer"
+        ),
     loading: LoadingIndicator
 });
 
@@ -94,73 +108,105 @@ const Asset = Loadable({
 
 const Block = Loadable({
     loader: () =>
-        import(/* webpackChunkName: "block" */ "./components/Blockchain/BlockContainer"),
+        import(
+            /* webpackChunkName: "block" */ "./components/Blockchain/BlockContainer"
+        ),
     loading: LoadingIndicator
 });
 
 const DashboardAccountsOnly = Loadable({
     loader: () =>
-        import(/* webpackChunkName: "dashboard-accounts" */ "./components/Dashboard/DashboardAccountsOnly"),
+        import(
+            /* webpackChunkName: "dashboard-accounts" */ "./components/Dashboard/DashboardAccountsOnly"
+        ),
     loading: LoadingIndicator
 });
 
 const DashboardPage = Loadable({
     loader: () =>
-        import(/* webpackChunkName: "dashboard" */ "./components/Dashboard/DashboardPage"),
+        import(
+            /* webpackChunkName: "dashboard" */ "./components/Dashboard/DashboardPage"
+        ),
     loading: LoadingIndicator
 });
 
 const WalletManager = Loadable({
     loader: () =>
-        import(/* webpackChunkName: "wallet" */ "./components/Wallet/WalletManager"),
+        import(
+            /* webpackChunkName: "wallet" */ "./components/Wallet/WalletManager"
+        ),
     loading: LoadingIndicator
 });
 
 const ExistingAccount = Loadable({
     loader: () =>
-        import(/* webpackChunkName: "existing-account" */ "./components/Wallet/ExistingAccount"),
+        import(
+            /* webpackChunkName: "existing-account" */ "./components/Wallet/ExistingAccount"
+        ),
     loading: LoadingIndicator
 });
 
 const CreateWorker = Loadable({
     loader: () =>
-        import(/* webpackChunkName: "create-worker" */ "./components/Account/CreateWorker"),
+        import(
+            /* webpackChunkName: "create-worker" */ "./components/Account/CreateWorker"
+        ),
     loading: LoadingIndicator
 });
 
 const Barter = Loadable({
     loader: () =>
-        import(/* webpackChunkName: "settings" */ "./components/Showcases/Barter"),
+        import(
+            /* webpackChunkName: "settings" */ "./components/Showcases/Barter"
+        ),
     loading: LoadingIndicator
 });
 
 const Borrow = Loadable({
     loader: () =>
-        import(/* webpackChunkName: "settings" */ "./components/Showcases/Borrow"),
+        import(
+            /* webpackChunkName: "settings" */ "./components/Showcases/Borrow"
+        ),
     loading: LoadingIndicator
 });
 
 const Htlc = Loadable({
     loader: () =>
-        import(/* webpackChunkName: "settings" */ "./components/Showcases/Htlc"),
+        import(
+            /* webpackChunkName: "settings" */ "./components/Showcases/Htlc"
+        ),
     loading: LoadingIndicator
 });
 
 const DirectDebit = Loadable({
     loader: () =>
-        import(/* webpackChunkName: "settings" */ "./components/Showcases/DirectDebit"),
+        import(
+            /* webpackChunkName: "settings" */ "./components/Showcases/DirectDebit"
+        ),
     loading: LoadingIndicator
 });
 
 const QuickTrade = Loadable({
     loader: () =>
-        import(/* webpackChunkName: "QuickTrade" */ "./components/QuickTrade/QuickTradeRouter"),
+        import(
+            /* webpackChunkName: "QuickTrade" */ "./components/QuickTrade/QuickTradeRouter"
+        ),
     loading: LoadingIndicator
 });
 
 const Listing = Loadable({
     loader: () =>
-        import(/* webpackChunkName: "listing" */ "./components/Listing/ListingPage"),
+        import(
+            /* webpackChunkName: "QuickTrade" */ "./components/Listing/ListingPage"
+        ),
+    loading: LoadingIndicator
+});
+
+const Volume_ranking = Loadable({
+    loader: () =>
+        import(
+            /* webpackChunkName: "QuickTrade" */ "./components/DashboardRuDEX/Dashboard"
+        ),
     loading: LoadingIndicator
 });
 
@@ -439,7 +485,7 @@ class App extends React.Component {
             content = (
                 <div className="grid-frame vertical">
                     <LoadingIndicator
-                        loadingText={"Connecting to APIs and starting app"}
+                        loadingText={"app_init.connecting_start"}
                     />
                 </div>
             );
@@ -455,13 +501,13 @@ class App extends React.Component {
                     : "committee-account";
             content = (
                 <div className="grid-frame vertical">
-                    {<NewsHeadline />}
+                    <NewsHeadline />
                     <Header height={this.state.height} {...others} />
                     <div id="mainContainer" className="grid-block">
                         <div className="grid-block vertical">
                             <Switch>
                                 <Route
-                                    path="/"
+                                    path="/dashboard"
                                     exact
                                     component={DashboardPage}
                                 />
@@ -518,6 +564,11 @@ class App extends React.Component {
                                     exact
                                     component={Listing}
                                 />{" "}
+                                <Route
+                                    path="/"
+                                    exact
+                                    component={Volume_ranking}
+                                />{" "}
                                 <Redirect
                                     path={"/voting"}
                                     to={{
diff --git a/app/AppInit.jsx b/app/AppInit.jsx
index 6b304484aa..60df1628b1 100644
--- a/app/AppInit.jsx
+++ b/app/AppInit.jsx
@@ -25,6 +25,10 @@ import {HashRouter, BrowserRouter} from "react-router-dom";
 
 const Router = __HASH_HISTORY__ ? HashRouter : BrowserRouter;
 
+// DEPRECATED / WARNING: this is deactivated because there is a race condition for some components when log is saved,
+//                       since it calls setState. If the subcomponent does not have a tailored rerendering logic, this may a WSOD
+const allowPersistentLog = false;
+
 class RootIntl extends React.Component {
     UNSAFE_componentWillMount() {
         IntlActions.switchLocale(this.props.locale);
@@ -67,7 +71,11 @@ class AppInit extends React.Component {
      * @param error
      */
     componentDidCatch(error) {
-        this.saveExtendedLog("error", [error]);
+        if (this.persistentLogEnabled) {
+            this.saveExtendedLog("error", [error]);
+        } else {
+            console.error(error);
+        }
     }
 
     componentDidUpdate(nextProps, nextState) {
@@ -97,6 +105,7 @@ class AppInit extends React.Component {
     }
 
     _enablePersistingLog() {
+        if (!allowPersistentLog) return;
         if (this.persistentLogEnabled) return;
 
         if (!this.state.extendeLogText.length) {
diff --git a/app/actions/AssetActions.js b/app/actions/AssetActions.js
index 33ba48f738..84ad1dc3ff 100644
--- a/app/actions/AssetActions.js
+++ b/app/actions/AssetActions.js
@@ -297,7 +297,9 @@ class AssetActions {
                 blacklist_markets: [],
                 description: description,
                 extensions: {
-                    reward_percent: createObject.reward_percent * 100 || 0,
+                    reward_percent: createObject.reward_percent
+                        ? createObject.reward_percent * 100
+                        : undefined,
                     whitelist_market_fee_sharing: []
                 }
             },
diff --git a/app/actions/IntlActions.js b/app/actions/IntlActions.js
index 02e75413c6..ad5c0ae4eb 100644
--- a/app/actions/IntlActions.js
+++ b/app/actions/IntlActions.js
@@ -1,6 +1,9 @@
 import alt from "alt-instance";
 
 import localeCodes from "assets/locales";
+import counterpart from "counterpart";
+
+var locale_en = require("assets/locales/locale-en.json");
 
 var locales = {};
 if (__ELECTRON__) {
@@ -14,6 +17,16 @@ class IntlActions {
         if (locale === "en") {
             return {locale};
         }
+
+        if (locale !== "ru") {
+            counterpart.registerTranslations(
+                "en",
+                require("counterpart/locales/en")
+            );
+            counterpart.registerTranslations("en", locale_en);
+            counterpart.setFallbackLocale("en");
+        }
+
         if (__ELECTRON__) {
             return {
                 locale: locale,
diff --git a/app/actions/TransactionConfirmActions.js b/app/actions/TransactionConfirmActions.js
index 1f6c6c547e..0e5f664532 100644
--- a/app/actions/TransactionConfirmActions.js
+++ b/app/actions/TransactionConfirmActions.js
@@ -37,7 +37,7 @@ class TransactionConfirmActions {
                         trx_block_num: res[0].block_num,
                         broadcasted_transaction: true
                     });
-                    if (resolve) resolve();
+                    if (resolve) resolve(res);
                 })
                 .catch(error => {
                     console.error(error);
diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js
index a538afbc7e..bf865a3195 100644
--- a/app/api/apiConfig.js
+++ b/app/api/apiConfig.js
@@ -54,7 +54,7 @@ export const settingsAPIs = {
         },
         {
             url: "wss://gph.lexai.host",
-            region: "Finland",
+            region: "Northern Europe",
             country: "Finland",
             location: "Helsinki",
             operator: "Witness: lex",
@@ -62,7 +62,7 @@ export const settingsAPIs = {
         },
         {
             url: "wss://node.graphenelab.io",
-            region: "Finland",
+            region: "Northern Europe",
             country: "Finland",
             location: "Helsinki",
             operator: "Witness: graphene-lab",
@@ -70,12 +70,19 @@ export const settingsAPIs = {
         },
         {
             url: "wss://gph-api.xchng.finance",
-            region: "Finland",
+            region: "Northern Europe",
             country: "Finland",
             location: "Helsinki",
             operator: "Witness: xchng",
             contact: "telegram:Lososeg"
         },
+        {
+            url: "wss://fin.marshmallow-cake.icu",
+            region: "Northern Europe",
+            country: "Holland",
+            location: "Amsterdam",
+            operator: "Witness: marshmallow-cake"
+        },
         {
             url: "wss://node.hk.graphene.fans",
             region: "Eastern Asia",
diff --git a/app/assets/asset-symbols/dexbot.png b/app/assets/asset-symbols/dexbot.png
new file mode 100644
index 0000000000..d560d62d81
Binary files /dev/null and b/app/assets/asset-symbols/dexbot.png differ
diff --git a/app/assets/asset-symbols/rudex.eos.png b/app/assets/asset-symbols/rudex.eos.png
index d664d643e9..5b058086c5 100644
Binary files a/app/assets/asset-symbols/rudex.eos.png and b/app/assets/asset-symbols/rudex.eos.png differ
diff --git a/app/assets/asset-symbols/symbols.js b/app/assets/asset-symbols/symbols.js
index c758f27d69..4db51d1ea6 100644
--- a/app/assets/asset-symbols/symbols.js
+++ b/app/assets/asset-symbols/symbols.js
@@ -9,12 +9,13 @@ require("file-loader?name=asset-symbols/[name].png!./usd.png");
 require("file-loader?name=asset-symbols/[name].png!./eur.png");
 require("file-loader?name=asset-symbols/[name].png!./rub.png");
 require("file-loader?name=asset-symbols/[name].png!./cny.png");
-require("file-loader?name=asset-symbols/[name].png!./btc.png");
 require("file-loader?name=asset-symbols/[name].png!./gold.png");
 require("file-loader?name=asset-symbols/[name].png!./silver.png");
+//require("file-loader?name=asset-symbols/[name].png!./btc.png");
 
 // RuDEX assets
 require("file-loader?name=asset-symbols/[name].png!./donate.png");
+require("file-loader?name=asset-symbols/[name].png!./dexbot.png");
 
 require("file-loader?name=asset-symbols/[name].png!./rudex.btc.png");
 require("file-loader?name=asset-symbols/[name].png!./rudex.ltc.png");
diff --git a/app/assets/bts_genesiskeys_bloom.dat b/app/assets/bts_genesiskeys_bloom.dat
deleted file mode 100644
index 047563f7bc..0000000000
Binary files a/app/assets/bts_genesiskeys_bloom.dat and /dev/null differ
diff --git a/app/assets/coins-logo/camino.png b/app/assets/coins-logo/camino.png
new file mode 100644
index 0000000000..b446fcdd37
Binary files /dev/null and b/app/assets/coins-logo/camino.png differ
diff --git a/app/assets/coins-logo/coins.js b/app/assets/coins-logo/coins.js
index 7ca362bf3c..ce0c79c47f 100644
--- a/app/assets/coins-logo/coins.js
+++ b/app/assets/coins-logo/coins.js
@@ -20,5 +20,8 @@ require("file-loader?name=coins-logo/[name].png!./rat.png");
 require("file-loader?name=coins-logo/[name].png!./ttt.png");
 require("file-loader?name=coins-logo/[name].png!./ctw.png");
 require("file-loader?name=coins-logo/[name].png!./wca.png");
+require("file-loader?name=coins-logo/[name].png!./camino.png");
+require("file-loader?name=coins-logo/[name].png!./ojx.png");
+require("file-loader?name=coins-logo/[name].png!./donr.png");
 
 require("file-loader?name=coins-logo/[name].png!./pzm.png");
diff --git a/app/assets/coins-logo/donr.png b/app/assets/coins-logo/donr.png
new file mode 100644
index 0000000000..b4df3f1966
Binary files /dev/null and b/app/assets/coins-logo/donr.png differ
diff --git a/app/assets/coins-logo/ojx.png b/app/assets/coins-logo/ojx.png
new file mode 100644
index 0000000000..5465f44bed
Binary files /dev/null and b/app/assets/coins-logo/ojx.png differ
diff --git a/app/assets/coins-logo/ttt.png b/app/assets/coins-logo/ttt.png
index 69f2e34906..dfb458cd15 100644
Binary files a/app/assets/coins-logo/ttt.png and b/app/assets/coins-logo/ttt.png differ
diff --git a/app/assets/icons/borrow.svg b/app/assets/icons/borrow.svg
index ea25aaea31..3969476213 100644
--- a/app/assets/icons/borrow.svg
+++ b/app/assets/icons/borrow.svg
@@ -1,55 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="210mm"
-   height="210mm"
-   viewBox="0 0 210 210"
-   version="1.1"
-   id="svg8"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <defs
-     id="defs2">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.78148328,0,0,1.2796179,904.71904,-1936.9488)"
-       x1="699.64471"
-       y1="83.421288"
-       x2="699.64471"
-       y2="720.01819"
-       id="linearGradient-1">
-      <stop
-         stop-color="#00A9E0"
-         offset="0%"
-         id="stop4595" />
-      <stop
-         stop-color="#00587C"
-         offset="100%"
-         id="stop4597" />
-    </linearGradient>
-  </defs>
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     transform="translate(0,-87)">
-    <path
-       style="fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.31263942;stroke-opacity:1"
-       d="M 309.81445 27.933594 C 292.19924 27.929695 271.4292 27.954741 247.28711 28.005859 C 109.52546 28.297488 109.16222 28.302227 106.49609 30.292969 C 100.04342 35.11105 99.877126 35.749518 99.347656 57.648438 L 98.863281 77.667969 L 85.794922 78.152344 C 75.094176 78.548703 72.23592 78.96979 70.015625 80.474609 C 64.614725 84.135157 64.057444 86.508062 63.529297 108.16211 L 63.044922 128.00586 L 54.333984 128.49023 C 47.50595 128.86959 44.850456 129.45418 42.056641 131.19141 C 35.115133 135.50782 35.362791 132.05319 35.667969 219.9707 L 35.941406 298.38281 L 38.09375 301.40039 C 42.022524 306.90822 44.533607 307.86185 56.732422 308.47266 L 67.886719 309.03125 L 67.886719 318.71094 L 67.886719 328.39258 L 46.996094 328.875 L 26.105469 329.35938 L 22.626953 332.01367 C 16.204724 336.9147 16.095703 337.53906 16.095703 369.2168 C 16.095703 397.54829 16.102921 397.65809 18.416016 401.32227 C 20.8105 405.11536 23.964905 407.67818 27.269531 408.51758 L 27.269531 408.52148 C 28.312187 408.7865 64.993229 409.05325 108.78516 409.11523 C 182.9541 409.21985 188.4082 409.11657 188.4082 407.5918 C 188.4082 406.69151 187.32572 402.4432 186.00391 398.15234 C 184.6821 393.86148 182.91101 387.8488 182.06641 384.79102 L 180.5293 379.23242 L 113.07617 378.98438 L 45.621094 378.73633 L 45.621094 369.05469 L 45.621094 359.375 L 111.20703 359.12695 C 147.2788 358.99029 176.7861 358.77222 176.7793 358.64258 C 176.77298 358.51317 176.1251 356.01041 175.33984 353.08203 C 174.55458 350.15373 173.62815 343.76348 173.2793 338.88086 C 172.71232 330.94582 172.42751 329.94468 170.60352 329.45508 C 169.48117 329.15374 152.55293 328.90209 132.98633 328.89453 L 97.412109 328.87891 L 97.412109 318.77539 L 97.412109 308.67188 L 136.05469 308.36914 C 157.30792 308.20288 175.01435 307.74795 175.40234 307.35938 C 175.79034 306.97076 176.44372 303.26789 176.85547 299.13086 C 177.26721 294.99386 178.0661 289.01717 178.63086 285.84766 C 179.42024 281.41752 179.3826 279.90623 178.4668 279.3125 C 177.81159 278.88783 152.2887 278.56364 121.75 278.59766 C 91.211304 278.6294 66.081393 278.51326 65.90625 278.33789 C 65.731099 278.16271 65.499841 273.67098 65.392578 268.35742 L 65.199219 258.69727 L 125.07617 258.21289 L 184.95508 257.72852 L 186.60352 253.37305 C 187.51051 250.97717 189.98507 244.6602 192.10156 239.33594 C 194.21805 234.01172 195.75173 229.32899 195.50977 228.92969 C 195.26783 228.53023 165.90861 228.20312 130.26758 228.20312 L 65.466797 228.20312 L 65.466797 218.03906 L 65.466797 207.875 L 136.375 207.84375 L 207.28516 207.81445 L 212.125 199.92969 C 216.60232 192.63709 218.69595 189.62097 224.28711 182.41016 C 225.44285 180.91955 226.20105 179.51344 225.97266 179.28516 C 225.74428 179.0568 189.646 178.7518 145.75391 178.60742 L 65.949219 178.3457 L 65.675781 167.9375 L 65.400391 157.53125 L 155.58594 157.53125 L 245.77148 157.53125 L 252.24414 151.42383 C 255.80485 148.06481 260.43289 144.03667 262.52734 142.4707 C 264.62183 140.90481 266.9262 139.06308 267.64844 138.37891 C 268.37064 137.6947 271.63725 135.29882 274.9082 133.05469 L 280.85547 128.97461 L 187.49414 128.72852 C 114.279 128.53493 93.967365 128.2205 93.367188 127.27539 C 92.119868 125.31117 92.421617 109.66628 93.732422 108.35547 C 94.622588 107.4652 121.16118 107.19336 207.28711 107.19336 L 319.67969 107.19336 L 330.27734 103.32812 C 346.58871 97.378771 372.13624 91.374927 385.88867 90.257812 C 389.88186 89.933453 394.3464 89.437069 395.81055 89.15625 L 398.47266 88.646484 L 398.47266 62.806641 L 398.47266 36.966797 L 395.51758 33.382812 C 393.76006 31.250641 391.11297 29.375577 388.98438 28.755859 C 387.10758 28.2107 362.6601 27.94529 309.81445 27.933594 z M 129.8418 57.339844 L 249.39453 57.339844 L 368.94727 57.339844 L 368.94727 67.503906 L 368.94727 77.667969 L 249.60742 77.914062 C 151.07541 78.117023 130.18102 77.935245 129.77344 76.873047 C 129.50188 76.165482 129.40623 71.481045 129.56055 66.462891 L 129.8418 57.339844 z M 412.66016 118.03711 L 412.66016 118.08203 C 408.01921 118.11367 403.39212 118.3093 398.79297 118.66992 C 390.55541 119.31584 381.56035 120.30483 378.80273 120.86719 C 357.74507 125.1616 345.0861 128.9678 330.22656 135.47656 C 273.15928 160.47319 229.41252 210.8104 212.6582 270.75586 C 210.03235 280.15093 209.28706 283.71937 206.79102 298.86719 C 205.32884 307.74069 204.68171 336.50457 205.74609 345.33203 C 208.20808 365.75063 208.98209 370.55645 211.11719 378.73047 C 213.67916 388.53883 217.59046 400.7263 219.9043 406.11133 C 227.24157 423.18742 238.35565 442.56459 246.82617 453.04492 C 246.99305 453.2514 247.1279 453.41128 247.29297 453.61523 C 251.85935 459.68653 256.75372 465.49342 261.9375 471.02344 C 270.72875 480.83826 277.58662 486.86957 288.29688 494.9375 C 290.74501 496.78166 293.63235 498.79374 296.76172 500.86133 C 302.90325 505.051 309.2794 508.91711 315.86523 512.44141 C 323.86107 516.92085 331.18305 520.56669 335.11133 521.76562 C 335.58792 521.91109 337.27056 522.4744 339.33398 523.17383 C 350.12596 527.31746 361.34469 530.59314 372.91016 532.90039 C 378.30318 534.00664 383.79089 534.92326 389.27734 535.61914 C 390.84022 535.8174 393.05698 535.97713 395.51172 536.11719 C 401.63817 536.65041 407.83555 536.93273 414.10156 536.92188 C 418.9219 536.91351 423.70319 536.73985 428.44141 536.4082 C 428.46836 536.40705 428.48879 536.40546 428.51562 536.4043 C 428.52602 536.40357 428.53648 536.40308 428.54688 536.40234 C 431.26834 536.28387 433.33251 536.11701 434.36914 535.90234 C 446.64199 534.69119 458.60423 532.41882 470.1582 529.16406 L 470.28711 498.8457 C 459.09112 502.56543 447.40461 505.20065 435.35352 506.64062 C 434.50733 506.45529 429.23733 506.71662 423.1582 507.25586 C 413.62359 508.1016 408.8527 507.99617 396.53711 506.66797 C 388.28455 505.77797 380.00807 504.63468 378.14453 504.12891 C 376.28107 503.62313 371.05297 502.26935 366.52734 501.12109 C 334.15087 492.90685 301.37246 471.94014 278.03711 445.24219 C 270.76644 436.76251 264.26213 427.59956 258.64258 417.85352 C 258.61256 417.80145 258.58271 417.74937 258.55273 417.69727 C 243.63505 391.76556 234.95792 361.74694 234.5625 329.71094 C 234.56121 329.40527 234.55989 329.18915 234.55859 328.875 C 234.46593 306.34803 234.93405 302.35346 240.0625 281.90625 C 244.05859 265.97369 257.3391 236.08774 263.53125 229.0918 C 264.27522 228.25123 264.88281 227.2464 264.88281 226.85938 C 264.88281 226.47231 268.22972 221.933 272.32031 216.77148 C 288.41289 196.46605 308.00107 180.12813 329.99023 168.41016 L 330.8457 139.91016 L 352.24609 158.43555 C 362.60788 154.61921 373.37077 151.74835 384.4375 149.87695 C 409.43197 145.65035 430.05541 146.67883 460.42773 153.66797 C 477.32835 157.5571 502.98451 170.07296 520.28125 182.86719 C 534.17763 193.14622 550.77283 210.13771 560.30469 223.84375 C 564.84893 230.37799 573.97777 246.11925 576.16211 251.18945 C 576.74448 252.54124 577.41518 253.63671 578.06055 254.36133 C 587.74744 276.33717 593.21299 300.62376 593.38867 326.19336 L 593.39453 327.43945 C 593.39459 343.04788 591.42454 358.19463 587.7207 372.64062 C 597.70591 371.35454 608.9099 371.40354 617.5 372.05859 C 620.60036 357.69186 622.23243 342.77687 622.23242 327.47852 L 622.22852 326.03125 C 622.0281 296.87894 615.8996 269.16115 605.01172 244.01367 C 604.53496 242.8596 603.95102 241.54142 603.25977 240.05859 C 602.85001 239.17961 602.4541 238.3219 601.98633 237.36133 C 599.12724 231.34467 595.99062 225.48861 592.59375 219.80664 C 591.50611 217.95172 590.45057 216.19705 589.50195 214.73828 C 589.27116 214.38337 589.0336 214.03318 588.80078 213.67969 C 551.43725 155.79483 486.41767 117.65254 412.66016 118.03711 z M 336.09961 151.74023 L 336.09961 240.01953 L 398.3418 303.80078 C 401.20452 301.86117 404.44209 300.45514 407.92383 299.73242 L 407.92383 217.05273 L 336.09961 151.74023 z M 418.91016 247.80078 L 418.91016 299.30273 C 422.42531 300.02678 425.69378 301.43288 428.58398 303.37109 L 464.54102 266.94727 C 452.14273 256.03834 436.31171 249.02981 418.91016 247.80078 z M 335.94727 255.98633 L 335.94727 321.89453 L 386.47656 321.89453 C 387.18239 318.31951 388.55687 314.9941 390.45117 312.05469 L 335.94727 255.98633 z M 472.37891 275.37109 L 436.6543 312.0293 C 438.55532 314.97601 439.93422 318.31063 440.64258 321.89453 L 491.1582 321.89453 C 489.95095 304.1526 483.07852 288.01187 472.37891 275.37109 z M 336.52148 332.66406 C 337.72875 350.40717 344.60112 366.54725 355.30078 379.1875 L 391.02539 342.5293 C 389.12436 339.5827 387.74543 336.24781 387.03711 332.66406 L 336.52148 332.66406 z M 440.64258 332.66406 C 439.93422 336.24781 438.55532 339.58264 436.6543 342.52734 L 472.37891 379.1875 C 483.07852 366.54725 489.95095 350.40717 491.1582 332.66406 L 440.64258 332.66406 z M 399.0957 350.32422 L 363.13867 386.75 C 375.53691 397.65927 391.36798 404.66547 408.76953 405.89453 L 408.76953 354.39062 C 405.25442 353.66654 401.98591 352.26251 399.0957 350.32422 z M 428.58398 350.32422 C 425.69378 352.26251 422.42531 353.66654 418.91016 354.39062 L 418.91016 405.89453 C 436.31171 404.66547 452.14273 397.65745 464.54102 386.75 L 428.58398 350.32422 z M 605.72656 401.45312 C 598.04798 401.43859 590.41002 401.92921 585.56641 402.92969 C 557.28647 408.77106 535.44522 423.06055 519.22266 446.33594 C 510.92867 458.23586 507.79256 464.60571 504.12109 477.01367 C 502.78201 481.53928 501.34859 486.33107 500.93359 487.66211 C 500.51856 488.99318 499.94066 507.72392 499.65039 529.28711 L 499.12305 568.49414 L 489.92578 569.14844 C 484.8636 569.44437 479.20529 570.20241 477.3418 570.69141 C 464.07717 574.17201 453.21088 586.12961 450.21484 600.54492 C 448.56708 608.47305 449.35897 728.33388 451.08398 732.09375 C 455.20012 741.0654 456.55926 743.34414 459.4707 746.16602 C 461.23563 747.87667 465.21621 750.71857 468.31641 752.48047 L 473.95312 755.68359 L 606.76172 755.74609 L 739.57031 755.81055 L 745.63867 751.21094 C 749.99167 747.91232 752.72853 744.83416 755.32227 740.32031 L 758.9375 734.0293 L 758.99023 663.65625 L 759.04297 593.28125 L 755.63867 587.47266 C 748.44185 575.1932 736.22903 568.97656 719.30469 568.97656 L 712.57617 568.97656 L 712.55664 535.33789 C 712.5461 516.83616 712.10411 498.64883 711.57422 494.92188 C 708.02184 469.93587 698.3962 450.29525 681.14258 432.83398 C 665.6594 417.16455 647.61417 407.3818 626.12695 403.00586 C 621.12275 401.98679 613.40515 401.46766 605.72656 401.45312 z M 605.39258 432.05273 C 608.02438 432.03755 610.53577 432.18526 612.86719 432.50195 C 641.70585 436.41955 663.00254 451.61689 674.32227 476.35938 C 680.3389 489.50994 680.63086 492.11929 680.63086 532.49609 L 680.63086 568.97656 L 605.66406 568.97656 C 564.43259 568.97656 530.56518 568.65126 530.40039 568.25195 C 530.23579 567.85265 530.34765 550.53602 530.65039 529.77148 L 531.20117 492.01758 L 534.29688 482.9707 C 537.99129 472.17373 538.31168 471.54287 543.66406 464.55664 C 553.95976 451.11811 567.76668 440.43775 580.08594 436.38281 C 588.52111 433.60639 597.49718 432.09829 605.39258 432.05273 z M 605.57422 613.64648 C 606.40023 613.65642 607.24626 613.6995 608.11328 613.77734 C 614.4051 614.34219 618.257 616.13045 623.62109 620.97656 C 630.03049 626.76706 631.58103 631.41722 631.62109 644.96875 C 631.65953 657.92879 630.37608 662.31317 624.625 668.86328 L 621.58008 672.33008 L 621.58008 686.8457 C 621.58008 702.91867 620.84734 705.97338 615.85156 710.73438 C 613.39067 713.07965 611.89645 713.6311 607.30273 713.89453 C 601.28739 714.23941 597.09225 712.85313 594.14062 709.54102 C 590.67828 705.65577 589.72195 700.67633 589.67773 686.32422 L 589.63477 672.50195 L 585.7832 667.62891 C 580.78478 661.30538 579.51735 656.70148 579.66211 645.39453 C 579.84912 630.8054 582.22161 624.90336 590.41211 618.65625 C 594.96554 615.18328 599.79214 613.57694 605.57422 613.64648 z "
-       transform="matrix(0.26458333,0,0,0.26458333,0,87)"
-       id="Fill-1" />
-  </g>
+<svg width="596" height="596" viewBox="0 0 596 596" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M192.44 24.7895C210.54 24.6895 226.14 24.6895 239.34 24.6895C278.94 24.6895 297.34 24.8895 298.54 25.2895C300.14 25.7895 302.14 27.1895 303.44 28.7895L305.64 31.4895V50.8895V70.2895L303.64 70.6895C302.54 70.8895 299.24 71.2895 296.24 71.4895C285.94 72.2895 266.74 76.7895 254.54 81.2895L246.64 84.1895H162.34C97.74 84.1895 77.84 84.3894 77.14 85.0894C76.14 86.0894 75.94 97.7895 76.84 99.2895C77.34 99.9895 92.54 100.289 147.44 100.389L217.44 100.589L212.94 103.689C210.54 105.389 208.04 107.189 207.54 107.689C207.04 108.189 205.34 109.589 203.74 110.789C202.14 111.989 198.74 114.989 196.04 117.489L191.14 122.089H123.54H55.94L56.14 129.889L56.34 137.689L116.24 137.889C149.24 137.989 176.24 138.189 176.44 138.389C176.54 138.489 176.04 139.589 175.14 140.689C170.94 146.089 169.44 148.289 166.04 153.789L162.44 159.689H109.24H56.04V166.989V174.589H104.54C131.24 174.589 153.24 174.789 153.44 175.089C153.54 175.389 152.44 178.889 150.84 182.889C149.6 185.99 148.239 189.512 147.364 191.777L147.364 191.778L147.363 191.779L147.363 191.78C147.11 192.435 146.897 192.985 146.74 193.389L145.54 196.689L100.64 197.089L55.74 197.489L55.84 204.689C55.94 208.689 56.14 212.089 56.24 212.189C56.34 212.289 75.24 212.389 98.14 212.389C121.04 212.289 140.14 212.589 140.64 212.889C141.34 213.289 141.34 214.489 140.74 217.789C140.34 220.189 139.74 224.689 139.44 227.789C139.14 230.889 138.64 233.689 138.34 233.989C138.04 234.289 124.74 234.689 108.84 234.789L79.84 234.989V242.589V250.189H106.54C121.24 250.189 133.94 250.389 134.74 250.589C136.14 250.989 136.34 251.689 136.74 257.689C136.94 261.389 137.64 266.189 138.24 268.389C138.84 270.589 139.34 272.489 139.34 272.589C139.34 272.689 117.24 272.889 90.14 272.989L40.94 273.189V280.489V287.789L91.54 287.989L142.14 288.189L143.34 292.389C143.603 293.255 143.952 294.432 144.337 295.734C144.976 297.892 145.716 300.394 146.34 302.389C147.34 305.589 148.14 308.789 148.14 309.489C148.14 310.589 144.04 310.689 88.44 310.589C55.64 310.589 28.14 310.389 27.34 310.189C24.94 309.589 22.54 307.589 20.74 304.789C19.04 301.989 19.04 301.889 19.04 280.689C19.04 256.889 19.14 256.389 23.84 252.989L26.44 250.989L42.14 250.589L57.84 250.189V242.889V235.589L49.44 235.189C40.24 234.689 38.34 233.989 35.44 229.889L33.84 227.589L33.64 168.789C33.6324 166.277 33.6248 163.865 33.6175 161.547L33.6175 161.542L33.6173 161.496L33.6173 161.481C33.4616 112.139 33.4423 106.041 36.4403 103.494C36.8631 103.135 37.3459 102.847 37.8967 102.517L37.8969 102.517L37.898 102.517C38.0718 102.413 38.2524 102.305 38.44 102.189C40.54 100.889 42.54 100.489 47.64 100.189L54.14 99.7895L54.54 84.8895C54.94 68.5895 55.34 66.7895 59.44 64.0895C61.04 62.9895 63.24 62.6894 71.24 62.3895L81.04 61.9895L81.44 46.9895C81.84 30.5895 82.04 30.0895 86.84 26.4895C88.8393 24.99 89.1398 24.9895 192.321 24.7897L192.44 24.7895ZM194.04 46.7895H104.34L104.14 53.5895C104.04 57.3895 104.14 60.8895 104.34 61.3895C104.64 62.1894 120.34 62.3895 194.24 62.1895L283.74 61.9895V54.3895V46.7895H194.04ZM352.667 96.3258C343.402 89.108 331.753 84.8086 319.099 84.8086C307.096 84.8086 295.997 88.677 286.98 95.2352C286.979 95.2355 286.978 95.2357 286.976 95.236C277.18 102.363 269.842 112.665 266.474 124.63L266.475 124.63C265.146 129.349 264.436 134.328 264.436 139.472C264.436 154.138 270.211 167.454 279.611 177.271L332.279 236.174C335.405 239.445 337.324 243.878 337.324 248.76C337.324 258.823 329.167 266.981 319.103 266.981C309.04 266.981 300.882 258.823 300.882 248.76C300.882 243.513 303.1 238.784 306.649 235.459L282.411 208.352C271.389 218.353 264.468 232.791 264.468 248.846C264.468 279.036 288.942 303.509 319.131 303.509C349.321 303.509 373.795 279.036 373.795 248.846C373.795 233.935 367.825 220.419 358.146 210.557L339.919 190.053L340.294 189.875C359.957 181.596 373.763 162.146 373.763 139.472C373.763 134.861 373.192 130.382 372.116 126.104C372.117 126.105 372.117 126.105 372.117 126.105C370.95 121.461 369.19 117.054 366.92 112.967C363.33 106.503 358.468 100.844 352.671 96.3269C352.67 96.3265 352.668 96.3261 352.667 96.3258ZM254.64 105.389C258.227 103.806 261.646 102.432 265.165 101.188C259.119 109.692 255.033 119.687 253.567 130.514C237.462 139.275 223.102 151.389 211.24 166.289C208.14 170.189 205.64 173.589 205.64 173.889C205.64 174.189 205.24 174.989 204.64 175.589C200.04 180.789 190.04 203.289 187.04 215.189C183.24 230.489 182.84 233.489 182.94 250.389V250.989C183.24 274.989 189.74 297.589 200.94 316.989C201.04 316.989 201.04 317.089 201.04 317.089C205.24 324.389 210.04 331.189 215.54 337.589C233.04 357.589 257.64 373.289 281.94 379.489C283.179 379.817 284.484 380.159 285.711 380.479C287.85 381.039 289.75 381.535 290.64 381.789C292.04 382.189 298.24 382.989 304.44 383.689C313.74 384.689 317.24 384.689 324.44 384.089C328.94 383.689 332.94 383.489 333.54 383.589C342.54 382.589 351.34 380.589 359.74 377.789L359.64 400.489C351.04 402.989 342.04 404.689 332.84 405.589C332.04 405.789 330.44 405.889 328.44 405.989H328.34C324.74 406.289 321.14 406.389 317.54 406.389C312.84 406.389 308.24 406.189 303.64 405.789C302.343 405.721 301.185 405.606 300.199 405.508C299.741 405.463 299.321 405.421 298.94 405.389C294.84 404.889 290.64 404.189 286.64 403.389C277.94 401.689 269.54 399.189 261.44 396.089C259.84 395.489 258.64 395.089 258.24 394.989C255.34 394.089 249.84 391.389 243.84 387.989C238.94 385.289 234.14 382.389 229.54 379.289C227.24 377.789 225.04 376.289 223.24 374.889C215.14 368.889 210.04 364.389 203.44 356.989C199.54 352.789 195.84 348.489 192.44 343.889C192.24 343.789 192.14 343.689 192.04 343.489C185.64 335.589 177.34 321.089 171.84 308.289C170.14 304.289 167.14 295.189 165.24 287.789C163.64 281.689 163.04 278.089 161.24 262.789C160.44 256.189 160.94 234.689 162.04 227.989C163.94 216.589 164.44 213.889 166.44 206.889C179.04 161.889 211.84 124.089 254.64 105.389ZM397.24 140.789C393.532 138.051 389.32 135.329 384.898 132.77C384.213 125.964 382.497 119.463 379.907 113.425C383.289 112.795 386.47 111.592 389.345 109.92C413.426 122.494 433.847 141.168 448.54 163.889C448.61 164.1 448.73 164.261 448.864 164.442C448.921 164.519 448.98 164.6 449.04 164.689C449.74 165.789 450.54 167.089 451.34 168.489C453.84 172.789 456.24 177.189 458.34 181.689C458.74 182.389 459.04 182.989 459.34 183.689C459.628 184.323 459.883 184.923 460.123 185.49C460.301 185.908 460.47 186.307 460.64 186.689C468.84 205.489 473.34 226.289 473.54 248.189V249.289C473.54 260.689 472.34 271.889 470.04 282.689C463.64 282.189 455.24 282.089 447.74 283.089C450.54 272.289 452.04 260.889 452.04 249.189V248.289C451.94 229.089 447.84 210.889 440.54 194.389C440.04 193.789 439.54 192.989 439.14 191.989C437.54 188.189 430.64 176.389 427.24 171.489C420.14 161.289 407.64 148.489 397.24 140.789ZM446.14 305.889C449.74 305.189 455.44 304.789 461.24 304.789C467.04 304.889 472.84 305.189 476.54 305.889C492.74 309.189 506.24 316.489 517.84 328.289C530.74 341.389 537.94 356.189 540.64 374.889C541.04 377.689 541.34 391.289 541.34 405.189V430.389H546.34C559.04 430.389 568.24 435.089 573.64 444.289L576.24 448.689V501.489V554.289L573.54 558.989C571.54 562.389 569.54 564.689 566.24 567.189L561.64 570.589H462.04H362.44L358.24 568.189C355.94 566.889 352.94 564.789 351.64 563.489C349.44 561.289 348.44 559.589 345.34 552.889C344.04 549.989 343.44 460.089 344.64 454.189C346.84 443.389 355.04 434.389 364.94 431.789C366.34 431.389 370.54 430.789 374.34 430.589L381.24 430.089L381.64 400.689C381.94 384.489 382.34 370.489 382.64 369.489C382.712 369.251 382.829 368.863 382.98 368.366L382.98 368.363C383.461 366.778 384.279 364.076 385.04 361.489C387.74 352.189 390.14 347.389 396.34 338.489C408.54 320.989 424.94 310.289 446.14 305.889ZM466.64 328.089C464.94 327.889 463.04 327.789 461.04 327.789C455.14 327.789 448.34 328.989 442.04 331.089C432.84 334.089 422.44 342.089 414.74 352.189C410.74 357.389 410.54 357.889 407.74 365.989L405.44 372.789L405.04 401.089C404.84 416.689 404.74 429.689 404.84 429.989C404.94 430.289 430.34 430.489 461.24 430.489H517.44V403.089C517.44 372.789 517.24 370.889 512.74 360.989C504.24 342.389 488.24 330.989 466.64 328.089ZM463.04 464.089C462.44 463.989 461.74 463.989 461.14 463.989C456.84 463.889 453.24 465.089 449.84 467.589C443.64 472.289 441.84 476.789 441.74 487.689C441.64 496.189 442.64 499.689 446.34 504.389L449.24 508.089V518.489C449.24 529.289 449.94 532.989 452.54 535.889C454.74 538.389 457.94 539.489 462.44 539.189C465.84 538.989 467.04 538.589 468.84 536.789C472.64 533.189 473.14 530.989 473.14 518.889V507.989L475.44 505.389C479.74 500.489 480.64 497.189 480.64 487.489C480.64 477.289 479.44 473.789 474.64 469.489C470.64 465.889 467.74 464.489 463.04 464.089ZM392.659 84.2368C392.659 94.3001 384.501 102.458 374.438 102.458C364.375 102.458 356.217 94.3001 356.217 84.2368C356.217 74.1735 364.375 66.0156 374.438 66.0156C384.501 66.0156 392.659 74.1735 392.659 84.2368ZM319.099 157.693C329.162 157.693 337.32 149.535 337.32 139.472C337.32 129.409 329.162 121.251 319.099 121.251C309.036 121.251 300.878 129.409 300.878 139.472C300.878 149.535 309.036 157.693 319.099 157.693Z" fill="black"/>
 </svg>
diff --git a/app/assets/icons/dashboard.svg b/app/assets/icons/dashboard.svg
index 3952d10256..1d062b23e9 100644
--- a/app/assets/icons/dashboard.svg
+++ b/app/assets/icons/dashboard.svg
@@ -1,42 +1,3 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="600px" height="600px" viewBox="0 0 600 600" style="enable-background:new 0 0 600 600;" xml:space="preserve">
-<g>
-	<g>
-  <path d="m275.944203,30.994584l0,106.971246l-230.799641,0c0,0 -14.184834,0 -14.184834,26.742818s14.184834,26.742805 14.184834,26.742805l510.596714,0c0,0 14.183951,0 14.183951,-26.742805s-14.183951,-26.742818 -14.183951,-26.742818l-230.800524,0l0,-106.971246l-48.996549,0z" id="svg_3" fill="black" transform="rotate(180 300.4424743652344,111.22301483154295) "/>
-  <path d="m94.454591,109.281159c0,0 -63.454572,0 -63.454572,65.736585l0,328.650881c0,65.706608 63.454572,65.706608 63.454572,65.706608l412.442113,0c0,0 63.454572,0 63.454572,-65.735551l0,-328.621937c0,-65.736585 -63.454572,-65.736585 -63.454572,-65.736585l-412.442113,0zm71.383485,373.827016l-26.967417,0l0,-28.755686l26.967417,0l0,28.755686zm0,-86.268091l-26.967417,0l0,-28.754652l26.967417,0l0,28.754652zm0,-86.267057l-26.967417,0l0,-28.755686l26.967417,0l0,28.755686zm269.676113,172.535148l-242.708696,0l0,-28.755686l242.708696,0l0,28.755686zm0,-86.268091l-242.708696,0l0,-28.754652l242.708696,0l0,28.754652zm0,-86.267057l-242.708696,0l0,-28.755686l242.708696,0l0,28.755686zm53.935804,-86.268091l-377.546752,0l0,-28.755686l377.546752,0l0,28.755686z" id="svg_4" fill="black"/>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14 68C14 34.8629 40.8629 8 74 8H181C214.137 8 241 34.8629 241 68V212C241 245.137 214.137 272 181 272H74C40.8629 272 14 245.137 14 212V68ZM74 40C58.536 40 46 52.536 46 68V212C46 227.464 58.536 240 74 240H181C196.464 240 209 227.464 209 212V68C209 52.536 196.464 40 181 40H74ZM271 68C271 34.8629 297.863 8 331 8H438C471.137 8 498 34.8629 498 68V150C498 183.137 471.137 210 438 210H331C297.863 210 271 183.137 271 150V68ZM331 40C315.536 40 303 52.536 303 68V150C303 165.464 315.536 178 331 178H438C453.464 178 466 165.464 466 150V68C466 52.536 453.464 40 438 40H331ZM271 300C271 266.863 297.863 240 331 240H438C471.137 240 498 266.863 498 300V444C498 477.137 471.137 504 438 504H331C297.863 504 271 477.137 271 444V300ZM331 272C315.536 272 303 284.536 303 300V444C303 459.464 315.536 472 331 472H438C453.464 472 466 459.464 466 444V300C466 284.536 453.464 272 438 272H331ZM14 362C14 328.863 40.8629 302 74 302H181C214.137 302 241 328.863 241 362V444C241 477.137 214.137 504 181 504H74C40.8629 504 14 477.137 14 444V362ZM74 334C58.536 334 46 346.536 46 362V444C46 459.464 58.536 472 74 472H181C196.464 472 209 459.464 209 444V362C209 346.536 196.464 334 181 334H74Z" fill="black"/>
+</svg>
diff --git a/app/assets/icons/donate.svg b/app/assets/icons/donate.svg
new file mode 100644
index 0000000000..ac3c7d9074
--- /dev/null
+++ b/app/assets/icons/donate.svg
@@ -0,0 +1,3 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M406.153 2.1914C401.808 0.870977 397.107 1.45876 393.221 3.80826L341.67 34.9785C334.17 39.5136 326.15 43.1275 317.784 45.7419L223.324 75.2608C176.328 89.9469 140.397 128.084 128.534 175.87L112.042 242.302C49.4071 254.01 2 308.969 2 375C2 449.558 62.4416 510 137 510C211.558 510 272 449.558 272 375C272 363.744 270.619 352.793 268.012 342.314C280.045 336.562 292.069 329.63 303.597 321.662C308.624 318.188 316.38 314.424 326.92 309.714C329.204 308.693 331.601 307.635 334.083 306.539L334.083 306.539L334.085 306.538C342.498 302.825 351.88 298.685 361.113 294.114C384.625 282.474 411.523 266.073 425.571 240.115C447.692 199.24 469.197 173.354 504.658 131.901C507.372 128.728 508.739 124.62 508.466 120.454C505.813 79.9828 494.939 53.2805 475.103 34.9743C456.202 17.531 430.966 9.73282 406.153 2.1914ZM171.814 244.536C163.345 242.281 154.55 240.828 145.519 240.265L159.591 183.58C168.762 146.639 196.538 117.157 232.868 105.804L327.329 76.2853C338.151 72.9034 348.525 68.2285 358.228 62.362L403.65 34.8973C426.159 41.8975 441.923 47.8984 453.4 58.4904C464.347 68.593 473.058 84.6686 476.025 116.149C442.872 154.98 420.327 182.571 397.428 224.885C388.476 241.427 369.727 254.143 346.916 265.436C338.378 269.662 329.887 273.411 321.584 277.076C318.991 278.221 316.415 279.358 313.863 280.498C303.649 285.063 293.229 289.929 285.403 295.338C259.659 313.132 231.925 324.481 209.797 328.256C198.68 330.153 189.924 329.977 183.876 328.493C177.999 327.05 176.05 324.808 175.28 323.285C175.183 323.092 175.082 322.901 174.977 322.713C174.931 322.631 174.897 322.564 174.871 322.508C175.028 321.987 175.641 320.502 177.778 317.915C182.792 311.846 191.952 304.577 205.519 294.633C208.081 292.754 210.761 290.809 213.539 288.793L213.545 288.788C238.867 270.405 272.364 246.087 300.341 212.183C305.466 205.972 305.176 196.92 299.665 191.049L276.665 166.549C272.91 162.549 267.366 160.752 261.978 161.788L222.978 169.288C218.499 170.149 214.601 172.881 212.262 176.797L171.814 244.536ZM174.796 322.327C174.795 322.325 174.797 322.33 174.799 322.34C174.797 322.333 174.796 322.328 174.796 322.327ZM137 272C149.875 272 162.181 274.356 173.525 278.659C165.55 284.903 158.346 291.192 153.107 297.535C150.109 301.165 147.259 305.38 145.322 310.179C141.898 309.115 138.258 308.542 134.484 308.542C114.334 308.542 98 324.876 98 345.026C98 354.814 101.854 363.702 108.128 370.254L143.281 409.567C145.367 411.75 146.648 414.709 146.648 417.967C146.648 424.683 141.203 430.128 134.486 430.128C127.77 430.128 122.325 424.683 122.325 417.967C122.325 414.465 123.805 411.309 126.174 409.09L109.997 390.998C102.641 397.672 98.0216 407.309 98.0216 418.024C98.0216 438.174 114.356 454.508 134.505 454.508C154.655 454.508 170.989 438.174 170.989 418.024C170.989 408.073 167.005 399.052 160.544 392.47L148.38 378.785L148.629 378.666C158.042 374.703 165.443 366.905 168.877 357.229C171.283 358.183 173.754 358.958 176.249 359.57C188 362.454 201.498 362.135 215.179 359.801C222.481 358.555 230.107 356.688 237.911 354.243C239.28 360.939 240 367.879 240 375C240 431.885 193.885 478 137 478C80.1147 478 34 431.885 34 375C34 318.115 80.1147 272 137 272ZM201.887 256.591C202.171 256.747 202.454 256.904 202.736 257.061C223.253 242.04 246 224.633 266.432 202.402L259.367 194.876L236.062 199.358L201.887 256.591ZM146.645 345.026C146.645 351.742 141.2 357.187 134.484 357.187C127.767 357.187 122.322 351.742 122.322 345.026C122.322 338.309 127.767 332.865 134.484 332.865C141.2 332.865 146.645 338.309 146.645 345.026Z" fill="black"/>
+</svg>
diff --git a/app/assets/icons/icons-loader.js b/app/assets/icons/icons-loader.js
index f45ef5e6e4..d0f9910299 100644
--- a/app/assets/icons/icons-loader.js
+++ b/app/assets/icons/icons-loader.js
@@ -1,4 +1,29 @@
 let icons = [
+    "menu-power",
+    "menu-create_account",
+    "menu-dashboard",
+    "menu-user", //old
+    "menu-robot",
+    "menu-listing",
+    "menu-volume_ranking",
+    "menu-trade",
+    "menu-server",
+    "menu-transfer",
+    "menu-deposit-withdraw",
+    "menu-cogs",
+    "menu-showcases",
+    "menu-insight",
+    "menu-news",
+    "menu-question-circle",
+    "menu-thumbs-up",
+    "menu-assets",
+    "menu-text-sign",
+    "menu-text",
+    "menu-hourglass",
+    "menu-list",
+    "menu-warning",
+    "menu-folder",
+
     "photo-camera",
     "adjust",
     "alarm",
@@ -23,6 +48,7 @@ let icons = [
     "direct_debit",
     "dollar-green",
     "dollar",
+    "donate",
     "download",
     "excel",
     "eye",
@@ -36,7 +62,6 @@ let icons = [
     "hourglass",
     "key",
     "list",
-    "listing",
     "locked",
     "minus-circle",
     "news",
@@ -77,7 +102,8 @@ let icons = [
     "insight",
     "create_account",
     "swap",
-    "instant-trade"
+    "instant-trade",
+    "qr-scan"
 ];
 
 let iconsMap = {};
diff --git a/app/assets/icons/listing.svg b/app/assets/icons/listing.svg
deleted file mode 100644
index a53414d087..0000000000
--- a/app/assets/icons/listing.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg height="445pt" viewBox="-5 0 445 445.03566" width="445pt" xmlns="http://www.w3.org/2000/svg"><path d="m401.390625 271.476562c24.644531-73.734374 5.6875-155.058593-49.019531-210.296874-.402344-.609376-.921875-1.128907-1.53125-1.53125-80.171875-79.53125-209.472656-79.53125-289.640625 0-.609375.402343-1.132813.921874-1.535157 1.53125-79.527343 80.171874-79.527343 209.472656 0 289.640624.203126.300782.433594.585938.691407.84375.257812.253907.542969.484376.84375.691407 51.742187 51.246093 126.699219 71.371093 197.152343 52.933593 5.515626 7.414063 12.039063 14.023438 19.386719 19.628907 17.128907 13.113281 38.117188 20.183593 59.6875 20.117187 41.300781.015625 78.230469-25.71875 92.511719-64.472656s2.886719-82.300781-28.546875-109.089844zm-189.371094 128.425782v-14.683594c0-3.3125-2.6875-6-6-6-3.316406 0-6 2.6875-6 6v14.679688c-47.28125-1.433594-92.394531-20.152344-126.800781-52.613282l10.3125-10.3125c2.34375-2.34375 2.34375-6.144531 0-8.488281-2.34375-2.339844-6.140625-2.339844-8.484375 0l-10.3125 10.316406c-32.464844-34.40625-51.183594-79.519531-52.617187-126.800781h14.679687c3.316406 0 6-2.6875 6-6s-2.683594-6-6-6h-14.679687c1.433593-47.28125 20.152343-92.394531 52.613281-126.800781l10.316406 10.320312c2.34375 2.34375 6.140625 2.34375 8.484375 0s2.34375-6.140625 0-8.484375l-10.3125-10.316406c34.402344-32.460938 79.519531-51.183594 126.800781-52.617188v14.679688c0 3.3125 2.683594 6 6 6 3.3125 0 6-2.6875 6-6v-14.679688c47.28125 1.433594 92.394531 20.15625 126.796875 52.617188l-10.3125 10.3125c-2.34375 2.34375-2.34375 6.144531 0 8.488281s6.140625 2.34375 8.484375 0l10.3125-10.3125c32.464844 34.402344 51.183594 79.519531 52.617188 126.800781h-14.679688c-3.3125 0-6 2.683594-6 6 0 3.3125 2.6875 6 6 6h14.679688c-.515625 17.597657-3.433594 35.042969-8.671875 51.851563-12.773438-8.386719-27.347656-13.644531-42.535156-15.339844 4.101562-13.800781 6.175781-28.121093 6.164062-42.515625 0-82.085937-66.777344-148.859375-148.855469-148.859375-82.082031 0-148.859375 66.773438-148.859375 148.855469s66.777344 148.859375 148.859375 148.859375c11.082031-.003906 22.128907-1.238281 32.941407-3.683594.679687 15.273438 4.957031 30.167969 12.488281 43.46875-12.929688 3.097657-26.140625 4.859375-39.429688 5.257813zm27.179688-62c-.027344.300781-.035157.609375-.058594.910156-10.835937 2.691406-21.957031 4.046875-33.121094 4.046875-75.464843 0-136.859375-61.394531-136.859375-136.859375s61.394532-136.855469 136.859375-136.855469c75.460938 0 136.855469 61.394531 136.855469 136.855469.015625 14.214844-2.1875 28.34375-6.527344 41.878906-50.726562.535156-92.761718 39.488282-97.148437 90.027344zm98.226562 95.132812c-22.972656.027344-45.015625-9.089844-61.257812-25.332031-16.246094-16.246094-25.359375-38.289063-25.335938-61.261719 0-2.5.109375-5.03125.320313-7.511718 4.0625-46.675782 44.507812-81.660157 91.285156-78.949219 46.773438 2.710937 82.910156 42.128906 81.554688 88.960937-1.355469 46.832032-39.714844 84.09375-86.566407 84.09375zm0 0"/><path d="m373.484375 340.445312h-30.058594v-30.058593c0-3.3125-2.6875-6-6-6-3.316406 0-6 2.6875-6 6v30.058593h-30.058593c-3.3125 0-6 2.6875-6 6s2.6875 6 6 6h30.058593v30.058594c0 3.3125 2.683594 6 6 6 3.3125 0 6-2.6875 6-6v-30.058594h30.058594c3.3125 0 6-2.6875 6-6s-2.6875-6-6-6zm0 0"/><path d="m254.875 173.546875c-.027344-18.101563-12.492188-33.804687-30.109375-37.941406v-17.804688c0-3.3125-2.6875-6-6-6s-6 2.6875-6 6v16.777344h-19.210937v-16.777344c0-3.3125-2.683594-6-6-6-3.3125 0-6 2.6875-6 6v16.777344h-18.398438c-3.3125 0-6 2.6875-6 6v131.867187c0 3.316407 2.6875 6 6 6h18.398438v15.757813c0 3.3125 2.6875 6 6 6 3.316406 0 6-2.6875 6-6v-15.757813h19.210937v15.757813c0 3.3125 2.6875 6 6 6s6-2.6875 6-6v-16.785156c15.3125-3.566407 26.976563-15.988281 29.574219-31.492188 2.597656-15.503906-4.382813-31.050781-17.695313-39.414062 11.339844-7.125 18.222657-19.574219 18.230469-32.964844zm-12 65.933594c-.019531 14.886719-12.082031 26.949219-26.96875 26.964843h-46.746094v-53.933593h46.746094c14.886719.019531 26.949219 12.082031 26.96875 26.96875zm-26.96875-38.96875h-46.746094v-53.933594h46.746094c14.894531 0 26.96875 12.074219 26.96875 26.96875s-12.074219 26.964844-26.96875 26.964844zm0 0"/></svg>
\ No newline at end of file
diff --git a/app/assets/icons/menu-assets.svg b/app/assets/icons/menu-assets.svg
new file mode 100644
index 0000000000..b37720d5da
--- /dev/null
+++ b/app/assets/icons/menu-assets.svg
@@ -0,0 +1,8 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M310.727 217C310.727 208.163 303.563 201 294.727 201C285.89 201 278.727 208.163 278.727 217V236.833H259C250.163 236.833 243 243.997 243 252.833C243 261.67 250.163 268.833 259 268.833H266.82V380.167H259C250.163 380.167 243 387.33 243 396.167C243 405.003 250.163 412.167 259 412.167H278.727V432C278.727 440.837 285.89 448 294.727 448C303.563 448 310.727 440.837 310.727 432V412.167H326.362V432C326.362 440.837 333.525 448 342.362 448C351.198 448 358.362 440.837 358.362 432V412.005C370.598 411.033 382.136 405.724 390.866 396.968C400.562 387.244 406 374.065 406 360.333C406 346.975 400.854 334.14 391.648 324.5C400.854 314.86 406 302.025 406 288.667C406 274.935 400.562 261.756 390.866 252.032C382.136 243.276 370.598 237.967 358.362 236.995V217C358.362 208.163 351.198 201 342.362 201C333.525 201 326.362 208.163 326.362 217V236.833H310.727V217ZM298.82 268.833V308.5H354.241L354.273 308.5C359.489 308.5 364.502 306.422 368.205 302.708C371.91 298.992 374 293.942 374 288.667C374 283.391 371.91 278.341 368.205 274.626C364.502 270.911 359.489 268.833 354.273 268.833H342.34H298.82ZM298.82 340.5H342.34L354.273 340.5L354.274 340.5L354.289 340.5C359.5 340.504 364.506 342.582 368.205 346.292C371.91 350.008 374 355.058 374 360.333C374 365.609 371.91 370.659 368.205 374.374C364.502 378.089 359.489 380.167 354.273 380.167L354.241 380.167L342.362 380.167L298.82 380.167V340.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M323.999 136C220.169 136 135.999 220.17 135.999 324C135.999 427.83 220.169 512 323.999 512C427.828 512 511.999 427.83 511.999 324C511.999 220.17 427.828 136 323.999 136ZM323.999 168C237.842 168 167.999 237.844 167.999 324C167.999 410.156 237.842 480 323.999 480C410.155 480 479.999 410.156 479.999 324C479.999 237.844 410.155 168 323.999 168Z" fill="black"/>
+<path d="M76 272C67.1634 272 60 279.163 60 288C60 296.837 67.1634 304 76 304H104C112.837 304 120 296.837 120 288C120 279.163 112.837 272 104 272H76Z" fill="black"/>
+<path d="M76 112C67.1634 112 60 119.163 60 128C60 136.837 67.1634 144 76 144H221C229.837 144 237 136.837 237 128C237 119.163 229.837 112 221 112H76Z" fill="black"/>
+<path d="M60 0C26.8629 0 0 26.8629 0 60V452C0 485.137 26.8629 512 60 512H196.5C205.337 512 212.5 504.837 212.5 496C212.5 487.163 205.337 480 196.5 480H60C44.536 480 32 467.464 32 452V60C32 44.536 44.536 32 60 32H324C339.464 32 352 44.536 352 60V105C352 113.837 359.163 121 368 121C376.837 121 384 113.837 384 105V60C384 26.8629 357.137 0 324 0H60Z" fill="black"/>
+<path d="M76 192C67.1634 192 60 199.163 60 208C60 216.837 67.1634 224 76 224H134.5C143.337 224 150.5 216.837 150.5 208C150.5 199.163 143.337 192 134.5 192H76Z" fill="black"/>
+</svg>
diff --git a/app/assets/icons/menu-cogs.svg b/app/assets/icons/menu-cogs.svg
new file mode 100644
index 0000000000..a32dea45ba
--- /dev/null
+++ b/app/assets/icons/menu-cogs.svg
@@ -0,0 +1,3 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M177.575 56.0127C206.811 -13.4145 305.19 -13.4146 334.426 56.0127C343.663 77.9473 366.367 91.0557 389.982 88.0876C464.725 78.6931 513.915 163.892 468.407 223.925C454.03 242.892 454.03 269.108 468.407 288.075C513.915 348.108 464.725 433.307 389.982 423.912C366.367 420.944 343.663 434.053 334.426 455.987C305.19 525.415 206.811 525.415 177.575 455.987C168.338 434.053 145.633 420.944 122.019 423.912C47.2755 433.307 -1.91436 348.108 43.5934 288.075C57.971 269.108 57.971 242.892 43.5934 223.925C-1.91437 163.892 47.2755 78.6931 122.019 88.0876C145.633 91.0557 168.338 77.9473 177.575 56.0127ZM304.934 68.4317C286.693 25.1124 225.308 25.1124 207.066 68.4317C192.263 103.586 155.875 124.595 118.028 119.838C71.392 113.976 40.6998 167.136 69.0945 204.594C92.1373 234.991 92.1373 277.009 69.0945 307.406C40.6999 344.864 71.392 398.024 118.028 392.162C155.875 387.405 192.263 408.414 207.066 443.568C225.308 486.888 286.693 486.888 304.934 443.568C319.738 408.414 356.126 387.405 393.972 392.162C440.609 398.024 471.301 344.864 442.906 307.406C419.864 277.009 419.864 234.991 442.906 204.594C471.301 167.136 440.609 113.976 393.972 119.838C356.126 124.595 319.738 103.586 304.934 68.4317ZM256 178C212.922 178 178 212.922 178 256C178 299.078 212.922 334 256 334C299.079 334 334 299.078 334 256C334 212.922 299.079 178 256 178ZM146 256C146 195.249 195.249 146 256 146C316.752 146 366 195.249 366 256C366 316.751 316.752 366 256 366C195.249 366 146 316.751 146 256Z" fill="black"/>
+</svg>
diff --git a/app/assets/icons/menu-create_account.svg b/app/assets/icons/menu-create_account.svg
new file mode 100644
index 0000000000..077149e08b
--- /dev/null
+++ b/app/assets/icons/menu-create_account.svg
@@ -0,0 +1,3 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M256 32C198.563 32 152 78.5624 152 136C152 193.438 198.563 240 256 240C313.438 240 360 193.438 360 136C360 78.5624 313.438 32 256 32ZM328.982 250.78C366.87 226.639 392 184.254 392 136C392 60.8893 331.111 0 256 0C180.89 0 120 60.8893 120 136C120 184.252 145.129 226.634 183.013 250.776C94.5126 277.629 26.7145 352.048 9.34422 444.276C2.60538 480.056 32.8753 507 65.0004 507H314.5C323.337 507 330.5 499.837 330.5 491C330.5 482.163 323.337 475 314.5 475H65.0004C48.5244 475 38.5347 462.18 40.7913 450.199C59.899 348.747 149.004 272 256 272C296.301 272 334.015 282.871 366.421 301.831C374.048 306.293 383.848 303.727 388.31 296.1C392.773 288.473 390.207 278.673 382.58 274.211C365.851 264.423 347.886 256.516 328.982 250.78ZM409 322C417.837 322 425 329.163 425 338V395H483C491.837 395 499 402.163 499 411C499 419.837 491.837 427 483 427H425V485C425 493.837 417.837 501 409 501C400.164 501 393 493.837 393 485V427H336C327.164 427 320 419.837 320 411C320 402.163 327.164 395 336 395H393V338C393 329.163 400.164 322 409 322Z" fill="black"/>
+</svg>
diff --git a/app/assets/icons/menu-dashboard.svg b/app/assets/icons/menu-dashboard.svg
new file mode 100644
index 0000000000..1d062b23e9
--- /dev/null
+++ b/app/assets/icons/menu-dashboard.svg
@@ -0,0 +1,3 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14 68C14 34.8629 40.8629 8 74 8H181C214.137 8 241 34.8629 241 68V212C241 245.137 214.137 272 181 272H74C40.8629 272 14 245.137 14 212V68ZM74 40C58.536 40 46 52.536 46 68V212C46 227.464 58.536 240 74 240H181C196.464 240 209 227.464 209 212V68C209 52.536 196.464 40 181 40H74ZM271 68C271 34.8629 297.863 8 331 8H438C471.137 8 498 34.8629 498 68V150C498 183.137 471.137 210 438 210H331C297.863 210 271 183.137 271 150V68ZM331 40C315.536 40 303 52.536 303 68V150C303 165.464 315.536 178 331 178H438C453.464 178 466 165.464 466 150V68C466 52.536 453.464 40 438 40H331ZM271 300C271 266.863 297.863 240 331 240H438C471.137 240 498 266.863 498 300V444C498 477.137 471.137 504 438 504H331C297.863 504 271 477.137 271 444V300ZM331 272C315.536 272 303 284.536 303 300V444C303 459.464 315.536 472 331 472H438C453.464 472 466 459.464 466 444V300C466 284.536 453.464 272 438 272H331ZM14 362C14 328.863 40.8629 302 74 302H181C214.137 302 241 328.863 241 362V444C241 477.137 214.137 504 181 504H74C40.8629 504 14 477.137 14 444V362ZM74 334C58.536 334 46 346.536 46 362V444C46 459.464 58.536 472 74 472H181C196.464 472 209 459.464 209 444V362C209 346.536 196.464 334 181 334H74Z" fill="black"/>
+</svg>
diff --git a/app/assets/icons/menu-deposit-withdraw.svg b/app/assets/icons/menu-deposit-withdraw.svg
new file mode 100644
index 0000000000..7c47cf9939
--- /dev/null
+++ b/app/assets/icons/menu-deposit-withdraw.svg
@@ -0,0 +1,3 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M346.877 39.2179C352.856 36.7414 359.738 38.1103 364.314 42.6863L505.564 183.936C511.812 190.185 511.812 200.315 505.564 206.564L364.314 347.814C359.738 352.39 352.856 353.759 346.877 351.282C340.898 348.806 337 342.971 337 336.5V271.875H159.25C150.413 271.875 143.25 264.712 143.25 255.875V213.877L40.6274 316.5L143.25 419.123V377.125C143.25 368.288 150.413 361.125 159.25 361.125H270.75C279.587 361.125 286.75 368.288 286.75 377.125C286.75 385.962 279.587 393.125 270.75 393.125H175.25V457.75C175.25 464.221 171.352 470.056 165.373 472.532C159.394 475.009 152.512 473.64 147.936 469.064L6.68629 327.814C0.437902 321.565 0.437902 311.435 6.68629 305.186L147.936 163.936C152.512 159.36 159.394 157.991 165.373 160.468C171.352 162.944 175.25 168.779 175.25 175.25V239.875H353C361.837 239.875 369 247.038 369 255.875V297.873L471.623 195.25L369 92.6274V134.625C369 143.462 361.837 150.625 353 150.625H241.5C232.663 150.625 225.5 143.462 225.5 134.625C225.5 125.788 232.663 118.625 241.5 118.625H337V54C337 47.5286 340.898 41.6944 346.877 39.2179Z" fill="black"/>
+</svg>
diff --git a/app/assets/icons/menu-folder.svg b/app/assets/icons/menu-folder.svg
new file mode 100644
index 0000000000..ed6cc28f1e
--- /dev/null
+++ b/app/assets/icons/menu-folder.svg
@@ -0,0 +1,3 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M60 70C44.536 70 32 82.536 32 98V413C32 428.464 44.536 441 60 441H452C467.464 441 480 428.464 480 413V175C480 159.536 467.464 147 452 147H275.844C258.639 147 242.261 139.613 230.871 126.717L189.143 79.4656C183.828 73.4471 176.185 70 168.156 70H60ZM0 98C0 64.8629 26.8629 38 60 38H168.156C185.361 38 201.739 45.3866 213.129 58.2834L254.857 105.534C260.172 111.553 267.815 115 275.844 115H452C485.137 115 512 141.863 512 175V413C512 446.137 485.137 473 452 473H60C26.8629 473 0 446.137 0 413V98Z" fill="black"/>
+</svg>
diff --git a/app/assets/icons/menu-hourglass.svg b/app/assets/icons/menu-hourglass.svg
new file mode 100644
index 0000000000..71d3f518d6
--- /dev/null
+++ b/app/assets/icons/menu-hourglass.svg
@@ -0,0 +1,3 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M95 20C95 11.1634 102.163 4 111 4H401C409.837 4 417 11.1634 417 20C417 28.8366 409.837 36 401 36H382.5V144.235C382.5 162.164 374.482 179.154 360.642 190.551L281.169 256L360.642 321.449C374.482 332.846 382.5 349.836 382.5 367.765V476H401C409.837 476 417 483.163 417 492C417 500.837 409.837 508 401 508H111C102.163 508 95 500.837 95 492C95 483.163 102.163 476 111 476H129.5V367.765C129.5 349.836 137.518 332.846 151.358 321.449L230.831 256L151.358 190.551C137.518 179.154 129.5 162.164 129.5 144.235V36H111C102.163 36 95 28.8366 95 20ZM161.5 36V144.235C161.5 152.602 165.242 160.531 171.7 165.849L256 235.273L340.3 165.849C346.758 160.531 350.5 152.602 350.5 144.235V36H161.5ZM256 276.727L171.7 346.151C165.242 351.469 161.5 359.398 161.5 367.765V403.5H350.5V367.765C350.5 359.398 346.758 351.469 340.3 346.151L256 276.727ZM350.5 435.5H161.5V476H350.5V435.5Z" fill="black"/>
+</svg>
diff --git a/app/assets/icons/menu-insight.svg b/app/assets/icons/menu-insight.svg
new file mode 100644
index 0000000000..810ff3105a
--- /dev/null
+++ b/app/assets/icons/menu-insight.svg
@@ -0,0 +1,10 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_673_3840)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M324 32C237.843 32 168 101.844 168 188C168 274.156 237.843 344 324 344C410.156 344 480 274.156 480 188C480 101.844 410.156 32 324 32ZM136 188C136 84.1705 220.17 0 324 0C427.829 0 512 84.1705 512 188C512 291.83 427.829 376 324 376C277.91 376 235.694 359.415 202.995 331.887L177.121 357.761L188.435 369.075C191.435 372.075 193.121 376.145 193.121 380.388C193.121 384.632 191.435 388.701 188.435 391.702L83.7829 496.354C65.0378 515.099 34.6458 515.099 15.9007 496.354C-2.84449 477.609 -2.84449 447.217 15.9007 428.472L120.552 323.82C123.553 320.819 127.623 319.134 131.866 319.134C136.11 319.134 140.179 320.819 143.18 323.82L154.494 335.133L180.346 309.281C152.679 276.543 136 234.219 136 188ZM131.866 357.761L72.8228 416.804L95.4502 439.432L154.494 380.388L131.866 357.761ZM72.8228 462.059L50.1953 439.432L38.5281 451.099C32.2797 457.347 32.2797 467.478 38.5281 473.726C44.7765 479.975 54.9071 479.975 61.1555 473.726L72.8228 462.059ZM323.621 120C309.157 120 297.431 131.725 297.431 146.189C297.431 160.654 309.157 172.379 323.621 172.379C338.085 172.379 349.81 160.654 349.81 146.189C349.81 131.725 338.085 120 323.621 120ZM278.118 182.463C270.178 172.516 265.431 159.907 265.431 146.189C265.431 114.052 291.484 88 323.621 88C355.758 88 381.81 114.052 381.81 146.189C381.81 159.907 377.064 172.516 369.124 182.463C387.877 190.922 404.442 204.251 415.88 220.7C421.227 228.389 423.78 236.996 423.214 245.718C422.658 254.308 419.155 261.909 414.236 267.975C404.589 279.874 388.741 287 372.242 287H275C258.501 287 242.653 279.874 233.005 267.976C228.087 261.909 224.584 254.308 224.027 245.718C223.462 236.996 226.015 228.389 231.361 220.7C242.798 204.252 259.364 190.923 278.118 182.463ZM323.621 204.379C298.294 204.379 271.914 218.431 257.634 238.969C256.044 241.255 255.904 242.782 255.96 243.648C256.025 244.648 256.458 246.091 257.862 247.822C260.859 251.519 267.198 255 275 255H372.242C380.043 255 386.383 251.519 389.38 247.822C390.783 246.091 391.217 244.648 391.281 243.648C391.338 242.782 391.197 241.255 389.608 238.969C381.859 227.825 370.547 218.59 357.773 212.473L357.203 213.447C347.586 207.82 336.433 204.535 324.48 204.384C324.242 204.381 324.004 204.38 323.765 204.379L323.621 204.379Z" fill="black"/>
+</g>
+<defs>
+<clipPath id="clip0_673_3840">
+<rect width="512" height="512" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/app/assets/icons/menu-list.svg b/app/assets/icons/menu-list.svg
new file mode 100644
index 0000000000..985b14e37a
--- /dev/null
+++ b/app/assets/icons/menu-list.svg
@@ -0,0 +1,3 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M152.285 37C159.814 16.5697 179.456 2 202.5 2H309.5C332.544 2 352.186 16.5697 359.715 37H399C432.137 37 459 63.8629 459 97V452C459 485.137 432.137 512 399 512H113C79.8629 512 53 485.137 53 452V97C53 63.8629 79.8629 37 113 37H152.285ZM150.718 69H113C97.536 69 85 81.536 85 97V452C85 467.464 97.536 480 113 480H399C414.464 480 427 467.464 427 452V97C427 81.536 414.464 69 399 69H361.282C355.3 92.0115 334.384 109 309.5 109H202.5C177.616 109 156.7 92.0115 150.718 69ZM202.5 34C190.626 34 181 43.6259 181 55.5C181 67.3741 190.626 77 202.5 77H309.5C321.374 77 331 67.3741 331 55.5C331 43.6259 321.374 34 309.5 34H202.5ZM225.314 188.686C231.562 194.935 231.562 205.065 225.314 211.314L170.314 266.314C164.065 272.562 153.935 272.562 147.686 266.314L116.686 235.314C110.438 229.065 110.438 218.935 116.686 212.686C122.935 206.438 133.065 206.438 139.314 212.686L159 232.373L202.686 188.686C208.935 182.438 219.065 182.438 225.314 188.686ZM257 237C257 228.163 264.163 221 273 221H384C392.837 221 400 228.163 400 237C400 245.837 392.837 253 384 253H273C264.163 253 257 245.837 257 237ZM225.314 312.686C231.562 318.935 231.562 329.065 225.314 335.314L170.314 390.314C164.065 396.562 153.935 396.562 147.686 390.314L116.686 359.314C110.438 353.065 110.438 342.935 116.686 336.686C122.935 330.438 133.065 330.438 139.314 336.686L159 356.373L202.686 312.686C208.935 306.438 219.065 306.438 225.314 312.686ZM257 361C257 352.163 264.163 345 273 345H384C392.837 345 400 352.163 400 361C400 369.837 392.837 377 384 377H273C264.163 377 257 369.837 257 361Z" fill="black"/>
+</svg>
diff --git a/app/assets/icons/menu-listing.svg b/app/assets/icons/menu-listing.svg
new file mode 100644
index 0000000000..c41d0939f6
--- /dev/null
+++ b/app/assets/icons/menu-listing.svg
@@ -0,0 +1,5 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M237.583 141C237.583 132.163 230.42 125 221.583 125C212.746 125 205.583 132.163 205.583 141V166.583H180C171.163 166.583 164 173.747 164 182.583C164 191.42 171.163 198.583 180 198.583H191.724V332.917H180C171.163 332.917 164 340.08 164 348.917C164 357.753 171.163 364.917 180 364.917H205.583V390.5C205.583 399.337 212.746 406.5 221.583 406.5C230.42 406.5 237.583 399.337 237.583 390.5V364.917H261.026V390.5C261.026 399.337 268.189 406.5 277.026 406.5C285.862 406.5 293.026 399.337 293.026 390.5V364.877C307.522 364.339 321.312 358.345 331.606 348.051C342.405 337.252 348.472 322.605 348.472 307.333C348.472 292.061 342.405 277.415 331.606 266.616C331.314 266.324 331.02 266.035 330.722 265.75C331.02 265.465 331.314 265.176 331.606 264.884C342.405 254.085 348.472 239.439 348.472 224.167C348.472 208.895 342.405 194.248 331.606 183.449C321.312 173.155 307.522 167.161 293.026 166.623V141C293.026 132.163 285.862 125 277.026 125C268.189 125 261.026 132.163 261.026 141V166.583H237.583V141ZM223.724 249.75V198.583H277.003H290.889C297.674 198.583 304.181 201.279 308.979 206.076C313.777 210.874 316.472 217.382 316.472 224.167C316.472 230.952 313.777 237.459 308.979 242.257C304.181 247.055 297.674 249.75 290.889 249.75L265.062 249.75L223.724 249.75ZM316.472 307.333C316.472 300.548 313.777 294.041 308.979 289.243C304.189 284.453 297.694 281.758 290.921 281.75H290.915L290.891 281.75H223.724V332.917H290.889C297.674 332.917 304.181 330.221 308.979 325.423C313.777 320.626 316.472 314.118 316.472 307.333Z" fill="black"/>
+<path d="M32 256C32 132.288 132.288 32 256 32C271.859 32 287.316 33.6456 302.217 36.7698C310.865 38.5832 319.346 33.0423 321.159 24.3938C322.973 15.7454 317.432 7.26431 308.783 5.4509C291.737 1.87652 274.079 0 256 0C114.615 0 0 114.615 0 256C0 397.385 114.615 512 256 512C397.385 512 512 397.385 512 256C512 232.771 508.902 210.24 503.088 188.81C500.774 180.282 491.985 175.244 483.456 177.558C474.928 179.872 469.89 188.661 472.204 197.19C477.284 215.913 480 235.627 480 256C480 379.712 379.712 480 256 480C132.288 480 32 379.712 32 256Z" fill="black"/>
+<path d="M425 27C425 18.1634 417.837 11 409 11C400.163 11 393 18.1634 393 27V84H336C327.163 84 320 91.1634 320 100C320 108.837 327.163 116 336 116H393V174C393 182.837 400.163 190 409 190C417.837 190 425 182.837 425 174V116H483C491.837 116 499 108.837 499 100C499 91.1634 491.837 84 483 84H425V27Z" fill="black"/>
+</svg>
diff --git a/app/assets/icons/menu-news.svg b/app/assets/icons/menu-news.svg
new file mode 100644
index 0000000000..a811c29bfa
--- /dev/null
+++ b/app/assets/icons/menu-news.svg
@@ -0,0 +1,10 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_673_3918)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 60C0 26.8629 26.8629 0 60 0H324C357.137 0 384 26.8629 384 60V64H452.5C485.637 64 512.5 90.8629 512.5 124V452C512.5 485.137 485.637 512 452.5 512H60C26.8629 512 0 485.137 0 452V60ZM384 96V451.949C384 467.385 396.493 479.909 411.929 479.949L432.25 480H452.5C467.964 480 480.5 467.464 480.5 452V124C480.5 108.536 467.964 96 452.5 96H384ZM358.948 480C354.512 471.628 352 462.081 352 451.949V60C352 44.536 339.464 32 324 32H60C44.536 32 32 44.536 32 60V452C32 467.464 44.536 480 60 480H358.948ZM60 98C60 77.0132 77.0132 60 98 60H154C174.987 60 192 77.0132 192 98V154C192 174.987 174.987 192 154 192H98C77.0132 192 60 174.987 60 154V98ZM98 92C94.6863 92 92 94.6863 92 98V154C92 157.314 94.6863 160 98 160H154C157.314 160 160 157.314 160 154V98C160 94.6863 157.314 92 154 92H98ZM231 93C231 84.1634 238.163 77 247 77H296C304.837 77 312 84.1634 312 93C312 101.837 304.837 109 296 109H247C238.163 109 231 101.837 231 93ZM231 173C231 164.163 238.163 157 247 157H296C304.837 157 312 164.163 312 173C312 181.837 304.837 189 296 189H247C238.163 189 231 181.837 231 173ZM60 253C60 244.163 67.1634 237 76 237H296C304.837 237 312 244.163 312 253C312 261.837 304.837 269 296 269H76C67.1634 269 60 261.837 60 253ZM60 333C60 324.163 67.1634 317 76 317H296C304.837 317 312 324.163 312 333C312 341.837 304.837 349 296 349H76C67.1634 349 60 341.837 60 333ZM60 413C60 404.163 67.1634 397 76 397H296C304.837 397 312 404.163 312 413C312 421.837 304.837 429 296 429H76C67.1634 429 60 421.837 60 413Z" fill="black"/>
+</g>
+<defs>
+<clipPath id="clip0_673_3918">
+<rect width="512" height="512" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/app/assets/icons/menu-power.svg b/app/assets/icons/menu-power.svg
new file mode 100644
index 0000000000..fec151e700
--- /dev/null
+++ b/app/assets/icons/menu-power.svg
@@ -0,0 +1,3 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M256 32C132.288 32 32 132.288 32 256C32 379.712 132.288 480 256 480C379.712 480 480 379.712 480 256C480 132.288 379.712 32 256 32ZM0 256C0 114.615 114.615 0 256 0C397.385 0 512 114.615 512 256C512 397.385 397.385 512 256 512C114.615 512 0 397.385 0 256ZM256 121C264.837 121 272 128.163 272 137V215C272 223.837 264.837 231 256 231C247.163 231 240 223.837 240 215V137C240 128.163 247.163 121 256 121ZM204.742 176.001C210.744 182.486 210.354 192.609 203.869 198.611C188.553 212.789 179 233.017 179 255.5C179 298.302 213.698 333 256.5 333C299.302 333 334 298.302 334 255.5C334 233.017 324.447 212.789 309.131 198.611C302.646 192.609 302.256 182.486 308.258 176.001C314.261 169.516 324.384 169.126 330.869 175.128C352.453 195.109 366 223.734 366 255.5C366 315.975 316.975 365 256.5 365C196.025 365 147 315.975 147 255.5C147 223.734 160.547 195.109 182.131 175.128C188.616 169.126 198.739 169.516 204.742 176.001Z" fill="black"/>
+</svg>
diff --git a/app/assets/icons/menu-question-circle.svg b/app/assets/icons/menu-question-circle.svg
new file mode 100644
index 0000000000..faf1911aad
--- /dev/null
+++ b/app/assets/icons/menu-question-circle.svg
@@ -0,0 +1,3 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M256 32C132.288 32 32 132.288 32 256C32 379.712 132.288 480 256 480C379.712 480 480 379.712 480 256C480 132.288 379.712 32 256 32ZM0 256C0 114.615 114.615 0 256 0C397.385 0 512 114.615 512 256C512 397.385 397.385 512 256 512C114.615 512 0 397.385 0 256ZM247.173 154C234.994 154 223.718 158.169 215.744 165.003C207.846 171.773 204 180.377 204 188.719C204 197.556 196.837 204.719 188 204.719C179.163 204.719 172 197.556 172 188.719C172 170.158 180.622 152.961 194.919 140.707C209.139 128.519 227.964 122 247.173 122H264.079C283.287 122 302.113 128.519 316.333 140.707C330.512 152.86 339.109 169.876 339.25 188.262C339.964 202.549 336.067 216.692 328.127 228.601C320.281 240.37 308.902 249.335 295.64 254.211C289.317 257.365 283.035 263.555 278.374 272.879C273.578 282.469 271.095 294.253 271.611 306.385C271.987 315.213 265.134 322.675 256.306 323.05C247.477 323.426 240.016 316.573 239.64 307.745C238.911 290.605 242.35 273.371 249.752 258.568C257.142 243.787 268.425 231.62 282.647 224.952C283.131 224.725 283.626 224.522 284.131 224.345C291.231 221.848 297.327 217.112 301.502 210.85C305.677 204.588 307.703 197.139 307.277 189.625C307.26 189.324 307.252 189.022 307.252 188.719C307.252 180.377 303.405 171.773 295.508 165.003C287.534 158.169 276.258 154 264.079 154H247.173ZM255.623 358.69C264.459 358.69 271.623 365.854 271.623 374.69V374.86C271.623 383.696 264.459 390.86 255.623 390.86C246.786 390.86 239.623 383.696 239.623 374.86V374.69C239.623 365.854 246.786 358.69 255.623 358.69Z" fill="black"/>
+</svg>
diff --git a/app/assets/icons/menu-robot.svg b/app/assets/icons/menu-robot.svg
new file mode 100644
index 0000000000..133ced0d98
--- /dev/null
+++ b/app/assets/icons/menu-robot.svg
@@ -0,0 +1,3 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M233 55C233 42.2975 243.297 32 256 32C268.703 32 279 42.2975 279 55C279 67.7025 268.703 78 256 78C243.297 78 233 67.7025 233 55ZM256 0C225.624 0 201 24.6243 201 55C201 79.8311 217.455 100.819 240.056 107.653C240.019 108.097 240 108.546 240 109V140H124C90.8629 140 64 166.863 64 200V312H33L33 288C33 279.163 25.8366 272 17 272C8.16345 272 1 279.163 1 288L1 368C1 376.837 8.16344 384 17 384C25.8366 384 33 376.837 33 368V344H64V452C64 485.137 90.8629 512 124 512H388C421.137 512 448 485.137 448 452V344H479V368C479 376.837 486.163 384 495 384C503.837 384 511 376.837 511 368V288C511 279.163 503.837 272 495 272C486.163 272 479 279.163 479 288V312H448V200C448 166.863 421.137 140 388 140H272V109C272 108.546 271.981 108.097 271.944 107.653C294.545 100.819 311 79.8311 311 55C311 24.6243 286.376 0 256 0ZM96 200C96 184.536 108.536 172 124 172H388C403.464 172 416 184.536 416 200V452C416 467.464 403.464 480 388 480H124C108.536 480 96 467.464 96 452V200ZM152 256.5C152 244.074 162.074 234 174.5 234C186.926 234 197 244.074 197 256.5C197 268.926 186.926 279 174.5 279C162.074 279 152 268.926 152 256.5ZM174.5 202C144.4 202 120 226.4 120 256.5C120 286.6 144.4 311 174.5 311C204.6 311 229 286.6 229 256.5C229 226.4 204.6 202 174.5 202ZM315 256.5C315 244.074 325.074 234 337.5 234C349.926 234 360 244.074 360 256.5C360 268.926 349.926 279 337.5 279C325.074 279 315 268.926 315 256.5ZM337.5 202C307.4 202 283 226.4 283 256.5C283 286.6 307.4 311 337.5 311C367.6 311 392 286.6 392 256.5C392 226.4 367.6 202 337.5 202ZM152 372C152 368.686 154.686 366 158 366H180H212H240H272H300H332H354C357.314 366 360 368.686 360 372V417C360 420.314 357.314 423 354 423H332H300H272H240H212H180H158C154.686 423 152 420.314 152 417V372ZM158 334C137.013 334 120 351.013 120 372V417C120 437.987 137.013 455 158 455H354C374.987 455 392 437.987 392 417V372C392 351.013 374.987 334 354 334H158Z" fill="black"/>
+</svg>
diff --git a/app/assets/icons/menu-server.svg b/app/assets/icons/menu-server.svg
new file mode 100644
index 0000000000..98a754833b
--- /dev/null
+++ b/app/assets/icons/menu-server.svg
@@ -0,0 +1,3 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M253 26C261.837 26 269 33.1634 269 42V71C269 79.8366 261.837 87 253 87C244.163 87 237 79.8366 237 71V42C237 33.1634 244.163 26 253 26ZM75.6863 86.6863C81.9347 80.4379 92.0653 80.4379 98.3137 86.6863L118.82 107.192C125.068 113.441 125.068 123.571 118.82 129.82C112.571 136.068 102.441 136.068 96.1924 129.82L75.6863 109.314C69.4379 103.065 69.4379 92.9347 75.6863 86.6863ZM437.314 86.6863C443.562 92.9347 443.562 103.065 437.314 109.314L416.808 129.82C410.559 136.068 400.429 136.068 394.18 129.82C387.932 123.571 387.932 113.441 394.18 107.192L414.686 86.6863C420.935 80.4379 431.065 80.4379 437.314 86.6863ZM46.0177 256C47.9769 257.962 50.2123 260.152 52.7115 262.528C63.7053 272.977 79.7193 286.935 99.7008 300.879C113.343 310.399 128.678 319.805 145.398 328.078C131.866 307.356 124 282.596 124 256C124 229.403 131.866 204.644 145.398 183.922C128.678 192.195 113.343 201.601 99.7008 211.121C79.7193 225.065 63.7053 239.023 52.7115 249.472C50.2123 251.848 47.9769 254.038 46.0177 256ZM254.549 124.008C184.511 124.568 123.906 155.208 81.388 184.879C59.813 199.935 42.5548 214.977 30.6656 226.278C24.7133 231.935 20.0859 236.675 16.9147 240.037C15.3285 241.718 14.105 243.057 13.2606 243.996C12.8384 244.465 12.5108 244.834 12.2798 245.097C12.1644 245.228 12.0731 245.332 12.0062 245.409L11.9242 245.504L11.8969 245.535L11.8868 245.547C11.8827 245.552 11.8789 245.556 24 256L11.8789 245.556C6.70702 251.558 6.70702 260.442 11.8789 266.444L24 256C11.8789 266.444 11.8827 266.448 11.8868 266.453L11.8969 266.465L11.9242 266.496L12.0062 266.591C12.0731 266.668 12.1644 266.772 12.2798 266.903C12.5108 267.166 12.8384 267.535 13.2606 268.004C14.105 268.943 15.3285 270.282 16.9147 271.963C20.0859 275.325 24.7133 280.065 30.6656 285.722C42.5548 297.023 59.813 312.065 81.388 327.121C123.906 356.792 184.511 387.432 254.549 387.992C255.032 387.997 255.516 388 256 388C256.071 388 256.142 388 256.213 388C256.309 388 256.404 388 256.5 388C327.376 388 388.471 357.058 431.149 327.095C452.604 312.032 469.741 296.983 481.538 285.677C487.445 280.016 492.034 275.274 495.178 271.91C496.751 270.227 497.964 268.887 498.802 267.947C499.22 267.478 499.545 267.108 499.774 266.845C499.889 266.713 499.98 266.608 500.046 266.531L500.128 266.437L500.155 266.405L500.165 266.393C500.169 266.388 500.173 266.384 488 256L500.173 266.384C505.276 260.402 505.276 251.598 500.173 245.616L488 256C500.173 245.616 500.169 245.612 500.165 245.607L500.155 245.595L500.128 245.563L500.046 245.469C499.98 245.392 499.889 245.287 499.774 245.155C499.545 244.892 499.22 244.522 498.802 244.053C497.964 243.113 496.751 241.773 495.178 240.09C492.034 236.726 487.445 231.984 481.538 226.323C469.741 215.017 452.604 199.968 431.149 184.905C388.471 154.942 327.376 124 256.5 124C256.404 124 256.309 124 256.213 124C256.142 124 256.071 124 256 124C255.516 124 255.032 124.003 254.549 124.008ZM254.858 156.006C255.307 156.003 255.756 156.001 256.205 156C311.339 156.111 356 200.84 356 256C356 311.16 311.339 355.889 256.205 356C255.756 355.999 255.307 355.997 254.858 355.994C200.156 355.381 156 310.847 156 256C156 201.153 200.156 156.619 254.858 156.006ZM366.243 328.624C379.995 307.791 388 282.83 388 256C388 229.17 379.995 204.209 366.243 183.376C383.305 191.774 398.918 201.375 412.762 211.095C432.614 225.032 448.499 238.983 459.397 249.427C461.895 251.821 464.127 254.026 466.08 256C464.127 257.974 461.895 260.179 459.397 262.573C448.499 273.017 432.614 286.968 412.762 300.905C398.918 310.625 383.305 320.227 366.243 328.624ZM36.1122 266.454C36.1108 266.456 36.1108 266.456 36.1124 266.454L36.1122 266.454ZM256 222C237.222 222 222 237.222 222 256C222 274.778 237.222 290 256 290C274.778 290 290 274.778 290 256C290 237.222 274.778 222 256 222ZM190 256C190 219.549 219.549 190 256 190C292.451 190 322 219.549 322 256C322 292.451 292.451 322 256 322C219.549 322 190 292.451 190 256ZM36.1124 245.546C36.1108 245.544 36.1108 245.544 36.1122 245.546L36.1124 245.546ZM118.82 382.18C125.068 388.429 125.068 398.559 118.82 404.808L98.3137 425.314C92.0653 431.562 81.9347 431.562 75.6863 425.314C69.4379 419.065 69.4379 408.935 75.6863 402.686L96.1924 382.18C102.441 375.932 112.571 375.932 118.82 382.18ZM394.18 382.18C400.429 375.932 410.559 375.932 416.808 382.18L437.314 402.686C443.562 408.935 443.562 419.065 437.314 425.314C431.065 431.562 420.935 431.562 414.686 425.314L394.18 404.808C387.932 398.559 387.932 388.429 394.18 382.18ZM253 425C261.837 425 269 432.163 269 441V470C269 478.837 261.837 486 253 486C244.163 486 237 478.837 237 470V441C237 432.163 244.163 425 253 425Z" fill="black"/>
+</svg>
diff --git a/app/assets/icons/menu-showcases.svg b/app/assets/icons/menu-showcases.svg
new file mode 100644
index 0000000000..3c04a32bc9
--- /dev/null
+++ b/app/assets/icons/menu-showcases.svg
@@ -0,0 +1,3 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M253 6C261.837 6 269 13.1634 269 22V41C269 49.8366 261.837 57 253 57C244.163 57 237 49.8366 237 41V22C237 13.1634 244.163 6 253 6ZM201.139 420C201.308 421.595 201.45 423.133 201.582 424.577L201.644 425.254C201.869 427.714 202.067 429.892 202.322 432H309.678C309.933 429.892 310.131 427.714 310.356 425.254L310.418 424.577C310.55 423.133 310.692 421.595 310.862 420H201.139ZM217.63 464C227.423 473.884 241.005 480 256 480C270.995 480 284.577 473.884 294.37 464H217.63ZM277.587 388H234.413H195.593C187.472 358.792 168.771 334.21 152.572 313.408C135.287 291.21 125 263.329 125 233C125 160.651 183.651 102 256 102C328.349 102 387 160.651 387 233C387 263.329 376.713 291.21 359.428 313.408C343.229 334.21 324.528 358.792 316.407 388H277.587ZM93 233C93 142.978 165.978 70 256 70C346.022 70 419 142.978 419 233C419 270.7 406.182 305.451 384.676 333.069C365.38 357.849 349.013 380.574 345.131 406.38L343.224 419.062C342.834 421.649 342.572 424.349 342.285 427.49L342.213 428.271C341.957 431.094 341.664 434.305 341.233 437.523C340.517 442.856 339.312 448.04 337.663 453.025C326.338 487.262 294.079 512 256 512C217.921 512 185.662 487.262 174.337 453.025C172.688 448.04 171.483 442.856 170.767 437.523C170.335 434.305 170.043 431.094 169.786 428.27L169.715 427.49C169.428 424.349 169.166 421.649 168.776 419.062L166.869 406.38C162.987 380.574 146.62 357.849 127.324 333.069C105.818 305.451 93 270.7 93 233ZM75.6863 78.6863C81.9347 72.4379 92.0653 72.4379 98.3137 78.6863L118.82 99.1924C125.068 105.441 125.068 115.571 118.82 121.82C112.571 128.068 102.441 128.068 96.1924 121.82L75.6863 101.314C69.4379 95.0653 69.4379 84.9347 75.6863 78.6863ZM437.314 78.6863C443.562 84.9347 443.562 95.0653 437.314 101.314L416.808 121.82C410.559 128.068 400.429 128.068 394.18 121.82C387.932 115.571 387.932 105.441 394.18 99.1924L414.686 78.6863C420.935 72.4379 431.065 72.4379 437.314 78.6863ZM19 249C19 240.163 26.1634 233 35 233H64C72.8366 233 80 240.163 80 249C80 257.837 72.8366 265 64 265H35C26.1634 265 19 257.837 19 249ZM432 249C432 240.163 439.163 233 448 233H477C485.837 233 493 240.163 493 249C493 257.837 485.837 265 477 265H448C439.163 265 432 257.837 432 249ZM118.82 361.686C125.068 367.935 125.068 378.065 118.82 384.314L98.3137 404.82C92.0653 411.068 81.9347 411.068 75.6863 404.82C69.4379 398.571 69.4379 388.441 75.6863 382.192L96.1924 361.686C102.441 355.438 112.571 355.438 118.82 361.686ZM394.18 361.686C400.429 355.438 410.559 355.438 416.808 361.686L437.314 382.192C443.562 388.441 443.562 398.571 437.314 404.82C431.065 411.068 420.935 411.068 414.686 404.82L394.18 384.314C387.932 378.065 387.932 367.935 394.18 361.686Z" fill="black"/>
+</svg>
diff --git a/app/assets/icons/menu-text-sign.svg b/app/assets/icons/menu-text-sign.svg
new file mode 100644
index 0000000000..17aed6e7ce
--- /dev/null
+++ b/app/assets/icons/menu-text-sign.svg
@@ -0,0 +1,3 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 60C0 26.8629 26.8629 0 60 0H324C357.137 0 384 26.8629 384 60V260C384 268.837 376.837 276 368 276C359.163 276 352 268.837 352 260V60C352 44.536 339.464 32 324 32H60C44.536 32 32 44.536 32 60V452C32 467.464 44.536 480 60 480H232C240.837 480 248 487.163 248 496C248 504.837 240.837 512 232 512H60C26.8629 512 0 485.137 0 452V60ZM60 128C60 119.163 67.1634 112 76 112H296C304.837 112 312 119.163 312 128C312 136.837 304.837 144 296 144H76C67.1634 144 60 136.837 60 128ZM60 208C60 199.163 67.1634 192 76 192H296C304.837 192 312 199.163 312 208C312 216.837 304.837 224 296 224H76C67.1634 224 60 216.837 60 208ZM408.471 283.314C427.216 264.569 457.608 264.569 476.353 283.314C495.098 302.059 495.098 332.451 476.353 351.196L371.701 455.848C369.87 457.679 367.622 459.038 365.15 459.809L299.39 480.315C293.711 482.086 287.519 480.56 283.313 476.354C279.107 472.148 277.581 465.956 279.352 460.277L299.858 394.516C300.629 392.044 301.988 389.796 303.819 387.966L408.471 283.314ZM453.725 305.941C447.477 299.693 437.346 299.693 431.098 305.941L419.431 317.608L442.058 340.236L453.725 328.569C459.974 322.32 459.974 312.19 453.725 305.941ZM419.431 362.863L396.803 340.236L329.234 407.806L318.981 440.686L351.861 430.433L419.431 362.863ZM60 288C60 279.163 67.1634 272 76 272H296C304.837 272 312 279.163 312 288C312 296.837 304.837 304 296 304H76C67.1634 304 60 296.837 60 288Z" fill="black"/>
+</svg>
diff --git a/app/assets/icons/menu-text.svg b/app/assets/icons/menu-text.svg
new file mode 100644
index 0000000000..dbb35bbe73
--- /dev/null
+++ b/app/assets/icons/menu-text.svg
@@ -0,0 +1,3 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M360 33.1837C360 24.3472 367.164 17.1837 376 17.1837L486.368 17.1837C495.204 17.1837 502.368 24.3472 502.368 33.1837V143.551C502.368 152.388 495.204 159.551 486.368 159.551C477.531 159.551 470.368 152.388 470.368 143.551V71.8112L335.365 206.814C329.784 212.394 320.968 213.072 314.6 208.41L182.611 111.777L40.2115 229.818C33.4084 235.458 23.3218 234.514 17.6824 227.711C12.043 220.908 12.9863 210.821 19.7894 205.182L171.789 79.182C177.434 74.5029 185.536 74.2591 191.452 78.5902L322.436 174.488L447.74 49.1837L376 49.1837C367.164 49.1837 360 42.0203 360 33.1837ZM200 186C208.837 186 216 193.163 216 202V492C216 500.837 208.837 508 200 508C191.164 508 184 500.837 184 492V202C184 193.163 191.164 186 200 186ZM440 186C448.837 186 456 193.163 456 202V492C456 500.837 448.837 508 440 508C431.164 508 424 500.837 424 492V202C424 193.163 431.164 186 440 186ZM80.0002 256C88.8368 256 96.0002 263.163 96.0002 272V492C96.0002 500.837 88.8368 508 80.0002 508C71.1637 508 64.0002 500.837 64.0002 492V272C64.0002 263.163 71.1637 256 80.0002 256ZM320 256C328.837 256 336 263.163 336 272V492C336 500.837 328.837 508 320 508C311.164 508 304 500.837 304 492V272C304 263.163 311.164 256 320 256Z" fill="black"/>
+</svg>
diff --git a/app/assets/icons/menu-thumbs-up.svg b/app/assets/icons/menu-thumbs-up.svg
new file mode 100644
index 0000000000..a91932d92d
--- /dev/null
+++ b/app/assets/icons/menu-thumbs-up.svg
@@ -0,0 +1,3 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M209.777 76.7204C219.386 55.005 240.899 41 264.645 41H277.827C312.606 41 340.1 70.4759 337.682 105.171L332.601 178.083C332.359 181.552 335.109 184.5 338.586 184.5H408.294C447.898 184.5 476.637 222.192 466.153 260.383L420.31 427.383C413.158 453.439 389.471 471.5 362.451 471.5H90C56.8629 471.5 30 444.637 30 411.5V244.5C30 211.363 56.8629 184.5 90 184.5H143.855C154.937 184.5 164.976 177.964 169.46 167.83L209.777 76.7204ZM264.645 73C253.563 73 243.524 79.5357 239.04 89.6695L198.723 180.78C189.54 201.532 169.486 215.243 147 216.418V439.5H362.451C375.06 439.5 386.114 431.072 389.452 418.912L435.295 251.912C440.187 234.09 426.776 216.5 408.294 216.5H338.586C316.56 216.5 299.147 197.832 300.678 175.858L305.759 102.947C306.888 86.7554 294.057 73 277.827 73H264.645ZM115 439.5V216.5H90C74.536 216.5 62 229.036 62 244.5V411.5C62 426.964 74.536 439.5 90 439.5H115Z" fill="black"/>
+</svg>
diff --git a/app/assets/icons/menu-trade.svg b/app/assets/icons/menu-trade.svg
new file mode 100644
index 0000000000..7f5c598b3e
--- /dev/null
+++ b/app/assets/icons/menu-trade.svg
@@ -0,0 +1,3 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M98.4799 30C107.316 30 114.48 37.1634 114.48 46V82.479H124.719C148.047 82.479 166.958 101.39 166.958 124.719V203.437C166.958 226.766 148.047 245.677 124.719 245.677H114.48V465.833C114.48 474.669 107.316 481.833 98.4799 481.833C89.6434 481.833 82.4799 474.669 82.4799 465.833V245.677H72.2396C48.9113 245.677 30 226.766 30 203.437V124.719C30 101.39 48.9113 82.479 72.2396 82.479H82.4799V46C82.4799 37.1634 89.6434 30 98.4799 30ZM98.4208 114.479H72.2396C66.5844 114.479 62 119.063 62 124.719V203.437C62 209.092 66.5844 213.677 72.2396 213.677H98.4208C98.4405 213.677 98.4602 213.677 98.4799 213.677C98.4996 213.677 98.5193 213.677 98.539 213.677H124.719C130.374 213.677 134.958 209.092 134.958 203.437V124.719C134.958 119.063 130.374 114.479 124.719 114.479H98.539C98.5193 114.479 98.4996 114.479 98.4799 114.479C98.4602 114.479 98.4405 114.479 98.4208 114.479ZM255.918 30C264.754 30 271.918 37.1634 271.918 46V292.395H282.156C305.484 292.395 324.395 311.307 324.395 334.635V413.354C324.395 436.682 305.484 455.593 282.156 455.593H271.918V465.833C271.918 474.67 264.754 481.833 255.918 481.833C247.081 481.833 239.918 474.67 239.918 465.833V455.593H229.677C206.348 455.593 187.437 436.682 187.437 413.354V334.635C187.437 311.307 206.348 292.395 229.677 292.395H239.918V46C239.918 37.1634 247.081 30 255.918 30ZM255.84 324.395H229.677C224.022 324.395 219.437 328.98 219.437 334.635V413.354C219.437 419.009 224.022 423.593 229.677 423.593H282.156C287.811 423.593 292.395 419.009 292.395 413.354V334.635C292.395 328.98 287.811 324.395 282.156 324.395H255.995C255.969 324.396 255.943 324.396 255.918 324.396C255.892 324.396 255.866 324.396 255.84 324.395ZM413.355 30C422.191 30 429.355 37.1634 429.355 46V56.2393H439.594C462.922 56.2393 481.833 75.1506 481.833 98.4789V203.437C481.833 226.765 462.922 245.677 439.594 245.677H429.355V465.833C429.355 474.669 422.191 481.833 413.355 481.833C404.518 481.833 397.355 474.669 397.355 465.833V245.677H387.114C363.786 245.677 344.875 226.765 344.875 203.437V98.4789C344.875 75.1506 363.786 56.2393 387.114 56.2393H397.355V46C397.355 37.1634 404.518 30 413.355 30ZM413.265 88.2393H387.114C381.459 88.2393 376.875 92.8237 376.875 98.4789V203.437C376.875 209.092 381.459 213.677 387.114 213.677H439.594C445.249 213.677 449.833 209.092 449.833 203.437V98.4789C449.833 92.8237 445.249 88.2393 439.594 88.2393H413.444C413.414 88.2395 413.385 88.2396 413.355 88.2396C413.325 88.2396 413.295 88.2395 413.265 88.2393Z" fill="black"/>
+</svg>
diff --git a/app/assets/icons/menu-transfer.svg b/app/assets/icons/menu-transfer.svg
new file mode 100644
index 0000000000..b4d494e118
--- /dev/null
+++ b/app/assets/icons/menu-transfer.svg
@@ -0,0 +1,3 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M121.035 71.5867C96.8691 58.8753 70.6597 84.7379 83.048 109.071L149.706 240H322.949C331.785 240 338.949 247.163 338.949 256C338.949 264.837 331.785 272 322.949 272H149.706L83.048 402.929C70.6597 427.262 96.8691 453.125 121.035 440.413L424.519 280.781C444.472 270.285 444.472 241.715 424.519 231.219L121.035 71.5867ZM121.943 256L54.5311 123.589C27.9846 71.4468 84.1476 16.027 135.932 43.2656L439.416 202.898C482.173 225.389 482.174 286.611 439.416 309.102L135.932 468.734C84.1477 495.973 27.9846 440.553 54.5311 388.41L121.943 256Z" fill="black"/>
+</svg>
diff --git a/app/assets/icons/menu-user.svg b/app/assets/icons/menu-user.svg
new file mode 100644
index 0000000000..5197168653
--- /dev/null
+++ b/app/assets/icons/menu-user.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generated by IcoMoon.io -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="20" height="20" viewBox="0 0 20 20">
+<path fill="#000000" d="M9.5 11c-3.033 0-5.5-2.467-5.5-5.5s2.467-5.5 5.5-5.5 5.5 2.467 5.5 5.5-2.467 5.5-5.5 5.5zM9.5 1c-2.481 0-4.5 2.019-4.5 4.5s2.019 4.5 4.5 4.5c2.481 0 4.5-2.019 4.5-4.5s-2.019-4.5-4.5-4.5z"></path>
+<path fill="#000000" d="M17.5 20h-16c-0.827 0-1.5-0.673-1.5-1.5 0-0.068 0.014-1.685 1.225-3.3 0.705-0.94 1.67-1.687 2.869-2.219 1.464-0.651 3.283-0.981 5.406-0.981s3.942 0.33 5.406 0.981c1.199 0.533 2.164 1.279 2.869 2.219 1.211 1.615 1.225 3.232 1.225 3.3 0 0.827-0.673 1.5-1.5 1.5zM9.5 13c-3.487 0-6.060 0.953-7.441 2.756-1.035 1.351-1.058 2.732-1.059 2.746 0 0.274 0.224 0.498 0.5 0.498h16c0.276 0 0.5-0.224 0.5-0.5-0-0.012-0.023-1.393-1.059-2.744-1.382-1.803-3.955-2.756-7.441-2.756z"></path>
+</svg>
diff --git a/app/assets/icons/menu-volume_ranking.svg b/app/assets/icons/menu-volume_ranking.svg
new file mode 100644
index 0000000000..0c7ec50527
--- /dev/null
+++ b/app/assets/icons/menu-volume_ranking.svg
@@ -0,0 +1,3 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M178 65C178 31.8629 204.863 5 238 5H447C480.137 5 507 31.8629 507 65V194C507 227.137 480.137 254 447 254H282.714C274.918 254 267.475 257.25 262.176 262.968L243.873 282.72C220.385 308.067 178 291.448 178 256.892V65ZM238 37C222.536 37 210 49.536 210 65V256.892C210 262.348 216.692 264.972 220.401 260.97L238.704 241.218C250.059 228.965 266.008 222 282.714 222H447C462.464 222 475 209.464 475 194V65C475 49.536 462.464 37 447 37H238ZM74 74C58.536 74 46 86.536 46 102V442C46 457.464 58.536 470 74 470H273C288.464 470 301 457.464 301 442V290C301 281.163 308.163 274 317 274C325.837 274 333 281.163 333 290V442C333 475.137 306.137 502 273 502H74C40.8629 502 14 475.137 14 442V102C14 68.8629 40.8629 42 74 42H146C154.837 42 162 49.1634 162 58C162 66.8366 154.837 74 146 74H74ZM447.658 68.0414C453.71 74.48 453.397 84.6058 446.959 90.658L371.959 161.158C366.852 165.958 359.216 166.876 353.117 163.423L298.154 132.304L263.375 185.281C258.526 192.668 248.606 194.725 241.219 189.875C233.832 185.026 231.775 175.106 236.625 167.719L279.625 102.219C284.25 95.1734 293.549 92.9241 300.883 97.0767L358.628 129.771L425.041 67.342C431.48 61.2897 441.606 61.6029 447.658 68.0414ZM114 422.5C114 413.663 121.163 406.5 130 406.5H217.5C226.337 406.5 233.5 413.663 233.5 422.5C233.5 431.337 226.337 438.5 217.5 438.5H130C121.163 438.5 114 431.337 114 422.5Z" fill="black"/>
+</svg>
diff --git a/app/assets/icons/menu-warning.svg b/app/assets/icons/menu-warning.svg
new file mode 100644
index 0000000000..ce9dd70baa
--- /dev/null
+++ b/app/assets/icons/menu-warning.svg
@@ -0,0 +1,4 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M256.355 190.244C265.192 190.244 272.355 197.408 272.355 206.244V296.062C272.355 304.899 265.192 312.062 256.355 312.062C247.519 312.062 240.355 304.899 240.355 296.062V206.244C240.355 197.408 247.519 190.244 256.355 190.244ZM256.355 339.698C265.192 339.698 272.355 346.861 272.355 355.698V355.947C272.355 364.783 265.192 371.947 256.355 371.947C247.519 371.947 240.355 364.783 240.355 355.947V355.698C240.355 346.861 247.519 339.698 256.355 339.698Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M222.679 49.1204C232.807 43.1493 244.349 40 256.106 40C267.863 40 279.406 43.1493 289.533 49.1204C299.612 55.0626 307.924 63.5835 313.614 73.8046L490.393 378.811C490.77 379.461 491.1 380.137 491.382 380.834C495.409 390.788 496.94 401.578 495.84 412.26C494.739 422.942 491.042 433.193 485.07 442.118C479.099 451.043 471.034 458.371 461.579 463.464C452.125 468.556 441.568 471.258 430.83 471.333C430.792 471.333 430.755 471.333 430.717 471.333H81.9928C81.5333 471.333 81.0784 471.314 80.6287 471.276C79.907 471.337 79.1727 471.35 78.429 471.312C67.9442 470.772 57.7407 467.731 48.6704 462.443C39.6002 457.156 31.9265 449.775 26.2899 440.918C20.6533 432.06 17.2174 421.983 16.2691 411.527C15.3207 401.071 16.8875 390.54 20.8385 380.813C21.1185 380.123 21.4462 379.454 21.8193 378.811L198.598 73.8046C204.288 63.5835 212.6 55.0626 222.679 49.1204ZM80.6185 439.392C81.0715 439.353 81.5298 439.333 81.9928 439.333H430.656C436.156 439.286 441.562 437.899 446.405 435.29C451.263 432.674 455.406 428.909 458.475 424.323C461.543 419.737 463.443 414.47 464.008 408.981C464.538 403.831 463.879 398.633 462.086 393.786L285.854 89.7231C285.8 89.6312 285.748 89.5388 285.697 89.4458C282.772 84.1601 278.485 79.7542 273.281 76.6861C268.078 73.6181 262.147 72 256.106 72C250.065 72 244.135 73.6181 238.931 76.6861C233.727 79.7542 229.44 84.1601 226.515 89.4458C226.464 89.5388 226.412 89.6312 226.358 89.7231L50.1199 393.797C48.3605 398.529 47.6814 403.6 48.1383 408.636C48.6255 414.009 50.3909 419.187 53.287 423.738C56.1832 428.289 60.126 432.081 64.7864 434.798C69.4467 437.514 74.6893 439.077 80.0766 439.355C80.2581 439.364 80.4388 439.376 80.6185 439.392Z" fill="black"/>
+</svg>
diff --git a/app/assets/icons/prediction.svg b/app/assets/icons/prediction.svg
index da17871a48..bc90b112f6 100644
--- a/app/assets/icons/prediction.svg
+++ b/app/assets/icons/prediction.svg
@@ -1,96 +1,46 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="93mm"
-   height="93mm"
-   viewBox="0 0 93 93"
-   version="1.1"
-   id="svg8"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <defs
-     id="defs2">
-    <linearGradient
-       id="linearGradient-1"
-       y2="720.01819"
-       x2="699.64471"
-       y1="83.421288"
-       x1="699.64471"
-       gradientTransform="matrix(0.78148328,0,0,1.2796179,904.71904,-1936.9488)"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop4595"
-         offset="0%"
-         stop-color="#00A9E0" />
-      <stop
-         id="stop4597"
-         offset="100%"
-         stop-color="#00587C" />
-    </linearGradient>
-  </defs>
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     transform="translate(0,-204)">
-    <path
-       style="stroke-width:0.2431266"
-       d="m 47.219377,292.50721 c -8.528596,-0.72414 -14.039973,-1.92691 -17.211266,-3.7561 -1.718606,-0.99129 -2.236799,-1.88176 -2.237954,-3.84576 l -9.09e-4,-1.54472 0.854225,0.75002 c 1.064899,0.93499 1.94988,1.39619 4.049312,2.11025 8.875121,3.01862 27.861929,3.29663 38.24641,0.56001 2.592576,-0.68323 5.73746,-2.1573 6.400284,-2.99994 l 0.533846,-0.67867 v 1.63637 c 0,1.97653 -0.358731,2.67511 -1.910575,3.72067 -2.240325,1.50941 -7.02048,2.83666 -12.920146,3.58739 -2.870695,0.36529 -13.333639,0.67017 -15.803227,0.46048 z"
-       id="path3744" />
-    <path
-       style="stroke-width:0.2431266"
-       d="m 45.639053,286.66471 c -6.723108,-0.6633 -11.604293,-1.68871 -14.145868,-2.9717 -2.02992,-1.02469 -2.508305,-1.68536 -2.508305,-3.46401 0,-1.30766 0.361483,-2.65305 0.71283,-2.65305 0.08169,0 0.891696,0.54181 1.800015,1.20401 3.643084,2.65594 8.603279,3.62964 19.490115,3.82595 7.377477,0.13303 11.604892,-0.16049 16.407837,-1.13927 3.263302,-0.66502 5.029206,-1.40449 6.939965,-2.9061 l 1.560776,-1.22656 0.37064,0.71672 c 0.5593,1.08158 0.489519,3.4417 -0.12486,4.22275 -1.174387,1.493 -6.190646,3.12041 -12.147081,3.94083 -2.891571,0.39829 -15.699122,0.71256 -18.356064,0.45043 z"
-       id="path3742" />
-    <path
-       style="stroke-width:0.26458332"
-       id="path3740"
-       d="m 42.990234,208.27734 c -5.646256,0.2003 -11.235797,1.58388 -16.326172,4.14258 -7.454977,3.74727 -13.891817,10.20378 -17.6289058,17.68164 -2.7147289,5.43215 -3.9200358,10.30628 -4.1503906,16.76172 -0.1585394,4.44289 0.00357,5.88877 1.2617188,11.16797 1.7240301,7.23405 6.5138856,14.89985 12.4433596,19.94922 2.897603,2.46751 4.880261,3.61999 7.539062,4.34961 0.789568,0.21667 1.405872,0.37488 1.869141,0.47461 0.231634,0.0499 0.422897,0.0843 0.595703,0.10547 0.172806,0.0212 0.280708,0.073 0.603516,-0.0254 0.161403,-0.0492 0.509369,-0.24798 0.591796,-0.63477 0.08243,-0.38679 -0.08667,-0.60202 -0.169921,-0.71094 -0.166512,-0.21783 -0.276733,-0.27026 -0.423829,-0.36718 -0.294191,-0.19386 -0.703261,-0.4129 -1.273437,-0.70118 -7.035713,-3.55713 -12.634402,-9.2044 -16.201172,-16.33984 -1.212332,-2.42532 -2.7612188,-6.90776 -3.1953124,-9.21875 -2.3464464,-12.49184 1.7051544,-24.95348 10.9609374,-33.71484 6.403066,-6.06105 14.451472,-9.4359 23.494141,-9.83789 6.961582,-0.30948 13.427828,1.25757 19.52539,4.73242 0.929375,0.52962 1.47532,0.83617 1.990235,1.0039 0.514915,0.16773 1.119527,0.076 1.480468,-0.11718 0.213771,-0.11441 0.400576,-0.23964 0.566407,-0.38282 0.08291,-0.0716 0.161616,-0.14678 0.242187,-0.25195 0.08057,-0.10517 0.212891,-0.22557 0.212891,-0.58789 0,-0.42307 -0.162442,-0.5185 -0.244141,-0.61328 -0.0817,-0.0948 -0.154594,-0.15921 -0.236328,-0.22656 -0.163467,-0.13471 -0.357273,-0.26918 -0.591797,-0.42188 -0.469047,-0.30539 -1.09447,-0.67201 -1.800781,-1.06055 -1.412622,-0.77706 -3.134853,-1.63551 -4.470703,-2.18554 -5.314481,-2.18823 -11.017783,-3.17099 -16.664063,-2.97071 z"
-       transform="matrix(0.91890375,0,0,0.91890375,11.920319,19.975702)" />
-    <path
-       style="stroke-width:0.26458332"
-       id="path3738"
-       d="m 75.210938,223.20898 c -0.32923,-0.0879 -0.704294,0.0344 -0.892579,0.15235 -0.188285,0.11794 -0.298356,0.22685 -0.429687,0.3457 -0.134094,0.12135 -0.31197,0.24626 -0.466797,0.55469 -0.154827,0.30843 -0.138844,0.74398 -0.03711,1.03125 0.203469,0.57454 0.573569,1.04336 1.289062,2.08203 2.56035,3.71686 4.768926,9.01368 5.707031,13.70117 0.727021,3.6327 1.097958,9.32775 -0.349609,15.99219 -0.364784,1.24647 -0.332937,1.1604 -0.808594,2.32812 a 0.83812499,0.83812499 0 0 0 -0.01953,0.0508 c -2.929636,8.7698 -9.284469,16.12607 -17.576172,20.62304 -1.116718,0.60563 -1.666141,0.88578 -2.060547,1.20313 -0.0986,0.0793 -0.243856,0.0763 -0.371094,0.52344 -0.06362,0.22358 0.02842,0.66995 0.236329,0.86718 0.207909,0.19723 0.365114,0.21417 0.466797,0.23242 0.406728,0.073 0.498287,3e-5 0.746093,-0.041 2.84207,-0.47073 5.400239,-1.52589 7.585938,-3.14649 6.900595,-5.11648 11.979004,-12.53156 14.378906,-20.9746 1.152268,-4.05383 1.467051,-6.41772 1.458984,-10.94532 -0.01018,-6.02282 -1.120375,-11.18827 -3.566406,-16.56054 -0.952809,-2.09266 -3.08113,-5.71179 -4.226562,-7.11719 -0.317779,-0.3899 -0.408735,-0.72732 -1.064453,-0.90235 z"
-       transform="matrix(0.91890375,0,0,0.91890375,11.920319,19.975702)" />
-    <path
-       style="stroke-width:0.2431266"
-       d="m 65.959488,275.81577 c 2.618012,-1.94898 6.026106,-5.38931 7.882255,-7.9568 0.802313,-1.1098 1.622867,-2.22081 1.823445,-2.46892 0.306133,-0.37867 3.600238,-1.31377 3.827492,-1.08651 0.03547,0.0355 -0.500445,0.87549 -1.190946,1.8667 -1.828425,2.6247 -5.528244,6.2234 -8.228452,8.00356 -1.95177,1.28674 -5.511851,3.15902 -6.006791,3.15902 -0.07967,0 0.772201,-0.68267 1.892997,-1.51705 z"
-       id="path3736" />
-    <path
-       style="stroke-width:0.2431266"
-       d="m 78.117559,260.61786 c 0.269532,-0.63516 0.699037,-1.56036 0.954447,-2.05599 0.556681,-1.08027 1.841198,-6.41751 2.217562,-9.21407 0.160285,-1.19106 0.217073,-3.68977 0.139885,-6.1561 -0.136751,-4.36998 -0.625479,-7.36773 -1.74702,-10.71575 -0.313557,-0.93603 -0.532027,-1.74059 -0.485493,-1.78791 0.0465,-0.0473 0.744284,1.26556 1.550558,2.91752 3.568002,7.31039 4.305735,14.38872 2.328778,22.34399 -0.184397,0.74199 -0.467143,1.67195 -0.628319,2.06658 -0.161185,0.39462 -0.317638,0.82691 -0.347667,0.96063 -0.03005,0.13372 -0.221805,0.64231 -0.426188,1.1302 -0.348154,0.83114 -0.479539,0.91162 -2.083394,1.27641 -0.94149,0.21414 -1.768375,0.38935 -1.837513,0.38935 -0.0691,0 0.09482,-0.51969 0.364364,-1.15486 z"
-       id="path3734" />
-    <path
-       style="stroke-width:0.2431266"
-       d="m 22.432731,256.99668 c -0.906955,-3.00183 -1.243085,-5.02105 -1.390459,-8.3528 -0.275985,-6.23936 1.056135,-11.89203 4.015356,-17.0386 1.579212,-2.74651 1.440012,-2.63558 3.528762,-2.81214 1.021488,-0.0864 1.857251,-0.0813 1.857251,0.0112 0,0.0925 -0.533471,0.95878 -1.185491,1.92503 -1.540304,2.28263 -3.423302,6.05056 -4.384018,8.77254 -1.679145,4.75748 -2.529319,11.91602 -1.977693,16.65235 0.146254,1.25575 0.215061,2.33404 0.152905,2.39619 -0.06215,0.0621 -0.339633,-0.63705 -0.616613,-1.55381 z"
-       id="path3732" />
-    <path
-       style="stroke-width:0.2431266"
-       d="m 61.506289,234.66409 c -0.08571,-0.26743 -0.228933,-1.21504 -0.31828,-2.10581 -0.280103,-2.79253 -1.414948,-3.93454 -4.20696,-4.23355 -2.784332,-0.29817 -3.035771,-0.49384 -0.88755,-0.69069 2.148431,-0.19688 3.656563,-0.79882 4.327889,-1.72741 0.240827,-0.33312 0.546448,-1.28885 0.679167,-2.12383 0.542896,-3.41566 0.516476,-3.38552 0.833194,-0.95059 0.455095,3.49876 1.267187,4.30988 4.767053,4.76134 2.446526,0.3156 2.410753,0.34687 -0.88224,0.77139 -1.50872,0.19451 -2.682528,0.88299 -3.214729,1.88557 -0.223842,0.42168 -0.5273,1.69665 -0.67435,2.83326 -0.164415,1.27085 -0.327368,1.87935 -0.423194,1.58032 z"
-       id="path3730" />
-    <path
-       style="stroke-width:0.2431266"
-       d="m 76.088083,230.39671 c -0.436635,-3.52233 -0.747868,-4.47561 -1.848623,-5.66229 -1.113683,-1.20061 -2.290992,-1.61941 -5.909856,-2.10231 -1.874885,-0.25019 -3.449555,-0.49556 -3.499259,-0.54526 -0.04971,-0.0497 1.462344,-0.27832 3.360128,-0.50802 6.235424,-0.75469 7.274226,-1.84316 7.988646,-8.37066 0.164649,-1.50434 0.366918,-2.73517 0.449491,-2.73517 0.08261,0 0.288545,1.23083 0.457715,2.73517 0.442406,3.9341 0.829485,5.12016 2.078708,6.36938 1.292612,1.29261 1.914104,1.50059 6.135924,2.05331 3.713787,0.48621 3.72054,0.47918 -1.075742,1.119 -2.920837,0.38964 -4.143613,0.85728 -5.189279,1.98456 -1.131943,1.2203 -1.461691,2.22676 -1.871054,5.71086 -0.217642,1.85233 -0.453662,3.36787 -0.524492,3.36787 -0.07085,0 -0.319374,-1.5374 -0.552307,-3.41644 z"
-       id="path3728" />
-    <path
-       style="stroke-width:0.2431266"
-       d="m 29.580263,225.49083 c 1.10791,-1.58177 5.909273,-5.14006 9.087989,-6.73511 1.695184,-0.85062 5.932931,-2.31873 7.457055,-2.5834 0.756129,-0.1313 0.323376,0.16136 -1.945012,1.3154 -3.413825,1.73675 -6.403375,3.8333 -9.378727,6.57723 l -2.134135,1.96816 h -1.733499 -1.733499 z"
-       id="path3724" />
-    <path
-       id="path3777"
-       style="fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.04392926;stroke-opacity:1"
-       d="m 16.018151,284.37863 c -0.406106,0.27234 -0.865361,0.46963 -1.359277,0.57137 v 7.23686 c 2.445109,-0.17269 4.669537,-1.1574 6.411632,-2.69002 z m -4.143429,0 -5.0523543,5.11821 c 1.742089,1.53288 3.9665233,2.51733 6.4116323,2.69002 V 284.95 c -0.493911,-0.10178 -0.953172,-0.29903 -1.359278,-0.57137 z m 5.837791,-2.48146 c -0.09953,0.50357 -0.29328,0.97215 -0.560395,1.3859 l 5.0197,5.15117 c 1.503408,-1.7761 2.469058,-4.04395 2.638692,-6.53707 z m -14.6301553,0 c 0.169638,2.49312 1.135278,4.76097 2.6386981,6.53707 l 5.0197002,-5.15089 c -0.267116,-0.41403 -0.460868,-0.88261 -0.560396,-1.38618 z m 19.0894603,-8.05028 -5.0197,5.15088 c 0.267115,0.41404 0.460863,0.8826 0.560395,1.38618 h 7.097997 c -0.169634,-2.49294 -1.135284,-4.76089 -2.638692,-6.53706 z M 3.0016787,271.12313 v 9.26082 h 7.0999203 c 0.09918,-0.50233 0.292303,-0.9696 0.558472,-1.38261 z m 11.6571953,-1.15016 v 7.23658 c 0.493916,0.10177 0.953171,0.29931 1.359277,0.57164 l 5.052355,-5.11793 c -1.742095,-1.53283 -3.966523,-2.51761 -6.411632,-2.69029 z M 3.0230797,256.4754 v 12.4042 l 8.7457113,8.96197 c 0.402244,-0.27254 0.857156,-0.4701 1.346383,-0.57164 v -11.61741 z" />
-  </g>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 264 264" style="enable-background:new 0 0 264 264;" xml:space="preserve">
+<path d="M135.2,251.5c-24.2-2.1-39.8-5.5-48.8-10.6c-4.9-2.8-6.3-5.3-6.3-10.9v-4.4l2.4,2.1c3,2.7,5.5,4,11.5,6
+	c25.2,8.6,79,9.3,108.4,1.6c7.3-1.9,16.3-6.1,18.1-8.5l1.5-1.9v4.6c0,5.6-1,7.6-5.4,10.5c-6.4,4.3-19.9,8-36.6,10.2
+	C171.9,251.3,142.2,252.1,135.2,251.5z"/>
+<path d="M130.8,235c-19.1-1.9-32.9-4.8-40.1-8.4c-5.8-2.9-7.1-4.8-7.1-9.8c0-3.7,1-7.5,2-7.5c0.2,0,2.5,1.5,5.1,3.4
+	c10.3,7.5,24.4,10.3,55.2,10.8c20.9,0.4,32.9-0.5,46.5-3.2c9.3-1.9,14.3-4,19.7-8.2l4.4-3.5l1.1,2c1.6,3.1,1.4,9.8-0.4,12
+	c-3.3,4.2-17.5,8.8-34.4,11.2C174.6,234.8,138.3,235.7,130.8,235z"/>
+<path d="M147.2,21.5c-14.7,0.5-29.3,4.1-42.5,10.8c-19.4,9.8-36.2,26.6-45.9,46.1c-7.2,14.1-10.3,26.8-10.9,43.6
+	c-0.4,11.6,0,15.3,3.3,29.1c4.5,18.8,17,38.8,32.4,52c7.5,6.4,12.7,9.4,19.6,11.3c2.1,0.6,3.7,1,4.9,1.2c0.6,0.1,1.1,0.2,1.6,0.3
+	c0.5,0.1,0.7,0.2,1.6-0.1c0.4-0.1,1.3-0.6,1.5-1.7c0.2-1-0.2-1.6-0.4-1.9c-0.4-0.6-0.7-0.7-1.1-1c-0.8-0.5-1.8-1.1-3.3-1.8
+	c-18.3-9.3-32.9-24-42.2-42.6c-3.2-6.3-7.2-18-8.3-24c-6.1-32.5,4.4-65,28.6-87.8c16.7-15.8,37.6-24.6,61.2-25.6
+	c18.1-0.8,35,3.3,50.9,12.3c2.4,1.4,3.8,2.2,5.2,2.6c1.3,0.4,2.9,0.2,3.9-0.3c0.6-0.3,1-0.6,1.5-1c0.2-0.2,0.4-0.4,0.6-0.7
+	c0.2-0.3,0.6-0.6,0.6-1.5c0-1.1-0.4-1.4-0.6-1.6s-0.4-0.4-0.6-0.6c-0.4-0.4-0.9-0.7-1.5-1.1c-1.2-0.8-2.9-1.8-4.7-2.8
+	c-3.7-2-8.2-4.3-11.6-5.7C176.7,23.6,161.9,21,147.2,21.5z"/>
+<path d="M231.1,60.4c-0.9-0.2-1.8,0.1-2.3,0.4s-0.8,0.6-1.1,0.9c-0.3,0.3-0.8,0.6-1.2,1.4c-0.4,0.8-0.4,1.9-0.1,2.7
+	c0.5,1.5,1.5,2.7,3.4,5.4c6.7,9.7,12.4,23.5,14.9,35.7c1.9,9.5,2.9,24.3-0.9,41.7c-1,3.2-0.9,3-2.1,6.1c0,0,0,0.1-0.1,0.1
+	c-7.6,22.8-24.2,42-45.8,53.7c-2.9,1.6-4.3,2.3-5.4,3.1c-0.3,0.2-0.6,0.2-1,1.4c-0.2,0.6,0.1,1.7,0.6,2.3c0.5,0.5,1,0.6,1.2,0.6
+	c1.1,0.2,1.3,0,1.9-0.1c7.4-1.2,14.1-4,19.8-8.2c18-13.3,31.2-32.6,37.5-54.6c3-10.6,3.8-16.7,3.8-28.5c0-15.7-2.9-29.1-9.3-43.1
+	c-2.5-5.5-8-14.9-11-18.5C233,61.7,232.8,60.9,231.1,60.4z"/>
+<path d="M188.4,204.2c7.4-5.5,17.1-15.3,22.3-22.6c2.3-3.1,4.6-6.3,5.2-7c0.9-1.1,10.2-3.7,10.8-3.1c0.1,0.1-1.4,2.5-3.4,5.3
+	c-5.2,7.4-15.7,17.6-23.3,22.7c-5.5,3.6-15.6,9-17,9C182.8,208.5,185.2,206.6,188.4,204.2z"/>
+<path d="M222.8,161.1c0.8-1.8,2-4.4,2.7-5.8c1.6-3.1,5.2-18.2,6.3-26.1c0.5-3.4,0.6-10.5,0.4-17.5c-0.4-12.4-1.8-20.9-5-30.4
+	c-0.9-2.7-1.5-4.9-1.4-5.1c0.1-0.1,2.1,3.6,4.4,8.3c10.1,20.7,12.2,40.8,6.6,63.3c-0.5,2.1-1.3,4.7-1.8,5.9c-0.5,1.1-0.9,2.3-1,2.7
+	c-0.1,0.4-0.6,1.8-1.2,3.2c-1,2.4-1.4,2.6-5.9,3.6c-2.7,0.6-5,1.1-5.2,1.1C221.6,164.4,222.1,162.9,222.8,161.1z"/>
+<path d="M65,150.9c-2.6-8.5-3.5-14.2-3.9-23.7c-0.8-17.7,3-33.7,11.4-48.3c4.5-7.8,4.1-7.5,10-8c2.9-0.2,5.3-0.2,5.3,0
+	c0,0.3-1.5,2.7-3.4,5.5C80,82.9,74.7,93.6,72,101.3c-4.8,13.5-7.2,33.8-5.6,47.2c0.4,3.6,0.6,6.6,0.4,6.8S65.8,153.5,65,150.9z"/>
+<path d="M175.7,87.6c-0.2-0.8-0.6-3.4-0.9-6c-0.8-7.9-4-11.2-11.9-12c-7.9-0.8-8.6-1.4-2.5-2c6.1-0.6,10.4-2.3,12.3-4.9
+	c0.7-0.9,1.5-3.7,1.9-6c1.5-9.7,1.5-9.6,2.4-2.7c1.3,9.9,3.6,12.2,13.5,13.5c6.9,0.9,6.8,1-2.5,2.2c-4.3,0.6-7.6,2.5-9.1,5.3
+	c-0.6,1.2-1.5,4.8-1.9,8C176.5,86.7,176,88.4,175.7,87.6z"/>
+<path d="M217.1,75.5c-1.2-10-2.1-12.7-5.2-16.1c-3.2-3.4-6.5-4.6-16.8-6c-5.3-0.7-9.8-1.4-9.9-1.5c-0.1-0.1,4.1-0.8,9.5-1.4
+	c17.7-2.1,20.6-5.2,22.6-23.7c0.5-4.3,1-7.8,1.3-7.8c0.2,0,0.8,3.5,1.3,7.8c1.3,11.2,2.4,14.5,5.9,18.1c3.7,3.7,5.4,4.3,17.4,5.8
+	c10.5,1.4,10.5,1.4-3,3.2c-8.3,1.1-11.7,2.4-14.7,5.6c-3.2,3.5-4.1,6.3-5.3,16.2c-0.6,5.3-1.3,9.5-1.5,9.5
+	C218.4,85.2,217.7,80.8,217.1,75.5z"/>
+<path d="M85.2,61.6C88.3,57.1,102,47,111,42.5c4.8-2.4,16.8-6.6,21.1-7.3c2.1-0.4,0.9,0.5-5.5,3.7c-9.7,4.9-18.2,10.9-26.6,18.6
+	l-6,5.6h-4.9h-4.9L85.2,61.6z"/>
+<g>
+	<path d="M48.5,165.8c-3.6,0-6.6,2.9-6.6,6.6c0,3.6,2.9,6.6,6.6,6.6c3.6,0,6.6-2.9,6.6-6.6C55,168.8,52.1,165.8,48.5,165.8z"/>
+	<path d="M36.1,210.5l0.1-0.1c7.1-3,12-10,12-18.1c0-10.9-8.8-19.7-19.7-19.7c-10.9,0-19.7,8.8-19.7,19.7c0,5.3,2.1,10.1,5.5,13.6
+		l19,21.2c1.1,1.2,1.8,2.8,1.8,4.5c0,3.6-2.9,6.6-6.6,6.6s-6.6-2.9-6.6-6.6c0-1.9,0.8-3.6,2.1-4.8l-8.7-9.8c-4,3.6-6.5,8.8-6.5,14.6
+		c0,10.9,8.8,19.7,19.7,19.7c10.9,0,19.7-8.8,19.7-19.7c0-5.4-2.1-10.2-5.6-13.8L36.1,210.5z M28.6,198.9c-3.6,0-6.6-2.9-6.6-6.6
+		c0-3.6,2.9-6.6,6.6-6.6c3.6,0,6.6,2.9,6.6,6.6C35.1,195.9,32.2,198.9,28.6,198.9z"/>
+</g>
 </svg>
diff --git a/app/assets/icons/qr-scan.svg b/app/assets/icons/qr-scan.svg
new file mode 100644
index 0000000000..664fd399e1
--- /dev/null
+++ b/app/assets/icons/qr-scan.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="240"
+   height="240"
+   viewBox="0 0 63.5 63.5"
+   version="1.1"
+   id="svg5"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2" />
+  <path
+     style="stroke-width:0.288731"
+     d="M 5.050155,63.10626 C 2.7107024,62.204877 1.1329136,60.598972 0.34873254,58.321066 -0.13552723,56.914376 -0.10674613,39.845858 0.38095774,39.210643 1.362806,37.931821 2.7881553,37.782488 4.0309536,38.828232 c 0.8883483,0.747498 0.8883483,0.747498 0.8883483,9.109392 0,9.075437 0.082937,9.616045 1.5799571,10.29813 0.5310971,0.241987 3.2446113,0.344946 9.091039,0.344946 8.333973,0 8.333973,0 9.081468,0.88835 1.045745,1.242797 0.896413,2.668145 -0.38241,3.649994 -0.634546,0.487189 -17.9714704,0.47567 -19.2391999,-0.01279 z m 34.203215,0.01949 c -1.280477,-1.00188 -1.428146,-2.41392 -0.382411,-3.656705 0.747499,-0.888344 0.747499,-0.888344 9.109392,-0.888344 9.075438,0 9.616044,-0.08295 10.298131,-1.579958 0.241986,-0.531097 0.344945,-3.244613 0.344945,-9.091041 0,-8.333971 0,-8.333971 0.88835,-9.081469 0.970789,-0.816866 1.599418,-0.917163 2.67549,-0.42687 1.326897,0.604573 1.373737,0.993152 1.284352,10.654501 -0.09321,10.073854 -0.127115,10.270417 -2.114863,12.258166 -1.994626,1.994624 -2.163268,2.023179 -12.405847,2.100458 -7.007716,0.05287 -9.350073,-0.01686 -9.697539,-0.288732 z M 10.942472,52.831932 c -0.681633,-0.551593 -0.681633,-0.551593 -0.772129,-8.878505 -0.09999,-9.200793 0.02622,-10.216326 1.337241,-10.759367 0.570518,-0.236315 3.302208,-0.310795 9.208331,-0.251058 7.784739,0.07874 8.441474,0.125044 9.004485,0.634958 0.592636,0.536745 0.607303,0.768625 0.607303,9.600335 0,8.665329 -0.02457,9.074866 -0.577463,9.627768 -0.552128,0.552127 -0.962439,0.577463 -9.3518,0.577463 -8.206806,0 -8.818423,-0.03567 -9.455968,-0.551594 z M 26.574189,43.27791 c 0,-6.3521 0,-6.3521 -6.207735,-6.3521 -6.207735,0 -6.207735,0 -6.207735,6.3521 0,6.352102 0,6.352102 6.207735,6.352102 6.207735,0 6.207735,0 6.207735,-6.352102 z m -8.675819,2.382039 c -0.0075,-0.0397 -0.02013,-1.144101 -0.02807,-2.454222 -0.01444,-2.382037 -0.01444,-2.382037 2.479377,-2.465629 2.493815,-0.08359 2.493815,-0.08359 2.410225,2.408282 -0.08359,2.491871 -0.08359,2.491871 -2.465742,2.537811 -1.310183,0.02526 -2.388287,0.01346 -2.395786,-0.02625 z m 16.47158,3.970063 c 0,-2.598587 0,-2.598587 2.45422,-2.598587 2.454222,0 2.454222,0 2.454222,2.598587 0,2.598586 0,2.598586 -2.454222,2.598586 -2.45422,0 -2.45422,0 -2.45422,-2.598586 z m 12.704202,0.01123 c 0,-2.609818 0,-2.609818 2.609828,-2.609818 2.60983,0 2.60983,0 2.526403,2.526403 -0.08343,2.526404 -0.08343,2.526404 -2.609828,2.609827 -2.526403,0.08343 -2.526403,0.08343 -2.526403,-2.526403 z m -6.232023,-4.029426 c -0.06604,-0.06615 -0.120078,-1.208098 -0.120078,-2.537636 0,-2.417341 0,-2.417341 2.482407,-2.333915 2.482409,0.08343 2.482409,0.08343 2.481719,2.491142 -5.77e-4,2.407717 -5.77e-4,2.407717 -2.362329,2.45422 -1.2989,0.02558 -2.415675,-0.0076 -2.481719,-0.0738 z M 34.36995,36.781444 c 0,-2.45422 0,-2.45422 2.45422,-2.45422 2.454222,0 2.454222,0 2.454222,2.45422 0,2.454222 0,2.454222 -2.454222,2.454222 -2.45422,0 -2.45422,0 -2.45422,-2.454222 z m 12.704202,0 c 0,-2.45422 0,-2.45422 2.598586,-2.45422 2.598587,0 2.598587,0 2.598587,2.45422 0,2.454222 0,2.454222 -2.598587,2.454222 -2.598586,0 -2.598586,0 -2.598586,-2.454222 z M 11.492816,30.246055 c -1.291176,-0.482159 -1.422394,-1.548019 -1.322473,-10.742211 0.0905,-8.32691 0.0905,-8.32691 0.772129,-8.878505 0.637545,-0.515916 1.249162,-0.551593 9.455968,-0.551593 8.389361,0 8.799672,0.02534 9.3518,0.577464 0.552901,0.5529 0.577463,0.962439 0.577463,9.627767 0,8.831765 -0.01467,9.063588 -0.607315,9.600334 -0.564792,0.51152 -1.196545,0.553932 -9.02287,0.605734 -5.15964,0.03416 -8.720871,-0.05832 -9.204702,-0.23899 z M 26.574189,20.179361 c 0,-6.352101 0,-6.352101 -6.207735,-6.352101 -6.207735,0 -6.207735,0 -6.207735,6.352101 0,6.352101 0,6.352101 6.207735,6.352101 6.207735,0 6.207735,0 6.207735,-6.352101 z m -8.675705,2.454221 c -0.0075,-0.0794 -0.01994,-1.196175 -0.0275,-2.48172 -0.01375,-2.337353 -0.01375,-2.337353 2.395787,-2.338041 2.409537,-6.89e-4 2.409537,-6.89e-4 2.492961,2.481719 0.08343,2.482408 0.08343,2.482408 -2.382038,2.482408 -1.356004,0 -2.471649,-0.06496 -2.47921,-0.144366 z m 16.760197,7.735288 c -0.238203,-0.08759 -0.660474,-0.357323 -0.938379,-0.599418 -0.461109,-0.401693 -0.505279,-1.231309 -0.505279,-9.490475 0,-8.665328 0.02456,-9.074867 0.577463,-9.627767 0.552128,-0.552128 0.962439,-0.577464 9.351801,-0.577464 8.206665,0 8.818434,0.03568 9.455968,0.55157 0.681632,0.551571 0.681632,0.551571 0.774174,8.878505 0.104358,9.390077 -0.01158,10.256726 -1.438413,10.754127 -0.929735,0.324107 -16.426955,0.423602 -17.277335,0.110922 z M 49.384007,20.179361 c 0,-6.352101 0,-6.352101 -6.207735,-6.352101 -6.207736,0 -6.207736,0 -6.207736,6.352101 0,6.352101 0,6.352101 6.207736,6.352101 6.207735,0 6.207735,0 6.207735,-6.352101 z m -8.601181,0.127587 c 0.08359,-2.493816 0.08359,-2.493816 2.493128,-2.493127 2.409536,6.93e-4 2.409536,6.93e-4 2.410223,2.410224 5.78e-4,2.409537 5.78e-4,2.409537 -2.493127,2.493128 -2.493815,0.08359 -2.493815,0.08359 -2.410224,-2.410225 z M 1.2710444,25.038898 C 0.03786134,24.441768 -0.01726196,23.953104 0.07110904,14.401408 0.16431444,4.3275541 0.19822344,4.1309924 2.1859728,2.1432429 4.1737212,0.15549463 4.3702829,0.12158233 14.444136,0.02838023 c 9.66135,-0.089386 10.049927,-0.042549 10.654501,1.28435057 0.490292,1.0760719 0.389995,1.7047024 -0.426872,2.6754929 -0.747496,0.8883483 -0.747496,0.8883483 -9.081468,0.8883483 -5.8464277,0 -8.559942,0.1029614 -9.0910391,0.344944 -1.4970162,0.6820863 -1.5799571,1.2226927 -1.5799571,10.29813 0,8.361896 0,8.361896 -0.8883483,9.109394 -0.9346477,0.786453 -1.7363066,0.905503 -2.7599081,0.409858 z M 59.511777,24.62904 c -0.88835,-0.747498 -0.88835,-0.747498 -0.88835,-9.109394 0,-9.0754373 -0.08294,-9.6160437 -1.579958,-10.29813 -0.531096,-0.2419848 -3.244614,-0.344944 -9.091041,-0.344944 -8.33397,0 -8.33397,0 -9.081469,-0.8883483 -0.816865,-0.9707905 -0.917163,-1.599421 -0.42687,-2.6754929 0.604573,-1.32689477 0.993151,-1.37373647 10.654501,-1.28435057 10.073855,0.093205 10.270418,0.1271144 12.258166,2.11486267 1.987748,1.9877495 2.02166,2.1843112 2.114863,12.2581651 0.08939,9.66135 0.04255,10.049928 -1.284352,10.654502 -1.076072,0.490292 -1.704701,0.389996 -2.67549,-0.42687 z"
+     id="path1107" />
+</svg>
diff --git a/app/assets/images/android.png b/app/assets/images/android.png
new file mode 100644
index 0000000000..00732111d3
Binary files /dev/null and b/app/assets/images/android.png differ
diff --git a/app/assets/images/images.js b/app/assets/images/images.js
index ce0a975822..8e032fad36 100644
--- a/app/assets/images/images.js
+++ b/app/assets/images/images.js
@@ -1,4 +1,4 @@
-require("file-loader?name=images/[name].png!./google-play.png");
+require("file-loader?name=images/[name].png!./android.png");
 require("file-loader?name=images/[name].png!./coinmarketcap.png");
 require("file-loader?name=images/[name].png!./coinpaprika.png");
 require("file-loader?name=images/[name].png!./coinranking.png");
diff --git a/app/assets/index.hbs b/app/assets/index.hbs
index 67acc2cd12..dcdafc7722 100644
--- a/app/assets/index.hbs
+++ b/app/assets/index.hbs
@@ -9,7 +9,7 @@
     <meta name="viewport" content="width=device-width" />
     <meta name="format-detection" content="telephone=no">
     <title>{{title}}</title>
-    <meta http-equiv="Content-Security-Policy" content="default-src 'self' blob:; worker-src 'self' blob:; script-src https://cdnjs.cloudflare.com/ajax/libs/zxcvbn/ 'self' 'unsafe-eval' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; connect-src 'self' *; font-src 'self' data: https://at.alicdn.com; img-src 'self' data:; frame-ancestors 'none'; frame-src 'self' https://chat.rudex.org;"">
+    <meta http-equiv="Content-Security-Policy" content="default-src 'self' blob:; worker-src 'self' blob:; script-src https://cdnjs.cloudflare.com/ajax/libs/zxcvbn/ 'self' 'unsafe-eval' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; connect-src 'self' *; font-src 'self' data: https://at.alicdn.com; img-src 'self' data:; frame-src 'self' https://chat.rudex.org;">
     <link rel="icon" type="image/x-icon" href="favicon.ico">
     <style>
         body {
@@ -53,7 +53,7 @@
 
 <body spellcheck="false">
     <main id="content">
-        <h1 class="centerDiv" style="">Loading...</h1>
+        <h1 class="centerDiv" style="">RuDEX</h1>
     </main>
     <script>
         function ieVersion(uaString) {
diff --git a/app/assets/locales/locale-de.json b/app/assets/locales/locale-de.json
index 28eeb35663..f6d00eebeb 100644
--- a/app/assets/locales/locale-de.json
+++ b/app/assets/locales/locale-de.json
@@ -810,6 +810,7 @@
         "vol_short": "Vol",
         "volume": "Volumen",
         "volume_24": "24h-Volumen",
+        "volume_24_usdt": "Volumen USDT",
         "worth_less_settlement_warning": "The current market price of {market_link} is higher than settle price",
         "your_price": "Ihr Preis",
         "zoom": "Vergrößern",
@@ -1127,7 +1128,7 @@
         "loading": "Lade ...",
         "nosync": "Dein Verbindungsknoten ist nicht mehr synchron.",
         "synced": "Synchronisiert",
-        "title": "Graphene",
+        "title": "RuDEX",
         "unsynced": "Keine Synchronisation",
         "update_available": "Aktualisierung verfügbar"
     },
@@ -1245,7 +1246,7 @@
         "recent_withdraw": "Kürzliche Auszahlung",
         "rudex": {
             "coming_soon": "Kommt bald ...",
-            "min_amount": "Minimaler Betrag: %(minAmount)s %(symbol)s",
+            "min_amount": "Minimaler Betrag: %(minamount)s %(symbol)s",
             "min_amount_error": "Bitte geben Sie eine Zahl ein >= Minimum!",
             "support_block": "Für Ünterstützung kontaktieren Sie RuDEX unter:",
             "under_construction": "In Arbeit"
@@ -2697,7 +2698,7 @@
         }
     },
     "voting": {
-        "description": "The Graphene blockchain allows the holders of its core token BTS to vote on block producers (witnesses), committee members (blockchain governance), worker proposals (reimbursement for tasks and strategic decisions through BSIPs/Polls).",
+        "description": "The Graphene blockchain allows the holders of its core token GPH to vote on block producers (witnesses), committee members (blockchain governance), worker proposals (reimbursement for tasks and strategic decisions through BSIPs/Polls).",
         "title": "Voting"
     },
     "walkthrough": {
diff --git a/app/assets/locales/locale-en.json b/app/assets/locales/locale-en.json
index 88c85fd1b8..c25e7a6330 100644
--- a/app/assets/locales/locale-en.json
+++ b/app/assets/locales/locale-en.json
@@ -23,7 +23,7 @@
         "create_account": "Create account",
         "create_new": "Create A New Account",
         "deactivate_suspicious_proposals": "Hide approve for suspicious proposals",
-        "deposit": "Deposit BTS",
+        "deposit": "Deposit GPH",
         "deposit_address": "Your deposit address is your account name",
         "deposit_withdraw": "Deposit/Withdraw",
         "download_history": "Download History",
@@ -70,7 +70,7 @@
         "in_open": "This is the amount of %(asset)s you have in open orders.",
         "in_open_value": "This is the estimated value of the %(asset)s you have in open orders.",
         "intro_text_1": "Your Decentralized Platform",
-        "intro_text_2": "<b>The DEX</b> is inherently decentralized, enabling you to trade the Graphene core token (BTS) and a range of trustless price-stable, market-pegged assets such as gpUSD, gpCNY, bitBTC, bitGold and more. These assets can all be traded with <b>zero</b> counter-party risk, putting you in total control of your funds.",
+        "intro_text_2": "<b>The DEX</b> is inherently decentralized, enabling you to trade the Graphene core token (GPH) and a range of trustless price-stable, market-pegged assets such as gpUSD, gpCNY, bitBTC, bitGold and more. These assets can all be traded with <b>zero</b> counter-party risk, putting you in total control of your funds.",
         "intro_text_3": "<b>The DEX</b> also enables creation of user-issued assets (UIAs), which can be traded against any other UIAs or trustless assets on the platform.  One well-known asset owner on The DEX is <b>OpenLedger</b>, offering a host of assets including BTC, ETH, STEEM, DASH, LTC, DOGE, and many more",
         "intro_text_4": "This gives cryptocurrency traders a unique blend of traditional and decentralized trading, all in a familiar exchange interface. Happy trading!",
         "intro_text_title": "Welcome to %(wallet_name)s",
@@ -141,6 +141,7 @@
         "new_user": "New user?",
         "no_order_history": "No order history",
         "no_orders": "No open orders",
+        "no_trades": "No last trades",
         "no_price": "--",
         "open_orders": "Open Orders",
         "optional": {
@@ -221,7 +222,7 @@
             "question3": "Are you aware that a proposal can steal your funds or lock you out of the account?",
             "show_me_proposals": "Show me Proposals"
         },
-        "qty": "Qty",
+        "qty": "Available",
         "quote": "Quote",
         "recent": "Recent activity",
         "reset_orders": "Reset",
@@ -295,7 +296,7 @@
             "disable_force_settle": "Disable force settling",
             "error_invalid": "That asset may not be used",
             "error_precision": "That asset does not have the same precision as %(asset)s",
-            "error_too_deep": "May not create a bitasset backed by a bitasset backed by a bitasset",
+            "error_too_deep": "May not create a gpasset backed by a gpasset backed by a gpasset",
             "exists": "That asset already exists",
             "expiry": "Market resolution date",
             "feed_lifetime_sec": "Feed lifetime in minutes",
@@ -471,6 +472,7 @@
         "check_latency_feedback_rest": "Latency check for remaining nodes (%(pinged)s/%(totalToPing)s nodes)",
         "check_latency_feedback_world": "Latency check in each region (%(pinged)s/%(totalToPing)s nodes)",
         "connected": "Connected",
+        "connecting_start": "Connecting to APIs and starting app",
         "connecting": "Connecting to API server: %(server)s",
         "database": "Connection established, initializing local databases",
         "not_connected": "Not connected",
@@ -538,6 +540,11 @@
                 "market_history": "%e/%m %H:%M:%S",
                 "market_history_us": "%m/%e %H:%M:%S",
                 "short_custom": "%e %b '%y"
+            },
+            "datetime": {
+                "default": "%a, %e %b %Y %H:%M",
+                "long": "%A, %B %o, %Y %H:%M:%S %z",
+                "short": "%e %b %H:%M"
             }
         }
     },
@@ -813,7 +820,8 @@
         "vertical": "Vertical",
         "vol_short": "Vol",
         "volume": "Volume",
-        "volume_24": "24hr Volume",
+        "volume_24": "Volume(24h) ",
+        "volume_24_usdt": "Volume USDT",
         "scam_alert": {
             "text1": "WARNING: ",
             "text2": "Potentially dangerous trading pair! Among the assets on this market, there are some ",
@@ -836,6 +844,7 @@
         },
         "asset": {
             "actions": "Asset actions",
+            "asset_owner_responsible": "The asset symbol, description as well as its parameters are user defined (by the asset owner)",
             "collateral": {
                 "bid": "Bid Collateral",
                 "bid_price": "Bid price",
@@ -1077,7 +1086,7 @@
             "time_finish": "Time finish",
             "date_text": "The start date should be at least a week into the future in order to allow people the time to discover, evaluate and vote for your worker.",
             "name_text": "The name of your worker should be short and descriptive, something like this: 'Worker Purpose - Account Name'",
-            "pay_text": "The daily pay defines how much you want to be paid per day and is defined in BTS. The current best practice is to define a salary in USD/CNY, and commit to burning whatever surplus you receive as a result of the BTS price increasing. As long as your worker is active and has sufficient votes to be above the refund worker, you will receive this daily salary.",
+            "pay_text": "The daily pay defines how much you want to be paid per day and is defined in GPH. The current best practice is to define a salary in USD/CNY, and commit to burning whatever surplus you receive as a result of the GPH price increasing. As long as your worker is active and has sufficient votes to be above the refund worker, you will receive this daily salary.",
             "period": "Duration",
             "title": "Worker name",
             "url_text": "You should supply a website, github document or google doc that describes in more detail the purpose of the worker and how you intend to use the worker pay.",
@@ -1088,7 +1097,7 @@
     },
     "external_service_provider": {
         "bridge": {
-            "description": "Bridges are external service providers that allow you to swap assets in and out of the Graphene Blockchain. For example, you can send your BTC on the Bitcoin Blockchain to a Bridge, who will swap it and give you an equivalent amount of BTS or another Gateways UIA on the Graphene Blockchain (for a fee of course). Normally, a Bridge does not hold your funds, but trust is required that they send you back the proper amount of the target asset. As it is an external service providers you implicitly agree to their Terms and Conditions by using any of their services or assets.",
+            "description": "Bridges are external service providers that allow you to swap assets in and out of the Graphene Blockchain. For example, you can send your BTC on the Bitcoin Blockchain to a Bridge, who will swap it and give you an equivalent amount of GPH or another Gateways UIA on the Graphene Blockchain (for a fee of course). Normally, a Bridge does not hold your funds, but trust is required that they send you back the proper amount of the target asset. As it is an external service providers you implicitly agree to their Terms and Conditions by using any of their services or assets.",
             "short": "Bridge",
             "what_is": "What is a Bridge?"
         },
@@ -1184,7 +1193,7 @@
             "support_block": "For DEPOSIT AND WITHDRAWAL issues using \"BitSpark TRANSFER SERVICE\", please contact BitSpark at:"
         },
         "bridge": "Bridge",
-        "bridge_text": "A bridge lets you exchange an asset into another one, for example BTC to BTS.",
+        "bridge_text": "A bridge lets you exchange an asset into another one, for example BTC to GPH.",
         "calc": "Calculating",
         "choose_deposit": "Please select the coin you would like to deposit",
         "choose_withdraw": "Please select the coin you would like to withdraw",
@@ -1261,7 +1270,7 @@
         "recent_withdraw": "Recent withdrawals",
         "rudex": {
             "coming_soon": "Coming soon",
-            "min_amount": "Minimum amount: %(minAmount)s %(symbol)s",
+            "min_amount": "Minimum amount: %(minamount)s %(symbol)s",
             "min_amount_warn": "Any deposits less than the minimum will not be credited.",
             "min_amount_error": "Please enter number >= minimum",
             "support_block": "For support, please contact RuDEX at:",
@@ -1356,6 +1365,7 @@
         "accounts_manage": "Manage Accounts",
         "bots": "Bots",
         "listing": "Listing",
+        "ranking": "Volume ranking",
         "bots_beta": "Bots (beta)",
         "advanced": "Advanced",
         "collateral_ratio": "Collateral ratio",
@@ -1631,7 +1641,7 @@
             "address_generation_error": "Unable to generate address",
             "amount": "Amount to Deposit",
             "asset": "Asset",
-            "bts_transfer_description": "It's easy to receive BTS from anywhere. As long as BTS is sent to your account name it will show up in your wallet. This QR code also contains your account name.",
+            "bts_transfer_description": "It's easy to receive GPH from anywhere. As long as GPH is sent to your account name it will show up in your wallet. This QR code also contains your account name.",
             "cancel": "Cancel",
             "close": "Close",
             "header": "Deposit to %(account_name)s",
@@ -1733,7 +1743,7 @@
             "enter_public_signing_key": "Enter your public signing key",
             "invalid_key": "Public Key is invalid",
             "public_signing_key": "Public Signing Key",
-            "text": "After being voted in as an active witness you are added in the rotation of block producers and expected to produce blocks signed by your signing key and you are rewarded in BTS per produced block. Common criteria that help make your case are <ul><li>implementation of fallbacks (e.g. running a hot swap backup server) and appropriate server specifications to ensure a low number of missed blocks (e.g. high connectivity)</li><li>participation in block production and rolling releases of the testnet</li><li>provision of a public node for the community</li><li>publication of price feeds for the gpAssets</li></ul> Submit a link to your website or forum post explaining why you would be a exemplary member to attract enough votes to become active.",
+            "text": "After being voted in as an active witness you are added in the rotation of block producers and expected to produce blocks signed by your signing key and you are rewarded in GPH per produced block. Common criteria that help make your case are <ul><li>implementation of fallbacks (e.g. running a hot swap backup server) and appropriate server specifications to ensure a low number of missed blocks (e.g. high connectivity)</li><li>participation in block production and rolling releases of the testnet</li><li>provision of a public node for the community</li><li>publication of price feeds for the gpAssets</li></ul> Submit a link to your website or forum post explaining why you would be a exemplary member to attract enough votes to become active.",
             "url": "URL",
             "web_example": "Enter link to your witness proposal post",
             "witness_account": "Witness Account"
@@ -1742,7 +1752,7 @@
     "news": {
         "author": "Author",
         "errors": {
-            "fetch": "Ops... Something went wrong fetching the news"
+            "fetch": "Ops... Something went wrong fetching the news, try refreshing the page"
         },
         "news": "News",
         "subject": "Subject"
@@ -2228,7 +2238,7 @@
         "borrow": {
             "borrow_tooltip": "You can also find this feature in your Dashboard under the tab Margin Positions, or by clicking  Borrow in the Exchange",
             "choose": "Choose the SmartCoin you want to create a position for",
-            "description": "Borrow a gpAsset from the Graphene Blockchain by locking up collateral (e.g. gpUSD, gpCNY, etc.)",
+            "description": "Borrow a gpAsset from the Graphene Blockchain by locking up collateral (e.g. gpUSD, gpEUR, gpCNY, gpRUB etc.)",
             "do_it": "Let's do it",
             "get_started": "Get started",
             "navigate_with_keys": "The mechanism of the SmartCoin generation will be explained in the following steps. You can also use arrow keys to navigate",
@@ -2237,13 +2247,13 @@
             "previous": "Previous",
             "steps_benefits": {
                 "text": "Creating a Collateralized Debt Position allows you to provide liquidity for your desired SmartCoin (MPA), without giving up ownership of your collateral provided that you lock up enough collateral to guarantee the value of the SmartCoin. On the one hand, selling the newly generated SmartCoin on the open market will create leverage on your position (i.e. you sell it short, and will need to buy it back to close the position). On the other hand, holders of the SmartCoin benefit from the significantly less volatile SmartCoin, and they can additionally request a force settlement to obtain the corresponding value in its collateral without the need of markets.",
-                "text_legend": "Forced settlement: Holders of a SmartCoin can request a forced settlement. The SmartCoin is used to forcefully pay back the debt of the least collateralized positions while the former SmartCoin holder receives collateral as if he sold it for the forced settlement price. Any leftover collateral is returned to the position holder. This mechanism enforces a mandated delay after being triggered to avoid abuse (24 hours). \nForced Settlement Price: The price at which a forced settlement price will occur. It is calculated from the feed price by adding a forced settlement offset to disincentivize forced settlements. All settlements are converted to underlying backing asset (e.g. BTS in the case of gpUSD).",
+                "text_legend": "Forced settlement: Holders of a SmartCoin can request a forced settlement. The SmartCoin is used to forcefully pay back the debt of the least collateralized positions while the former SmartCoin holder receives collateral as if he sold it for the forced settlement price. Any leftover collateral is returned to the position holder. This mechanism enforces a mandated delay after being triggered to avoid abuse (24 hours). \nForced Settlement Price: The price at which a forced settlement price will occur. It is calculated from the feed price by adding a forced settlement offset to disincentivize forced settlements. All settlements are converted to underlying backing asset (e.g. GPH in the case of gpUSD).",
                 "title": "Benefits",
                 "title_within": "What are the benefits?"
             },
             "steps_concept": {
                 "text": "A Collateralized Debt Position enables every user of the Graphene Blockchain to generate SmartCoins (MPA) by providing collateral. The collateral is locked up until you pay back the SmartCoins you have generated. You are effectively borrowing the SmartCoin from the Graphene Blockchain.",
-                "text_legend": "Example gpUSD: Provide BTS as collateral to borrow gpUSD",
+                "text_legend": "Example gpUSD: Provide GPH as collateral to borrow gpUSD",
                 "title": "Concept",
                 "title_within": "What is a Collateralized Debt Position?"
             },
@@ -2526,7 +2536,7 @@
             "fee_per_kb": "Price per KByte Transaction Size",
             "long_symbol": "Longer Symbols",
             "membership_annual_fee": "Annual Membership",
-            "membership_lifetime_fee": "Lifetime Membership",
+            "membership_lifetime_fee": "Lifetime Membership (LTM)",
             "premium_fee": "Fee for Premium Names",
             "price_per_kbyte": "Price per KByte Transaction Size",
             "price_per_output": "Price per recipient",
@@ -2561,6 +2571,8 @@
         "show_more": "Show more",
         "to": "to",
         "transaction_confirmed": "Transaction confirmed",
+        "title_qrcode": "Transaction QR сode",
+        "view_qr": "view QR",
         "trxTypes": {
             "account_create": "Create account",
             "account_transfer": "Transfer Account",
@@ -2744,7 +2756,7 @@
         }
     },
     "voting": {
-        "description": "The Graphene blockchain allows the holders of its core token BTS to vote on block producers (witnesses), committee members (blockchain governance), worker proposals (reimbursement for tasks and strategic decisions through BSIPs/Polls).",
+        "description": "The Graphene blockchain allows the holders of its core token GPH to vote on block producers (witnesses), committee members (blockchain governance), worker proposals (reimbursement for tasks and strategic decisions through BSIPs/Polls).",
         "title": "Voting"
     },
     "walkthrough": {
@@ -2998,12 +3010,15 @@
             "trailing_percent": "Trailing Percent, %"
         },
         "percent_up": {
-            "distance": "Distance, %"
+            "distance": "Distance, %",
+            "sell_asset": "Sell asset",
+            "get_asset": "Get asset"
         }
     },
     "listing": {
         "submit_request": "Submit request",
         "add_coin": "Add Coin",
+        "donate": "Donate",
         "donate_progress": "Crowdfunding progress",
         "listed": "Listed",
         "get_donate_tokens": "Get ",
@@ -3030,7 +3045,7 @@
         "texts": {
             "header": "List an asset on RuDEX",
             "text1": "Would you like to list an asset on RuDEX, and integrate with Graphene decentralized trading platform? Use our listing service via public crowdfunding. The listing process is very simple and is described below.",
-            "text2": "To sumbit an asset listing request on RuDEX platform please fill out a simple form (Submit request button). Our team will review your request in accordance with submitted information in 14 business days, and if the project fulfils our listing criteria, it will be added to the public list for public crowdfunding. The main goal for the voluntary crowdfunding is to gather the funds for the launch and maintenance of the gateway, as well as estimation of potentioal interest in an ansset.",
+            "text2": "To sumbit an asset listing request on RuDEX platform please fill out a simple form (Submit request button). Our team will review your request in accordance with submitted information, and if the project fulfils our listing criteria, it will be added to the public list for public crowdfunding. The main goal for the voluntary crowdfunding is to gather the funds for the launch and maintenance of the gateway, as well as estimation of potentioal interest in an ansset.",
             "text3": {
                 "t1": "Any RuDEX user can support the listing of their favorite assets via crowdfunding. ",
                 "t2": "To that end please ",
@@ -3052,7 +3067,7 @@
                 "rule_1": "Please check ",
                 "rule_10": "rules",
                 "rule_11": " and submit a listing request.",
-                "rule_2": "Wait for the review results: if everything is in order, then it would be added to the project listing page within 14 business days.",
+                "rule_2": "Wait for the review results: if everything is in order, then it would be added to the project listing page.",
                 "rule_3": "Use your time to promote your project crowdfunding process via social networks, attract other users. Use",
                 "rule_4": " tokens to reach the crowdfunding goal (a RuDEX account is required for this).",
                 "rule_5": "Listing process is initiated after the crowdfunding goal is reach, and begins with the gateway launch preparation. Please provide the contacts for technical/marketing team, or any other qualified contact."
diff --git a/app/assets/locales/locale-es.json b/app/assets/locales/locale-es.json
index d15ea47da0..ef28930a70 100644
--- a/app/assets/locales/locale-es.json
+++ b/app/assets/locales/locale-es.json
@@ -291,7 +291,7 @@
             "disable_force_settle": " Desactivar el settling forzado",
             "error_invalid": "Ese activo no puede ser usado",
             "error_precision": "Ese activo no tiene la misma precisión que %(asset)s",
-            "error_too_deep": "No puede crear un bitasset respaldado por un bitasset respaldado por un bitasset",
+            "error_too_deep": "No puede crear un gpasset respaldado por un gpasset respaldado por un bitasset",
             "exists": "Ese activo ya existe",
             "expiry": "Fecha de resolución del mercado",
             "feed_lifetime_sec": "Feed tiempo de vida en minutos",
@@ -810,6 +810,7 @@
         "vol_short": "Vol",
         "volume": "Volumen",
         "volume_24": "24 hora volumen",
+        "volume_24_usdt": "Volumen USDT",
         "worth_less_settlement_warning": "El precio de mercado actual de {market_link} es más alto que el precio de liquidación",
         "your_price": "Su precio de llamada",
         "zoom": " Enfocar",
@@ -1127,7 +1128,7 @@
         "loading": "Cargando...",
         "nosync": "Su nodo activo no está sincronizado",
         "synced": "Sincronizado",
-        "title": "Graphene",
+        "title": "RuDEX",
         "unsynced": "Fuera de sincronización",
         "update_available": "ACTUALIZACIÓN DISPONIBLE"
     },
@@ -1245,7 +1246,7 @@
         "recent_withdraw": "Retiros recientes",
         "rudex": {
             "coming_soon": "Próximamente",
-            "min_amount": "Monto minimo: %(minAmount)s %(symbol)s",
+            "min_amount": "Monto minimo: %(minamount)s %(symbol)s",
             "min_amount_error": "Por favor ingrese número >= mínimo",
             "support_block": "Para soporte, póngase en contacto con RuDEX en:",
             "under_construction": "En Construcción"
@@ -2696,7 +2697,7 @@
         }
     },
     "voting": {
-        "description": "The Graphene blockchain allows the holders of its core token BTS to vote on block producers (witnesses), committee members (blockchain governance), worker proposals (reimbursement for tasks and strategic decisions through BSIPs/Polls).",
+        "description": "The Graphene blockchain allows the holders of its core token GPH to vote on block producers (witnesses), committee members (blockchain governance), worker proposals (reimbursement for tasks and strategic decisions through BSIPs/Polls).",
         "title": "Voting"
     },
     "walkthrough": {
diff --git a/app/assets/locales/locale-fr.json b/app/assets/locales/locale-fr.json
index 66f7932e7c..f880e91bc5 100644
--- a/app/assets/locales/locale-fr.json
+++ b/app/assets/locales/locale-fr.json
@@ -291,7 +291,7 @@
             "disable_force_settle": "Disable force settling",
             "error_invalid": "That asset may not be used",
             "error_precision": "That asset does not have the same precision as %(asset)s",
-            "error_too_deep": "May not create a bitasset backed by a bitasset backed by a bitasset",
+            "error_too_deep": "May not create a gpasset backed by a gpasset backed by a gpasset",
             "exists": "That asset already exists",
             "expiry": "Market resolution date",
             "feed_lifetime_sec": "Feed lifetime in minutes",
@@ -804,6 +804,7 @@
         "vol_short": "Vol",
         "volume": "Volume",
         "volume_24": "24hr Volume",
+        "volume_24_usdt": "Volume USDT",
         "worth_less_settlement_warning": "Warning! You can get a better price by selling to {market_link}.",
         "your_price": "Your Call Price",
         "zoom": "Zoom",
@@ -1121,7 +1122,7 @@
         "loading": "Loading...",
         "nosync": "Your active node is out of sync",
         "synced": "Synced",
-        "title": "Graphene",
+        "title": "RuDEX",
         "unsynced": "Out of sync",
         "update_available": "UPDATE AVAILABLE"
     },
@@ -1239,7 +1240,7 @@
         "recent_withdraw": "Recent withdrawals",
         "rudex": {
             "coming_soon": "Coming soon",
-            "min_amount": "Minimum amount: %(minAmount)s %(symbol)s",
+            "min_amount": "Minimum amount: %(minamount)s %(symbol)s",
             "min_amount_error": "Please enter number >= minimum",
             "support_block": "For support, please contact RuDEX at:",
             "under_construction": "Under Construction"
@@ -1327,7 +1328,7 @@
         "payments_legacy": "Send (legacy)",
         "settings": "Options",
         "showcases": "Spotlight",
-        "title": "Graphene",
+        "title": "RuDEX",
         "unlock": "Dévérouiller",
         "unlock_password": "Log in using a password",
         "unlock_short": "Login",
@@ -2690,7 +2691,7 @@
         }
     },
     "voting": {
-        "description": "The Graphene blockchain allows the holders of its core token BTS to vote on block producers (witnesses), committee members (blockchain governance), worker proposals (reimbursement for tasks and strategic decisions through BSIPs/Polls).",
+        "description": "The Graphene blockchain allows the holders of its core token GPH to vote on block producers (witnesses), committee members (blockchain governance), worker proposals (reimbursement for tasks and strategic decisions through BSIPs/Polls).",
         "title": "Voting"
     },
     "walkthrough": {
diff --git a/app/assets/locales/locale-it.json b/app/assets/locales/locale-it.json
index ceab124f5b..3ac899e554 100644
--- a/app/assets/locales/locale-it.json
+++ b/app/assets/locales/locale-it.json
@@ -291,7 +291,7 @@
             "disable_force_settle": "Disabilita settling obbligato",
             "error_invalid": "Quell'asset non può essere usato",
             "error_precision": "Quell'asset non ha la stessa precisione di %(asset)s",
-            "error_too_deep": "May not create a bitasset backed by a bitasset backed by a bitasset",
+            "error_too_deep": "May not create a gpasset backed by a gpasset backed by a gpasset",
             "exists": "Questo asset esiste sempre",
             "expiry": "Data risoluzione mercato",
             "feed_lifetime_sec": "Feed lifetime in minuti",
@@ -804,6 +804,7 @@
         "vol_short": "Vol",
         "volume": "Volume",
         "volume_24": "Volume 24h",
+        "volume_24_usdt": "Volume USDT",
         "worth_less_settlement_warning": "Warning! You can get a better price by selling to {market_link}.",
         "your_price": "Il tuo Call Price",
         "zoom": "Zoom",
@@ -1121,7 +1122,7 @@
         "loading": "Caricamento...",
         "nosync": "La blockchain non è sincronizzata, per favore attendi..",
         "synced": "Sincronizzato",
-        "title": "Graphene",
+        "title": "RuDEX",
         "unsynced": "Fuori sincrono",
         "update_available": "AGGIORNAMENTO DISPONIBILE"
     },
@@ -1239,7 +1240,7 @@
         "recent_withdraw": "Prelievi recenti",
         "rudex": {
             "coming_soon": "Prossimamente",
-            "min_amount": "Quantità minima: %(minAmount)s %(symbol)s",
+            "min_amount": "Quantità minima: %(minamount)s %(symbol)s",
             "min_amount_error": "Per favore inserisci un numero >= minimo",
             "support_block": "Per supporto, contatta RuDEX a:",
             "under_construction": "Under Construction"
diff --git a/app/assets/locales/locale-ja.json b/app/assets/locales/locale-ja.json
index 9ea959131c..877ac62e26 100644
--- a/app/assets/locales/locale-ja.json
+++ b/app/assets/locales/locale-ja.json
@@ -291,7 +291,7 @@
             "disable_force_settle": "強制決済を無効にする",
             "error_invalid": "そのアセットは使用できません",
             "error_precision": "そのアセットの精度は%(asset)sと異なります。",
-            "error_too_deep": "May not create a bitasset backed by a bitasset backed by a bitasset",
+            "error_too_deep": "May not create a gpasset backed by a gpasset backed by a gpasset",
             "exists": "そのアセットは既に存在します",
             "expiry": "市場解決日",
             "feed_lifetime_sec": "フィード寿命 (分)",
@@ -1121,7 +1121,7 @@
         "loading": "ロード中...",
         "nosync": "ブロックチェーンは同期していません。同期が完了するまでお待ち下さい..",
         "synced": "同期しました",
-        "title": "Graphene",
+        "title": "RuDEX",
         "unsynced": "同期していません",
         "update_available": "更新があります"
     },
@@ -1239,7 +1239,7 @@
         "recent_withdraw": "最近の出金",
         "rudex": {
             "coming_soon": "近日公開",
-            "min_amount": "最低数量: %(minAmount)s %(symbol)s",
+            "min_amount": "最低数量: %(minamount)s %(symbol)s",
             "min_amount_error": "数字を入力してください >= minimum",
             "support_block": "サポートについては、RuDEXまでご連絡ください。:",
             "under_construction": "工事中"
@@ -2690,7 +2690,7 @@
         }
     },
     "voting": {
-        "description": "The Graphene blockchain allows the holders of its core token BTS to vote on block producers (witnesses), committee members (blockchain governance), worker proposals (reimbursement for tasks and strategic decisions through BSIPs/Polls).",
+        "description": "The Graphene blockchain allows the holders of its core token GPH to vote on block producers (witnesses), committee members (blockchain governance), worker proposals (reimbursement for tasks and strategic decisions through BSIPs/Polls).",
         "title": "Voting"
     },
     "walkthrough": {
diff --git a/app/assets/locales/locale-ko.json b/app/assets/locales/locale-ko.json
index 4a3d6eca14..ac231633fd 100644
--- a/app/assets/locales/locale-ko.json
+++ b/app/assets/locales/locale-ko.json
@@ -291,7 +291,7 @@
             "disable_force_settle": "Disable force settling",
             "error_invalid": "That asset may not be used",
             "error_precision": "That asset does not have the same precision as %(asset)s",
-            "error_too_deep": "May not create a bitasset backed by a bitasset backed by a bitasset",
+            "error_too_deep": "May not create a gpasset backed by a gpasset backed by a gpasset",
             "exists": "That asset already exists",
             "expiry": "Market resolution date",
             "feed_lifetime_sec": "Feed lifetime in minutes",
@@ -1239,7 +1239,7 @@
         "recent_withdraw": "Recent withdrawals",
         "rudex": {
             "coming_soon": "Coming soon",
-            "min_amount": "Minimum amount: %(minAmount)s %(symbol)s",
+            "min_amount": "Minimum amount: %(minamount)s %(symbol)s",
             "min_amount_error": "Please enter number >= minimum",
             "support_block": "For support, please contact RuDEX at:",
             "under_construction": "Under Construction"
@@ -2690,7 +2690,7 @@
         }
     },
     "voting": {
-        "description": "The Graphene blockchain allows the holders of its core token BTS to vote on block producers (witnesses), committee members (blockchain governance), worker proposals (reimbursement for tasks and strategic decisions through BSIPs/Polls).",
+        "description": "The Graphene blockchain allows the holders of its core token GPH to vote on block producers (witnesses), committee members (blockchain governance), worker proposals (reimbursement for tasks and strategic decisions through BSIPs/Polls).",
         "title": "Voting"
     },
     "walkthrough": {
diff --git a/app/assets/locales/locale-ru.json b/app/assets/locales/locale-ru.json
index 1ad80bed39..e8cd1ce881 100644
--- a/app/assets/locales/locale-ru.json
+++ b/app/assets/locales/locale-ru.json
@@ -141,6 +141,7 @@
         "new_user": "Новый пользователь?",
         "no_order_history": "История ордеров отсутствует",
         "no_orders": "Нет открытых ордеров",
+        "no_trades": "Нет недавних сделок",
         "no_price": "--",
         "open_orders": "Открытые ордера",
         "optional": {
@@ -221,7 +222,7 @@
             "question3": "Знаете ли вы, что предложение может украсть ваши средства или заблокировать вход в ваш аккаунт?",
             "show_me_proposals": "Показать предложения"
         },
-        "qty": "Кол-во",
+        "qty": "Доступно",
         "quote": "Тикер",
         "recent": "Последние действия",
         "reset_orders": "Сбросить",
@@ -295,7 +296,7 @@
             "disable_force_settle": "Отключить принудительное погашение",
             "error_invalid": "Этот актив не может быть использован",
             "error_precision": "Этот актив не обладает той же точностью, что и %(asset)s",
-            "error_too_deep": "Невозможно создать битактив (gpAsset), обеспеченный залогом в битактиве, который также обеспечен битактивом",
+            "error_too_deep": "Невозможно создать gp-актив (gpAsset), обеспеченный залогом в gp-активе, который также обеспечен gp-активом",
             "exists": "Этот актив уже существует",
             "expiry": "Дата выхода с рынка",
             "feed_lifetime_sec": "Срок действия котировок в минутах",
@@ -479,6 +480,26 @@
         "understand": "Я понимаю",
         "ws_status": "Состояние подключения полного узла"
     },
+    "app_init": {
+        "browser": "Неподдерживаемый браузер",
+        "browser_text": "Браузер, который вы используете, не тестировался на предмет поддержки кошелька %(wallet_name)s. Мы настоятельно рекомендуем вам сделать резервную копию вашего локального кошелька и импортировать его, используя браузер Chrome, пока мы не проведём полное тестирование выбранного вами браузера. Мы не несём ответственность за использование вами данного браузера.",
+        "check_latency": "Производится проверка задержки...",
+        "check_latency_feedback": "Выполняется проверка задержки (%(pinged)s/%(totalToPing)s узлов) ...",
+        "check_latency_feedback_country": "Проверка задержки в наилучшей стране (%(pinged)s/%(totalToPing)s узлов)",
+        "check_latency_feedback_last": "Проверка задержки последнего подключенного узла (%(pinged)s/%(totalToPing)s узлов)",
+        "check_latency_feedback_region": "Проверка задержки по наилучшему региону (%(pinged)s/%(totalToPing)s узлов)",
+        "check_latency_feedback_rest": "Проверка задержки оставшихся узлов (%(pinged)s/%(totalToPing)s узлов)",
+        "check_latency_feedback_world": "Проверка задержки по каждому региону (%(pinged)s/%(totalToPing)s узлов)",
+        "connected": "Соединение установлено",
+        "connecting_start": "Подключение к API и запуск приложения",
+        "connecting": "Подключение к серверу API: %(server)s",
+        "database": "Соединение установлено, идет инициализация локальных баз данных",
+        "not_connected": "Нет соединения",
+        "retry": "Повторить попытку",
+        "title": "Проблемы инициализации приложения",
+        "understand": "Я понимаю",
+        "ws_status": "Состояние подключения полного узла"
+    },
     "assets": {
         "BTS": "GPH является основным токеном блокчейна Graphene"
     },
@@ -537,7 +558,12 @@
                 "full": "%F %T %Z",
                 "market_history": "%e/%m %H:%M:%S",
                 "market_history_us": "%m/%e %H:%M:%S",
-                "short_custom": "%e %b '%y"
+                "short_custom": "%d %m '%Y"
+            },
+            "datetime": {
+                "default": "%a, %e %b %Y %H:%M",
+                "long": "%A, %B %o, %Y %H:%M:%S %z",
+                "short": "%e %b %H:%M"
             }
         }
     },
@@ -812,8 +838,9 @@
         "value": "Стоимость",
         "vertical": "Вертикальный",
         "vol_short": "Объем",
-        "volume": "Объем",
-        "volume_24": "Суточный объем",
+        "volume": "Объём",
+        "volume_24": "Суточный объём ",
+        "volume_24_usdt": "Объём USDT",
         "scam_alert": {
             "text1": "ВНИМАНИЕ: ",
             "text2": "Потенциально опасная торговая пара! Cреди активов, представленных на данном рынке, есть ",
@@ -836,6 +863,7 @@
         },
         "asset": {
             "actions": "Действия с активами",
+            "asset_owner_responsible": "Символ актива, описание, а также его параметры определяются пользователем (владельцем актива)",
             "collateral": {
                 "bid": "Обеспечение предложения",
                 "bid_price": "Цена предложения",
@@ -1261,7 +1289,7 @@
         "recent_withdraw": "Недавние выводы",
         "rudex": {
             "coming_soon": "Скоро",
-            "min_amount": "Минимальная сумма: %(minAmount)s %(symbol)s",
+            "min_amount": "Минимальная сумма: %(minamount)s %(symbol)s",
             "min_amount_warn": "Любые депозиты, меньше минимального размера, не будут зачислены.",
             "min_amount_error": "Пожалуйста, введите число ≥ минимума",
             "support_block": "Для получения поддержки, пожалуйста, свяжитесь с RuDEX по адресу:",
@@ -1356,6 +1384,7 @@
         "accounts_manage": "Управление аккаунтами",
         "bots": "Боты",
         "listing": "Листинг",
+        "ranking": "Рейтинг объёмов",
         "bots_beta": "Боты (бета)",
         "advanced": "Расширенный",
         "collateral_ratio": "Коэффициент обеспечения",
@@ -1742,7 +1771,7 @@
     "news": {
         "author": "Автор",
         "errors": {
-            "fetch": "Упс! При получении новостей что-то пошло не так "
+            "fetch": "Упс! При получении новостей что-то пошло не так, попробуйте обновить страницу"
         },
         "news": "Новости",
         "subject": "Тема"
@@ -2228,7 +2257,7 @@
         "borrow": {
             "borrow_tooltip": "Вы также можете найти эту функцию на своей инфопанели во вкладке «Маржинальные позиции» или нажав «Занять» на бирже",
             "choose": " Выберите SmartCoin, для которого вы хотите создать позицию",
-            "description": "Займите gpAsset у блокчейна Graphene путем блокировки в нем залогового обеспечения (например, gpUSD, gpRUB и т.д.)",
+            "description": "Займите gpAsset у блокчейна Graphene путем блокировки в нем залогового обеспечения (например, gpUSD, gpEUR, gpCNY, gpRUB и т.д.)",
             "do_it": " Сделаем это!",
             "get_started": " Начало работы",
             "navigate_with_keys": " Механизм генерации SmartCoin будет объяснен в следующих шагах. Вы также можете использовать клавиши со стрелками для навигации",
@@ -2526,7 +2555,7 @@
             "fee_per_kb": "Цена за Кбайт размера транзакции",
             "long_symbol": "Длинные тикеры",
             "membership_annual_fee": "Годовое членство",
-            "membership_lifetime_fee": "Пожизненное членство",
+            "membership_lifetime_fee": "Пожизненное членство (LTM)",
             "premium_fee": "Комиссия для премиум имён",
             "price_per_kbyte": "Цена за Кбайт данных транзакции",
             "price_per_output": "Цена за получателя",
@@ -2561,6 +2590,8 @@
         "show_more": "Показать больше",
         "to": "кому",
         "transaction_confirmed": "Транзакция подтверждена",
+        "title_qrcode": "QR код транзакции",
+        "view_qr": "посмотреть QR-код",
         "trxTypes": {
             "account_create": "Создание аккаунта",
             "account_transfer": "Передача аккаунта",
@@ -2998,12 +3029,15 @@
             "trailing_percent": "Треллинг-стоп, %"
         },
         "percent_up": {
-            "distance": "Distance, %"
+            "distance": "Дистанция, %",
+            "sell_asset": "Продаваемый актив",
+            "get_asset": "Приобретаемый актив"
         }
     },
     "listing": {
         "submit_request": "Подать заявку",
         "add_coin": "Добавить монету",
+        "donate": "Donate",
         "donate_progress": "Прогресс краудфандинга",
         "listed": "Размещенные активы",
         "get_donate_tokens": "Получить ",
@@ -3030,7 +3064,7 @@
         "texts": {
             "header": "Разместите актив на RuDEX",
             "text1": "Хотите разместить актив на RuDEX, и интегрироваться в децентрализованную торговую платформу Graphene? Воспользуйтесь нашим сервисом листинга путем публичного краудфандинга. Процедура листинга очень проста и описана ниже.",
-            "text2": "Чтобы подать заявку на размещение актива на платформе RuDEX достаточно заполнить простую форму (кнопка Подать заявку). Наша команда рассмотрит вашу заявку в соответствии с предоставленной информацией в течение 14 рабочих дней, и в случае если проект удовлетворяет нашим критериям, он будет включен в список проектов для листинга путем публичного краудфандинга. Основная цель публичного добровольного краудфандинга - сбор средств на запуск и техническую поддержку шлюза, а также оценка потенциальной востребованности конкретного актива.",
+            "text2": "Чтобы подать заявку на размещение актива на платформе RuDEX достаточно заполнить простую форму (кнопка Подать заявку). Наша команда рассмотрит вашу заявку в соответствии с предоставленной информацией, и в случае если проект удовлетворяет нашим критериям, он будет включен в список проектов для листинга путем публичного краудфандинга. Основная цель публичного добровольного краудфандинга - сбор средств на запуск и техническую поддержку шлюза, а также оценка потенциальной востребованности конкретного актива.",
             "text3": {
                 "t1": "Поддержать листинг интересующего проекта путем краудфандинга может любой пользователь RuDEX. ",
                 "t2": "Для этого необходимо предварительно ",
@@ -3052,7 +3086,7 @@
                 "rule_1": "Изучите ",
                 "rule_10": "правила",
                 "rule_11": " и подайте заявку на листинг.",
-                "rule_2": "Дождитесь результатов ревью вашего проекта: если всё в порядке, то он будет включен в список проектов на листинг в течение 14 рабочих дней.",
+                "rule_2": "Дождитесь результатов ревью вашего проекта: если всё в порядке, то он будет включен в список проектов на листинг.",
                 "rule_3": "Не сидите сложа руки, продвигайте листинг своего проекта путем публичного краудфандинга через соцсети, привлекайте других пользователей. Используйте токены",
                 "rule_4": " для достижения порога краудфандинга (необходимо иметь аккаунт на RuDEX).",
                 "rule_5": " Процедура листинга актива стартует сразу после преодоления порога краудфандинга и начинается с подготовки к запуску шлюза. Обеспечьте возможность связи со своей технической/маркетинговой командой или другим ответственным лицом."
diff --git a/app/assets/locales/locale-tr.json b/app/assets/locales/locale-tr.json
index 1e2939d53e..41160b4342 100644
--- a/app/assets/locales/locale-tr.json
+++ b/app/assets/locales/locale-tr.json
@@ -291,7 +291,7 @@
             "disable_force_settle": "Zorla kapamayı etkisizleştir",
             "error_invalid": "Bu dijital varlık kullanılmayabilir",
             "error_precision": "Dijital varlık, %(asset)s ile aynı hassasiyete sahip değil",
-            "error_too_deep": "May not create a bitasset backed by a bitasset backed by a bitasset",
+            "error_too_deep": "May not create a gpasset backed by a gpasset backed by a gpasset",
             "exists": "O dijital varlık zaten mevcut",
             "expiry": "Piyasa çözülüm tarihi",
             "feed_lifetime_sec": "Dakika olarak yayın ömrü",
@@ -804,6 +804,7 @@
         "vol_short": "Hacim",
         "volume": "Hacim",
         "volume_24": "24 Saat",
+        "volume_24_usdt": "Saat 24h",
         "worth_less_settlement_warning": "Warning! You can get a better price by selling to {market_link}.",
         "your_price": "Sizin Çağrı Fiyatınız",
         "zoom": "Yakınlaştır",
@@ -1121,7 +1122,7 @@
         "loading": "Yükleniyor...",
         "nosync": "Blokzinciri ile eşzamanlı değil, lütfen senkronize olana kadar bekleyin...",
         "synced": "Synced",
-        "title": "Graphene",
+        "title": "RuDEX",
         "unsynced": "Out of sync",
         "update_available": "UPDATE AVAILABLE"
     },
@@ -1239,7 +1240,7 @@
         "recent_withdraw": "Son işlemler",
         "rudex": {
             "coming_soon": "Coming soon",
-            "min_amount": "Minimum amount: %(minAmount)s %(symbol)s",
+            "min_amount": "Minimum amount: %(minamount)s %(symbol)s",
             "min_amount_error": "Please enter number >= minimum",
             "support_block": "For support, please contact RuDEX at:",
             "under_construction": "Under Construction"
diff --git a/app/assets/locales/locale-zh.json b/app/assets/locales/locale-zh.json
index aefd1f2f34..12a17b34c7 100644
--- a/app/assets/locales/locale-zh.json
+++ b/app/assets/locales/locale-zh.json
@@ -1245,7 +1245,7 @@
         "recent_withdraw": "最近提现",
         "rudex": {
             "coming_soon": "即将上线",
-            "min_amount": "最小金额：%(minAmount)s %(symbol)s",
+            "min_amount": "最小金额：%(minamount)s %(symbol)s",
             "min_amount_error": "请输入大于最小金额的数量",
             "support_block": "请联系 RuDEX 获取客户支持：",
             "under_construction": "施工中"
diff --git a/app/assets/stylesheets/components/_all.scss b/app/assets/stylesheets/components/_all.scss
index 8c9d028273..1e6cedd220 100644
--- a/app/assets/stylesheets/components/_all.scss
+++ b/app/assets/stylesheets/components/_all.scss
@@ -1,53 +1,58 @@
-@import "account";
-@import "account-create";
-@import "bitkapital";
-@import "blocktrades";
-@import "cards";
-@import "console";
-@import "dashboard";
-@import "exchange";
-@import "existing_accounts";
-@import "footer";
-@import "forms";
-@import "header";
-@import "help";
-@import "loading-indicator";
-@import "modal";
-@import "node-selector";
-@import "pagination";
-@import "rudex";
-@import "settings";
-@import "tables";
-@import "tabs";
-@import "typeahead";
-@import "page404";
-@import "wallet";
-@import "incognito";
-@import "asset";
-@import "registration/account-registration";
-@import "registration/registration-selector";
-@import "login/login";
-@import "barter";
-@import "direct-debit";
-@import "collapsible_table";
-@import "voting";
-@import "invoice";
-@import "quick_trade";
-
-.lifetime {
-    background: url("../fresh-bolt2.png") no-repeat 100% 50%;
-    background-size: auto 80%;
-    padding-right: 0.75rem;
-}
-
-.bottom-border {
-    border-bottom: 1px solid #444;
-}
-
-.linethrough {
-    text-decoration: line-through;
-}
-
-.fixed-height-2rem tr {
-    height: 2.5rem;
-}
+@import "account";
+@import "account-create";
+@import "bitkapital";
+@import "blocktrades";
+@import "cards";
+@import "console";
+@import "dashboard";
+@import "exchange";
+@import "existing_accounts";
+@import "footer";
+@import "forms";
+@import "header";
+@import "help";
+@import "loading-indicator";
+@import "modal";
+@import "node-selector";
+@import "pagination";
+@import "rudex";
+@import "settings";
+@import "tables";
+@import "tabs";
+@import "typeahead";
+@import "page404";
+@import "wallet";
+@import "incognito";
+@import "asset";
+@import "registration/account-registration";
+@import "registration/registration-selector";
+@import "login/login";
+@import "barter";
+@import "direct-debit";
+@import "collapsible_table";
+@import "voting";
+@import "invoice";
+@import "quick_trade";
+
+.lifetime {
+    background: url("../fresh-bolt2.png") no-repeat 100% 50%;
+    background-size: auto 80%;
+    padding-right: 0.75rem;
+}
+
+.bottom-border {
+    border-bottom: 1px solid #444;
+}
+
+.linethrough {
+    text-decoration: line-through;
+}
+
+.fixed-height-2rem tr {
+    height: 1rem;
+}
+
+.fixed-height-1rem tr {
+    max-height: 1.4rem;
+    line-height: 1.2rem;
+}
diff --git a/app/assets/stylesheets/components/_dashboard.scss b/app/assets/stylesheets/components/_dashboard.scss
index cd5c07b0a3..5e5d628300 100644
--- a/app/assets/stylesheets/components/_dashboard.scss
+++ b/app/assets/stylesheets/components/_dashboard.scss
@@ -63,3 +63,51 @@ div.input-wrapper {
         height: inherit;
     }
 }
+
+@include breakpoint(large) {
+    div.fm-container {
+        > div:first-child {
+            padding-right: 15px;
+        }
+
+        > div:last-child {
+            padding-right: 15px;
+        }
+    }
+}
+
+// DashboardRuDEX
+.dashboardRuDEX div.fm-container {
+    border: 1px solid $border-color;
+    padding: 0.5rem;
+    min-width: 16rem;
+    cursor: default;
+
+    &:hover {
+        background-color: #d8d8d8;
+    }
+
+    .fm-title,
+    .fm-volume,
+    .fm-change {
+        font-size: 0.85rem;
+    }
+
+    .fm-name {
+        font-weight: bold;
+        padding-bottom: 10px;
+    }
+
+    .fm-volume,
+    .fm-change {
+        text-transform: lowercase;
+        font-variant: small-caps;
+        padding-top: 6px;
+    }
+}
+
+.darkTheme .dashboardRuDEX div.fm-container {
+    &:hover {
+        background-color: #525252;
+    }
+}
diff --git a/app/assets/stylesheets/themes/_light-theme.scss b/app/assets/stylesheets/themes/_light-theme.scss
index 4ec2a088ec..9fc0b85771 100644
--- a/app/assets/stylesheets/themes/_light-theme.scss
+++ b/app/assets/stylesheets/themes/_light-theme.scss
@@ -97,18 +97,17 @@ $primary-color: #337ab7;
 
 // help colors
 $white: #fff;
+$grey: #e5e6e4;
 $dark: rgba(0, 0, 0, 0.6);
 $dark-1: lighten($dark, 30%);
 $dark-2: lighten($dark, 60%);
 $dark-3: lighten($dark, 90%);
 
 // Header
-//$header-background-color: $white;
-$header-background-color: #e5e6e4;
+$header-background-color: $grey;
 $header-shadow: 0 4px 9px 0 #00000015 !important;
 $header-item--color: lighten($dark, 20%);
-//$header-item-background-color: $white;
-$header-item-background-color: #e5e6e4;
+$header-item-background-color: $grey;
 $header-item--active--background-color: $white;
 
 $header-item--active--color: $link-text-color;
diff --git a/app/assets/stylesheets/themes/_theme-template.scss b/app/assets/stylesheets/themes/_theme-template.scss
index 0d428bc206..2ccb81d790 100644
--- a/app/assets/stylesheets/themes/_theme-template.scss
+++ b/app/assets/stylesheets/themes/_theme-template.scss
@@ -266,8 +266,8 @@
     }
     .settings-input {
         /* !important to overwrite styles for Inputs on User Settings. By default inputs take styles from
-    .block-list and it uses on many places. To keep everything OK and do not break something I just do
-    overwrite for Inputs on settings and keep default styles for inputs on another places. */
+.block-list and it uses on many places. To keep everything OK and do not break something I just do
+overwrite for Inputs on settings and keep default styles for inputs on another places. */
         color: $settings-select-color !important;
         height: 36px !important;
         background-color: $settings-select-bg !important;
@@ -1108,6 +1108,12 @@
             }
         }
     }
+    ul.account-overview.segmented {
+        > li > a {
+            background: $bg-color !important;
+            border-right: none;
+        }
+    }
     ul.button-group.segmented {
         > li.is-active > a {
             background: $input-background;
@@ -2610,13 +2616,16 @@
         }
     }
 }
+
 .rc-time-picker-panel {
     z-index: 9999 !important;
 }
+
 .midnightTheme .gate_fee .amount-selector {
     width: 100%;
     display: inline-block;
 }
+
 .midnightTheme .gate_fee .right-selector {
     text-align: right;
     width: 26%;
@@ -2624,19 +2633,23 @@
     color: #adadad;
     text-transform: uppercase;
 }
+
 .midnightTheme .gate_fee .right-selector .right-selector-input {
     text-align: right;
     width: 100%;
 }
+
 .clear-text,
 .search-wrapper {
     position: relative;
 }
+
 .market-filter-input,
 .clear-text,
 .search-wrapper {
     position: relative;
 }
+
 .clear-text {
     top: 10px;
     right: -30px;
@@ -2647,6 +2660,7 @@
     outline: 0;
     cursor: pointer;
 }
+
 .clear-text:after {
     content: "X";
     display: block;
@@ -2667,9 +2681,11 @@
     font-size: 12px;
     cursor: pointer;
 }
+
 .market-filter-input:not(:valid) ~ .clear-text {
     display: none;
 }
+
 .header-container {
     display: flex;
     align-items: center;
@@ -2708,6 +2724,7 @@
         line-height: normal;
     }
 }
+
 .local-wallet-menu {
     // top: 50px!important;
     .table-cell {
@@ -2720,6 +2737,7 @@
         }
     }
 }
+
 .app-menu {
     flex: 0;
 }
@@ -2740,6 +2758,7 @@
         text-align: right;
     }
 }
+
 #qr_scanner_modal {
     > section {
         width: 100%;
@@ -2749,6 +2768,7 @@
         justify-content: center;
     }
 }
+
 @media screen and (max-width: 640px) {
     .responsive-list > .help-content > ul {
         height: 300px;
@@ -2766,6 +2786,7 @@
         }
     }
 }
+
 div.customizable-column--selector {
     position: absolute;
     right: 1rem;
@@ -2777,11 +2798,13 @@ div.customizable-column--selector {
         }
     }
 }
+
 div.customizable-column--selector--dropdown {
     ul.ant-select-dropdown-menu-vertical {
         max-height: 100% !important;
     }
 }
+
 .ant-table-tbody > tr.ant-table-row-selected td {
     background-color: #4f596633 !important;
 }
@@ -2797,7 +2820,31 @@ div.customizable-column--selector--dropdown {
     padding: 5px;
 }
 
-@media only all and (max-width: 900px) {
+@media only all and (max-width: 1040px) {
+    .footer .footer-support {
+        display: none !important;
+    }
+}
+
+@media only all and (max-width: 920px) {
+    .footer .footer-listing {
+        display: none !important;
+    }
+}
+
+@media only all and (max-width: 840px) {
+    .footer .logo {
+        display: none !important;
+    }
+}
+
+@media only all and (max-width: 770px) {
+    .footer .footer-audit {
+        display: none !important;
+    }
+}
+
+@media only all and (max-width: 680px) {
     .footer[class*="grid-block"]:not(.ng-hide) {
         display: none !important;
     }
@@ -2806,3 +2853,9 @@ div.customizable-column--selector--dropdown {
 .footer {
     height: 40px;
 }
+
+@media only all and (min-width: 900px) {
+    .margin-row td:first-child {
+        min-width: 8.5rem;
+    }
+}
diff --git a/app/branding.js b/app/branding.js
index 9f778d372f..fb92aea608 100644
--- a/app/branding.js
+++ b/app/branding.js
@@ -113,35 +113,27 @@ export function getMyMarketsBases() {
     if (_isTestnet()) {
         return ["TEST"];
     }
-    return ["GPH", "USD", "RUDEX.BTC", "RUDEX.USDT", "RUDEX.BTS", "RUDEX.NBS"];
+    return [
+        "GPH",
+        "USD",
+        "RUDEX.BTC",
+        "RUDEX.USDT",
+        "RUDEX.BTS",
+        "RUDEX.NBS",
+        "RUDEX.BUSD",
+        "RUDEX.BTCB"
+    ];
 }
 
-/**
- * These are the default quotes that are shown after selecting a base
- *
- * @returns {[string]}
+/*
+All trusted tokens
  */
-export function getMyMarketsQuotes() {
-    if (_isTestnet()) {
-        return ["TEST"];
-    }
-    let tokens = {
-        nativeTokens: [
-            "GPH",
-            "USD"
-
-            /* ,
-            "EUR",
-            "CNY",
-            "RUB",
-
-            "BTC",
-            "GOLD",
-            "SILVER",
-            "OIL"*/
-        ],
+export function get_allTokens() {
+    return {
+        nativeTokens: ["GPH", "USD", "EUR", "RUB", "CNY", "GOLD", "SILVER"],
         rudexTokens: [
             "DONATE",
+            "DEXBOT",
 
             "RUDEX.BTC",
             "RUDEX.LTC",
@@ -156,18 +148,13 @@ export function getMyMarketsQuotes() {
             "RUDEX.BTS",
             "RUDEX.TRX",
 
-            "RUDEX.DEC",
-            "RUDEX.SPS",
-
             "RUDEX.BNB",
             "RUDEX.BUSD",
-            "RUDEX.BTCB"
-
-            //"RUDEX.PPY",
-            //"RUDEX.SMOKE",
-            //"RUDEX.WLS"
+            "RUDEX.BTCB",
+            "RUDEX.DEC",
+            "RUDEX.SPS"
 
-            //RuDEX MPA-s
+            //RuDEX MPA-s OLD
             /*
             "RUDEX.XBS",
             "RUDEX.XBT",
@@ -176,11 +163,43 @@ export function getMyMarketsQuotes() {
             "RUDEX.XAU"
             */
         ],
+        delistedTokens: ["RUDEX.PPY", "RUDEX.SMOKE", "RUDEX.WLS"],
         otherTokens: []
     };
+}
 
+/*
+These are the default coins that are displayed with the images
+ */
+export function getImageName(symbol) {
+    if (symbol.startsWith("RUDEX.")) return symbol;
+    if (
+        get_allTokens().nativeTokens.indexOf(symbol) !== -1 ||
+        symbol == "DONATE" ||
+        symbol == "DEXBOT"
+    )
+        return symbol;
+
+    return "unknown";
+
+    //let imgName = symbol.split(".");
+    //return imgName.length === 2 ? imgName[1] : imgName[0];
+}
+
+/**
+ * These are the default quotes that are shown after selecting a base
+ *
+ * @returns {[string]}
+ */
+export function getMyMarketsQuotes(delisted = false) {
+    if (_isTestnet()) {
+        return ["TEST"];
+    }
+    let tokens = get_allTokens();
     let allTokens = [];
     for (let type in tokens) {
+        if (delisted !== true && type == "delistedTokens") continue;
+
         allTokens = allTokens.concat(tokens[type]);
     }
     return allTokens;
@@ -192,7 +211,6 @@ export function getMyMarketsQuotes() {
  */
 export function getGroupedMPAsRuDEX() {
     let tokens = {
-        //listed: ["USD", "EUR", "CNY", "RUB", "BTC", "GOLD", "SILVER", "OIL"],
         listed: [],
         rudex: [
             //RuDEX MPA-s
@@ -219,32 +237,11 @@ export function getFeaturedMarkets(quotes = []) {
     return [
         //GPH
         ["GPH", "USD"],
-
-        /*
         ["GPH", "EUR"],
-        ["GPH", "CNY"],
         ["GPH", "RUB"],
-        ["GPH", "BTC"],
+        ["GPH", "CNY"],
         ["GPH", "GOLD"],
         ["GPH", "SILVER"],
-        ["GPH", "OIL"],
-
-        ["USD", "GPH"],
-        ["USD", "EUR"],
-        ["USD", "CNY"],
-        ["USD", "BTC"],
-        ["USD", "GOLD"],
-        ["USD", "SILVER"],
-        ["USD", "OIL"],
-
-        ["RUB", "USD"],
-        ["RUB", "GPH"],
-        ["RUB", "EUR"],
-        ["RUB", "CNY"],
-        ["RUB", "BTC"],
-        ["RUB", "GOLD"],
-        ["RUB", "SILVER"],
-        ["RUB", "OIL"]*/
 
         ["GPH", "RUDEX.NBS"],
         ["GPH", "RUDEX.BTC"],
@@ -258,19 +255,16 @@ export function getFeaturedMarkets(quotes = []) {
         ["GPH", "RUDEX.BTS"],
         ["GPH", "RUDEX.TRX"],
 
-        /*["RUBLE", "GPH"],
-        ["RUBLE", "RUDEX.BTC"],
-        ["RUBLE", "RUDEX.USDT"],
-        ["RUBLE", "RUDEX.ETH"],
-        ["RUBLE", "RUDEX.EOS"],
-        ["RUBLE", "RUDEX.GOLOS"],
-        ["RUBLE", "RUDEX.STEEM"],
-        ["RUBLE", "RUDEX.RUB"], */
-
         ["RUDEX.USDT", "GPH"],
         ["RUDEX.USDT", "USD"],
+        ["RUDEX.USDT", "EUR"],
+        ["RUDEX.USDT", "RUB"],
+        ["RUDEX.USDT", "CNY"],
+        ["RUDEX.USDT", "GOLD"],
+        ["RUDEX.USDT", "SILVER"],
 
         ["RUDEX.USDT", "DONATE"],
+        ["RUDEX.USDT", "DEXBOT"],
         ["RUDEX.USDT", "RUDEX.NBS"],
         ["RUDEX.USDT", "RUDEX.BTC"],
         ["RUDEX.USDT", "RUDEX.LTC"],
@@ -290,16 +284,18 @@ export function getFeaturedMarkets(quotes = []) {
         ["RUDEX.USDT", "RUDEX.BUSD"],
         ["RUDEX.USDT", "RUDEX.BTCB"],
 
+        //Delisted
         //["RUDEX.USDT", "RUDEX.PPY"],
         //["RUDEX.USDT", "RUDEX.SMOKE"],
         //["RUDEX.USDT", "RUDEX.WLS"],
-        //["RUDEX.USDT", "RUBLE"],
 
-        /*        ["RUDEX.USDT", "RUDEX.XBS"], //MPA
-        ["RUDEX.USDT", "RUDEX.XBT"], //MPA
-        ["RUDEX.USDT", "RUDEX.OIL"], //MPA
-        ["RUDEX.USDT", "RUDEX.XAU"], //MPA
-        ["RUDEX.USDT", "RUDEX.RUB"], //MPA*/
+        //RuDEX MPA (old)
+        /*        ["RUDEX.USDT", "RUDEX.XBS"],
+                ["RUDEX.USDT", "RUDEX.XBT"],
+                ["RUDEX.USDT", "RUDEX.OIL"],
+                ["RUDEX.USDT", "RUDEX.XAU"],
+                ["RUDEX.USDT", "RUDEX.RUB"],
+         */
 
         //Bitcoin
         //["RUDEX.BTC", "DONATE"],
@@ -338,21 +334,52 @@ export function getFeaturedMarkets(quotes = []) {
         ["RUDEX.BTS", "RUDEX.STEEM"],
         ["RUDEX.BTS", "RUDEX.TRX"],
 
+        //Delisted
         //["RUDEX.BTS", "RUDEX.PPY"],
         //["RUDEX.BTS", "RUDEX.SMOKE"],
         //["RUDEX.BTS", "RUDEX.WLS"],
 
         //NewBitshares
-        ["RUDEX.NBS", "RUDEX.GPH"],
+        ["RUDEX.NBS", "GPH"],
         ["RUDEX.NBS", "RUDEX.USDT"],
         ["RUDEX.NBS", "RUDEX.EOS"],
         ["RUDEX.NBS", "RUDEX.BTS"],
         ["RUDEX.NBS", "RUDEX.TRX"],
+        ["RUDEX.NBS", "RUDEX.LTC"],
+        ["RUDEX.NBS", "RUDEX.GOLOS"],
 
         //gpUSD
-        ["USD", "RUDEX.USDT"],
         ["USD", "GPH"],
-        ["USD", "RUDEX.PZM"]
+        ["USD", "EUR"],
+        ["USD", "RUB"],
+        ["USD", "CNY"],
+        ["USD", "GOLD"],
+        ["USD", "SILVER"],
+
+        ["USD", "RUDEX.USDT"],
+        ["USD", "RUDEX.PZM"],
+        ["USD", "RUDEX.BUSD"],
+
+        //RUDEX.BUSD
+        ["RUDEX.BUSD", "GPH"],
+        ["RUDEX.BUSD", "USD"],
+        //["RUDEX.BUSD", "EUR"],
+        //["RUDEX.BUSD", "RUB"],
+        //["RUDEX.BUSD", "CNY"],
+        //["RUDEX.BUSD", "GOLD"],
+        //["RUDEX.BUSD", "SILVER"],
+
+        ["RUDEX.BUSD", "RUDEX.BTCB"],
+        ["RUDEX.BUSD", "RUDEX.USDT"],
+        ["RUDEX.BUSD", "RUDEX.DEC"],
+        ["RUDEX.BUSD", "RUDEX.SPS"],
+        ["RUDEX.BUSD", "RUDEX.GOLOS"],
+
+        //RUDEX.BTCB
+        ["RUDEX.BTCB", "RUDEX.BTC"],
+        ["RUDEX.BTCB", "RUDEX.STEEM"],
+        ["RUDEX.BTCB", "RUDEX.GOLOS"],
+        ["RUDEX.BTCB", "RUDEX.XMR"]
     ].filter(a => {
         if (!quotes.length) return true;
         return quotes.indexOf(a[0]) !== -1;
@@ -376,7 +403,7 @@ export function getAssetNamespaces() {
  * @returns {[string,string]}
  */
 export function getAssetHideNamespaces() {
-    // e..g "OPEN.", "bit"
+    // e..g "RUDEX.", "gp"
     return ["RUDEX."];
 }
 
@@ -466,6 +493,14 @@ export function getListingCoins() {
             goal: 7000,
             votes: 0
         },
+        {
+            name: "Dash",
+            ticker: "DASH",
+            page: "https://www.dash.org",
+            account: "rudex-dash",
+            goal: 2000,
+            votes: 0
+        },
         {
             name: "Dogecoin",
             ticker: "DOGE",
@@ -503,7 +538,7 @@ export function getListingCoins() {
             ticker: "GWN",
             page: "http://www.gwncoin.com",
             account: "rudex-gwn",
-            goal: 10000,
+            goal: 5000,
             votes: 0
         },
         {
@@ -537,17 +572,34 @@ export function getListingCoins() {
             account: "rudex-wca",
             goal: 5000,
             votes: 0
+        },
+        {
+            name: "Camino Token",
+            ticker: "CAMINO",
+            page: "https://www.caminotoken.com",
+            account: "rudex-camino",
+            goal: 5000,
+            votes: 0
+        },
+        {
+            name: "OJA Coin",
+            ticker: "OJX",
+            page: "https://ojacoin.org",
+            account: "rudex-ojx",
+            goal: 10000,
+            votes: 0
+        },
+        {
+            name: "GoDonr",
+            ticker: "Donr",
+            page: "https://godonr.com/home",
+            account: "rudex-donr",
+            goal: 5000,
+            votes: 0
         }
 
         //Disabled
-        /*        {
-                    name: "Dash",
-                    ticker: "DASH",
-                    page: "https://www.dash.org",
-                    account: "rudex-dash",
-                    goal: 2000,
-                    votes: 0
-                },
+        /*
                 {
                     name: "Waves",
                     ticker: "WAVES",
diff --git a/app/components/Account/AccountOverview.jsx b/app/components/Account/AccountOverview.jsx
index d5a4f4079f..cce2df7fa7 100644
--- a/app/components/Account/AccountOverview.jsx
+++ b/app/components/Account/AccountOverview.jsx
@@ -20,53 +20,14 @@ import AccountPortfolioList from "./AccountPortfolioList";
 import {Input, Icon, Switch, Tooltip, Button} from "bitshares-ui-style-guide";
 import counterpart from "counterpart";
 import SearchInput from "../Utility/SearchInput";
+import {getMyMarketsQuotes} from "branding";
 
 class AccountOverview extends React.Component {
     constructor(props) {
         super(props);
         this.state = {
             shownAssets: props.viewSettings.get("shownAssets", "active"),
-            alwaysShowAssets: [
-                "GPH",
-                "USD",
-
-                /*
-                 "EUR",
-                 "CNY",
-                 "RUB",
-                 "BTC",
-                 "GOLD",
-                 "SILVER",
-                 "OIL",
-                */
-
-                "DONATE",
-
-                "RUDEX.BTC",
-                "RUDEX.LTC",
-                "RUDEX.ETH",
-                "RUDEX.USDT",
-                "RUDEX.EOS",
-                "RUDEX.PZM",
-                "RUDEX.GOLOS",
-                "RUDEX.STEEM",
-                "RUDEX.NBS",
-                "RUDEX.XMR",
-                "RUDEX.BTS",
-                "RUDEX.TRX",
-
-                "RUDEX.DEC",
-                "RUDEX.SPS",
-
-                "RUDEX.BNB",
-                "RUDEX.BUSD",
-                "RUDEX.BTCB",
-
-                //Delisted
-                "RUDEX.PPY",
-                "RUDEX.SMOKE",
-                "RUDEX.WLS"
-            ],
+            alwaysShowAssets: getMyMarketsQuotes(true),
             hideFishingProposals: true,
             question1: false,
             question2: false,
@@ -242,7 +203,7 @@ class AccountOverview extends React.Component {
                     assetName = asset.get("symbol").toLowerCase();
                     let {isBitAsset} = utils.replaceName(asset);
                     if (isBitAsset) {
-                        assetName = "bit" + assetName;
+                        assetName = "gp" + assetName;
                     }
                 }
 
@@ -517,7 +478,7 @@ class AccountOverview extends React.Component {
                                                 <td>{marginValue}</td>
                                                 <td className="column-hide-small" />
                                                 <td className="column-hide-small" />
-                                                <td colSpan="4" />
+                                                <td colSpan="5" />
                                             </tr>
                                         </MarginPositionsTable>
                                     </div>
diff --git a/app/components/Account/AccountPortfolioList.jsx b/app/components/Account/AccountPortfolioList.jsx
index 805bf2299e..3b79d5dfd7 100644
--- a/app/components/Account/AccountPortfolioList.jsx
+++ b/app/components/Account/AccountPortfolioList.jsx
@@ -39,6 +39,7 @@ import Translate from "react-translate-component";
 import AssetName from "../Utility/AssetName";
 import TranslateWithLinks from "../Utility/TranslateWithLinks";
 import MarketsActions from "actions/MarketsActions";
+import {getImageName} from "branding";
 
 class AccountPortfolioList extends React.Component {
     constructor(props) {
@@ -530,31 +531,6 @@ class AccountPortfolioList extends React.Component {
             settings.get("unit") || this.props.core_asset.get("symbol");
         const showAssetPercent = settings.get("showAssetPercent", false);
 
-        function getImageName(symbol) {
-            if (symbol.startsWith("RUDEX.")) return symbol;
-
-            if (
-                symbol == "DONATE" ||
-                symbol == "GPH" ||
-                symbol == "USD"
-
-                /* ||
-            symbol == "EUR" ||
-            symbol == "CNY" ||
-            symbol == "RUB" ||
-            symbol == "BTC" ||
-            symbol == "GOLD" ||
-            symbol == "SILVER" ||
-            symbol == "OIL"*/
-            )
-                return symbol;
-
-            return "unknown";
-
-            //let imgName = symbol.split(".");
-            //return imgName.length === 2 ? imgName[1] : imgName[0];
-        }
-
         let headerItems = [
             {
                 title: <Translate content="account.asset" />,
@@ -1161,7 +1137,7 @@ class AccountPortfolioList extends React.Component {
                     isBitAsset && borrowLink ? (
                         <Tooltip
                             title={counterpart.translate("tooltip.borrow", {
-                                asset: isAssetBitAsset ? "bit" + symbol : symbol
+                                asset: isAssetBitAsset ? "gp" + symbol : symbol
                             })}
                         >
                             {borrowLink}
@@ -1172,7 +1148,7 @@ class AccountPortfolioList extends React.Component {
                                 "tooltip.borrow_disabled",
                                 {
                                     asset: isAssetBitAsset
-                                        ? "bit" + symbol
+                                        ? "gp" + symbol
                                         : symbol
                                 }
                             )}
@@ -1187,11 +1163,9 @@ class AccountPortfolioList extends React.Component {
                         <Tooltip
                             placement="bottom"
                             title={counterpart.translate(settlePriceTitle, {
-                                asset: isAssetBitAsset
-                                    ? "bit" + symbol
-                                    : symbol,
+                                asset: isAssetBitAsset ? "gp" + symbol : symbol,
                                 backingAsset: isBackingBitAsset
-                                    ? "bit" + backingAsset.get("symbol")
+                                    ? "gp" + backingAsset.get("symbol")
                                     : backingAsset.get("symbol"),
                                 settleDelay:
                                     options.force_settlement_delay_sec / 3600
diff --git a/app/components/Account/AccountVoting.jsx b/app/components/Account/AccountVoting.jsx
index 23204547b1..08dfe1cd64 100644
--- a/app/components/Account/AccountVoting.jsx
+++ b/app/components/Account/AccountVoting.jsx
@@ -444,7 +444,7 @@ class AccountVoting extends React.Component {
                 proxyAccount.get("id") !== this.state.proxy_account_id)
         ) {
             this.setState({
-                proxy_account_id: "",
+                proxy_account_id: !proxyAccount ? "" : proxyAccount.get("id"),
                 proxy_witnesses: Immutable.Set(),
                 proxy_committee: Immutable.Set(),
                 proxy_workers: Immutable.Set()
diff --git a/app/components/Account/AccountVotingProxy.jsx b/app/components/Account/AccountVotingProxy.jsx
index 9fde9ee74d..45c80536ab 100644
--- a/app/components/Account/AccountVotingProxy.jsx
+++ b/app/components/Account/AccountVotingProxy.jsx
@@ -16,7 +16,7 @@ class AccountVotingProxy extends React.Component {
     };
 
     static defaultProps = {
-        knownProxies: List([]),
+        knownProxies: List(["blckchnd"]),
         existingProxy: "1.2.5", // proxy-to-self
         autosubscribe: false
     };
diff --git a/app/components/Account/MarginPosition.jsx b/app/components/Account/MarginPosition.jsx
index 0b56395f09..4d7b5da70e 100644
--- a/app/components/Account/MarginPosition.jsx
+++ b/app/components/Account/MarginPosition.jsx
@@ -265,12 +265,12 @@ class MarginPosition extends React.Component {
         return (
             <tr className="margin-row">
                 <td style={alignLeft}>
-                    <AssetImage
-                        replaceNoneToBts={false}
-                        maxWidth={30}
-                        name={debtAsset.get("symbol")}
-                    />
                     <Link to={`/asset/${debtAsset.get("symbol")}`}>
+                        <AssetImage
+                            replaceNoneToBts={false}
+                            maxWidth={30}
+                            name={debtAsset.get("symbol")}
+                        />
                         <AssetName noTip name={debtAsset.get("symbol")} />
                     </Link>
                 </td>
diff --git a/app/components/Account/MarginPositionsTable.jsx b/app/components/Account/MarginPositionsTable.jsx
index 852437b340..5d55caeb31 100644
--- a/app/components/Account/MarginPositionsTable.jsx
+++ b/app/components/Account/MarginPositionsTable.jsx
@@ -171,7 +171,8 @@ class ListGenerator extends React.Component {
                     let bSymbol =
                         (bName.prefix != null ? bName.prefix : "") + bName.name;
 
-                    return aSymbol.localeCompare(bSymbol);
+                    //return aSymbol.localeCompare(bSymbol);// sort
+                    return false; //Disable sort for margin positions default
                 }
             })
             .map(a => {
@@ -226,7 +227,13 @@ ListGenerator = AssetWrapper(ListGenerator, {
     defaultProps: {
         bitAssets: [
             //gpAssets
-            "1.3.27" //gpUSD
+            "1.3.27", // gpUSD
+            "1.3.36", // gpEUR
+            "1.3.37", // gpRUB
+            "1.3.38", // gpCNY
+            "1.3.35", // gpGOLD
+            "1.3.34" // gpSILVER
+
             //RuDEX MPA-s
             /*            "1.3.5747",
             "1.3.5748",
diff --git a/app/components/Blockchain/Asset.jsx b/app/components/Blockchain/Asset.jsx
index 4b689fa8d6..a616b5bee0 100644
--- a/app/components/Blockchain/Asset.jsx
+++ b/app/components/Blockchain/Asset.jsx
@@ -25,7 +25,15 @@ import AssetOwnerUpdate from "./AssetOwnerUpdate";
 import AssetPublishFeed from "./AssetPublishFeed";
 import AssetResolvePrediction from "./AssetResolvePrediction";
 import BidCollateralOperation from "./BidCollateralOperation";
-import {Tooltip, Icon, Table, Tabs, Collapse} from "bitshares-ui-style-guide";
+import {
+    Tooltip,
+    Icon,
+    Table,
+    Tabs,
+    Collapse,
+    Alert
+} from "bitshares-ui-style-guide";
+import GatewayStore from "../../stores/GatewayStore";
 const {Panel} = Collapse;
 
 class AssetFlag extends React.Component {
@@ -373,6 +381,19 @@ class Asset extends React.Component {
         return (
             <div style={{overflow: "visible"}}>
                 <h2>
+                    {asset &&
+                        issuer &&
+                        asset.id != "1.3.0" &&
+                        issuer.get("id") != "1.2.0" && (
+                            <Alert
+                                message={counterpart.translate(
+                                    "explorer.asset.asset_owner_responsible"
+                                )}
+                                type="info"
+                                showIcon
+                                style={{marginTop: "1em"}}
+                            />
+                        )}
                     <AssetImage
                         maxWidth={50}
                         replaceNoneToBts={false}
diff --git a/app/components/Blockchain/Fees.jsx b/app/components/Blockchain/Fees.jsx
index 98a80a6302..60aafb9cd8 100644
--- a/app/components/Blockchain/Fees.jsx
+++ b/app/components/Blockchain/Fees.jsx
@@ -72,6 +72,7 @@ class FeeGroup extends React.Component {
             let fee = feeStruct[1];
             let operation_name = ops[opId];
             let feename = trxTypes[operation_name];
+            //let feename = trxTypes[operation_name] + ` (${opId})`;
 
             let feeRateForLTM = network_fee;
             if (opId === 10) {
@@ -131,7 +132,7 @@ class FeeGroup extends React.Component {
                 }
 
                 if (ltm_required.indexOf(opId) < 0) {
-                    if (feeTypes[key] != "Annual Membership") {
+                    if (feeTypes[key] != "Annual Membership222") {
                         rows.push(
                             <tr key={opId.toString() + key}>
                                 {title}
diff --git a/app/components/Blockchain/ProposedOperation.jsx b/app/components/Blockchain/ProposedOperation.jsx
index 923402c02e..59447c4d74 100644
--- a/app/components/Blockchain/ProposedOperation.jsx
+++ b/app/components/Blockchain/ProposedOperation.jsx
@@ -26,7 +26,8 @@ export const TransactionIDAndExpiry = ({
     openJSONModal
 }) => {
     const endDate = counterpart.localize(new Date(expiration), {
-        format: "short"
+        type: "datetime",
+        format: "default"
     });
     return (
         <b style={style}>
@@ -85,19 +86,18 @@ class Row extends React.Component {
                         </span>
                     )}
                 </span>
-                {!hideExpiration &&
-                    this.props.expiration && (
-                        <TransactionIDAndExpiry
-                            id={id}
-                            expiration={expiration}
-                            style={{
-                                paddingTop: 5,
-                                fontSize: "0.85rem",
-                                paddingBottom: "0.5rem",
-                                display: "block"
-                            }}
-                        />
-                    )}
+                {!hideExpiration && this.props.expiration && (
+                    <TransactionIDAndExpiry
+                        id={id}
+                        expiration={expiration}
+                        style={{
+                            paddingTop: 5,
+                            fontSize: "0.85rem",
+                            paddingBottom: "0.5rem",
+                            display: "block"
+                        }}
+                    />
+                )}
             </div>
         );
     }
diff --git a/app/components/Blockchain/TransactionConfirm.jsx b/app/components/Blockchain/TransactionConfirm.jsx
index aad9e1101b..8ccdbd8e57 100644
--- a/app/components/Blockchain/TransactionConfirm.jsx
+++ b/app/components/Blockchain/TransactionConfirm.jsx
@@ -21,6 +21,7 @@ import {
     Switch,
     Input
 } from "bitshares-ui-style-guide";
+import QRCode from "qrcode.react";
 
 class TransactionConfirm extends React.Component {
     constructor(props) {
@@ -28,7 +29,8 @@ class TransactionConfirm extends React.Component {
 
         this.state = {
             isModalVisible: false,
-            isErrorDetailsVisible: false
+            isErrorDetailsVisible: false,
+            showQrCode: false
         };
 
         this.onCloseClick = this.onCloseClick.bind(this);
@@ -46,7 +48,9 @@ class TransactionConfirm extends React.Component {
         }
 
         if (
-            nextState.isErrorDetailsVisible !== this.state.isErrorDetailsVisible
+            nextState.isErrorDetailsVisible !==
+                this.state.isErrorDetailsVisible ||
+            nextState.showQrCode !== this.state.showQrCode
         ) {
             return true;
         }
@@ -163,9 +167,29 @@ class TransactionConfirm extends React.Component {
         }
     }
 
+    _showQrCode() {
+        let {transaction} = this.props;
+        let trStr = "";
+        if (transaction.tr_buffer) {
+            trStr = JSON.stringify(transaction.serialize());
+            this.setState({showQrCode: true, trStr});
+        } else {
+            transaction.set_expire_seconds(60);
+            transaction.finalize().then(() => {
+                trStr = JSON.stringify(transaction.serialize());
+                this.setState({showQrCode: true, trStr});
+            });
+        }
+    }
+
+    _hideQrCode() {
+        this.props.transaction.tr_buffer = null;
+        this.setState({showQrCode: false, trStr: ""});
+    }
+
     render() {
         let {broadcast, broadcasting} = this.props;
-        let {isErrorDetailsVisible} = this.state;
+        let {isErrorDetailsVisible, showQrCode, trStr} = this.state;
         if (!this.props.transaction || this.props.closed) {
             return null;
         }
@@ -245,6 +269,24 @@ class TransactionConfirm extends React.Component {
             header = counterpart.translate("transaction.confirm");
 
             footer = [
+                <div
+                    style={{
+                        float: "left",
+                        cursor: "pointer",
+                        marginTop: "4px"
+                    }}
+                    key="scan-qr"
+                    onClick={this._showQrCode.bind(this)}
+                >
+                    <Translate
+                        style={{
+                            marginTop: "3px",
+                            marginLeft: "5px"
+                        }}
+                        content="transaction.view_qr"
+                    />
+                    <Icon name="qr-scan" size={"1_5x"} />
+                </div>,
                 <Button
                     key={"confirm"}
                     type="primary"
@@ -259,7 +301,6 @@ class TransactionConfirm extends React.Component {
                 </Button>
             ];
         }
-
         return (
             <div ref="transactionConfirm" onKeyUp={this.onKeyUp}>
                 <Modal
@@ -311,6 +352,45 @@ class TransactionConfirm extends React.Component {
                                 index={0}
                                 no_links={true}
                             />
+                            {trStr ? (
+                                <Modal
+                                    visible={showQrCode}
+                                    onCancel={this._hideQrCode.bind(this)}
+                                    footer={
+                                        <Button
+                                            key="cancel"
+                                            onClick={this._hideQrCode.bind(
+                                                this
+                                            )}
+                                        >
+                                            {counterpart.translate("cancel")}
+                                        </Button>
+                                    }
+                                >
+                                    <div className="text-center">
+                                        <div style={{margin: "1.5rem 0"}}>
+                                            <Translate
+                                                component="h4"
+                                                content="transaction.title_qrcode"
+                                            />
+                                        </div>
+                                        <div className="full-width">
+                                            <span
+                                                style={{
+                                                    background: "#fff",
+                                                    padding: ".75rem",
+                                                    display: "inline-block"
+                                                }}
+                                            >
+                                                <QRCode
+                                                    size={256}
+                                                    value={trStr}
+                                                />
+                                            </span>
+                                        </div>
+                                    </div>
+                                </Modal>
+                            ) : null}
                         </div>
 
                         {/* P R O P O S E   F R O M */}
diff --git a/app/components/Bots/Bots.jsx b/app/components/Bots/Bots.jsx
index f6ae2d3bf2..00e0da93ea 100644
--- a/app/components/Bots/Bots.jsx
+++ b/app/components/Bots/Bots.jsx
@@ -83,8 +83,8 @@ class Bots extends React.Component {
         this.setState({botRun: bot.run});
     };
 
-    handleDeleteBot = () => {
-        BotManager.delete(this.state.bots[this.state.selectBot]);
+    handleDeleteBot = async () => {
+        await BotManager.delete(this.state.bots[this.state.selectBot]);
 
         this.setState({
             bots: BotManager.getBots(this.props.currentAccount),
@@ -220,18 +220,15 @@ class Bots extends React.Component {
     }
 }
 
-export default connect(
-    Bots,
-    {
-        listenTo() {
-            return [AccountStore];
-        },
-        getProps() {
-            return {
-                currentAccount:
-                    AccountStore.getState().currentAccount ||
-                    AccountStore.getState().passwordAccount
-            };
-        }
+export default connect(Bots, {
+    listenTo() {
+        return [AccountStore];
+    },
+    getProps() {
+        return {
+            currentAccount:
+                AccountStore.getState().currentAccount ||
+                AccountStore.getState().passwordAccount
+        };
     }
-);
+});
diff --git a/app/components/Bots/PercentUp/Create.jsx b/app/components/Bots/PercentUp/Create.jsx
index ea9f9990a1..c1200dfe4a 100644
--- a/app/components/Bots/PercentUp/Create.jsx
+++ b/app/components/Bots/PercentUp/Create.jsx
@@ -9,14 +9,18 @@ import Translate from "react-translate-component";
 class Create extends React.Component {
     state = {
         name: "",
+
         base: "GPH",
         quote: "RUDEX.USDT",
-        amount: 100,
+
+        amount: 1000,
         percentAmount: false,
-        balance: "",
-        spread: 1,
-        distance: "1.5",
-        validate: ["name"]
+
+        balance: "5000",
+        spread: 2,
+        distance: 4,
+        validate: ["name"],
+        fromMarket: false
     };
 
     componentDidMount() {
@@ -122,7 +126,7 @@ class Create extends React.Component {
                 <div className="grid-block horizontal" style={{marginLeft: 50}}>
                     <div className="content-block">
                         <label className="left-label">
-                            <Translate content="bots.common.base" />
+                            <Translate content="bots.percent_up.sell_asset" />
                         </label>
                         <AssetSelector
                             name="base"
@@ -166,7 +170,7 @@ class Create extends React.Component {
                     </div>
                     <div className="content-block" style={{marginLeft: 50}}>
                         <label className="left-label">
-                            <Translate content="bots.common.quote" />
+                            <Translate content="bots.percent_up.get_asset" />
                         </label>
                         <AssetSelector
                             name="quote"
diff --git a/app/components/Bots/PercentUp/State.jsx b/app/components/Bots/PercentUp/State.jsx
index 9159e3cb9f..f2b44bc68c 100644
--- a/app/components/Bots/PercentUp/State.jsx
+++ b/app/components/Bots/PercentUp/State.jsx
@@ -90,7 +90,7 @@ class State extends React.Component {
                 <div className="grid-block horizontal" style={{marginLeft: 50}}>
                     <div className="content-block">
                         <label className="left-label">
-                            <Translate content="bots.common.base" />
+                            <Translate content="bots.percent_up.sell_asset" />
                         </label>
                         <Select
                             style={{marginBottom: 30}}
@@ -111,6 +111,11 @@ class State extends React.Component {
                                 type="radio"
                                 value={true}
                                 name="percentAmount"
+                                checked={
+                                    this.state.percentAmount == "true"
+                                        ? true
+                                        : false
+                                }
                             />{" "}
                             <Translate content="bots.common.balance_percent" />
                             <br />
@@ -118,7 +123,11 @@ class State extends React.Component {
                                 type="radio"
                                 value={false}
                                 name="percentAmount"
-                                defaultChecked
+                                checked={
+                                    this.state.percentAmount == "false"
+                                        ? true
+                                        : false
+                                }
                             />{" "}
                             <Translate content="bots.common.balance_value" />
                         </div>
@@ -140,7 +149,7 @@ class State extends React.Component {
                     </div>
                     <div className="content-block" style={{marginLeft: 50}}>
                         <label className="left-label">
-                            <Translate content="bots.common.quote" />
+                            <Translate content="bots.percent_up.get_asset" />
                         </label>
                         <Select
                             style={{marginBottom: 30}}
diff --git a/app/components/Bots/SpreadTrade/Create.jsx b/app/components/Bots/SpreadTrade/Create.jsx
index 04a27585f5..eebd5f9ed8 100644
--- a/app/components/Bots/SpreadTrade/Create.jsx
+++ b/app/components/Bots/SpreadTrade/Create.jsx
@@ -1,364 +1,370 @@
-import React from "react";
-import BotManager from "lib/bots";
-import Apis from "lib/bots/apis";
-import {debounce} from "lodash-es";
-import AssetSelector from "../libs/AssetSelector";
-import Translate from "react-translate-component";
-
-class Create extends React.Component {
-    state = {
-        name: "",
-        baseAsset: "RUDEX.USDT",
-        quoteAsset: "RUDEX.BTC",
-        baseAmount: 10,
-        quoteAmount: 0.01,
-        baseSpread: 10,
-        quoteSpread: 10,
-        baseBalance: 100,
-        quoteBalance: 0.1,
-        percentBaseAmount: false,
-        percentQuoteAmount: false,
-        validate: ["name"]
-    };
-
-    componentDidMount() {
-        this.assetValidate = debounce(this.assetValidate, 200);
-    }
-
-    assetValidate = async name => {
-        let asset = this.state[name];
-        let blockchainAssets = (await Apis.db.list_assets(asset, 1))[0];
-        let validate = this.state.validate;
-
-        if (asset !== blockchainAssets.symbol) validate.push(name);
-        else {
-            validate = validate.filter(input => input !== name);
-        }
-
-        this.setState({validate});
-        this.props.enableCreate(this.state.validate.length == 0);
-    };
-
-    handleChange = event => {
-        let name = event.target.name,
-            value =
-                event.target.type === "checkbox"
-                    ? event.target.checked
-                    : event.target.value;
-        console.log(name, value);
-
-        if (["baseAsset", "quoteAsset"].includes(name))
-            value = value.toUpperCase();
-
-        this.setState({[name]: value}, () => this.validate(name, value));
-    };
-
-    validate = (name, value) => {
-        let validate = this.state.validate;
-
-        switch (name) {
-            case "name":
-                if (
-                    !/^\w+$/.test(value) ||
-                    BotManager.hasBot(
-                        this.props.account,
-                        this.props.name,
-                        value
-                    )
-                ) {
-                    validate.push(name);
-                    this.setState({validate});
-                } else {
-                    this.setState({
-                        validate: validate.filter(input => input !== name)
-                    });
-                }
-                break;
-            case "baseAsset":
-            case "quoteAsset":
-                if (value.length !== 0) {
-                    this.assetValidate(name);
-                } else {
-                    validate.push(name);
-                    this.setState({validate});
-                }
-                break;
-            case "baseBalance":
-            case "quoteBalance":
-                if (value !== "-" && isNaN(+value)) {
-                    validate.push(name);
-                    this.setState({validate});
-                } else {
-                    this.setState({
-                        validate: validate.filter(input => input !== name)
-                    });
-                }
-                break;
-            case "baseAmount":
-            case "quoteAmount":
-            case "baseSpread":
-            case "quoteSpread":
-                if (value === "" || isNaN(+value)) {
-                    validate.push(name);
-                    this.setState({validate});
-                } else {
-                    this.setState({
-                        validate: validate.filter(input => input !== name)
-                    });
-                }
-                break;
-            case "defaultPrice":
-                if (!isNaN(+value))
-                    this.setState({
-                        validate: validate.filter(input => input !== name)
-                    });
-                else {
-                    validate.push(name);
-                    this.setState({validate});
-                }
-                break;
-        }
-
-        console.log(this.state.validate);
-        this.props.enableCreate(this.state.validate.length == 0);
-    };
-
-    render() {
-        return (
-            <div>
-                <div className="content-block">
-                    <label className="left-label">
-                        <Translate content="bots.common.name" />
-                    </label>
-                    <input
-                        name="name"
-                        id="name"
-                        type="text"
-                        ref="input"
-                        value={this.state.name}
-                        onChange={this.handleChange}
-                        autoComplete="name"
-                        style={{
-                            border: this.state.validate.includes("name")
-                                ? "1px solid red"
-                                : "none"
-                        }}
-                    />
-                </div>
-                <div className="grid-block horizontal">
-                    <div className="content-block" style={{marginLeft: 50}}>
-                        <label style={{textAlign: "center"}}>
-                            <Translate content="bots.common.base" />
-                        </label>
-                        {/*                        <label className="left-label">
-                            <Translate content="bots.common.asset" />
-                        </label>*/}
-                        <AssetSelector
-                            name="baseAsset"
-                            value={this.state.baseAsset}
-                            onChange={this.handleChange}
-                        />
-                        <label className="left-label">
-                            <Translate content="bots.common.balance" />
-                        </label>
-                        <input
-                            name="baseBalance"
-                            id="baseBalance"
-                            type="text"
-                            ref="input"
-                            value={this.state.baseBalance}
-                            onChange={this.handleChange}
-                            autoComplete="baseBalance"
-                            style={{
-                                marginBottom: 30,
-                                border: this.state.validate.includes(
-                                    "baseBalance"
-                                )
-                                    ? "1px solid red"
-                                    : "none"
-                            }}
-                        />
-                        <label className="left-label">
-                            <Translate content="bots.common.amount" />
-                        </label>
-                        <div onChange={this.handleChange}>
-                            <input
-                                type="radio"
-                                value={true}
-                                name="percentBaseAmount"
-                            />{" "}
-                            <Translate content="bots.spread_trade.balance_percent" />
-                            <br />
-                            <input
-                                type="radio"
-                                value={false}
-                                name="percentBaseAmount"
-                                defaultChecked
-                            />{" "}
-                            <Translate content="bots.spread_trade.balance_value" />
-                        </div>
-                        <input
-                            name="baseAmount"
-                            id="baseAmount"
-                            type="text"
-                            ref="input"
-                            value={this.state.baseAmount}
-                            onChange={this.handleChange}
-                            autoComplete="baseAmount"
-                            style={{
-                                marginBottom: 30,
-                                border: this.state.validate.includes(
-                                    "baseAmount"
-                                )
-                                    ? "1px solid red"
-                                    : "none"
-                            }}
-                        />
-                        <label className="left-label">
-                            <Translate content="bots.spread_trade.spread" />
-                        </label>
-                        <input
-                            name="baseSpread"
-                            id="baseSpread"
-                            type="text"
-                            ref="input"
-                            value={this.state.baseSpread}
-                            onChange={this.handleChange}
-                            autoComplete="baseSpread"
-                            style={{
-                                marginBottom: 30,
-                                border: this.state.validate.includes(
-                                    "baseSpread"
-                                )
-                                    ? "1px solid red"
-                                    : "none"
-                            }}
-                        />
-                    </div>
-                    <div className="content-block" style={{marginLeft: 50}}>
-                        <label style={{textAlign: "center"}}>
-                            <Translate content="bots.common.quote" />
-                        </label>
-                        {/*                        <label className="left-label">
-                            <Translate content="bots.common.asset" />
-                        </label>*/}
-                        <AssetSelector
-                            name="quoteAsset"
-                            value={this.state.quoteAsset}
-                            onChange={this.handleChange}
-                        />
-                        <label className="left-label">
-                            <Translate content="bots.common.balance" />
-                        </label>
-                        <input
-                            name="quoteBalance"
-                            id="quoteBalance"
-                            type="text"
-                            ref="input"
-                            value={this.state.quoteBalance}
-                            onChange={this.handleChange}
-                            autoComplete="quoteBalance"
-                            style={{
-                                marginBottom: 30,
-                                border: this.state.validate.includes(
-                                    "quoteBalance"
-                                )
-                                    ? "1px solid red"
-                                    : "none"
-                            }}
-                        />
-                        <label className="left-label">
-                            <Translate content="bots.common.amount" />
-                        </label>
-                        <div onChange={this.handleChange}>
-                            <input
-                                type="radio"
-                                value={true}
-                                name="percentQuoteAmount"
-                            />{" "}
-                            <Translate content="bots.spread_trade.balance_percent" />
-                            <br />
-                            <input
-                                type="radio"
-                                value={false}
-                                name="percentQuoteAmount"
-                                defaultChecked
-                            />{" "}
-                            <Translate content="bots.spread_trade.balance_value" />
-                        </div>
-                        <input
-                            name="quoteAmount"
-                            id="quoteAmount"
-                            type="text"
-                            ref="input"
-                            value={this.state.quoteAmount}
-                            onChange={this.handleChange}
-                            autoComplete="quoteAmount"
-                            style={{
-                                marginBottom: 30,
-                                border: this.state.validate.includes(
-                                    "quoteAmount"
-                                )
-                                    ? "1px solid red"
-                                    : "none"
-                            }}
-                        />
-                        <label className="left-label">
-                            <Translate content="bots.spread_trade.spread" />
-                        </label>
-                        <input
-                            name="quoteSpread"
-                            id="quoteSpread"
-                            type="text"
-                            ref="input"
-                            value={this.state.quoteSpread}
-                            onChange={this.handleChange}
-                            autoComplete="quoteSpread"
-                            style={{
-                                marginBottom: 30,
-                                border: this.state.validate.includes(
-                                    "quoteSpread"
-                                )
-                                    ? "1px solid red"
-                                    : "none"
-                            }}
-                        />
-                    </div>
-                </div>
-                <div className="content-block">
-                    <label className="left-label">
-                        <Translate content="bots.spread_trade.default_price" />
-                    </label>
-
-                    <input
-                        name="defaultPrice"
-                        id="defaultPrice"
-                        type="text"
-                        ref="input"
-                        value={this.state.defaultPrice}
-                        onChange={this.handleChange}
-                        autoComplete="defaultPrice"
-                        style={{
-                            border: this.state.validate.includes("defaultPrice")
-                                ? "1px solid red"
-                                : "none"
-                        }}
-                    />
-                </div>
-                <div className="content-block">
-                    <label>
-                        <input
-                            type="checkbox"
-                            name="fromMarket"
-                            onChange={this.handleChange}
-                            checked={this.state.fromMarket}
-                        />
-                        <Translate content="bots.spread_trade.get_price_from_market" />
-                    </label>
-                </div>
-            </div>
-        );
-    }
-}
-
-export default Create;
+import React from "react";
+import BotManager from "lib/bots";
+import Apis from "lib/bots/apis";
+import {debounce} from "lodash-es";
+import AssetSelector from "../libs/AssetSelector";
+import Translate from "react-translate-component";
+
+class Create extends React.Component {
+    state = {
+        name: "",
+        quoteAsset: "GPH",
+        baseAsset: "RUDEX.USDT",
+
+        quoteAmount: 500.0,
+        baseAmount: 10,
+
+        baseSpread: 10,
+        quoteSpread: 10,
+
+        quoteBalance: 5000.0,
+        baseBalance: 100,
+
+        percentQuoteAmount: false,
+        percentBaseAmount: false,
+
+        validate: ["name"],
+        fromMarket: false
+    };
+
+    componentDidMount() {
+        this.assetValidate = debounce(this.assetValidate, 200);
+    }
+
+    assetValidate = async name => {
+        let asset = this.state[name];
+        let blockchainAssets = (await Apis.db.list_assets(asset, 1))[0];
+        let validate = this.state.validate;
+
+        if (asset !== blockchainAssets.symbol) validate.push(name);
+        else {
+            validate = validate.filter(input => input !== name);
+        }
+
+        this.setState({validate});
+        this.props.enableCreate(this.state.validate.length == 0);
+    };
+
+    handleChange = event => {
+        let name = event.target.name,
+            value =
+                event.target.type === "checkbox"
+                    ? event.target.checked
+                    : event.target.value;
+        console.log(name, value);
+
+        if (["baseAsset", "quoteAsset"].includes(name))
+            value = value.toUpperCase();
+
+        this.setState({[name]: value}, () => this.validate(name, value));
+    };
+
+    validate = (name, value) => {
+        let validate = this.state.validate;
+
+        switch (name) {
+            case "name":
+                if (
+                    !/^\w+$/.test(value) ||
+                    BotManager.hasBot(
+                        this.props.account,
+                        this.props.name,
+                        value
+                    )
+                ) {
+                    validate.push(name);
+                    this.setState({validate});
+                } else {
+                    this.setState({
+                        validate: validate.filter(input => input !== name)
+                    });
+                }
+                break;
+            case "baseAsset":
+            case "quoteAsset":
+                if (value.length !== 0) {
+                    this.assetValidate(name);
+                } else {
+                    validate.push(name);
+                    this.setState({validate});
+                }
+                break;
+            case "baseBalance":
+            case "quoteBalance":
+                if (value !== "-" && isNaN(+value)) {
+                    validate.push(name);
+                    this.setState({validate});
+                } else {
+                    this.setState({
+                        validate: validate.filter(input => input !== name)
+                    });
+                }
+                break;
+            case "baseAmount":
+            case "quoteAmount":
+            case "baseSpread":
+            case "quoteSpread":
+                if (value === "" || isNaN(+value)) {
+                    validate.push(name);
+                    this.setState({validate});
+                } else {
+                    this.setState({
+                        validate: validate.filter(input => input !== name)
+                    });
+                }
+                break;
+            case "defaultPrice":
+                if (!isNaN(+value))
+                    this.setState({
+                        validate: validate.filter(input => input !== name)
+                    });
+                else {
+                    validate.push(name);
+                    this.setState({validate});
+                }
+                break;
+        }
+
+        console.log(this.state.validate);
+        this.props.enableCreate(this.state.validate.length == 0);
+    };
+
+    render() {
+        return (
+            <div>
+                <div className="content-block">
+                    <label className="left-label">
+                        <Translate content="bots.common.name" />
+                    </label>
+                    <input
+                        name="name"
+                        id="name"
+                        type="text"
+                        ref="input"
+                        value={this.state.name}
+                        onChange={this.handleChange}
+                        autoComplete="name"
+                        style={{
+                            border: this.state.validate.includes("name")
+                                ? "1px solid red"
+                                : "none"
+                        }}
+                    />
+                </div>
+                <div className="grid-block horizontal">
+                    <div className="content-block" style={{marginLeft: 50}}>
+                        <label className="left-label">
+                            <Translate content="bots.common.quote" />
+                        </label>
+                        {/*                        <label className="left-label">
+                            <Translate content="bots.common.asset" />
+                        </label>*/}
+                        <AssetSelector
+                            name="quoteAsset"
+                            value={this.state.quoteAsset}
+                            onChange={this.handleChange}
+                        />
+                        <label className="left-label">
+                            <Translate content="bots.common.balance" />
+                        </label>
+                        <input
+                            name="quoteBalance"
+                            id="quoteBalance"
+                            type="text"
+                            ref="input"
+                            value={this.state.quoteBalance}
+                            onChange={this.handleChange}
+                            autoComplete="quoteBalance"
+                            style={{
+                                marginBottom: 30,
+                                border: this.state.validate.includes(
+                                    "quoteBalance"
+                                )
+                                    ? "1px solid red"
+                                    : "none"
+                            }}
+                        />
+                        <label className="left-label">
+                            <Translate content="bots.common.amount" />
+                        </label>
+                        <div onChange={this.handleChange}>
+                            <input
+                                type="radio"
+                                value={true}
+                                name="percentQuoteAmount"
+                            />{" "}
+                            <Translate content="bots.spread_trade.balance_percent" />
+                            <br />
+                            <input
+                                type="radio"
+                                value={false}
+                                name="percentQuoteAmount"
+                                defaultChecked
+                            />{" "}
+                            <Translate content="bots.spread_trade.balance_value" />
+                        </div>
+                        <input
+                            name="quoteAmount"
+                            id="quoteAmount"
+                            type="text"
+                            ref="input"
+                            value={this.state.quoteAmount}
+                            onChange={this.handleChange}
+                            autoComplete="quoteAmount"
+                            style={{
+                                marginBottom: 30,
+                                border: this.state.validate.includes(
+                                    "quoteAmount"
+                                )
+                                    ? "1px solid red"
+                                    : "none"
+                            }}
+                        />
+                        <label className="left-label">
+                            <Translate content="bots.spread_trade.spread" />
+                        </label>
+                        <input
+                            name="quoteSpread"
+                            id="quoteSpread"
+                            type="text"
+                            ref="input"
+                            value={this.state.quoteSpread}
+                            onChange={this.handleChange}
+                            autoComplete="quoteSpread"
+                            style={{
+                                marginBottom: 30,
+                                border: this.state.validate.includes(
+                                    "quoteSpread"
+                                )
+                                    ? "1px solid red"
+                                    : "none"
+                            }}
+                        />
+                    </div>
+                    <div className="content-block" style={{marginLeft: 50}}>
+                        <label className="left-label">
+                            <Translate content="bots.common.base" />
+                        </label>
+                        {/*                        <label className="left-label">
+                            <Translate content="bots.common.asset" />
+                        </label>*/}
+                        <AssetSelector
+                            name="baseAsset"
+                            value={this.state.baseAsset}
+                            onChange={this.handleChange}
+                        />
+                        <label className="left-label">
+                            <Translate content="bots.common.balance" />
+                        </label>
+                        <input
+                            name="baseBalance"
+                            id="baseBalance"
+                            type="text"
+                            ref="input"
+                            value={this.state.baseBalance}
+                            onChange={this.handleChange}
+                            autoComplete="baseBalance"
+                            style={{
+                                marginBottom: 30,
+                                border: this.state.validate.includes(
+                                    "baseBalance"
+                                )
+                                    ? "1px solid red"
+                                    : "none"
+                            }}
+                        />
+                        <label className="left-label">
+                            <Translate content="bots.common.amount" />
+                        </label>
+                        <div onChange={this.handleChange}>
+                            <input
+                                type="radio"
+                                value={true}
+                                name="percentBaseAmount"
+                            />{" "}
+                            <Translate content="bots.spread_trade.balance_percent" />
+                            <br />
+                            <input
+                                type="radio"
+                                value={false}
+                                name="percentBaseAmount"
+                                defaultChecked
+                            />{" "}
+                            <Translate content="bots.spread_trade.balance_value" />
+                        </div>
+                        <input
+                            name="baseAmount"
+                            id="baseAmount"
+                            type="text"
+                            ref="input"
+                            value={this.state.baseAmount}
+                            onChange={this.handleChange}
+                            autoComplete="baseAmount"
+                            style={{
+                                marginBottom: 30,
+                                border: this.state.validate.includes(
+                                    "baseAmount"
+                                )
+                                    ? "1px solid red"
+                                    : "none"
+                            }}
+                        />
+                        <label className="left-label">
+                            <Translate content="bots.spread_trade.spread" />
+                        </label>
+                        <input
+                            name="baseSpread"
+                            id="baseSpread"
+                            type="text"
+                            ref="input"
+                            value={this.state.baseSpread}
+                            onChange={this.handleChange}
+                            autoComplete="baseSpread"
+                            style={{
+                                marginBottom: 30,
+                                border: this.state.validate.includes(
+                                    "baseSpread"
+                                )
+                                    ? "1px solid red"
+                                    : "none"
+                            }}
+                        />
+                    </div>
+                </div>
+                <div className="content-block">
+                    <label className="left-label">
+                        <Translate content="bots.spread_trade.default_price" />
+                    </label>
+
+                    <input
+                        name="defaultPrice"
+                        id="defaultPrice"
+                        type="text"
+                        ref="input"
+                        value={this.state.defaultPrice}
+                        onChange={this.handleChange}
+                        autoComplete="defaultPrice"
+                        style={{
+                            border: this.state.validate.includes("defaultPrice")
+                                ? "1px solid red"
+                                : "none"
+                        }}
+                    />
+                </div>
+                <div className="content-block">
+                    <label>
+                        <input
+                            type="checkbox"
+                            name="fromMarket"
+                            onChange={this.handleChange}
+                            checked={this.state.fromMarket}
+                        />
+                        <Translate content="bots.spread_trade.get_price_from_market" />
+                    </label>
+                </div>
+            </div>
+        );
+    }
+}
+
+export default Create;
diff --git a/app/components/Bots/SpreadTrade/State.jsx b/app/components/Bots/SpreadTrade/State.jsx
index 093a9ec6a8..84917e2891 100644
--- a/app/components/Bots/SpreadTrade/State.jsx
+++ b/app/components/Bots/SpreadTrade/State.jsx
@@ -1,335 +1,335 @@
-import React from "react";
-import {AssetLabel} from "../libs/AssetSelector";
-import Select from "react-select";
-import Translate from "react-translate-component";
-
-class State extends React.Component {
-    UNSAFE_componentWillMount() {
-        this.setState(
-            Object.assign({validate: []}, this.props.bot.storage.read())
-        );
-    }
-
-    handleChange = event => {
-        let name = event.target.name,
-            value = event.target.value,
-            base,
-            quote;
-
-        //console.log(name, value, typeof value);
-
-        switch (name) {
-            case "baseAmount":
-                base = this.state.base;
-                base.amount = value;
-                this.setState({base});
-                break;
-            case "percentBaseAmount":
-                base = this.state.base;
-                base.percent = value == "true";
-                this.setState({base});
-                break;
-            case "baseBalance":
-                base = this.state.base;
-                base.balance = value;
-                this.setState({base});
-                break;
-            case "baseSpread":
-                base = this.state.base;
-                base.spread = value;
-                this.setState({base});
-                break;
-            case "quoteAmount":
-                quote = this.state.quote;
-                quote.amount = value;
-                this.setState({quote});
-                break;
-            case "percentQuoteAmount":
-                quote = this.state.quote;
-                quote.percent = value == "true";
-                this.setState({quote});
-                break;
-            case "quoteBalance":
-                quote = this.state.quote;
-                quote.balance = value;
-                this.setState({quote});
-                break;
-            case "quoteSpread":
-                quote = this.state.quote;
-                quote.spread = value;
-                this.setState({quote});
-                break;
-            case "defaultPrice":
-                this.setState({defaultPrice: value});
-                break;
-            case "fromMarket":
-                this.setState({fromMarket: event.target.checked});
-                break;
-        }
-
-        //this.setState({[name]: value}, () => this.validate(name, value));
-    };
-
-    handleUpdateBot = () => {
-        let stateNow = this.props.bot.storage.read();
-        this.state.base.order = stateNow.base.order;
-        this.state.quote.order = stateNow.quote.order;
-
-        this.props.bot.storage.write(this.state);
-    };
-
-    render() {
-        return (
-            <div>
-                <div className="grid-block horizontal">
-                    <div
-                        className="content-block"
-                        style={{
-                            marginLeft: 50,
-                            marginTop: 30
-                        }}
-                    >
-                        <label style={{textAlign: "center"}}>
-                            <Translate content="bots.common.base" />
-                        </label>
-                        {/*                        <label className="left-label">
-                            <Translate content="bots.common.asset" />
-                        </label>*/}
-                        <Select
-                            style={{marginBottom: 30}}
-                            name="baseAsset"
-                            value={{
-                                value: this.state.base.asset,
-                                label: (
-                                    <AssetLabel name={this.state.base.asset} />
-                                )
-                            }}
-                            clearable={false}
-                            searchable={false}
-                            disabled
-                        />
-                        <label className="left-label">
-                            <Translate content="bots.common.balance" />
-                        </label>
-                        <input
-                            name="baseBalance"
-                            type="text"
-                            ref="input"
-                            value={this.state.base.balance}
-                            onChange={this.handleChange}
-                            disabled={this.props.bot.run}
-                            style={{
-                                marginBottom: 30,
-                                border: this.state.validate.includes(
-                                    "baseBalance"
-                                )
-                                    ? "1px solid red"
-                                    : "none"
-                            }}
-                        />
-                        <label className="left-label">
-                            <Translate content="bots.common.amount" />
-                        </label>
-                        <div>
-                            <input
-                                type="radio"
-                                value={true}
-                                name="percentBaseAmount"
-                                checked={this.state.base.percent}
-                                onChange={this.handleChange}
-                            />{" "}
-                            <Translate content="bots.spread_trade.balance_percent" />
-                            <br />
-                            <input
-                                type="radio"
-                                value={false}
-                                name="percentBaseAmount"
-                                checked={!this.state.base.percent}
-                                onChange={this.handleChange}
-                            />{" "}
-                            <Translate content="bots.spread_trade.balance_value" />
-                        </div>
-                        <input
-                            name="baseAmount"
-                            type="text"
-                            ref="input"
-                            value={this.state.base.amount}
-                            onChange={this.handleChange}
-                            disabled={this.props.bot.run}
-                            style={{
-                                marginBottom: 30,
-                                border: this.state.validate.includes(
-                                    "baseAmount"
-                                )
-                                    ? "1px solid red"
-                                    : "none"
-                            }}
-                        />
-                        <label className="left-label">
-                            <Translate content="bots.spread_trade.spread" />
-                        </label>
-                        <input
-                            name="baseSpread"
-                            type="text"
-                            ref="input"
-                            value={this.state.base.spread}
-                            onChange={this.handleChange}
-                            disabled={this.props.bot.run}
-                            style={{
-                                marginBottom: 30,
-                                border: this.state.validate.includes(
-                                    "baseSpread"
-                                )
-                                    ? "1px solid red"
-                                    : "none"
-                            }}
-                        />
-                    </div>
-                    <div
-                        className="content-block"
-                        style={{
-                            marginLeft: 50,
-                            marginTop: 30
-                        }}
-                    >
-                        <label style={{textAlign: "center"}}>
-                            <Translate content="bots.common.quote" />
-                        </label>
-                        {/*                        <label className="left-label">
-                            <Translate content="bots.common.asset" />
-                        </label>*/}
-                        <Select
-                            style={{marginBottom: 30}}
-                            name="quoteAsset"
-                            value={{
-                                value: this.state.quote.asset,
-                                label: (
-                                    <AssetLabel name={this.state.quote.asset} />
-                                )
-                            }}
-                            clearable={false}
-                            searchable={false}
-                            disabled
-                        />
-                        <label className="left-label">
-                            <Translate content="bots.common.balance" />
-                        </label>
-                        <input
-                            name="quoteBalance"
-                            type="text"
-                            ref="input"
-                            value={this.state.quote.balance}
-                            onChange={this.handleChange}
-                            disabled={this.props.bot.run}
-                            style={{
-                                marginBottom: 30,
-                                border: this.state.validate.includes(
-                                    "quoteBalance"
-                                )
-                                    ? "1px solid red"
-                                    : "none"
-                            }}
-                        />
-                        <label className="left-label">
-                            <Translate content="bots.common.amount" />
-                        </label>
-                        <div>
-                            <input
-                                type="radio"
-                                value={true}
-                                name="percentQuoteAmount"
-                                checked={this.state.quote.percent}
-                                onChange={this.handleChange}
-                            />{" "}
-                            <Translate content="bots.spread_trade.balance_percent" />
-                            <br />
-                            <input
-                                type="radio"
-                                value={false}
-                                name="percentQuoteAmount"
-                                checked={!this.state.quote.percent}
-                                onChange={this.handleChange}
-                            />{" "}
-                            <Translate content="bots.spread_trade.balance_value" />
-                        </div>
-                        <input
-                            name="quoteAmount"
-                            type="text"
-                            ref="input"
-                            value={this.state.quote.amount}
-                            onChange={this.handleChange}
-                            disabled={this.props.bot.run}
-                            style={{
-                                marginBottom: 30,
-                                border: this.state.validate.includes(
-                                    "quoteAmount"
-                                )
-                                    ? "1px solid red"
-                                    : "none"
-                            }}
-                        />
-                        <label className="left-label">
-                            <Translate content="bots.spread_trade.spread" />
-                        </label>
-                        <input
-                            name="quoteSpread"
-                            type="text"
-                            ref="input"
-                            value={this.state.quote.spread}
-                            onChange={this.handleChange}
-                            disabled={this.props.bot.run}
-                            style={{
-                                marginBottom: 30,
-                                border: this.state.validate.includes(
-                                    "quoteSpread"
-                                )
-                                    ? "1px solid red"
-                                    : "none"
-                            }}
-                        />
-                    </div>
-                </div>
-                <div className="content-block">
-                    <label className="left-label">
-                        <Translate content="bots.spread_trade.default_price" />
-                    </label>
-                    <input
-                        name="defaultPrice"
-                        type="text"
-                        ref="input"
-                        value={this.state.defaultPrice}
-                        onChange={this.handleChange}
-                        disabled={this.props.bot.run}
-                        style={{
-                            border: this.state.validate.includes("defaultPrice")
-                                ? "1px solid red"
-                                : "none"
-                        }}
-                    />
-                </div>
-                <div className="content-block">
-                    <label>
-                        <input
-                            type="checkbox"
-                            name="fromMarket"
-                            onChange={this.handleChange}
-                            checked={this.state.fromMarket}
-                            disabled={this.props.bot.run}
-                        />
-                        <Translate content="bots.spread_trade.get_price_from_market" />
-                    </label>
-                </div>
-                <button
-                    className="button"
-                    onClick={this.handleUpdateBot}
-                    disabled={this.props.bot.run}
-                    style={{marginLeft: 50, marginBottom: 30}}
-                >
-                    <Translate content="bots.common.update" />
-                </button>
-            </div>
-        );
-    }
-}
-
-export default State;
+import React from "react";
+import {AssetLabel} from "../libs/AssetSelector";
+import Select from "react-select";
+import Translate from "react-translate-component";
+
+class State extends React.Component {
+    UNSAFE_componentWillMount() {
+        this.setState(
+            Object.assign({validate: []}, this.props.bot.storage.read())
+        );
+    }
+
+    handleChange = event => {
+        let name = event.target.name,
+            value = event.target.value,
+            base,
+            quote;
+
+        //console.log(name, value, typeof value);
+
+        switch (name) {
+            case "baseAmount":
+                base = this.state.base;
+                base.amount = value;
+                this.setState({base});
+                break;
+            case "percentBaseAmount":
+                base = this.state.base;
+                base.percent = value == "true";
+                this.setState({base});
+                break;
+            case "baseBalance":
+                base = this.state.base;
+                base.balance = value;
+                this.setState({base});
+                break;
+            case "baseSpread":
+                base = this.state.base;
+                base.spread = value;
+                this.setState({base});
+                break;
+            case "quoteAmount":
+                quote = this.state.quote;
+                quote.amount = value;
+                this.setState({quote});
+                break;
+            case "percentQuoteAmount":
+                quote = this.state.quote;
+                quote.percent = value == "true";
+                this.setState({quote});
+                break;
+            case "quoteBalance":
+                quote = this.state.quote;
+                quote.balance = value;
+                this.setState({quote});
+                break;
+            case "quoteSpread":
+                quote = this.state.quote;
+                quote.spread = value;
+                this.setState({quote});
+                break;
+            case "defaultPrice":
+                this.setState({defaultPrice: value});
+                break;
+            case "fromMarket":
+                this.setState({fromMarket: event.target.checked});
+                break;
+        }
+
+        //this.setState({[name]: value}, () => this.validate(name, value));
+    };
+
+    handleUpdateBot = () => {
+        let stateNow = this.props.bot.storage.read();
+        this.state.base.order = stateNow.base.order;
+        this.state.quote.order = stateNow.quote.order;
+
+        this.props.bot.storage.write(this.state);
+    };
+
+    render() {
+        return (
+            <div>
+                <div className="grid-block horizontal">
+                    <div
+                        className="content-block"
+                        style={{
+                            marginLeft: 50,
+                            marginTop: 30
+                        }}
+                    >
+                        <label className="left-label">
+                            <Translate content="bots.common.quote" />
+                        </label>
+                        {/*                        <label className="left-label">
+                            <Translate content="bots.common.asset" />
+                        </label>*/}
+                        <Select
+                            style={{marginBottom: 30}}
+                            name="quoteAsset"
+                            value={{
+                                value: this.state.quote.asset,
+                                label: (
+                                    <AssetLabel name={this.state.quote.asset} />
+                                )
+                            }}
+                            clearable={false}
+                            searchable={false}
+                            disabled
+                        />
+                        <label className="left-label">
+                            <Translate content="bots.common.balance" />
+                        </label>
+                        <input
+                            name="quoteBalance"
+                            type="text"
+                            ref="input"
+                            value={this.state.quote.balance}
+                            onChange={this.handleChange}
+                            disabled={this.props.bot.run}
+                            style={{
+                                marginBottom: 30,
+                                border: this.state.validate.includes(
+                                    "quoteBalance"
+                                )
+                                    ? "1px solid red"
+                                    : "none"
+                            }}
+                        />
+                        <label className="left-label">
+                            <Translate content="bots.common.amount" />
+                        </label>
+                        <div>
+                            <input
+                                type="radio"
+                                value={true}
+                                name="percentQuoteAmount"
+                                checked={this.state.quote.percent}
+                                onChange={this.handleChange}
+                            />{" "}
+                            <Translate content="bots.spread_trade.balance_percent" />
+                            <br />
+                            <input
+                                type="radio"
+                                value={false}
+                                name="percentQuoteAmount"
+                                checked={!this.state.quote.percent}
+                                onChange={this.handleChange}
+                            />{" "}
+                            <Translate content="bots.spread_trade.balance_value" />
+                        </div>
+                        <input
+                            name="quoteAmount"
+                            type="text"
+                            ref="input"
+                            value={this.state.quote.amount}
+                            onChange={this.handleChange}
+                            disabled={this.props.bot.run}
+                            style={{
+                                marginBottom: 30,
+                                border: this.state.validate.includes(
+                                    "quoteAmount"
+                                )
+                                    ? "1px solid red"
+                                    : "none"
+                            }}
+                        />
+                        <label className="left-label">
+                            <Translate content="bots.spread_trade.spread" />
+                        </label>
+                        <input
+                            name="quoteSpread"
+                            type="text"
+                            ref="input"
+                            value={this.state.quote.spread}
+                            onChange={this.handleChange}
+                            disabled={this.props.bot.run}
+                            style={{
+                                marginBottom: 30,
+                                border: this.state.validate.includes(
+                                    "quoteSpread"
+                                )
+                                    ? "1px solid red"
+                                    : "none"
+                            }}
+                        />
+                    </div>
+                    <div
+                        className="content-block"
+                        style={{
+                            marginLeft: 50,
+                            marginTop: 30
+                        }}
+                    >
+                        <label className="left-label">
+                            <Translate content="bots.common.base" />
+                        </label>
+                        {/*                        <label className="left-label">
+                            <Translate content="bots.common.asset" />
+                        </label>*/}
+                        <Select
+                            style={{marginBottom: 30}}
+                            name="baseAsset"
+                            value={{
+                                value: this.state.base.asset,
+                                label: (
+                                    <AssetLabel name={this.state.base.asset} />
+                                )
+                            }}
+                            clearable={false}
+                            searchable={false}
+                            disabled
+                        />
+                        <label className="left-label">
+                            <Translate content="bots.common.balance" />
+                        </label>
+                        <input
+                            name="baseBalance"
+                            type="text"
+                            ref="input"
+                            value={this.state.base.balance}
+                            onChange={this.handleChange}
+                            disabled={this.props.bot.run}
+                            style={{
+                                marginBottom: 30,
+                                border: this.state.validate.includes(
+                                    "baseBalance"
+                                )
+                                    ? "1px solid red"
+                                    : "none"
+                            }}
+                        />
+                        <label className="left-label">
+                            <Translate content="bots.common.amount" />
+                        </label>
+                        <div>
+                            <input
+                                type="radio"
+                                value={true}
+                                name="percentBaseAmount"
+                                checked={this.state.base.percent}
+                                onChange={this.handleChange}
+                            />{" "}
+                            <Translate content="bots.spread_trade.balance_percent" />
+                            <br />
+                            <input
+                                type="radio"
+                                value={false}
+                                name="percentBaseAmount"
+                                checked={!this.state.base.percent}
+                                onChange={this.handleChange}
+                            />{" "}
+                            <Translate content="bots.spread_trade.balance_value" />
+                        </div>
+                        <input
+                            name="baseAmount"
+                            type="text"
+                            ref="input"
+                            value={this.state.base.amount}
+                            onChange={this.handleChange}
+                            disabled={this.props.bot.run}
+                            style={{
+                                marginBottom: 30,
+                                border: this.state.validate.includes(
+                                    "baseAmount"
+                                )
+                                    ? "1px solid red"
+                                    : "none"
+                            }}
+                        />
+                        <label className="left-label">
+                            <Translate content="bots.spread_trade.spread" />
+                        </label>
+                        <input
+                            name="baseSpread"
+                            type="text"
+                            ref="input"
+                            value={this.state.base.spread}
+                            onChange={this.handleChange}
+                            disabled={this.props.bot.run}
+                            style={{
+                                marginBottom: 30,
+                                border: this.state.validate.includes(
+                                    "baseSpread"
+                                )
+                                    ? "1px solid red"
+                                    : "none"
+                            }}
+                        />
+                    </div>
+                </div>
+                <div className="content-block">
+                    <label className="left-label">
+                        <Translate content="bots.spread_trade.default_price" />
+                    </label>
+                    <input
+                        name="defaultPrice"
+                        type="text"
+                        ref="input"
+                        value={this.state.defaultPrice}
+                        onChange={this.handleChange}
+                        disabled={this.props.bot.run}
+                        style={{
+                            border: this.state.validate.includes("defaultPrice")
+                                ? "1px solid red"
+                                : "none"
+                        }}
+                    />
+                </div>
+                <div className="content-block">
+                    <label>
+                        <input
+                            type="checkbox"
+                            name="fromMarket"
+                            onChange={this.handleChange}
+                            checked={this.state.fromMarket}
+                            disabled={this.props.bot.run}
+                        />
+                        <Translate content="bots.spread_trade.get_price_from_market" />
+                    </label>
+                </div>
+                <button
+                    className="button"
+                    onClick={this.handleUpdateBot}
+                    disabled={this.props.bot.run}
+                    style={{marginLeft: 50, marginBottom: 30}}
+                >
+                    <Translate content="bots.common.update" />
+                </button>
+            </div>
+        );
+    }
+}
+
+export default State;
diff --git a/app/components/Bots/TrailingStop/Create.jsx b/app/components/Bots/TrailingStop/Create.jsx
index cf6f29664f..8dd73c5178 100644
--- a/app/components/Bots/TrailingStop/Create.jsx
+++ b/app/components/Bots/TrailingStop/Create.jsx
@@ -8,11 +8,11 @@ import Translate from "react-translate-component";
 class Create extends React.Component {
     state = {
         name: "",
-        sellAsset: "RUDEX.BTC",
+        sellAsset: "GPH",
         getAsset: "RUDEX.USDT",
-        amount: 0.01,
+        amount: 1000,
         minAmount: 1,
-        stoploss: 100,
+        stoploss: 0.01,
         percent: 10,
         validate: ["name"]
     };
@@ -141,8 +141,8 @@ class Create extends React.Component {
                         }}
                     />
                 </div>
-                <div className="grid-block horizontal" style={{marginLeft: 50}}>
-                    <div className="content-block">
+                <div className="grid-block horizontal">
+                    <div className="content-block" style={{marginLeft: 50}}>
                         <label className="left-label">
                             <Translate content="bots.trailing_stop.sell_asset" />
                         </label>
diff --git a/app/components/Bots/libs/AssetSelector.jsx b/app/components/Bots/libs/AssetSelector.jsx
index 48773683e4..35e03bc9c7 100644
--- a/app/components/Bots/libs/AssetSelector.jsx
+++ b/app/components/Bots/libs/AssetSelector.jsx
@@ -33,7 +33,7 @@ export class AssetLabel extends React.Component {
         let asset = await Assets[name];
 
         this.setState({
-            name: asset.bitasset_data_id ? `bit${name}` : name
+            name: asset.bitasset_data_id ? `gp${name}` : name
         });
     };
 
diff --git a/app/components/Dashboard/DashboardPage.jsx b/app/components/Dashboard/DashboardPage.jsx
index 2cc2933d4a..17c63b38c7 100644
--- a/app/components/Dashboard/DashboardPage.jsx
+++ b/app/components/Dashboard/DashboardPage.jsx
@@ -9,6 +9,8 @@ import SettingsStore from "stores/SettingsStore";
 import {Tabs, Tab} from "../Utility/Tabs";
 import {StarredMarkets, FeaturedMarkets} from "./Markets";
 import {getPossibleGatewayPrefixes} from "common/gateways";
+//import Dashboard from "../DashboardRuDEX/Dashboard";
+import {getMyMarketsQuotes} from "branding";
 
 class DashboardPage extends React.Component {
     render() {
@@ -41,12 +43,15 @@ class DashboardPage extends React.Component {
                         <div className="content-block small-12">
                             <div className="tabs-container generic-bordered-box">
                                 <Tabs
-                                    defaultActiveTab={1}
+                                    defaultActiveTab={0}
                                     segmented={false}
                                     setting="dashboardTab"
                                     className="account-tabs"
                                     tabsClass="account-overview no-padding bordered-header content-block"
                                 >
+                                    {/*                                    <Tab title="dashboard.top_markets">
+                                        <Dashboard {...this.props} />
+                                    </Tab>*/}
                                     <Tab title="dashboard.starred_markets">
                                         <StarredMarkets />
                                     </Tab>
@@ -60,21 +65,10 @@ class DashboardPage extends React.Component {
                                                         marginRight: 5
                                                     }}
                                                     src={
-                                                        imgName.indexOf(
-                                                            "RUDEX"
-                                                        ) !== -1 ||
-                                                        imgName.indexOf(
-                                                            "GPH"
-                                                        ) !== -1 ||
-                                                        imgName.indexOf(
-                                                            "USD"
+                                                        getMyMarketsQuotes().indexOf(
+                                                            imgName
                                                         ) !== -1
-                                                            ? `${__BASE_URL__}asset-symbols/${imgName
-                                                                  .replace(
-                                                                      /^BTC/,
-                                                                      "OPEN.BTC"
-                                                                  )
-                                                                  .toLowerCase()}.png`
+                                                            ? `${__BASE_URL__}asset-symbols/${imgName.toLowerCase()}.png`
                                                             : "asset-symbols/unknown.png"
                                                     }
                                                 />
@@ -105,28 +99,25 @@ class DashboardPage extends React.Component {
     }
 }
 
-export default connect(
-    DashboardPage,
-    {
-        listenTo() {
-            return [AccountStore, SettingsStore];
-        },
-        getProps() {
-            let {
-                myActiveAccounts,
-                myHiddenAccounts,
-                passwordAccount,
-                accountsLoaded,
-                refsLoaded
-            } = AccountStore.getState();
+export default connect(DashboardPage, {
+    listenTo() {
+        return [AccountStore, SettingsStore];
+    },
+    getProps() {
+        let {
+            myActiveAccounts,
+            myHiddenAccounts,
+            passwordAccount,
+            accountsLoaded,
+            refsLoaded
+        } = AccountStore.getState();
 
-            return {
-                myActiveAccounts,
-                myHiddenAccounts,
-                passwordAccount,
-                accountsReady: accountsLoaded && refsLoaded,
-                preferredBases: SettingsStore.getState().preferredBases
-            };
-        }
+        return {
+            myActiveAccounts,
+            myHiddenAccounts,
+            passwordAccount,
+            accountsReady: accountsLoaded && refsLoaded,
+            preferredBases: SettingsStore.getState().preferredBases
+        };
     }
-);
+});
diff --git a/app/components/Dashboard/MarketsTable.jsx b/app/components/Dashboard/MarketsTable.jsx
index f851515933..b3d211aaa7 100644
--- a/app/components/Dashboard/MarketsTable.jsx
+++ b/app/components/Dashboard/MarketsTable.jsx
@@ -13,6 +13,7 @@ import Icon from "../Icon/Icon";
 import AssetName from "../Utility/AssetName";
 import {Link} from "react-router-dom";
 import {Icon as AntIcon} from "bitshares-ui-style-guide";
+import {getImageName} from "branding";
 
 class MarketsTable extends React.Component {
     constructor() {
@@ -337,30 +338,6 @@ class MarketsTable extends React.Component {
     getTableData(row) {
         let {base, quote, marketStats, isHidden, inverted, basePrecision} = row;
 
-        function getImageName(symbol) {
-            //if (symbol === "OPEN.BTC" || symbol === "GDEX.BTC") return symbol;
-            if (symbol.startsWith("RUDEX.")) return symbol;
-
-            if (
-                symbol == "DONATE" ||
-                symbol == "GPH" ||
-                symbol == "USD"
-
-                /* ||
-        symbol == "EUR" ||
-        symbol == "CNY" ||
-        symbol == "RUB" ||
-        symbol == "BTC" ||
-        symbol == "GOLD" ||
-        symbol == "SILVER" ||
-        symbol == "OIL"*/
-            )
-                return symbol;
-
-            let imgName = symbol.split(".");
-            return imgName.length === 2 ? imgName[1] : imgName[0];
-        }
-
         let imgName = getImageName(quote);
 
         let marketID = `${quote}_${base}`;
@@ -504,11 +481,11 @@ class MarketsTable extends React.Component {
                     let baseSymbol = row.base;
 
                     if (quoteIsBitAsset) {
-                        quoteSymbol = "bit" + quoteSymbol;
+                        quoteSymbol = "gp" + quoteSymbol;
                     }
 
                     if (baseIsBitAsset) {
-                        baseSymbol = "bit" + baseSymbol;
+                        baseSymbol = "gp" + baseSymbol;
                     }
 
                     const filterPair = filter.includes(":");
diff --git a/app/components/DashboardRuDEX/Dashboard.jsx b/app/components/DashboardRuDEX/Dashboard.jsx
new file mode 100644
index 0000000000..41e0161190
--- /dev/null
+++ b/app/components/DashboardRuDEX/Dashboard.jsx
@@ -0,0 +1,360 @@
+import React from "react";
+import Translate from "react-translate-component";
+import MarketCard from "./MarketCard";
+import utils from "common/utils";
+import {Apis} from "bitsharesjs-ws";
+import LoadingIndicator from "../LoadingIndicator";
+import SettingsStore from "stores/SettingsStore";
+import {connect} from "alt-react";
+import MarketsStore from "../../stores/MarketsStore";
+
+import counterpart from "counterpart";
+
+import {getMyMarketsQuotes, getFeaturedMarkets} from "branding";
+
+import "./DashboardRuDEX.css";
+
+class Dashboard extends React.Component {
+    constructor(props) {
+        super(props);
+
+        this.state = {
+            width: null,
+
+            marketStats: this.props.marketStats,
+
+            featuredMarkets: [],
+
+            volume24_usdt: 0,
+
+            markets: [],
+            updating: true,
+
+            timeOutID: undefined
+        };
+
+        this._setDimensions = this._setDimensions.bind(this);
+        this.pingMarkets = this.pingMarkets.bind(this);
+    }
+
+    componentDidMount() {
+        this._setDimensions();
+        window.addEventListener("resize", this._setDimensions, {
+            capture: false,
+            passive: true
+        });
+    }
+
+    UNSAFE_componentWillMount() {
+        let data = this.calcVolumeSort();
+
+        this.setState({
+            featuredMarkets: data
+        });
+
+        let timeOutID = setTimeout(this.pingMarkets, 3000);
+
+        this.setState({
+            timeOutID: timeOutID
+        });
+    }
+
+    pingMarkets() {
+        let timeOutID;
+
+        let allMarketStats = MarketsStore.getState().allMarketStats;
+
+        if (allMarketStats.size !== 0) {
+            /*            if (allMarketStats.toJSON().hasOwnProperty("GPH_RUDEX.USDT")) {
+                            //console.log("allMarketStats: " + JSON.stringify((allMarketStats.toJSON())["GPH_RUDEX.USDT"]));
+                            //console.log("----------------------------------------------------------------");
+                        }
+
+                        if (allMarketStats.toJSON().hasOwnProperty("RUDEX.USDT_GPH")) {
+                            //console.log("allMarketStats: " + JSON.stringify((allMarketStats.toJSON())["RUDEX.USDT_GPH"]));
+                            //console.log("----------------------------------------------------------------");
+                        }*/
+
+            let data = this.calcVolumeSort();
+            this.setState({
+                featuredMarkets: data,
+                marketStats: allMarketStats,
+                updating: false
+            });
+
+            timeOutID = setTimeout(this.pingMarkets, 20000);
+        } else {
+            timeOutID = setTimeout(this.pingMarkets, 3000);
+        }
+
+        this.setState({
+            timeOutID: timeOutID
+        });
+    }
+
+    shouldComponentUpdate(nextProps, nextState) {
+        return (
+            !utils.are_equal_shallow(
+                nextState.featuredMarkets,
+                this.state.featuredMarkets
+            ) ||
+            nextProps.marketStats !== this.props.marketStats ||
+            nextState.marketStats !== this.state.marketStats ||
+            nextState.volume24_usdt !== this.state.volume24_usdt ||
+            nextState.width !== this.state.width
+        );
+    }
+
+    componentWillUnmount() {
+        window.removeEventListener("resize", this._setDimensions);
+    }
+
+    _setDimensions() {
+        let width = window.innerWidth;
+
+        if (width !== this.state.width) {
+            this.setState({width});
+        }
+    }
+
+    getVolumeUSDT(quote, base, allMarketStats) {
+        let marketStats1 = allMarketStats.get(`${quote}_${base}`);
+        let volume_usdt = 0;
+
+        if (marketStats1 && quote == "RUDEX.USDT") {
+            volume_usdt = marketStats1.volumeQuote * 1;
+        } else {
+            try {
+                let marketStats_to_USDT = allMarketStats.get(
+                    `RUDEX.USDT_${quote}`
+                );
+
+                let price;
+                if (
+                    marketStats_to_USDT &&
+                    marketStats_to_USDT.price &&
+                    marketStats_to_USDT.price.quote.amount != 0
+                ) {
+                    price =
+                        ((marketStats_to_USDT.price.quote.amount /
+                            marketStats_to_USDT.price.base.amount) *
+                            Math.pow(
+                                10,
+                                marketStats_to_USDT.price.base.precision
+                            )) /
+                        Math.pow(10, marketStats_to_USDT.price.quote.precision);
+
+                    volume_usdt = marketStats1.volumeQuote * price * 1;
+                }
+            } catch (e) {
+                //console.log(`log error ${quote} / ${base} : volume_usdt: ${volume_usdt}`);
+            }
+        }
+
+        return volume_usdt;
+    }
+
+    _SortFilterPairs(pairs) {
+        let sortPairs = pairs.map(pair => {
+            let res = getFeaturedMarkets().find(el => {
+                if (el[0] == pair[1] && el[1] == pair[0]) {
+                    return true;
+                } else return false;
+            });
+
+            if (res) {
+                //Not in 2nd place
+                if (pair[0] === "RUDEX.USDT") {
+                    return [pair[0], pair[1], 0];
+                }
+                return [pair[1], pair[0], 0];
+            } else {
+                //Not in 2nd place
+                if (pair[0] === "RUDEX.USDT") {
+                    return [pair[0], pair[1], 0];
+                }
+                return [pair[0], pair[1], 0];
+            }
+
+            //Not in 2nd place
+            if (
+                pair[1] === "RUDEX.USDT" ||
+                pair[1] === "RUDEX.BUSD" ||
+                pair[1] === "GPH" ||
+                pair[1] === "USD" ||
+                pair[1] === "EUR" ||
+                pair[1] === "RUB" ||
+                pair[1] === "CNY" ||
+                pair[1] === "GOLD" ||
+                pair[1] === "SILVER" ||
+                pair[1] === "RUDEX.BTS" ||
+                pair[1] === "RUDEX.EOS" //||
+            ) {
+                return [pair[1], pair[0], 0];
+            }
+
+            //Not in 1nd place
+            if (
+                pair[0] === "RUDEX.XMR" ||
+                pair[0] === "RUDEX.BTC" ||
+                pair[0] === "RUDEX.BTCB" //||
+            ) {
+                return [pair[1], pair[0], 0];
+            }
+
+            return [pair[0], pair[1], 0];
+        });
+
+        return sortPairs;
+    }
+
+    calcVolumeSort() {
+        let pairs = [];
+        let pairsNew = [];
+        let volume24_usdt = 0;
+
+        let all_coins = getMyMarketsQuotes();
+
+        for (let i = 0; i < all_coins.length - 1; i++) {
+            for (let k = i + 1; k < all_coins.length; k++) {
+                pairs.push([all_coins[i], all_coins[k], 0, 0, 0, 0]);
+            }
+        }
+
+        pairs = this._SortFilterPairs(pairs);
+
+        let allMarketStats = MarketsStore.getState().allMarketStats;
+
+        if (allMarketStats.size == 0) return pairs;
+
+        for (let i = 0; i < pairs.length - 1; i++) {
+            let volume_usdt = 0;
+
+            volume_usdt = this.getVolumeUSDT(
+                pairs[i][0],
+                pairs[i][1],
+                allMarketStats
+            );
+
+            let pairStat = allMarketStats.get(`${pairs[i][1]}_${pairs[i][0]}`);
+
+            let price = pairStat !== undefined ? pairStat.price : 0;
+            let volume = pairStat !== undefined ? pairStat.volumeQuote : 0;
+            let change = pairStat !== undefined ? pairStat.change : 0;
+
+            pairsNew.push([
+                pairs[i][0],
+                pairs[i][1],
+                volume_usdt,
+                price,
+                volume,
+                change
+            ]);
+
+            volume24_usdt = volume24_usdt + volume_usdt;
+        }
+
+        this.setState({
+            volume24_usdt: volume24_usdt
+        });
+
+        return pairsNew;
+    }
+
+    render() {
+        let {featuredMarkets, marketStats} = this.state;
+
+        let validMarkets = 0;
+
+        let markets = featuredMarkets
+            .sort(function(a, b) {
+                return b[2] * 1 - a[2] * 1;
+            })
+            .map(pair => {
+                validMarkets++;
+                let className = "";
+                return (
+                    <MarketCard
+                        key={validMarkets}
+                        marketId={pair[1] + "_" + pair[0]}
+                        className={className}
+                        quote={pair[0]}
+                        base={pair[1]}
+                        volumeUSDT={pair[2]}
+                        history={this.props.history}
+                        hide={validMarkets > 400}
+                        price={pair[3]}
+                        volume={pair[4]}
+                        change={pair[5]}
+                    />
+                );
+            });
+
+        return (
+            <div className="grid-block vertical dashboardRuDEX">
+                <div ref="container" className="grid-container">
+                    {this.state.updating === true ? (
+                        <div className="grid-frame vertical">
+                            <LoadingIndicator
+                                loadingText={counterpart.translate(
+                                    "footer.loading"
+                                )}
+                            />
+                        </div>
+                    ) : (
+                        <div className="grid-frame vertical">
+                            <div
+                                className="block-content-header"
+                                style={{
+                                    padding: 0,
+                                    margin: 0
+                                }}
+                            >
+                                <div
+                                    style={{
+                                        paddingBottom: "24px"
+                                    }}
+                                >
+                                    <Translate
+                                        content="exchange.volume_24"
+                                        component="h1"
+                                        style={{margin: "10px 0px 5px 0rem"}}
+                                    />{" "}
+                                    $
+                                    {utils.format_number(
+                                        this.state.volume24_usdt,
+                                        2
+                                    )}
+                                </div>
+                            </div>
+                            <div className="grid-block small-up-1 medium-up-3 large-up-4  no-overflow fm-outer-container">
+                                {this.state.volume24_usdt === 0
+                                    ? null
+                                    : markets}
+                            </div>
+                        </div>
+                    )}
+                    {marketStats === undefined || marketStats.size === 0
+                        ? markets
+                        : null}
+                </div>
+            </div>
+        );
+    }
+}
+
+let DashboardWrapper = props => {
+    return <Dashboard {...props} />;
+};
+
+export default DashboardWrapper = connect(DashboardWrapper, {
+    listenTo() {
+        return [SettingsStore, MarketsStore];
+    },
+    getProps() {
+        return {
+            viewSettings: SettingsStore.getState().viewSettings,
+            marketStats: MarketsStore.getState().allMarketStats
+        };
+    }
+});
diff --git a/app/components/DashboardRuDEX/DashboardRuDEX.css b/app/components/DashboardRuDEX/DashboardRuDEX.css
new file mode 100644
index 0000000000..e5767fd64e
--- /dev/null
+++ b/app/components/DashboardRuDEX/DashboardRuDEX.css
@@ -0,0 +1,43 @@
+.grid-block.dashboardRuDEX {
+    margin: 0;
+}
+
+.grid-block.dashboardRuDEX .block-content-header {
+    text-align: center !important;
+}
+
+.grid-content .dashboardRuDEX .grid-block {
+    margin: 0;
+}
+
+.grid-content .dashboardRuDEX .loading-panel {
+    top: 20%;
+}
+
+.dashboardRuDEX .grid-frame {
+    height: auto;
+    min-height: 500px;
+}
+
+.block-content-header {
+    padding-bottom: 0;
+    margin-bottom: 15px;
+}
+
+.grid-block.dashboardRuDEX .grid-container {
+    padding: 1rem;
+}
+
+.grid-block.dashboardRuDEX {
+    margin-right: 0;
+    overflow-y: auto !important;
+}
+
+.grid-block.dashboardRuDEX .loading-panel {
+    position: fixed !important;
+    top: 40% !important;
+}
+
+.grid-block.dashboardRuDEX .grid-block.fm-outer-container {
+    margin-left: 1rem;
+}
diff --git a/app/components/DashboardRuDEX/MarketCard.jsx b/app/components/DashboardRuDEX/MarketCard.jsx
new file mode 100644
index 0000000000..b2153130a0
--- /dev/null
+++ b/app/components/DashboardRuDEX/MarketCard.jsx
@@ -0,0 +1,422 @@
+import React from "react";
+import ChainTypes from "../Utility/ChainTypes";
+import BindToChainState from "../Utility/BindToChainState";
+import AssetName from "../Utility/AssetName";
+import cnames from "classnames";
+import MarketsActions from "actions/MarketsActions";
+import MarketsStore from "stores/MarketsStore";
+import {connect} from "alt-react";
+import utils from "common/utils";
+import Translate from "react-translate-component";
+import PropTypes from "prop-types";
+import {get_allTokens} from "../../branding";
+
+import Icon from "../Icon/Icon";
+import {Link} from "react-router-dom";
+import counterpart from "counterpart";
+
+import SettingsActions from "../../actions/SettingsActions";
+import SettingsStore from "../../stores/SettingsStore";
+
+class MarketCard extends React.Component {
+    static propTypes = {
+        quote: ChainTypes.ChainAsset.isRequired,
+        base: ChainTypes.ChainAsset.isRequired
+        //invert: PropTypes.bool
+    };
+
+    static defaultProps = {
+        //invert: true
+    };
+
+    constructor(props) {
+        super(props);
+
+        this.statsInterval = null;
+
+        this.state = {
+            imgError: false,
+
+            base: this.props.base,
+            quote: this.props.quote,
+
+            marketStats: this.props.marketStats,
+            starredMarkets: this.props.starredMarkets,
+
+            history: this.props.history,
+
+            volumeUSDT: this.props.volumeUSDT,
+
+            price: this.props.price,
+            volume: this.props.volume,
+            change: this.props.change
+        };
+    }
+
+    _toggleMarket(e, quote, base) {
+        if (e) {
+            e.preventDefault();
+        }
+
+        MarketsActions.getMarketStats.defer(base, quote);
+
+        let marketStats = MarketsStore.getState().allMarketStats.get(
+            `${quote.get("symbol")}_${base.get("symbol")}`
+        );
+
+        this.statsInterval = setInterval(
+            MarketsActions.getMarketStats.bind(this, base, quote),
+            30 * 1000
+        );
+
+        this.setState({
+            base: quote,
+            quote: base,
+            marketStats: marketStats,
+
+            price: marketStats ? marketStats.price : 0,
+            volume: marketStats ? marketStats.volumeQuote : 0,
+            change: marketStats ? marketStats.change : 0
+        });
+    }
+
+    _checkStats(
+        newStats = {close: {}, price: {}},
+        oldStats = {close: {}, price: {}}
+    ) {
+        return (
+            newStats.volumeQuote !== oldStats.volumeQuote ||
+            !utils.are_equal_shallow(
+                newStats.close && newStats.close.base,
+                oldStats.close && oldStats.close.base
+            ) ||
+            !utils.are_equal_shallow(
+                newStats.close && newStats.close.quote,
+                oldStats.close && oldStats.close.quote
+            ) ||
+            newStats.change !== oldStats.change ||
+            newStats.volumeBase !== oldStats.volumeBase ||
+            !utils.are_equal_shallow(
+                newStats.price && newStats.price.quote,
+                oldStats.price && oldStats.price.quote
+            ) ||
+            !utils.are_equal_shallow(
+                newStats.price && newStats.price.base,
+                oldStats.price && oldStats.price.base
+            )
+        );
+    }
+
+    shouldComponentUpdate(np, ns) {
+        return (
+            //this._checkStats(ns.marketStats, this.state.marketStats) ||
+
+            ns.imgError !== this.state.imgError ||
+            ns.starredMarkets !== this.state.starredMarkets ||
+            ns.base.get("id") !== this.state.base.get("id") ||
+            ns.quote.get("id") !== this.state.quote.get("id") ||
+            np.volumeUSDT !== this.props.volumeUSDT ||
+            np.price !== this.props.price ||
+            np.volume !== this.props.volume ||
+            np.change !== this.props.change
+        );
+    }
+
+    UNSAFE_componentWillUpdate(nextProps, nextState) {
+        if (
+            nextProps.quote.get("symbol") !== this.state.quote.get("symbol") ||
+            nextProps.base.get("symbol") !== this.state.base.get("symbol")
+        ) {
+            this.setState({
+                quote: nextProps.quote,
+                base: nextProps.base
+            });
+        }
+
+        if (nextProps.volumeUSDT !== this.state.volumeUSDT) {
+            this.setState({
+                volumeUSDT: nextProps.volumeUSDT
+            });
+        }
+
+        if (
+            nextProps.price !== this.state.price ||
+            nextProps.volume !== this.state.volume ||
+            nextProps.change !== this.state.change
+        ) {
+            this.setState({
+                price: nextProps.price,
+                volume: nextProps.volume,
+                change: nextProps.change
+            });
+        }
+    }
+
+    UNSAFE_componentWillMount() {
+        MarketsActions.getMarketStats.defer(this.state.quote, this.state.base);
+
+        let marketStats = MarketsStore.getState().allMarketStats.get(
+            `${this.state.base.get("symbol")}_${this.state.quote.get("symbol")}`
+        );
+
+        this.statsInterval = setInterval(
+            MarketsActions.getMarketStats.bind(
+                this,
+                this.state.quote,
+                this.state.base
+            ),
+            30 * 1000
+        );
+
+        this.setState({
+            marketStats: marketStats,
+
+            price: marketStats ? marketStats.price : 0,
+            volume: marketStats ? marketStats.volumeQuote : 0,
+            change: marketStats ? marketStats.change : 0
+        });
+    }
+
+    componentWillUnmount() {
+        clearInterval(this.statsInterval);
+    }
+
+    goToMarket(e) {
+        //e.preventDefault();
+
+        let history = this.state.history;
+        history.push(
+            `/market/${this.state.base.get("symbol")}_${this.state.quote.get(
+                "symbol"
+            )}`
+        );
+    }
+
+    _addMarket(quote, base) {
+        let marketID = `${quote}_${base}`;
+
+        if (!this.state.starredMarkets.has(marketID)) {
+            SettingsActions.addStarMarket(quote, base);
+        } else {
+            SettingsActions.removeStarMarket(quote, base);
+        }
+
+        this.setState({
+            starredMarkets: SettingsStore.getState().starredMarkets
+        });
+    }
+
+    _onError(imgName) {
+        if (!this.state.imgError) {
+            this.refs[imgName.toLowerCase()].src = "asset-symbols/unknown.png";
+            this.setState({
+                imgError: true
+            });
+        }
+    }
+
+    render() {
+        let {hide, isLowVolume} = this.props;
+        let {
+            base,
+            quote,
+            marketStats,
+            volumeUSDT,
+
+            price,
+            volume,
+            change
+        } = this.state;
+
+        if (isLowVolume || hide) return null;
+
+        if (!marketStats || volumeUSDT < 1) return null;
+
+        price =
+            price && price
+                ? utils.price_text(price.toReal(), base, quote)
+                : null;
+
+        volume = !volume
+            ? null
+            : utils.format_volume(volume, quote.get("precision"));
+
+        change = !change ? null : change;
+
+        function getImageName(asset) {
+            if (asset === null) return null;
+
+            let symbol = asset.get("symbol");
+
+            if (symbol.startsWith("RUDEX.")) return symbol;
+
+            if (
+                get_allTokens().nativeTokens.indexOf(symbol) !== -1 ||
+                symbol == "DONATE" ||
+                symbol == "DEXBOT"
+            )
+                return symbol;
+
+            return "unknown";
+        }
+
+        let imgName = getImageName(base);
+
+        let changeClass = !change
+            ? ""
+            : parseFloat(change) > 0
+            ? "change-up"
+            : parseFloat(change) < 0
+            ? "change-down"
+            : "";
+
+        let marketID = `${base.get("symbol")}_${quote.get("symbol")}`;
+
+        const starClass = this.state.starredMarkets.has(marketID)
+            ? "gold-star"
+            : "grey-star";
+
+        return (
+            <div
+                className={cnames(
+                    "grid-block no-overflow fm-container",
+                    this.props.className
+                )}
+            >
+                <div
+                    className="grid-block vertical shrink"
+                    style={{
+                        cursor: "pointer"
+                    }}
+                    onClick={e => {
+                        this.goToMarket(e);
+                    }}
+                >
+                    <div className="v-align">
+                        <img
+                            className="align-center"
+                            ref={imgName.toLowerCase()}
+                            onError={this._onError.bind(this, imgName)}
+                            style={{maxWidth: 70}}
+                            src={`${__BASE_URL__}asset-symbols/${imgName.toLowerCase()}.png`}
+                        />
+                    </div>
+                </div>
+                <div className="grid-block vertical no-overflow">
+                    <div className="fm-name">
+                        <AssetName dataPlace="top" name={base.get("symbol")} />{" "}
+                        :{" "}
+                        <AssetName dataPlace="top" name={quote.get("symbol")} />
+                    </div>
+
+                    <div className="label-actions">
+                        <Translate
+                            component="span"
+                            className="stat-text"
+                            content="exchange.trading_pair"
+                        />
+                        <div
+                            onClick={e => {
+                                this._toggleMarket(e, quote, base);
+                            }}
+                            data-intro={counterpart.translate(
+                                "walkthrough.switch_button"
+                            )}
+                            style={{
+                                padding: "0px 5px 0px 5px",
+                                display: "inline",
+                                cursor: "pointer"
+                            }}
+                        >
+                            <Icon
+                                className="shuffle"
+                                name="shuffle"
+                                title={counterpart.translate("icons.shuffle")}
+                            />
+                        </div>
+
+                        <a
+                            style={{
+                                cursor: "pointer"
+                            }}
+                            onClick={() => {
+                                this._addMarket(
+                                    base.get("symbol"),
+                                    quote.get("symbol")
+                                );
+                            }}
+                            data-intro={counterpart.translate(
+                                "walkthrough.favourite_button"
+                            )}
+                        >
+                            <Icon
+                                className={starClass}
+                                name="fi-star"
+                                title={counterpart.translate(
+                                    "icons.fi_star.market"
+                                )}
+                            />
+                        </a>
+                    </div>
+
+                    <div
+                        className="grid-block vertical no-overflow"
+                        style={{
+                            marginTop: "10px",
+                            cursor: "pointer"
+                        }}
+                        onClick={e => {
+                            this.goToMarket(e);
+                        }}
+                    >
+                        <div className="fm-volume">
+                            <Translate content="exchange.price" />:{" "}
+                            <div className="float-right">{price}</div>
+                        </div>
+
+                        <div className="fm-volume">
+                            <Translate content="exchange.volume" />:{" "}
+                            <div className="float-right">{volume}</div>
+                        </div>
+
+                        <div className="fm-volume">
+                            <Translate content="exchange.volume_24_usdt" />:{" "}
+                            <div className="float-right">
+                                {utils.format_volume(volumeUSDT, 2)}
+                            </div>
+                        </div>
+
+                        <div className="fm-change">
+                            <Translate content="exchange.change" />:{" "}
+                            <div className={cnames("float-right", changeClass)}>
+                                {change}%
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        );
+    }
+}
+
+MarketCard = BindToChainState(MarketCard);
+
+class MarketCardWrapper extends React.Component {
+    render() {
+        return <MarketCard {...this.props} />;
+    }
+}
+
+export default connect(MarketCardWrapper, {
+    listenTo() {
+        return [MarketsStore];
+    },
+    getProps(props) {
+        return {
+            marketStats: MarketsStore.getState().allMarketStats.get(
+                props.marketId
+            ),
+            starredMarkets: SettingsStore.getState().starredMarkets
+        };
+    }
+});
diff --git a/app/components/DepositWithdraw/rudex/RuDexGateway.jsx b/app/components/DepositWithdraw/rudex/RuDexGateway.jsx
index 0b62f922bc..794f003602 100644
--- a/app/components/DepositWithdraw/rudex/RuDexGateway.jsx
+++ b/app/components/DepositWithdraw/rudex/RuDexGateway.jsx
@@ -21,8 +21,10 @@ class RuDexGateway extends React.Component {
         super(props);
 
         this.state = {
-            activeCoin: this._getActiveCoin(props, {action: "deposit"}),
-            action: props.viewSettings.get("rudexAction", "deposit")
+            activeCoin: this._getActiveCoin(props, {
+                action: props.viewSettings.get("rudexAction") || "deposit"
+            }),
+            action: props.viewSettings.get("rudexAction") || "deposit"
         };
     }
 
@@ -50,13 +52,13 @@ class RuDexGateway extends React.Component {
     UNSAFE_componentWillReceiveProps(nextProps) {
         if (nextProps.provider !== this.props.provider) {
             this.setState({
-                activeCoin: this._getActiveCoin(nextProps, this.state.action)
+                activeCoin: this._getActiveCoin(nextProps, this.state)
             });
         }
 
         if (nextProps.network !== this.props.network) {
             this.setState({
-                activeCoin: this._getActiveCoin(nextProps, this.state.action)
+                activeCoin: this._getActiveCoin(nextProps, this.state)
             });
         }
     }
diff --git a/app/components/DepositWithdraw/rudex/RuDexGatewayDepositRequest.jsx b/app/components/DepositWithdraw/rudex/RuDexGatewayDepositRequest.jsx
index 8454330b20..f9f097136a 100644
--- a/app/components/DepositWithdraw/rudex/RuDexGatewayDepositRequest.jsx
+++ b/app/components/DepositWithdraw/rudex/RuDexGatewayDepositRequest.jsx
@@ -425,7 +425,7 @@ class RuDexGatewayDepositRequest extends React.Component {
                                 <b>
                                     <Translate
                                         content="gateway.rudex.min_amount"
-                                        minAmount={utils.format_number(
+                                        minamount={utils.format_number(
                                             this.props.min_amount /
                                                 utils.get_asset_precision(
                                                     this.props.asset_precision
@@ -441,7 +441,7 @@ class RuDexGatewayDepositRequest extends React.Component {
                                 <b>
                                     <Translate
                                         content="gateway.rudex.min_amount_warn"
-                                        minAmount={utils.format_number(
+                                        minamount={utils.format_number(
                                             this.props.min_amount /
                                                 utils.get_asset_precision(
                                                     this.props.asset_precision
diff --git a/app/components/DepositWithdraw/rudex/RuDexWithdrawModal.jsx b/app/components/DepositWithdraw/rudex/RuDexWithdrawModal.jsx
index 87f89ec4c5..91abeb4259 100644
--- a/app/components/DepositWithdraw/rudex/RuDexWithdrawModal.jsx
+++ b/app/components/DepositWithdraw/rudex/RuDexWithdrawModal.jsx
@@ -323,7 +323,8 @@ class RuDexWithdrawModal extends React.Component {
     onSubmit() {
         if (
             !this.state.withdraw_address_check_in_progress &&
-            this.state.withdraw_address && this.state.withdraw_address.length &&
+            this.state.withdraw_address &&
+            this.state.withdraw_address.length &&
             this.state.withdraw_amount !== null
         ) {
             if (!this.state.withdraw_address_is_valid) {
@@ -624,7 +625,8 @@ class RuDexWithdrawModal extends React.Component {
 
         if (
             !this.state.withdraw_address_check_in_progress &&
-            this.state.withdraw_address && this.state.withdraw_address.length
+            this.state.withdraw_address &&
+            this.state.withdraw_address.length
         ) {
             if (!this.state.withdraw_address_is_valid) {
                 invalid_address_message = (
@@ -775,7 +777,7 @@ class RuDexWithdrawModal extends React.Component {
                             <b>
                                 <Translate
                                     content="gateway.rudex.min_amount"
-                                    minAmount={utils.format_number(
+                                    minamount={utils.format_number(
                                         this.props.min_amount /
                                             utils.get_asset_precision(
                                                 this.props.asset_precision
diff --git a/app/components/DepositWithdraw/rudex/raido/RaidoFinance.jsx b/app/components/DepositWithdraw/rudex/raido/RaidoFinance.jsx
index 3e86f3423c..01d143dca9 100644
--- a/app/components/DepositWithdraw/rudex/raido/RaidoFinance.jsx
+++ b/app/components/DepositWithdraw/rudex/raido/RaidoFinance.jsx
@@ -35,13 +35,19 @@ class RaidoFinance extends React.Component {
     }
 
     _getActiveCoin(props, state) {
-        let cachedCoin = props.viewSettings.get("activeCoin_Raido", null);
-        let firstTimeCoin = "BTC";
-        let activeCoin = cachedCoin ? cachedCoin : firstTimeCoin;
+        let cachedCoin;
+        let firstTimeCoin;
+        let activeCoin;
 
-        if (state.action === "withdraw") {
+        cachedCoin = props.viewSettings.get("activeCoin_Raido", "deposit");
+        //let firstTimeCoin = "BTC";
+        firstTimeCoin = props.coins[0];
+
+        activeCoin = cachedCoin ? cachedCoin : firstTimeCoin;
+
+        /*        if (state.action === "withdraw") {
             activeCoin = this._findCoinByName(props, activeCoin).symbol;
-        }
+        }*/
 
         return activeCoin;
     }
@@ -49,7 +55,7 @@ class RaidoFinance extends React.Component {
     UNSAFE_componentWillReceiveProps(nextProps) {
         if (nextProps.provider !== this.props.provider) {
             this.setState({
-                activeCoin: this._getActiveCoin(nextProps, this.state.action)
+                activeCoin: this._getActiveCoin(nextProps, this.state)
             });
         }
     }
diff --git a/app/components/Exchange/Exchange.jsx b/app/components/Exchange/Exchange.jsx
index 06fb71e017..2716f0809e 100644
--- a/app/components/Exchange/Exchange.jsx
+++ b/app/components/Exchange/Exchange.jsx
@@ -367,7 +367,7 @@ class Exchange extends React.Component {
                 open_settlement: 2
             }),
             panelTabsActive: ws.get("panelTabsActive", {
-                1: "my_history",
+                1: "history",
                 2: "my_orders"
             })
         };
diff --git a/app/components/Exchange/ExchangeHeader.jsx b/app/components/Exchange/ExchangeHeader.jsx
index ee86831124..753e3d5e07 100644
--- a/app/components/Exchange/ExchangeHeader.jsx
+++ b/app/components/Exchange/ExchangeHeader.jsx
@@ -14,6 +14,7 @@ import {Icon as AntIcon} from "bitshares-ui-style-guide";
 import {Asset, Price} from "common/MarketClasses";
 
 import {getGroupedMPAsRuDEX} from "../../branding";
+import {get_allTokens} from "branding";
 
 export default class ExchangeHeader extends React.Component {
     constructor(props) {
@@ -67,21 +68,9 @@ export default class ExchangeHeader extends React.Component {
     }
 
     _checkPotencialScamMarket(quote, base) {
-        let coins = [
-            "GPH",
-
-            "USD",
-            "EUR",
-            "CNY",
-            "RUB",
-
-            "BTC",
-            "GOLD",
-            "SILVER",
-            "OIL",
-
-            "DONATE"
-        ];
+        let coins = ["DONATE", "DEXBOT"];
+        let nativeTokens = get_allTokens().nativeTokens;
+        coins = coins.concat(nativeTokens);
 
         //1. RUDEX.X <=> RUDEX.X
         if (quote.indexOf("RUDEX.") !== -1 && base.indexOf("RUDEX.") !== -1)
diff --git a/app/components/Exchange/MyMarkets.jsx b/app/components/Exchange/MyMarkets.jsx
index dadc035ccd..ae33e3c1b0 100644
--- a/app/components/Exchange/MyMarkets.jsx
+++ b/app/components/Exchange/MyMarkets.jsx
@@ -855,7 +855,8 @@ class MyMarkets extends React.Component {
 
         let listStyle = {
             minWidth: this.state.minWidth,
-            minHeight: "6rem"
+            minHeight: "6rem",
+            paddingBottom: "2rem"
         };
         if (listHeight) {
             listStyle.height = listHeight;
diff --git a/app/components/Exchange/OrderBook.jsx b/app/components/Exchange/OrderBook.jsx
index e010ff97ef..a28d9f6f92 100644
--- a/app/components/Exchange/OrderBook.jsx
+++ b/app/components/Exchange/OrderBook.jsx
@@ -1,6 +1,6 @@
 import cnames from "classnames";
 import translator from "counterpart";
-import {StickyTable} from "react-sticky-table";
+import {StickyTable, Row, Cell} from "react-sticky-table";
 import React from "react";
 import Translate from "react-translate-component";
 import PropTypes from "prop-types";
@@ -12,6 +12,7 @@ import TransitionWrapper from "../Utility/TransitionWrapper";
 import AssetName from "../Utility/AssetName";
 import Icon from "../Icon/Icon";
 import {Select, Icon as AntIcon, Tooltip} from "bitshares-ui-style-guide";
+import ReactDOM from "react-dom";
 
 /**
  * @array: orderRows
@@ -31,8 +32,7 @@ class OrderRows extends React.Component {
             <TransitionWrapper
                 id={id}
                 ref={isBid ? "bidTransition" : "askTransaction"}
-                className="transition-container clickable"
-                component="div"
+                component={null}
                 transitionName="newrow"
             >
                 {orderRows.length > 0
@@ -72,39 +72,40 @@ class OrderBookRowVertical extends React.Component {
         let integerClass = isCall
             ? "orderHistoryCall"
             : isBid
-                ? "orderHistoryBid"
-                : "orderHistoryAsk";
+            ? "orderHistoryBid"
+            : "orderHistoryAsk";
 
         let price = (
             <PriceText price={order.getPrice()} quote={quote} base={base} />
         );
         return (
-            <div
+            <Row
                 onClick={this.props.onClick}
                 className={cnames(
                     "sticky-table-row order-row",
                     {"final-row": final},
-                    {"my-order": order.isMine(this.props.currentAccount)}
+                    {"my-order": order.isMine(this.props.currentAccount)},
+                    "clickable"
                 )}
             >
-                <div className="cell left">
+                <Cell className="cell left">
                     {utils.format_number(
                         order[
                             isBid ? "amountForSale" : "amountToReceive"
                         ]().getAmount({real: true}),
                         base.get("precision")
                     )}
-                </div>
-                <div className="cell">
+                </Cell>
+                <Cell className="cell">
                     {utils.format_number(
                         order[
                             isBid ? "amountToReceive" : "amountForSale"
                         ]().getAmount({real: true}),
                         quote.get("precision")
                     )}
-                </div>
-                <div className={`cell ${integerClass} right`}>{price}</div>
-            </div>
+                </Cell>
+                <Cell className={`cell ${integerClass} right`}>{price}</Cell>
+            </Row>
         );
     }
 }
@@ -130,8 +131,8 @@ class OrderBookRowHorizontal extends React.Component {
         let integerClass = isCall
             ? "orderHistoryCall"
             : isBid
-                ? "orderHistoryBid"
-                : "orderHistoryAsk";
+            ? "orderHistoryBid"
+            : "orderHistoryAsk";
 
         let price = (
             <PriceText price={order.getPrice()} quote={quote} base={base} />
@@ -218,30 +219,32 @@ class GroupedOrderBookRowVertical extends React.Component {
             <PriceText price={order.getPrice()} quote={quote} base={base} />
         );
         return (
-            <div
+            <Row
                 onClick={this.props.onClick}
-                className={cnames("sticky-table-row order-row", {
-                    "final-row": final
-                })}
+                className={cnames(
+                    "sticky-table-row order-row",
+                    {"final-row": final},
+                    "clickable"
+                )}
             >
-                <div className="cell left">
+                <Cell className="cell left">
                     {utils.format_number(
                         order[
                             isBid ? "amountForSale" : "amountToReceive"
                         ]().getAmount({real: true}),
                         base.get("precision")
                     )}
-                </div>
-                <div className="cell">
+                </Cell>
+                <Cell className="cell">
                     {utils.format_number(
                         order[
                             isBid ? "amountToReceive" : "amountForSale"
                         ]().getAmount({real: true}),
                         quote.get("precision")
                     )}
-                </div>
-                <div className={`cell ${integerClass} right`}>{price}</div>
-            </div>
+                </Cell>
+                <Cell className={`cell ${integerClass} right`}>{price}</Cell>
+            </Row>
         );
     }
 }
@@ -419,6 +422,10 @@ class OrderBook extends React.Component {
         };
         this.verticalStickyTable = React.createRef();
         this.centerText = React.createRef();
+        this.hor_bids = React.createRef();
+        this.hor_asks = React.createRef();
+        this.askTransition = React.createRef();
+        this.bidTransition = React.createRef();
     }
 
     shouldComponentUpdate(nextProps, nextState) {
@@ -427,15 +434,15 @@ class OrderBook extends React.Component {
             this.props.hideScrollbars &&
             nextState.showAllAsks != this.state.showAllAsks
         ) {
-            let asksContainer = this.refs.hor_asks;
+            let asksContainer = this.hor_asks.current;
             if (!nextState.showAllAsks) {
                 Ps.destroy(asksContainer);
             } else {
                 Ps.initialize(asksContainer);
                 this.psUpdate();
             }
-            this.refs.askTransition.resetAnimation();
-            if (this.refs.hor_asks) this.refs.hor_asks.scrollTop = 0;
+            this.askTransition.current.resetAnimation();
+            if (this.hor_asks.current) this.hor_asks.current.scrollTop = 0;
         }
 
         if (
@@ -443,15 +450,15 @@ class OrderBook extends React.Component {
             this.props.hideScrollbars &&
             nextState.showAllBids != this.state.showAllBids
         ) {
-            let bidsContainer = this.refs.hor_bids;
+            let bidsContainer = this.hor_bids.current;
             if (!nextState.showAllBids) {
                 Ps.destroy(bidsContainer);
             } else {
                 Ps.initialize(bidsContainer);
                 this.psUpdate();
             }
-            this.refs.bidTransition.resetAnimation();
-            if (this.refs.hor_bids) this.refs.hor_bids.scrollTop = 0;
+            this.bidTransition.current.resetAnimation();
+            if (this.hor_bids.current) this.hor_bids.current.scrollTop = 0;
         }
 
         // if (!nextProps.marketReady) return false;
@@ -465,14 +472,14 @@ class OrderBook extends React.Component {
             nextProps.base.get("id") !== prevProps.base.get("id") ||
             nextProps.quote.get("id") !== prevProps.quote.get("id")
         ) {
-            if (this.refs.askTransition) {
-                this.refs.askTransition.resetAnimation();
-                if (this.refs.hor_asks) this.refs.hor_asks.scrollTop = 0;
-                if (this.refs.hor_bids) this.refs.hor_bids.scrollTop = 0;
+            if (this.askTransition.current) {
+                this.askTransition.current.resetAnimation();
+                if (this.hor_asks.current) this.hor_asks.current.scrollTop = 0;
+                if (this.hor_bids.current) this.hor_bids.current.scrollTop = 0;
             }
 
-            if (this.refs.bidTransition) {
-                this.refs.bidTransition.resetAnimation();
+            if (this.bidTransition.current) {
+                this.bidTransition.current.resetAnimation();
             }
 
             if (this.refs.vert_bids) this.refs.vert_bids.scrollTop = 0;
@@ -482,8 +489,8 @@ class OrderBook extends React.Component {
             }
         }
 
-        let bidsContainer = this.refs.hor_bids;
-        let asksContainer = this.refs.hor_asks;
+        let bidsContainer = this.hor_bids.current;
+        let asksContainer = this.hor_asks.current;
 
         if (
             this.props.horizontal &&
@@ -501,8 +508,8 @@ class OrderBook extends React.Component {
         ) {
             Ps.initialize(bidsContainer);
             Ps.initialize(asksContainer);
-            this.refs.askTransition.resetAnimation();
-            this.refs.bidTransition.resetAnimation();
+            this.askTransition.current.resetAnimation();
+            this.bidTransition.current.resetAnimation();
             if (asksContainer) asksContainer.scrollTop = 0;
             if (bidsContainer) bidsContainer.scrollTop = 0;
             this.psUpdate();
@@ -511,20 +518,22 @@ class OrderBook extends React.Component {
         this.centerVerticalScrollBar();
     }
 
-    queryStickyTable = query => {
-        return this.verticalStickyTable.current.table.querySelector(query);
+    queryStickyTable = (query = null) => {
+        const node = ReactDOM.findDOMNode(this.verticalStickyTable.current);
+        if (query == null) return node;
+        return node.querySelector(query);
     };
 
-    verticalScrollBar = () => this.queryStickyTable("#y-scrollbar");
+    verticalScrollBar = () => this.queryStickyTable();
 
     componentDidMount() {
         if (!this.props.horizontal) {
             Ps.initialize(this.verticalScrollBar());
         } else {
             if (!this.props.hideScrollbars) {
-                let bidsContainer = this.refs.hor_bids;
+                let bidsContainer = this.hor_bids.current;
                 Ps.initialize(bidsContainer);
-                let asksContainer = this.refs.hor_asks;
+                let asksContainer = this.hor_asks.current;
                 Ps.initialize(asksContainer);
             }
         }
@@ -533,10 +542,8 @@ class OrderBook extends React.Component {
     centerVerticalScrollBar() {
         if (!this.props.horizontal && this.state.autoScroll) {
             // Center vertical scroll bar
-            const scrollableContainer = this.queryStickyTable(
-                "#sticky-table-y-wrapper"
-            );
-            const header = this.queryStickyTable("#sticky-table-header");
+            const scrollableContainer = this.queryStickyTable();
+            const header = this.queryStickyTable(".top-header");
             const centerTextContainer = this.centerText.current;
             const singleRowHeight = elemHeight(
                 this.queryStickyTable(".order-row")
@@ -548,8 +555,8 @@ class OrderBook extends React.Component {
                         ? this.props.groupedAsks
                         : this.props.groupedBids
                     : !this.props.orderBookReversed
-                        ? this.props.combinedAsks
-                        : this.props.combinedBids;
+                    ? this.props.combinedAsks
+                    : this.props.combinedBids;
 
             const rowsHeight = rows.length * singleRowHeight;
 
@@ -569,9 +576,9 @@ class OrderBook extends React.Component {
         if (!this.props.horizontal) {
             Ps.update(this.verticalScrollBar());
         } else {
-            let bidsContainer = this.refs.hor_bids;
+            let bidsContainer = this.hor_bids.current;
             Ps.update(bidsContainer);
-            let asksContainer = this.refs.hor_asks;
+            let asksContainer = this.hor_asks.current;
             Ps.update(asksContainer);
         }
     }
@@ -587,7 +594,7 @@ class OrderBook extends React.Component {
             });
 
             if (this.state.showAllAsks) {
-                this.refs.hor_asks.scrollTop = 0;
+                this.hor_asks.current.scrollTop = 0;
             }
         } else {
             this.setState({
@@ -595,7 +602,7 @@ class OrderBook extends React.Component {
             });
 
             if (this.state.showAllBids) {
-                this.refs.hor_bids.scrollTop = 0;
+                this.hor_bids.current.scrollTop = 0;
             }
         }
     }
@@ -1053,13 +1060,12 @@ class OrderBook extends React.Component {
                             </div>
                             <div
                                 className="grid-block"
-                                ref="hor_asks"
+                                ref={this.hor_asks}
                                 style={{
                                     paddingRight: "0.6rem",
                                     overflow: "hidden",
                                     maxHeight: 260,
-                                    lineHeight: "13px",
-                                    flexWrap: "wrap"
+                                    lineHeight: "13px"
                                 }}
                             >
                                 <table
@@ -1067,7 +1073,7 @@ class OrderBook extends React.Component {
                                     className="table order-table no-stripes table-hover fixed-table text-right no-overflow"
                                 >
                                     <TransitionWrapper
-                                        ref="askTransition"
+                                        ref={this.askTransition}
                                         className="orderbook clickable"
                                         component="tbody"
                                         transitionName="newrow"
@@ -1214,13 +1220,12 @@ class OrderBook extends React.Component {
                             </div>
                             <div
                                 className="grid-block"
-                                ref="hor_bids"
+                                ref={this.hor_bids}
                                 style={{
                                     paddingRight: "0.6rem",
                                     overflow: "hidden",
                                     maxHeight: 260,
-                                    lineHeight: "13px",
-                                    flexWrap: "wrap"
+                                    lineHeight: "13px"
                                 }}
                             >
                                 <table
@@ -1228,7 +1233,7 @@ class OrderBook extends React.Component {
                                     className="table order-table no-stripes table-hover fixed-table text-right no-overflow"
                                 >
                                     <TransitionWrapper
-                                        ref="bidTransition"
+                                        ref={this.bidTransition}
                                         className="orderbook clickable"
                                         component="tbody"
                                         transitionName="newrow"
@@ -1265,28 +1270,30 @@ class OrderBook extends React.Component {
             return (
                 <div className="order-table-container">
                     <StickyTable
-                        stickyColumnCount={0}
+                        borderWidth="0px"
+                        borderColor="grey"
+                        leftStickyColumnCount={0}
                         className="order-table table"
                         ref={this.verticalStickyTable}
                     >
-                        <div className="sticky-table-row top-header">
-                            <div className="cell header-cell left">
+                        <Row className="top-header sticky-table-header">
+                            <Cell className="cell header-cell left">
                                 <span className="header-sub-title">
                                     <AssetName name={baseSymbol} />
                                 </span>
-                            </div>
-                            <div className="cell header-cell">
+                            </Cell>
+                            <Cell className="cell header-cell">
                                 <span className="header-sub-title">
                                     <AssetName name={quoteSymbol} />
                                 </span>
-                            </div>
-                            <div className="cell header-cell right">
+                            </Cell>
+                            <Cell className="cell header-cell right">
                                 <Translate
                                     className="header-sub-title"
                                     content="exchange.price"
                                 />
-                            </div>
-                        </div>
+                            </Cell>
+                        </Row>
                         {orderBookReversed ? (
                             <OrderRows
                                 id="top-order-rows"
@@ -1295,26 +1302,28 @@ class OrderBook extends React.Component {
                                 isBid={true}
                             />
                         ) : (
+                            // bidRows
                             <OrderRows
                                 id="top-order-rows"
                                 noOrders={noOrders}
                                 orderRows={askRows}
                                 isBid={false}
                             />
+                            // askRows
                         )}
 
                         {noOrders ? (
-                            <div
+                            <Row
                                 className="sticky-table-row"
                                 ref={this.centerText}
                             >
-                                <div className="cell" />
-                                <div className="cell no-orders padtop">
+                                <Cell className="cell" />
+                                <Cell className="cell no-orders padtop">
                                     <Translate content="exchange.no_orders" />
-                                </div>
-                            </div>
+                                </Cell>
+                            </Row>
                         ) : (
-                            <div
+                            <Row
                                 className="sticky-table-row orderbook-latest-price"
                                 ref={this.centerText}
                                 style={{padding: 0}}
@@ -1322,7 +1331,7 @@ class OrderBook extends React.Component {
                                 //    "walkthrough.vertical_order"
                                 //)}
                             >
-                                <div className="cell right">
+                                <Cell className="cell right">
                                     <span
                                         className="clickable left"
                                         onClick={this.toggleSpreadValue}
@@ -1335,8 +1344,8 @@ class OrderBook extends React.Component {
                                             {!!spread ? spread : "0"}
                                         </span>
                                     </span>
-                                </div>
-                                <div className="cell cell-center">
+                                </Cell>
+                                <Cell className="cell cell-center">
                                     <span style={{width: 75}}>
                                         {!this.props.hideFunctionButtons ? (
                                             <Icon
@@ -1389,12 +1398,10 @@ class OrderBook extends React.Component {
                                             />
                                         )}
                                     </span>
-                                </div>
-                                <div
+                                </Cell>
+                                <Cell
                                     className="cell"
-                                    style={{
-                                        textAlign: "right"
-                                    }}
+                                    style={{textAlign: "center"}}
                                 >
                                     {!!this.props.latest && (
                                         <span className="right">
@@ -1404,9 +1411,6 @@ class OrderBook extends React.Component {
                                                         ? "spread-value"
                                                         : this.props.changeClass
                                                 }
-                                                style={{
-                                                    paddingRight: "15px"
-                                                }}
                                             >
                                                 <PriceText
                                                     price={this.props.latest}
@@ -1416,8 +1420,8 @@ class OrderBook extends React.Component {
                                             </span>
                                         </span>
                                     )}
-                                </div>
-                            </div>
+                                </Cell>
+                            </Row>
                         )}
 
                         {orderBookReversed ? (
@@ -1427,11 +1431,13 @@ class OrderBook extends React.Component {
                                 isBid={false}
                             />
                         ) : (
+                            // askRows
                             <OrderRows
                                 noOrders={noOrders}
                                 orderRows={bidRows}
                                 isBid={true}
                             />
+                            // bidRows
                         )}
                     </StickyTable>
                 </div>
diff --git a/app/components/Exchange/View/MarketHistoryView.jsx b/app/components/Exchange/View/MarketHistoryView.jsx
index a2b109c83d..b891d84cd2 100644
--- a/app/components/Exchange/View/MarketHistoryView.jsx
+++ b/app/components/Exchange/View/MarketHistoryView.jsx
@@ -70,7 +70,7 @@ class MarketHistoryView extends React.Component {
                     }}
                     colSpan="5"
                 >
-                    <Translate content="account.no_orders" />
+                    <Translate content="account.no_trades" />
                 </td>
             </tr>
         );
diff --git a/app/components/Exchange/tradingViewClasses.js b/app/components/Exchange/tradingViewClasses.js
index eb00bbd3fd..ebf0f36ea4 100644
--- a/app/components/Exchange/tradingViewClasses.js
+++ b/app/components/Exchange/tradingViewClasses.js
@@ -16,10 +16,10 @@ class SymbolInfo {
             quoteGateway === baseGateway
                 ? quoteGateway
                 : quoteGateway && !baseGateway
-                    ? quoteGateway
-                    : !quoteGateway && baseGateway
-                        ? baseGateway
-                        : `${quoteGateway} / ${baseGateway}`;
+                ? quoteGateway
+                : !quoteGateway && baseGateway
+                ? baseGateway
+                : `${quoteGateway} / ${baseGateway}`;
 
         let {name: baseSymbol, prefix: basePrefix} = utils.replaceName(
             options.baseAsset
@@ -145,9 +145,9 @@ class DataFeed {
             callback({
                 exchanges: [
                     {
-                        value: "OPEN.",
-                        name: "Openledger",
-                        desc: "Openledger Gateway"
+                        value: "RUDEX.",
+                        name: "RuDEX",
+                        desc: "RuDEX Gateway"
                     }
                 ],
                 symbols_types: [],
@@ -307,12 +307,12 @@ class DataFeed {
 
     unsubscribeBars() {
         /*
-        * This is ALWAYS called after subscribeBars for some reason, but
-        * sometimes it executes BEFORE the subscribe call in subscribeBars and
-        * sometimes AFTER. This causes the callback to be cleared and we stop
-        * receiving updates from the MarketStore. Unless we find it causes bugs,
-        * it's best to just not use this.
-        */
+         * This is ALWAYS called after subscribeBars for some reason, but
+         * sometimes it executes BEFORE the subscribe call in subscribeBars and
+         * sometimes AFTER. This causes the callback to be cleared and we stop
+         * receiving updates from the MarketStore. Unless we find it causes bugs,
+         * it's best to just not use this.
+         */
         // MarketsStore.unsubscribe("subscribeBars");
         // this.latestBar = null;
     }
@@ -387,9 +387,7 @@ function getTVTimezone() {
             if (zoneTime.format() === actual) {
                 if (__DEV__)
                     console.log(
-                        `Found a match for ${current} timezone, using ${
-                            supportedTimeZones[i]
-                        }`
+                        `Found a match for ${current} timezone, using ${supportedTimeZones[i]}`
                     );
                 // Found a match, return that zone
                 return supportedTimeZones[i];
diff --git a/app/components/Explorer/Blocks.jsx b/app/components/Explorer/Blocks.jsx
index 18c1e270bb..2052656ac3 100644
--- a/app/components/Explorer/Blocks.jsx
+++ b/app/components/Explorer/Blocks.jsx
@@ -514,7 +514,7 @@ class Blocks extends React.Component {
                                 <div className="block-content-header">
                                     <Translate content="account.recent" />
                                 </div>
-                                <table className="table fixed-height-2rem">
+                                <table className="table fixed-height-1rem">
                                     <thead>
                                         <tr>
                                             <th>
@@ -532,7 +532,7 @@ class Blocks extends React.Component {
                                 }}
                                 ref="operations"
                             >
-                                <table className="table fixed-height-2rem">
+                                <table className="table fixed-height-1rem">
                                     <tbody>{transactions}</tbody>
                                 </table>
                             </div>
@@ -559,7 +559,7 @@ class Blocks extends React.Component {
                                 }}
                                 ref="blocks"
                             >
-                                <table className="table fixed-height-2rem">
+                                <table className="table fixed-height-1rem">
                                     <thead>
                                         <tr>
                                             <th>
diff --git a/app/components/Icon/Icon.jsx b/app/components/Icon/Icon.jsx
index af60e5b284..e7c3ce39d3 100644
--- a/app/components/Icon/Icon.jsx
+++ b/app/components/Icon/Icon.jsx
@@ -5,7 +5,7 @@ import counterpart from "counterpart";
 import PropTypes from "prop-types";
 import iconsMap from "../../assets/icons/icons-loader.js";
 
-require("./icon.scss");
+import "./icon.scss";
 
 class Icon extends React.Component {
     shouldComponentUpdate(np) {
diff --git a/app/components/InitError.jsx b/app/components/InitError.jsx
index 356bc61cfa..02dc1577f8 100644
--- a/app/components/InitError.jsx
+++ b/app/components/InitError.jsx
@@ -105,7 +105,7 @@ class InitError extends React.Component {
                 <div className="grid-container">
                     <div className="grid-content no-overflow">
                         <br />
-                        <Translate component="h3" content={"app_init.title"} />
+                        <Translate component="h3" content={`app_init.title`} />
 
                         <Form layout="vertical">
                             <Form.Item
@@ -142,13 +142,13 @@ class InitError extends React.Component {
                                 {this.props.rpc_connection_status === "open" ? (
                                     <span className="txtlabel success">
                                         <Translate
-                                            content={"app_init.connected"}
+                                            content={`app_init.connected`}
                                         />
                                     </span>
                                 ) : (
                                     <span className="txtlabel warning">
                                         <Translate
-                                            content={"app_init.not_connected"}
+                                            content={`app_init.not_connected`}
                                         />
                                     </span>
                                 )}
@@ -158,13 +158,13 @@ class InitError extends React.Component {
                                 type={"primary"}
                                 onClick={this.onReloadClick}
                             >
-                                {counterpart.translate("app_init.retry")}
+                                {counterpart.translate(`app_init.retry`)}
                             </Button>
                             <Button
                                 style={{marginLeft: "16px"}}
                                 onClick={this.onReset.bind(this)}
                             >
-                                {counterpart.translate("settings.reset")}
+                                {counterpart.translate(`settings.reset`)}
                             </Button>
                         </Form>
 
diff --git a/app/components/Layout/Footer.jsx b/app/components/Layout/Footer.jsx
index 54cdfaadef..2a2862f89c 100644
--- a/app/components/Layout/Footer.jsx
+++ b/app/components/Layout/Footer.jsx
@@ -519,33 +519,35 @@ class Footer extends React.Component {
                                     />
                                 )}
                             </div>
-                            <Link
+                            <a
                                 style={{
-                                    flexFlow: "row",
                                     padding: "0 0.5rem",
                                     borderRight:
                                         "1px solid rgba(128, 128, 128, 0.45)",
                                     lineHeight: "2rem",
                                     fontSize: "1em"
                                 }}
-                                to={"/listing"}
+                                className="footer-audit"
+                                href="https://audit.rudex.org"
+                                target="_blank"
+                                rel="noopener noreferrer"
                             >
-                                <Translate content="footer.listing" />
-                            </Link>
-                            <a
+                                <Translate content="footer.audit" />
+                            </a>
+                            <Link
                                 style={{
+                                    flexFlow: "row",
                                     padding: "0 0.5rem",
                                     borderRight:
                                         "1px solid rgba(128, 128, 128, 0.45)",
                                     lineHeight: "2rem",
                                     fontSize: "1em"
                                 }}
-                                href="https://audit.rudex.org"
-                                target="_blank"
-                                rel="noopener noreferrer"
+                                to={"/listing"}
+                                className="footer-listing"
                             >
-                                <Translate content="footer.audit" />
-                            </a>
+                                <Translate content="footer.listing" />
+                            </Link>
                             <a
                                 style={{
                                     padding: "0 0.5rem",
@@ -554,6 +556,7 @@ class Footer extends React.Component {
                                     lineHeight: "2rem",
                                     fontSize: "1em"
                                 }}
+                                className="footer-support"
                                 href="https://rudex.freshdesk.com"
                                 target="_blank"
                                 rel="noopener noreferrer"
@@ -613,7 +616,7 @@ class Footer extends React.Component {
                                         style={{
                                             height: "22px"
                                         }}
-                                        src={`${__BASE_URL__}images/google-play.png`}
+                                        src={`${__BASE_URL__}images/android.png`}
                                     />
                                 </a>
                                 <a
@@ -773,12 +776,11 @@ class Footer extends React.Component {
                                         }}
                                     >
                                         <div className="footer-status">
-                                            {connected &&
-                                                activeNode.testNet && (
-                                                    <span className="testnet">
-                                                        <Translate content="settings.testnet_nodes" />{" "}
-                                                    </span>
-                                                )}
+                                            {connected && activeNode.testNet && (
+                                                <span className="testnet">
+                                                    <Translate content="settings.testnet_nodes" />{" "}
+                                                </span>
+                                            )}
                                             {!connected ? (
                                                 <span className="warning">
                                                     <Translate content="footer.disconnected" />
@@ -798,10 +800,10 @@ class Footer extends React.Component {
                                                 {!connected
                                                     ? "-"
                                                     : !activeNode.ping
-                                                        ? "-"
-                                                        : parseInt(
-                                                              activeNode.ping
-                                                          ) + "ms"}
+                                                    ? "-"
+                                                    : parseInt(
+                                                          activeNode.ping
+                                                      ) + "ms"}
                                                 &nbsp;/&nbsp;
                                                 <span className="footer-block-title">
                                                     <Translate content="footer.block" />
diff --git a/app/components/Layout/MenuDataStructure.js b/app/components/Layout/MenuDataStructure.js
index 523462591c..0b75fc02b7 100644
--- a/app/components/Layout/MenuDataStructure.js
+++ b/app/components/Layout/MenuDataStructure.js
@@ -69,11 +69,12 @@ class MenuDataStructure {
         const allItems = MenuDataStructure.getAllEntries();
 
         return [
-            allItems.dashboard,
+            //allItems.dashboard,
+            allItems.volume_ranking,
             allItems.account,
-            allItems.market,
-            allItems.explorer,
-            allItems.bots
+            allItems.market
+            //allItems.explorer,
+            //allItems.bots
         ];
     }
 
@@ -104,10 +105,11 @@ class MenuDataStructure {
             let submenu = [
                 //allItems.account_voting,
                 allItems.account_assets,
-                allItems.account_signedmessages,
-                allItems.account_stats,
-                allItems.account_vesting,
                 allItems.account_whitelist,
+                allItems.account_stats,
+                //allItems.account_vesting,
+                allItems.account_signedmessages,
+                allItems.accounts,
                 allItems.account_permissions
             ];
             item.submenu = submenu.map(item => item(state));
@@ -120,13 +122,16 @@ class MenuDataStructure {
             allItems.follow,
 
             allItems.divider,
-            allItems.dashboard,
+            //allItems.dashboard,
+            allItems.volume_ranking,
             allItems.account,
             allItems.market,
             allItems.bots,
             allItems.explorer,
-
+            allItems.spotlight,
+            allItems.dashboard,
             allItems.divider,
+
             allItems.transfer,
             //allItems.deposit,
             //allItems.withdraw,
@@ -135,12 +140,15 @@ class MenuDataStructure {
 
             allItems.divider,
             allItems.listing,
+
             allItems.news,
             allItems.help,
 
             allItems.divider,
             allItems.account_voting,
-            allItems.spotlight,
+            allItems.account_vesting,
+            allItems.divider,
+            //allItems.spotlight,
             allItems.insight,
 
             allItems.divider,
@@ -154,7 +162,7 @@ class MenuDataStructure {
             // allItems.account_permissions,
             // allItems.divider,
             allItems.settings_mobile,
-            allItems.accounts,
+            //allItems.accounts,
             allItems.borrow,
             allItems.barter,
             allItems.direct_debit,
@@ -167,7 +175,7 @@ class MenuDataStructure {
         return {
             login: state => ({
                 target: state.clickHandlers.toggleLock,
-                icon: "power",
+                icon: "menu-power",
                 text: state.locked
                     ? "header.lock_short"
                     : "header.unlock_short",
@@ -184,7 +192,7 @@ class MenuDataStructure {
                     ? "/create-account/password"
                     : "/create-account/wallet",
                 icon: {
-                    name: "create_account",
+                    name: "menu-create_account",
                     title: "icons.user.create_account"
                 },
                 text: "header.create_account",
@@ -193,7 +201,8 @@ class MenuDataStructure {
             }),
             dashboard: state => ({
                 //includePattern: ["/account", "account/", "/account/"],
-                includePattern: ["/"],
+                //includePattern: ["/"],
+                includePattern: ["/dashboard"],
                 excludePattern: [
                     "/account",
                     "account/",
@@ -203,40 +212,52 @@ class MenuDataStructure {
                     "/assets",
                     "/bots",
                     "/listing",
+
+                    "/volume-ranking",
+
+                    "/borrow",
+                    "/barter",
+                    "/direct-debit",
+                    "/htlc",
+                    "/invoice",
+                    "/instant-trade",
+
                     "/news",
                     "/help",
                     "/settings",
                     "/spotlight",
                     "/explorer",
                     "/market",
-                    "/voting",
+                    //"/voting",
                     "/signedmessages",
                     "/member-stats",
-                    "/vesting",
+                    //"/vesting",
                     "/whitelist",
                     "/permissions",
                     "/prediction"
                 ],
-                target: "/",
-                icon: "dashboard",
+                target: "/dashboard",
+                icon: "menu-dashboard",
                 text: "header.dashboard",
-                inHeaderBehavior: MenuItemType.Always,
-                inDropdownBehavior: MenuItemType.Never
+                inHeaderBehavior: MenuItemType.Dynamic,
+                inDropdownBehavior: MenuItemType.Always
             }),
 
             account: state => ({
                 includePattern: ["/account", "account/", "/account/"],
                 excludePattern: [
                     "/assets",
+                    "/whitelist",
                     "/voting",
-                    "/signedmessages",
+
                     "/member-stats",
+                    "/signedmessages",
                     "/vesting",
-                    "/whitelist",
+                    "/accounts",
                     "/permissions"
                 ],
                 target: `/account/${state.currentAccount}`,
-                icon: "user",
+                icon: "menu-user",
                 text: "header.account",
                 inHeaderBehavior: MenuItemType.WhenAccount,
                 inDropdownBehavior: MenuItemType.Never
@@ -244,40 +265,93 @@ class MenuDataStructure {
             bots: state => ({
                 includePattern: ["/bots"],
                 excludePattern: [
-                    //"/account", "account/", "/account/",
-                    "/assets",
                     "/help/bots",
-                    "/voting",
-                    "/signedmessages",
-                    "/member-stats",
-                    "/vesting",
+
+                    "/assets",
                     "/whitelist",
+                    //"/voting",
+                    "/member-stats",
+                    "/signedmessages",
+                    //"/vesting",
+                    "/accounts",
                     "/permissions"
                 ],
                 target: "/bots",
-                icon: "robot",
+                icon: "menu-robot",
                 text: "header.bots",
                 inHeaderBehavior: MenuItemType.WhenAccount,
-                inDropdownBehavior: MenuItemType.WhenNotInHeader
+                inDropdownBehavior: MenuItemType.Never
             }),
             listing: state => ({
                 includePattern: ["/listing"],
                 excludePattern: [
-                    //"/account", "account/", "/account/",
                     "/assets",
-                    "/voting",
-                    "/signedmessages",
-                    "/member-stats",
-                    "/vesting",
                     "/whitelist",
+                    //"/voting",
+                    "/member-stats",
+                    "/signedmessages",
+                    //"/vesting",
+                    "/accounts",
                     "/permissions"
                 ],
                 target: "/listing",
-                icon: "listing",
+                icon: "menu-listing",
                 text: "header.listing",
                 inHeaderBehavior: MenuItemType.Dynamic,
                 inDropdownBehavior: MenuItemType.Always
             }),
+            volume_ranking: state => ({
+                includePattern: ["/"],
+                //includePattern: ["/volume-ranking"],
+                excludePattern: [
+                    "/assets",
+                    "/whitelist",
+                    //"/voting",
+                    "/member-stats",
+                    "/signedmessages",
+
+                    "/accounts",
+                    "/permissions",
+
+                    "/dashboard",
+
+                    "/borrow",
+                    "/barter",
+                    "/direct-debit",
+                    "/htlc",
+                    "/invoice",
+                    "/instant-trade",
+
+                    "/account",
+                    "account/",
+                    "/account/",
+                    "/deposit-withdraw",
+                    "/asset",
+                    "/assets",
+                    "/bots",
+                    "/listing",
+                    "/volume-ranking",
+                    "/news",
+                    "/help",
+                    "/settings",
+                    "/spotlight",
+                    "/explorer",
+                    "/market",
+                    //"/voting",
+                    "/signedmessages",
+                    "/member-stats",
+                    //"/vesting",
+                    "/whitelist",
+                    "/permissions",
+                    "/prediction"
+                ],
+                //target: "/volume-ranking",
+                target: "/",
+                icon: "menu-volume_ranking",
+                text: "header.ranking",
+                inHeaderBehavior: MenuItemType.Always,
+                inDropdownBehavior: MenuItemType.Never
+            }),
             follow: state => ({
                 target: state.clickHandlers.followUnfollow,
                 icon: {
@@ -293,7 +367,7 @@ class MenuDataStructure {
                 includePattern: "/market/",
                 target: state.tradeUrl,
                 icon: {
-                    name: "trade",
+                    name: "menu-trade",
                     title: "icons.trade.exchange"
                 },
                 text: "header.exchange",
@@ -304,16 +378,16 @@ class MenuDataStructure {
                 includePattern: "/explorer",
                 target: "/explorer/blocks",
                 icon: {
-                    name: "server",
+                    name: "menu-server",
                     size: "2x"
                 },
                 text: "header.explorer",
-                inHeaderBehavior: MenuItemType.Never,
+                inHeaderBehavior: MenuItemType.Dynamic,
                 inDropdownBehavior: MenuItemType.Always
             }),
             transfer: state => ({
                 target: state.clickHandlers.showSend,
-                icon: "transfer",
+                icon: "menu-transfer",
                 text: "header.payments",
                 inDropdownBehavior: MenuItemType.WhenAccount
             }),
@@ -359,7 +433,7 @@ class MenuDataStructure {
                 includePattern: "/settings",
                 target: "/settings",
                 additionalClassName: "desktop-only",
-                icon: "cogs",
+                icon: "menu-cogs",
                 text: "header.settings",
                 inHeaderBehavior: MenuItemType.Dynamic,
                 inDropdownBehavior: MenuItemType.Always
@@ -367,7 +441,7 @@ class MenuDataStructure {
             spotlight: state => ({
                 includePattern: "/spotlight",
                 target: "/spotlight",
-                icon: "showcases",
+                icon: "menu-showcases",
                 text: "header.showcases",
                 inHeaderBehavior: MenuItemType.Dynamic,
                 inDropdownBehavior: MenuItemType.Always
@@ -375,14 +449,14 @@ class MenuDataStructure {
             settings_mobile: state => ({
                 includePattern: "/settings",
                 additionalClassName: "mobile-only",
-                icon: "cogs",
+                icon: "menu-cogs",
                 text: "header.settings",
                 inHeaderBehavior: MenuItemType.Never,
                 inDropdownBehavior: MenuItemType.Always
             }),
             insight: state => ({
                 includePattern: "/account",
-                icon: "insight",
+                icon: "menu-insight",
                 text: "header.advanced",
                 inHeaderBehavior: MenuItemType.Never,
                 inDropdownBehavior: MenuItemType.WhenAccount
@@ -429,7 +503,7 @@ class MenuDataStructure {
             news: state => ({
                 includePattern: "/news",
                 target: "/news",
-                icon: "news",
+                icon: "menu-news",
                 text: "news.news",
                 inHeaderBehavior: MenuItemType.Dynamic,
                 inDropdownBehavior: MenuItemType.Always
@@ -437,7 +511,7 @@ class MenuDataStructure {
             help: state => ({
                 includePattern: "/help",
                 icon: {
-                    name: "question-circle",
+                    name: "menu-question-circle",
                     title: "icons.question_circle"
                 },
                 target: "/help/index",
@@ -449,7 +523,7 @@ class MenuDataStructure {
                 includePattern: "/voting",
                 target: `/account/${state.currentAccount}/voting`,
                 icon: {
-                    name: "thumbs-up",
+                    name: "menu-thumbs-up",
                     title: "icons.thumbs_up"
                 },
                 text: "account.voting",
@@ -460,7 +534,7 @@ class MenuDataStructure {
                 includePattern: "/assets",
                 excludePattern: "explorer",
                 target: `/account/${state.currentAccount}/assets`,
-                icon: "assets",
+                icon: "menu-assets",
                 text: "explorer.assets.title",
                 inHeaderBehavior: MenuItemType.Dynamic,
                 inDropdownBehavior: MenuItemType.WhenAccount
@@ -469,7 +543,7 @@ class MenuDataStructure {
                 includePattern: "/signedmessages",
                 target: `/account/${state.currentAccount}/signedmessages`,
                 icon: {
-                    name: "text",
+                    name: "menu-text-sign",
                     title: "icons.text.signed_messages"
                 },
                 text: "icons.text.signed_messages",
@@ -480,7 +554,7 @@ class MenuDataStructure {
                 includePattern: "/member-stats",
                 target: `/account/${state.currentAccount}/member-stats`,
                 icon: {
-                    name: "text",
+                    name: "menu-text",
                     title: "icons.text.membership_stats"
                 },
                 text: "account.member.stats",
@@ -490,7 +564,7 @@ class MenuDataStructure {
             account_vesting: state => ({
                 includePattern: "/vesting",
                 target: `/account/${state.currentAccount}/vesting`,
-                icon: "hourglass",
+                icon: "menu-hourglass",
                 text: "account.vesting.title",
                 inHeaderBehavior: MenuItemType.Never,
                 inDropdownBehavior: MenuItemType.WhenAccount
@@ -498,7 +572,7 @@ class MenuDataStructure {
             account_vesting_2: state => ({
                 includePattern: "/vesting",
                 target: `/account/${state.currentAccount}/vesting`,
-                icon: "hourglass",
+                icon: "menu-hourglass",
                 text: "account.vesting.title",
                 inHeaderBehavior: MenuItemType.Dynamic,
                 inDropdownBehavior: MenuItemType.Never
@@ -506,7 +580,7 @@ class MenuDataStructure {
             account_whitelist: state => ({
                 includePattern: "/whitelist",
                 target: `/account/${state.currentAccount}/whitelist`,
-                icon: "list",
+                icon: "menu-list",
                 text: "account.whitelist.title",
                 inHeaderBehavior: MenuItemType.Dynamic,
                 inDropdownBehavior: MenuItemType.WhenAccount
@@ -514,7 +588,7 @@ class MenuDataStructure {
             account_permissions: state => ({
                 includePattern: "/permissions",
                 target: `/account/${state.currentAccount}/permissions`,
-                icon: "warning",
+                icon: "menu-warning",
                 text: "account.permissions",
                 inHeaderBehavior: MenuItemType.Dynamic,
                 inDropdownBehavior: MenuItemType.WhenAccount
@@ -522,7 +596,7 @@ class MenuDataStructure {
             accounts: state => ({
                 includePattern: "/accounts",
                 target: "/accounts",
-                icon: "folder",
+                icon: "menu-folder",
                 text: "explorer.accounts.title",
                 inHeaderBehavior: MenuItemType.Never,
                 inDropdownBehavior: MenuItemType.WhenAccount
diff --git a/app/components/Listing/CoinCardListing.jsx b/app/components/Listing/CoinCardListing.jsx
index e4d5cf9f24..b7d7dac509 100644
--- a/app/components/Listing/CoinCardListing.jsx
+++ b/app/components/Listing/CoinCardListing.jsx
@@ -2,14 +2,15 @@ import React from "react";
 
 import {DonutChart} from "./DonutChart";
 import SendModal from "./DonateSendModal";
-import {Icon} from "bitshares-ui-style-guide";
+import {Button} from "bitshares-ui-style-guide";
 
 import SettingsStore from "../../stores/SettingsStore";
 import {connect} from "alt-react";
 import AccountStore from "../../stores/AccountStore";
 import Translate from "react-translate-component";
-import {Asset} from "../../lib/common/MarketClasses";
-import {Link} from "react-router-dom";
+import counterpart from "counterpart";
+
+import Icon from "../Icon/Icon";
 
 class CoinCardListing extends React.Component {
     constructor(props) {
@@ -102,33 +103,43 @@ class CoinCardListing extends React.Component {
                                     </div>
                                     {coin.votes}
                                     {coin.soon === true ? (
-                                        <a className="coin-soon">
-                                            {
-                                                <Icon
-                                                    name="transfer"
-                                                    title="icons.transfer"
-                                                    className="icon-14px"
-                                                />
-                                            }
-                                            &nbsp; Donate
-                                        </a>
+                                        <Button
+                                            className={"coin-soon"}
+                                            onClick={this.triggerSend.bind(
+                                                this,
+                                                "1.3.2",
+                                                coin
+                                            )}
+                                            disabled
+                                        >
+                                            <Translate content="listing.donate" />
+                                        </Button>
                                     ) : (
-                                        <a
+                                        <Button
+                                            title={counterpart.translate(
+                                                "listing.modal.header2"
+                                            )}
                                             onClick={this.triggerSend.bind(
                                                 this,
                                                 "1.3.2",
                                                 coin
                                             )}
                                         >
-                                            {
-                                                <Icon
-                                                    name="transfer"
-                                                    title="icons.transfer"
-                                                    className="icon-14px"
-                                                />
-                                            }
-                                            &nbsp; Donate
-                                        </a>
+                                            <Icon
+                                                style={{
+                                                    margin: "-3px 0 0px 0px"
+                                                }}
+                                                name="donate"
+                                                title="listing.modal.header2"
+                                                className="icon-14x"
+                                                onClick={this.triggerSend.bind(
+                                                    this,
+                                                    "1.3.2",
+                                                    coin
+                                                )}
+                                            />
+                                            {/*<Translate content="listing.donate"/>*/}
+                                        </Button>
                                     )}
                                 </div>
                             )}
diff --git a/app/components/Listing/ListingPage.css b/app/components/Listing/ListingPage.css
index 53cfec389e..90368ebd5e 100644
--- a/app/components/Listing/ListingPage.css
+++ b/app/components/Listing/ListingPage.css
@@ -7,6 +7,20 @@
     text-transform: none;
 }
 
+.listingTable button .icon > svg,
+.listingTable button span .icon {
+    width: 1.4rem;
+    height: 1.4rem;
+}
+
+.listingTableProgress {
+    line-height: 90px;
+}
+
+.listingTableProgress .inside {
+    margin-top: 10px;
+}
+
 .listingTable__header,
 .listingTable__row {
     display: flex;
@@ -34,12 +48,20 @@
 }
 
 .listingAssetCard {
-    width: 70%;
+    width: 60%;
     display: flex;
     flex-direction: row;
     align-items: center;
 }
 
+.listingAssetInfo {
+    width: 40%;
+    display: flex;
+    flex-direction: row;
+    position: relative;
+    left: -0.8rem;
+}
+
 .listingTableRank {
     width: 10%;
 }
@@ -50,12 +72,7 @@
 
 .listingTableAssetName {
     width: 75%;
-}
-
-.listingAssetInfo {
-    width: 40%;
-    display: flex;
-    flex-direction: row;
+    padding-left: 1.5rem;
 }
 
 .listingAssetInfoData {
@@ -93,17 +110,37 @@
     text-align: left;
 }
 
-.nowrap {
-    white-space: normal;
-}
-
 .listingAssetInfoBlock {
     display: none;
 }
 
-@media (min-width: 768px) {
-    .nowrap {
-        white-space: nowrap;
+.listingTableLogo a {
+    position: relative;
+    right: 1rem;
+    font-size: 0.8rem;
+}
+
+@media (max-width: 1100px) {
+    .listingAssetCard {
+        width: 55%;
+    }
+
+    .listingAssetInfo {
+        width: 45%;
+        display: flex;
+        flex-direction: row;
+    }
+}
+
+@media (max-width: 900px) {
+    .listingAssetCard {
+        width: 50%;
+    }
+
+    .listingAssetInfo {
+        width: 50%;
+        display: flex;
+        flex-direction: row;
     }
 }
 
@@ -121,6 +158,14 @@
         justify-content: flex-end;
     }
 
+    .listingAssetInfo {
+        width: 100%;
+        display: flex;
+        flex-direction: row;
+        align-self: flex-end;
+        justify-content: flex-end;
+    }
+
     .listingAsset {
         flex-direction: column;
     }
@@ -133,20 +178,17 @@
         width: 15%;
     }
 
+    .listingTableLogo a {
+        position: relative;
+        right: -1.5rem;
+    }
+
     .listingTableAssetName {
         width: 75%;
         align-self: center;
         padding: 0 0 0.5rem 1rem;
     }
 
-    .listingAssetInfo {
-        width: 100%;
-        display: flex;
-        flex-direction: row;
-        align-self: flex-end;
-        justify-content: flex-end;
-    }
-
     .listingAssetInfoData {
         width: 75%;
         display: flex;
@@ -205,15 +247,15 @@ body .listing_button .ant-btn[disabled]:hover {
     border-color: red !important;
 }
 
-.listingTable__cell.listingTableVotes a {
-    border: 1px solid #00a9e0;
-    display: block;
-    padding: 4px 6px 3px 0px;
-    border-radius: 3px;
+@media only screen and (max-width: 768px) {
+    .listingTable__cell.listingTableVotes button.ant-btn {
+        position: absolute;
+        right: -8%;
+    }
 }
 
 @media only screen and (max-width: 468px) {
-    .listingTable__cell.listingTableVotes a {
+    .listingTable__cell.listingTableVotes button.ant-btn {
         position: absolute;
         right: 20px;
     }
@@ -224,6 +266,21 @@ body .listing_button .ant-btn[disabled]:hover {
     color: grey !important;
 }
 
-.listingTable__cell.listingTableVotes a:hover {
-    border-color: #1652f0;
+.darkTheme .listingTable__cell .icon > svg path {
+    fill: white;
+}
+.lightTheme .listingTable__cell .icon > svg path {
+    fill: white;
+}
+
+.listingTable__cell button.ant-btn {
+    display: block;
+    padding: 5px 20px;
+
+    background-color: #349ff4 !important;
+
+    width: 96px;
+    height: 30px;
+
+    margin-left: 5px;
 }
diff --git a/app/components/Listing/ListingPage.jsx b/app/components/Listing/ListingPage.jsx
index 3bc0d121c6..24a9ab0e56 100644
--- a/app/components/Listing/ListingPage.jsx
+++ b/app/components/Listing/ListingPage.jsx
@@ -3,6 +3,7 @@ import "./ListingPage.css";
 
 import {Apis} from "bitsharesjs-ws";
 import {FetchChain} from "bitsharesjs";
+import counterpart from "counterpart";
 
 import CoinCardListing from "./CoinCardListing";
 import {getListingCoins, getListedCoins} from "../../branding";
@@ -11,18 +12,41 @@ import AssetImage from "../Utility/AssetImage";
 import Translate from "react-translate-component";
 import {Button} from "bitshares-ui-style-guide";
 import {Link} from "react-router-dom";
-import SettingsStore from "stores/SettingsStore";
+import IntlStore from "../../stores/IntlStore";
+
+import LoadingIndicator from "../LoadingIndicator";
+import {connect} from "alt-react";
 
 class ListingPage extends React.Component {
-    constructor() {
-        super();
+    constructor(props) {
+        super(props);
+
         this.state = {
             ListingNotice1Informed: false,
             coins: [],
-            updating: true
+            updating: true,
+            currentLocale: this.props.currentLocale
+        };
+        this.data = {
+            links: {
+                agreement_ru:
+                    "https://rudex.freshdesk.com/support/solutions/articles/35000138247-cоглашение-об-оказании-услуг-шлюза",
+                agreement_en:
+                    "https://rudex.freshdesk.com/support/solutions/articles/35000138245-gateway-service-agreement"
+            },
+            donateTokenName: "DONATE",
+            donateMarket: "DONATE_RUDEX.USDT"
         };
     }
 
+    UNSAFE_componentWillReceiveProps(nextProps) {
+        if (nextProps.currentLocale !== this.state.currentLocale) {
+            this.setState({
+                currentLocale: nextProps.currentLocale
+            });
+        }
+    }
+
     onSubmitRequest(e) {
         e.preventDefault();
         this.setState({error: null});
@@ -32,9 +56,10 @@ class ListingPage extends React.Component {
         let link_en =
             "https://docs.google.com/forms/d/1X2PguAaRzxlXZGLAarGcmNd-LbJCy8lcoMBcQjFSQ5k";
 
-        let current_locale = SettingsStore.getState().settings.get("locale");
-
-        window.open(current_locale == "ru" ? link_ru : link_en, "_blank");
+        window.open(
+            this.state.currentLocale == "ru" ? link_ru : link_en,
+            "_blank"
+        );
     }
 
     onListingNotice1Informed() {
@@ -52,305 +77,6 @@ class ListingPage extends React.Component {
         return false;
     }
 
-    render() {
-        let current_locale = SettingsStore.getState().settings.get("locale");
-
-        let agreement_ru =
-            "https://rudex.freshdesk.com/support/solutions/articles/35000138247-cоглашение-об-оказании-услуг-шлюза";
-        let agreement_en =
-            "https://rudex.freshdesk.com/support/solutions/articles/35000138245-gateway-service-agreement";
-
-        let RuDEX = <span style={{fontWeight: "bold"}}>RuDEX</span>;
-        let DONATE = (
-            <Link
-                style={{
-                    margin: 2,
-                    fontSize: "1.0rem",
-                    paddingRight: 5
-                }}
-                to={"/asset/DONATE"}
-            >
-                <AssetImage
-                    maxWidth={25}
-                    replaceNoneToBts={false}
-                    name={"DONATE"}
-                />
-                DONATE
-            </Link>
-        );
-
-        return (
-            <div className="grid-block vertical">
-                {/*Tabs*/}
-                <div className="grid-content">
-                    <div className="content-block small-12">
-                        <div className="tabs-container generic-bordered-box">
-                            <Tabs
-                                defaultActiveTab={0}
-                                segmented={false}
-                                setting="permissionsTab"
-                                className="account-tabs"
-                                tabsClass="account-overview bordered-header content-block"
-                                contentClass="padding"
-                            >
-                                {/* DONATE PROGRESS*/}
-                                <Tab title="listing.donate_progress">
-                                    <label className="horizontal" tabIndex={0}>
-                                        <div
-                                            className="grid-container"
-                                            style={{padding: "2rem 8px"}}
-                                        >
-                                            <div style={{marginBottom: 20}} />
-                                            <div className="grid-block small-up-1 medium-up-1 large-up-1 no-overflow">
-                                                {this.state.updating ===
-                                                true ? (
-                                                    <div
-                                                        style={{margin: "10px"}}
-                                                    >
-                                                        <Translate content="listing.loading" />{" "}
-                                                    </div>
-                                                ) : (
-                                                    this.getContent()
-                                                )}
-                                            </div>
-                                        </div>
-                                    </label>
-                                    <br />
-                                </Tab>
-
-                                {/* LISTED*/}
-                                <Tab title="listing.listed">
-                                    <label className="horizontal" tabIndex={1}>
-                                        <div
-                                            className="grid-container"
-                                            style={{padding: "2rem 8px"}}
-                                        >
-                                            <div style={{marginBottom: 20}} />
-                                            <div className="grid-block small-up-1 medium-up-1 large-up-1 no-overflow">
-                                                {this.state.updating ===
-                                                true ? (
-                                                    <div
-                                                        style={{margin: "10px"}}
-                                                    >
-                                                        <Translate content="listing.loading" />{" "}
-                                                    </div>
-                                                ) : (
-                                                    this.getContent_listed()
-                                                )}
-                                            </div>
-                                        </div>
-                                    </label>
-                                    <br />
-                                </Tab>
-
-                                <Tab title="listing.add_coin">
-                                    <label
-                                        className="horizontal"
-                                        tabIndex={2}
-                                    />
-
-                                    <div className="grid-container help-content-layout">
-                                        {/*<div className="grid-block">*/}
-                                        <div className="main-content">
-                                            <h2>
-                                                <Translate content="listing.texts.header" />
-                                            </h2>
-
-                                            <p style={{fontSize: "20px"}}>
-                                                <Translate content="listing.texts.text1" />
-                                            </p>
-                                            <p>
-                                                <Translate content="listing.texts.text2" />
-                                            </p>
-
-                                            <p>
-                                                <Translate content="listing.texts.text3.t1" />
-                                                <Translate content="listing.texts.text3.t2" />
-                                                <Link
-                                                    style={{
-                                                        margin: 2,
-                                                        fontSize: "1.0rem"
-                                                    }}
-                                                    to={
-                                                        "/market/DONATE_RUDEX.USDT"
-                                                    }
-                                                >
-                                                    <Translate content="listing.texts.text3.get" />
-                                                </Link>
-                                                <Translate content="listing.texts.text4.t1" />
-                                                <Link
-                                                    style={{
-                                                        margin: 2,
-                                                        fontSize: "1.0rem",
-                                                        paddingRight: 5
-                                                    }}
-                                                    to={"/asset/DONATE"}
-                                                >
-                                                    <AssetImage
-                                                        maxWidth={25}
-                                                        replaceNoneToBts={false}
-                                                        name={"DONATE"}
-                                                    />
-                                                    DONATE
-                                                </Link>
-                                                .
-                                                <Translate content="listing.texts.text4.t2" />
-                                                <Link
-                                                    style={{
-                                                        margin: 2,
-                                                        fontSize: "1.0rem",
-                                                        paddingRight: 5
-                                                    }}
-                                                    to={"/asset/DONATE"}
-                                                >
-                                                    <AssetImage
-                                                        maxWidth={25}
-                                                        replaceNoneToBts={false}
-                                                        name={"DONATE"}
-                                                    />
-                                                    DONATE
-                                                </Link>
-                                                <Translate content="listing.texts.text4.t3" />
-                                                <span
-                                                    style={{
-                                                        border:
-                                                            "1px solid #00a9e0",
-                                                        padding:
-                                                            "4px 3px 3px 4px",
-                                                        borderRadius: "3px",
-                                                        cursor: "pointer"
-                                                    }}
-                                                >
-                                                    DONATE
-                                                </span>
-                                                <Translate content="listing.texts.text4.t4" />
-                                            </p>
-
-                                            <p>
-                                                <Translate content="listing.texts.text5.t1" />
-
-                                                <Link
-                                                    style={{
-                                                        margin: 2,
-                                                        fontSize: "1.0rem",
-                                                        paddingRight: 5
-                                                    }}
-                                                    to={"/asset/DONATE"}
-                                                >
-                                                    <AssetImage
-                                                        maxWidth={25}
-                                                        replaceNoneToBts={false}
-                                                        name={"DONATE"}
-                                                    />
-                                                    DONATE
-                                                </Link>
-
-                                                <Translate content="listing.texts.text5.t2" />
-                                            </p>
-
-                                            <p>
-                                                <Translate content="listing.texts.text5.t3" />
-                                            </p>
-
-                                            <h3>
-                                                <Translate content="listing.texts.rules.header" />
-                                            </h3>
-
-                                            <ol>
-                                                <li>
-                                                    <Translate content="listing.texts.rules.rule_1" />
-                                                    <Translate
-                                                        href={
-                                                            current_locale ==
-                                                            "ru"
-                                                                ? agreement_ru
-                                                                : agreement_en
-                                                        }
-                                                        content="listing.texts.rules.rule_10"
-                                                        component="a"
-                                                        target="_blank"
-                                                    />
-                                                    <Translate content="listing.texts.rules.rule_11" />
-                                                </li>
-                                                <li>
-                                                    <Translate content="listing.texts.rules.rule_2" />
-                                                </li>
-                                                <li>
-                                                    <Translate content="listing.texts.rules.rule_3" />
-                                                    <Link
-                                                        style={{
-                                                            margin: 2,
-                                                            fontSize: "1.0rem",
-                                                            paddingRight: 5
-                                                        }}
-                                                        to={"/asset/DONATE"}
-                                                    >
-                                                        <AssetImage
-                                                            maxWidth={25}
-                                                            replaceNoneToBts={
-                                                                false
-                                                            }
-                                                            name={"DONATE"}
-                                                        />
-                                                        DONATE
-                                                    </Link>
-                                                    <Translate content="listing.texts.rules.rule_4" />
-                                                </li>
-                                                <li>
-                                                    <Translate content="listing.texts.rules.rule_5" />
-                                                </li>
-                                            </ol>
-                                        </div>
-
-                                        <h5>
-                                            <input
-                                                type="checkbox"
-                                                defaultChecked={
-                                                    this.state
-                                                        .ListingNotice1Informed
-                                                }
-                                                onChange={this.onListingNotice1Informed.bind(
-                                                    this
-                                                )}
-                                            />{" "}
-                                            -{" "}
-                                            <Translate content="listing.notice_informed" />
-                                        </h5>
-
-                                        <div className={"listing_button"}>
-                                            <Button
-                                                key={"send"}
-                                                disabled={
-                                                    !this.state
-                                                        .ListingNotice1Informed
-                                                }
-                                                onClick={
-                                                    this.state
-                                                        .ListingNotice1Informed
-                                                        ? this.onSubmitRequest.bind(
-                                                              this
-                                                          )
-                                                        : null
-                                                }
-                                            >
-                                                <Translate content="listing.submit_request" />
-                                            </Button>
-                                        </div>
-
-                                        <h3>
-                                            <Translate content="listing.texts.end" />{" "}
-                                            {RuDEX}!
-                                        </h3>
-                                    </div>
-                                </Tab>
-                            </Tabs>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        );
-    }
-
     _getBalances() {
         let coins = getListingCoins();
 
@@ -360,40 +86,57 @@ class ListingPage extends React.Component {
             coins: coins,
             updating: true
         });
+
         coins.forEach(coin => {
-            FetchChain("getAsset", "DONATE").then(assetInfo => {
-                Apis.instance()
-                    .db_api()
-                    .exec("get_named_account_balances", [
-                        coin.account,
-                        [assetInfo.get("id")]
-                    ])
-                    .then(res => {
-                        let coins = this.state.coins;
-                        let x = coins.find(i => i.account === coin.account);
-                        x.votes =
-                            res[0]["amount"] /
-                            Math.pow(10, assetInfo.get("precision"));
-                        this.setState({
-                            coins: coins
-                        });
-                    })
-                    .then(() => {
-                        this.setState({
-                            updating: false
+            FetchChain("getAsset", this.data.donateTokenName).then(
+                assetInfo => {
+                    Apis.instance()
+                        .db_api()
+                        .exec("get_named_account_balances", [
+                            coin.account,
+                            [assetInfo.get("id")]
+                        ])
+                        .then(res => {
+                            let coins = this.state.coins;
+                            let x = coins.find(i => i.account === coin.account);
+                            x.votes =
+                                res[0]["amount"] /
+                                Math.pow(10, assetInfo.get("precision"));
+                            this.setState({
+                                coins: coins
+                            });
+                        })
+                        .then(() => {
+                            this.setState({
+                                updating: false
+                            });
                         });
-                    });
-            });
+                }
+            );
         });
     }
 
-    getContent = () => {
+    render() {
+        return (
+            <div className="grid-block vertical">
+                {this.state.updating === true ? (
+                    <LoadingIndicator
+                        loadingText={counterpart.translate("footer.loading")}
+                    />
+                ) : (
+                    this.getTableTabs()
+                )}
+            </div>
+        );
+    }
+
+    getContent() {
         return (
             <div className="listingTable">
                 <p>
                     <Link
                         style={{margin: 2, fontSize: "1.0rem"}}
-                        to={"/market/DONATE_RUDEX.USDT"}
+                        to={`/market/${this.data.donateMarket}`}
                     >
                         <Translate content="listing.get_donate_tokens" />
 
@@ -401,9 +144,9 @@ class ListingPage extends React.Component {
                             <AssetImage
                                 maxWidth={25}
                                 replaceNoneToBts={false}
-                                name={"DONATE"}
+                                name={this.data.donateTokenName}
                             />
-                            DONATE
+                            {this.data.donateTokenName}
                         </span>
                         <Translate content="listing.token" />
                     </Link>
@@ -438,7 +181,7 @@ class ListingPage extends React.Component {
                 {this.getCoinsList()}
             </div>
         );
-    };
+    }
 
     getContent_listed = () => {
         return (
@@ -499,6 +242,229 @@ class ListingPage extends React.Component {
             return <CoinCardListing key={i} rank={i + 1} coin={coin} />;
         });
     };
+
+    getTableTabs = () => {
+        let RuDEX = <span style={{fontWeight: "bold"}}>RuDEX</span>;
+
+        let DonateLink = (
+            style = {
+                margin: 2,
+                fontSize: "1.0rem",
+                paddingRight: 5
+            }
+        ) => {
+            return (
+                <Link style={style} to={`/asset/${this.data.donateTokenName}`}>
+                    <AssetImage
+                        maxWidth={25}
+                        replaceNoneToBts={false}
+                        name={this.data.donateTokenName}
+                    />
+                    {this.data.donateTokenName}
+                </Link>
+            );
+        };
+
+        return (
+            <div className="grid-content">
+                <div className="content-block small-12">
+                    <div className="tabs-container generic-bordered-box">
+                        <Tabs
+                            defaultActiveTab={0}
+                            segmented={false}
+                            setting="permissionsTab"
+                            className="account-tabs"
+                            tabsClass="account-overview bordered-header content-block"
+                            contentClass="padding"
+                        >
+                            {/* DONATE PROGRESS*/}
+                            <Tab title="listing.donate_progress">
+                                <label className="horizontal" tabIndex={0}>
+                                    <div
+                                        className="grid-container"
+                                        style={{padding: "2rem 8px"}}
+                                    >
+                                        <div style={{marginBottom: 20}} />
+                                        <div className="grid-block small-up-1 medium-up-1 large-up-1 no-overflow">
+                                            {this.getContent()}
+                                        </div>
+                                    </div>
+                                </label>
+                                <br />
+                            </Tab>
+
+                            {/* LISTED*/}
+                            <Tab title="listing.listed">
+                                <label className="horizontal" tabIndex={1}>
+                                    <div
+                                        className="grid-container"
+                                        style={{padding: "2rem 8px"}}
+                                    >
+                                        <div style={{marginBottom: 20}} />
+                                        <div className="grid-block small-up-1 medium-up-1 large-up-1 no-overflow">
+                                            {this.getContent_listed()}
+                                        </div>
+                                    </div>
+                                </label>
+                                <br />
+                            </Tab>
+
+                            {/* Add Coin*/}
+                            <Tab title="listing.add_coin">
+                                <label className="horizontal" tabIndex={2} />
+
+                                <div className="grid-container help-content-layout">
+                                    {/*<div className="grid-block">*/}
+                                    <div className="main-content">
+                                        <h2>
+                                            <Translate content="listing.texts.header" />
+                                        </h2>
+
+                                        <p style={{fontSize: "20px"}}>
+                                            <Translate content="listing.texts.text1" />
+                                        </p>
+                                        <p>
+                                            <Translate content="listing.texts.text2" />
+                                        </p>
+
+                                        <p>
+                                            <Translate content="listing.texts.text3.t1" />
+                                            <Translate content="listing.texts.text3.t2" />
+                                            <Link
+                                                style={{
+                                                    margin: 2,
+                                                    fontSize: "1.0rem"
+                                                }}
+                                                to={`/market/${this.data.donateMarket}`}
+                                            >
+                                                <Translate content="listing.texts.text3.get" />
+                                            </Link>
+                                            <Translate content="listing.texts.text4.t1" />
+                                            {DonateLink()}
+                                            .
+                                            <Translate content="listing.texts.text4.t2" />
+                                            {DonateLink()}
+                                            <Translate content="listing.texts.text4.t3" />
+                                            <span
+                                                style={{
+                                                    border: "1px solid #00a9e0",
+                                                    padding: "4px 3px 3px 4px",
+                                                    borderRadius: "3px",
+                                                    cursor: "pointer"
+                                                }}
+                                            >
+                                                {this.data.donateTokenName}
+                                            </span>
+                                            <Translate content="listing.texts.text4.t4" />
+                                        </p>
+
+                                        <p>
+                                            <Translate content="listing.texts.text5.t1" />
+
+                                            {DonateLink()}
+
+                                            <Translate content="listing.texts.text5.t2" />
+                                        </p>
+
+                                        <p>
+                                            <Translate content="listing.texts.text5.t3" />
+                                        </p>
+
+                                        <h3>
+                                            <Translate content="listing.texts.rules.header" />
+                                        </h3>
+
+                                        <ol>
+                                            <li>
+                                                <Translate content="listing.texts.rules.rule_1" />
+                                                <Translate
+                                                    href={
+                                                        this.state
+                                                            .currentLocale ==
+                                                        "ru"
+                                                            ? this.data.links
+                                                                  .agreement_ru
+                                                            : this.data.links
+                                                                  .agreement_en
+                                                    }
+                                                    content="listing.texts.rules.rule_10"
+                                                    component="a"
+                                                    target="_blank"
+                                                />
+                                                <Translate content="listing.texts.rules.rule_11" />
+                                            </li>
+                                            <li>
+                                                <Translate content="listing.texts.rules.rule_2" />
+                                            </li>
+                                            <li>
+                                                <Translate content="listing.texts.rules.rule_3" />
+                                                {DonateLink()}
+                                                <Translate content="listing.texts.rules.rule_4" />
+                                            </li>
+                                            <li>
+                                                <Translate content="listing.texts.rules.rule_5" />
+                                            </li>
+                                        </ol>
+                                    </div>
+
+                                    <h5>
+                                        <input
+                                            type="checkbox"
+                                            defaultChecked={
+                                                this.state
+                                                    .ListingNotice1Informed
+                                            }
+                                            onChange={this.onListingNotice1Informed.bind(
+                                                this
+                                            )}
+                                        />{" "}
+                                        -{" "}
+                                        <Translate content="listing.notice_informed" />
+                                    </h5>
+
+                                    <div className={"listing_button"}>
+                                        <Button
+                                            key={"send"}
+                                            disabled={
+                                                !this.state
+                                                    .ListingNotice1Informed
+                                            }
+                                            onClick={
+                                                this.state
+                                                    .ListingNotice1Informed
+                                                    ? this.onSubmitRequest.bind(
+                                                          this
+                                                      )
+                                                    : null
+                                            }
+                                        >
+                                            <Translate content="listing.submit_request" />
+                                        </Button>
+                                    </div>
+
+                                    <h3>
+                                        <Translate content="listing.texts.end" />{" "}
+                                        {RuDEX}!
+                                    </h3>
+                                </div>
+                            </Tab>
+                        </Tabs>
+                    </div>
+                </div>
+            </div>
+        );
+    };
 }
 
+ListingPage = connect(ListingPage, {
+    listenTo() {
+        return [IntlStore];
+    },
+    getProps() {
+        return {
+            currentLocale: IntlStore.getState().currentLocale
+        };
+    }
+});
+
 export default ListingPage;
diff --git a/app/components/Modal/BorrowModal.jsx b/app/components/Modal/BorrowModal.jsx
index 2cdda5c3a6..6856ba666e 100755
--- a/app/components/Modal/BorrowModal.jsx
+++ b/app/components/Modal/BorrowModal.jsx
@@ -732,7 +732,7 @@ class BorrowModalContent extends React.Component {
         if (!isPredictionMarket && isNaN(feed_price)) {
             footer.push(
                 <Button tabIndex={6} onClick={this.props.hideModal}>
-                    {counterpart.translate("accountObj.perm.cancel")}
+                    {counterpart.translate("account.perm.cancel")}
                 </Button>
             );
         } else {
diff --git a/app/components/Modal/SetDefaultFeeAssetModal.jsx b/app/components/Modal/SetDefaultFeeAssetModal.jsx
index 493a87f933..321702a972 100644
--- a/app/components/Modal/SetDefaultFeeAssetModal.jsx
+++ b/app/components/Modal/SetDefaultFeeAssetModal.jsx
@@ -96,10 +96,10 @@ class SetDefaultFeeAssetModal extends React.Component {
             if (a.asset == "GPH" || b.asset == "GPH") {
                 return a.asset == "GPH" ? 1 : -1;
             } else if (
-                ["USD", "CNY", "EUR"].includes(a.asset) !==
-                ["USD", "CNY", "EUR"].includes(b.asset)
+                ["USD", "CNY", "EUR", "RUB"].includes(a.asset) !==
+                ["USD", "CNY", "EUR", "RUB"].includes(b.asset)
             ) {
-                return ["USD", "CNY", "EUR"].includes(a.asset) ? 1 : -1;
+                return ["USD", "CNY", "EUR", "RUB"].includes(a.asset) ? 1 : -1;
             }
             return a.asset < b.asset;
         };
@@ -235,21 +235,18 @@ SetDefaultFeeAssetModal.defaultProps = {
     show: false
 };
 
-SetDefaultFeeAssetModal = connect(
-    SetDefaultFeeAssetModal,
-    {
-        listenTo() {
-            return [SettingsStore, AccountStore];
-        },
-        getProps(props) {
-            const currentAccount =
-                props.currentAccount ||
-                ChainStore.getAccount(AccountStore.getState().currentAccount);
-            return {
-                settings: SettingsStore.getState().settings,
-                currentAccount
-            };
-        }
+SetDefaultFeeAssetModal = connect(SetDefaultFeeAssetModal, {
+    listenTo() {
+        return [SettingsStore, AccountStore];
+    },
+    getProps(props) {
+        const currentAccount =
+            props.currentAccount ||
+            ChainStore.getAccount(AccountStore.getState().currentAccount);
+        return {
+            settings: SettingsStore.getState().settings,
+            currentAccount
+        };
     }
-);
+});
 export default SetDefaultFeeAssetModal;
diff --git a/app/components/News.jsx b/app/components/News.jsx
index dac196a7dd..6e5d98d330 100644
--- a/app/components/News.jsx
+++ b/app/components/News.jsx
@@ -1,18 +1,24 @@
 import React from "react";
 import counterpart from "counterpart";
 import * as api_en from "steem-js-api";
-import * as api_ru from "golos-classic-js";
+import * as api_ru from "golos-lib-js";
 import Translate from "react-translate-component";
 import LoadingIndicator from "./LoadingIndicator";
 import utils from "common/utils";
+import SettingsStore from "stores/SettingsStore";
+import {connect} from "alt-react";
+import IntlStore from "../stores/IntlStore";
 
 let api;
 
-const query = {
-    select_authors: ["rudex"],
-    tag: "rudex",
-    limit: 20,
-    filter_tag_masks: ["fm-"]
+let query_func = function(locale) {
+    let query = {
+        select_authors: ["rudex"],
+        tag: "rudex",
+        limit: 20
+    };
+    locale == "ru" ? (query.filter_tag_masks = ["fm-"]) : query;
+    return query;
 };
 
 const alignRight = {textAlign: "right"};
@@ -37,8 +43,6 @@ const SomethingWentWrong = () => (
 
 const ReusableLink = ({data, locale, url, isLink = false}) => (
     <a
-        //href={`https://steemit.com${url}`}
-        //href={`https://golos.id${url}`}
         href={
             locale == "ru"
                 ? `https://golos.id${url}`
@@ -62,10 +66,11 @@ const NewsTable = ({data, width, locale}) => {
             <thead>
                 <tr>
                     <th style={rightCellHeader}>
-                        <Translate
-                            component="span"
-                            content="account.votes.line"
-                        />
+                        #
+                        {/*<Translate
+                        component="span"
+                        content="account.votes.line"
+                    />*/}
                     </th>
                     <th style={leftCellHeader}>
                         <Translate
@@ -86,9 +91,11 @@ const NewsTable = ({data, width, locale}) => {
                     const theAuthor = singleNews.parentAuthor
                         ? singleNews.parentAuthor
                         : singleNews.author;
-                    const formattedDate = counterpart.localize(
+
+                    let formattedDate = counterpart.localize(
                         new Date(singleNews.created)
                     );
+
                     const smartTitle =
                         singleNews.title.length * 6 > width - 450
                             ? `${singleNews.title.slice(
@@ -151,7 +158,7 @@ class News extends React.Component {
             isWrong: false,
             discussions: [],
             width: 1200,
-            currentLocale: Translate.getLocale()
+            currentLocale: this.props.currentLocale
         };
         this.updateDimensions = this.updateDimensions.bind(this);
         this.orderDiscussions = this.orderDiscussions.bind(this);
@@ -172,13 +179,36 @@ class News extends React.Component {
         this.updateDimensions();
         window.addEventListener("resize", this.updateDimensions);
 
-        if (this.state.currentLocale === "ru") {
+        this.processUpdateNews(this.state.currentLocale);
+    }
+
+    processUpdateNews(currentLocale, oldLocale = false) {
+        if (oldLocale !== false && currentLocale !== "ru" && oldLocale !== "ru")
+            return false;
+
+        this.setState({
+            isLoading: true
+        });
+
+        let api = false;
+        if (currentLocale == "ru") {
             api = api_ru.api;
-            api.setWebSocket("wss://api.golos.id/ws");
+            //api.setWebSocket("wss://api.golos.id/ws");//deprecated for new lib
+            api_ru.config.set("websocket", "wss://api.golos.id/ws");
+
+            this.setState({
+                currentLocale: currentLocale
+            });
         } else api = api_en.api;
 
-        api.getDiscussionsByBlog(query)
+        api.getDiscussionsByBlog(query_func(currentLocale))
             .then(discussions => {
+                this.setState({
+                    isLoading: true,
+                    currentLocale: currentLocale,
+                    discussions: discussions
+                });
+
                 this.orderDiscussions(discussions);
             })
             .catch(() => {
@@ -190,6 +220,18 @@ class News extends React.Component {
         window.removeEventListener("resize", this.updateDimensions);
     }
 
+    UNSAFE_componentWillReceiveProps(nextProps, nextState) {
+        if (
+            nextProps.currentLocale !== this.props.currentLocale &&
+            nextState.discussions !== this.state.discussions
+        ) {
+            this.processUpdateNews(
+                nextProps.currentLocale,
+                this.props.currentLocale
+            );
+        }
+    }
+
     render() {
         const {
             isLoading,
@@ -201,27 +243,42 @@ class News extends React.Component {
 
         return (
             <div className="grid-block page-layout">
-                <div className="grid-block vertical">
-                    <div className="account-tabs">
-                        <div className="tab-content">
-                            <div className="grid-block vertical">
-                                {isWrong && <SomethingWentWrong />}
-                                {isLoading ? <LoadingIndicator /> : null}
-                                {!isWrong &&
-                                    !isLoading && (
+                {isLoading ? (
+                    <LoadingIndicator
+                        loadingText={counterpart.translate("footer.loading")}
+                    />
+                ) : (
+                    <div className="grid-block vertical">
+                        <div className="account-tabs">
+                            <div className="tab-content">
+                                <div className="grid-block vertical">
+                                    {isWrong && <SomethingWentWrong />}
+                                    {!isWrong && !isLoading && (
                                         <NewsTable
                                             width={width}
                                             data={discussions}
                                             locale={currentLocale}
                                         />
                                     )}
+                                </div>
                             </div>
                         </div>
                     </div>
-                </div>
+                )}
             </div>
         );
     }
 }
 
+News = connect(News, {
+    listenTo() {
+        return [IntlStore];
+    },
+    getProps() {
+        return {
+            currentLocale: IntlStore.getState().currentLocale
+        };
+    }
+});
+
 export default News;
diff --git a/app/components/PrivateKeyView.jsx b/app/components/PrivateKeyView.jsx
index 15f962b466..35feb2c61a 100644
--- a/app/components/PrivateKeyView.jsx
+++ b/app/components/PrivateKeyView.jsx
@@ -7,6 +7,7 @@ import QrcodeModal from "./Modal/QrcodeModal";
 import counterpart from "counterpart";
 import PropTypes from "prop-types";
 import {Modal, Button} from "bitshares-ui-style-guide";
+import QR_IMG from "../assets/qr.png";
 
 export default class PrivateKeyView extends Component {
     static propTypes = {
@@ -122,7 +123,7 @@ export default class PrivateKeyView extends Component {
                                                 >
                                                     <img
                                                         style={{height: 50}}
-                                                        src={require("assets/qr.png")}
+                                                        src={QR_IMG}
                                                     />
                                                 </div>
                                             </div>
diff --git a/app/components/Showcases/Borrow.jsx b/app/components/Showcases/Borrow.jsx
index 774aa7c319..533713ef39 100644
--- a/app/components/Showcases/Borrow.jsx
+++ b/app/components/Showcases/Borrow.jsx
@@ -147,7 +147,14 @@ class Borrow extends Component {
                                     marginBottom: "1rem"
                                 }}
                                 assets={[
-                                    "1.3.27" // gpUSD
+                                    //gpAssets
+                                    "1.3.27", // gpUSD
+                                    "1.3.36", // gpEUR
+                                    "1.3.37", // gpRUB
+                                    "1.3.38", // gpCNY
+                                    "1.3.35", // gpGOLD
+                                    "1.3.34" // gpSILVER
+
                                     /*"1.3.120",
                                     "1.3.121",
                                     "1.3.1325",
@@ -352,20 +359,19 @@ class Borrow extends Component {
                         )}
                     </div>
                 </Card>
-                {accountLoaded &&
-                    !!selectedAssetObject && (
-                        <BorrowModal
-                            visible={this.state.isBorrowBaseModalVisible}
-                            hideModal={this.hideBorrowModal}
-                            quoteAssetObj={selectedAssetObject.get("id")}
-                            backingAssetObj={selectedAssetObject.getIn([
-                                "bitasset",
-                                "options",
-                                "short_backing_asset"
-                            ])}
-                            accountObj={currentAccount}
-                        />
-                    )}
+                {accountLoaded && !!selectedAssetObject && (
+                    <BorrowModal
+                        visible={this.state.isBorrowBaseModalVisible}
+                        hideModal={this.hideBorrowModal}
+                        quoteAssetObj={selectedAssetObject.get("id")}
+                        backingAssetObj={selectedAssetObject.getIn([
+                            "bitasset",
+                            "options",
+                            "short_backing_asset"
+                        ])}
+                        accountObj={currentAccount}
+                    />
+                )}
             </div>
         );
     }
@@ -404,18 +410,15 @@ class Borrow extends Component {
 
 Borrow = debounceRender(Borrow, 50, {leading: false});
 
-export default connect(
-    Borrow,
-    {
-        listenTo() {
-            return [AccountStore];
-        },
-        getProps() {
-            return {
-                currentAccount:
-                    AccountStore.getState().currentAccount ||
-                    AccountStore.getState().passwordAccount
-            };
-        }
+export default connect(Borrow, {
+    listenTo() {
+        return [AccountStore];
+    },
+    getProps() {
+        return {
+            currentAccount:
+                AccountStore.getState().currentAccount ||
+                AccountStore.getState().passwordAccount
+        };
     }
-);
+});
diff --git a/app/components/Transfer/InvoicePay.jsx b/app/components/Transfer/InvoicePay.jsx
index da042d929b..780b1d655b 100644
--- a/app/components/Transfer/InvoicePay.jsx
+++ b/app/components/Transfer/InvoicePay.jsx
@@ -8,7 +8,6 @@ import NotificationActions from "actions/NotificationActions";
 import TransactionConfirmStore from "stores/TransactionConfirmStore";
 import {decompress, compress} from "lzma";
 import bs58 from "common/base58";
-import utils from "common/utils";
 import PrintReceiptButton from "./PrintReceiptButton.jsx";
 import Translate from "react-translate-component";
 import {
@@ -19,6 +18,7 @@ import {
     Tooltip,
     Switch
 } from "bitshares-ui-style-guide";
+import utils from "common/utils";
 import counterpart from "counterpart";
 import {hasLoaded} from "../Utility/BindToCurrentAccount";
 import Operation from "../Blockchain/Operation";
diff --git a/app/components/Transfer/InvoiceRequest.jsx b/app/components/Transfer/InvoiceRequest.jsx
index 6d03252f11..ddca3b080f 100644
--- a/app/components/Transfer/InvoiceRequest.jsx
+++ b/app/components/Transfer/InvoiceRequest.jsx
@@ -16,6 +16,7 @@ import {
 } from "bitshares-ui-style-guide";
 import counterpart from "counterpart";
 import CopyButton from "../Utility/CopyButton";
+import {get_allTokens} from "branding";
 
 let id = 1;
 
@@ -28,8 +29,7 @@ class InvoiceRequest extends React.Component {
             recipient_name: null,
             recipient_name_account: null,
             currency: "GPH",
-            //defaultAssets: ["GPH", "USD", "RUB", "CNY"]
-            defaultAssets: ["GPH", "USD"]
+            defaultAssets: get_allTokens().nativeTokens
         };
     }
 
diff --git a/app/components/Utility/AssetImage.jsx b/app/components/Utility/AssetImage.jsx
index 5c52ed1758..8e9ac5272a 100644
--- a/app/components/Utility/AssetImage.jsx
+++ b/app/components/Utility/AssetImage.jsx
@@ -1,6 +1,7 @@
 import React from "react";
 import AssetWrapper from "../Bots/libs/AssetWrapper";
 import PropTypes from "prop-types";
+import {getImageName} from "branding";
 
 class AssetImage extends React.Component {
     static propTypes = {
@@ -45,13 +46,13 @@ class AssetImage extends React.Component {
     render() {
         let {asset} = this.props;
 
-        function getImageName(asset) {
-            if (asset === null) return null;
+        function getImageWrapper(asset) {
+            if (asset === null) return "unknown";
             let symbol = asset.get("symbol");
-            return symbol;
+            return getImageName(symbol);
         }
 
-        const imgName = getImageName(asset);
+        const imgName = getImageWrapper(asset);
 
         return (
             <img
diff --git a/app/components/Utility/FormattedPrice.jsx b/app/components/Utility/FormattedPrice.jsx
index 4c8ac69fc7..422c2e8a27 100644
--- a/app/components/Utility/FormattedPrice.jsx
+++ b/app/components/Utility/FormattedPrice.jsx
@@ -190,11 +190,13 @@ class FormattedPrice extends React.Component {
                 : price.base.precision;
             decimals = Math.min(8, decimals);
             formatted_value = (
-                <FormattedNumber
-                    value={value}
-                    minimumFractionDigits={Math.max(2, decimals)}
-                    maximumFractionDigits={Math.max(2, decimals)}
-                />
+                <span className="clickable" onClick={this.onFlip.bind(this)}>
+                    <FormattedNumber
+                        value={value}
+                        minimumFractionDigits={Math.max(2, decimals)}
+                        maximumFractionDigits={Math.max(2, decimals)}
+                    />
+                </span>
             );
 
             if (pulsate) {
diff --git a/app/components/Utility/TransitionWrapper.jsx b/app/components/Utility/TransitionWrapper.jsx
index 2d13388330..5be07eadfb 100644
--- a/app/components/Utility/TransitionWrapper.jsx
+++ b/app/components/Utility/TransitionWrapper.jsx
@@ -1,5 +1,5 @@
 import React from "react";
-import CSSTransitionGroup from "react-transition-group/CSSTransitionGroup";
+import {CSSTransition, TransitionGroup} from "react-transition-group";
 
 export default class TransitionWrapper extends React.Component {
     static defaultProps = {
@@ -49,17 +49,23 @@ export default class TransitionWrapper extends React.Component {
             return React.createElement(this.props.component);
         } else {
             return (
-                <CSSTransitionGroup
+                <TransitionGroup
+                    component={this.props.component}
                     id={this.props.id}
                     className={this.props.className}
-                    component={this.props.component}
-                    transitionName={this.props.transitionName}
-                    transitionEnterTimeout={this.props.enterTimeout}
-                    transitionEnter={this.state.animateEnter}
-                    transitionLeave={false}
                 >
-                    {this.props.children}
-                </CSSTransitionGroup>
+                    {React.Children.map(this.props.children, (child, index) => (
+                        <CSSTransition
+                            key={index}
+                            classNames={this.props.transitionName}
+                            timeout={{enter: this.props.enterTimeout}}
+                            exit={false}
+                            enter={this.state.animateEnter}
+                        >
+                            {child}
+                        </CSSTransition>
+                    ))}
+                </TransitionGroup>
             );
         }
     }
diff --git a/app/components/Utility/TranslateWithLinks.jsx b/app/components/Utility/TranslateWithLinks.jsx
index 1f7835795b..56f4c6f468 100644
--- a/app/components/Utility/TranslateWithLinks.jsx
+++ b/app/components/Utility/TranslateWithLinks.jsx
@@ -186,52 +186,73 @@ export default class TranslateWithLinks extends React.Component {
                                         content={"proposal.changes_to_active"}
                                     />
                                     <div style={{marginLeft: "0.5rem"}}>
-                                        {active.keys.plus.length > 0 ||
-                                            (active.accounts.plus.length >
-                                                0 && (
-                                                <div>
-                                                    {"- " +
-                                                        counterpart.translate(
-                                                            "proposal.add"
-                                                        ) +
-                                                        " "}
-                                                    {active.keys.plus.join(
-                                                        ", "
-                                                    )}{" "}
-                                                    {active.accounts.plus.map(
-                                                        _tmp => (
-                                                            <span key={_tmp}>
-                                                                {this.linkToAccount(
-                                                                    _tmp
-                                                                )}
-                                                            </span>
-                                                        )
-                                                    )}
-                                                </div>
-                                            ))}
-                                        {active.keys.minus.length > 0 ||
-                                            (active.accounts.minus.length >
-                                                0 && (
-                                                <div>
-                                                    {"- " +
-                                                        counterpart.translate(
-                                                            "proposal.remove"
-                                                        ) +
-                                                        " "}
-                                                    {active.keys.minus.join(
-                                                        ", "
-                                                    )}{" "}
-                                                    {active.accounts.minus.map(
-                                                        _tmp => (
-                                                            <span key={_tmp}>
-                                                                {this.linkToAccount(
-                                                                    _tmp
-                                                                )}
-                                                            </span>
-                                                        )
-                                                    )}
-                                                </div>
-                                            ))}
+                                        {(active.keys.plus.length > 0 ||
+                                            active.accounts.plus.length >
+                                                0) && (
+                                            <div>
+                                                {"- " +
+                                                    counterpart.translate(
+                                                        "proposal.add"
+                                                    ) +
+                                                    " "}
+                                                {active.keys.plus.join(", ")}
+                                                {active.keys.plus.length > 0 &&
+                                                    active.accounts.plus
+                                                        .length > 0 &&
+                                                    ", "}
+                                                {active.accounts.plus.length > 0
+                                                    ? active.accounts.plus
+                                                          .map(_tmp => (
+                                                              <span key={_tmp}>
+                                                                  {this.linkToAccount(
+                                                                      _tmp
+                                                                  )}
+                                                              </span>
+                                                          ))
+                                                          .reduce(
+                                                              (prev, curr) => [
+                                                                  prev,
+                                                                  ", ",
+                                                                  curr
+                                                              ]
+                                                          )
+                                                    : ""}
+                                            </div>
+                                        )}
+                                        {(active.keys.minus.length > 0 ||
+                                            active.accounts.minus.length >
+                                                0) && (
+                                            <div>
+                                                {"- " +
+                                                    counterpart.translate(
+                                                        "proposal.remove"
+                                                    ) +
+                                                    " "}
+                                                {active.keys.minus.join(", ")}
+                                                {active.keys.minus.length > 0 &&
+                                                    active.accounts.minus
+                                                        .length > 0 &&
+                                                    ", "}
+                                                {active.accounts.minus.length >
+                                                0
+                                                    ? active.accounts.minus
+                                                          .map(_tmp => (
+                                                              <span key={_tmp}>
+                                                                  {this.linkToAccount(
+                                                                      _tmp
+                                                                  )}
+                                                              </span>
+                                                          ))
+                                                          .reduce(
+                                                              (prev, curr) => [
+                                                                  prev,
+                                                                  ", ",
+                                                                  curr
+                                                              ]
+                                                          )
+                                                    : ""}
+                                            </div>
+                                        )}
                                         {active.weight_threshold && (
                                             <div>
                                                 {"- " +
@@ -253,49 +274,71 @@ export default class TranslateWithLinks extends React.Component {
                                         content={"proposal.changes_to_owner"}
                                     />
                                     <div style={{marginLeft: "0.5rem"}}>
-                                        {owner.keys.plus.length > 0 ||
-                                            (owner.accounts.plus.length > 0 && (
-                                                <div>
-                                                    {"- " +
-                                                        counterpart.translate(
-                                                            "proposal.add"
-                                                        ) +
-                                                        " "}
-                                                    {owner.keys.plus.join(", ")}{" "}
-                                                    {owner.accounts.plus.map(
-                                                        _tmp => (
-                                                            <span key={_tmp}>
-                                                                {this.linkToAccount(
-                                                                    _tmp
-                                                                )}
-                                                            </span>
-                                                        )
-                                                    )}
-                                                </div>
-                                            ))}
-                                        {owner.keys.minus.length > 0 ||
-                                            (owner.accounts.minus.length >
-                                                0 && (
-                                                <div>
-                                                    {"- " +
-                                                        counterpart.translate(
-                                                            "proposal.remove"
-                                                        ) +
-                                                        " "}
-                                                    {owner.keys.minus.join(
-                                                        ", "
-                                                    )}{" "}
-                                                    {owner.accounts.minus.map(
-                                                        _tmp => (
-                                                            <span key={_tmp}>
-                                                                {this.linkToAccount(
-                                                                    _tmp
-                                                                )}
-                                                            </span>
-                                                        )
-                                                    )}
-                                                </div>
-                                            ))}
+                                        {(owner.keys.plus.length > 0 ||
+                                            owner.accounts.plus.length > 0) && (
+                                            <div>
+                                                {"- " +
+                                                    counterpart.translate(
+                                                        "proposal.add"
+                                                    ) +
+                                                    " "}
+                                                {owner.keys.plus.join(", ")}
+                                                {owner.keys.plus.length > 0 &&
+                                                    owner.accounts.plus.length >
+                                                        0 &&
+                                                    ", "}
+                                                {owner.accounts.plus.length > 0
+                                                    ? owner.accounts.plus
+                                                          .map(_tmp => (
+                                                              <span key={_tmp}>
+                                                                  {this.linkToAccount(
+                                                                      _tmp
+                                                                  )}
+                                                              </span>
+                                                          ))
+                                                          .reduce(
+                                                              (prev, curr) => [
+                                                                  prev,
+                                                                  ", ",
+                                                                  curr
+                                                              ]
+                                                          )
+                                                    : ""}
+                                            </div>
+                                        )}
+                                        {(owner.keys.minus.length > 0 ||
+                                            owner.accounts.minus.length >
+                                                0) && (
+                                            <div>
+                                                {"- " +
+                                                    counterpart.translate(
+                                                        "proposal.remove"
+                                                    ) +
+                                                    " "}
+                                                {owner.keys.minus.join(", ")}
+                                                {owner.keys.minus.length > 0 &&
+                                                    owner.accounts.minus
+                                                        .length > 0 &&
+                                                    ", "}
+                                                {owner.accounts.minus.length > 0
+                                                    ? owner.accounts.minus
+                                                          .map(_tmp => (
+                                                              <span key={_tmp}>
+                                                                  {this.linkToAccount(
+                                                                      _tmp
+                                                                  )}
+                                                              </span>
+                                                          ))
+                                                          .reduce(
+                                                              (prev, curr) => [
+                                                                  prev,
+                                                                  ", ",
+                                                                  curr
+                                                              ]
+                                                          )
+                                                    : ""}
+                                            </div>
+                                        )}
                                         {owner.weight_threshold && (
                                             <div>
                                                 {"- " +
diff --git a/app/components/Wallet/ImportKeys.jsx b/app/components/Wallet/ImportKeys.jsx
index da26f81022..0d23653b3e 100644
--- a/app/components/Wallet/ImportKeys.jsx
+++ b/app/components/Wallet/ImportKeys.jsx
@@ -19,8 +19,6 @@ import ImportKeysStore from "stores/ImportKeysStore";
 
 import {Notification} from "bitshares-ui-style-guide";
 
-import GenesisFilter from "chain/GenesisFilter";
-
 import {Button, Input} from "bitshares-ui-style-guide";
 
 require("./ImportKeys.scss");
@@ -169,106 +167,19 @@ class ImportKeys extends Component {
 
         // BTS 1.0 wallets may have a lot of generated but unused keys or spent TITAN addresses making
         // wallets so large it is was not possible to use the JavaScript wallets with them.
-
-        let genesis_filter = new GenesisFilter();
-        if (!genesis_filter.isAvailable()) {
-            update_state({
-                password_checksum,
-                account_keys: unfiltered_account_keys,
-                genesis_filter_finished: true,
-                genesis_filtering: false
-            });
-            return;
-        }
-        this.setState(
-            {genesis_filter_initalizing: true},
-            () =>
-                // setTimeout(()=>
-                genesis_filter.init(() => {
-                    let filter_status = this.state.genesis_filter_status;
-
-                    // FF < version 41 does not support worker threads internals (like blob urls)
-                    // let GenesisFilterWorker = require("worker-loader!workers/GenesisFilterWorker")
-                    // let worker = new GenesisFilterWorker
-                    // worker.postMessage({
-                    //     account_keys: unfiltered_account_keys,
-                    //     bloom_filter: genesis_filter.bloom_filter
-                    // })
-                    // worker.onmessage = event => { try {
-                    //     let { status, account_keys } = event.data
-                    //     // ...
-                    // } catch( e ) { console.error('GenesisFilterWorker', e) }}
-
-                    let account_keys = unfiltered_account_keys;
-                    genesis_filter.filter(account_keys, status => {
-                        //console.log("import filter", status)
-                        if (status.error === "missing_public_keys") {
-                            console.error(
-                                "un-released format, just for testing"
-                            );
-                            update_state({
-                                password_checksum,
-                                account_keys: unfiltered_account_keys,
-                                genesis_filter_finished: true,
-                                genesis_filtering: false
-                            });
-                            return;
-                        }
-                        if (status.success) {
-                            // let { account_keys } = event.data // if using worker thread
-                            update_state({
-                                password_checksum,
-                                account_keys,
-                                genesis_filter_finished: true,
-                                genesis_filtering: false
-                            });
-                            return;
-                        }
-                        if (status.initalizing !== undefined) {
-                            update_state({
-                                genesis_filter_initalizing: status.initalizing,
-                                genesis_filtering: true
-                            });
-                            return;
-                        }
-                        if (status.importing === undefined) {
-                            // programmer error
-                            console.error("unknown status", status);
-                            return;
-                        }
-                        if (!filter_status.length)
-                            // first account
-                            filter_status.push(status);
-                        else {
-                            let last_account_name =
-                                filter_status[filter_status.length - 1]
-                                    .account_name;
-                            if (last_account_name === status.account_name)
-                                // update same account
-                                filter_status[
-                                    filter_status.length - 1
-                                ] = status;
-                            // new account
-                            else filter_status.push(status);
-                        }
-                        update_state({genesis_filter_status: filter_status});
-                    });
-                })
-            //, 100)
-        );
     }
 
     /**
-    BTS 1.0 hosted wallet backup (wallet.bitshares.org) is supported.
+     BTS 1.0 hosted wallet backup (wallet.bitshares.org) is supported.
 
-    BTS 1.0 native wallets should use wallet_export_keys instead of a wallet backup.
+     BTS 1.0 native wallets should use wallet_export_keys instead of a wallet backup.
 
-    Note,  Native wallet backups will be rejected.  The logic below does not
-    capture assigned account names (for unregisted accounts) and does not capture
-    signing keys.  The hosted wallet has only registered accounts and no signing
-    keys.
+     Note,  Native wallet backups will be rejected.  The logic below does not
+     capture assigned account names (for unregisted accounts) and does not capture
+     signing keys.  The hosted wallet has only registered accounts and no signing
+     keys.
 
-    */
+     */
     _parseWalletJson(json_contents) {
         let password_checksum;
         let encrypted_brainkey;
@@ -405,9 +316,7 @@ class ImportKeys extends Component {
         let format_error1_once = true;
         for (let account of this.state.account_keys) {
             if (!account.encrypted_private_keys) {
-                let error = `Account ${
-                    account.account_name
-                } missing encrypted_private_keys`;
+                let error = `Account ${account.account_name} missing encrypted_private_keys`;
                 console.error(error);
                 if (format_error1_once) {
                     Notification.error({
@@ -976,14 +885,6 @@ class ImportKeys extends Component {
                     </div>
                 ) : null}
 
-                {this.state.genesis_filter_initalizing ? (
-                    <div>
-                        <div className="center-content">
-                            <LoadingIndicator type="circle" />
-                        </div>
-                    </div>
-                ) : null}
-
                 {import_ready ? (
                     <div>
                         <div>
@@ -1026,18 +927,15 @@ class ImportKeys extends Component {
     }
 }
 
-ImportKeys = connect(
-    ImportKeys,
-    {
-        listenTo() {
-            return [ImportKeysStore];
-        },
-        getProps() {
-            return {
-                importing: ImportKeysStore.getState().importing
-            };
-        }
+ImportKeys = connect(ImportKeys, {
+    listenTo() {
+        return [ImportKeysStore];
+    },
+    getProps() {
+        return {
+            importing: ImportKeysStore.getState().importing
+        };
     }
-);
+});
 
 export default ImportKeys;
diff --git a/app/help/en/assets/mpa.md b/app/help/en/assets/mpa.md
index 59b9e0c339..01217d2c7b 100644
--- a/app/help/en/assets/mpa.md
+++ b/app/help/en/assets/mpa.md
@@ -18,8 +18,10 @@ the collateral and performing settlements as will be described in more detail
 below.
 
 This is a subset of the available market pegged assets:
-* BitUSD
-* BitCNY
-* BitEUR
-* BitGOLD
+* gpUSD
+* gpEUR
+* gpRUB
+* gpCNY
+* gpGOLD
+* gpSILVER
 * ...
diff --git a/app/help/en/dex/shorting.md b/app/help/en/dex/shorting.md
index dd99350dd5..a904f9febe 100644
--- a/app/help/en/dex/shorting.md
+++ b/app/help/en/dex/shorting.md
@@ -1,7 +1,7 @@
 # Short Selling gpAssets
 
 In order to increase your exposure to GPH and offer liquidity to gpAssets, such
-as USD, EUR, GOLD, etc., you can go *borrow* this gpAsset from the network and
+as gpUSD, gpEUR, gpRUB, gpCNY, gpSILVER, gpGOLD etc., you can go *borrow* this gpAsset from the network and
 *sell it short*. We will here briefly describe the procedure.
 
 ## Borrowing
diff --git a/app/help/en/index.md b/app/help/en/index.md
index 691eb41a44..8ea0230e08 100644
--- a/app/help/en/index.md
+++ b/app/help/en/index.md
@@ -9,7 +9,7 @@ This help section gives a brief overview and describes the most basic concepts
 of this application.
 
 ## Introduction 
- * [Graphene](introduction/bitshares.md)
+ * [Graphene](introduction/graphene.md)
  * [Wallet](introduction/wallets.md)
  * [Backups](introduction/backups.md)
  * [Blockchain](introduction/blockchain.md)
@@ -23,7 +23,7 @@ of this application.
  * [Memberships](accounts/membership.md)
 
 ## Assets
- * [Market Pegged Assets](assets/mpa.md) (BitUSD, BitEUR, BitGOLD, Bit\*,...)
+ * [Market Pegged Assets](assets/mpa.md) (gpUSD, gpEUR, gpCNY, gpRUB, gpGOLD, gp\*,...)
  * [User Issued Assets](assets/uia.md)
  * [Privatized gpAssets](assets/privbitassets.md)
 
diff --git a/app/help/en/introduction/bridges_gateways.md b/app/help/en/introduction/bridges_gateways.md
index 72f2cd8c53..62c8895e77 100644
--- a/app/help/en/introduction/bridges_gateways.md
+++ b/app/help/en/introduction/bridges_gateways.md
@@ -8,5 +8,5 @@ A bridge service provides a way to deposit an amount of a crypto-currency other
 ### Gateways: trust-based model
 Gateways are basically equivalent to the standard exchange model where you depend on the solvency of the exchange to be able to redeem your coins. Generally gateways issue assets prefixed with their symbol, like OPEN, TRADE, or META. These assets are backed 100% by the real BTC or ETH or any other coin that people deposit with the gateways.
 
-An OPEN.BTC is thus in theory equivalent to the BTC you get on Poloniex, which could be prefixed POLO.BTC. In both cases you rely on the service provider, CCEDK for OPEN. assets and Poloniex for POLO. assets, to remain solvent in order to back the value of the assets they've issued. Because gateways only provide this one service which is normally only one part of running an exchange, one might even argue that they have an easier job of securing their holdings.
+An RUDEX.BTC is thus in theory equivalent to the BTC you get on Poloniex, which could be prefixed POLO.BTC. In both cases you rely on the service provider, RuDEX for RUDEX. assets and Poloniex for POLO. assets, to remain solvent in order to back the value of the assets they've issued. Because gateways only provide this one service which is normally only one part of running an exchange, one might even argue that they have an easier job of securing their holdings.
 
diff --git a/app/help/en/introduction/bitshares.md b/app/help/en/introduction/graphene.md
similarity index 85%
rename from app/help/en/introduction/bitshares.md
rename to app/help/en/introduction/graphene.md
index 085545e6cc..2109d259b5 100644
--- a/app/help/en/introduction/bitshares.md
+++ b/app/help/en/introduction/graphene.md
@@ -4,14 +4,13 @@
 
 >If you have an issue related to a Gateway provider, please be sure to contact them directly. See Gateways in the left menu.
 
-### Bitshares Chat
-You can chat with other member of the Bitshares community in real time at:
+### Chat Graphene/RuDEX
+You can chat with other member of the Graphene and RuDEX community in real time at:
 
-- [Telegram btstalk](https://t.me/btstalk)
-- [Telegram BitSharesDAC](https://t.me/BitSharesDAC)
-- [Telegram btsWalletHelp](https://t.me/btsWalletHelp)
+- [Telegram](https://t.me/BitSharesDEX_RU)
 
-- [Discord](https://discord.gg/GsjQfAJ)
+- [Telegram chat RuDEX](https://t.me/BitSharesDEX_RU)
+- [Telegram chat Graphene](https://t.me/graphene_dex)
 
 ### Developers
 If you are a software developer, you may contribute via a bounty system at:
diff --git a/app/help/en/toc.md b/app/help/en/toc.md
index 7367630388..258208e2d4 100644
--- a/app/help/en/toc.md
+++ b/app/help/en/toc.md
@@ -1,6 +1,6 @@
 #### Help
 
- * [Graphene](introduction/bitshares.md)
+ * [Graphene](introduction/graphene.md)
  * [Wallet](introduction/wallets.md)
  * [Backups](introduction/backups.md)
  * [Blockchain](introduction/blockchain.md)
@@ -12,7 +12,11 @@
  * [Market Pegged Assets](assets/mpa.md)
     * gpUSD
     * gpEUR
-    * bitGOLD
+    * gpRUB
+    * gpCNY
+    * gpGOLD
+    * gpSILVER
+    * ...
  * [User Issued Assets](assets/uia.md)
  * [Privatized gpAssets](assets/privbitassets.md)
  * [Decentralized Exchange](dex/introduction.md)
diff --git a/app/help/es/toc.md b/app/help/es/toc.md
index 486ce59a7b..ecb3222e46 100644
--- a/app/help/es/toc.md
+++ b/app/help/es/toc.md
@@ -2,7 +2,7 @@
 
  * [Introducción](index.md)
  * [Glosario](glossary.md)
- * [Graphene](introduction/bitshares.md)
+ * [Graphene](introduction/graphene.md)
  * [Billetera](introduction/wallets.md)
  * [Backups](introduction/backups.md)
  * [Blockchain](introduction/blockchain.md)
@@ -11,7 +11,7 @@
  * [Cuentas](accounts/general.md)
  * [Permisos](accounts/permissions.md)
  * [Membresías](accounts/membership.md)
- * [Market Pegged Assets](assets/mpa.md) (BitUSD, BitEUR, BitGOLD, Bit\*,...)
+ * [Market Pegged Assets](assets/mpa.md) (gpUSD, gpEUR, gpCNY, gpRUB, gpGOLD, gp\*,...)
  * [Activos Emitidos por Usuarios](assets/uia.md)
  * [gpAssets Privados](assets/privbitassets.md)
  * [Exchange Descentralizado](dex/introduction.md)
diff --git a/app/help/ru/assets/mpa.md b/app/help/ru/assets/mpa.md
index fc39ff2f70..9231b6a25e 100644
--- a/app/help/ru/assets/mpa.md
+++ b/app/help/ru/assets/mpa.md
@@ -8,8 +8,10 @@
 
 Это подгруппа доступных привязанных к рынку активов:
 
-* BitUSD
-* BitCNY
-* BitEUR
-* BitGOLD
+* gpUSD
+* gpEUR
+* gpRUB
+* gpCNY
+* gpGOLD
+* gpSILVER
 * ...
\ No newline at end of file
diff --git a/app/help/ru/assets/privbitassets.md b/app/help/ru/assets/privbitassets.md
index 097d0cb3c5..70f56f499e 100644
--- a/app/help/ru/assets/privbitassets.md
+++ b/app/help/ru/assets/privbitassets.md
@@ -1,5 +1,5 @@
 # Приватизированные gpAssets
 
-Приватизированные gpAssets обслуживают тех клиентов, которые хотели бы выпустить актив с привязкой к рынку, но не хотели бы, чтобы заверители публиковали его цены. Вместо этого, когда клиент создает *приватизированный* bitasset, он может определять набор авторитетов, которые смогут публиковать цену для этого конкретного актива. Эмитент также может определить все виды комиссий, связанных с этим активом, и получать прибыль.
+Приватизированные gpAssets обслуживают тех клиентов, которые хотели бы выпустить актив с привязкой к рынку, но не хотели бы, чтобы заверители публиковали его цены. Вместо этого, когда клиент создает *приватизированный* gpAsset, он может определять набор авторитетов, которые смогут публиковать цену для этого конкретного актива. Эмитент также может определить все виды комиссий, связанных с этим активом, и получать прибыль.
 
 Эта функция представляет особый интерес для бирж и институтов, которые имеют доступ к ценам в режиме реального времени и хотели бы увеличить видимость и объем.
\ No newline at end of file
diff --git a/app/help/ru/dex/shorting.md b/app/help/ru/dex/shorting.md
index ffc5c2cbab..e23fe9d4f0 100644
--- a/app/help/ru/dex/shorting.md
+++ b/app/help/ru/dex/shorting.md
@@ -1,6 +1,6 @@
 # Короткая продажа gpAssets
 
-Для увеличения Вашего воздействия на GPH и увеличения ликвидности активов gpAssets, таких как USD, EUR, GOLD и др., Вы можете *занять* этот актив gpAsset у сети и *выставить шорт*. Здесь мы кратко опишем данную процедуру.
+Для увеличения Вашего воздействия на GPH и увеличения ликвидности активов gpAssets, таких как gpUSD, gpEUR, gpRUB, gpCNY, gpSILVER, gpGOLD и др., Вы можете *занять* этот актив gpAsset у сети и *выставить шорт*. Здесь мы кратко опишем данную процедуру.
 
 ## Заём
 
diff --git a/app/help/ru/index.md b/app/help/ru/index.md
index 70a7740ccf..7b555d10ce 100644
--- a/app/help/ru/index.md
+++ b/app/help/ru/index.md
@@ -6,7 +6,7 @@ Graphene 2.0 - это платформа Финансовых Смарт-Кон
 
 ## Введение
 
-- [Graphene](introduction/bitshares.md)
+- [Graphene](introduction/graphene.md)
 - [Кошелек](introduction/wallets.md)
 - [Резервные копии](introduction/backups.md)
 - [Блокчейн](introduction/blockchain.md)
@@ -22,7 +22,7 @@ Graphene 2.0 - это платформа Финансовых Смарт-Кон
 
 ## Активы
 
-- [Привязанные к рынку активы](assets/mpa.md) (BitUSD, BitEUR, BitGOLD, Bit\*,...)
+- [Привязанные к рынку активы](assets/mpa.md) (gpUSD, gpEUR, gpCNY, gpRUB, gpGOLD, gp\*,...)
 - [Выпущенные пользователем активы](assets/uia.md)
 - [Приватизированные gpAssets](assets/privbitassets.md)
 
diff --git a/app/help/ru/introduction/bridges_gateways.md b/app/help/ru/introduction/bridges_gateways.md
index 98ea947ed1..802dd18f59 100644
--- a/app/help/ru/introduction/bridges_gateways.md
+++ b/app/help/ru/introduction/bridges_gateways.md
@@ -10,4 +10,4 @@
 
 Шлюзы по сути являются аналогом стандартной модели биржи, где Вы зависите от платежеспособности биржи, которая должна выкупить Ваши монеты. В основном шлюзы выпускают активы с собственным символом в префиксе, например, TRADE или META. Эти активы на 100% обеспечены реальными BTC или ETH, либо же любой другой валютой, которую люди заводят через шлюзы.
 
-Таким образом, OPEN.BTC теоретически эквивалентны BTC, которые Вы получаете на Poloniex, которые могут иметь префикс POLO.BTC. В обоих случаях Вы полагаетесь на поставщика сервиса: CCEDK для OPEN. assets и Poloniex для POLO. assets, которые должны оставаться платежеспособными, дабы обеспечивать ценность выпущенных ими активов. Так как шлюзы предоставляют только один сервис, который обычно является частью работы биржи, кто-нибудь даже может сказать, что их работа по обеспечению своих средств довольно легкая.
\ No newline at end of file
+Таким образом, RUDEX.BTC теоретически эквивалентны BTC, которые Вы получаете на Poloniex, которые могут иметь префикс POLO.BTC. В обоих случаях Вы полагаетесь на поставщика сервиса: RuDEX для RUDEX. ассетов и Poloniex для POLO. ассетов, которые должны оставаться платежеспособными, дабы обеспечивать ценность выпущенных ими активов. Так как шлюзы предоставляют только один сервис, который обычно является частью работы биржи, кто-нибудь даже может сказать, что их работа по обеспечению своих средств довольно легкая.
\ No newline at end of file
diff --git a/app/help/ru/introduction/bitshares.md b/app/help/ru/introduction/graphene.md
similarity index 92%
rename from app/help/ru/introduction/bitshares.md
rename to app/help/ru/introduction/graphene.md
index d6f05ab704..3f5d24c8d0 100644
--- a/app/help/ru/introduction/bitshares.md
+++ b/app/help/ru/introduction/graphene.md
@@ -4,12 +4,12 @@
 
 > Если у Вас возникли проблемы со шлюзом от провайдера, пожалуйста, свяжитесь с ним напрямую. Смотрите список шлюзов в левом меню.
 
-### Чат Bitshares
+### Чат Graphene/RuDEX
 
-Вы можете общаться с другими членами сообщества Bitshares в реальном времени здесь:
+Вы можете общаться с другими членами сообщества Graphene и RuDEX в реальном времени здесь:
 
-- [Telegram](https://t.me/BitSharesDEX_RU)
-- [Discord](https://discord.gg/GsjQfAJ)
+- [Telegram чат RuDEX](https://t.me/BitSharesDEX_RU)
+- [Telegram чат Graphene](https://t.me/graphene_dex)
 
 ### Разработчики
 
@@ -28,6 +28,6 @@ Graphene делает для бизнеса то, что Биткоин сдел
 
 Этот кошелек обеспечивает доступ к большинству функций сети Graphene, включая
 
-- [gpAssets (БитАктивы)](/help/assets/mpa)
+- [gpAssets (gpАктивы)](/help/assets/mpa)
 - [Выпущенные пользователем активы](/help/assets/uia)
 - [Биржу DEX](/help/dex/introduction)
\ No newline at end of file
diff --git a/app/help/ru/toc.md b/app/help/ru/toc.md
index 3b8d401067..1e05f0b7aa 100644
--- a/app/help/ru/toc.md
+++ b/app/help/ru/toc.md
@@ -1,6 +1,6 @@
 #### Содержание
 
-- [Graphene](introduction/bitshares.md)
+- [Graphene](introduction/graphene.md)
 - [Кошелек](introduction/wallets.md)
 - [Резервные копии](introduction/backups.md)
 - [Блокчейн](introduction/blockchain.md)
@@ -10,9 +10,13 @@
 - [Разрешения](accounts/permissions.md)
 - [Членство](accounts/membership.md)
 - [Привязанные к рынку активы](assets/mpa.md) 
-    - gpUSD
-    - gpEUR
-    - bitGOLD
+    * gpUSD
+    * gpEUR
+    * gpRUB
+    * gpCNY
+    * gpGOLD
+    * gpSILVER
+    * ...
 - [Эмитированные пользователем активы](assets/uia.md)
 - [Приватизированные gpAssets](assets/privbitassets.md)
 - [Децентрализованная биржа](dex/introduction.md)
diff --git a/app/help/tr/assets/mpa.md b/app/help/tr/assets/mpa.md
index 7e045b2720..b293f1d1b0 100644
--- a/app/help/tr/assets/mpa.md
+++ b/app/help/tr/assets/mpa.md
@@ -18,8 +18,10 @@ güvence  altına alma ve hesap görme işlemleri ağın  kendi sorumluluğuna b
 anlatılacaktır.
 
 Bu, piyasaya-sabitli-varlıkların mevcut bir alt kümesidir:
-* BitUSD
-* BitCNY
-* BitEUR
-* BitGOLD
+* gpUSD
+* gpEUR
+* gpRUB
+* gpCNY
+* gpGOLD
+* gpSILVER
 * ...
\ No newline at end of file
diff --git a/app/help/tr/index.md b/app/help/tr/index.md
index f2aa5c9a37..4072364611 100644
--- a/app/help/tr/index.md
+++ b/app/help/tr/index.md
@@ -9,7 +9,7 @@ Bu yardım bölümü özet bir genel bakış sağlar ve bu uygulamanın en temel
 kavramlarını tanımlar.
 
 ## Takdim 
- * [Graphene](introduction/bitshares.md)
+ * [Graphene](introduction/graphene.md)
  * [Cüzdan](introduction/wallets.md)
  * [Yedekler](introduction/backups.md)
  * [Blokzinciri](introduction/blockchain.md)
@@ -23,7 +23,7 @@ kavramlarını tanımlar.
  * [Üyelikler](accounts/membership.md)
 
 ## Aktifler
- * [Piyasa Sabitli Varlıklar](assets/mpa.md) (BitUSD, BitEUR, BitGOLD, Bit\*,...)
+ * [Piyasa Sabitli Varlıklar](assets/mpa.md) (gpUSD, gpEUR, gpCNY, gpRUB, gpGOLD, gp\*,...)
  * [Kullanıcı Aktifleri](assets/uia.md)
  * [Özelleştirilmiş Varlıklar](assets/privbitassets.md)
 
diff --git a/app/help/tr/introduction/bitshares.md b/app/help/tr/introduction/graphene.md
similarity index 100%
rename from app/help/tr/introduction/bitshares.md
rename to app/help/tr/introduction/graphene.md
diff --git a/app/help/tr/toc.md b/app/help/tr/toc.md
index bf73d84056..08561ae9ac 100644
--- a/app/help/tr/toc.md
+++ b/app/help/tr/toc.md
@@ -2,7 +2,7 @@
 
  * [ Giriş ](index.md)
  * [Terimler Listesi](glossary.md)
- * [Graphene](introduction/bitshares.md)
+ * [Graphene](introduction/graphene.md)
  * [Cüzdan](introduction/wallets.md)
  * [Yedeklemeler](introduction/backups.md)
  * [Blokzinciri](introduction/blockchain.md)
@@ -12,7 +12,7 @@
  * [Hesaplar](accounts/general.md)
  * [İzinler](accounts/permissions.md)
  * [Üyelikler](accounts/membership.md)
- * [Piyasaya Sabitli Aktifler](assets/mpa.md) (BitUSD, BitEUR, BitGOLD, Bit\*,...)
+ * [Piyasaya Sabitli Aktifler](assets/mpa.md) (gpUSD, gpEUR, gpCNY, gpRUB, gpGOLD, gp\*,...)
  * [Kullanıcı Aktifler](assets/uia.md)
  * [Özelleştirilmiş BitAktifler](assets/privbitassets.md)
  * [Merkezsiz/dağıtık Borsa](dex/introduction.md)
diff --git a/app/help/zh/assets/mpa.md b/app/help/zh/assets/mpa.md
index 8f0c7466d9..38555f5771 100644
--- a/app/help/zh/assets/mpa.md
+++ b/app/help/zh/assets/mpa.md
@@ -7,8 +7,8 @@
 市场锚定资产与众不同的一个特点在于，尽管它使用了有抵押的价差合约，它却能免于对手盘风险。这是由网络本身(软件协议)通过确保抵押充足，并在特定情况下进行强制清算的机制来实现的。
 
 以下是部分已经可用的市场锚定资产
-* BitUSD (比特美元)
-* BitCNY (比特人民币)
-* BitEUR (比特欧元)
-* BitGOLD (比特黄金)
+* gpUSD (比特美元)
+* gpCNY (比特人民币)
+* gpEUR (比特欧元)
+* gpGOLD (比特黄金)
 * ...
diff --git a/app/help/zh/dex/shorting.md b/app/help/zh/dex/shorting.md
index 4b7b40cff0..0592035d44 100644
--- a/app/help/zh/dex/shorting.md
+++ b/app/help/zh/dex/shorting.md
@@ -1,6 +1,6 @@
 # 卖空比特资产
 
-为了看多BTS，并且为比特资产，比如USD, EUR, GOLD等提供市场深度，你可以从网络*借入*比特资产，并且*卖出*。我们来介绍下相关步骤。
+为了看多BTS，并且为比特资产，比如gpUSD, gpEUR, gpRUB, gpCNY, gpSILVER, gpGOLD等提供市场深度，你可以从网络*借入*比特资产，并且*卖出*。我们来介绍下相关步骤。
 
 ## 借入
 
diff --git a/app/help/zh/index.md b/app/help/zh/index.md
index 031a13bbb4..3ecb1ee241 100644
--- a/app/help/zh/index.md
+++ b/app/help/zh/index.md
@@ -5,7 +5,7 @@ Graphene(比特股) 2.0 是一个金融智能合约平台，该平台基于[Cryp
 本帮助文档旨在提供用户一个系统概述，并解释系统中的一些基本概念。
 
 ## 简介
- * [BitShares(比特股)](introduction/bitshares.md)
+ * [BitShares(比特股)](introduction/graphene.md)
  * [钱包](introduction/wallets.md)
  * [备份](introduction/backups.md)
  * [区块链](introduction/blockchain.md)
@@ -19,7 +19,7 @@ Graphene(比特股) 2.0 是一个金融智能合约平台，该平台基于[Cryp
  * [会员级别](accounts/membership.md)
 
 ## 资产
- * [市场锚定资产](assets/mpa.md) (BitUSD, BitEUR, BitGOLD, Bit\*,...)
+ * [市场锚定资产](assets/mpa.md) (gpUSD, gpEUR, gpCNY, gpRUB, gpGOLD, gp\*,...)
  * [用户发行资产](assets/uia.md)
  * [私有比特资产](assets/privbitassets.md)
 
diff --git a/app/help/zh/introduction/bridges_gateways.md b/app/help/zh/introduction/bridges_gateways.md
index 5a3cba99f0..34aa552299 100644
--- a/app/help/zh/introduction/bridges_gateways.md
+++ b/app/help/zh/introduction/bridges_gateways.md
@@ -8,4 +8,4 @@
 ### 网关: 需要信任的模式
 网关模式下基本上就和传统的交易所运作模式相似，依赖于交易所的偿付能力。网关发行资产，一般以网关品牌作为前缀，比如OPEN，TRADE或是META。这些资产由用户存入网关的对真实应资产背书，比如BTC，ETH等。
 
-OPEN.BTC理论上和你充值到一般中心化交易所，比如Poloniex的BTC一样，可以记作POLO.BTC。你都将依赖网关对你的数字资产进行兑付。
\ No newline at end of file
+RUDEX.BTC理论上和你充值到一般中心化交易所，比如Poloniex的BTC一样，可以记作POLO.BTC。你都将依赖网关对你的数字资产进行兑付。
\ No newline at end of file
diff --git a/app/help/zh/introduction/bitshares.md b/app/help/zh/introduction/graphene.md
similarity index 100%
rename from app/help/zh/introduction/bitshares.md
rename to app/help/zh/introduction/graphene.md
diff --git a/app/help/zh/toc.md b/app/help/zh/toc.md
index f46ba7e6c5..e62c91e948 100644
--- a/app/help/zh/toc.md
+++ b/app/help/zh/toc.md
@@ -2,7 +2,7 @@
 
  * [介绍](index.md)
  * [词汇表](glossary.md)
- * [BitShares比特股](introduction/bitshares.md)
+ * [BitShares比特股](introduction/graphene.md)
  * [钱包](introduction/wallets.md)
  * [备份](introduction/backups.md)
  * [区块链](introduction/blockchain.md)
@@ -12,7 +12,7 @@
  * [账户](accounts/general.md)
  * [权限](accounts/permissions.md)
  * [会员等级](accounts/membership.md)
- * [市场锚定资产](assets/mpa.md) (BitUSD, BitEUR, BitGOLD, Bit\*,...)
+ * [市场锚定资产](assets/mpa.md) (gpUSD, gpEUR, gpCNY, gpRUB, gpGOLD, gp\*,...)
  * [用户发行资产](assets/uia.md)
  * [私有比特资产](assets/privbitassets.md)
  * [去中心化交易所](dex/introduction.md)
diff --git a/app/lib/bots/BotFather.js b/app/lib/bots/BotFather.js
new file mode 100644
index 0000000000..b1f5ef99fe
--- /dev/null
+++ b/app/lib/bots/BotFather.js
@@ -0,0 +1,92 @@
+import {ChainStore} from "bitsharesjs";
+import Account from "/app/lib/bots/account";
+import SettingsActions from "/app/actions/SettingsActions";
+import WalletUnlockActions from "/app/actions/WalletUnlockActions";
+
+/*/
+    Bot progenitor:
+        3 required methods for create new bots:
+            - constructor
+            - initStartData
+            - checkOrders
+ */
+class BotFather {
+    static create = null;
+    state = null;
+
+    constructor(account, storage, initData) {
+        if (initData) {
+            /*storage.init({
+                name: initData.name,
+                defaultPrice: initData.defaultPrice
+            });*/
+        }
+
+        this.account = new Account(account);
+        this.storage = storage;
+
+        this.name = storage.read().name;
+
+        this.logger = console;
+        this.queueEvents = Promise.resolve();
+        this.run = false;
+    }
+
+    async initStartData() {
+        //Example
+        /*
+        let state = this.storage.read();
+
+        this.base = await Assets[state.base];
+        this.quote = await Assets[state.quote];
+        */
+    }
+
+    //Here Logic - Change for new strategy
+    async checkOrders() {
+        let state = this.storage.read();
+        console.log("checkOrders");
+
+        //Strategy
+        //...
+    }
+
+    //=============================================
+    //Common Methods
+    //=============================================
+
+    async start() {
+        await this.initStartData();
+
+        await WalletUnlockActions.unlock();
+        SettingsActions.changeSetting({
+            setting: "walletLockTimeout",
+            value: 0
+        });
+
+        ChainStore.subscribe(this.queue);
+        this.run = true;
+    }
+
+    async stop() {
+        ChainStore.unsubscribe(this.queue);
+        this.run = false;
+        await this.queueEvents;
+    }
+
+    /*
+        See SpreadTrade or PercentUp  delete() to:
+            to implement a general method for deleting orders for all inherited bots , taking into account the internal data structure
+     */
+    async delete() {
+        this.storage.delete();
+    }
+
+    queue = () => {
+        this.queueEvents = this.queueEvents
+            .then(this.checkOrders)
+            .catch(this.logger.error.bind(this.logger));
+    };
+}
+
+export default BotFather;
diff --git a/app/lib/bots/PercentUp/index.js b/app/lib/bots/PercentUp/index.js
index 432b6fb00a..d56be6f9c9 100644
--- a/app/lib/bots/PercentUp/index.js
+++ b/app/lib/bots/PercentUp/index.js
@@ -1,21 +1,16 @@
 import Create from "components/Bots/PercentUp/Create";
 import State from "components/Bots/PercentUp/State";
-import Account from "lib/bots/account";
-import {ChainStore} from "bitsharesjs";
 import Apis from "lib/bots/apis";
 import Assets from "lib/bots/assets";
 import BigNumber from "bignumber.js";
-import SettingsActions from "actions/SettingsActions";
-import WalletUnlockActions from "actions/WalletUnlockActions";
 
-class PercentUp {
+import BotFather from "../BotFather";
+
+class PercentUp extends BotFather {
     static create = Create;
     state = State;
 
     constructor(account, storage, initData) {
-        this.account = new Account(account);
-        this.storage = storage;
-
         if (initData) {
             let {
                 name,
@@ -40,51 +35,23 @@ class PercentUp {
             });
         }
 
-        this.name = storage.read().name;
-
-        this.logger = console;
-        this.queueEvents = Promise.resolve();
-        this.run = false;
+        //BotFather
+        super(account, storage, initData);
     }
 
-    async start() {
+    async initStartData() {
         let state = this.storage.read();
 
         this.base = await Assets[state.base];
         this.quote = await Assets[state.quote];
-
-        await WalletUnlockActions.unlock();
-        SettingsActions.changeSetting({
-            setting: "walletLockTimeout",
-            value: 0
-        });
-
-        ChainStore.subscribe(this.queue);
-        this.run = true;
-    }
-    async stop() {
-        ChainStore.unsubscribe(this.queue);
-        this.run = false;
-        await this.queueEvents;
-    }
-
-    delete() {
-        this.storage.delete();
     }
 
-    queue = () => {
-        this.queueEvents = this.queueEvents
-            .then(this.checkOrders)
-            .catch(this.logger.error.bind(this.logger));
-    };
-
     checkOrders = async () => {
         let state = this.storage.read(),
             log = (...args) => this.logger.log(`[${state.name}]`, ...args),
-            accountBalances = (await this.account.balances(
-                this.base.id,
-                this.quote.id
-            )).reduce((acc, balance) => {
+            accountBalances = (
+                await this.account.balances(this.base.id, this.quote.id)
+            ).reduce((acc, balance) => {
                 this.base.id === balance.asset_id
                     ? (acc.base = BigNumber(balance.amount)
                           .div(10 ** this.base.precision)
@@ -98,8 +65,8 @@ class PercentUp {
                 state.balance === "-"
                     ? 0
                     : state.balance === ""
-                        ? accountBalances.base
-                        : Math.min(accountBalances.base, state.balance),
+                    ? accountBalances.base
+                    : Math.min(accountBalances.base, state.balance),
             amount =
                 state.percentAmount.toString() == "true"
                     ? BigNumber(balance)
@@ -107,9 +74,11 @@ class PercentUp {
                           .div(100)
                           .toNumber()
                     : state.amount,
-            orders = (await Apis.db.get_objects(
-                state.orders.map(order => order.id).filter(id => id)
-            ))
+            orders = (
+                await Apis.db.get_objects(
+                    state.orders.map(order => order.id).filter(id => id)
+                )
+            )
                 .map(order => order && order.id)
                 .filter(id => id),
             processOrders = state.orders.filter(
@@ -143,8 +112,8 @@ class PercentUp {
                                   .div(10 ** this.base.precision)
                                   .toNumber()
                             : this.base.options.market_fee_percent !== 0
-                                ? 10 ** -this.base.precision
-                                : 0);
+                            ? 10 ** -this.base.precision
+                            : 0);
                 }
             } else {
                 let forQuoteFee =
@@ -295,6 +264,19 @@ class PercentUp {
 
         this.storage.write(state);
     };
+
+    async delete() {
+        let state = this.storage.read();
+        state.orders.forEach(async order => {
+            try {
+                this.logger.info(`delete orderId: ${order.id}`);
+                await this.account.cancelOrder(order.id);
+            } catch (error) {
+                this.logger.error(error);
+            }
+        });
+        this.storage.delete();
+    }
 }
 
 export default PercentUp;
diff --git a/app/lib/bots/RelativeOrders/index.js b/app/lib/bots/RelativeOrders/index.js
index 7f78e06607..5015cb7912 100644
--- a/app/lib/bots/RelativeOrders/index.js
+++ b/app/lib/bots/RelativeOrders/index.js
@@ -1,15 +1,18 @@
 import Create from "components/Bots/RelativeOrders/Create";
 import State from "components/Bots/RelativeOrders/State";
-import Account from "lib/bots/account";
+import Apis from "lib/bots/apis";
+import Assets from "lib/bots/assets";
+import BigNumber from "bignumber.js";
 
-class RelativeOrders {
+import BotFather from "../BotFather";
+
+BigNumber.config({ERRORS: false});
+
+class RelativeOrders extends BotFather {
     static create = Create;
     state = State;
 
     constructor(account, storage, initData) {
-        this.account = new Account(account);
-        this.storage = storage;
-
         if (initData) {
             storage.init({
                 name: initData.name,
@@ -17,14 +20,11 @@ class RelativeOrders {
             });
         }
 
-        this.name = storage.read().name;
-
-        this.logger = console;
-        this.queueEvents = Promise.resolve();
-        this.run = false;
+        //BotFather
+        super(account, storage, initData);
     }
 
-    async start() {
+    async initStartData() {
         let state = this.storage.read();
 
         this.base = await Assets[state.base.asset];
@@ -39,31 +39,7 @@ class RelativeOrders {
         } else {
             this.getFeed = this.getUIAFeed;
         }
-
-        await WalletUnlockActions.unlock();
-        SettingsActions.changeSetting({
-            setting: "walletLockTimeout",
-            value: 0
-        });
-
-        ChainStore.subscribe(this.queue);
-        this.run = true;
     }
-    async stop() {
-        ChainStore.unsubscribe(this.queue);
-        this.run = false;
-        await this.queueEvents;
-    }
-
-    delete() {
-        this.storage.delete();
-    }
-
-    queue = () => {
-        this.queueEvents = this.queueEvents
-            .then(this.checkOrders)
-            .catch(this.logger.error.bind(this.logger));
-    };
 
     checkOrders = async () => {
         let state = this.storage.read();
diff --git a/app/lib/bots/SpreadTrade/index.js b/app/lib/bots/SpreadTrade/index.js
index cd0fd1de33..0abccb7f5a 100644
--- a/app/lib/bots/SpreadTrade/index.js
+++ b/app/lib/bots/SpreadTrade/index.js
@@ -1,21 +1,18 @@
 import Create from "components/Bots/SpreadTrade/Create";
 import State from "components/Bots/SpreadTrade/State";
-import {ChainStore} from "bitsharesjs";
 import Apis from "lib/bots/apis";
 import Assets from "lib/bots/assets";
 import BigNumber from "bignumber.js";
-import Account from "lib/bots/account";
-import SettingsActions from "actions/SettingsActions";
-import WalletUnlockActions from "actions/WalletUnlockActions";
 
-class SpreadTrade {
+import BotFather from "../BotFather";
+
+BigNumber.config({ERRORS: false});
+
+class SpreadTrade extends BotFather {
     static create = Create;
     state = State;
 
     constructor(account, storage, initData) {
-        this.account = new Account(account);
-        this.storage = storage;
-
         if (initData) {
             storage.init({
                 name: initData.name,
@@ -44,14 +41,11 @@ class SpreadTrade {
             });
         }
 
-        this.name = storage.read().name;
-
-        this.logger = console;
-        this.queueEvents = Promise.resolve();
-        this.run = false;
+        //BotFather
+        super(account, storage, initData);
     }
 
-    async start() {
+    async initStartData() {
         let state = this.storage.read();
 
         this.base = await Assets[state.base.asset];
@@ -66,33 +60,25 @@ class SpreadTrade {
         } else {
             this.getFeed = this.getUIAFeed;
         }
+    }
 
-        await WalletUnlockActions.unlock();
-        SettingsActions.changeSetting({
-            setting: "walletLockTimeout",
-            value: 0
-        });
+    async delete() {
+        let state = this.storage.read();
 
-        ChainStore.subscribe(this.queue);
-        this.run = true;
-    }
+        try {
+            this.logger.info(`delete orderId: ${state.quote.order.id}`);
+            await this.account.cancelOrder(state.quote.order.id);
 
-    async stop() {
-        ChainStore.unsubscribe(this.queue);
-        this.run = false;
-        await this.queueEvents;
-    }
+            this.logger.info(`delete orderId: ${state.base.order.id}`);
+            await this.account.cancelOrder(state.base.order.id);
+        } catch (error) {
+            this.logger.error(error);
+            state.base.order.id = undefined;
+        }
 
-    delete() {
         this.storage.delete();
     }
 
-    queue = () => {
-        this.queueEvents = this.queueEvents
-            .then(this.checkOrders)
-            .catch(this.logger.error.bind(this.logger));
-    };
-
     checkOrders = async () => {
         let state = this.storage.read();
         //console.log("state", state);
@@ -122,10 +108,9 @@ class SpreadTrade {
             sellOrder = state.quote.order.id
                 ? (await Apis.db.get_objects([state.quote.order.id]))[0]
                 : state.quote.order.id,
-            accountBalances = (await this.account.balances(
-                this.base.id,
-                this.quote.id
-            )).reduce((acc, balance) => {
+            accountBalances = (
+                await this.account.balances(this.base.id, this.quote.id)
+            ).reduce((acc, balance) => {
                 this.base.id === balance.asset_id
                     ? (acc.base = BigNumber(balance.amount)
                           .div(10 ** this.base.precision)
@@ -139,32 +124,29 @@ class SpreadTrade {
                 state.base.balance === "-"
                     ? 0
                     : state.base.balance === ""
-                        ? accountBalances.base
-                        : Math.min(accountBalances.base, state.base.balance),
+                    ? accountBalances.base
+                    : Math.min(accountBalances.base, state.base.balance),
             quoteBalance =
                 state.quote.balance === "-"
                     ? 0
                     : state.quote.balance === ""
-                        ? accountBalances.quote
-                        : Math.min(accountBalances.quote, state.quote.balance),
+                    ? accountBalances.quote
+                    : Math.min(accountBalances.quote, state.quote.balance),
             baseAmount =
-                state.base.percent.toString() == "true"
+                state.base.percent == "true"
                     ? BigNumber(baseBalance)
                           .times(state.base.amount)
                           .div(100)
                           .toNumber()
                     : state.base.amount,
             quoteAmount =
-                state.quote.percent.toString() == "true"
+                state.quote.percent == "true"
                     ? BigNumber(quoteBalance)
                           .times(state.quote.amount)
                           .div(100)
                           .toNumber()
                     : state.quote.amount;
 
-        console.log("prices", buyPrice, feedPrice, sellPrice);
-        console.log("orders", buyOrder, sellOrder);
-
         if (buyOrder) {
             //check Price
             console.log(
@@ -182,9 +164,7 @@ class SpreadTrade {
                 // move order
 
                 this.logger.info(
-                    `move buy order: ${buyPrice} ${this.quote.symbol}/${
-                        this.base.symbol
-                    }`
+                    `move buy order: ${buyPrice} ${this.quote.symbol}/${this.base.symbol}`
                 );
                 await this.account.cancelOrder(state.base.order.id);
 
@@ -291,9 +271,7 @@ class SpreadTrade {
                 // move order
 
                 this.logger.info(
-                    `move sell order: ${sellPrice} ${this.quote.symbol}/${
-                        this.base.symbol
-                    }`
+                    `move sell order: ${sellPrice} ${this.quote.symbol}/${this.base.symbol}`
                 );
                 await this.account.cancelOrder(state.quote.order.id);
 
@@ -355,9 +333,7 @@ class SpreadTrade {
             if (quoteBalance >= quoteAmount && ticker.highest_bid < sellPrice) {
                 //buy
                 this.logger.info(
-                    `sell: ${sellPrice} ${this.quote.symbol}/${
-                        this.base.symbol
-                    }`
+                    `sell: ${sellPrice} ${this.quote.symbol}/${this.base.symbol}`
                 );
                 try {
                     let obj = await this.account.sell(
@@ -428,14 +404,18 @@ class SpreadTrade {
 
         let quotePrice = BigNumber(base.amount)
             .div(10 ** bts.precision)
-            .div(BigNumber(quote.amount).div(10 ** this.quote.precision));
+            .div(
+                BigNumber(quote.amount.toString()).div(
+                    10 ** this.quote.precision
+                )
+            );
 
         return quotePrice.div(basePrice);
     }
 
     async getUIAFeed() {
         return this.defaultPrice
-            ? BigNumber(this.defaultPrice)
+            ? BigNumber(this.defaultPrice.toString())
             : await this.binancePrice(this.base.symbol, this.quote.symbol);
     }
 
diff --git a/app/lib/bots/TrailingStop/index.js b/app/lib/bots/TrailingStop/index.js
index e2d1718dce..5c9ef5a6c3 100644
--- a/app/lib/bots/TrailingStop/index.js
+++ b/app/lib/bots/TrailingStop/index.js
@@ -1,21 +1,16 @@
 import Create from "components/Bots/TrailingStop/Create";
 import State from "components/Bots/TrailingStop/State";
-import {ChainStore} from "bitsharesjs";
 import Apis from "lib/bots/apis";
 import Assets from "lib/bots/assets";
 import BigNumber from "bignumber.js";
-import Account from "lib/bots/account";
-import SettingsActions from "actions/SettingsActions";
-import WalletUnlockActions from "actions/WalletUnlockActions";
 
-class TrailingStop {
+import BotFather from "../BotFather";
+
+class TrailingStop extends BotFather {
     static create = Create;
     state = State;
 
     constructor(account, storage, initData) {
-        this.account = new Account(account);
-        this.storage = storage;
-
         if (initData) {
             storage.init({
                 name: initData.name,
@@ -27,43 +22,16 @@ class TrailingStop {
             });
         }
 
-        this.name = storage.read().name;
-
-        this.logger = console;
-        this.queueEvents = Promise.resolve();
-        this.run = false;
+        //BotFather
+        super(account, storage, initData);
     }
 
-    async start() {
+    async initStartData() {
         let state = this.storage.read();
 
         this.sellAsset = await Assets[state.sellAsset];
         this.getAsset = await Assets[state.getAsset];
-
-        await WalletUnlockActions.unlock();
-        SettingsActions.changeSetting({
-            setting: "walletLockTimeout",
-            value: 0
-        });
-
-        ChainStore.subscribe(this.queue);
-        this.run = true;
     }
-    async stop() {
-        ChainStore.unsubscribe(this.queue);
-        this.run = false;
-        await this.queueEvents;
-    }
-
-    delete() {
-        this.storage.delete();
-    }
-
-    queue = () => {
-        this.queueEvents = this.queueEvents
-            .then(this.checkOrders)
-            .catch(this.logger.error.bind(this.logger));
-    };
 
     checkOrders = async () => {
         let state = this.storage.read();
@@ -97,7 +65,7 @@ class TrailingStop {
                 state.amount,
                 stoploss.toNumber()
             );
-            this.stop();
+            await this.stop();
         }
     };
 }
diff --git a/app/lib/bots/account.js b/app/lib/bots/account.js
index ecb05682ac..cc91e15c3d 100644
--- a/app/lib/bots/account.js
+++ b/app/lib/bots/account.js
@@ -33,7 +33,7 @@ class Account {
         amount,
         price,
         fill_or_kill = false,
-        expire = "2025-02-02T02:02:02"
+        expire = "2099-01-01T00:00:00"
     ) {
         await this.promise;
 
@@ -74,9 +74,9 @@ class Account {
             extensions: []
         });
 
-        return (await Apis.db.get_objects([
-            tx[0].trx.operation_results[0][1]
-        ]))[0];
+        return (
+            await Apis.db.get_objects([tx[0].trx.operation_results[0][1]])
+        )[0];
     }
 
     async sell(
@@ -85,7 +85,7 @@ class Account {
         amount,
         price,
         fill_or_kill = false,
-        expire = "2025-02-02T02:02:02"
+        expire = "2099-01-01T00:00:00"
     ) {
         await this.promise;
 
@@ -128,9 +128,9 @@ class Account {
             extensions: []
         });
 
-        return (await Apis.db.get_objects([
-            tx[0].trx.operation_results[0][1]
-        ]))[0];
+        return (
+            await Apis.db.get_objects([tx[0].trx.operation_results[0][1]])
+        )[0];
     }
 
     async balances() {
diff --git a/app/lib/bots/index.js b/app/lib/bots/index.js
index a032bed189..ef603b904e 100644
--- a/app/lib/bots/index.js
+++ b/app/lib/bots/index.js
@@ -23,10 +23,10 @@ export default {
         return bot;
     },
 
-    delete(bot) {
+    async delete(bot) {
         let name = `__bots__${bot.storage.name}`;
 
-        bots[name].delete();
+        await bots[name].delete();
         delete bots[name];
     },
 
diff --git a/app/lib/chain/GenesisFilter.js b/app/lib/chain/GenesisFilter.js
deleted file mode 100644
index 609050ea1c..0000000000
--- a/app/lib/chain/GenesisFilter.js
+++ /dev/null
@@ -1,180 +0,0 @@
-import {hash, key} from "bitsharesjs";
-
-var bts_genesiskeys_bloom_url = undefined;
-try {
-    var url = require("file-loader?name=bts_genesiskeys_bloom_[sha1:hash:hex:7].dat!assets/bts_genesiskeys_bloom.dat");
-    if (url.indexOf("3cee441") === -1)
-        throw new Error("Incorrect hash: bts_genesiskeys_bloom.dat");
-    bts_genesiskeys_bloom_url = url;
-} catch (e) {
-    // webpack deployment exception (not run time)
-    console.log(
-        "WARN: Will be unable to filter BTS 1.0 wallet imports, did not find assets/bts_genesiskeys_bloom.dat",
-        e
-    );
-}
-
-/**
-    This should only be applied to a BTS 1.0 export file taken on the
-    discontinued chain. Any public key string or address (all 5 formats) carried
-    over to the BTS 2.0 genesis block will be in this filter.
-
-    Their may be some false positives but no false negatives.
-*/
-export default class GenesisFilter {
-    /** or call this.init */
-    constructor(bloom_buffer) {
-        if (!bloom_buffer) return;
-        this.bloom_buffer = bloom_buffer;
-        this.bits_in_filter = bloom_buffer.length * 8; // 8388608 (test data)
-    }
-
-    /** Was a bloom file deployed?  This does not try to load it from the server. */
-    isAvailable() {
-        return bts_genesiskeys_bloom_url !== undefined;
-    }
-
-    init(done) {
-        if (this.bloom_buffer) {
-            done();
-            return;
-        }
-        if (!this.isAvailable())
-            throw new Error("Genesis bloom file was not deployed");
-
-        var xhr = new XMLHttpRequest();
-        // firefox 40 did not allow the blob url but ff 41.0.2 did
-        xhr.responseType = "blob";
-        xhr.onload = () => {
-            if (xhr.status === 404) return;
-            var reader = new FileReader();
-            reader.onload = evt => {
-                var contents = new Buffer(evt.target.result, "binary");
-                if (contents.length !== 1048576)
-                    throw new Error("Wrong length");
-                this.bits_in_filter = contents.length * 8; // 8388608 (test data)
-                this.bloom_buffer = contents;
-                done();
-            };
-            reader.readAsBinaryString(xhr.response);
-        };
-        xhr.onerror = () => {
-            console.error("xhr.onerror", e);
-        };
-        xhr.open("GET", bts_genesiskeys_bloom_url);
-        xhr.send();
-    }
-
-    inGenesis(pubkey_or_address) {
-        if (!this.bloom_buffer) throw new Error("Call init() first");
-        for (var hashes = 0; hashes < 3; hashes++) {
-            var hex = hash.sha256(hashes + ":" + pubkey_or_address);
-            var bit_address =
-                parseInt(hex.slice(-3).toString("hex"), 16) %
-                this.bits_in_filter; // 3090564
-            // console.error("bit_address", bit_address.toString(16))
-            var byte_address = bit_address >> 3; // 386320
-            // console.error("byte_address", byte_address.toString(16))
-            var mask = 1 << (bit_address & 7); // 16
-            // console.error("mask", mask.toString(16))
-            var byte = this.bloom_buffer[byte_address];
-            // console.error("byte", byte.toString(16))
-            // console.error("byte & mask", byte & mask, (byte & mask) === 0, '\n')
-            if ((byte & mask) === 0) return false;
-        }
-        return true;
-    }
-
-    filter(account_keys, status) {
-        if (!this.isAvailable()) {
-            console.log("WARN: Missing bloom filter for BTS 0.9.x wallets");
-            status({error: "missing_bloom"});
-            return;
-        }
-        var initalizing = true;
-        status({initalizing});
-        this.init(() => {
-            try {
-                initalizing = false;
-                status({initalizing});
-                var running_count_progress = 1;
-                for (var a = 0; a < account_keys.length; a++) {
-                    var removed_count = 0,
-                        count = 0;
-                    var keys = account_keys[a];
-                    var total = keys.encrypted_private_keys.length;
-                    status({
-                        importing: true,
-                        account_name: keys.account_name,
-                        count,
-                        total
-                    });
-                    for (
-                        var k = keys.encrypted_private_keys.length - 1;
-                        k >= 0;
-                        k--
-                    ) {
-                        count++;
-                        if (count % running_count_progress === 0) {
-                            running_count_progress = 47;
-                            status({
-                                importing: true,
-                                account_name: keys.account_name,
-                                count,
-                                total
-                            });
-                        }
-                        if (!keys.public_keys) {
-                            // un-released format, just for testing
-                            status({error: "missing_public_keys"});
-                            return;
-                        }
-                        var currentKey = keys.public_keys[k];
-                        if (/^GPH/.test(currentKey))
-                            currentKey = "GPH" + currentKey.substring(3);
-                        if (this.inGenesis(currentKey)) continue;
-                        var addresses = key.addresses(currentKey, "GPH");
-                        var addy_found = false;
-                        for (var i = 0; i < addresses.length; i++) {
-                            if (this.inGenesis(addresses[i])) {
-                                addy_found = true;
-                                break;
-                            }
-                        }
-                        if (addy_found) continue;
-                        delete keys.encrypted_private_keys[k];
-                        delete keys.public_keys[k];
-                        removed_count++;
-                    }
-                    var encrypted_private_keys = [],
-                        public_keys = [];
-                    for (
-                        var k = keys.encrypted_private_keys.length - 1;
-                        k >= 0;
-                        k--
-                    ) {
-                        if (!keys.encrypted_private_keys[k]) continue;
-                        encrypted_private_keys.push(
-                            keys.encrypted_private_keys[k]
-                        );
-                        public_keys.push(keys.public_keys[k]);
-                    }
-                    keys.encrypted_private_keys = encrypted_private_keys;
-                    status({
-                        importing: false,
-                        account_name: keys.account_name,
-                        count: count - removed_count,
-                        total
-                    });
-                    keys.public_keys = public_keys;
-                }
-                status({success: true});
-            } finally {
-                if (initalizing) {
-                    initalizing = false;
-                    status({initalizing});
-                }
-            }
-        });
-    }
-}
diff --git a/app/lib/common/MarketClasses.js b/app/lib/common/MarketClasses.js
index ff5f11f022..3e993e1f5c 100644
--- a/app/lib/common/MarketClasses.js
+++ b/app/lib/common/MarketClasses.js
@@ -367,7 +367,7 @@ class Price {
 }
 
 class FeedPrice extends Price {
-    constructor({priceObject, assets, market_base, sqr, real = false}) {
+    constructor({priceObject, assets, market_base, sqr, mcfr, real = false}) {
         if (
             !priceObject ||
             typeof priceObject !== "object" ||
@@ -404,6 +404,8 @@ class FeedPrice extends Price {
 
         this.sqr = parseInt(sqr, 10) / 1000;
         this.inverted = inverted;
+        if (!mcfr) this.mcfr = 0;
+        else this.mcfr = parseInt(mcfr, 10) / 1000;
     }
 
     getSqueezePrice({real = false} = {}) {
@@ -411,12 +413,16 @@ class FeedPrice extends Price {
             this._squeeze_price = this.clone();
             if (this.inverted) {
                 this._squeeze_price.base.amount = Math.floor(
-                    this._squeeze_price.base.amount * this.sqr * 1000
+                    this._squeeze_price.base.amount *
+                        (this.sqr - this.mcfr) *
+                        1000
                 );
                 this._squeeze_price.quote.amount *= 1000;
             } else if (!this.inverted) {
                 this._squeeze_price.quote.amount = Math.floor(
-                    this._squeeze_price.quote.amount * this.sqr * 1000
+                    this._squeeze_price.quote.amount *
+                        (this.sqr - this.mcfr) *
+                        1000
                 );
                 this._squeeze_price.base.amount *= 1000;
             }
@@ -899,25 +905,25 @@ class CallOrder {
         let orderDebt = order.iSum
             ? order.debt
             : orderUseCR
-                ? order.max_debt_to_cover.getAmount()
-                : order.amountToReceive().getAmount();
+            ? order.max_debt_to_cover.getAmount()
+            : order.amountToReceive().getAmount();
         let newOrderDebt = newOrder.iSum
             ? newOrder.debt
             : newOrderUseCR
-                ? newOrder.max_debt_to_cover.getAmount()
-                : newOrder.amountToReceive().getAmount();
+            ? newOrder.max_debt_to_cover.getAmount()
+            : newOrder.amountToReceive().getAmount();
 
         /* Determine which collateral values to use */
         let orderCollateral = order.iSum
             ? order.collateral
             : orderUseCR
-                ? order.max_collateral_to_sell.getAmount()
-                : order.amountForSale().getAmount();
+            ? order.max_collateral_to_sell.getAmount()
+            : order.amountForSale().getAmount();
         let newOrderCollateral = newOrder.iSum
             ? newOrder.collateral
             : newOrderUseCR
-                ? newOrder.max_collateral_to_sell.getAmount()
-                : newOrder.amountForSale().getAmount();
+            ? newOrder.max_collateral_to_sell.getAmount()
+            : newOrder.amountForSale().getAmount();
 
         newOrder.debt = newOrderDebt + orderDebt;
         newOrder.collateral = newOrderCollateral + orderCollateral;
@@ -1232,8 +1238,8 @@ class FillOrder {
         this.className = this.isCall
             ? "orderHistoryCall"
             : this.isBid
-                ? "orderHistoryBid"
-                : "orderHistoryAsk";
+            ? "orderHistoryBid"
+            : "orderHistoryAsk";
         this.time = fill.time && new Date(utils.makeISODateString(fill.time));
         this.block = fill.block;
         this.account = fill.op.account || fill.op.account_id;
diff --git a/app/lib/common/scamAccounts.js b/app/lib/common/scamAccounts.js
index a1a5477bd1..4acc1e8ed3 100644
--- a/app/lib/common/scamAccounts.js
+++ b/app/lib/common/scamAccounts.js
@@ -15,6 +15,9 @@ export const scamAccountsBittrex = [
 ];
 
 export const scamAccountsOther = [
+    "blckchnb",
+    "1.2.3655",
+
     "deepcrypto8",
     "1.2.2126",
 
diff --git a/app/lib/common/trxHelper.js b/app/lib/common/trxHelper.js
index 458c87b574..b28990eb09 100644
--- a/app/lib/common/trxHelper.js
+++ b/app/lib/common/trxHelper.js
@@ -133,9 +133,9 @@ function checkFeeStatusAsync({
                     let hasValidCER = true;
 
                     /*
-                ** If the fee is to be paid in a non-core asset, check the fee
-                ** pool and convert the amount using the CER
-                */
+                     ** If the fee is to be paid in a non-core asset, check the fee
+                     ** pool and convert the amount using the CER
+                     */
                     if (feeID !== "1.3.0") {
                         // Convert the amount using the CER
                         let cer = feeAsset.getIn([
@@ -157,9 +157,9 @@ function checkFeeStatusAsync({
                         let quote = new Asset(q);
 
                         /*
-                    ** If the CER is incorrectly configured, the multiplication
-                    ** will fail, so catch the error and default to core
-                    */
+                         ** If the CER is incorrectly configured, the multiplication
+                         ** will fail, so catch the error and default to core
+                         */
                         try {
                             let price = new Price({base, quote});
                             fee = fee.times(price, true);
@@ -215,9 +215,9 @@ let _feeCache = {};
 function estimateFee(op_type, options, globalObject, data = {}) {
     // console.time("estimateFee");
     /*
-    * The actual content doesn't matter, only the length of it, so we use a
-    * string of equal length to improve caching
-    */
+     * The actual content doesn't matter, only the length of it, so we use a
+     * string of equal length to improve caching
+     */
     if (!!data.content)
         data.content = new Array(data.content.length + 1).join("a");
     if (!globalObject) return 0;
@@ -227,15 +227,19 @@ function estimateFee(op_type, options, globalObject, data = {}) {
         return _feeCache[cacheKey];
     }
     let op_code = operations[op_type];
-    let currentFees = globalObject.getIn([
+    let currentFees = null;
+
+    // The data returned by the API is not necessarily continuous.
+    let params = globalObject.getIn([
         "parameters",
         "current_fees",
-        "parameters",
-        op_code,
-        1
+        "parameters"
     ]);
-    /* Default to transfer fees if the op is missing in globalObject */
-    if (!currentFees)
+    let index = params.findIndex(item => item.get(0) == op_code);
+    if (index > -1) {
+        currentFees = params.getIn([index, 1]);
+    } else {
+        /* Default to transfer fees if the op is missing in globalObject */
         currentFees = globalObject.getIn([
             "parameters",
             "current_fees",
@@ -243,6 +247,8 @@ function estimateFee(op_type, options, globalObject, data = {}) {
             0,
             1
         ]);
+    }
+
     currentFees = currentFees.toJS();
 
     let fee = 0;
diff --git a/app/lib/common/utils.js b/app/lib/common/utils.js
index 37360a3956..ea03903963 100644
--- a/app/lib/common/utils.js
+++ b/app/lib/common/utils.js
@@ -136,8 +136,12 @@ var Utils = {
         let baseID = base.toJS ? base.get("id") : base.id;
         let basePrecision = base.toJS ? base.get("precision") : base.precision;
         let fixedPrecisionAssets = {
-            //"1.3.113": 5, // bitCNY
-            "1.3.27": 5 // gpUSD
+            "1.3.27": 5, // gpUSD
+            "1.3.36": 5, // gpEUR
+            "1.3.37": 5, // gpRUB
+            "1.3.38": 5, // gpCNY
+            "1.3.35": 6, // gpGOLD
+            "1.3.34": 4 // gpSILVER
         };
         if (quoteID === "1.3.0") {
             priceText = this.format_number(price, quotePrecision);
diff --git a/app/lib/workers/GenesisFilterWorker.js b/app/lib/workers/GenesisFilterWorker.js
deleted file mode 100644
index 3f5db16e44..0000000000
--- a/app/lib/workers/GenesisFilterWorker.js
+++ /dev/null
@@ -1,19 +0,0 @@
-var GenesisFilter = require("chain/GenesisFilter");
-
-onmessage = function(event) {
-    try {
-        console.log("GenesisFilterWorker start");
-        var {account_keys, bloom_filter} = event.data;
-        var genesis_filter = new GenesisFilter(bloom_filter);
-        genesis_filter.filter(account_keys, status => {
-            if (status.success) {
-                postMessage({account_keys, status});
-                console.log("GenesisFilterWorker done");
-                return;
-            }
-            postMessage({status});
-        });
-    } catch (e) {
-        console.error("GenesisFilterWorker", e);
-    }
-};
diff --git a/app/stores/AddressIndex.js b/app/stores/AddressIndex.js
index 49cd244ff1..a9d2009353 100644
--- a/app/stores/AddressIndex.js
+++ b/app/stores/AddressIndex.js
@@ -7,7 +7,8 @@ import BaseStore from "stores/BaseStore";
 
 let AddressIndexWorker;
 if (__ELECTRON__) {
-    AddressIndexWorker = require("worker-loader?inline=no-fallback!workers/AddressIndexWorker");
+    AddressIndexWorker = require("worker-loader?inline=no-fallback!workers/AddressIndexWorker")
+        .default;
 }
 class AddressIndex extends BaseStore {
     constructor() {
@@ -65,7 +66,8 @@ class AddressIndex extends BaseStore {
             this.loadAddyMap()
                 .then(() => {
                     if (!__ELECTRON__) {
-                        AddressIndexWorker = require("worker-loader!workers/AddressIndexWorker");
+                        AddressIndexWorker = require("worker-loader!workers/AddressIndexWorker")
+                            .default;
                     }
                     let worker = new AddressIndexWorker();
                     worker.postMessage({
diff --git a/app/stores/IntlStore.js b/app/stores/IntlStore.js
index cb1db68e80..5ed2259049 100644
--- a/app/stores/IntlStore.js
+++ b/app/stores/IntlStore.js
@@ -1,13 +1,20 @@
 import alt from "alt-instance";
 import IntlActions from "actions/IntlActions";
 import SettingsActions from "actions/SettingsActions";
+import SettingsStore from "stores/SettingsStore";
 import counterpart from "counterpart";
+
 var locale_en = require("assets/locales/locale-en.json");
+var locale_ru = require("assets/locales/locale-ru.json");
 import ls from "common/localStorage";
+
 let ss = ls("__graphene__");
 
-counterpart.registerTranslations("en", locale_en);
-counterpart.setFallbackLocale("en");
+//counterpart.registerTranslations("en", locale_en);
+//counterpart.setFallbackLocale("en");
+
+let localeFirstLoad = SettingsStore.getState().settings.get("locale");
+console.log("localeFirstLoad: " + localeFirstLoad);
 
 import {addLocaleData} from "react-intl";
 
@@ -16,6 +23,22 @@ for (let localeCode of localeCodes) {
     addLocaleData(require(`react-intl/locale-data/${localeCode}`));
 }
 
+counterpart.registerTranslations("ru", require("counterpart/locales/ru"));
+counterpart.registerTranslations("en", require("counterpart/locales/en"));
+
+if (localeFirstLoad === "ru") {
+    counterpart.registerTranslations("ru", locale_ru);
+    counterpart.setFallbackLocale("ru");
+} else if (localeFirstLoad === "en") {
+    counterpart.registerTranslations("en", locale_en);
+    counterpart.setFallbackLocale("en");
+} else {
+    counterpart.registerTranslations(
+        localeFirstLoad,
+        IntlActions.switchLocale(localeFirstLoad)
+    );
+}
+
 class IntlStore {
     constructor() {
         const storedSettings = ss.get("settings_v4", {});
@@ -24,8 +47,12 @@ class IntlStore {
         }
         this.currentLocale = storedSettings.locale;
 
-        this.locales = ["en"];
-        this.localesObject = {en: locale_en};
+        //this.locales = ["en"];
+        this.locales = localeCodes;
+        this.localesObject = {
+            en: locale_en,
+            ru: locale_ru
+        };
 
         this.bindListeners({
             onSwitchLocale: IntlActions.switchLocale,
diff --git a/app/stores/MarketsStore.js b/app/stores/MarketsStore.js
index b57fd263b4..6d5247d920 100644
--- a/app/stores/MarketsStore.js
+++ b/app/stores/MarketsStore.js
@@ -170,7 +170,7 @@ class MarketsStore {
     }
 
     _getBucketSize() {
-        return parseInt(marketStorage.get("bucketSize", 4 * 3600));
+        return parseInt(marketStorage.get("bucketSize", 24 * 3600));
     }
 
     _setBucketSize(size) {
@@ -755,6 +755,14 @@ class MarketsStore {
                 "current_feed",
                 "maximum_short_squeeze_ratio"
             ]);
+            let mcfr = this[
+                this.invertedCalls ? "baseAsset" : "quoteAsset"
+            ].getIn([
+                "bitasset",
+                "options",
+                "extensions",
+                "margin_call_fee_ratio"
+            ]);
 
             this.is_prediction_market = this[
                 this.invertedCalls ? "baseAsset" : "quoteAsset"
@@ -791,6 +799,7 @@ class MarketsStore {
                 priceObject: feedPriceRaw,
                 market_base: this.quoteAsset.get("id"),
                 sqr,
+                mcfr,
                 assets
             });
 
diff --git a/app/stores/WalletDb.js b/app/stores/WalletDb.js
index 5d9b1d5472..f799a5a6ea 100644
--- a/app/stores/WalletDb.js
+++ b/app/stores/WalletDb.js
@@ -27,7 +27,8 @@ let TRACE = false;
 
 let dictJson, AesWorker;
 if (__ELECTRON__) {
-    AesWorker = require("worker-loader?inline=no-fallback!workers/AesWorker");
+    AesWorker = require("worker-loader?inline=no-fallback!workers/AesWorker")
+        .default;
     dictJson = require("common/dictionary_en.json");
 }
 
@@ -223,7 +224,9 @@ class WalletDb extends BaseStore {
                         });
                 });
             })
-            .catch(() => {});
+            .catch(e => {
+                console.error(e);
+            });
     }
 
     transaction_update() {
@@ -640,7 +643,7 @@ class WalletDb extends BaseStore {
                 private_plainhex_array.push(private_key_obj.private_plainhex);
             }
             if (!__ELECTRON__) {
-                AesWorker = require("worker-loader!workers/AesWorker");
+                AesWorker = require("worker-loader!workers/AesWorker").default;
             }
             let worker = new AesWorker();
             worker.postMessage({
diff --git a/bloom_filter/bloom.py b/bloom_filter/bloom.py
deleted file mode 100755
index 6c4114e22a..0000000000
--- a/bloom_filter/bloom.py
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/env python3
-
-# Matching exmaple:
-# ./bloom.py BTS87mopaNqLDjT1BvzqQR3QjWzWSTgkWnMcwt5sqxHuavCBi1s3m
-
-# Sample program by theoriticalbts used to create js implementation
-
-import hashlib
-import sys
-
-k = sys.argv[1]
-
-# specified with -s parameter
-size = 8388608
-
-# specified with -n parameter
-hashes = 3
-
-with open("bloom.dat", "rb") as f:
-    filter_result = True
-
-    for i in range(hashes):
-        x = (str(i)+":"+k).encode("UTF-8")
-        print("getting hash of ", repr(x))
-        hash = hashlib.sha256(x).hexdigest()
-        print("hash value is ", repr(hash))
-        bit_address = int(hash, 16) % size
-        print("bit address is", hex(bit_address))
-        byte_address = bit_address >> 3
-        print("byte address is", hex(byte_address))
-        mask = 1 << (bit_address & 7)
-        print("mask is", hex(mask))
-        f.seek(byte_address)
-        b = f.read(1)
-        print("byte is", hex(b[0]))
-        # print("b[0] & mask", b[0] & mask)
-        ok = (b[0] & mask)
-        print("ok", ok, ok == 0)
-        if ok == 0:
-            filter_result = False
-            print("returning False result")
-            break
-    print("filter_result is", filter_result)
diff --git a/bloom_filter/bloom_bitshares.dat b/bloom_filter/bloom_bitshares.dat
deleted file mode 100644
index 047563f7bc..0000000000
Binary files a/bloom_filter/bloom_bitshares.dat and /dev/null differ
diff --git a/bloom_filter/bloom_filter_wallet.js b/bloom_filter/bloom_filter_wallet.js
deleted file mode 100644
index e3a2645c47..0000000000
--- a/bloom_filter/bloom_filter_wallet.js
+++ /dev/null
@@ -1,138 +0,0 @@
-/* eslint-disable */
-
-// Filter BTS 0.9.2+ import keys export file so that it will include only private keys
-// that may be found in the BTS 2.0 genesis block.
-// Dependencies:
-// ./bloom_bitshares.dat (1,048,576 bytes) sha1 4d80faa41a5e868899febdc9dab48d1f2d567487992810cf0532f3c0ee2b266c
-// nodejs, npm, and: npm install
-
-/*
- * ./bloom.dat is from bitshares/graphene/programs/genesis_util/create_bloom_filter.py
- * The bloom filter was created with a genesis containing BTS prefixed keys.  Create
- * or dowload this file first.
- */
-
-// Automatic usage: name your wallet file wallet.json and run "npm start".
-// Output is called "filtered_wallet.json"
-
-// Manual usage: cat large_import_keys.json | node ./bloom_filter_wallet.js > filtered_import_keys.json
-
-var fs = require("fs");
-
-require("coffee-script/register"); // npm install coffee-script
-
-var graphenejs = require("bitsharesjs");
-var h = graphenejs.hash;
-var key_utils = graphenejs.key;
-const chainPrefix = "GPH";
-
-fs.readFile("bloom_bitshares.dat", function(err, data) {
-    if (err) throw err;
-    console.error(
-        "bloom_bitshares.dat (" + data.length + " bytes)",
-        "sha1",
-        h.sha1(data).toString("hex"),
-        "\n"
-    );
-
-    var bits_in_filter = data.length * 8; // 8388608 (test data)
-    function in_bloom(str) {
-        // echo -n '0:BTS87mopaNqLDjT1BvzqQR3QjWzWSTgkWnMcwt5sqxHuavCBi1s3m'|sha256sum
-        // str = 'BTS87mopaNqLDjT1BvzqQR3QjWzWSTgkWnMcwt5sqxHuavCBi1s3n' // should be found
-        // str = 'BTS4A43UCoWz1F5vqLxX3LLoGHKs1GzCGRjZ' // should be found
-        for (var hashes = 0; hashes < 3; hashes++) {
-            hex = h.sha256(hashes + ":" + str); //"...af2884"
-            bit_address =
-                parseInt(hex.slice(-3).toString("hex"), 16) % bits_in_filter; // 3090564
-            // console.error("bit_address", bit_address.toString(16))
-            byte_address = bit_address >> 3; // 386320
-            // console.error("byte_address", byte_address.toString(16))
-            mask = 1 << (bit_address & 7); // 16
-            // console.error("mask", mask.toString(16))
-            var byte = data[byte_address];
-            // console.error("byte", byte.toString(16))
-            // console.error("byte & mask", byte & mask, (byte & mask) === 0, '\n')
-            if ((byte & mask) === 0) return false;
-        }
-        return true;
-    }
-
-    var stdin = process.stdin,
-        inputChunks = [];
-    stdin.resume();
-    stdin.setEncoding("utf8");
-    stdin.on("data", function(chunk) {
-        inputChunks.push(chunk);
-    });
-    stdin.on("end", function() {
-        var inputJSON = inputChunks.join("");
-        var wallet = JSON.parse(inputJSON);
-        var removed_count = 0,
-            running_count = 0;
-        if (!wallet.account_keys) unsupportedJsonFormat();
-        var total_count = 0;
-        for (let a = 0; a < wallet.account_keys.length; a++) {
-            let keys = wallet.account_keys[a];
-            total_count += keys.encrypted_private_keys.length;
-        }
-        for (let a = 0; a < wallet.account_keys.length; a++) {
-            var keys = wallet.account_keys[a];
-            let current_count = 0;
-            for (var k = keys.encrypted_private_keys.length - 1; k >= 0; k--) {
-                current_count++;
-                running_count++;
-                if (running_count % 100 === 0)
-                    console.error(
-                        "processing | current:",
-                        current_count,
-                        "/",
-                        keys.encrypted_private_keys.length,
-                        "total:",
-                        running_count,
-                        "/",
-                        total_count
-                    );
-                if (!keys.public_keys) unsupportedJsonFormat();
-                var key = keys.public_keys[k];
-
-                if (/^GPH/.test(key)) key = chainPrefix + key.substring(3);
-                if (in_bloom(key)) continue;
-                var addresses = key_utils.addresses(key, chainPrefix);
-                var addy_found = false;
-                for (var i = 0; i < addresses.length; i++) {
-                    if (in_bloom(addresses[i])) {
-                        addy_found = true;
-                        break;
-                    }
-                }
-                if (addy_found) continue;
-                delete keys.encrypted_private_keys[k];
-                delete keys.public_keys[k];
-                removed_count++;
-            }
-            var encrypted_private_keys = [],
-                public_keys = [];
-            for (var k = keys.encrypted_private_keys.length - 1; k >= 0; k--) {
-                if (!keys.encrypted_private_keys[k]) continue;
-                encrypted_private_keys.push(keys.encrypted_private_keys[k]);
-                public_keys.push(keys.public_keys[k]);
-            }
-            keys.encrypted_private_keys = encrypted_private_keys;
-            keys.public_keys = public_keys;
-            console.error(
-                "kept",
-                running_count - removed_count,
-                "of",
-                running_count,
-                "keys"
-            );
-            console.error();
-        }
-        console.log(JSON.stringify(wallet, null, 1));
-    });
-});
-
-function unsupportedJsonFormat() {
-    console.error("Unsupported JSON wallet format");
-    process.exit(1);
-}
diff --git a/bloom_filter/package.json b/bloom_filter/package.json
deleted file mode 100644
index b1bbafd695..0000000000
--- a/bloom_filter/package.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "name": "bitshares-keys-bloom-filter",
-  "version": "1.0.0",
-  "description": "",
-  "main": "bloom_filter_wallet.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "start": "cat wallet.json | node bloom_filter_wallet.js > filtered_wallet.json",
-    "start-windows": "type wallet.json | node bloom_filter_wallet.js > filtered_wallet.json"
-  },
-  "author": "",
-  "license": "ISC",
-  "devDependencies": {
-    "coffee-script": "^1.12.2",
-    "bitsharesjs": "^0.4.10"
-  }
-}
diff --git a/charting_library/install-charting-library.cjs b/charting_library/install-charting-library.cjs
index 782ad5946e..512d69e6ef 100644
--- a/charting_library/install-charting-library.cjs
+++ b/charting_library/install-charting-library.cjs
@@ -9,22 +9,27 @@ function getMD5Digest(file) {
     return hash.toUpperCase();
 }
 
-//var outputFilePath = path.join(__dirname, "charting_library.zip");
 var outputFileName = "charting_library.17.025.02b61a1c.zip";
 var outputFilePath = path.join(__dirname, outputFileName);
-const outputFile = fs.createWriteStream(outputFilePath);
 
-/*http.get("https://files.rudex.org/rudex/charting_library_original.zip", (response) => {
-    response.pipe(outputFile);*/
-http.get("https://bitshares.org/assets/" + outputFileName, (response) => {
-    response.pipe(outputFile);
-}).on("error", (err) => {
-    console.error("Failed to download charting_library archive");
-    console.error(err);
-    throw (err);
-});
+// download only if it doesnt exist
+if (!fs.existsSync(outputFilePath)) {
+    const outputFile = fs.createWriteStream(outputFilePath);
+    http.get("https://files.rudex.org/rudex/" + outputFileName, (response) => {
+        response.pipe(outputFile);
+    }).on("error", (err) => {
+        console.error("Failed to download charting_library archive");
+        console.error(err);
+        throw (err);
+    });
+    outputFile.on("finish", () => {
+        checkDigest();
+    });
+} else {
+    checkDigest();
+}
 
-outputFile.on("finish", () => {
+function checkDigest() {
     const actualDigest = getMD5Digest(outputFilePath);
     const expectedDigest = fs.readFileSync(outputFilePath + ".md5").toString().trim();
     if (actualDigest !== expectedDigest) {
@@ -37,5 +42,5 @@ outputFile.on("finish", () => {
             console.error("Decompress error!", err);
         }
     });
-});
+}
 
diff --git a/package.json b/package.json
index d0eb909872..5763980bdd 100644
--- a/package.json
+++ b/package.json
@@ -1,9 +1,9 @@
 {
   "name": "RuDEX3-light",
-  "version": "3.3.220317",
+  "version": "3.3.220713",
   "description": "Advanced wallet interface for the Graphene financial blockchain.",
   "homepage": "https://github.com/blckchnd/rudex-ui",
-  "author": "RuDEX Team <support@rudex.org>",
+  "author": "RuDEX Team <info@rudex.org>",
   "contributors": [
     "Sigve Kvalsvik <kvalsvik.crypto@gmail.com>",
     "James Calfee",
@@ -142,13 +142,13 @@
     }
   },
   "dependencies": {
-    "alt": "git+https://github.com/graphene-blockchain/alt.git#b6b42ceb790ca321402e9add95b9f77af8a7657d",
-    "alt-container": "git+https://github.com/graphene-blockchain/alt-container.git#cf4e2c690a54e49fc9fe2dc99ab8816e6c3e5a86",
-    "alt-react": "git+https://github.com/graphene-blockchain/alt-react.git#d91addef51f58e41e9857ebb0dd9177cfbd3b583",
+    "alt": "https://github.com/graphene-blockchain/alt.git",
+    "alt-container": "https://github.com/graphene-blockchain/alt-container.git",
+    "alt-react": "https://github.com/graphene-blockchain/alt-react.git",
     "bignumber.js": "^9.0.1",
-    "bitshares-report": "git+https://github.com/graphene-blockchain/graphene-report.git#02f6974168deda0bbd413ebbd93eaad1c1bfb461",
-    "bitshares-ui-style-guide": "git+https://github.com/graphene-blockchain/graphene-ui-style-guide.git#a17a9f6a89932f288a543b1922af0107aea06218",
-    "bitsharesjs": "^4.0.0",
+    "bitshares-report": "https://github.com/graphene-blockchain/graphene-report.git",
+    "bitshares-ui-style-guide": "https://github.com/graphene-blockchain/graphene-ui-style-guide.git",
+    "bitsharesjs": "4.0.0",
     "browser-locale": "^1.0.3",
     "classnames": "^2.2.1",
     "constants-browserify": "^1.0.0",
@@ -158,10 +158,11 @@
     "file-saver": "^1.3.8",
     "foundation-apps": "git+https://github.com/zurb/foundation-apps.git",
     "fractional": "^1.0.0",
-    "golos-classic-js": "^0.7.83",
+    "golos-lib-js": "^0.9.33",
     "handlebars": "^4.7.7",
     "hirestime": "^3.2.1",
     "html2canvas": "^1.3.3",
+    "humanize-duration": "^3.27.1",
     "ifvisible": "^1.1.0",
     "immutable": "3.8.2",
     "indexeddbshim": "^2.2.1",
@@ -174,7 +175,7 @@
     "jspdf-autotable": "^3.1.1",
     "lodash-es": "^4.17.10",
     "lzma": "2.1.6",
-    "moment": "^2.22.2",
+    "moment": "^2.29.2",
     "moment-timezone": "^0.5.16",
     "node-rsa": "^1.1.1",
     "notifyjs": "^3.0.0",
@@ -208,7 +209,7 @@
     "react-select": "^1.2.1",
     "react-sticky-table": "^5.1.11",
     "react-tooltip": "^4.2.21",
-    "react-transition-group": "^1.2.0",
+    "react-transition-group": "^4.4.2",
     "react-translate-component": "^0.15.1",
     "steem-js-api": "^0.7.1",
     "stream-browserify": "^3.0.0",
@@ -241,7 +242,7 @@
     "copyfiles": "^1.2.0",
     "cross-env": "^5.0.5",
     "css-loader": "^6.5.1",
-    "electron": "16.0.4",
+    "electron": "16.2.6",
     "electron-builder": "22.14.5",
     "es6-promise": "^3.0.2",
     "eslint": "^8.4.1",
diff --git a/server.js b/server.js
deleted file mode 100644
index 7ef8451386..0000000000
--- a/server.js
+++ /dev/null
@@ -1,76 +0,0 @@
-var path = require("path");
-var webpack = require("webpack");
-var express = require("express");
-var devMiddleware = require("webpack-dev-middleware");
-var hotMiddleware = require("webpack-hot-middleware");
-var fs = require("fs");
-
-const perf_dev = process.argv[2] === "perf-dev";
-
-var ProgressPlugin = require("webpack/lib/ProgressPlugin");
-var config = require("./webpack.config.js")({prod: false, perf_dev});
-
-var app = express();
-var compiler = webpack(config);
-
-var https = require("https");
-var http = require("http");
-
-compiler.apply(
-    new ProgressPlugin(function(percentage, msg) {
-        process.stdout.write(
-            (percentage * 100).toFixed(2) +
-                "% " +
-                msg +
-                "                 \033[0G"
-        );
-    })
-);
-
-app.use(
-    devMiddleware(compiler, {
-        publicPath: config.output.publicPath,
-        historyApiFallback: true
-    })
-);
-
-app.use(hotMiddleware(compiler));
-
-// app.get("*", function(req, res) {
-//     res.sendFile(path.join(__dirname, "app/assets/index.html"));
-// });
-
-app.use("*", function(req, res, next) {
-    var filename = path.join(compiler.outputPath, "index.html");
-    compiler.outputFileSystem.readFile(filename, function(err, result) {
-        if (err) {
-            return next(err);
-        }
-        res.set("content-type", "text/html");
-        res.send(result);
-        res.end();
-    });
-});
-
-var options = {
-    key: fs.readFileSync("./ssl/server.key"),
-    cert: fs.readFileSync("./ssl/server.crt")
-};
-
-http.createServer(app).listen(8080);
-https.createServer(options, app).listen(8085);
-
-console.log("Listening at http://localhost:8080/ or https://localhost:8085/");
-// new WebpackDevServer(compiler, {
-//     publicPath: config.output.publicPath,
-//     hot: true,
-//     historyApiFallback: true,
-//     quiet: false,
-//     stats: {colors: true},
-//     port: 8080
-// }).listen(8080, '0.0.0.0', function (err, result) {
-//     if (err) {
-//         console.log(err);
-//     }
-//     console.log('Listening at 0.0.0.0:8080');
-// });
diff --git a/yarn.lock b/yarn.lock
index 6fed9ba961..6ac101efa9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -312,6 +312,11 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.8.tgz#61c243a3875f7d0b0962b0543a33ece6ff2f1f17"
   integrity sha512-i7jDUfrVBWc+7OKcBzEe5n7fbv3i2fWtxKzzCvOjnzSxMfWMigAhtfJ7qzZNGFNMsCCd67+uz553dYKWXPvCKw==
 
+"@babel/parser@^7.16.10":
+  version "7.16.12"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.12.tgz#9474794f9a650cf5e2f892444227f98e28cdf8b6"
+  integrity sha512-VfaV15po8RiZssrkPweyvbGVSe4x2y+aciFCgn0n0/SJMR22cwofRV1mtnJQYcSB1wUTaA/X1LnA3es66MCO5A==
+
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz#4eda6d6c2a0aa79c70fa7b6da67763dfe2141050"
@@ -1027,7 +1032,7 @@
     pirates "^4.0.0"
     source-map-support "^0.5.16"
 
-"@babel/runtime@^7.1.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.0", "@babel/runtime@^7.8.4":
+"@babel/runtime@^7.1.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.7.tgz#03ff99f64106588c9c403c6ecb8c3bafbbdff1fa"
   integrity sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==
@@ -1043,7 +1048,7 @@
     "@babel/parser" "^7.16.7"
     "@babel/types" "^7.16.7"
 
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.4.3", "@babel/traverse@^7.4.5":
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.4.3":
   version "7.16.8"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.8.tgz#bab2f2b09a5fe8a8d9cad22cbfe3ba1d126fef9c"
   integrity sha512-xe+H7JlvKsDQwXRsBhSnq1/+9c+LlQcCK3Tn/l5sbx02HYns/cn7ibp9+RV1sIUqu7hKg91NWsgHurO9dowITQ==
@@ -1059,6 +1064,22 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
+"@babel/traverse@^7.4.5":
+  version "7.16.10"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.10.tgz#448f940defbe95b5a8029975b051f75993e8239f"
+  integrity sha512-yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw==
+  dependencies:
+    "@babel/code-frame" "^7.16.7"
+    "@babel/generator" "^7.16.8"
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-function-name" "^7.16.7"
+    "@babel/helper-hoist-variables" "^7.16.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/parser" "^7.16.10"
+    "@babel/types" "^7.16.8"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
 "@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4":
   version "7.16.8"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.8.tgz#0ba5da91dd71e0a4e7781a30f22770831062e3c1"
@@ -1836,6 +1857,13 @@ abab@^2.0.0:
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"
   integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==
 
+abort-controller@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
+  integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==
+  dependencies:
+    event-target-shim "^5.0.0"
+
 accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
   version "1.3.7"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
@@ -1941,27 +1969,27 @@ ajv@^8.0.0, ajv@^8.8.0:
     require-from-string "^2.0.2"
     uri-js "^4.2.2"
 
-"alt-container@git+https://github.com/graphene-blockchain/alt-container.git#cf4e2c690a54e49fc9fe2dc99ab8816e6c3e5a86":
+"alt-container@https://github.com/graphene-blockchain/alt-container.git":
   version "1.1.1"
-  resolved "git+https://github.com/graphene-blockchain/alt-container.git#cf4e2c690a54e49fc9fe2dc99ab8816e6c3e5a86"
+  resolved "https://github.com/graphene-blockchain/alt-container.git#f36fde0847fd3cb25cee1340ad733546eb9cfc9e"
   dependencies:
-    object.assign "^4.0.1"
-    prop-types "^15.5.10"
+    object.assign "^4.1.2"
+    prop-types "^15.8.0"
 
-"alt-react@git+https://github.com/graphene-blockchain/alt-react.git#d91addef51f58e41e9857ebb0dd9177cfbd3b583":
+"alt-react@https://github.com/graphene-blockchain/alt-react.git":
   version "0.0.2"
-  resolved "git+https://github.com/graphene-blockchain/alt-react.git#d91addef51f58e41e9857ebb0dd9177cfbd3b583"
+  resolved "https://github.com/graphene-blockchain/alt-react.git#27ed02aff1b3da9f7a69ffbd1c9d9cd40e194da2"
   dependencies:
-    create-react-class "^15.6.3"
-    prop-types "^15.6.1"
+    create-react-class "^15.7.0"
+    prop-types "^15.8.0"
 
-"alt@git+https://github.com/graphene-blockchain/alt.git#b6b42ceb790ca321402e9add95b9f77af8a7657d":
+"alt@https://github.com/graphene-blockchain/alt.git":
   version "0.18.6"
-  resolved "git+https://github.com/graphene-blockchain/alt.git#b6b42ceb790ca321402e9add95b9f77af8a7657d"
+  resolved "https://github.com/graphene-blockchain/alt.git#c334b87c1f8071e386bbbbfa9adde4fd9af5ed04"
   dependencies:
-    flux "2.1.1"
-    is-promise "2.1.0"
-    transmitter "3.0.1"
+    flux "^4.0.3"
+    is-promise "^4.0.0"
+    transmitter "^3.0.1"
 
 ansi-align@^3.0.0:
   version "3.0.1"
@@ -1988,9 +2016,9 @@ ansi-html-community@0.0.8, ansi-html-community@^0.0.8:
   integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==
 
 ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.1.tgz#123d6479e92ad45ad897d4054e3c7ca7db4944e1"
+  integrity sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==
 
 ansi-regex@^4.0.0, ansi-regex@^4.1.0:
   version "4.1.0"
@@ -2021,7 +2049,7 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   dependencies:
     color-convert "^2.0.1"
 
-antd@^3.15.2:
+antd@^3.26.20:
   version "3.26.20"
   resolved "https://registry.yarnpkg.com/antd/-/antd-3.26.20.tgz#f3f570efaaa5950a144942f21eb2aaaa088e9407"
   integrity sha512-VIous4ofZfxFtd9K1h9MpRX2sDDpj3QcOFi3YgIc9B/uyDli/GlLb8SWKfQfJaMkaxwatIv503dag2Tog+hiEg==
@@ -2323,6 +2351,16 @@ assert@^1.1.1:
     object-assign "^4.1.1"
     util "0.10.3"
 
+assert@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/assert/-/assert-2.0.0.tgz#95fc1c616d48713510680f2eaf2d10dd22e02d32"
+  integrity sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==
+  dependencies:
+    es6-object-assign "^1.1.0"
+    is-nan "^1.2.1"
+    object-is "^1.0.1"
+    util "^0.12.0"
+
 assign-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
@@ -2360,18 +2398,18 @@ async-validator@~1.11.3:
   resolved "https://registry.yarnpkg.com/async-validator/-/async-validator-1.11.5.tgz#9d43cf49ef6bb76be5442388d19fb9a6e47597ea"
   integrity sha512-XNtCsMAeAH1pdLMEg1z8/Bb3a8cdCbui9QbJATRFHHHW5kT6+NPI3zSVQUXgikTFITzsg+kYY5NTWhM2Orwt9w==
 
-async@0.9.x:
-  version "0.9.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
-  integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=
-
-async@^2.6.0, async@^2.6.2, async@^2.6.3:
+async@^2.6.2, async@^2.6.3:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
   integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
   dependencies:
     lodash "^4.17.14"
 
+async@^3.2.2, async@^3.2.3:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.2.3.tgz#ac53dafd3f4720ee9e8a160628f18ea91df196c9"
+  integrity sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==
+
 async@~0.2.10:
   version "0.2.10"
   resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
@@ -2405,6 +2443,11 @@ autoprefixer@^9.5.1:
     postcss "^7.0.32"
     postcss-value-parser "^4.1.0"
 
+available-typed-arrays@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
+  integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
+
 aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
@@ -2635,7 +2678,7 @@ big.js@^5.2.2:
 bigi@1.4.2, bigi@^1.1.0, bigi@^1.4.2:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/bigi/-/bigi-1.4.2.tgz#9c665a95f88b8b08fc05cfd731f561859d725825"
-  integrity sha1-nGZalfiLiwj8Bc/XMfVhhZ1yWCU=
+  integrity sha512-ddkU+dFIuEIW8lE7ZwdIAf2UPoM90eaprg5m3YXAVVTmKlqV/9BX4A2M8BOK2yOq6/VgZFVhK6QAxJebhlbhzw==
 
 bignumber.js@^9.0.1:
   version "9.0.2"
@@ -2654,24 +2697,24 @@ bindings@^1.5.0:
   dependencies:
     file-uri-to-path "1.0.0"
 
-"bitshares-report@git+https://github.com/graphene-blockchain/graphene-report.git#02f6974168deda0bbd413ebbd93eaad1c1bfb461":
+"bitshares-report@https://github.com/graphene-blockchain/graphene-report.git":
   version "2.0.0"
-  resolved "git+https://github.com/graphene-blockchain/graphene-report.git#02f6974168deda0bbd413ebbd93eaad1c1bfb461"
+  resolved "https://github.com/graphene-blockchain/graphene-report.git#9b26b2f1f3f57d1003f95984fe17f4214b7a5583"
   dependencies:
-    async "^2.6.0"
-    csv "^5.3.0"
-    moment "^2.22.0"
-    node-fetch "^2.2.0"
+    async "^3.2.2"
+    csv "^6.0.5"
+    moment "^2.29.1"
+    node-fetch "2.6.6"
 
-"bitshares-ui-style-guide@git+https://github.com/graphene-blockchain/graphene-ui-style-guide.git#a17a9f6a89932f288a543b1922af0107aea06218":
-  version "4.0.0"
-  resolved "git+https://github.com/graphene-blockchain/graphene-ui-style-guide.git#a17a9f6a89932f288a543b1922af0107aea06218"
+"bitshares-ui-style-guide@https://github.com/graphene-blockchain/graphene-ui-style-guide.git":
+  version "6.0.0"
+  resolved "https://github.com/graphene-blockchain/graphene-ui-style-guide.git#118b6aadc3b0f7922aefd77b060cf022d21851e2"
   dependencies:
-    antd "^3.15.2"
+    antd "^3.26.20"
     normalize.css "^8.0.1"
-    prop-types "^15.7.2"
-    react "^16.11.0"
-    react-dom "^16.11.0"
+    prop-types "^15.6.1"
+    react "16.14.0"
+    react-dom "16.14.0"
     react-router-dom "^5.1.2"
 
 bitsharesjs-ws@^4.0.0:
@@ -2682,7 +2725,7 @@ bitsharesjs-ws@^4.0.0:
     isomorphic-ws "^4.0.1"
     ws "^4.1.0"
 
-bitsharesjs@^4.0.0:
+bitsharesjs@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/bitsharesjs/-/bitsharesjs-4.0.0.tgz#0dc97a012a014b897fbaa03118e50e6e4b45f084"
   integrity sha512-mB5iAvOgPoURRBq2tZRr10U/V1xz7hJExZsZcbhNhS+mJqpALVMEZPi26B2zQ5/02K37ukIwkLGJVIzafOBuCw==
@@ -2717,7 +2760,7 @@ bluebird-lst@^1.0.9:
   dependencies:
     bluebird "^3.5.5"
 
-bluebird@^3.4.6, bluebird@^3.5.0, bluebird@^3.5.5:
+bluebird@^3.5.0, bluebird@^3.5.5:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
@@ -2792,6 +2835,13 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
+brace-expansion@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
+  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
+  dependencies:
+    balanced-match "^1.0.0"
+
 braces@^2.3.1:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
@@ -2917,7 +2967,7 @@ browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.17.5, browserslist@^
 bs58@4.0.1, bs58@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/bs58/-/bs58-4.0.1.tgz#be161e76c354f6f788ae4071f63f34e8c4f0a42a"
-  integrity sha1-vhYedsNU9veIrkBx9j806MTwpCo=
+  integrity sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw==
   dependencies:
     base-x "^3.0.2"
 
@@ -2985,7 +3035,7 @@ buffer@^4.3.0:
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
-buffer@^5.0.6, buffer@^5.1.0, buffer@^5.5.0:
+buffer@^5.1.0, buffer@^5.5.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
   integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
@@ -2993,6 +3043,14 @@ buffer@^5.0.6, buffer@^5.1.0, buffer@^5.5.0:
     base64-js "^1.3.1"
     ieee754 "^1.1.13"
 
+buffer@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6"
+  integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==
+  dependencies:
+    base64-js "^1.3.1"
+    ieee754 "^1.2.1"
+
 builder-util-runtime@8.9.1:
   version "8.9.1"
   resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.9.1.tgz#25f066b3fbc20b3e6236a9b956b1ebb0e33ff66a"
@@ -3030,7 +3088,7 @@ builtin-status-codes@^3.0.0:
 bytebuffer@5.0.1, bytebuffer@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/bytebuffer/-/bytebuffer-5.0.1.tgz#582eea4b1a873b6d020a48d58df85f0bba6cfddd"
-  integrity sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0=
+  integrity sha512-IuzSdmADppkZ6DlpycMkm8l9zeEq16fWtLvunEwFiYciR/BHo4E8/xs5piFquG+Za8OWmMqHF8zuRviz2LHvRQ==
   dependencies:
     long "~3"
 
@@ -3158,11 +3216,6 @@ caseless@~0.12.0:
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
-chain-function@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/chain-function/-/chain-function-1.0.1.tgz#c63045e5b4b663fb86f1c6e186adaf1de402a1cc"
-  integrity sha512-SxltgMwL9uCko5/ZCLiyG2B7R9fY4pDZUw7hJ4MhirdjBLosoDqkWABi3XMucddHdLiFJMb7PD2MZifZriuMTg==
-
 chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
@@ -3172,7 +3225,7 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.2:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1:
+chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -3638,6 +3691,11 @@ core-js@^2.4.0, core-js@^2.5.0:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
   integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
 
+core-js@^3.17.3:
+  version "3.22.8"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.22.8.tgz#23f860b1fe60797cc4f704d76c93fea8a2f60631"
+  integrity sha512-UoGQ/cfzGYIuiq6Z7vWL1HfkE9U9IZ4Ub+0XSiJTCzvbZzgPA69oDF2f+lgJ6dFFLEdjW5O6svvoKzXX23xFkA==
+
 core-js@^3.6.0, core-js@^3.8.3:
   version "3.20.3"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.20.3.tgz#c710d0a676e684522f3db4ee84e5e18a9d11d69a"
@@ -3721,7 +3779,7 @@ create-hmac@1.1.7, create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-create-react-class@^15.5.2, create-react-class@^15.5.3, create-react-class@^15.6.0, create-react-class@^15.6.3:
+create-react-class@^15.5.2, create-react-class@^15.5.3, create-react-class@^15.6.0, create-react-class@^15.6.3, create-react-class@^15.7.0:
   version "15.7.0"
   resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.7.0.tgz#7499d7ca2e69bb51d13faf59bd04f0c65a1d6c1e"
   integrity sha512-QZv4sFWG9S5RUvkTYWbflxeZX+JG7Cz0Tn33rQBJ+WFQTqTfUTjMjiv9tnfXazjsO5r0KhPs+AqCjyrQX6h2ng==
@@ -3745,6 +3803,13 @@ cross-fetch@^1.1.1:
     whatwg-fetch "2.0.3"
 
 cross-fetch@^3.0.0:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f"
+  integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==
+  dependencies:
+    node-fetch "2.6.7"
+
+cross-fetch@^3.0.4:
   version "3.1.4"
   resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.4.tgz#9723f3a3a247bf8b89039f3a380a9244e8fa2f39"
   integrity sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ==
@@ -3808,7 +3873,7 @@ crypto-browserify@^3.11.0, crypto-browserify@^3.12.0:
 crypto-js@3.1.9-1:
   version "3.1.9-1"
   resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-3.1.9-1.tgz#fda19e761fc077e01ffbfdc6e9fdfc59e8806cd8"
-  integrity sha1-/aGedh/Ad+Af+/3G6f38WeiAbNg=
+  integrity sha512-W93aKztssqf29OvUlqfikzGyYbD1rpkXvGP9IQ1JchLY3bxaLXZSWYbwrtib2vk8DobrDzX7PIXcDWHp0B6Ymw==
 
 crypto-js@^4.0.0:
   version "4.1.1"
@@ -3928,30 +3993,30 @@ csstype@^3.0.2:
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.10.tgz#2ad3a7bed70f35b965707c092e5f30b327c290e5"
   integrity sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA==
 
-csv-generate@^3.4.3:
-  version "3.4.3"
-  resolved "https://registry.yarnpkg.com/csv-generate/-/csv-generate-3.4.3.tgz#bc42d943b45aea52afa896874291da4b9108ffff"
-  integrity sha512-w/T+rqR0vwvHqWs/1ZyMDWtHHSJaN06klRqJXBEpDJaM/+dZkso0OKh1VcuuYvK3XM53KysVNq8Ko/epCK8wOw==
+csv-generate@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/csv-generate/-/csv-generate-4.0.4.tgz#c780c35ec5b23481d7cf37abd147a4fbdf8c94ad"
+  integrity sha512-6/0FOBbF4O+EBSAYsfOXBjIFhyPpfeeeuWEM4XJQhc/6TvDDL9AGFQNPh2SKlFx7VYERBDmZAWnITgaa+z4BJA==
 
-csv-parse@^4.16.3:
-  version "4.16.3"
-  resolved "https://registry.yarnpkg.com/csv-parse/-/csv-parse-4.16.3.tgz#7ca624d517212ebc520a36873c3478fa66efbaf7"
-  integrity sha512-cO1I/zmz4w2dcKHVvpCr7JVRu8/FymG5OEpmvsZYlccYolPBLoVGKUHgNoc4ZGkFeFlWGEDmMyBM+TTqRdW/wg==
+csv-parse@^5.0.4:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/csv-parse/-/csv-parse-5.0.4.tgz#97e5e654413bcf95f2714ce09bcb2be6de0eb8e3"
+  integrity sha512-5AIdl8l6n3iYQYxan5djB5eKDa+vBnhfWZtRpJTcrETWfVLYN0WSj3L9RwvgYt+psoO77juUr8TG8qpfGZifVQ==
 
-csv-stringify@^5.6.5:
-  version "5.6.5"
-  resolved "https://registry.yarnpkg.com/csv-stringify/-/csv-stringify-5.6.5.tgz#c6d74badda4b49a79bf4e72f91cce1e33b94de00"
-  integrity sha512-PjiQ659aQ+fUTQqSrd1XEDnOr52jh30RBurfzkscaE2tPaFsDH5wOAHJiw8XAHphRknCwMUE9KRayc4K/NbO8A==
+csv-stringify@^6.0.5:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/csv-stringify/-/csv-stringify-6.0.5.tgz#3474a4fe784249eb5c91d455f616e1f70961cdc0"
+  integrity sha512-7xpV3uweJCFF/Ssn56l3xsR/k2r3UqszwjEhej9qEn2cCPzyK1WyHCgoUVzBA792x8HbwonNX7CU9XM2K5s5yw==
 
-csv@^5.3.0:
-  version "5.5.3"
-  resolved "https://registry.yarnpkg.com/csv/-/csv-5.5.3.tgz#cd26c1e45eae00ce6a9b7b27dcb94955ec95207d"
-  integrity sha512-QTaY0XjjhTQOdguARF0lGKm5/mEq9PD9/VhZZegHDIBq2tQwgNpHc3dneD4mGo2iJs+fTKv5Bp0fZ+BRuY3Z0g==
+csv@^6.0.5:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/csv/-/csv-6.0.5.tgz#e7823b1d9c8a35d7ec03801e3e80c3fb0d1d5247"
+  integrity sha512-VyII851P4BvzMsXenhtR7g3mARmZ3HvBX16PD85E8IOoxyvNT9e74egbfdkYBj5SGHh1LphCWXeQvskijH+kfg==
   dependencies:
-    csv-generate "^3.4.3"
-    csv-parse "^4.16.3"
-    csv-stringify "^5.6.5"
-    stream-transform "^2.1.3"
+    csv-generate "^4.0.4"
+    csv-parse "^5.0.4"
+    csv-stringify "^6.0.5"
+    stream-transform "^3.0.4"
 
 currently-unhandled@^0.4.1:
   version "0.4.1"
@@ -4057,7 +4122,7 @@ decompress-response@^3.3.0:
 deep-equal@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
-  integrity sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=
+  integrity sha512-bHtC0iYvWhyaTzvV3CZgPeZQqCOBGyGsVV7v4eevpdkLHfiSrXUdBG+qAuSz4RI70sszvjQ1QSZ98An1yNwpSw==
 
 deep-equal@^1.0.1:
   version "1.1.1"
@@ -4105,6 +4170,14 @@ define-properties@^1.1.3:
   dependencies:
     object-keys "^1.0.12"
 
+define-properties@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1"
+  integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==
+  dependencies:
+    has-property-descriptors "^1.0.0"
+    object-keys "^1.1.1"
+
 define-property@^0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
@@ -4301,12 +4374,13 @@ dom-converter@^0.2.0:
   dependencies:
     utila "~0.4"
 
-dom-helpers@^3.2.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.4.0.tgz#e9b369700f959f62ecde5a6babde4bccd9169af8"
-  integrity sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==
+dom-helpers@^5.0.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.1.tgz#d9400536b2bf8225ad98fe052e029451ac40e902"
+  integrity sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==
   dependencies:
-    "@babel/runtime" "^7.1.2"
+    "@babel/runtime" "^7.8.7"
+    csstype "^3.0.2"
 
 dom-matches@>=1.0.1:
   version "2.0.0"
@@ -4436,11 +4510,11 @@ ee-first@1.1.1:
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
 ejs@^3.1.6:
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz#5bfd0a0689743bb5268b3550cceeebbc1702822a"
-  integrity sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw==
+  version "3.1.7"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.7.tgz#c544d9c7f715783dd92f0bddcf73a59e6962d006"
+  integrity sha512-BIar7R6abbUxDA3bfXrO4DSgwo8I+fB5/1zgujl3HLLjwd6+9iOnrT+t3grn2qbk9vOgBubXOFwX2m9axoFaGw==
   dependencies:
-    jake "^10.6.1"
+    jake "^10.8.5"
 
 electron-builder@22.14.5:
   version "22.14.5"
@@ -4490,10 +4564,10 @@ electron-to-chromium@^1.4.17:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.46.tgz#c88a6fedc766589826db0481602a888864ade1ca"
   integrity sha512-UtV0xUA/dibCKKP2JMxOpDtXR74zABevuUEH4K0tvduFSIoxRVcYmQsbB51kXsFTX8MmOyWMt8tuZAlmDOqkrQ==
 
-electron@16.0.4:
-  version "16.0.4"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-16.0.4.tgz#87dfe21d17608537fc6df292c437362297566a73"
-  integrity sha512-IptwmowvMP1SFOmZLh6rrURwfnOxbDBXBRBcaOdfBM5I+B9mgtdNwzNC3ymFFNzEkZUwdOyg9fu3iyjAAQIQgw==
+electron@16.2.6:
+  version "16.2.6"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-16.2.6.tgz#2d22077edb5361ab52034bb3b19405380921931b"
+  integrity sha512-FJLnIu318WNh1WigMmWqSidOPwipwym2Qi3Hs/YY6znquztf6ZJuaq/TdJJyHIJHld+znG0hSmq3VbyW5KUr9A==
   dependencies:
     "@electron/get" "^1.13.0"
     "@types/node" "^14.6.2"
@@ -4617,6 +4691,35 @@ es-abstract@^1.19.0, es-abstract@^1.19.1:
     string.prototype.trimstart "^1.0.4"
     unbox-primitive "^1.0.1"
 
+es-abstract@^1.19.5, es-abstract@^1.20.0:
+  version "1.20.1"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.1.tgz#027292cd6ef44bd12b1913b828116f54787d1814"
+  integrity sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA==
+  dependencies:
+    call-bind "^1.0.2"
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    function.prototype.name "^1.1.5"
+    get-intrinsic "^1.1.1"
+    get-symbol-description "^1.0.0"
+    has "^1.0.3"
+    has-property-descriptors "^1.0.0"
+    has-symbols "^1.0.3"
+    internal-slot "^1.0.3"
+    is-callable "^1.2.4"
+    is-negative-zero "^2.0.2"
+    is-regex "^1.1.4"
+    is-shared-array-buffer "^1.0.2"
+    is-string "^1.0.7"
+    is-weakref "^1.0.2"
+    object-inspect "^1.12.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.2"
+    regexp.prototype.flags "^1.4.3"
+    string.prototype.trimend "^1.0.5"
+    string.prototype.trimstart "^1.0.5"
+    unbox-primitive "^1.0.2"
+
 es-module-lexer@^0.9.0:
   version "0.9.3"
   resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19"
@@ -4654,6 +4757,11 @@ es6-iterator@~2.0.3:
     es5-ext "^0.10.35"
     es6-symbol "^3.1.1"
 
+es6-object-assign@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/es6-object-assign/-/es6-object-assign-1.1.0.tgz#c2c3582656247c39ea107cb1e6652b6f9f24523c"
+  integrity sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==
+
 es6-promise@^3.0.2:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.3.1.tgz#a08cdde84ccdbf34d027a1451bc91d4bcd28a613"
@@ -4926,11 +5034,16 @@ etag@~1.8.1:
 event-emitter@0.3.5:
   version "0.3.5"
   resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
-  integrity sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=
+  integrity sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==
   dependencies:
     d "1"
     es5-ext "~0.10.14"
 
+event-target-shim@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
+  integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==
+
 eventemitter3@^4.0.0:
   version "4.0.7"
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
@@ -5243,23 +5356,19 @@ fb-watchman@^2.0.0:
   dependencies:
     bser "2.1.1"
 
-fbemitter@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/fbemitter/-/fbemitter-2.1.1.tgz#523e14fdaf5248805bb02f62efc33be703f51865"
-  integrity sha1-Uj4U/a9SSIBbsC9i78M75wP1GGU=
+fbemitter@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/fbemitter/-/fbemitter-3.0.0.tgz#00b2a1af5411254aab416cd75f9e6289bee4bff3"
+  integrity sha512-KWKaceCwKQU0+HPoop6gn4eOHk50bBv/VxjJtGMfwmJt3D29JpN4H4eisCtIPA+a8GVBam+ldMMpMjJUvpDyHw==
   dependencies:
-    fbjs "^0.8.4"
+    fbjs "^3.0.0"
 
-fbjs@0.1.0-alpha.7:
-  version "0.1.0-alpha.7"
-  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.1.0-alpha.7.tgz#ad4308b8f232fb3c73603349ea725d1e9c39323c"
-  integrity sha1-rUMIuPIy+zxzYDNJ6nJdHpw5Mjw=
-  dependencies:
-    core-js "^1.0.0"
-    promise "^7.0.3"
-    whatwg-fetch "^0.9.0"
+fbjs-css-vars@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/fbjs-css-vars/-/fbjs-css-vars-1.0.2.tgz#216551136ae02fe255932c3ec8775f18e2c078b8"
+  integrity sha512-b2XGFAFdWZWg0phtAWLHCk836A1Xann+I+Dgd3Gk64MHKZO44FfoD1KxyvbSh0qZsIoXQGGlVztIY+oitJPpRQ==
 
-fbjs@^0.8.15, fbjs@^0.8.4:
+fbjs@^0.8.15:
   version "0.8.18"
   resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.18.tgz#9835e0addb9aca2eff53295cd79ca1cfc7c9662a"
   integrity sha512-EQaWFK+fEPSoibjNy8IxUtaFOMXcWsY0JaVrQoZR9zC8N2Ygf9iDITPWjUTVIax95b6I742JFLqASHfsag/vKA==
@@ -5272,6 +5381,19 @@ fbjs@^0.8.15, fbjs@^0.8.4:
     setimmediate "^1.0.5"
     ua-parser-js "^0.7.30"
 
+fbjs@^3.0.0, fbjs@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-3.0.2.tgz#dfae08a85c66a58372993ce2caf30863f569ff94"
+  integrity sha512-qv+boqYndjElAJHNN3NoM8XuwQZ1j2m3kEvTgdle8IDjr6oUbkEpvABWtj/rQl3vq4ew7dnElBxL4YJAwTVqQQ==
+  dependencies:
+    cross-fetch "^3.0.4"
+    fbjs-css-vars "^1.0.0"
+    loose-envify "^1.0.0"
+    object-assign "^4.1.0"
+    promise "^7.1.1"
+    setimmediate "^1.0.5"
+    ua-parser-js "^0.7.30"
+
 fd-slicer@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
@@ -5324,11 +5446,11 @@ file-uri-to-path@1.0.0:
   integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
 
 filelist@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.2.tgz#80202f21462d4d1c2e214119b1807c1bc0380e5b"
-  integrity sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ==
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.3.tgz#448607750376484932f67ef1b9ff07386b036c83"
+  integrity sha512-LwjCsruLWQULGYKy7TX0OPtrL9kLpojOFKc5VCTxdFTV7w5zbsgqVKfnkKG7Qgjtq50gKfO56hJv88OfcGb70Q==
   dependencies:
-    minimatch "^3.0.4"
+    minimatch "^5.0.1"
 
 fill-range@^4.0.0:
   version "4.0.0"
@@ -5437,19 +5559,18 @@ flow-parser@0.*:
   resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.169.0.tgz#4f77d61dd4241f8063f734ef1f71c684ec03ab52"
   integrity sha512-X1DFb6wxXpZLLqM9NX0Wm+4xoN6xAyJn8OwuiHsV0JJvLfD18Z+wbgJ1lM7ykTVINdu8v7Mu0gIzWMvnhKWBkA==
 
-flux@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/flux/-/flux-2.1.1.tgz#2c6ac652d4337488968489c6586f3aff26a38ea4"
-  integrity sha1-LGrGUtQzdIiWhInGWG86/yajjqQ=
+flux@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/flux/-/flux-4.0.3.tgz#573b504a24982c4768fdfb59d8d2ea5637d72ee7"
+  integrity sha512-yKAbrp7JhZhj6uiT1FTuVMlIAT1J4jqEyBpFApi1kxpGZCvacMVc/t1pMQyotqHhAgvoE3bNvAykhCo2CLjnYw==
   dependencies:
-    fbemitter "^2.0.0"
-    fbjs "0.1.0-alpha.7"
-    immutable "^3.7.4"
+    fbemitter "^3.0.0"
+    fbjs "^3.0.1"
 
 follow-redirects@^1.0.0:
-  version "1.14.7"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685"
-  integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==
+  version "1.14.8"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc"
+  integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==
 
 for-each@^0.3.3:
   version "0.3.3"
@@ -5580,11 +5701,26 @@ function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
+function.prototype.name@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621"
+  integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.19.0"
+    functions-have-names "^1.2.2"
+
 functional-red-black-tree@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
   integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
 
+functions-have-names@^1.2.2:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
+  integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
+
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
@@ -5801,17 +5937,19 @@ globby@^12.0.2:
     merge2 "^1.4.1"
     slash "^4.0.0"
 
-golos-classic-js@^0.7.83:
-  version "0.7.99"
-  resolved "https://registry.yarnpkg.com/golos-classic-js/-/golos-classic-js-0.7.99.tgz#9f18905606479cbaa30950592330f17811867c8c"
-  integrity sha512-hxx/KOQdIkQOO1V6i+Cjilh1ayFOFADr8Z5vyqVgQDQin0qmPF7qPk6PSY3ZhoV6HnhojImURmIjTJuQ0o1tNg==
+golos-lib-js@^0.9.33:
+  version "0.9.33"
+  resolved "https://registry.yarnpkg.com/golos-lib-js/-/golos-lib-js-0.9.33.tgz#5f46721609b3655350bf8126bcaaaa39cd3e84cc"
+  integrity sha512-QJWjk5h+o+HTavXPpwRuBJiKth6JV8OP5Qi0zOTrrjDrhfUdYlzJZeF96fkADeeVdKKF4D9ScVYZZMkHiuKOKA==
   dependencies:
+    abort-controller "^3.0.0"
+    assert "^2.0.0"
     bigi "^1.4.2"
-    bluebird "^3.4.6"
     browserify-aes "^1.0.6"
     bs58 "^4.0.0"
-    buffer "^5.0.6"
+    buffer "^6.0.3"
     bytebuffer "^5.0.1"
+    core-js "^3.17.3"
     create-hash "^1.1.2"
     create-hmac "^1.1.4"
     cross-env "^5.0.0"
@@ -5819,9 +5957,12 @@ golos-classic-js@^0.7.83:
     debug "^2.6.8"
     detect-node "^2.0.3"
     ecurve "^1.0.5"
-    lodash "^4.16.4"
+    lodash "^4.17.21"
+    process "^0.11.10"
+    regenerator-runtime "^0.13.9"
     secure-random "^1.1.1"
-    ws "^1.1.1"
+    stream-browserify "^3.0.0"
+    ws "^8.2.3"
 
 good-listener@^1.2.2:
   version "1.2.2"
@@ -5927,6 +6068,11 @@ has-bigints@^1.0.1:
   resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
   integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==
 
+has-bigints@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"
+  integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==
+
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
@@ -5937,11 +6083,23 @@ has-flag@^4.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
+has-property-descriptors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861"
+  integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==
+  dependencies:
+    get-intrinsic "^1.1.1"
+
 has-symbols@^1.0.1, has-symbols@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
   integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
 
+has-symbols@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
+  integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
+
 has-tostringtag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25"
@@ -6236,6 +6394,11 @@ human-signals@^2.1.0:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
   integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
 
+humanize-duration@^3.27.1:
+  version "3.27.1"
+  resolved "https://registry.npmjs.org/humanize-duration/-/humanize-duration-3.27.1.tgz#2cd4ea4b03bd92184aee6d90d77a8f3d7628df69"
+  integrity sha512-jCVkMl+EaM80rrMrAPl96SGG4NRac53UyI1o/yAzebDntEY6K6/Fj2HOjdPg8omTqIe5Y0wPBai2q5xXrIbarA==
+
 husky@^0.14.3:
   version "0.14.3"
   resolved "https://registry.yarnpkg.com/husky/-/husky-0.14.3.tgz#c69ed74e2d2779769a17ba8399b54ce0b63c12c3"
@@ -6272,7 +6435,7 @@ icss-utils@^5.0.0, icss-utils@^5.1.0:
   resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae"
   integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==
 
-ieee754@^1.1.13, ieee754@^1.1.4:
+ieee754@^1.1.13, ieee754@^1.1.4, ieee754@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
@@ -6656,6 +6819,13 @@ is-generator-fn@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
   integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
 
+is-generator-function@^1.0.7:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72"
+  integrity sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==
+  dependencies:
+    has-tostringtag "^1.0.0"
+
 is-git-clean@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-git-clean/-/is-git-clean-1.1.0.tgz#13abd6dda711bb08aafd42604da487845ddcf88d"
@@ -6690,7 +6860,15 @@ is-mobile@^2.1.0:
   resolved "https://registry.yarnpkg.com/is-mobile/-/is-mobile-2.2.2.tgz#f6c9c5d50ee01254ce05e739bdd835f1ed4e9954"
   integrity sha512-wW/SXnYJkTjs++tVK5b6kVITZpAZPtUrt9SF80vvxGiF/Oywal+COk1jlRkiVq15RFNEQKQY31TkV24/1T5cVg==
 
-is-negative-zero@^2.0.1:
+is-nan@^1.2.1:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/is-nan/-/is-nan-1.3.2.tgz#043a54adea31748b55b6cd4e09aadafa69bd9e1d"
+  integrity sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==
+  dependencies:
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+
+is-negative-zero@^2.0.1, is-negative-zero@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
   integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
@@ -6756,10 +6934,10 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
-is-promise@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
-  integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=
+is-promise@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-4.0.0.tgz#42ff9f84206c1991d26debf520dd5c01042dd2f3"
+  integrity sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==
 
 is-regex@^1.0.4, is-regex@^1.1.4:
   version "1.1.4"
@@ -6774,6 +6952,13 @@ is-shared-array-buffer@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6"
   integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==
 
+is-shared-array-buffer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
+  integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==
+  dependencies:
+    call-bind "^1.0.2"
+
 is-stream@^1.0.1, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
@@ -6798,12 +6983,23 @@ is-symbol@^1.0.2, is-symbol@^1.0.3:
   dependencies:
     has-symbols "^1.0.2"
 
+is-typed-array@^1.1.3, is-typed-array@^1.1.9:
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.9.tgz#246d77d2871e7d9f5aeb1d54b9f52c71329ece67"
+  integrity sha512-kfrlnTTn8pZkfpJMUgYD7YZ3qzeJgWUn8XfVYBARc4wnmNOmLbmuuaAs3q5fvB0UJOn6yHAKaGTPM7d6ezoD/A==
+  dependencies:
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.2"
+    es-abstract "^1.20.0"
+    for-each "^0.3.3"
+    has-tostringtag "^1.0.0"
+
 is-typedarray@^1.0.0, is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
-is-weakref@^1.0.1:
+is-weakref@^1.0.1, is-weakref@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
   integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==
@@ -6934,13 +7130,13 @@ istanbul-reports@^2.2.6:
   dependencies:
     html-escaper "^2.0.0"
 
-jake@^10.6.1:
-  version "10.8.2"
-  resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz#ebc9de8558160a66d82d0eadc6a2e58fbc500a7b"
-  integrity sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A==
+jake@^10.8.5:
+  version "10.8.5"
+  resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz#f2183d2c59382cb274226034543b9c03b8164c46"
+  integrity sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==
   dependencies:
-    async "0.9.x"
-    chalk "^2.4.2"
+    async "^3.2.3"
+    chalk "^4.0.2"
     filelist "^1.0.1"
     minimatch "^3.0.4"
 
@@ -8096,13 +8292,27 @@ minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
+minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
+minimatch@^3.0.4:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
+  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
+  dependencies:
+    brace-expansion "^1.1.7"
+
+minimatch@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.0.1.tgz#fb9022f7528125187c92bd9e9b6366be1cf3415b"
+  integrity sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==
+  dependencies:
+    brace-expansion "^2.0.1"
+
 minimist-options@^3.0.1:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-3.0.2.tgz#fba4c8191339e13ecf4d61beb03f070103f3d954"
@@ -8129,11 +8339,6 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mixme@^0.5.1:
-  version "0.5.4"
-  resolved "https://registry.yarnpkg.com/mixme/-/mixme-0.5.4.tgz#8cb3bd0cd32a513c161bf1ca99d143f0bcf2eff3"
-  integrity sha512-3KYa4m4Vlqx98GPdOHghxSdNtTvcP8E0kkaJ5Dlh+h2DRzF7zpuVVcA8B0QpKd11YJeP9QQ7ASkKzOeu195Wzw==
-
 mkdirp@0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
@@ -8172,10 +8377,10 @@ moment-timezone@^0.5.16:
   dependencies:
     moment ">= 2.9.0"
 
-moment@2.x, "moment@>= 2.9.0", moment@^2.22.0, moment@^2.22.2, moment@^2.24.0:
-  version "2.29.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
-  integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
+moment@2.x, "moment@>= 2.9.0", moment@^2.24.0, moment@^2.29.1, moment@^2.29.2:
+  version "2.29.2"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.2.tgz#00910c60b20843bcba52d37d58c628b47b1f20e4"
+  integrity sha512-UgzG4rvxYpN15jgCmVJwac49h9ly9NurikMWGPdVxm8GZD6XjkKPxDTjQQ43gtGgnV3X0cAyWDdP2Wexoquifg==
 
 mri@^1.1.0:
   version "1.2.0"
@@ -8325,7 +8530,14 @@ node-fetch@2.6.1:
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
   integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
 
-node-fetch@^2.2.0:
+node-fetch@2.6.6:
+  version "2.6.6"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.6.tgz#1751a7c01834e8e1697758732e9efb6eeadfaf89"
+  integrity sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==
+  dependencies:
+    whatwg-url "^5.0.0"
+
+node-fetch@2.6.7:
   version "2.6.7"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
   integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
@@ -8333,9 +8545,9 @@ node-fetch@^2.2.0:
     whatwg-url "^5.0.0"
 
 node-forge@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.2.1.tgz#82794919071ef2eb5c509293325cec8afd0fd53c"
-  integrity sha512-Fcvtbb+zBcZXbTTVwqGA5W+MKBj56UjVRevvchv5XrcyXbmNdesfZL37nlcWOfpgHhgmxApw3tQbTr4CqNmX4w==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.0.tgz#37a874ea723855f37db091e6c186e5b67a01d4b2"
+  integrity sha512-08ARB91bUi6zNKzVmaj3QO7cr397uiDT2nJ63cHjyNtCTWIgvS47j3eT0WfzUwS9+6Z5YshRaoasFkXCKrIYbA==
 
 node-int64@^0.4.0:
   version "0.4.0"
@@ -8537,6 +8749,11 @@ object-inspect@^1.11.0, object-inspect@^1.9.0:
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0"
   integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==
 
+object-inspect@^1.12.0:
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea"
+  integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==
+
 object-is@^1.0.1:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac"
@@ -8557,7 +8774,7 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
-object.assign@^4.0.1, object.assign@^4.1.0, object.assign@^4.1.2:
+object.assign@^4.1.0, object.assign@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
   integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
@@ -8700,11 +8917,6 @@ optionator@^0.9.1:
     type-check "^0.4.0"
     word-wrap "^1.2.3"
 
-options@>=0.0.5:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f"
-  integrity sha1-7CLTEoBrtT5zF3Pnza788cZDEo8=
-
 os-browserify@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.2.1.tgz#63fc4ccee5d2d7763d26bbf8601078e6c2e0044f"
@@ -9033,9 +9245,9 @@ platform@^1.3.3:
   integrity sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg==
 
 plist@^3.0.1, plist@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.4.tgz#a62df837e3aed2bb3b735899d510c4f186019cbe"
-  integrity sha512-ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg==
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.5.tgz#2cbeb52d10e3cdccccf0c11a63a85d830970a987"
+  integrity sha512-83vX4eYdQp3vP9SxuYgEM/G/pJQqLUz/V/xzPrzruLs7fz7jxGQ1msZ/mg1nwZxUSuOp4sb+/bEIbRrbzZRxDA==
   dependencies:
     base64-js "^1.5.1"
     xmlbuilder "^9.0.7"
@@ -9201,7 +9413,7 @@ progress@^2.0.0, progress@^2.0.3:
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
-promise@^7.0.3, promise@^7.1.1:
+promise@^7.1.1:
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
   integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
@@ -9216,7 +9428,7 @@ prompts@^2.0.1:
     kleur "^3.0.3"
     sisteransi "^1.0.5"
 
-prop-types@15.x, prop-types@^15.5.0, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.5.9, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
+prop-types@15.x, prop-types@^15.5.0, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.5.9, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.0:
   version "15.8.1"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
   integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
@@ -9889,7 +10101,7 @@ react-debounce-render@^7.0.0:
     hoist-non-react-statics "^3.3.2"
     lodash.debounce "^4.0.8"
 
-react-dom@16.14.0, react-dom@^16.11.0:
+react-dom@16.14.0:
   version "16.14.0"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz#7ad838ec29a777fb3c75c3a190f661cf92ab8b89"
   integrity sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==
@@ -10111,16 +10323,15 @@ react-tooltip@^4.2.21:
     prop-types "^15.7.2"
     uuid "^7.0.3"
 
-react-transition-group@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-1.2.1.tgz#e11f72b257f921b213229a774df46612346c7ca6"
-  integrity sha512-CWaL3laCmgAFdxdKbhhps+c0HRGF4c+hdM4H23+FI1QBNUyx/AMeIJGWorehPNSaKnQNOAxL7PQmqMu78CDj3Q==
+react-transition-group@^4.4.2:
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz#8b59a56f09ced7b55cbd53c36768b922890d5470"
+  integrity sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg==
   dependencies:
-    chain-function "^1.0.0"
-    dom-helpers "^3.2.0"
-    loose-envify "^1.3.1"
-    prop-types "^15.5.6"
-    warning "^3.0.0"
+    "@babel/runtime" "^7.5.5"
+    dom-helpers "^5.0.1"
+    loose-envify "^1.4.0"
+    prop-types "^15.6.2"
 
 react-translate-component@^0.15.1:
   version "0.15.1"
@@ -10131,7 +10342,7 @@ react-translate-component@^0.15.1:
     object-assign "^4.0.1"
     prop-types "^15.5.8"
 
-react@16.14.0, react@^16.11.0:
+react@16.14.0:
   version "16.14.0"
   resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d"
   integrity sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==
@@ -10276,7 +10487,7 @@ regenerator-runtime@^0.11.0:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
   integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
 
-regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.7:
+regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.7, regenerator-runtime@^0.13.9:
   version "0.13.9"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
   integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
@@ -10304,6 +10515,15 @@ regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.3.1:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
 
+regexp.prototype.flags@^1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac"
+  integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    functions-have-names "^1.2.2"
+
 regexpp@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
@@ -11273,12 +11493,10 @@ stream-http@^2.3.1:
     to-arraybuffer "^1.0.0"
     xtend "^4.0.0"
 
-stream-transform@^2.1.3:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/stream-transform/-/stream-transform-2.1.3.tgz#a1c3ecd72ddbf500aa8d342b0b9df38f5aa598e3"
-  integrity sha512-9GHUiM5hMiCi6Y03jD2ARC1ettBXkQBoQAe7nJsPknnI0ow10aXjTnew8QtYQmLjzn974BnmWEAJgCY6ZP1DeQ==
-  dependencies:
-    mixme "^0.5.1"
+stream-transform@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/stream-transform/-/stream-transform-3.0.4.tgz#aae97911ea3adf2cd25976655ec3201fb714fda8"
+  integrity sha512-g2jbk1hs3GiF3oHZLbR7Fph/PXh/3xHoz/D8aR2oHySE4xVUvNeTGqihhb1vxFjYyu4inqiTfT42g2MHBjjx0g==
 
 strict-uri-encode@^2.0.0:
   version "2.0.0"
@@ -11343,6 +11561,15 @@ string.prototype.trimend@^1.0.4:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
 
+string.prototype.trimend@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz#914a65baaab25fbdd4ee291ca7dde57e869cb8d0"
+  integrity sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.19.5"
+
 string.prototype.trimstart@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"
@@ -11351,6 +11578,15 @@ string.prototype.trimstart@^1.0.4:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
 
+string.prototype.trimstart@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz#5466d93ba58cfa2134839f81d7f42437e8c01fef"
+  integrity sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.19.5"
+
 string_decoder@^0.10.25, string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
@@ -11792,7 +12028,7 @@ tr46@~0.0.3:
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
   integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
 
-transmitter@3.0.1:
+transmitter@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/transmitter/-/transmitter-3.0.1.tgz#32e99e43d1321e49dc2e194fa75df4fe84a8b918"
   integrity sha1-MumeQ9EyHkncLhlPp130/oSouRg=
@@ -11915,11 +12151,6 @@ uglify-js@^3.1.4:
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.14.5.tgz#cdabb7d4954231d80cb4a927654c4655e51f4859"
   integrity sha512-qZukoSxOG0urUTvjc2ERMTcAy+BiFh3weWAkeurLwjrCba73poHmG3E36XEjd/JGukMzwTL7uCxZiAexj8ppvQ==
 
-ultron@1.0.x:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz#ace116ab557cd197386a4e88f4685378c8b2e4fa"
-  integrity sha1-rOEWq1V80Zc4ak6I9GhTeMiy5Po=
-
 ultron@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
@@ -11935,6 +12166,16 @@ unbox-primitive@^1.0.1:
     has-symbols "^1.0.2"
     which-boxed-primitive "^1.0.2"
 
+unbox-primitive@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"
+  integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==
+  dependencies:
+    call-bind "^1.0.2"
+    has-bigints "^1.0.2"
+    has-symbols "^1.0.3"
+    which-boxed-primitive "^1.0.2"
+
 unicode-canonical-property-names-ecmascript@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
@@ -12094,6 +12335,18 @@ util@^0.10.3:
   dependencies:
     inherits "2.0.3"
 
+util@^0.12.0:
+  version "0.12.4"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.12.4.tgz#66121a31420df8f01ca0c464be15dfa1d1850253"
+  integrity sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw==
+  dependencies:
+    inherits "^2.0.3"
+    is-arguments "^1.0.4"
+    is-generator-function "^1.0.7"
+    is-typed-array "^1.1.3"
+    safe-buffer "^5.1.2"
+    which-typed-array "^1.1.2"
+
 utila@~0.4:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c"
@@ -12226,13 +12479,6 @@ warning@4.x, warning@^4.0.1, warning@^4.0.2, warning@^4.0.3, warning@~4.0.3:
   dependencies:
     loose-envify "^1.0.0"
 
-warning@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c"
-  integrity sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=
-  dependencies:
-    loose-envify "^1.0.0"
-
 watchpack@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.3.1.tgz#4200d9447b401156eeca7767ee610f8809bc9d25"
@@ -12414,11 +12660,6 @@ whatwg-fetch@>=0.10.0:
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz#dced24f37f2624ed0281725d51d0e2e3fe677f8c"
   integrity sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA==
 
-whatwg-fetch@^0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-0.9.0.tgz#0e3684c6cb9995b43efc9df03e4c365d95fd9cc0"
-  integrity sha1-DjaExsuZlbQ+/J3wPkw2XZX9nMA=
-
 whatwg-fetch@^2.0.1:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f"
@@ -12471,6 +12712,18 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
+which-typed-array@^1.1.2:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.8.tgz#0cfd53401a6f334d90ed1125754a42ed663eb01f"
+  integrity sha512-Jn4e5PItbcAHyLoRDwvPj1ypu27DJbtdYXUa5zsinrUx77Uvfb0cXwwnGMTn7cjUfhhqgVQnVJCwF+7cgU7tpw==
+  dependencies:
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.2"
+    es-abstract "^1.20.0"
+    for-each "^0.3.3"
+    has-tostringtag "^1.0.0"
+    is-typed-array "^1.1.9"
+
 which@^1.2.8, which@^1.2.9, which@^1.3.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
@@ -12582,14 +12835,6 @@ write@1.0.3:
   dependencies:
     mkdirp "^0.5.1"
 
-ws@^1.1.1:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.5.tgz#cbd9e6e75e09fc5d2c90015f21f0c40875e0dd51"
-  integrity sha512-o3KqipXNUdS7wpQzBHSe180lBGO60SoK0yVo3CYJgb2MkobuWuBX6dhkYP5ORCLd55y+SaflMOV5fqAB53ux4w==
-  dependencies:
-    options ">=0.0.5"
-    ultron "1.0.x"
-
 ws@^3.3.2:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"
@@ -12619,6 +12864,11 @@ ws@^8.1.0:
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.4.2.tgz#18e749868d8439f2268368829042894b6907aa0b"
   integrity sha512-Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA==
 
+ws@^8.2.3:
+  version "8.7.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.7.0.tgz#eaf9d874b433aa00c0e0d8752532444875db3957"
+  integrity sha512-c2gsP0PRwcLFzUiA8Mkr37/MI7ilIlHQxaEAtd0uNMbVMoy8puJyafRlm0bV9MbGSabUPeLrRRaqIBcFcA2Pqg==
+
 xdg-basedir@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13"