diff --git a/README.md b/README.md
index 1ff55709..8cc01116 100644
--- a/README.md
+++ b/README.md
@@ -76,7 +76,8 @@ The `<Resource>` component is a configuration component that allows to define su
 // in posts.js
 import React from 'react';
 import { List, Datagrid, Edit, Create, SimpleForm, DateField, TextField, EditButton, DisabledInput, TextInput, LongTextInput, DateInput } from 'admin-on-rest';
-export PostIcon from 'material-ui/svg-icons/action/book';
+import BookIcon from 'material-ui/svg-icons/action/book';
+export const PostIcon = BookIcon;
 
 export const PostList = (props) => (
     <List {...props}>
diff --git a/docs/Admin.md b/docs/Admin.md
index 9f6d414d..7180c6a8 100644
--- a/docs/Admin.md
+++ b/docs/Admin.md
@@ -434,6 +434,7 @@ const App = () => (
 ```
 
 ## `initialState`
+
 The `initialState` prop lets you pass preloaded state to Redux. See the [Redux Documentation](http://redux.js.org/docs/api/createStore.html#createstorereducer-preloadedstate-enhancer) for more details.
 
 ## `history`
diff --git a/docs/Tutorial.md b/docs/Tutorial.md
index b302ddfc..982bbf71 100644
--- a/docs/Tutorial.md
+++ b/docs/Tutorial.md
@@ -224,7 +224,6 @@ When displaying the posts list, the app now fetches related user records, and di
 
 ## Creation and Editing
 
-
 An admin interface is about displaying remote data, but also about editing and creating. Admin-on-REST provides `<Create>` and `<Edit>` components for that purpose. Add them to the `posts` script:
 
 ```jsx
diff --git a/docs/index.md b/docs/index.md
index d44665ab..f5853682 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -78,7 +78,8 @@ The `<Resource>` component is a configuration component that allows to define su
 // in posts.js
 import React from 'react';
 import { List, Datagrid, Edit, Create, SimpleForm, DateField, TextField, EditButton, DisabledInput, TextInput, LongTextInput, DateInput } from 'admin-on-rest';
-export PostIcon from 'material-ui/svg-icons/action/book';
+import BookIcon from 'material-ui/svg-icons/action/book';
+export const PostIcon = BookIcon;
 
 export const PostList = (props) => (
     <List {...props}>
diff --git a/example/comments.js b/example/comments.js
index 3541775f..f426285e 100644
--- a/example/comments.js
+++ b/example/comments.js
@@ -30,9 +30,11 @@ import Avatar from 'material-ui/Avatar';
 import { Card, CardActions, CardHeader, CardText } from 'material-ui/Card';
 import FlatButton from 'material-ui/FlatButton';
 import { Toolbar, ToolbarGroup } from 'material-ui/Toolbar';
+
 import ChevronLeft from 'material-ui/svg-icons/navigation/chevron-left';
 import ChevronRight from 'material-ui/svg-icons/navigation/chevron-right';
-export CommentIcon from 'material-ui/svg-icons/communication/chat-bubble';
+import ChatBubbleIcon from 'material-ui/svg-icons/communication/chat-bubble';
+export const CommentIcon = ChatBubbleIcon;
 
 const CommentFilter = ({ ...props }) => (
     <Filter {...props}>
diff --git a/example/i18n/index.js b/example/i18n/index.js
index a9cfe411..8655eb2d 100644
--- a/example/i18n/index.js
+++ b/example/i18n/index.js
@@ -1,2 +1,5 @@
-export en from './en';
-export fr from './fr';
+import enMessages from './en';
+import frMessages from './fr';
+
+export const en = enMessages;
+export const fr = frMessages;
diff --git a/example/posts.js b/example/posts.js
index 00cf4796..18a37134 100644
--- a/example/posts.js
+++ b/example/posts.js
@@ -47,7 +47,8 @@ import {
 import RichTextInput from 'aor-rich-text-input';
 import Chip from 'material-ui/Chip';
 
-export PostIcon from 'material-ui/svg-icons/action/book';
+import BookIcon from 'material-ui/svg-icons/action/book';
+export const PostIcon = BookIcon;
 
 const QuickFilter = translate(({ label, translate }) => (
     <Chip style={{ marginBottom: 8 }}>{translate(label)}</Chip>
diff --git a/example/users.js b/example/users.js
index 2582d474..ed480ebd 100644
--- a/example/users.js
+++ b/example/users.js
@@ -25,7 +25,8 @@ import {
     translate,
 } from 'admin-on-rest'; // eslint-disable-line import/no-unresolved
 
-export UserIcon from 'material-ui/svg-icons/social/people';
+import PeopleIcon from 'material-ui/svg-icons/social/people';
+export const UserIcon = PeopleIcon;
 
 const UserFilter = ({ ...props }) => (
     <Filter {...props}>