diff --git a/samples/ControlCatalog/Pages/ButtonPage.xaml b/samples/ControlCatalog/Pages/ButtonPage.xaml
index 8b697b7948..74073bffa6 100644
--- a/samples/ControlCatalog/Pages/ButtonPage.xaml
+++ b/samples/ControlCatalog/Pages/ButtonPage.xaml
@@ -9,8 +9,8 @@
                 Margin="0,16,0,0"
                 HorizontalAlignment="Center"
                 Spacing="16">
-      <StackPanel Orientation="Vertical" Spacing="8" Width="150">
-        <Button>Button</Button>
+      <StackPanel Orientation="Vertical" Spacing="8" Width="200">
+        <Button>Standard XAML Button</Button>
         <Button Foreground="White">Foreground</Button>
         <Button Background="{DynamicResource ThemeAccentBrush}">Background</Button>
         <Button IsEnabled="False">Disabled</Button>
diff --git a/src/Avalonia.Themes.Fluent/Accents/Base.xaml b/src/Avalonia.Themes.Fluent/Accents/Base.xaml
index 6dc59bed21..4973ecbdbf 100644
--- a/src/Avalonia.Themes.Fluent/Accents/Base.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/Base.xaml
@@ -12,8 +12,8 @@
     <Color x:Key="SystemColorHotlight">#FF0066CC</Color>
     <Color x:Key="SystemColorWindow">#FFFFFFFF</Color>
     <Color x:Key="SystemColorWindowText">#FF000000</Color>
-    <FontFamily x:Key="ContentControlThemeFontFamily">Segoe UI</FontFamily>
-    <sys:Double x:Key="ControlContentThemeFontSize">14</sys:Double>
+    <FontFamily x:Key="ContentControlThemeFontFamily">avares://Avalonia.Themes.Fluent/Assets#Open Sans</FontFamily>
+    <sys:Double x:Key="ControlContentThemeFontSize">13</sys:Double>
 
     <SolidColorBrush x:Key="SystemControlTransparentBrush" Color="Transparent" />
     <x:Boolean x:Key="UseSystemFocusVisuals">True</x:Boolean>
diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml
index 8647e7f0dc..58b87be586 100644
--- a/src/Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml
@@ -11,8 +11,8 @@
     <SolidColorBrush x:Key="SystemControlTransparentRevealBorderBrush" Color="Transparent" />
     
     <!-- Override system shape defaults -->
-    <CornerRadius x:Key="ControlCornerRadius">2,2,2,2</CornerRadius>
-    <CornerRadius x:Key="OverlayCornerRadius">4,4,4,4</CornerRadius>
+    <CornerRadius x:Key="ControlCornerRadius">3</CornerRadius>
+    <CornerRadius x:Key="OverlayCornerRadius">5</CornerRadius>
     
     <!-- Override system borders -->
     <Thickness x:Key="MenuBarItemBorderThickness">1,1,1,1</Thickness>
diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml
index 2b960259d0..699a5d606f 100644
--- a/src/Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml
@@ -11,8 +11,8 @@
     <SolidColorBrush x:Key="SystemControlTransparentRevealBorderBrush" Color="Transparent" />
     
     <!-- Override system shape defaults -->
-    <CornerRadius x:Key="ControlCornerRadius">2,2,2,2</CornerRadius>
-    <CornerRadius x:Key="OverlayCornerRadius">4,4,4,4</CornerRadius>
+    <CornerRadius x:Key="ControlCornerRadius">3</CornerRadius>
+    <CornerRadius x:Key="OverlayCornerRadius">5</CornerRadius>
     
     <!-- Override system borders -->
     <Thickness x:Key="MenuBarItemBorderThickness">1,1,1,1</Thickness>
