diff --git a/js/src/Application/application.js b/js/src/Application/application.js
index b80f5bf67..c93e62b66 100644
--- a/js/src/Application/application.js
+++ b/js/src/Application/application.js
@@ -21,7 +21,7 @@ import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 
 import UpgradeStore from '@parity/shared/mobx/upgradeParity';
-import { Errors } from '@parity/ui';
+import Errors from '@parity/ui/Errors';
 
 import Connection from '../Connection';
 import DappRequests from '../DappRequests';
diff --git a/js/src/Connection/connection.js b/js/src/Connection/connection.js
index ebb80be9d..05aa2dce7 100644
--- a/js/src/Connection/connection.js
+++ b/js/src/Connection/connection.js
@@ -19,7 +19,7 @@ import { FormattedMessage } from 'react-intl';
 import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 
-import { Input } from '@parity/ui';
+import Input from '@parity/ui/Form/Input';
 import { CompareIcon, ComputerIcon, DashboardIcon, VpnIcon } from '@parity/ui/Icons';
 
 import styles from './connection.css';
diff --git a/js/src/DappRequests/Request/request.js b/js/src/DappRequests/Request/request.js
index 1ce8e43af..d491412dc 100644
--- a/js/src/DappRequests/Request/request.js
+++ b/js/src/DappRequests/Request/request.js
@@ -18,7 +18,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { FormattedMessage } from 'react-intl';
 
-import { Button } from '@parity/ui';
+import Button from '@parity/ui/Button';
 
 import DappsStore from '@parity/shared/mobx/dappsStore';
 
diff --git a/js/src/Dapps/dapps.js b/js/src/Dapps/dapps.js
index 302a5787c..7850fba81 100644
--- a/js/src/Dapps/dapps.js
+++ b/js/src/Dapps/dapps.js
@@ -21,7 +21,10 @@ import { FormattedMessage } from 'react-intl';
 import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 
-import { Checkbox, DappCard, Page, SectionList } from '@parity/ui';
+import DappCard from '@parity/ui/DappCard';
+import Checkbox from '@parity/ui/Form/Checkbox';
+import Page from '@parity/ui/Page';
+import SectionList from '@parity/ui/SectionList';
 
 import DappsStore from '@parity/shared/mobx/dappsStore';
 
diff --git a/js/src/Extension/extension.js b/js/src/Extension/extension.js
index 5fd5e0784..c1c3c452a 100644
--- a/js/src/Extension/extension.js
+++ b/js/src/Extension/extension.js
@@ -18,7 +18,7 @@ import { observer } from 'mobx-react';
 import React, { Component } from 'react';
 import { FormattedMessage } from 'react-intl';
 
-import { Button } from '@parity/ui';
+import Button from '@parity/ui/Button';
 import { CloseIcon, CheckIcon } from '@parity/ui/Icons';
 
 import Store from '@parity/shared/mobx/extensionStore';
diff --git a/js/src/FirstRun/TnC/tnc.js b/js/src/FirstRun/TnC/tnc.js
index 719ff471c..5a22cb0b5 100644
--- a/js/src/FirstRun/TnC/tnc.js
+++ b/js/src/FirstRun/TnC/tnc.js
@@ -19,7 +19,7 @@ import PropTypes from 'prop-types';
 import { FormattedMessage } from 'react-intl';
 import ReactMarkdown from 'react-markdown';
 
-import { Checkbox } from '@parity/ui';
+import Checkbox from '@parity/ui/Form/Checkbox';
 
 import styles from '../firstRun.css';
 
diff --git a/js/src/FirstRun/firstRun.js b/js/src/FirstRun/firstRun.js
index 8ceddc067..ae6ac0f59 100644
--- a/js/src/FirstRun/firstRun.js
+++ b/js/src/FirstRun/firstRun.js
@@ -23,7 +23,8 @@ import { bindActionCreators } from 'redux';
 
 import { createIdentityImg } from '@parity/api/util/identity';
 import { newError } from '@parity/shared/redux/actions';
-import { Button, Portal } from '@parity/ui';
+import Button from '@parity/ui/Button';
+import Portal from '@parity/ui/Portal';
 import { CheckIcon, DoneIcon, NextIcon, PrintIcon, ReplayIcon } from '@parity/ui/Icons';
 
 import ParityLogo from '@parity/shared/assets/images/parity-logo-black-no-text.svg';
diff --git a/js/src/ParityBar/parityBar.js b/js/src/ParityBar/parityBar.js
index 1886d3e7a..65b2eec83 100644
--- a/js/src/ParityBar/parityBar.js
+++ b/js/src/ParityBar/parityBar.js
@@ -24,7 +24,13 @@ import { Link } from 'react-router';
 import { connect } from 'react-redux';
 import store from 'store';
 
-import { AccountCard, Badge, Button, ContainerTitle, IdentityIcon, SelectionList, StatusIndicator } from '@parity/ui';
+import AccountCard from '@parity/ui/AccountCard';
+import Badge from '@parity/ui/Badge';
+import Button from '@parity/ui/Button';
+import ContainerTitle from '@parity/ui/Container/Title';
+import IdentityIcon from '@parity/ui/IdentityIcon';
+import SelectionList from '@parity/ui/SectionList';
+import StatusIndicator from '@parity/ui/StatusIndicator';
 import { CancelIcon, FingerprintIcon } from '@parity/ui/Icons';
 
 import imagesEthcoreBlock from '@parity/shared/assets/images/parity-logo-white-no-text.svg';
