diff --git a/examples/custom-map-style/src/store.ts b/examples/custom-map-style/src/store.ts
index 86203b0fc4..7d9e9e3e6d 100644
--- a/examples/custom-map-style/src/store.ts
+++ b/examples/custom-map-style/src/store.ts
@@ -19,8 +19,8 @@
 // THE SOFTWARE.
 
 import {createStore, combineReducers, applyMiddleware, compose} from 'redux';
-import keplerGlReducer from 'kepler.gl/reducers';
-import {enhanceReduxMiddleware} from 'kepler.gl/middleware';
+import keplerGlReducer from '@kepler.gl/reducers';
+import {enhanceReduxMiddleware} from '@kepler.gl/middleware';
 
 const mapStyles = {
   voyager: {
diff --git a/examples/custom-reducer/src/app.js b/examples/custom-reducer/src/app.js
index 6d1c2c988a..a7be9cf719 100644
--- a/examples/custom-reducer/src/app.js
+++ b/examples/custom-reducer/src/app.js
@@ -24,7 +24,7 @@ import AutoSizer from 'react-virtualized/dist/commonjs/AutoSizer';
 import KeplerGl from 'kepler.gl';
 import {createAction} from 'redux-actions';
 
-import {addDataToMap, wrapTo} from 'kepler.gl/actions';
+import {addDataToMap, wrapTo} from '@kepler.gl/actions';
 import sampleData from './data/sample-data';
 import config from './configurations/config';
 
diff --git a/examples/custom-reducer/src/store.js b/examples/custom-reducer/src/store.js
index 677b39464c..ba8bbf49bb 100644
--- a/examples/custom-reducer/src/store.js
+++ b/examples/custom-reducer/src/store.js
@@ -19,8 +19,8 @@
 // THE SOFTWARE.
 
 import {createStore, combineReducers, applyMiddleware, compose} from 'redux';
-import keplerGlReducer, {uiStateUpdaters} from 'kepler.gl/reducers';
-import {enhanceReduxMiddleware} from 'kepler.gl/middleware';
+import keplerGlReducer, {uiStateUpdaters} from '@kepler.gl/reducers';
+import {enhanceReduxMiddleware} from '@kepler.gl/middleware';
 import appReducer from './app-reducer';
 import window from 'global/window';
 
diff --git a/examples/demo-app/src/app.js b/examples/demo-app/src/app.js
index b40d84957d..1604456e49 100644
--- a/examples/demo-app/src/app.js
+++ b/examples/demo-app/src/app.js
@@ -24,7 +24,7 @@ import styled, {ThemeProvider} from 'styled-components';
 import window from 'global/window';
 import {connect} from 'react-redux';
 
-import {theme} from 'kepler.gl/styles';
+import {theme} from '@kepler.gl/styles';
 import Banner from './components/banner';
 import Announcement, {FormLink} from './components/announcement';
 import {replaceLoadDataModal} from './factories/load-data-modal';
@@ -40,10 +40,10 @@ import {
   onLoadCloudMapSuccess
 } from './actions';
 
-import {loadCloudMap, addDataToMap, addNotification} from 'kepler.gl/actions';
+import {loadCloudMap, addDataToMap, addNotification} from '@kepler.gl/actions';
 import {CLOUD_PROVIDERS} from './cloud-providers';
 
-const KeplerGl = require('kepler.gl/components').injectComponents([
+const KeplerGl = require('@kepler.gl/components').injectComponents([
   replaceLoadDataModal(),
   replaceMapControl(),
   replacePanelHeader()
@@ -61,7 +61,7 @@ import sampleAnimateTrip from './data/sample-animate-trip-data';
 import sampleIconCsv, {config as savedMapConfig} from './data/sample-icon-csv';
 import sampleGpsData from './data/sample-gps-data';
 
-import {processCsvData, processGeojson} from 'kepler.gl/processors';
+import {processCsvData, processGeojson} from '@kepler.gl/processors';
 /* eslint-enable no-unused-vars */
 
 const BannerHeight = 48;
diff --git a/examples/demo-app/src/cloud-providers/carto/carto-icon.js b/examples/demo-app/src/cloud-providers/carto/carto-icon.js
index 6f35d9ec2f..ce3fc103cf 100644
--- a/examples/demo-app/src/cloud-providers/carto/carto-icon.js
+++ b/examples/demo-app/src/cloud-providers/carto/carto-icon.js
@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 
 import React, {Component} from 'react';
-import {Icons} from 'kepler.gl/components';
+import {Icons} from '@kepler.gl/components';
 import PropTypes from 'prop-types';
 
 class CartoIcon extends Component {
diff --git a/examples/demo-app/src/cloud-providers/dropbox/dropbox-icon.js b/examples/demo-app/src/cloud-providers/dropbox/dropbox-icon.js
index 171837eda0..73ce22f531 100644
--- a/examples/demo-app/src/cloud-providers/dropbox/dropbox-icon.js
+++ b/examples/demo-app/src/cloud-providers/dropbox/dropbox-icon.js
@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 
 import React, {Component} from 'react';
-import {Icons} from 'kepler.gl/components';
+import {Icons} from '@kepler.gl/components';
 import PropTypes from 'prop-types';
 
 class DropboxIcon extends Component {
diff --git a/examples/demo-app/src/components/banner.js b/examples/demo-app/src/components/banner.js
index 7a5a6e28d4..99f2691531 100644
--- a/examples/demo-app/src/components/banner.js
+++ b/examples/demo-app/src/components/banner.js
@@ -20,7 +20,7 @@
 
 import React from 'react';
 import styled from 'styled-components';
-import {Icons} from 'kepler.gl/components';
+import {Icons} from '@kepler.gl/components';
 
 const StyledBanner = styled.div`
   align-items: center;
diff --git a/examples/demo-app/src/components/load-data-modal/sample-maps-tab.js b/examples/demo-app/src/components/load-data-modal/sample-maps-tab.js
index 73ad6399e3..5c9396ddff 100644
--- a/examples/demo-app/src/components/load-data-modal/sample-maps-tab.js
+++ b/examples/demo-app/src/components/load-data-modal/sample-maps-tab.js
@@ -20,7 +20,7 @@
 
 import React from 'react';
 import styled from 'styled-components';
-import {Icons} from 'kepler.gl/components';
+import {Icons} from '@kepler.gl/components';
 import {media} from 'kepler.gl/styles';
 import {FormattedMessage} from 'react-intl';
 
diff --git a/examples/demo-app/src/factories/load-data-modal.js b/examples/demo-app/src/factories/load-data-modal.js
index 0f87767ad3..4864755973 100644
--- a/examples/demo-app/src/factories/load-data-modal.js
+++ b/examples/demo-app/src/factories/load-data-modal.js
@@ -18,7 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-import {LoadDataModalFactory, withState} from 'kepler.gl/components';
+import {LoadDataModalFactory, withState} from '@kepler.gl/components';
 import {LOADING_METHODS} from '../constants/default-settings';
 
 import SampleMapGallery from '../components/load-data-modal/sample-data-viewer';
diff --git a/examples/demo-app/src/store.js b/examples/demo-app/src/store.js
index bd1e6c4f6f..1103aaf80a 100644
--- a/examples/demo-app/src/store.js
+++ b/examples/demo-app/src/store.js
@@ -21,7 +21,7 @@
 import {combineReducers, createStore, applyMiddleware, compose} from 'redux';
 import {routerReducer, routerMiddleware} from 'react-router-redux';
 import {browserHistory} from 'react-router';
-import {enhanceReduxMiddleware} from 'kepler.gl/middleware';
+import {enhanceReduxMiddleware} from '@kepler.gl/middleware';
 import thunk from 'redux-thunk';
 // eslint-disable-next-line no-unused-vars
 import window from 'global/window';
diff --git a/examples/replace-component/src/app-reducer.js b/examples/replace-component/src/app-reducer.js
index 1da605ca42..2102a1a4f2 100644
--- a/examples/replace-component/src/app-reducer.js
+++ b/examples/replace-component/src/app-reducer.js
@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 
 import {createAction, handleActions} from 'redux-actions';
-import KeplerGlSchema from 'kepler.gl/schemas';
+import KeplerGlSchema from '@kepler.gl/schemas';
 
 // CONSTANTS
 export const INIT = 'INIT';
diff --git a/examples/replace-component/src/components/custom-panel.js b/examples/replace-component/src/components/custom-panel.js
index afbdd515ba..621676f099 100644
--- a/examples/replace-component/src/components/custom-panel.js
+++ b/examples/replace-component/src/components/custom-panel.js
@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 
 import React from 'react';
-import {Icons} from 'kepler.gl/components';
+import {Icons} from '@kepler.gl/components';
 
 function CustomSidePanelsFactory() {
   const CustomPanels = props => {
diff --git a/src/components/src/common/icons/index.tsx b/src/components/src/common/icons/index.tsx
index 566702fad0..67c0353995 100644
--- a/src/components/src/common/icons/index.tsx
+++ b/src/components/src/common/icons/index.tsx
@@ -57,6 +57,7 @@ export {default as FreeWindow} from './free-window';
 export {default as Gear} from './gear';
 export {default as Hash} from './hash';
 export {default as Histogram} from './histogram';
+export {default as IconWrapper} from './base';
 export {default as Info} from './info';
 export {default as Layers} from './layers';
 export {default as LeftArrow} from './left-arrow';