diff --git a/src/Devolutions.AvaloniaTheme.DevExpress/Controls/TabPane.axaml b/src/Devolutions.AvaloniaTheme.DevExpress/Controls/TabPane.axaml
index efd1436..8e8ada0 100644
--- a/src/Devolutions.AvaloniaTheme.DevExpress/Controls/TabPane.axaml
+++ b/src/Devolutions.AvaloniaTheme.DevExpress/Controls/TabPane.axaml
@@ -33,7 +33,7 @@
 
   <ControlTheme x:Key="TabPane_TabItem" TargetType="TabItem">
     <Setter Property="FontSize" Value="{DynamicResource TabItemHeaderFontSize}" />
-    <Setter Property="FontWeight" Value="{DynamicResource TabItemHeaderThemeFontWeight}" />
+    <Setter Property="FontWeight" Value="{DynamicResource DefaultFontWeight}" />
     <Setter Property="Background" Value="Transparent" />
     <Setter Property="Foreground" Value="{DynamicResource Foreground}" />
     <Setter Property="Padding" Value="{DynamicResource TabItemHeaderMargin}" />
@@ -146,7 +146,7 @@
     </Style>
 
     <Style Selector="^:selected">
-      <Setter Property="FontWeight" Value="SemiBold" />
+      <Setter Property="FontWeight" Value="{DynamicResource DemiBoldWeight}" />
     </Style>
   </ControlTheme>
 
diff --git a/src/Devolutions.AvaloniaTheme.Linux/Controls/TabItem.axaml b/src/Devolutions.AvaloniaTheme.Linux/Controls/TabItem.axaml
index b6c36a9..90eed36 100644
--- a/src/Devolutions.AvaloniaTheme.Linux/Controls/TabItem.axaml
+++ b/src/Devolutions.AvaloniaTheme.Linux/Controls/TabItem.axaml
@@ -24,8 +24,6 @@
   <Thickness x:Key="TabItemHeaderMargin">4, 0</Thickness>
 
   <ControlTheme x:Key="{x:Type TabItem}" TargetType="TabItem">
-    <!-- <Setter Property="FontSize" Value="{DynamicResource TabItemHeaderFontSize}" /> -->
-    <!-- <Setter Property="FontWeight" Value="{DynamicResource TabItemHeaderThemeFontWeight}" /> -->
     <Setter Property="FontSize" Value="14" />
     <Setter Property="FontWeight" Value="Light" />
     <Setter Property="Background" Value="{DynamicResource TabItemHeaderBackgroundUnselected}" />