diff --git a/extension/package.json b/extension/package.json
index cc6ee903..e7af07d7 100644
--- a/extension/package.json
+++ b/extension/package.json
@@ -71,10 +71,10 @@
   },
   "dependencies": {
     "jsan": "^3.1.13",
-    "lodash": "^4.17.2",
+    "lodash": "^4.17.19",
     "react": "^15.4.1",
     "react-dom": "^15.4.1",
-    "react-icons": "^2.2.1",
+    "react-icons": "^3.10.0",
     "react-json-tree": "^0.10.9",
     "react-redux": "^4.4.5",
     "redux": "^3.5.2",
diff --git a/extension/src/app/containers/App.js b/extension/src/app/containers/App.js
index 230e53cd..73a41fa2 100644
--- a/extension/src/app/containers/App.js
+++ b/extension/src/app/containers/App.js
@@ -19,12 +19,8 @@ import SliderButton from 'remotedev-app/lib/components/buttons/SliderButton';
 import ImportButton from 'remotedev-app/lib/components/buttons/ImportButton';
 import ExportButton from 'remotedev-app/lib/components/buttons/ExportButton';
 import PrintButton from 'remotedev-app/lib/components/buttons/PrintButton';
-import SettingsIcon from 'react-icons/lib/md/settings';
-import LeftIcon from 'react-icons/lib/md/border-left';
-import RightIcon from 'react-icons/lib/md/border-right';
-import BottomIcon from 'react-icons/lib/md/border-bottom';
-import RemoteIcon from 'react-icons/lib/go/radio-tower';
-import PersistIcon from 'react-icons/lib/go/pin';
+import { MdSettings, MdBorderLeft, MdBorderRight, MdBorderBottom } from 'react-icons/md';
+import { GoRadioTower, GoPin } from 'react-icons/go';
 
 @enhance
 class App extends Component {
@@ -96,7 +92,7 @@ class App extends Component {
         <div style={styles.buttonBar}>
           {!window.isElectron && position !== '#left' && (
             <Button
-              Icon={LeftIcon}
+              Icon={MdBorderLeft}
               onClick={() => {
                 this.openWindow('left');
               }}
@@ -104,7 +100,7 @@ class App extends Component {
           )}
           {!window.isElectron && position !== '#right' && (
             <Button
-              Icon={RightIcon}
+              Icon={MdBorderRight}
               onClick={() => {
                 this.openWindow('right');
               }}
@@ -112,7 +108,7 @@ class App extends Component {
           )}
           {!window.isElectron && position !== '#bottom' && (
             <Button
-              Icon={BottomIcon}
+              Icon={MdBorderBottom}
               onClick={() => {
                 this.openWindow('bottom');
               }}
@@ -121,7 +117,7 @@ class App extends Component {
           {features.pause && <RecordButton paused={liftedState.isPaused} />}
           {features.lock && <LockButton locked={liftedState.isLocked} />}
           {features.persist && (
-            <Button Icon={PersistIcon} onClick={togglePersist}>
+            <Button Icon={GoPin} onClick={togglePersist}>
               Persist
             </Button>
           )}
@@ -136,7 +132,7 @@ class App extends Component {
               navigator.userAgent.indexOf('Firefox') !== -1) && <PrintButton />}
           {!window.isElectron && (
             <Button
-              Icon={RemoteIcon}
+              Icon={GoRadioTower}
               onClick={() => {
                 this.openWindow('remote');
               }}
@@ -146,7 +142,7 @@ class App extends Component {
           )}
           {(chrome.runtime.openOptionsPage ||
             navigator.userAgent.indexOf('Firefox') !== -1) && (
-            <Button Icon={SettingsIcon} onClick={this.openOptionsPage}>
+            <Button Icon={MdSettings} onClick={this.openOptionsPage}>
               Settings
             </Button>
           )}
diff --git a/extension/yarn.lock b/extension/yarn.lock
index b6d35fa4..2e0ddd37 100644
--- a/extension/yarn.lock
+++ b/extension/yarn.lock
@@ -7371,7 +7371,7 @@ lodash@^3.10.1:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
   integrity sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=
 
-lodash@^4.0.0, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.6.1:
+lodash@^4.0.0, lodash@^4.14.0, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.6.1:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
   integrity sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=
@@ -9515,6 +9515,13 @@ react-icons@^2.2.1:
   dependencies:
     react-icon-base "2.0.4"
 
+react-icons@^3.10.0:
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/react-icons/-/react-icons-3.11.0.tgz#2ca2903dfab8268ca18ebd8cc2e879921ec3b254"
+  integrity sha512-JRgiI/vdF6uyBgyZhVyYJUZAop95Sy4XDe/jmT3R/bKliFWpO/uZBwvSjWEdxwzec7SYbEPNPck0Kff2tUGM2Q==
+  dependencies:
+    camelcase "^5.0.0"
+
 react-is@^16.13.1, react-is@^16.8.1:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"