diff --git a/wax-prosemirror-components/index.js b/wax-prosemirror-components/index.js
index 6870d2819132ae2139a0bc546a6367a75471c6ff..1d983a0b32a0d29c8bc21bad9ce836b5b971501d 100644
--- a/wax-prosemirror-components/index.js
+++ b/wax-prosemirror-components/index.js
@@ -28,7 +28,6 @@ export { default as TrackChangeOptionsTool } from './src/components/trackChanges
 export { default as CustomTagInlineComponent } from './src/components/customtag/CustomTagInlineComponent';
 export { default as CustomTagInlineOverlayComponent } from './src/components/customtag/CustomTagInlineOverlayCompoment';
 export { default as CustomTagBlockComponent } from './src/components/customtag/CustomTagBlockComponent';
-export { default as SaveButton } from './src/components/SaveButton';
 export { default as ReactDropDownStyles } from './src/helpers/ReactDropDownStyles';
 export { default as OENAsideButton } from './src/components/OEN/OENAsideButton';
 
diff --git a/wax-prosemirror-services/src/BaseService/SaveService/Save.js b/wax-prosemirror-services/src/BaseService/SaveService/Save.js
index 533651184f87bd1a13e510f3b6403b3c9e10a7b4..4df48ccbe18a251206cac650806fb9d40cfa436e 100644
--- a/wax-prosemirror-services/src/BaseService/SaveService/Save.js
+++ b/wax-prosemirror-services/src/BaseService/SaveService/Save.js
@@ -1,8 +1,9 @@
 import React from 'react';
 import { isEmpty } from 'lodash';
 import { injectable } from 'inversify';
-import { SaveButton, icons } from 'wax-prosemirror-components';
+import { icons } from 'wax-prosemirror-components';
 import { Tools } from 'wax-prosemirror-core';
+import SaveButton from './components/SaveButton';
 
 @injectable()
 export default class Save extends Tools {
@@ -12,12 +13,6 @@ export default class Save extends Tools {
   content = icons.save;
   name = 'Save';
 
-  get run() {
-    return (state, dispatch) => {
-      return true;
-    };
-  }
-
   renderTool(view) {
     if (isEmpty(view)) return null;
     // eslint-disable-next-line no-underscore-dangle
diff --git a/wax-prosemirror-components/src/components/SaveButton.js b/wax-prosemirror-services/src/BaseService/SaveService/components/SaveButton.js
similarity index 96%
rename from wax-prosemirror-components/src/components/SaveButton.js
rename to wax-prosemirror-services/src/BaseService/SaveService/components/SaveButton.js
index 8eec53b41e68449cdcae68ea2eff40dc53c1e56b..af32edbc0b890afc0c8d05f0545b37ef9866b872 100644
--- a/wax-prosemirror-components/src/components/SaveButton.js
+++ b/wax-prosemirror-services/src/BaseService/SaveService/components/SaveButton.js
@@ -1,7 +1,7 @@
 /* eslint react/prop-types: 0 */
 import React, { useContext, useMemo, useEffect, useState } from 'react';
 import { WaxContext } from 'wax-prosemirror-core';
-import MenuButton from '../ui/buttons/MenuButton';
+import { MenuButton } from 'wax-prosemirror-components';
 
 const SaveButton = ({ view = {}, item }) => {
   const { icon, label, select, title } = item;