diff --git a/package.json b/package.json
index 3acd02cb..e16aec0f 100644
--- a/package.json
+++ b/package.json
@@ -75,9 +75,9 @@
     "postcss-mixins": "^6.2.0",
     "postcss-simple-vars": "^4.1.0",
     "pre-commit": "^1.2.2",
-    "react": "^16.2.0",
-    "react-dev-utils": "^5.0.0",
-    "react-dom": "^16.2.0",
+    "react": "^16.4.0",
+    "react-dev-utils": "^5.0.1",
+    "react-dom": "^16.4.0",
     "react-redux": "^5.0.7",
     "react-router-redux": "^5.0.0-alpha.9",
     "redux": "^3.7.2",
@@ -100,14 +100,14 @@
     "webpack-manifest-plugin": "^2.0.0-rc.2"
   },
   "dependencies": {
+    "@material-ui/core": "^1.2.1",
+    "@material-ui/icons": "^1.1.0",
     "final-form": "^4.2.1",
     "history": "^4.7.2",
-    "material-ui": "^1.0.0-beta.35",
-    "material-ui-icons": "^1.0.0-beta.35",
     "react-final-form": "^3.1.2",
     "react-loadable": "^5.3.1",
     "react-router-dom": "^4.2.2",
-    "recompose": "^0.27.0"
+    "recompose": "^0.27.1"
   },
   "jest": {
     "verbose": true,
diff --git a/src/components/List/ListItemText/index.jsx b/src/components/List/ListItemText/index.jsx
index 0ee309ab..74edd962 100644
--- a/src/components/List/ListItemText/index.jsx
+++ b/src/components/List/ListItemText/index.jsx
@@ -1,7 +1,7 @@
 // @flow
 import * as React from 'react'
-import { ListItemText } from 'material-ui/List'
-import { withStyles } from 'material-ui/styles'
+import ListItemText from '@material-ui/core/ListItemText'
+import { withStyles } from '@material-ui/core/styles'
 import { type WithStyles } from '~/theme/mui'
 
 type Props = WithStyles & {
diff --git a/src/components/Loader/index.jsx b/src/components/Loader/index.jsx
index 750a9419..5ae3f7b9 100644
--- a/src/components/Loader/index.jsx
+++ b/src/components/Loader/index.jsx
@@ -1,7 +1,7 @@
 // @flow
 import * as React from 'react'
 import Page from '~/components/layout/Page'
-import { CircularProgress } from 'material-ui/Progress'
+import CircularProgress from '@material-ui/core/CircularProgress'
 
 const centerStyle = {
   margin: 'auto 0',
diff --git a/src/components/Refresh/index.jsx b/src/components/Refresh/index.jsx
index cabccf0d..8ec4bd55 100644
--- a/src/components/Refresh/index.jsx
+++ b/src/components/Refresh/index.jsx
@@ -1,7 +1,7 @@
 // @flow
 import * as React from 'react'
-import { CircularProgress } from 'material-ui/Progress'
-import RefreshIcon from 'material-ui-icons/Refresh'
+import CircularProgress from '@material-ui/core/CircularProgress'
+import RefreshIcon from '@material-ui/icons/Refresh'
 import { sm, secondary } from '~/theme/variables'
 
 type Props = {
diff --git a/src/components/Stepper/index.jsx b/src/components/Stepper/index.jsx
index 5f90792a..d7121567 100644
--- a/src/components/Stepper/index.jsx
+++ b/src/components/Stepper/index.jsx
@@ -1,6 +1,8 @@
 // @flow
-import Stepper, { Step as FormStep, StepLabel } from 'material-ui/Stepper'
-import { withStyles } from 'material-ui/styles'
+import Stepper from '@material-ui/core/Stepper'
+import FormStep from '@material-ui/core/Step'
+import StepLabel from '@material-ui/core/StepLabel'
+import { withStyles } from '@material-ui/core/styles'
 import * as React from 'react'
 import type { FormApi } from 'react-final-form'
 import GnoForm from '~/components/forms/GnoForm'
diff --git a/src/components/forms/Checkbox/index.jsx b/src/components/forms/Checkbox/index.jsx
index b20e101e..a11e0844 100644
--- a/src/components/forms/Checkbox/index.jsx
+++ b/src/components/forms/Checkbox/index.jsx
@@ -1,6 +1,6 @@
 // @flow
 import React from 'react'
-import Checkbox, { type CheckoxProps } from 'material-ui/Checkbox'
+import Checkbox, { type CheckoxProps } from '@material-ui/core/Checkbox'
 
 class GnoCheckbox extends React.PureComponent<CheckoxProps> {
   render() {
diff --git a/src/components/forms/TextField/index.jsx b/src/components/forms/TextField/index.jsx
index cbc88c88..77c936ed 100644
--- a/src/components/forms/TextField/index.jsx
+++ b/src/components/forms/TextField/index.jsx
@@ -1,6 +1,6 @@
 // @flow
 import React from 'react'
-import MuiTextField, { TextFieldProps } from 'material-ui/TextField'
+import MuiTextField, { TextFieldProps } from '@material-ui/core/TextField'
 
 // Neded for solving a fix in Windows browsers
 const overflowStyle = {
diff --git a/src/components/layout/Button/index.jsx b/src/components/layout/Button/index.jsx
index 31a62242..f0ee9a37 100644
--- a/src/components/layout/Button/index.jsx
+++ b/src/components/layout/Button/index.jsx
@@ -1,4 +1,4 @@
 // @flow
-import Button from 'material-ui/Button'
+import Button from '@material-ui/core/Button'
 
 export default Button
diff --git a/src/components/layout/Table/index.jsx b/src/components/layout/Table/index.jsx
index 817b7c2d..6f23f532 100644
--- a/src/components/layout/Table/index.jsx
+++ b/src/components/layout/Table/index.jsx
@@ -1,6 +1,10 @@
 // @flow
 import * as React from 'react'
-import Table, { TableBody, TableCell, TableHead, TableRow } from 'material-ui/Table'
+import Table from '@material-ui/core/Table'
+import TableBody from '@material-ui/core/TableBody'
+import TableCell from '@material-ui/core/TableCell'
+import TableHead from '@material-ui/core/TableHead'
+import TableRow from '@material-ui/core/TableRow'
 
 export { TableBody, TableCell, TableHead, TableRow }
 
diff --git a/src/index.js b/src/index.js
index e57c20bb..364987d1 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,7 +1,7 @@
 // @flow
 import 'babel-polyfill'
 
-import { MuiThemeProvider } from 'material-ui/styles'
+import { MuiThemeProvider } from '@material-ui/core/styles'
 import React from 'react'
 import ReactDOM from 'react-dom'
 import { Provider } from 'react-redux'
diff --git a/src/routes/open/components/FormConfirmation/index.jsx b/src/routes/open/components/FormConfirmation/index.jsx
index 647a47e0..1fe4c947 100644
--- a/src/routes/open/components/FormConfirmation/index.jsx
+++ b/src/routes/open/components/FormConfirmation/index.jsx
@@ -1,6 +1,6 @@
 // @flow
 import * as React from 'react'
-import { CircularProgress } from 'material-ui/Progress'
+import CircularProgress from '@material-ui/core/CircularProgress'
 import Block from '~/components/layout/Block'
 import Bold from '~/components/layout/Bold'
 import Col from '~/components/layout/Col'
diff --git a/src/routes/safe/component/AddOwner/Review/index.jsx b/src/routes/safe/component/AddOwner/Review/index.jsx
index 6bc31b77..7c2b9ac9 100644
--- a/src/routes/safe/component/AddOwner/Review/index.jsx
+++ b/src/routes/safe/component/AddOwner/Review/index.jsx
@@ -1,6 +1,6 @@
 // @flow
 import * as React from 'react'
-import { CircularProgress } from 'material-ui/Progress'
+import CircularProgress from '@material-ui/core/CircularProgress'
 import Block from '~/components/layout/Block'
 import Bold from '~/components/layout/Bold'
 import Heading from '~/components/layout/Heading'
diff --git a/src/routes/safe/component/AddTransaction/ReviewTx/index.jsx b/src/routes/safe/component/AddTransaction/ReviewTx/index.jsx
index 86524b60..e37028ee 100644
--- a/src/routes/safe/component/AddTransaction/ReviewTx/index.jsx
+++ b/src/routes/safe/component/AddTransaction/ReviewTx/index.jsx
@@ -1,6 +1,6 @@
 // @flow
 import * as React from 'react'
-import { CircularProgress } from 'material-ui/Progress'
+import CircularProgress from '@material-ui/core/CircularProgress'
 import Block from '~/components/layout/Block'
 import Bold from '~/components/layout/Bold'
 import Heading from '~/components/layout/Heading'
diff --git a/src/routes/safe/component/Safe/Address.jsx b/src/routes/safe/component/Safe/Address.jsx
index 3a21532e..52dd3135 100644
--- a/src/routes/safe/component/Safe/Address.jsx
+++ b/src/routes/safe/component/Safe/Address.jsx
@@ -1,8 +1,8 @@
 // @flow
 import * as React from 'react'
-import { ListItem } from 'material-ui/List'
-import Avatar from 'material-ui/Avatar'
-import Mail from 'material-ui-icons/Mail'
+import ListItem from '@material-ui/core/ListItem'
+import Avatar from '@material-ui/core/Avatar'
+import Mail from '@material-ui/icons/Mail'
 import ListItemText from '~/components/List/ListItemText'
 
 type Props = {
diff --git a/src/routes/safe/component/Safe/Balance.jsx b/src/routes/safe/component/Safe/Balance.jsx
index 95aeef3f..da301688 100644
--- a/src/routes/safe/component/Safe/Balance.jsx
+++ b/src/routes/safe/component/Safe/Balance.jsx
@@ -1,8 +1,9 @@
 // @flow
 import * as React from 'react'
-import { ListItem, ListItemText } from 'material-ui/List'
-import Avatar from 'material-ui/Avatar'
-import AccountBalance from 'material-ui-icons/AccountBalance'
+import ListItem from '@material-ui/core/ListItem'
+import ListItemText from '@material-ui/core/ListItemText'
+import Avatar from '@material-ui/core/Avatar'
+import AccountBalance from '@material-ui/icons/AccountBalance'
 
 type Props = {
   balance: string,
diff --git a/src/routes/safe/component/Safe/Confirmations.jsx b/src/routes/safe/component/Safe/Confirmations.jsx
index faf23d45..c9350771 100644
--- a/src/routes/safe/component/Safe/Confirmations.jsx
+++ b/src/routes/safe/component/Safe/Confirmations.jsx
@@ -1,8 +1,8 @@
 // @flow
 import * as React from 'react'
-import { ListItem } from 'material-ui/List'
-import Avatar from 'material-ui/Avatar'
-import DoneAll from 'material-ui-icons/DoneAll'
+import ListItem from '@material-ui/core/ListItem'
+import Avatar from '@material-ui/core/Avatar'
+import DoneAll from '@material-ui/icons/DoneAll'
 import ListItemText from '~/components/List/ListItemText'
 import Button from '~/components/layout/Button'
 
diff --git a/src/routes/safe/component/Safe/DailyLimit.jsx b/src/routes/safe/component/Safe/DailyLimit.jsx
index c44326c0..fcfc10b5 100644
--- a/src/routes/safe/component/Safe/DailyLimit.jsx
+++ b/src/routes/safe/component/Safe/DailyLimit.jsx
@@ -1,8 +1,8 @@
 // @flow
 import * as React from 'react'
-import { ListItem } from 'material-ui/List'
-import Avatar from 'material-ui/Avatar'
-import NotificationsPaused from 'material-ui-icons/NotificationsPaused'
+import ListItem from '@material-ui/core/ListItem'
+import Avatar from '@material-ui/core/Avatar'
+import NotificationsPaused from '@material-ui/icons/NotificationsPaused'
 import Button from '~/components/layout/Button'
 import ListItemText from '~/components/List/ListItemText'
 import { type DailyLimit } from '~/routes/safe/store/model/dailyLimit'
diff --git a/src/routes/safe/component/Safe/MultisigTx.jsx b/src/routes/safe/component/Safe/MultisigTx.jsx
index a70774db..e41973d0 100644
--- a/src/routes/safe/component/Safe/MultisigTx.jsx
+++ b/src/routes/safe/component/Safe/MultisigTx.jsx
@@ -1,8 +1,8 @@
 // @flow
 import * as React from 'react'
-import { ListItem } from 'material-ui/List'
-import Avatar from 'material-ui/Avatar'
-import AcoountBalanceWallet from 'material-ui-icons/AccountBalanceWallet'
+import ListItem from '@material-ui/core/ListItem'
+import Avatar from '@material-ui/core/Avatar'
+import AcoountBalanceWallet from '@material-ui/icons/AccountBalanceWallet'
 import Button from '~/components/layout/Button'
 import ListItemText from '~/components/List/ListItemText'
 
diff --git a/src/routes/safe/component/Safe/Owners.jsx b/src/routes/safe/component/Safe/Owners.jsx
index 47cdc07a..e3a5473b 100644
--- a/src/routes/safe/component/Safe/Owners.jsx
+++ b/src/routes/safe/component/Safe/Owners.jsx
@@ -1,17 +1,20 @@
 // @flow
 import * as React from 'react'
 import openHoc, { type Open } from '~/components/hoc/OpenHoc'
-import { withStyles } from 'material-ui/styles'
-import Collapse from 'material-ui/transitions/Collapse'
+import { withStyles } from '@material-ui/core/styles'
+import Collapse from '@material-ui/core/Collapse'
 import ListItemText from '~/components/List/ListItemText'
-import List, { ListItem, ListItemIcon } from 'material-ui/List'
-import Avatar from 'material-ui/Avatar'
+import List from '@material-ui/core/List'
+import ListItem from '@material-ui/core/ListItem'
+import ListItemIcon from '@material-ui/core/ListItemIcon'
+import Avatar from '@material-ui/core/Avatar'
+import IconButton from '@material-ui/core/IconButton'
 import Button from '~/components/layout/Button'
-import Group from 'material-ui-icons/Group'
-import Delete from 'material-ui-icons/Delete'
-import Person from 'material-ui-icons/Person'
-import ExpandLess from 'material-ui-icons/ExpandLess'
-import ExpandMore from 'material-ui-icons/ExpandMore'
+import Group from '@material-ui/icons/Group'
+import Delete from '@material-ui/icons/Delete'
+import Person from '@material-ui/icons/Person'
+import ExpandLess from '@material-ui/icons/ExpandLess'
+import ExpandMore from '@material-ui/icons/ExpandMore'
 import { type OwnerProps } from '~/routes/safe/store/model/owner'
 import { type WithStyles } from '~/theme/mui'
 import { sameAddress } from '~/wallets/ethAddresses'
@@ -64,13 +67,9 @@ const Owners = openHoc(({
               secondary={owner.address}
             />
             { !sameAddress(userAddress, owner.address) &&
-              <Button
-                variant="raised"
-                color="secondary"
-                onClick={() => {}}
-              >
+              <IconButton aria-label="Delete">
                 <Delete />
-              </Button>
+              </IconButton>
             }
           </ListItem>
         ))}
diff --git a/src/routes/safe/component/Safe/index.jsx b/src/routes/safe/component/Safe/index.jsx
index 87bc3893..e729f4c8 100644
--- a/src/routes/safe/component/Safe/index.jsx
+++ b/src/routes/safe/component/Safe/index.jsx
@@ -7,7 +7,7 @@ import Img from '~/components/layout/Img'
 import Paragraph from '~/components/layout/Paragraph'
 import Row from '~/components/layout/Row'
 import { type Safe } from '~/routes/safe/store/model/safe'
-import List from 'material-ui/List'
+import List from '@material-ui/core/List'
 
 import Withdrawn from '~/routes/safe/component/Withdrawn'
 import Transactions from '~/routes/safe/component/Transactions'
diff --git a/src/routes/safe/component/Threshold/Review/index.jsx b/src/routes/safe/component/Threshold/Review/index.jsx
index 0483e876..93937efd 100644
--- a/src/routes/safe/component/Threshold/Review/index.jsx
+++ b/src/routes/safe/component/Threshold/Review/index.jsx
@@ -1,6 +1,6 @@
 // @flow
 import * as React from 'react'
-import { CircularProgress } from 'material-ui/Progress'
+import CircularProgress from '@material-ui/core/CircularProgress'
 import Block from '~/components/layout/Block'
 import Bold from '~/components/layout/Bold'
 import Heading from '~/components/layout/Heading'
diff --git a/src/routes/safe/component/Transactions/Collapsed/Confirmations.jsx b/src/routes/safe/component/Transactions/Collapsed/Confirmations.jsx
index 0b79b3d7..d0bcb9f4 100644
--- a/src/routes/safe/component/Transactions/Collapsed/Confirmations.jsx
+++ b/src/routes/safe/component/Transactions/Collapsed/Confirmations.jsx
@@ -1,15 +1,17 @@
 // @flow
 import * as React from 'react'
 import openHoc, { type Open } from '~/components/hoc/OpenHoc'
-import { withStyles } from 'material-ui/styles'
-import Collapse from 'material-ui/transitions/Collapse'
+import { withStyles } from '@material-ui/core/styles'
+import Collapse from '@material-ui/core/Collapse'
 import ListItemText from '~/components/List/ListItemText'
-import List, { ListItem, ListItemIcon } from 'material-ui/List'
-import Avatar from 'material-ui/Avatar'
-import Group from 'material-ui-icons/Group'
-import Person from 'material-ui-icons/Person'
-import ExpandLess from 'material-ui-icons/ExpandLess'
-import ExpandMore from 'material-ui-icons/ExpandMore'
+import List from '@material-ui/core/List'
+import ListItem from '@material-ui/core/ListItem'
+import ListItemIcon from '@material-ui/core/ListItemIcon'
+import Avatar from '@material-ui/core/Avatar'
+import Group from '@material-ui/icons/Group'
+import Person from '@material-ui/icons/Person'
+import ExpandLess from '@material-ui/icons/ExpandLess'
+import ExpandMore from '@material-ui/icons/ExpandMore'
 import { type WithStyles } from '~/theme/mui'
 import { type Confirmation, type ConfirmationProps } from '~/routes/safe/store/model/confirmation'
 
diff --git a/src/routes/safe/component/Transactions/Collapsed/index.jsx b/src/routes/safe/component/Transactions/Collapsed/index.jsx
index b92a0635..d57b0b0a 100644
--- a/src/routes/safe/component/Transactions/Collapsed/index.jsx
+++ b/src/routes/safe/component/Transactions/Collapsed/index.jsx
@@ -3,11 +3,12 @@ import * as React from 'react'
 import { List as ImmutableList } from 'immutable'
 import Row from '~/components/layout/Row'
 import Col from '~/components/layout/Col'
-import List, { ListItem } from 'material-ui/List'
+import List from '@material-ui/core/List'
+import ListItem from '@material-ui/core/ListItem'
 import ListItemText from '~/components/List/ListItemText'
-import Avatar from 'material-ui/Avatar'
-import Group from 'material-ui-icons/Group'
-import MailOutline from 'material-ui-icons/MailOutline'
+import Avatar from '@material-ui/core/Avatar'
+import Group from '@material-ui/icons/Group'
+import MailOutline from '@material-ui/icons/MailOutline'
 import { type Confirmation } from '~/routes/safe/store/model/confirmation'
 import Confirmations from './Confirmations'
 
diff --git a/src/routes/safe/component/Transactions/Transaction/index.jsx b/src/routes/safe/component/Transactions/Transaction/index.jsx
index 7ee48833..344b33ba 100644
--- a/src/routes/safe/component/Transactions/Transaction/index.jsx
+++ b/src/routes/safe/component/Transactions/Transaction/index.jsx
@@ -3,16 +3,17 @@ import * as React from 'react'
 import { List } from 'immutable'
 import { connect } from 'react-redux'
 import openHoc, { type Open } from '~/components/hoc/OpenHoc'
-import ExpandLess from 'material-ui-icons/ExpandLess'
-import ExpandMore from 'material-ui-icons/ExpandMore'
+import ExpandLess from '@material-ui/icons/ExpandLess'
+import ExpandMore from '@material-ui/icons/ExpandMore'
 import ListItemText from '~/components/List/ListItemText'
 import Row from '~/components/layout/Row'
-import { ListItem, ListItemIcon } from 'material-ui/List'
-import Avatar from 'material-ui/Avatar'
-import AttachMoney from 'material-ui-icons/AttachMoney'
-import Atm from 'material-ui-icons/LocalAtm'
-import DoneAll from 'material-ui-icons/DoneAll'
-import CompareArrows from 'material-ui-icons/CompareArrows'
+import ListItem from '@material-ui/core/ListItem'
+import ListItemIcon from '@material-ui/core/ListItemIcon'
+import Avatar from '@material-ui/core/Avatar'
+import AttachMoney from '@material-ui/icons/AttachMoney'
+import Atm from '@material-ui/icons/LocalAtm'
+import DoneAll from '@material-ui/icons/DoneAll'
+import CompareArrows from '@material-ui/icons/CompareArrows'
 import Collapsed from '~/routes/safe/component/Transactions/Collapsed'
 import { type Transaction } from '~/routes/safe/store/model/transaction'
 import Hairline from '~/components/layout/Hairline/index'
diff --git a/src/routes/safe/component/Withdrawn/Review/index.jsx b/src/routes/safe/component/Withdrawn/Review/index.jsx
index 303d0588..83a36444 100644
--- a/src/routes/safe/component/Withdrawn/Review/index.jsx
+++ b/src/routes/safe/component/Withdrawn/Review/index.jsx
@@ -1,6 +1,6 @@
 // @flow
 import * as React from 'react'
-import { CircularProgress } from 'material-ui/Progress'
+import CircularProgress from '@material-ui/core/CircularProgress'
 import Block from '~/components/layout/Block'
 import Bold from '~/components/layout/Bold'
 import Heading from '~/components/layout/Heading'
diff --git a/src/theme/mui.js b/src/theme/mui.js
index 486d3422..325d2da9 100644
--- a/src/theme/mui.js
+++ b/src/theme/mui.js
@@ -1,6 +1,6 @@
 // @flow
-import red from 'material-ui/colors/red'
-import { createMuiTheme } from 'material-ui/styles'
+import red from '@material-ui/core/colors/red'
+import { createMuiTheme } from '@material-ui/core/styles'
 import { primary, secondary } from './variables'
 
 export type WithStyles = {
diff --git a/yarn.lock b/yarn.lock
index d6761ce8..17e48898 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -657,6 +657,13 @@
     "@babel/plugin-syntax-dynamic-import" "7.0.0-beta.40"
     "@babel/plugin-syntax-import-meta" "7.0.0-beta.40"
 
+"@babel/runtime@^7.0.0-beta.42":
+  version "7.0.0-beta.49"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.0.0-beta.49.tgz#03b3bf07eb982072c8e851dd2ddd5110282e61bf"
+  dependencies:
+    core-js "^2.5.6"
+    regenerator-runtime "^0.11.1"
+
 "@babel/template@7.0.0-beta.40":
   version "7.0.0-beta.40"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.40.tgz#034988c6424eb5c3268fe6a608626de1f4410fc8"
@@ -688,6 +695,44 @@
     lodash "^4.2.0"
     to-fast-properties "^2.0.0"
 
+"@material-ui/core@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-1.2.1.tgz#f8c73da10b875762b37be7167ec2ac79b027499f"
+  dependencies:
+    "@babel/runtime" "^7.0.0-beta.42"
+    "@types/jss" "^9.5.3"
+    "@types/react-transition-group" "^2.0.8"
+    brcast "^3.0.1"
+    classnames "^2.2.5"
+    csstype "^2.5.2"
+    debounce "^1.1.0"
+    deepmerge "^2.0.1"
+    dom-helpers "^3.2.1"
+    hoist-non-react-statics "^2.5.0"
+    jss "^9.3.3"
+    jss-camel-case "^6.0.0"
+    jss-default-unit "^8.0.2"
+    jss-global "^3.0.0"
+    jss-nested "^6.0.1"
+    jss-props-sort "^6.0.0"
+    jss-vendor-prefixer "^7.0.0"
+    keycode "^2.1.9"
+    normalize-scroll-left "^0.1.2"
+    prop-types "^15.6.0"
+    react-event-listener "^0.6.0"
+    react-jss "^8.1.0"
+    react-popper "^0.10.0"
+    react-transition-group "^2.2.1"
+    recompose "^0.26.0 || ^0.27.0"
+    scroll "^2.0.3"
+    warning "^4.0.1"
+
+"@material-ui/icons@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@material-ui/icons/-/icons-1.1.0.tgz#4d025df7b0ba6ace8d6710079ed76013a4d26595"
+  dependencies:
+    recompose "^0.26.0 || ^0.27.0"
+
 "@sambego/storybook-state@^1.0.7":
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/@sambego/storybook-state/-/storybook-state-1.0.7.tgz#4409793c0d34f1d351af1c8045a2764b5af574c0"
@@ -898,9 +943,12 @@
     react-treebeard "^2.1.0"
     redux "^3.7.2"
 
-"@types/jss@^9.3.0":
-  version "9.3.1"
-  resolved "https://registry.yarnpkg.com/@types/jss/-/jss-9.3.1.tgz#9e113f5d3e6bba6d8babca6be528b5cf19d37a16"
+"@types/jss@^9.5.3":
+  version "9.5.3"
+  resolved "https://registry.yarnpkg.com/@types/jss/-/jss-9.5.3.tgz#0c106de3fe0b324cd4173fac7dab26c12cda624e"
+  dependencies:
+    csstype "^2.0.0"
+    indefinite-observable "^1.0.1"
 
 "@types/radium@^0.18.22":
   version "0.18.24"
@@ -912,9 +960,9 @@
   version "0.25.12"
   resolved "https://registry.yarnpkg.com/@types/ramda/-/ramda-0.25.12.tgz#49f22f7611ae381473bc9b992776a1471e899a5a"
 
-"@types/react-transition-group@^2.0.6":
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-2.0.7.tgz#2847292d54c5685d982ae5a3ecb6960946689d87"
+"@types/react-transition-group@^2.0.8":
+  version "2.0.11"
+  resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-2.0.11.tgz#feb274676a39383fffaa0dff710958d2251abefb"
   dependencies:
     "@types/react" "*"
 
@@ -3465,6 +3513,10 @@ core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0, core-js@^2.5.3:
   version "2.5.3"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e"
 
+core-js@^2.5.6:
+  version "2.5.7"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e"
+
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -3711,6 +3763,10 @@ cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
   dependencies:
     cssom "0.3.x"
 
+csstype@^2.0.0, csstype@^2.5.2:
+  version "2.5.3"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.5.3.tgz#2504152e6e1cc59b32098b7f5d6a63f16294c1f7"
+
 currently-unhandled@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
@@ -3753,6 +3809,10 @@ dateformat@^3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
 
+debounce@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.1.0.tgz#6a1a4ee2a9dc4b7c24bb012558dbcdb05b37f408"
+
 debug@2.2.0, debug@~2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
@@ -3930,9 +3990,9 @@ detect-node@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.3.tgz#a2033c09cc8e158d37748fbde7507832bd6ce127"
 
-detect-port-alt@1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/detect-port-alt/-/detect-port-alt-1.1.5.tgz#a1aa8fc805a4a5df9b905b7ddc7eed036bcce889"
+detect-port-alt@1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/detect-port-alt/-/detect-port-alt-1.1.6.tgz#24707deabe932d4a3cf621302027c2b266568275"
   dependencies:
     address "^1.0.1"
     debug "^2.6.0"
@@ -5890,6 +5950,12 @@ in-publish@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51"
 
+indefinite-observable@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/indefinite-observable/-/indefinite-observable-1.0.1.tgz#09915423cc8d6f7eb1cb7882ad134633c9a6edc3"
+  dependencies:
+    symbol-observable "1.0.4"
+
 indent-string@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
@@ -7444,45 +7510,6 @@ material-colors@^1.2.1:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/material-colors/-/material-colors-1.2.5.tgz#5292593e6754cb1bcc2b98030e4e0d6a3afc9ea1"
 
-material-ui-icons@^1.0.0-beta.35:
-  version "1.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/material-ui-icons/-/material-ui-icons-1.0.0-beta.36.tgz#86390a61f4c83f718eaba77ccce575834f2cf2a8"
-  dependencies:
-    recompose "^0.26.0"
-
-material-ui@^1.0.0-beta.35:
-  version "1.0.0-beta.37"
-  resolved "https://registry.yarnpkg.com/material-ui/-/material-ui-1.0.0-beta.37.tgz#19097dd05e61936d2d8449874aeed1c9ae9ceb8a"
-  dependencies:
-    "@types/jss" "^9.3.0"
-    "@types/react-transition-group" "^2.0.6"
-    babel-runtime "^6.26.0"
-    brcast "^3.0.1"
-    classnames "^2.2.5"
-    deepmerge "^2.0.1"
-    dom-helpers "^3.2.1"
-    hoist-non-react-statics "^2.5.0"
-    jss "^9.3.3"
-    jss-camel-case "^6.0.0"
-    jss-default-unit "^8.0.2"
-    jss-global "^3.0.0"
-    jss-nested "^6.0.1"
-    jss-props-sort "^6.0.0"
-    jss-vendor-prefixer "^7.0.0"
-    keycode "^2.1.9"
-    lodash "^4.2.0"
-    normalize-scroll-left "^0.1.2"
-    prop-types "^15.6.0"
-    react-event-listener "^0.5.1"
-    react-jss "^8.1.0"
-    react-lifecycles-compat "^1.0.2"
-    react-popper "^0.8.0"
-    react-scrollbar-size "^2.0.2"
-    react-transition-group "^2.2.1"
-    recompose "^0.26.0"
-    scroll "^2.0.3"
-    warning "^3.0.0"
-
 math-expression-evaluator@^1.2.14:
   version "1.2.17"
   resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac"
@@ -8587,9 +8614,9 @@ pn@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
 
-popper.js@^1.12.9:
-  version "1.12.9"
-  resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.12.9.tgz#0dfbc2dff96c451bb332edcfcfaaf566d331d5b3"
+popper.js@^1.14.1:
+  version "1.14.3"
+  resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.3.tgz#1438f98d046acf7b4d78cd502bf418ac64d4f095"
 
 portfinder@^1.0.9:
   version "1.0.13"
@@ -8998,7 +9025,7 @@ promise@^7.1.1:
   dependencies:
     asap "~2.0.3"
 
-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.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:
   version "15.6.1"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.1.tgz#36644453564255ddda391191fb3a125cbdf654ca"
   dependencies:
@@ -9181,15 +9208,15 @@ react-datetime@^2.11.1:
     prop-types "^15.5.7"
     react-onclickoutside "^6.5.0"
 
-react-dev-utils@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-5.0.0.tgz#425ac7c9c40c2603bc4f7ab8836c1406e96bb473"
+react-dev-utils@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-5.0.1.tgz#1f396e161fe44b595db1b186a40067289bf06613"
   dependencies:
     address "1.0.3"
     babel-code-frame "6.26.0"
     chalk "1.1.3"
     cross-spawn "5.1.0"
-    detect-port-alt "1.1.5"
+    detect-port-alt "1.1.6"
     escape-string-regexp "1.0.5"
     filesize "3.5.11"
     global-modules "1.0.0"
@@ -9216,9 +9243,9 @@ react-docgen@^2.20.0:
     node-dir "^0.1.10"
     recast "^0.12.6"
 
-react-dom@^16.2.0:
-  version "16.2.0"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.2.0.tgz#69003178601c0ca19b709b33a83369fe6124c044"
+react-dom@^16.4.0:
+  version "16.4.0"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.4.0.tgz#099f067dd5827ce36a29eaf9a6cdc7cbf6216b1e"
   dependencies:
     fbjs "^0.8.16"
     loose-envify "^1.1.0"
@@ -9229,12 +9256,11 @@ react-error-overlay@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-4.0.0.tgz#d198408a85b4070937a98667f500c832f86bd5d4"
 
-react-event-listener@^0.5.1:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/react-event-listener/-/react-event-listener-0.5.3.tgz#a8b492596ad601865314fcc2c18cb87b6ce3876e"
+react-event-listener@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/react-event-listener/-/react-event-listener-0.6.0.tgz#f8cf2821f5ca1844e0df1dac1c7b9a3ecb686fd7"
   dependencies:
-    babel-runtime "^6.26.0"
-    fbjs "^0.8.16"
+    "@babel/runtime" "^7.0.0-beta.42"
     prop-types "^15.6.0"
     warning "^3.0.0"
 
@@ -9284,10 +9310,6 @@ react-jss@^8.1.0:
     prop-types "^15.6.0"
     theming "^1.3.0"
 
-react-lifecycles-compat@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-1.0.2.tgz#551d8b1d156346e5fcf30ffac9b32ce3f78b8850"
-
 react-lifecycles-compat@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.2.tgz#7279047275bd727a912e25f734c0559527e84eff"
@@ -9310,12 +9332,12 @@ react-onclickoutside@^6.5.0:
   version "6.7.1"
   resolved "https://registry.yarnpkg.com/react-onclickoutside/-/react-onclickoutside-6.7.1.tgz#6a5b5b8b4eae6b776259712c89c8a2b36b17be93"
 
-react-popper@^0.8.0:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-0.8.2.tgz#092095ff13933211d3856d9f325511ec3a42f12c"
+react-popper@^0.10.0:
+  version "0.10.4"
+  resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-0.10.4.tgz#af2a415ea22291edd504678d7afda8a6ee3295aa"
   dependencies:
-    popper.js "^1.12.9"
-    prop-types "^15.6.0"
+    popper.js "^1.14.1"
+    prop-types "^15.6.1"
 
 react-redux@^5.0.7:
   version "5.0.7"
@@ -9359,15 +9381,6 @@ react-router-redux@^5.0.0-alpha.9:
     prop-types "^15.5.4"
     warning "^3.0.0"
 
-react-scrollbar-size@^2.0.2:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/react-scrollbar-size/-/react-scrollbar-size-2.1.0.tgz#105e797135cab92b1f9e16f00071db7f29f80754"
-  dependencies:
-    babel-runtime "^6.26.0"
-    prop-types "^15.6.0"
-    react-event-listener "^0.5.1"
-    stifle "^1.0.2"
-
 react-split-pane@^0.1.74:
   version "0.1.77"
   resolved "https://registry.yarnpkg.com/react-split-pane/-/react-split-pane-0.1.77.tgz#f0c8cd18d076bbac900248dcf6dbcec02d5340db"
@@ -9430,9 +9443,9 @@ react-treebeard@^2.1.0:
     object-assign "^4.1.0"
     prop-types "^15.5.10"
 
-react@^16.2.0:
-  version "16.2.0"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.2.0.tgz#a31bd2dab89bff65d42134fa187f24d054c273ba"
+react@^16.4.0:
+  version "16.4.0"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.4.0.tgz#402c2db83335336fba1962c08b98c6272617d585"
   dependencies:
     fbjs "^0.8.16"
     loose-envify "^1.1.0"
@@ -9593,18 +9606,9 @@ rechoir@^0.6.2:
   dependencies:
     resolve "^1.1.6"
 
-recompose@^0.26.0:
-  version "0.26.0"
-  resolved "https://registry.yarnpkg.com/recompose/-/recompose-0.26.0.tgz#9babff039cb72ba5bd17366d55d7232fbdfb2d30"
-  dependencies:
-    change-emitter "^0.1.2"
-    fbjs "^0.8.1"
-    hoist-non-react-statics "^2.3.1"
-    symbol-observable "^1.0.4"
-
-recompose@^0.27.0:
-  version "0.27.0"
-  resolved "https://registry.yarnpkg.com/recompose/-/recompose-0.27.0.tgz#8230ebd651bf1159097006f79083fe224b1501cf"
+"recompose@^0.26.0 || ^0.27.0", recompose@^0.27.1:
+  version "0.27.1"
+  resolved "https://registry.yarnpkg.com/recompose/-/recompose-0.27.1.tgz#1a49e931f183634516633bbb4f4edbfd3f38a7ba"
   dependencies:
     babel-runtime "^6.26.0"
     change-emitter "^0.1.2"
@@ -10650,10 +10654,6 @@ stealthy-require@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
 
-stifle@^1.0.2:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/stifle/-/stifle-1.0.4.tgz#8b3bcdf52419b0a9c79e35adadce50123c1d8e99"
-
 storybook-host@^4.1.5:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/storybook-host/-/storybook-host-4.1.5.tgz#d0e71eeba05744a4a72c9c53a0cab3d9efca9a88"
@@ -10930,6 +10930,10 @@ symbol-observable@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4"
 
+symbol-observable@1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"
+
 symbol-observable@^0.2.2:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-0.2.4.tgz#95a83db26186d6af7e7a18dbd9760a2f86d08f40"
@@ -11666,6 +11670,12 @@ warning@^3.0.0:
   dependencies:
     loose-envify "^1.0.0"
 
+warning@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.1.tgz#66ce376b7fbfe8a887c22bdf0e7349d73d397745"
+  dependencies:
+    loose-envify "^1.0.0"
+
 watch@~0.18.0:
   version "0.18.0"
   resolved "https://registry.yarnpkg.com/watch/-/watch-0.18.0.tgz#28095476c6df7c90c963138990c0a5423eb4b986"