diff --git a/editors/editoria/src/layout/EditoriaLayout.js b/editors/editoria/src/layout/EditoriaLayout.js
index 4668f50752ec28a48bdb240960e9e28ef49a27da..f79a5442415b1fb3ebd5039ce34a748bc44c93b6 100644
--- a/editors/editoria/src/layout/EditoriaLayout.js
+++ b/editors/editoria/src/layout/EditoriaLayout.js
@@ -60,10 +60,16 @@ const TopMenu = styled.div`
       ${th('colorFurniture')};
   }
 
-  > div:last-child {
+
+  > div:nth-last-of-type(-n+2) {
     margin-left: auto;
+  }
+
+  > div:last-child {
+    margin-left: 0;
     margin-right: 10px;
   }
+
   > div[data-name="Tables"]{
     border-right: none;
   }
diff --git a/wax-prosemirror-services/src/FullScreenService/FullScreenTool.js b/wax-prosemirror-services/src/FullScreenService/FullScreenTool.js
index 1e110895ee9fd5eb352b5694c240ce1d3f6c3fc0..ae8d74663270816021a4578ad5a10c112569b041 100644
--- a/wax-prosemirror-services/src/FullScreenService/FullScreenTool.js
+++ b/wax-prosemirror-services/src/FullScreenService/FullScreenTool.js
@@ -1,27 +1,34 @@
 import React from 'react';
 import { isEmpty } from 'lodash';
 import { injectable } from 'inversify';
+import { FullScreen } from 'wax-prosemirror-components';
 import Tools from '../lib/Tools';
 
 export default
 @injectable()
 class FullScreenTool extends Tools {
   title = 'full screen';
-  icon = 'image';
+  icon = 'fullScreen';
   name = 'FullScreen';
 
   get run() {
     return () => true;
   }
 
-  select = (state, activeViewId) => {};
+  select = (state, activeViewId) => {
+    return true;
+  };
 
   get enable() {
-    return state => {};
+    return state => {
+      return true;
+    };
   }
 
   renderTool(view) {
     if (isEmpty(view)) return null;
-    return this._isDisplayed ? <span key="1"> full</span> : null;
+    return this._isDisplayed ? (
+      <FullScreen key="FullScreen" item={this.toJSON()} view={view} />
+    ) : null;
   }
 }