diff --git a/app/src/app.module.ts b/app/src/app.module.ts
index de921018..baac46c6 100644
--- a/app/src/app.module.ts
+++ b/app/src/app.module.ts
@@ -22,7 +22,7 @@ import { HotkeyInputComponent } from 'components/hotkeyInput'
 import { HotkeyDisplayComponent } from 'components/hotkeyDisplay'
 import { HotkeyHintComponent } from 'components/hotkeyHint'
 import { HotkeyInputModalComponent } from 'components/hotkeyInputModal'
-import { SettingsModalComponent } from 'components/settingsModal'
+import { SettingsPaneComponent } from 'components/settingsPane'
 import { TerminalComponent } from 'components/terminal'
 
 
@@ -48,7 +48,6 @@ import { TerminalComponent } from 'components/terminal'
     ],
     entryComponents: [
         HotkeyInputModalComponent,
-        SettingsModalComponent,
     ],
     declarations: [
         AppComponent,
@@ -57,7 +56,7 @@ import { TerminalComponent } from 'components/terminal'
         HotkeyHintComponent,
         HotkeyInputComponent,
         HotkeyInputModalComponent,
-        SettingsModalComponent,
+        SettingsPaneComponent,
         TerminalComponent,
     ],
     bootstrap: [
diff --git a/app/src/components/app.less b/app/src/components/app.less
index 38c2924b..3755adc3 100644
--- a/app/src/components/app.less
+++ b/app/src/components/app.less
@@ -19,6 +19,8 @@
 
 .button-states() {
     transition: 0.125s all;
+    border: none;
+    background: transparent;
 
     &:hover:not(.active) {
         background: rgba(255, 255, 255, .033);
@@ -43,7 +45,7 @@
         -webkit-app-region: drag;
     }
 
-    .btn-minimize, .btn-maximize, .btn-close {
+    button {
         flex: none;
         line-height: @titlebar-height - 2px;
         padding: 0 15px;
@@ -62,32 +64,36 @@
     flex: none;
     height: @tabs-height;
     background: @body-bg;
-
     display: flex;
     flex-direction: row;
 
-    .btn-settings, .btn-new-tab, .tab {
+    &>button, .tab {
         line-height: @tabs-height - 2px;
         cursor: pointer;
     }
 
-    .btn-new-tab, .btn-settings {
+    &>button {
         padding: 0 15px;
         flex: none;
         flex-grow: 0;
         border-bottom: 2px solid transparent;
         transition: 0.25s all;
+        font-size: 12px;
+
+        .button-states();
 
         text-transform: uppercase;
         font-weight: bold;
         color: #888;
         background: #141c23;
+    }
 
-        i {
-            margin-right: 10px;
-        }
+    &.active-tab-0 .btn-new-tab {
+        border-bottom-right-radius: @tab-border-radius;
+    }
 
-        .button-states();
+    .tab.active + button {
+        border-bottom-left-radius: @tab-border-radius;
     }
 
     .tab {
@@ -99,6 +105,7 @@
         overflow: hidden;
         min-width: 0;
         background: @body-bg;
+        transition: 0.25s all;
 
         .button-states();
 
@@ -108,6 +115,7 @@
             flex: auto;
             min-width: 0;
             background: #141c23;
+            transition: 0.25s all;
 
             div.index {
                 flex: none;
@@ -162,7 +170,7 @@
         //border-bottom: 2px solid transparent;
         transition: 0.25s all;
 
-        &.pre-selected, &:nth-last-child(2) {
+        &.pre-selected, &:nth-last-child(1) {
             .content-wrapper {
                 border-bottom-right-radius: @tab-border-radius;
             }
@@ -195,7 +203,7 @@
         display: none;
         flex: auto;
         position: relative;
-        padding: 10px 15px;
+        padding: 15px;
 
         &.active {
             display: flex;
diff --git a/app/src/components/app.pug b/app/src/components/app.pug
index 5e62f9e7..5e2c1bf8 100644
--- a/app/src/components/app.pug
+++ b/app/src/components/app.pug
@@ -1,13 +1,15 @@
 .titlebar
     .title((dblclick)='hostApp.maximizeWindow()') Term
-    .btn-minimize((click)='hostApp.minimizeWindow()')
+    button.btn-minimize((click)='hostApp.minimizeWindow()')
         i.fa.fa-window-minimize
-    .btn-maximize((click)='hostApp.maximizeWindow()')
+    button.btn-maximize((click)='hostApp.maximizeWindow()')
         i.fa.fa-window-maximize
-    .btn-close((click)='hostApp.quit()')
+    button.btn-close((click)='hostApp.quit()')
         i.fa.fa-close
 
-.tabs
+.tabs(class='active-tab-{{tabs.indexOf(activeTab)}}')
+    button.btn-new-tab((click)='newTab()')
+        i.fa.fa-plus
     .tab(
         *ngFor='let tab of tabs; let idx = index; trackBy: tab?.id',
         (click)='selectTab(tab)',
@@ -20,15 +22,13 @@
             div.index {{idx + 1}}
             div.name {{tab.name || 'Terminal'}}
             button((click)='closeTab(tab)') ×
-    .btn-new-tab((click)='newTab()')
-        i.fa.fa-plus
-        span Tab
-    .btn-settings((click)='showSettings()')
+    button.btn-settings((click)='showSettings()')
         i.fa.fa-cog
 
 .tabs-content
     .tab(*ngFor='let tab of tabs; trackBy: tab?.id', [class.active]='tab == activeTab')
-        terminal([session]='tab.session', '[(title)]'='tab.name')
+        terminal(*ngIf='tab.type == "terminal"', [session]='tab.session', '[(title)]'='tab.name')
+        settings-pane(*ngIf='tab.type == "settings"')
 
 hotkey-hint
 
diff --git a/app/src/components/app.ts b/app/src/components/app.ts
index 80c62ad6..2795aa15 100644
--- a/app/src/components/app.ts
+++ b/app/src/components/app.ts
@@ -1,5 +1,4 @@
 import { Component, ElementRef, trigger, style, animate, transition, state } from '@angular/core'
-import { ModalService } from 'services/modal'
 import { ElectronService } from 'services/electron'
 import { HostAppService } from 'services/hostApp'
 import { HotkeysService } from 'services/hotkeys'
@@ -8,19 +7,23 @@ import { QuitterService } from 'services/quitter'
 import { ToasterConfig } from 'angular2-toaster'
 import { Session, SessionsService } from 'services/sessions'
 
-import { SettingsModalComponent } from 'components/settingsModal'
-
 import 'angular2-toaster/lib/toaster.css'
 import 'global.less'
 
 
+const TYPE_TERMINAL = 'terminal'
+const TYPE_SETTINGS = 'settings'
+
 class Tab {
     id: number
     name: string
     static lastTabID = 0
 
-    constructor (public session: Session) {
+    constructor (public type: string, public session: Session) {
         this.id = Tab.lastTabID++
+        if (type == TYPE_SETTINGS) {
+            this.name = 'Settings'
+        }
     }
 }
 
@@ -55,7 +58,6 @@ export class AppComponent {
     lastTabIndex = 0
 
     constructor(
-        private modal: ModalService,
         private elementRef: ElementRef,
         private sessions: SessionsService,
         public hostApp: HostAppService,
@@ -118,11 +120,11 @@ export class AppComponent {
     }
 
     newTab () {
-        this.addSessionTab(this.sessions.createNewSession({command: 'bash'}))
+        this.addTerminalTab(this.sessions.createNewSession({command: 'bash'}))
     }
 
-    addSessionTab (session) {
-        let tab = new Tab(session)
+    addTerminalTab (session) {
+        let tab = new Tab(TYPE_TERMINAL, session)
         this.tabs.push(tab)
         this.selectTab(tab)
     }
@@ -161,7 +163,9 @@ export class AppComponent {
     }
 
     closeTab (tab) {
-        tab.session.gracefullyDestroy()
+        if (tab.session) {
+            tab.session.gracefullyDestroy()
+        }
         let newIndex = Math.max(0, this.tabs.indexOf(tab) - 1)
         this.tabs = this.tabs.filter((x) => x != tab)
         if (tab == this.activeTab) {
@@ -173,7 +177,7 @@ export class AppComponent {
         this.sessions.recoverAll().then((recoveredSessions) => {
             if (recoveredSessions.length > 0) {
                 recoveredSessions.forEach((session) => {
-                    this.addSessionTab(session)
+                    this.addTerminalTab(session)
                 })
             } else {
                 this.newTab()
@@ -185,6 +189,11 @@ export class AppComponent {
     }
 
     showSettings() {
-        this.modal.open(SettingsModalComponent)
+        let settingsTab = this.tabs.find((x) => x.type == TYPE_SETTINGS)
+        if (!settingsTab) {
+            settingsTab = new Tab(TYPE_SETTINGS, null)
+            this.tabs.push(settingsTab)
+        }
+        this.selectTab(settingsTab)
     }
 }
diff --git a/app/src/components/settingsModal.pug b/app/src/components/settingsModal.pug
deleted file mode 100644
index 78020461..00000000
--- a/app/src/components/settingsModal.pug
+++ /dev/null
@@ -1,20 +0,0 @@
-div.modal-body
-    ngb-tabset(type='tabs nav-justified')
-        ngb-tab
-            template(ngbTabTitle)
-                i.fa.fa-keyboard-o
-                | Hotkeys
-            template(ngbTabContent)
-                .form-group
-                    table.table
-                        tr
-                            th Toggle terminal window
-                            td
-                                hotkey-input('[(model)]'='globalHotkey')
-
-div.modal-footer
-    div.btn-group.btn-group-justified
-        a.btn.btn-default((click)='close()')
-            i.fa.fa-fw.fa-check
-            br
-            | Done
diff --git a/app/src/components/settingsModal.less b/app/src/components/settingsPane.less
similarity index 100%
rename from app/src/components/settingsModal.less
rename to app/src/components/settingsPane.less
diff --git a/app/src/components/settingsPane.pug b/app/src/components/settingsPane.pug
new file mode 100644
index 00000000..8d5e9ca7
--- /dev/null
+++ b/app/src/components/settingsPane.pug
@@ -0,0 +1,12 @@
+ngb-tabset(type='tabs nav-justified')
+    ngb-tab
+        template(ngbTabTitle)
+            i.fa.fa-keyboard-o
+            | Hotkeys
+        template(ngbTabContent)
+            .form-group
+                table.table
+                    tr
+                        th Toggle terminal window
+                        td
+                            hotkey-input('[(model)]'='globalHotkey')
diff --git a/app/src/components/settingsModal.ts b/app/src/components/settingsPane.ts
similarity index 72%
rename from app/src/components/settingsModal.ts
rename to app/src/components/settingsPane.ts
index 46065cf5..3e6d9f0d 100644
--- a/app/src/components/settingsModal.ts
+++ b/app/src/components/settingsPane.ts
@@ -2,17 +2,15 @@ import { Component } from '@angular/core'
 import { ElectronService } from 'services/electron'
 import { HostAppService, PLATFORM_WINDOWS, PLATFORM_LINUX, PLATFORM_MAC } from 'services/hostApp'
 import { ConfigService } from 'services/config'
-import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 
 
 @Component({
-  selector: 'settings-modal',
-  template: require('./settingsModal.pug'),
-  styles: [require('./settingsModal.less')],
+  selector: 'settings-pane',
+  template: require('./settingsPane.pug'),
+  styles: [require('./settingsPane.less')],
 })
-export class SettingsModalComponent {
+export class SettingsPaneComponent {
     constructor(
-        private modalInstance: NgbActiveModal,
         public config: ConfigService,
         hostApp: HostAppService,
         electron: ElectronService,
@@ -35,8 +33,4 @@ export class SettingsModalComponent {
     ngOnDestroy() {
         this.config.save()
     }
-
-    close() {
-        this.modalInstance.close()
-    }
 }
diff --git a/app/src/components/terminal.ts b/app/src/components/terminal.ts
index 097ce1bb..6a2bb5c4 100644
--- a/app/src/components/terminal.ts
+++ b/app/src/components/terminal.ts
@@ -22,6 +22,7 @@ hterm.hterm.VT.ESC['k'] = function(parseState) {
 hterm.hterm.defaultStorage = new hterm.lib.Storage.Memory()
 const pmgr = new hterm.hterm.PreferenceManager('default')
 pmgr.set('user-css', ``)
+pmgr.set('font-size', 12)
 pmgr.set('background-color', '#1D272D')
 pmgr.set('color-palette-overrides', {
     0: '#1D272D',