diff --git a/server/zanata-frontend/src/app/editor/components/Button/index.css b/server/zanata-frontend/src/app/editor/components/Button/index.css
index 941c815005..737c1ae4cb 100644
--- a/server/zanata-frontend/src/app/editor/components/Button/index.css
+++ b/server/zanata-frontend/src/app/editor/components/Button/index.css
@@ -48,6 +48,11 @@ not conflict with the other frontend code
   outline: inherit;
 }
 
+.EditorButton:hover, html input[type=button], input[type=reset], input[type=submit] {
+  cursor: pointer;
+  -webkit-appearance: button;
+}
+
 /* Default */
 
 .Button--default {
@@ -229,3 +234,4 @@ not conflict with the other frontend code
   padding: var(--Button-padding-small);
   font-size: calc(14/16)rem;
 }
+
diff --git a/server/zanata-frontend/src/app/editor/containers/ControlsHeader.js b/server/zanata-frontend/src/app/editor/containers/ControlsHeader.js
index 61cfcfbf18..84afb555a0 100644
--- a/server/zanata-frontend/src/app/editor/containers/ControlsHeader.js
+++ b/server/zanata-frontend/src/app/editor/containers/ControlsHeader.js
@@ -69,7 +69,7 @@ export const ControlsHeader = ({
  }/*: props*/) => {
   return (
     /* eslint-disable max-len */
-    <nav className="flex flex-wrapper u-bgHighest u-sPH-1-2 l--cf-of u-sizeHeight-1_1-2">
+    <nav className="flex flex-wrapper controlHeader u-bgHighest u-sPH-1-2 l--cf-of">
       <TranslatingIndicator gettextCatalog={gettextCatalog} />
       <div className="u-floatLeft"><PhraseStatusFilter /></div>
       {/* FIXME move InputEditorSearch into component. Layout component should
diff --git a/server/zanata-frontend/src/app/editor/containers/Root/index.css b/server/zanata-frontend/src/app/editor/containers/Root/index.css
index 05ed0bebf3..6c2f36d326 100644
--- a/server/zanata-frontend/src/app/editor/containers/Root/index.css
+++ b/server/zanata-frontend/src/app/editor/containers/Root/index.css
@@ -996,6 +996,14 @@ label span.n1 {
   background-color: var(--Editor-color-dark);
 }
 
+.controlHeader {
+  min-height: 2.25rem!important
+  padding-top: 0.2rem;
+}
+
+.TransUnit-panelFooterLeftNav .Button--snug .u-textMini {
+  vertical-align: text-top;
+}
 /**
  * Media Queries
  */