diff --git a/src/Avalonia.Themes.Fluent2/Accents/BaseResources.xaml b/src/Avalonia.Themes.Fluent2/Accents/BaseResources.xaml
index 690af6dee2..dd66f42ebf 100644
--- a/src/Avalonia.Themes.Fluent2/Accents/BaseResources.xaml
+++ b/src/Avalonia.Themes.Fluent2/Accents/BaseResources.xaml
@@ -6,7 +6,10 @@
fonts:Inter#Inter, $Default
14
- 00:00:00.167
+ 00:00:00.167
+ 00:00:00.250
+ 00:00:00.168
+ 00:00:00.083
diff --git a/src/Avalonia.Themes.Fluent2/Accents/Fluent2TokenResources.xaml b/src/Avalonia.Themes.Fluent2/Accents/Fluent2TokenResources.xaml
index 4e9634e6aa..806598b935 100644
--- a/src/Avalonia.Themes.Fluent2/Accents/Fluent2TokenResources.xaml
+++ b/src/Avalonia.Themes.Fluent2/Accents/Fluent2TokenResources.xaml
@@ -300,8 +300,4 @@
-
- 00:00:00.250
- 00:00:00.168
- 00:00:00.083
diff --git a/src/Avalonia.Themes.Fluent2/Controls/Button.xaml b/src/Avalonia.Themes.Fluent2/Controls/Button.xaml
index 72193e187d..75fd1a7399 100644
--- a/src/Avalonia.Themes.Fluent2/Controls/Button.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/Button.xaml
@@ -39,7 +39,7 @@
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}">
-
+
diff --git a/src/Avalonia.Themes.Fluent2/Controls/CalendarButton.xaml b/src/Avalonia.Themes.Fluent2/Controls/CalendarButton.xaml
index 2fcf23b148..ea2d905ed3 100644
--- a/src/Avalonia.Themes.Fluent2/Controls/CalendarButton.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/CalendarButton.xaml
@@ -53,7 +53,7 @@
ClipToBounds="True">
-
+
diff --git a/src/Avalonia.Themes.Fluent2/Controls/CalendarDayButton.xaml b/src/Avalonia.Themes.Fluent2/Controls/CalendarDayButton.xaml
index 3426d91f51..c9a853f677 100644
--- a/src/Avalonia.Themes.Fluent2/Controls/CalendarDayButton.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/CalendarDayButton.xaml
@@ -53,7 +53,7 @@
ClipToBounds="True">
-
+
diff --git a/src/Avalonia.Themes.Fluent2/Controls/CalendarItem.xaml b/src/Avalonia.Themes.Fluent2/Controls/CalendarItem.xaml
index fe0f34f156..c7ca536a45 100644
--- a/src/Avalonia.Themes.Fluent2/Controls/CalendarItem.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/CalendarItem.xaml
@@ -46,7 +46,7 @@
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}">
-
+
diff --git a/src/Avalonia.Themes.Fluent2/Controls/ComboBox.xaml b/src/Avalonia.Themes.Fluent2/Controls/ComboBox.xaml
index 56abfc2d5c..1cddc28d1a 100644
--- a/src/Avalonia.Themes.Fluent2/Controls/ComboBox.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/ComboBox.xaml
@@ -111,7 +111,7 @@
MinWidth="{DynamicResource ComboBoxThemeMinWidth}">
-
+
diff --git a/src/Avalonia.Themes.Fluent2/Controls/DatePicker.xaml b/src/Avalonia.Themes.Fluent2/Controls/DatePicker.xaml
index 358f6e5d79..8f32f9556e 100644
--- a/src/Avalonia.Themes.Fluent2/Controls/DatePicker.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/DatePicker.xaml
@@ -62,7 +62,7 @@
CornerRadius="{TemplateBinding CornerRadius}">
-
+
diff --git a/src/Avalonia.Themes.Fluent2/Controls/DateTimePickerShared.xaml b/src/Avalonia.Themes.Fluent2/Controls/DateTimePickerShared.xaml
index 4dbe510744..d6c9bb49cf 100644
--- a/src/Avalonia.Themes.Fluent2/Controls/DateTimePickerShared.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/DateTimePickerShared.xaml
@@ -93,7 +93,7 @@
CornerRadius="{TemplateBinding CornerRadius}">
-
+
diff --git a/src/Avalonia.Themes.Fluent2/Controls/DropDownButton.xaml b/src/Avalonia.Themes.Fluent2/Controls/DropDownButton.xaml
index ff83ab346c..84bfc20f2c 100644
--- a/src/Avalonia.Themes.Fluent2/Controls/DropDownButton.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/DropDownButton.xaml
@@ -45,7 +45,7 @@
Padding="{TemplateBinding Padding}">
-
+
diff --git a/src/Avalonia.Themes.Fluent2/Controls/HyperlinkButton.xaml b/src/Avalonia.Themes.Fluent2/Controls/HyperlinkButton.xaml
index 9600d1f1ff..5afaf02ec2 100644
--- a/src/Avalonia.Themes.Fluent2/Controls/HyperlinkButton.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/HyperlinkButton.xaml
@@ -44,7 +44,7 @@
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}">
-
+
diff --git a/src/Avalonia.Themes.Fluent2/Controls/NotificationCard.xaml b/src/Avalonia.Themes.Fluent2/Controls/NotificationCard.xaml
index a429d61303..0208c7c181 100644
--- a/src/Avalonia.Themes.Fluent2/Controls/NotificationCard.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/NotificationCard.xaml
@@ -56,7 +56,7 @@
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}">
-
+
diff --git a/src/Avalonia.Themes.Fluent2/Controls/RepeatButton.xaml b/src/Avalonia.Themes.Fluent2/Controls/RepeatButton.xaml
index 77d55bb3c9..606e0e5be2 100644
--- a/src/Avalonia.Themes.Fluent2/Controls/RepeatButton.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/RepeatButton.xaml
@@ -40,7 +40,7 @@
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}">
-
+
diff --git a/src/Avalonia.Themes.Fluent2/Controls/ScrollBar.xaml b/src/Avalonia.Themes.Fluent2/Controls/ScrollBar.xaml
index 2e438f47b3..14d6a60029 100644
--- a/src/Avalonia.Themes.Fluent2/Controls/ScrollBar.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/ScrollBar.xaml
@@ -94,7 +94,7 @@
-
+
@@ -151,7 +151,7 @@
Grid.RowSpan="3">
-
+
@@ -239,7 +239,7 @@
Grid.ColumnSpan="3">
-
+
diff --git a/src/Avalonia.Themes.Fluent2/Controls/ScrollViewer.xaml b/src/Avalonia.Themes.Fluent2/Controls/ScrollViewer.xaml
index 3aa6af59ca..75a90cdb0f 100644
--- a/src/Avalonia.Themes.Fluent2/Controls/ScrollViewer.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/ScrollViewer.xaml
@@ -59,7 +59,7 @@
Opacity="0">
-
+
diff --git a/src/Avalonia.Themes.Fluent2/Controls/SplitButton.xaml b/src/Avalonia.Themes.Fluent2/Controls/SplitButton.xaml
index f61b7708b3..c91ef44fce 100644
--- a/src/Avalonia.Themes.Fluent2/Controls/SplitButton.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/SplitButton.xaml
@@ -63,7 +63,7 @@
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}">
-
+
diff --git a/src/Avalonia.Themes.Fluent2/Controls/TabItem.xaml b/src/Avalonia.Themes.Fluent2/Controls/TabItem.xaml
index 5790e609d0..f7a30ae432 100644
--- a/src/Avalonia.Themes.Fluent2/Controls/TabItem.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/TabItem.xaml
@@ -44,7 +44,7 @@
Padding="{TemplateBinding Padding}">
-
+
diff --git a/src/Avalonia.Themes.Fluent2/Controls/TabStripItem.xaml b/src/Avalonia.Themes.Fluent2/Controls/TabStripItem.xaml
index b7c12b9039..c1df2cdf9b 100644
--- a/src/Avalonia.Themes.Fluent2/Controls/TabStripItem.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/TabStripItem.xaml
@@ -42,7 +42,7 @@
Padding="{TemplateBinding Padding}">
-
+
diff --git a/src/Avalonia.Themes.Fluent2/Controls/TimePicker.xaml b/src/Avalonia.Themes.Fluent2/Controls/TimePicker.xaml
index 3d71b4a637..0f18c8d803 100644
--- a/src/Avalonia.Themes.Fluent2/Controls/TimePicker.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/TimePicker.xaml
@@ -61,7 +61,7 @@
CornerRadius="{TemplateBinding CornerRadius}">
-
+
diff --git a/src/Avalonia.Themes.Fluent2/Controls/ToggleButton.xaml b/src/Avalonia.Themes.Fluent2/Controls/ToggleButton.xaml
index 9ef5d169c4..b48460df29 100644
--- a/src/Avalonia.Themes.Fluent2/Controls/ToggleButton.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/ToggleButton.xaml
@@ -43,7 +43,7 @@
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}">
-
+
diff --git a/src/Avalonia.Themes.Fluent2/Controls/TreeViewItem.xaml b/src/Avalonia.Themes.Fluent2/Controls/TreeViewItem.xaml
index a7c9a4247d..4da3c3242a 100644
--- a/src/Avalonia.Themes.Fluent2/Controls/TreeViewItem.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/TreeViewItem.xaml
@@ -84,7 +84,7 @@
TemplatedControl.IsTemplateFocusTarget="True">
-
+