diff --git a/src/Avalonia.Themes.Fluent/Assets/OpenSans-Bold.ttf b/src/Avalonia.Themes.Fluent/Assets/OpenSans-Bold.ttf
new file mode 100644
index 0000000000..efdd5e84a0
Binary files /dev/null and b/src/Avalonia.Themes.Fluent/Assets/OpenSans-Bold.ttf differ
diff --git a/src/Avalonia.Themes.Fluent/Assets/OpenSans-BoldItalic.ttf b/src/Avalonia.Themes.Fluent/Assets/OpenSans-BoldItalic.ttf
new file mode 100644
index 0000000000..9bf9b4e97b
Binary files /dev/null and b/src/Avalonia.Themes.Fluent/Assets/OpenSans-BoldItalic.ttf differ
diff --git a/src/Avalonia.Themes.Fluent/Assets/OpenSans-ExtraBold.ttf b/src/Avalonia.Themes.Fluent/Assets/OpenSans-ExtraBold.ttf
new file mode 100644
index 0000000000..67fcf0fb2a
Binary files /dev/null and b/src/Avalonia.Themes.Fluent/Assets/OpenSans-ExtraBold.ttf differ
diff --git a/src/Avalonia.Themes.Fluent/Assets/OpenSans-ExtraBoldItalic.ttf b/src/Avalonia.Themes.Fluent/Assets/OpenSans-ExtraBoldItalic.ttf
new file mode 100644
index 0000000000..086722809c
Binary files /dev/null and b/src/Avalonia.Themes.Fluent/Assets/OpenSans-ExtraBoldItalic.ttf differ
diff --git a/src/Avalonia.Themes.Fluent/Assets/OpenSans-Italic.ttf b/src/Avalonia.Themes.Fluent/Assets/OpenSans-Italic.ttf
new file mode 100644
index 0000000000..117856707b
Binary files /dev/null and b/src/Avalonia.Themes.Fluent/Assets/OpenSans-Italic.ttf differ
diff --git a/src/Avalonia.Themes.Fluent/Assets/OpenSans-Light.ttf b/src/Avalonia.Themes.Fluent/Assets/OpenSans-Light.ttf
new file mode 100644
index 0000000000..6580d3a169
Binary files /dev/null and b/src/Avalonia.Themes.Fluent/Assets/OpenSans-Light.ttf differ
diff --git a/src/Avalonia.Themes.Fluent/Assets/OpenSans-LightItalic.ttf b/src/Avalonia.Themes.Fluent/Assets/OpenSans-LightItalic.ttf
new file mode 100644
index 0000000000..1e0c331981
Binary files /dev/null and b/src/Avalonia.Themes.Fluent/Assets/OpenSans-LightItalic.ttf differ
diff --git a/src/Avalonia.Themes.Fluent/Assets/OpenSans-Regular.ttf b/src/Avalonia.Themes.Fluent/Assets/OpenSans-Regular.ttf
new file mode 100644
index 0000000000..29bfd35a2b
Binary files /dev/null and b/src/Avalonia.Themes.Fluent/Assets/OpenSans-Regular.ttf differ
diff --git a/src/Avalonia.Themes.Fluent/Assets/OpenSans-SemiBold.ttf b/src/Avalonia.Themes.Fluent/Assets/OpenSans-SemiBold.ttf
new file mode 100644
index 0000000000..54e7059cf3
Binary files /dev/null and b/src/Avalonia.Themes.Fluent/Assets/OpenSans-SemiBold.ttf differ
diff --git a/src/Avalonia.Themes.Fluent/Assets/OpenSans-SemiBoldItalic.ttf b/src/Avalonia.Themes.Fluent/Assets/OpenSans-SemiBoldItalic.ttf
new file mode 100644
index 0000000000..aebcf14212
Binary files /dev/null and b/src/Avalonia.Themes.Fluent/Assets/OpenSans-SemiBoldItalic.ttf differ
diff --git a/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj b/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj
index 8a38b5eead..c2a1359e8a 100644
--- a/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj
+++ b/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj
@@ -13,9 +13,8 @@
     <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
     <ProjectReference Include="..\Avalonia.Styling\Avalonia.Styling.csproj" />    
     <AvaloniaResource Include="**/*.xaml" />
-    <AvaloniaResource Include="Assets\*" />
-  </ItemGroup>
+    <AvaloniaResource Include="Assets\*" />  
   </ItemGroup>
   <Import Project="..\..\build\BuildTargets.targets" />
   <Import Project="..\..\build\Rx.props" />
-</Project>
\ No newline at end of file
+</Project>