diff --git a/js/src/Requests/requests.js b/js/src/Requests/requests.js
index d35cd815b..5531b561a 100644
--- a/js/src/Requests/requests.js
+++ b/js/src/Requests/requests.js
@@ -22,7 +22,11 @@ import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 
 import { hideRequest } from '@parity/shared/redux/providers/requestsActions';
-import { MethodDecoding, IdentityIcon, Progress, ScrollableText, ShortenedHash } from '@parity/ui';
+import MethodDecoding from '@parity/ui/MethodDecoding';
+import IdentityIcon from '@parity/ui/IdentityIcon';
+import Progress from '@parity/ui/Progress';
+import ScrollableText from '@parity/ui/ScrollableText';
+import ShortenedHash from '@parity/ui/ShortenedHash';
 
 import styles from './requests.css';
 
diff --git a/js/src/Signer/Embedded/embedded.js b/js/src/Signer/Embedded/embedded.js
index 4a36b78bc..23b75b8c0 100644
--- a/js/src/Signer/Embedded/embedded.js
+++ b/js/src/Signer/Embedded/embedded.js
@@ -22,7 +22,7 @@ import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 
 import * as RequestsActions from '@parity/shared/redux/providers/signerActions';
-import { Container } from '@parity/ui';
+import Container from '@parity/ui/Container';
 import RequestPending from '@parity/ui/Signer/RequestPending';
 
 import Store from '@parity/shared/mobx/signerStore';
diff --git a/js/src/Snackbar/snackbar.js b/js/src/Snackbar/snackbar.js
index 24e2d40a7..f1b45f009 100644
--- a/js/src/Snackbar/snackbar.js
+++ b/js/src/Snackbar/snackbar.js
@@ -20,7 +20,7 @@ import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 
 import { closeSnackbar } from '@parity/shared/redux/providers/snackbarActions';
-import { Snackbar as SnackbarUI } from '@parity/ui';
+import SnackbarUI from '@parity/ui/Snackbar';
 
 function Snackbar ({ closeSnackbar, cooldown = 3500, message, open = false }) {
   return (
diff --git a/js/src/Status/status.js b/js/src/Status/status.js
index e90ac0a5e..619b4306b 100644
--- a/js/src/Status/status.js
+++ b/js/src/Status/status.js
@@ -19,7 +19,11 @@ import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import { FormattedMessage } from 'react-intl';
 
-import { BlockNumber, ClientVersion, NetChain, NetPeers, StatusIndicator } from '@parity/ui';
+import BlockNumber from '@parity/ui/BlockNumber';
+import ClientVersion from '@parity/ui/ClientVersion';
+import NetChain from '@parity/ui/NetChain';
+import NetPeers from '@parity/ui/NetPeers';
+import StatusIndicator from '@parity/ui/StatusIndicator';
 
 import Consensus from './Consensus';
 import Upgrade from './Upgrade';
diff --git a/js/src/SyncWarning/syncWarning.js b/js/src/SyncWarning/syncWarning.js
index 838ffa7c3..483c2f020 100644
--- a/js/src/SyncWarning/syncWarning.js
+++ b/js/src/SyncWarning/syncWarning.js
@@ -20,7 +20,9 @@ import { FormattedMessage } from 'react-intl';
 import { connect } from 'react-redux';
 import store from 'store';
 
-import { Button, Checkbox, StatusIndicator } from '@parity/ui';
+import Button from '@parity/ui/Button';
+import Checkbox from '@parity/ui/Form/Checkbox';
+import StatusIndicator from '@parity/ui/StatusIndicator';
 
 import styles from './syncWarning.css';
 
diff --git a/js/src/UpgradeParity/upgradeParity.js b/js/src/UpgradeParity/upgradeParity.js
index afc2fe5b8..87127d81f 100644
--- a/js/src/UpgradeParity/upgradeParity.js
+++ b/js/src/UpgradeParity/upgradeParity.js
@@ -20,7 +20,8 @@ import PropTypes from 'prop-types';
 import { FormattedMessage } from 'react-intl';
 
 import { STEP_COMPLETED, STEP_ERROR, STEP_INFO, STEP_UPDATING } from '@parity/shared/mobx/upgradeParity';
-import { Button, Portal } from '@parity/ui';
+import Button from '@parity/ui/Button';
+import Portal from '@parity/ui/Portal';
 import { CancelIcon, DoneIcon, ErrorIcon, NextIcon, UpdateIcon, UpdateWaitIcon } from '@parity/ui/Icons';
 
 import styles from './upgradeParity.css';
diff --git a/js/src/index.js b/js/src/index.js
index 1543c57ec..e07b7c1cc 100644
--- a/js/src/index.js
+++ b/js/src/index.js
@@ -15,6 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import 'whatwg-fetch';
+// import 'semantic-ui-css/semantic.css';
 
 import es6Promise from 'es6-promise';
 es6Promise.polyfill();
@@ -32,7 +33,6 @@ import viewsDapps from '@parity/shared/config/dappsViews.json';
 import ContractInstances from '@parity/shared/contracts';
 import HistoryStore from '@parity/shared/mobx/historyStore';
 import { initStore } from '@parity/shared/redux';
-import { patchApi } from '@parity/shared/util/tx';
 import ContextProvider from '@parity/ui/ContextProvider';
 
 import '@parity/shared/environment';
@@ -63,7 +63,6 @@ if (window.location.hash && window.location.hash.indexOf(AUTH_HASH) === 0) {
 const uiUrl = window.location.host;
 const api = new SecureApi(uiUrl, token);
 
-patchApi(api);
 ContractInstances.get(api);
 
 setupProviderFilters(api.provider);