diff --git a/components/Carbon.js b/components/Carbon.js
index 624307b..4dc2bdc 100644
--- a/components/Carbon.js
+++ b/components/Carbon.js
@@ -123,7 +123,7 @@ class Carbon extends React.Component {
             #container :global(.CodeMirror__container .CodeMirror) {
               height: auto;
               min-width: 680px;
-              padding: 24px 18px;
+              padding: 18px 18px;
               border-radius: 5px;
               font-family: Hack, monospace !important;
               font-size: 0.7rem;
@@ -138,7 +138,7 @@ class Carbon extends React.Component {
             }
 
             #container :global(.window-controls + .CodeMirror__container > .CodeMirror) {
-              padding-top: 40px;
+              padding-top: 48px;
             }
           `}</style>
         </div>
diff --git a/components/WindowControls.js b/components/WindowControls.js
index 9f15088..d80c120 100644
--- a/components/WindowControls.js
+++ b/components/WindowControls.js
@@ -6,9 +6,9 @@ export default ({ theme }) => (
     { theme === 'bw' ? <ControlsBW /> : <Controls /> }
     <style jsx>{`
       div {
-        margin-top: -19px;
+        margin-top: -24px;
         position: relative;
-        top: +30px;
+        top: 34px;
         margin-left: 18px;
         z-index: 1;
       }