diff --git a/wax-prosemirror-components/index.js b/wax-prosemirror-components/index.js
index c17751b53d88fa5d3b3f7727f295940b2b85189c..bdcac1b0f4b894be109977070f1986461250fa9b 100644
--- a/wax-prosemirror-components/index.js
+++ b/wax-prosemirror-components/index.js
@@ -12,7 +12,6 @@ export { default as BlockLevelTools } from './src/ui/tabs/BlockLevelTools';
 export { default as EditorInfoTool } from './src/components/EditorInfo/CounterInfo/EditorInfoTool';
 export { default as EditorShortCutsTool } from './src/components/EditorInfo/EditorShortCutsTool';
 
-export { default as EditingSuggestingDropDown } from './src/components/editingSuggesting/EditingSuggestingDropDown';
 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';
diff --git a/wax-prosemirror-services/src/EditingSuggestingService/EditingSuggesting.js b/wax-prosemirror-services/src/EditingSuggestingService/EditingSuggesting.js
index b3d94342975257f62ec028dd50a4028398750720..57892b7ba99df1097fa33549407cf4f5d7c62473 100644
--- a/wax-prosemirror-services/src/EditingSuggestingService/EditingSuggesting.js
+++ b/wax-prosemirror-services/src/EditingSuggestingService/EditingSuggesting.js
@@ -1,9 +1,10 @@
+/* eslint-disable no-unused-vars */
 import React from 'react';
 import { injectable } from 'inversify';
 import { isEmpty } from 'lodash';
 import { v4 as uuidv4 } from 'uuid';
-import { EditingSuggestingDropDown } from 'wax-prosemirror-components';
 import { Tools } from 'wax-prosemirror-core';
+import EditingSuggestingDropDown from './components/EditingSuggestingDropDown';
 
 @injectable()
 export default class EditingSuggesting extends Tools {
@@ -25,12 +26,13 @@ export default class EditingSuggesting extends Tools {
 
   renderTool(view) {
     if (isEmpty(view)) return null;
+    // eslint-disable-next-line no-underscore-dangle
     return this._isDisplayed ? (
       <EditingSuggestingDropDown
+        enabled={this.config.enabled}
+        item={this.toJSON()}
         key={uuidv4()}
         view={view}
-        item={this.toJSON()}
-        enabled={this.config.enabled}
       />
     ) : null;
   }
diff --git a/wax-prosemirror-components/src/components/editingSuggesting/EditingSuggestingDropDown.js b/wax-prosemirror-services/src/EditingSuggestingService/components/EditingSuggestingDropDown.js
similarity index 94%
rename from wax-prosemirror-components/src/components/editingSuggesting/EditingSuggestingDropDown.js
rename to wax-prosemirror-services/src/EditingSuggestingService/components/EditingSuggestingDropDown.js
index b525220df0ec51680c64e342df6420b4b9f86fcc..4a467e7488e1d058f12a2e05609baf4c46fe64f0 100644
--- a/wax-prosemirror-components/src/components/editingSuggesting/EditingSuggestingDropDown.js
+++ b/wax-prosemirror-services/src/EditingSuggestingService/components/EditingSuggestingDropDown.js
@@ -3,7 +3,7 @@ import React, { useMemo, useContext } from 'react';
 import styled from 'styled-components';
 import { WaxContext, ReactDropDownStyles } from 'wax-prosemirror-core';
 import Dropdown from 'react-dropdown';
-import Icon from '../../helpers/Icon';
+import { Icon } from 'wax-prosemirror-components';
 
 const Wrapper = styled.span`
   ${ReactDropDownStyles};
@@ -78,6 +78,7 @@ const dropDownOptions = [
   { label: <Suggesting />, value: 'suggesting' },
 ];
 
+// eslint-disable-next-line no-unused-vars
 const EditingSuggesting = ({ view: { dispatch, state }, item }) => {
   const { app, activeView, pmViews } = useContext(WaxContext);
   const enableService = app.config.get('config.EnableTrackChangeService')
@@ -110,6 +111,7 @@ const EditingSuggesting = ({ view: { dispatch, state }, item }) => {
     () => (
       <Wrapper>
         <DropdownStyled
+          // eslint-disable-next-line no-unused-vars
           onChange={option => {
             return enableDisableTrackChanges();
           }}