diff --git a/src/BootstrapBlazor.Server/Components/Samples/Tabs.razor b/src/BootstrapBlazor.Server/Components/Samples/Tabs.razor
index 754075908ee..d424641a9b8 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/Tabs.razor
+++ b/src/BootstrapBlazor.Server/Components/Samples/Tabs.razor
@@ -384,7 +384,7 @@ private void Navigation()
     <Tab IsBorderCard="true" @ref="TabSetTemplate">
         <TabItem>
             <HeaderTemplate>
-                <div class="@GetClassString(context)" @onclick="() => OnClickTabItem(context)">
+                <div class="tabs-item" @onclick="() => OnClickTabItem(context)">
                     <i class="fa-solid fa-tv"></i>
                     <span class="mx-2">@Localizer["BlockHeaderTemplateHeaderText"]</span>
                     <Badge Color="Color.Danger" style="position: absolute; right: 2px; top: 2px;">9</Badge>
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Tabs.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/Tabs.razor.cs
index 102a8db0c95..7b0eb2d6c35 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/Tabs.razor.cs
+++ b/src/BootstrapBlazor.Server/Components/Samples/Tabs.razor.cs
@@ -150,10 +150,6 @@ private Task AddTab()
         return Task.CompletedTask;
     }
 
-    private static string? GetClassString(TabItem tabItem) => CssBuilder.Default("tabs-item")
-        .AddClass("active", tabItem.IsActive)
-        .Build();
-
     private async Task OnClickTabItem(TabItem tabItem)
     {
         TabSetTemplate.ActiveTab(tabItem);
diff --git a/src/BootstrapBlazor.Server/wwwroot/css/devui.css b/src/BootstrapBlazor.Server/wwwroot/css/devui.css
index 29f590bc83f..8ca4c311c8c 100644
--- a/src/BootstrapBlazor.Server/wwwroot/css/devui.css
+++ b/src/BootstrapBlazor.Server/wwwroot/css/devui.css
@@ -22,6 +22,10 @@ code {
     --bb-code-line-height: 1.5;
 }
 
+hr {
+    margin: .5rem 0;
+}
+
 pre code.hljs {
     padding: var(--bb-space);
 }
@@ -159,5 +163,18 @@ pre code.hljs {
 
 .tabs {
     --bb-tabs-item-height: 29px;
+    --bb-tabs-item-padding: 0 .5rem;
     --bb-tabs-body-padding: .5rem;
+    --bb-tabs-item-close-button-height: 16px;
+}
+
+.tabs-chrome > .tabs-header,
+.tabs-capsule > .tabs-header {
+    --bb-tabs-item-body-padding: 2px 8px;
+    --bb-tabs-header-height: 26px;
+}
+
+.tabs-chrome {
+    --bb-tabs-item-wrap-padding-x: 0.5rem;
+    --bb-tabs-item-body-margin-bottom: 2px;
 }
diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
index 0f703b035e8..ed26d38f41d 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>9.5.0</Version>
+    <Version>9.5.1</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BootstrapBlazor/Components/Tab/Tab.razor b/src/BootstrapBlazor/Components/Tab/Tab.razor
index bc398dd2b8a..a503659557a 100644
--- a/src/BootstrapBlazor/Components/Tab/Tab.razor
+++ b/src/BootstrapBlazor/Components/Tab/Tab.razor
@@ -86,7 +86,9 @@ else
                             {
                                 @if (item.HeaderTemplate != null)
                                 {
-                                    @item.HeaderTemplate(item)
+                                    <div @key="@item" class="@GetItemWrapClassString(item)" draggable="@DraggableString">
+                                        @item.HeaderTemplate(item)
+                                    </div>
                                 }
                                 else if (item.IsDisabled)
                                 {
diff --git a/src/BootstrapBlazor/Components/Tab/Tab.razor.scss b/src/BootstrapBlazor/Components/Tab/Tab.razor.scss
index b349a66a08b..4747744c25c 100644
--- a/src/BootstrapBlazor/Components/Tab/Tab.razor.scss
+++ b/src/BootstrapBlazor/Components/Tab/Tab.razor.scss
@@ -10,6 +10,7 @@
     --bb-tabs-bar-bg: #{$bb-tabs-bar-bg};
     --bb-tabs-body-padding: #{$bb-tabs-body-padding};
     --bb-tabs-header-vertical-min-width: #{$bb-tabs-header-vertical-min-width};
+    --bb-tabs-item-close-button-height: 21px;
     display: flex;
     flex-flow: column;
 
@@ -140,6 +141,10 @@
     list-style: none;
 }
 
+.tabs-item-wrap.active .tabs-item {
+    color: var(--bb-tabs-item-active-color);
+}
+
 .tabs-item {
     padding: var(--bb-tabs-item-padding);
     height: var(--bb-tabs-item-height);
@@ -151,48 +156,46 @@
     align-items: center;
     position: relative;
     transition: color .3s cubic-bezier(.645,.045,.355,1), padding .3s cubic-bezier(.645,.045,.355,1), transform .3s linear;
-}
 
-.tabs-item.active {
-    color: var(--bb-tabs-item-active-color);
-}
-
-.tabs-item:not(.disabled):hover {
-    color: var(--bb-tabs-item-hover-color);
-}
+    &.disabled {
+        opacity: var(--bb-tabs-item-disabled-opacity);
+    }
 
-.tabs-item.disabled {
-    opacity: var(--bb-tabs-item-disabled-opacity);
-}
+    &:not(.disabled):hover {
+        color: var(--bb-tabs-item-hover-color);
+    }
 
-.tabs-item .tabs-item-text {
-    padding: 0 0.25rem;
-    pointer-events: none;
-}
+    &:hover {
+        .tabs-item-close {
+            visibility: visible;
+        }
+    }
 
-.tabs-item.is-closeable .tabs-item-text {
-    padding-right: 1rem;
-}
+    .tabs-item-body {
+        display: flex;
+        align-items: center;
+        flex-wrap: nowrap;
+    }
 
-.tabs-item:hover .tabs-item-close {
-    display: flex;
-}
+    .tabs-item-text {
+        padding: 0 0.25rem;
+        pointer-events: none;
+        user-select: none;
+    }
 
-.tabs-item .tabs-item-close {
-    width: 21px;
-    height: 21px;
-    display: none;
-    position: absolute;
-    right: .5rem;
-    top: 10px;
-    justify-content: center;
-    align-items: center;
-    transition: all .3s linear;
-}
+    .tabs-item-close {
+        width: var(--bb-tabs-item-close-button-height);
+        height: var(--bb-tabs-item-close-button-height);
+        visibility: hidden;
+        display: flex;
+        justify-content: center;
+        align-items: center;
 
-.tabs-item .tabs-item-close:hover {
-    background-color: #e4e7ed;
-    border-radius: var(--bs-border-radius);
+        &:hover {
+            background-color: #e4e7ed;
+            border-radius: var(--bs-border-radius);
+        }
+    }
 }
 
 .tabs .tabs-body {
@@ -224,8 +227,8 @@
     border-width: 0 1px 1px 0;
 }
 
-.tabs.tabs-card > .tabs-header .tabs-item.active,
-.tabs.tabs-border-card > .tabs-header .tabs-item.active {
+.tabs.tabs-card > .tabs-header .tabs-item-wrap.active .tabs-item,
+.tabs.tabs-border-card > .tabs-header .tabs-item-wrap.active .tabs-item {
     border-width: 0 1px 0px 0;
 }
 
@@ -335,8 +338,8 @@
     border-width: 1px 1px 0 0;
 }
 
-.tabs.tabs-card.tabs-bottom > .tabs-header .tabs-item.active,
-.tabs.tabs-border-card.tabs-bottom > .tabs-header .tabs-item.active {
+.tabs.tabs-card.tabs-bottom > .tabs-header .tabs-item-wrap.active .tabs-item,
+.tabs.tabs-border-card.tabs-bottom > .tabs-header .tabs-item-wrap.active .tabs-item {
     border-width: 0 1px 0 0;
 }
 
@@ -394,7 +397,7 @@
     justify-content: flex-end;
 }
 
-.tabs.tabs-vertical > .tabs-header .tabs-item:last-child {
+.tabs.tabs-vertical > .tabs-header .tabs-item-wrap:last-child .tabs-item {
     border-width: 0 1px 0 0;
 }
 
@@ -407,13 +410,13 @@
     justify-content: flex-start;
 }
 
-.tabs.tabs-vertical.tabs-card > .tabs-header .tabs-item.active,
-.tabs.tabs-vertical.tabs-border-card > .tabs-header .tabs-item.active {
+.tabs.tabs-vertical.tabs-card > .tabs-header .tabs-item-wrap.active .tabs-item,
+.tabs.tabs-vertical.tabs-border-card > .tabs-header .tabs-item-wrap.active .tabs-item {
     border-width: 0 0 1px 0;
 }
 
-.tabs.tabs-vertical.tabs-card > .tabs-header .tabs-item:last-child.active,
-.tabs.tabs-vertical.tabs-border-card > .tabs-header .tabs-item:last-child.active {
+.tabs.tabs-vertical.tabs-card > .tabs-header .tabs-item-wrap:last-child.active .tabs-item,
+.tabs.tabs-vertical.tabs-border-card > .tabs-header .tabs-item-wrap:last-child.active .tabs-item {
     border-width: 0;
 }
 
@@ -422,13 +425,13 @@
     border-width: 0 0 1px 1px;
 }
 
-.tabs.tabs-card.tabs-right > .tabs-header .tabs-item.active,
-.tabs.tabs-border-card.tabs-right > .tabs-header .tabs-item.active {
+.tabs.tabs-card.tabs-right > .tabs-header .tabs-item-wrap.active .tabs-item,
+.tabs.tabs-border-card.tabs-right > .tabs-header .tabs-item-wrap.active .tabs-item {
     border-width: 0 0 1px 0;
 }
 
-.tabs.tabs-card.tabs-right > .tabs-header .tabs-item:last-child.active,
-.tabs.tabs-border-card.tabs-right > .tabs-header .tabs-item:last-child.active {
+.tabs.tabs-card.tabs-right > .tabs-header .tabs-item-wrap:last-child.active .tabs-item,
+.tabs.tabs-border-card.tabs-right > .tabs-header .tabs-item-wrap:last-child.active .tabs-item {
     border-width: 0;
 }
 
@@ -486,12 +489,16 @@
 
 .tabs-chrome > .tabs-header,
 .tabs-capsule > .tabs-header {
+    --bb-tabs-header-height: 36px;
     --bb-tabs-header-bg-color: var(--bs-border-color);
+    --bb-tabs-item-body-border-radius: 14.5px;
+    --bb-tabs-item-body-padding: 4px 10px;
     --bb-tabs-item-hover-bg-color: rgba(var(--bs-body-color-rgb), 0.1);
     --bb-tabs-item-active-bg-color: var(--bs-body-bg);
     --bb-tabs-item-active-color: var(--bs-body-color);
     --bb-tabs-item-hover-color: var(--bs-body-color);
     --bb-tabs-item-bg-color: rgba(var(--bs-body-color-rgb), 0.08);
+    --bb-tabs-item-text-padding: 0 .5rem;
     background-color: var(--bb-tabs-header-bg-color);
 
     .tabs-item-fix {
@@ -504,7 +511,7 @@
                 &:hover {
                     background-color: var(--bb-tabs-item-hover-bg-color);
                 }
-            }       
+            }
         }
 
         .btn-fs {
@@ -513,21 +520,19 @@
 
         .tabs-item {
             .tabs-item-body {
-                padding: 4px 10px;
+                padding: var(--bb-tabs-item-body-padding);
                 display: flex;
                 align-items: center;
                 flex-wrap: nowrap;
-                border-radius: 14.5px;
+                border-radius: var(--bb-tabs-item-body-border-radius);
 
                 .tabs-item-text {
-                    padding: 0 .5rem;
+                    padding: var(--bb-tabs-item-text-padding);
                 }
 
                 .tabs-item-close {
                     display: flex;
                     position: unset;
-                    width: 21px;
-                    height: 21px;
                     border-radius: 50%;
                 }
             }
@@ -566,8 +571,14 @@
     }
 }
 
+.tabs-chrome {
+    --bb-tabs-header-padding: 0 0.25rem;
+    --bb-tabs-item-wrap-padding-x: 1rem;
+    --bb-tabs-item-body-margin-bottom: 4px;
+}
+
 .tabs-chrome > .tabs-header {
-    padding: 0 .25rem;
+    padding: var(--bb-tabs-header-padding);
 
     .tabs-item-wrap {
         overflow: hidden;
@@ -575,7 +586,7 @@
         display: flex;
         align-items: flex-end;
         flex-shrink: 0;
-        padding: 0 1rem;
+        padding: 0 var(--bb-tabs-item-wrap-padding-x);
 
         &.active {
             z-index: 1;
@@ -590,7 +601,7 @@
         }
 
         &:not(:first-child) {
-            margin-left: -2rem;
+            margin-left: calc(0px - 2 * var(--bb-tabs-item-wrap-padding-x));
         }
 
         &:not(.active) {
@@ -607,11 +618,14 @@
                     }
                 }
             }
+        }
 
-            &:hover + .tabs-item-wrap {
+        &.active,
+        &:hover {
+            + .tabs-item-wrap {
                 .tabs-item {
                     &:before {
-                        content: none;
+                        content: none !important;
                     }
                 }
             }
@@ -621,16 +635,16 @@
             border: none !important;
             border-top-left-radius: 10px;
             border-top-right-radius: 10px;
-            height: 36px !important;
+            height: var(--bb-tabs-header-height) !important;
 
             .tabs-item-body {
-                margin-bottom: 4px;
+                margin-bottom: var(--bb-tabs-item-body-margin-bottom);
             }
         }
 
         .tab-corner {
-            height: 2rem;
-            width: 2rem;
+            height: calc(2 * var(--bb-tabs-item-wrap-padding-x));
+            width: calc(2 * var(--bb-tabs-item-wrap-padding-x));
             display: inline-flex;
             justify-content: center;
             align-items: center;
@@ -647,7 +661,7 @@
 
         .tab-corner-left {
             bottom: 0;
-            left: -1rem;
+            left: calc(0px - var(--bb-tabs-item-wrap-padding-x));
 
             &::after {
                 border-bottom-right-radius: 50%;
@@ -656,7 +670,7 @@
 
         .tab-corner-right {
             bottom: 0;
-            right: -1rem;
+            right: calc(0px - var(--bb-tabs-item-wrap-padding-x));
 
             &::after {
                 border-bottom-left-radius: 50%;
@@ -667,7 +681,7 @@
 
 .tabs-capsule > .tabs-header {
     .tabs-item-wrap {
-        margin-left: .5rem;
+        margin-left: calc(var(--bb-tabs-item-wrap-padding-x) / 2);
 
         &.active {
             .tabs-item {