diff --git a/packages/netlify-cms-core/src/components/App/Header.js b/packages/netlify-cms-core/src/components/App/Header.js
index 42c54191..c56d4e73 100644
--- a/packages/netlify-cms-core/src/components/App/Header.js
+++ b/packages/netlify-cms-core/src/components/App/Header.js
@@ -46,7 +46,9 @@ const AppHeaderContent = styled.div`
 
 const AppHeaderButton = styled.button`
   ${buttons.button};
+  background: none;
   color: #7b8290;
+  font-family: inherit;
   font-size: 16px;
   font-weight: 500;
   display: inline-flex;
@@ -58,10 +60,17 @@ const AppHeaderButton = styled.button`
     color: #b3b9c4;
   }
 
+  &:hover,
+  &:active,
+  &:focus {
+    ${styles.buttonActive};
+
+    ${Icon} {
+      ${styles.buttonActive};
+    }
+  }
+
   ${props => css`
-    &:hover,
-    &:active,
-    &:focus,
     &.${props.activeClassName} {
       ${styles.buttonActive};