diff --git a/src/core/gui/TabContainer.css b/src/core/gui/TabContainer.css
index cce87e05..2b3c0a48 100644
--- a/src/core/gui/TabContainer.css
+++ b/src/core/gui/TabContainer.css
@@ -2,14 +2,17 @@
     box-sizing: border-box;
     background-color: hsl(0, 0%, 16%);
     padding: 3px 0 0 0;
+    border-bottom: solid 1px var(--border-color);
 }
 
 .core_TabContainer_Tab {
+    box-sizing: border-box;
     display: inline-block;
-    height: 100%;
-    line-height: 25px;
+    height: calc(100% + 1px);
+    line-height: 22px;
     padding: 0 10px;
-    margin: 0 1px;
+    border: solid 1px var(--border-color);
+    margin: 0 1px -1px 1px;
     color: #c0c0c0;
     font-size: 15px;
 }
@@ -22,4 +25,5 @@
 .core_TabContainer_Tab.active {
     background-color: var(--bg-color);
     color: hsl(0, 0%, 90%);
+    border-bottom-color: var(--bg-color);
 }
diff --git a/src/core/gui/ToolBar.css b/src/core/gui/ToolBar.css
index 439c1b1d..a556c3e3 100644
--- a/src/core/gui/ToolBar.css
+++ b/src/core/gui/ToolBar.css
@@ -3,7 +3,6 @@
     display: flex;
     flex-direction: row;
     align-items: center;
-    padding-top: 1px;
     border-bottom: solid var(--border-color) 1px;
 }
 
diff --git a/src/core/gui/ToolBar.ts b/src/core/gui/ToolBar.ts
index 7088114c..5583cbf8 100644
--- a/src/core/gui/ToolBar.ts
+++ b/src/core/gui/ToolBar.ts
@@ -5,7 +5,7 @@ import { LabelledControl } from "./LabelledControl";
 
 export class ToolBar extends View {
     readonly element = create_el("div", "core_ToolBar");
-    readonly height = 34;
+    readonly height = 35;
 
     constructor(...children: View[]) {
         super();