diff --git a/editors/editoria/src/config/config.js b/editors/editoria/src/config/config.js
index da5d6d1009631477a4cdea583cc51e58e5100c6e..be39bf3281288077a27d1cdcb50d5a0b232abdef 100644
--- a/editors/editoria/src/config/config.js
+++ b/editors/editoria/src/config/config.js
@@ -10,7 +10,7 @@ export default {
   MenuService: [
     {
       templateArea: "topBar",
-      toolGroups: ["Base", "Annotations", "Lists", "Tables"]
+      toolGroups: ["Base", "Annotations", "Lists", "Images", "Tables"]
     },
     {
       templateArea: "leftSideBar",
diff --git a/wax-prosemirror-core/src/config/defaultConfig.js b/wax-prosemirror-core/src/config/defaultConfig.js
index 27690414a7bd99429183671ff73e726872ca893b..2417a2904752f3fd9a072dbd27a0db2cdf2ab0c6 100644
--- a/wax-prosemirror-core/src/config/defaultConfig.js
+++ b/wax-prosemirror-core/src/config/defaultConfig.js
@@ -16,7 +16,8 @@ import {
   TablesService,
   TableToolGroupService,
   BaseService,
-  BaseToolGroupService
+  BaseToolGroupService,
+  ImageToolGroupService
 } from "wax-prosemirror-services";
 
 export default {
@@ -37,6 +38,7 @@ export default {
     new TableToolGroupService(),
     new TablesService(),
     new BaseService(),
-    new BaseToolGroupService()
+    new BaseToolGroupService(),
+    new ImageToolGroupService()
   ]
 };
diff --git a/wax-prosemirror-services/index.js b/wax-prosemirror-services/index.js
index 235be06c651073ededad5557cc3f4e4e098e21a5..3f71ac01cc7bb62d270da05025e58fc9c0321bf0 100644
--- a/wax-prosemirror-services/index.js
+++ b/wax-prosemirror-services/index.js
@@ -40,6 +40,10 @@ export {
 export {
   default as ListToolGroupService
 } from "./src/WaxToolGroups/ListToolGroupService/ListToolGroupService";
+export {
+  default as ImageToolGroupService
+} from "./src/WaxToolGroups/ImageToolGroupService/ImageToolGroupService";
+
 export {
   default as TableToolGroupService
 } from "./src/WaxToolGroups/TableToolGroupService/TableToolGroupService";
diff --git a/wax-prosemirror-services/src/WaxToolGroups/AnnotationToolGroupService/Annotations.js b/wax-prosemirror-services/src/WaxToolGroups/AnnotationToolGroupService/Annotations.js
index cf8b596567139790a2b8199b807476231d498c4d..efec146dde9b0cebfe382704650ef526762ac7da 100644
--- a/wax-prosemirror-services/src/WaxToolGroups/AnnotationToolGroupService/Annotations.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/AnnotationToolGroupService/Annotations.js
@@ -14,8 +14,7 @@ class Annotations extends ToolGroup {
     @inject("Subscript") subscript,
     @inject("Superscript") superscript,
     @inject("Underline") underline,
-    @inject("Blockquote") blockquote,
-    @inject("Image") image
+    @inject("Blockquote") blockquote
   ) {
     super();
     this.tools = [
@@ -28,8 +27,7 @@ class Annotations extends ToolGroup {
       subscript,
       superscript,
       underline,
-      blockquote,
-      image
+      blockquote
     ];
   }
 
diff --git a/wax-prosemirror-services/src/WaxToolGroups/ImageToolGroupService/Image.js b/wax-prosemirror-services/src/WaxToolGroups/ImageToolGroupService/Image.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/wax-prosemirror-services/src/WaxToolGroups/ImageToolGroupService/ImageToolGroupService.js b/wax-prosemirror-services/src/WaxToolGroups/ImageToolGroupService/ImageToolGroupService.js
index 4305f81c2a2a2ae3d3041e17bf2a327e13e173f0..4e5c2f132466159638c5c031642511b884f96f3c 100644
--- a/wax-prosemirror-services/src/WaxToolGroups/ImageToolGroupService/ImageToolGroupService.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/ImageToolGroupService/ImageToolGroupService.js
@@ -1,11 +1,11 @@
-import Image from "./Image";
+import Images from "./Images";
 import Service from "wax-prosemirror-core/src/services/Service";
 
 class ImageToolGroupService extends Service {
   name = "ImageToolGroupService";
 
   register() {
-    this.container.bind("Image").to(Image);
+    this.container.bind("Images").to(Images);
   }
 }
 
diff --git a/wax-prosemirror-services/src/WaxToolGroups/ImageToolGroupService/Images.js b/wax-prosemirror-services/src/WaxToolGroups/ImageToolGroupService/Images.js
new file mode 100644
index 0000000000000000000000000000000000000000..2614e20a002804908ad6b902f87804b3cbb68fd4
--- /dev/null
+++ b/wax-prosemirror-services/src/WaxToolGroups/ImageToolGroupService/Images.js
@@ -0,0 +1,21 @@
+import { injectable, inject } from "inversify";
+import ToolGroup from "../../lib/ToolGroup";
+
+@injectable()
+class Images extends ToolGroup {
+  tools = [];
+  constructor(@inject("Image") image) {
+    super();
+    this.tools = [image];
+  }
+
+  renderTools(view) {
+    const tools = [];
+    this.tools.forEach(tool => {
+      tools.push(tool.renderTool(view));
+    });
+    return tools;
+  }
+}
+
+export default Images;