diff --git a/src/assets/css/librarybrowser.css b/src/assets/css/librarybrowser.css
index dd47651d3f..8475b72b2f 100644
--- a/src/assets/css/librarybrowser.css
+++ b/src/assets/css/librarybrowser.css
@@ -275,7 +275,7 @@
 
 @media all and (min-width: 84em) {
     .headerTop {
-        padding: 1.25em 1.25em;
+        padding: 0.8em 0.8em;
     }
 
     .headerTabs {
@@ -288,9 +288,8 @@
         -webkit-box-pack: center;
         -webkit-justify-content: center;
         justify-content: center;
-        margin-top: -3em;
         position: relative;
-        top: -0.35em;
+        margin-top: -4.3em;
     }
 
     .libraryPage:not(.noSecondaryNavPage) {
@@ -768,7 +767,8 @@
 
 @media all and (min-width: 62.5em) {
     .headerTop {
-        padding: 0.8em 0;
+        padding-left: 0.8em;
+        padding-right: 0.8em;
     }
 
     .headerTabs {
@@ -776,7 +776,7 @@
         width: auto;
         align-items: center;
         justify-content: center;
-        margin-top: -3.34em;
+        margin-top: -4.3em;
         position: relative;
     }
 
diff --git a/src/components/emby-tabs/emby-tabs.css b/src/components/emby-tabs/emby-tabs.css
index 8d1ac464fb..733a05fb0b 100644
--- a/src/components/emby-tabs/emby-tabs.css
+++ b/src/components/emby-tabs/emby-tabs.css
@@ -1,4 +1,7 @@
 .emby-tab-button {
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
     background: transparent;
     box-shadow: none;
     cursor: pointer;
@@ -10,7 +13,7 @@
     vertical-align: middle;
     flex-shrink: 0;
     margin: 0;
-    padding: 1em 0.9em;
+    padding: 1.5em;
     position: relative;
     height: auto;
     min-width: initial;
diff --git a/src/themes/dark/theme.css b/src/themes/dark/theme.css
index 4912e591c7..58e9ab1856 100644
--- a/src/themes/dark/theme.css
+++ b/src/themes/dark/theme.css
@@ -311,6 +311,14 @@ html {
 
 .emby-tab-button-active {
     color: #fff;
+    border-bottom: 2px solid #fff;
+    padding-top: 1.55em;
+    padding-bottom: 1.38em;
+}
+
+.layout-mobile .emby-tab-button-active {
+    padding-top: 1.56em; /* Add one pixel to get a better fit in mobile layout */
+    padding-bottom: 1.38em;
 }
 
 .emby-tab-button.show-focus:focus {