diff --git a/main/ui/src/main/resources/css/dark_theme.css b/main/ui/src/main/resources/css/dark_theme.css
index 3ba21ba99..24d77b829 100644
--- a/main/ui/src/main/resources/css/dark_theme.css
+++ b/main/ui/src/main/resources/css/dark_theme.css
@@ -97,26 +97,32 @@
  ******************************************************************************/
 
 .tab-pane {
-	-fx-tab-min-height: 24;
+	-fx-tab-min-height: 2em;
 }
+
 .tab-pane > .tab-header-area {
 	-fx-padding: 6px 12px 0 12px;
 	-fx-background-color: CONTROL_BORDER_FOCUSED, MAIN_BG;
-    -fx-background-insets: 0, 0 0 1 0;
+	-fx-background-insets: 0, 0 0 1px 0;
 }
+
 .tab-pane > .tab-header-area > .headers-region > .tab {
-	-fx-text-fill: TEXT_FILL;
-	-fx-alignment: CENTER;
-	-fx-background-color: CONTROL_BORDER_NORMAL, CONTROL_BORDER_FOCUSED, MAIN_BG;
-	-fx-background-insets: 0, 1px 1px 0 1px, 1px;
+	-fx-background-color: CONTROL_BORDER_NORMAL, MAIN_BG;
+	-fx-background-insets: 0 0 1px 0, 1px;
 	-fx-background-radius: 4px 4px 0 0;
 	-fx-padding: 0.2em 0.4em 0.2em 0.4em;
 }
+
 .tab-pane > .tab-header-area > .headers-region > .tab:selected {
 	-fx-background-color: CONTROL_BORDER_FOCUSED, MAIN_BG;
 	-fx-background-insets: 0, 1px 1px 0 1px;
 }
 
+.tab-pane > .tab-header-area > .headers-region > .tab > .tab-container > .tab-label {
+	-fx-text-fill: TEXT_FILL;
+	-fx-alignment: CENTER;
+}
+
 /*******************************************************************************
  *                                                                             *
  * SplitPane                                                                   *
@@ -139,7 +145,7 @@
  ******************************************************************************/
 
 .list-view {
-    -fx-background-color: CONTROL_BG_NORMAL;
+	-fx-background-color: CONTROL_BG_NORMAL;
 }
 
 .list-cell:selected {
@@ -165,7 +171,6 @@
 	-fx-border-width: 0 0 3px 0;
 }
 
-
 .onboarding-overlay-arc {
 	-fx-stroke: TEXT_FILL;
 	-fx-fill: transparent;
@@ -183,7 +188,7 @@
 	-fx-background-insets: 0;
 	-fx-background-radius: 0;
 	-fx-border-color: transparent CONTROL_BORDER_NORMAL transparent transparent;
-    -fx-border-width: 1;
+	-fx-border-width: 1;
 }
 
 .toolbar-container .button:armed {
diff --git a/main/ui/src/main/resources/css/light_theme.css b/main/ui/src/main/resources/css/light_theme.css
index 020b07a1e..f33837828 100644
--- a/main/ui/src/main/resources/css/light_theme.css
+++ b/main/ui/src/main/resources/css/light_theme.css
@@ -19,7 +19,7 @@
 	SCROLL_BAR_THUMB_HOVER: #B1B1B1;
 
 	-fx-background-color: MAIN_BG;
-    -fx-text-fill: TEXT_FILL;
+	-fx-text-fill: TEXT_FILL;
 }
 
 /*******************************************************************************
@@ -97,26 +97,32 @@
  ******************************************************************************/
 
 .tab-pane {
-	-fx-tab-min-height: 24;
+	-fx-tab-min-height: 2em;
 }
+
 .tab-pane > .tab-header-area {
 	-fx-padding: 6px 12px 0 12px;
 	-fx-background-color: CONTROL_BORDER_FOCUSED, MAIN_BG;
-    -fx-background-insets: 0, 0 0 1 0;
+	-fx-background-insets: 0, 0 0 1px 0;
 }
+
 .tab-pane > .tab-header-area > .headers-region > .tab {
-	-fx-text-fill: TEXT_FILL;
-	-fx-alignment: CENTER;
-	-fx-background-color: CONTROL_BORDER_NORMAL, CONTROL_BORDER_FOCUSED, MAIN_BG;
-	-fx-background-insets: 0, 1px 1px 0 1px, 1px;
+	-fx-background-color: CONTROL_BORDER_NORMAL, MAIN_BG;
+	-fx-background-insets: 0 0 1px 0, 1px;
 	-fx-background-radius: 4px 4px 0 0;
 	-fx-padding: 0.2em 0.4em 0.2em 0.4em;
 }
+
 .tab-pane > .tab-header-area > .headers-region > .tab:selected {
 	-fx-background-color: CONTROL_BORDER_FOCUSED, MAIN_BG;
 	-fx-background-insets: 0, 1px 1px 0 1px;
 }
 
+.tab-pane > .tab-header-area > .headers-region > .tab > .tab-container > .tab-label {
+	-fx-text-fill: TEXT_FILL;
+	-fx-alignment: CENTER;
+}
+
 /*******************************************************************************
  *                                                                             *
  * SplitPane                                                                   *
@@ -139,7 +145,7 @@
  ******************************************************************************/
 
 .list-view {
-    -fx-background-color: CONTROL_BG_NORMAL;
+	-fx-background-color: CONTROL_BG_NORMAL;
 }
 
 .list-cell:selected {
@@ -182,7 +188,7 @@
 	-fx-background-insets: 0;
 	-fx-background-radius: 0;
 	-fx-border-color: transparent CONTROL_BORDER_NORMAL transparent transparent;
-    -fx-border-width: 1;
+	-fx-border-width: 1;
 }
 
 .toolbar-container .button:armed {