diff --git a/src/app/components/swap-panel-component.js b/src/app/components/swap-panel-component.js
index 47c433bbb02..3431fe2cc65 100644
--- a/src/app/components/swap-panel-component.js
+++ b/src/app/components/swap-panel-component.js
@@ -77,7 +77,7 @@ const css = csjs`
   }
   .plugItIn       {
     display        : none;
-    height: calc(100% - 50px);
+    height         : 100%;
   }
   .plugItIn > div {
     overflow-y     : auto;
@@ -95,8 +95,8 @@ const css = csjs`
     text-transform: uppercase;
   }
   .swapitHeader {
-    height: 50px;
-    padding-top: 16px;
+    height: 35px;
+    padding-top: 10px;
     padding-left: 27px;
   }
 `
diff --git a/src/app/editor/editor.js b/src/app/editor/editor.js
index 83fd681783a..2750ecdd40d 100644
--- a/src/app/editor/editor.js
+++ b/src/app/editor/editor.js
@@ -276,7 +276,10 @@ class Editor {
    * @param {number} incr The amount of pixels to add to the font.
    */
   editorFontSize (incr) {
-    this.editor.setFontSize(this.editor.getFontSize() + incr)
+    let newSize = this.editor.getFontSize() + incr
+    if (newSize >= 6) {
+      this.editor.setFontSize(newSize)
+    }
   }
 
   /**
diff --git a/src/app/panels/styles/terminal-styles.js b/src/app/panels/styles/terminal-styles.js
index 184e127ab53..58d91cc8fcc 100644
--- a/src/app/panels/styles/terminal-styles.js
+++ b/src/app/panels/styles/terminal-styles.js
@@ -34,7 +34,8 @@ var css = csjs`
   }
   .toggleTerminal              {
     margin-right      : 20px;
-    margin-left       : 4px;
+    margin-left       : 2px;
+    margin-top        : 2px;
     font-size         : 14px;
     font-weight       : bold;
     cursor            : pointer;
diff --git a/src/app/panels/tab-proxy.js b/src/app/panels/tab-proxy.js
index 48d40549cca..23b6f761677 100644
--- a/src/app/panels/tab-proxy.js
+++ b/src/app/panels/tab-proxy.js
@@ -102,18 +102,12 @@ export class TabProxy {
     this._view.filetabs.canAdd = false
 
     this._view.tabs = yo`
-      <div>
+      <div style="width: 100%; height: 100%;">
         ${this._view.filetabs}
       </div>
     `
     let tabsbar = yo`
-      <div class="d-flex align-items-center" style="max-height: 30px; height: 100%">
-        <div class="m-1">
-          <span class="p-1" style="height: 100%;">
-            <i class="m-1 fa fa-plus" style="color: var(--text-dark)" onclick=${increase} aria-hidden="true" title="increase editor font size"></i>
-            <i class="m-1 fa fa-minus" style="color: var(--text-dark)" onclick=${decrease} aria-hidden="true" title="decrease editor font size"></i>
-          </span>
-        </div>
+      <div class="d-flex align-items-center" style="max-height: 35px; height: 100%">
         ${this._view.tabs}
       </div>
     `
@@ -138,8 +132,6 @@ export class TabProxy {
       return false
     })
 
-    function increase () { self.editor.editorFontSize(1) }
-    function decrease () { self.editor.editorFontSize(-1) }
     return tabsbar
   }
 }
diff --git a/src/app/panels/terminal.js b/src/app/panels/terminal.js
index 6cf8587a400..21b6aa2c09d 100644
--- a/src/app/panels/terminal.js
+++ b/src/app/panels/terminal.js
@@ -120,7 +120,7 @@ class Terminal {
     `
     self._view.icon = yo`
       <i onmouseenter=${hover} onmouseleave=${hover} onmousedown=${minimize}
-      class="${css.toggleTerminal} fa fa-angle-double-down"></i>`
+      class="btn btn-secondary align-items-center ${css.toggleTerminal} fa fa-angle-double-down"></i>`
     self._view.dragbar = yo`
       <div onmousedown=${mousedown} class=${css.dragbarHorizontal}></div>`
     self._view.dropdown = self._components.dropdown.render()