diff --git a/x-pack/plugins/code/public/components/main/content.tsx b/x-pack/plugins/code/public/components/main/content.tsx
index b6f3a3ad7f064..031873a1c4d92 100644
--- a/x-pack/plugins/code/public/components/main/content.tsx
+++ b/x-pack/plugins/code/public/components/main/content.tsx
@@ -44,6 +44,9 @@ const ButtonsContainer = styled.div`
   & > *:first-child {
     margin-right: ${theme.euiSizeS};
   }
+  & .euiButton {
+    min-width: ${theme.euiSizeS};
+  }
 `;
 
 const EditorBlameContainer = styled.div`
@@ -182,7 +185,7 @@ class CodeContent extends React.PureComponent<Props> {
       return (
         <ButtonsContainer>
           <EuiButtonGroup
-            buttonSize="m"
+            buttonSize="s"
             color="primary"
             options={this.buttonOptions}
             type="single"
@@ -190,7 +193,7 @@ class CodeContent extends React.PureComponent<Props> {
             onChange={this.switchButton}
           />
           <EuiButtonGroup
-            buttonSize="m"
+            buttonSize="s"
             color="primary"
             options={this.rawButtonOptions}
             type="single"
@@ -203,7 +206,7 @@ class CodeContent extends React.PureComponent<Props> {
       return (
         <ButtonsContainer>
           <EuiButtonGroup
-            buttonSize="m"
+            buttonSize="s"
             color="primary"
             options={[
               {
diff --git a/x-pack/plugins/code/public/components/main/top_bar.tsx b/x-pack/plugins/code/public/components/main/top_bar.tsx
index a2da8f2c188e0..a4e5853462a1d 100644
--- a/x-pack/plugins/code/public/components/main/top_bar.tsx
+++ b/x-pack/plugins/code/public/components/main/top_bar.tsx
@@ -60,9 +60,7 @@ export class TopBar extends React.Component<Props, { value: string }> {
               <Breadcrumb routeParams={this.props.routeParams} />
             </EuiFlexGroup>
           </EuiFlexItem>
-          <EuiFlexItem grow={false} style={{ marginRight: '-.5rem' }}>
-            {this.props.buttons}
-          </EuiFlexItem>
+          <EuiFlexItem grow={false}>{this.props.buttons}</EuiFlexItem>
         </EuiFlexGroup>
       </div>
     );