diff --git a/editors/editoria/src/Editoria.js b/editors/editoria/src/Editoria.js
index 9696eab0bc56e32a63dbcda459785661b651f3c7..46e64b34cb8f7c136c2ac3e5e3f20f2db2778740 100644
--- a/editors/editoria/src/Editoria.js
+++ b/editors/editoria/src/Editoria.js
@@ -17,6 +17,10 @@ const GlobalStyle = createGlobalStyle`
   #root {
     height:100vh;
     width:100vw;
+    
+    * {
+      box-sizing: border-box;
+    }
   }
 `;
 
diff --git a/editors/editoria/src/layout/EditoriaLayout.js b/editors/editoria/src/layout/EditoriaLayout.js
index be563e198c5954d9c8ea8def0b74b76751c4a897..81a4b1f091e05f47d55306d900ec690b87b12572 100644
--- a/editors/editoria/src/layout/EditoriaLayout.js
+++ b/editors/editoria/src/layout/EditoriaLayout.js
@@ -32,7 +32,7 @@ const Wrapper = styled.div`
   background: ${th('colorBackground')};
   font-family: ${th('fontInterface')};
   font-size: ${th('fontSizeBase')};
-
+  line-height: ${grid(4)};
   display: flex;
   flex-direction: column;
 
diff --git a/wax-prosemirror-components/src/components/findAndReplace/ExpandedFindAndReplaceComponent.js b/wax-prosemirror-components/src/components/findAndReplace/ExpandedFindAndReplaceComponent.js
index 6c499c69be0534b6e7d79a46f65499cdabf67d84..54c924076af9460e3f9aa845c5f7cf9a97d4d9f9 100644
--- a/wax-prosemirror-components/src/components/findAndReplace/ExpandedFindAndReplaceComponent.js
+++ b/wax-prosemirror-components/src/components/findAndReplace/ExpandedFindAndReplaceComponent.js
@@ -46,16 +46,16 @@ const InputLabel = styled.div`
 const SearchInputWrapper = styled.div`
   input {
     padding: ${grid(1)} ${grid(10)} ${grid(1)} ${grid(1)};
-    width: 89%;
+    width: 98%;
   }
 `;
 
 const CounterInput = styled.span`
   font-size: 12px;
   position: absolute;
-  right: 14px;
+  right: 19px;
   -webkit-text-fill-color: rgba(27, 43, 75, 0.28);
-  top: 72px;
+  top: 69px;
   z-index: 1;
 `;
 
@@ -93,7 +93,7 @@ const CheckBoxWrapper = styled.div`
 const ControlContainer = styled.div`
   display: flex;
   flex-direction: row;
-  margin-top: 70px;
+  margin-top: 62px;
 `;
 
 const ButtonReplace = styled.button`
@@ -120,6 +120,7 @@ const PreviousNextContainer = styled.div`
   margin: 3px 0 0 auto;
 
   svg {
+    box-sizing: unset !important;
     padding: ${grid(2)};
 
     &:hover {
diff --git a/wax-prosemirror-components/src/components/findAndReplace/FindComponent.js b/wax-prosemirror-components/src/components/findAndReplace/FindComponent.js
index d313bfe58bc4f08e64e0d2856cf03a6a23fef476..462ddf56954212b5a612dce4f3c9c8a2f5eca22f 100644
--- a/wax-prosemirror-components/src/components/findAndReplace/FindComponent.js
+++ b/wax-prosemirror-components/src/components/findAndReplace/FindComponent.js
@@ -41,7 +41,7 @@ const SearchInput = styled.input`
   font-size: 15px;
   font-weight: 400;
   padding: ${grid(1)} ${grid(10)} ${grid(1)} ${grid(1)};
-  width: calc(100% - ${grid(10)});
+  width: 100%;
 
   ::placeholder {
     color: #d8dae0;
@@ -61,7 +61,7 @@ const ControlsWrapper = styled.div`
 const CounterInput = styled.span`
   font-size: 12px;
   position: absolute;
-  right: 145px;
+  right: 141px;
   -webkit-text-fill-color: rgba(27, 43, 75, 0.28);
   top: 13px;
   z-index: 1;
diff --git a/wax-prosemirror-components/src/components/trackChanges/TrackChangeOptionsComponent.js b/wax-prosemirror-components/src/components/trackChanges/TrackChangeOptionsComponent.js
index f9e8748d0238219cb9fca2b53724c97a98a2fabb..2bc6ea0fe689458a35b4494d79f2faaff22f8429 100644
--- a/wax-prosemirror-components/src/components/trackChanges/TrackChangeOptionsComponent.js
+++ b/wax-prosemirror-components/src/components/trackChanges/TrackChangeOptionsComponent.js
@@ -34,11 +34,11 @@ const ShowComments = styled.div`
   color: #bdc2ca;
   display: flex;
   flex-direction: row;
-  height: 23px;
+  height: 25px;
   padding-top: ${grid(2)};
 
   svg {
-    bottom: 12px;
+    bottom: 14px;
     cursor: not-allowed;
     fill: #85adff;
     height: 45px !important;
@@ -118,7 +118,6 @@ const AcceptRejectAllControls = styled.div`
 const AcceptRejectAllRow = styled.div`
   background: none;
   border: none;
-  cursor: pointer;
   padding-bottom: 3px;
   padding-top: 8px;
   text-align: start;
diff --git a/wax-prosemirror-components/src/components/trackChanges/TrackChangesBox.js b/wax-prosemirror-components/src/components/trackChanges/TrackChangesBox.js
index dc944776207fd6e2d3d2386b6cd97dcf5e62d30f..d385794bb303136d0779f147a83b80ca18e24ee2 100644
--- a/wax-prosemirror-components/src/components/trackChanges/TrackChangesBox.js
+++ b/wax-prosemirror-components/src/components/trackChanges/TrackChangesBox.js
@@ -68,10 +68,10 @@ const Text = styled.span``;
 const Icon = styled.div`
   border-radius: 3px;
   display: inline-block;
-  height: 16px;
+  height: 20px;
   padding: 4px;
   transition: background 0.1s ease-in;
-  width: 16px;
+  width: 20px;
 
   &:hover {
     background: #bfc4cd;