diff --git a/package.json b/package.json
index 366a636e..0b84af4c 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
   "scripts": {
     "start": "lerna run --parallel watch",
     "clean": "cd packages && rimraf */.cache */*.js */*.css */*.svg */*.map",
-    "reset": "yarn clean && lerna clean --yes && lerna bootstrap && cd packages/netlify-cms-core && yarn link netlify-cms-lib-auth netlify-cms-lib-util netlify-cms-ui-default react-split-pane"
+    "reset": "yarn clean && lerna clean --yes && lerna bootstrap && cd packages/netlify-cms-core && yarn link netlify-cms-lib-auth netlify-cms-lib-util netlify-cms-ui-default netlify-cms-editor-component-image react-split-pane"
   },
   "jest": {
     "moduleNameMapper": {
diff --git a/packages/netlify-cms-core/package.json b/packages/netlify-cms-core/package.json
index 38c6d65e..19922c2f 100644
--- a/packages/netlify-cms-core/package.json
+++ b/packages/netlify-cms-core/package.json
@@ -49,6 +49,7 @@
     "netlify-cms-lib-auth": "file:../netlify-cms-lib-auth",
     "netlify-cms-lib-util": "file:../netlify-cms-lib-util",
     "netlify-cms-ui-default": "file:../netlify-cms-ui-default",
+    "netlify-cms-editor-component-image": "file:../netlify-cms-editor-component-image",
     "prop-types": "^15.5.10",
     "react": "15.x || 16.x",
     "react-aria-menubutton": "^5.1.0",
diff --git a/packages/netlify-cms-core/src/components/Editor/EditorToolbar.js b/packages/netlify-cms-core/src/components/Editor/EditorToolbar.js
index 1d61240a..6b628688 100644
--- a/packages/netlify-cms-core/src/components/Editor/EditorToolbar.js
+++ b/packages/netlify-cms-core/src/components/Editor/EditorToolbar.js
@@ -285,7 +285,7 @@ export default class EditorToolbar extends React.Component {
           dropdownTopOverlap="40px"
           dropdownWidth="150px"
           renderButton={() => (
-            <PublishButton>{isPersisting ? 'Publishing...' : 'Publish'}</PublishButton>
+            <PublishButton>{isPublishing ? 'Publishing...' : 'Publish'}</PublishButton>
           )}
         >
           <DropdownItem label="Publish now" icon="arrow" iconDirection="right" onClick={onPublish}/>
diff --git a/packages/netlify-cms-core/src/components/MarkdownPlugins/index.js b/packages/netlify-cms-core/src/components/MarkdownPlugins/index.js
index 8d266aab..a03a6ded 100644
--- a/packages/netlify-cms-core/src/components/MarkdownPlugins/index.js
+++ b/packages/netlify-cms-core/src/components/MarkdownPlugins/index.js
@@ -1,5 +1,5 @@
 import { registerEditorComponent } from 'Lib/registry';
-import image from './image';
+import image from 'netlify-cms-editor-component-image';
 
 const plugins = [
   image,
diff --git a/packages/netlify-cms-editor-component-image/package.json b/packages/netlify-cms-editor-component-image/package.json
new file mode 100644
index 00000000..a7976e5e
--- /dev/null
+++ b/packages/netlify-cms-editor-component-image/package.json
@@ -0,0 +1,22 @@
+{
+  "name": "netlify-cms-editor-component-image",
+  "description": "Image component for Netlify CMS editor widget",
+  "version": "2.0.0-alpha.0",
+  "license": "MIT",
+  "keywords": [
+    "netlify",
+    "netlify-cms",
+    "editor",
+    "component"
+  ],
+  "scripts": {
+    "watch": "parcel watch src/*.js --out-dir . --no-cache",
+    "build": "parcel build src/*.js --out-dir . --no-cache"
+  },
+  "dependencies": {
+    "react": "^16.4.1"
+  },
+  "devDependencies": {
+    "parcel-bundler": "^1.9.4"
+  }
+}
diff --git a/packages/netlify-cms-core/src/components/MarkdownPlugins/image.js b/packages/netlify-cms-editor-component-image/src/index.js
similarity index 100%
rename from packages/netlify-cms-core/src/components/MarkdownPlugins/image.js
rename to packages/netlify-cms-editor-component-image/src/index.js
diff --git a/yarn.lock b/yarn.lock
index a50084d7..21d3a1e4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5029,6 +5029,11 @@ needle@^2.2.0:
     iconv-lite "^0.4.4"
     sax "^1.2.4"
 
+"netlify-cms-editor-component-image@file:packages/netlify-cms-editor-component-image":
+  version "2.0.0-alpha.0"
+  dependencies:
+    react "^16.4.1"
+
 "netlify-cms-lib-auth@file:packages/netlify-cms-lib-auth":
   version "2.0.0-alpha.0"
   dependencies:
@@ -6634,7 +6639,7 @@ react-waypoint@^7.1.0:
     consolidated-events "^1.1.0"
     prop-types "^15.0.0"
 
-"react@15.x || 16.x":
+"react@15.x || 16.x", react@^16.4.1:
   version "16.4.1"
   resolved "https://registry.yarnpkg.com/react/-/react-16.4.1.tgz#de51ba5764b5dbcd1f9079037b862bd26b82fe32"
   dependencies: