diff --git a/common.props b/common.props
index 1d7fcfe8..976ff0d9 100644
--- a/common.props
+++ b/common.props
@@ -29,8 +29,8 @@
    </ItemGroup>
 -->
   <ItemGroup>
-	<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
-	<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
+	<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.6" />
+	<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.6" />
 	<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
   </ItemGroup>
diff --git a/src/SharedMauiXamlStylesLibrary.SampleApp/AppShell.xaml b/src/SharedMauiXamlStylesLibrary.SampleApp/AppShell.xaml
index b4fc6dcd..63d51b7d 100644
--- a/src/SharedMauiXamlStylesLibrary.SampleApp/AppShell.xaml
+++ b/src/SharedMauiXamlStylesLibrary.SampleApp/AppShell.xaml
@@ -31,6 +31,11 @@
         ContentTemplate="{DataTemplate views:EntryPage}"
         Route="EntryPage" />
 
+    <ShellContent
+        Title="SfSegmentedControl"
+        ContentTemplate="{DataTemplate views:SfSegmentedControlPage}"
+        Route="SfSegmentedControlPage" />
+
     <ShellContent
         Title="TabView"
         ContentTemplate="{DataTemplate views:TabViewPage}"
diff --git a/src/SharedMauiXamlStylesLibrary.SampleApp/Hosting/AppHostBuilderExtensions.cs b/src/SharedMauiXamlStylesLibrary.SampleApp/Hosting/AppHostBuilderExtensions.cs
index 5c942484..9735bc7d 100644
--- a/src/SharedMauiXamlStylesLibrary.SampleApp/Hosting/AppHostBuilderExtensions.cs
+++ b/src/SharedMauiXamlStylesLibrary.SampleApp/Hosting/AppHostBuilderExtensions.cs
@@ -35,6 +35,7 @@ public static MauiAppBuilder RegisterMainViewModels(this MauiAppBuilder builder)
             builder.Services.AddSingleton<LabesPageViewModel>();
             builder.Services.AddSingleton<EntryPageViewModel>();
             builder.Services.AddSingleton<ButtonsPageViewModel>();
+            builder.Services.AddSingleton<SfSegmentedControlPageViewModel>();
             builder.Services.AddSingleton<TabViewPageViewModel>();
             return builder;
         }
@@ -47,6 +48,7 @@ public static MauiAppBuilder RegisterMainViews(this MauiAppBuilder builder)
             builder.Services.AddSingleton<ButtonsPage>();
             builder.Services.AddSingleton<EntryPage>();
             builder.Services.AddSingleton<LabelsPage>();
+            builder.Services.AddSingleton<SfSegmentedControlPage>();
             builder.Services.AddSingleton<TabViewPage>();
             return builder;
         }
diff --git a/src/SharedMauiXamlStylesLibrary.SampleApp/SharedMauiXamlStylesLibrary.SampleApp.csproj b/src/SharedMauiXamlStylesLibrary.SampleApp/SharedMauiXamlStylesLibrary.SampleApp.csproj
index dcf9983d..90cce147 100644
--- a/src/SharedMauiXamlStylesLibrary.SampleApp/SharedMauiXamlStylesLibrary.SampleApp.csproj
+++ b/src/SharedMauiXamlStylesLibrary.SampleApp/SharedMauiXamlStylesLibrary.SampleApp.csproj
@@ -54,6 +54,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
+	  <Compile Update="Views\SfSegmentedControlPage.xaml.cs">
+	    <DependentUpon>SfSegmentedControlPage.xaml</DependentUpon>
+	  </Compile>
 	  <Compile Update="Views\EntryPage.xaml.cs">
 	    <DependentUpon>EntryPage.xaml</DependentUpon>
 	  </Compile>
@@ -87,5 +90,8 @@
 	  <MauiXaml Update="Views\LabelsPage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="Views\SfSegmentedControlPage.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	</ItemGroup>
 </Project>
diff --git a/src/SharedMauiXamlStylesLibrary.SampleApp/ViewModels/SfSegmentedControlPageViewModel.cs b/src/SharedMauiXamlStylesLibrary.SampleApp/ViewModels/SfSegmentedControlPageViewModel.cs
new file mode 100644
index 00000000..022b5e9e
--- /dev/null
+++ b/src/SharedMauiXamlStylesLibrary.SampleApp/ViewModels/SfSegmentedControlPageViewModel.cs
@@ -0,0 +1,35 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using System.Collections.ObjectModel;
+
+namespace SharedMauiXamlStylesLibrary.SampleApp.ViewModels
+{
+    public partial class SfSegmentedControlPageViewModel : BaseViewModel
+    {
+
+        #region Properties
+
+        [ObservableProperty]
+        ObservableCollection<string> sizes = [
+            "S", "M", "L", "XL", "XXL"
+            ];
+
+        [ObservableProperty]
+        int selectedSizeIndex = 0;
+        partial void OnSelectedSizeIndexChanged(int value) => SelectedSize = Sizes[value];
+        
+        [ObservableProperty]
+        string selectedSize = string.Empty;
+        #endregion
+
+        #region Constructor, LoadSettings
+
+        public SfSegmentedControlPageViewModel(IDispatcher dispatcher, IServiceProvider provider) : base(dispatcher, provider)
+        {
+            Dispatcher = dispatcher;
+            UpdateVersionBuild();
+        }
+
+        #endregion
+
+    }
+}
diff --git a/src/SharedMauiXamlStylesLibrary.SampleApp/Views/SfSegmentedControlPage.xaml b/src/SharedMauiXamlStylesLibrary.SampleApp/Views/SfSegmentedControlPage.xaml
new file mode 100644
index 00000000..d690f8b3
--- /dev/null
+++ b/src/SharedMauiXamlStylesLibrary.SampleApp/Views/SfSegmentedControlPage.xaml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    x:Class="SharedMauiXamlStylesLibrary.SampleApp.Views.SfSegmentedControlPage"
+    
+    xmlns:viewModels="clr-namespace:SharedMauiXamlStylesLibrary.SampleApp.ViewModels"
+    
+    xmlns:converters="clr-namespace:AndreasReitberger.Shared.Core.Converters;assembly=SharedMauiCoreLibrary"
+    
+    xmlns:icons="clr-namespace:AndreasReitberger.Shared.FontIcons;assembly=SharedMauiXamlStylesLibrary"
+    xmlns:iconsSyncfusion="clr-namespace:AndreasReitberger.Shared.Syncfusion.FontIcons;assembly=SharedMauiXamlStylesLibrary.Syncfusion"
+    xmlns:buttons="clr-namespace:Syncfusion.Maui.Buttons;assembly=Syncfusion.Maui.Buttons"
+    
+    Title="SfSegmentedControlPage"
+    Style="{StaticResource Style.Core.ContentPage.Default}"
+    x:DataType="viewModels:SfSegmentedControlPageViewModel"   
+    >
+    <ContentPage.Resources>
+        <converters:BrushToBlackWhiteConverter x:Key="BrushToBlackWhiteConverter" />
+    </ContentPage.Resources>
+    <ScrollView>
+        <VerticalStackLayout>
+            <Label 
+                Margin="2,16"
+                Text="Segmented Control (Syncfusion)"
+                VerticalTextAlignment="Center" 
+                HorizontalTextAlignment="Center"
+                Style="{StaticResource Style.Core.Label.Default}"
+                />
+            <!--        
+                Style="{StaticResource Style.Syncfusion.SfSegmentedControl.Default}"
+            -->
+            <buttons:SfSegmentedControl
+                Margin="4,16"
+                ItemsSource="{Binding Sizes}"
+                SelectedIndex="{Binding SelectedSizeIndex, Mode=TwoWay}"
+                Style="{StaticResource Style.Syncfusion.SfSegmentedControl.Default}"
+                />
+
+            <buttons:SfSegmentedControl
+                Margin="4,16"
+                ItemsSource="{Binding Sizes}"
+                SelectedIndex="{Binding SelectedSizeIndex, Mode=TwoWay}"
+                Style="{StaticResource Style.Syncfusion.SfSegmentedControl.Borderless}"
+                />
+
+        </VerticalStackLayout>
+    </ScrollView>
+</ContentPage>
\ No newline at end of file
diff --git a/src/SharedMauiXamlStylesLibrary.SampleApp/Views/SfSegmentedControlPage.xaml.cs b/src/SharedMauiXamlStylesLibrary.SampleApp/Views/SfSegmentedControlPage.xaml.cs
new file mode 100644
index 00000000..e97218c6
--- /dev/null
+++ b/src/SharedMauiXamlStylesLibrary.SampleApp/Views/SfSegmentedControlPage.xaml.cs
@@ -0,0 +1,12 @@
+using SharedMauiXamlStylesLibrary.SampleApp.ViewModels;
+
+namespace SharedMauiXamlStylesLibrary.SampleApp.Views;
+
+public partial class SfSegmentedControlPage : ContentPage
+{
+    public SfSegmentedControlPage(SfSegmentedControlPageViewModel viewModel)
+    {
+        InitializeComponent();
+        BindingContext = viewModel;
+    }
+}
\ No newline at end of file
diff --git a/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/Controls/SfButton.xaml b/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/Controls/SfButton.xaml
new file mode 100644
index 00000000..5c1de56f
--- /dev/null
+++ b/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/Controls/SfButton.xaml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<?xaml-comp compile="true" ?>
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    
+    xmlns:converters="clr-namespace:AndreasReitberger.Shared.Core.Converters;assembly=SharedMauiCoreLibrary"
+    xmlns:shared="clr-namespace:AndreasReitberger.Shared;assembly=SharedMauiXamlStylesLibrary"
+    xmlns:icons="clr-namespace:AndreasReitberger.Shared.Syncfusion.FontIcons"
+    xmlns:iconsCore="clr-namespace:AndreasReitberger.Shared.FontIcons;assembly=SharedMauiXamlStylesLibrary"
+    
+    xmlns:core="clr-namespace:Syncfusion.Maui.Core;assembly=Syncfusion.Maui.Core"
+    xmlns:buttons="clr-namespace:Syncfusion.Maui.Buttons;assembly=Syncfusion.Maui.Buttons"
+    >
+    <ResourceDictionary.MergedDictionaries>
+        <shared:Colors />
+        <shared:Fonts />
+        <ResourceDictionary Source="/Resources/Themes/SharedFonts.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <converters:BrushToBlackWhiteConverter x:Key="BrushToBlackWhiteConverter"/>
+
+    <!-- Docs: https://help.syncfusion.com/maui/button/overview -->
+    <Style x:Key="Style.Syncfusion.SfButton.Default" TargetType="buttons:SfButton">
+        <Setter Property="FontFamily" Value="{StaticResource MontserratSemiBold}" />
+        <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Black}}" />
+        <Setter Property="TextColor" Value="{Binding Source={RelativeSource Self}, Path=Background, Converter={StaticResource BrushToBlackWhiteConverter}}" />
+        <Setter Property="FontSize" Value="Small" />
+        <Setter Property="VisualStateManager.VisualStateGroups">
+            <VisualStateGroupList>
+                <VisualStateGroup x:Name="CommonStates">
+                    <VisualState x:Name="Normal">
+                        <VisualState.Setters>
+                            <Setter Property="Background" Value="{DynamicResource PrimaryColor}"/>
+                            <Setter Property="TextColor" Value="{Binding Source={RelativeSource Self}, Path=Background, Converter={StaticResource BrushToBlackWhiteConverter}}" />
+                        </VisualState.Setters>
+                    </VisualState>
+                    <VisualState x:Name="Disabled">
+                        <VisualState.Setters>
+                            <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource LightGray}, Dark={StaticResource DarkGray}}" />
+                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource DarkGray}, Dark={StaticResource LightGray}}" />
+                        </VisualState.Setters>
+                    </VisualState>
+                </VisualStateGroup>
+            </VisualStateGroupList>
+        </Setter>
+    </Style>
+
+    <Style TargetType="buttons:SfButton" BasedOn="{StaticResource Style.Syncfusion.SfButton.Default}"/>
+
+    <Style x:Key="Style.Syncfusion.SfButton.Icon" TargetType="buttons:SfButton" BasedOn="{StaticResource Style.Syncfusion.SfButton.Default}">
+        <Setter Property="Background" Value="{StaticResource Transparent}" />
+        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray600}, Dark={StaticResource Gray400}}" />
+        <Setter Property="FontFamily" Value="{StaticResource FontIcons}" />
+        <Setter Property="FontSize" Value="{OnIdiom Desktop=Medium, Default=Large}" />
+        <Setter Property="HorizontalTextAlignment" Value="Center" />
+        <Setter Property="VerticalTextAlignment" Value="Center" />
+        <Setter Property="HeightRequest" Value="{OnIdiom Phone=40, Default=60}" />
+        <Setter Property="WidthRequest" Value="{OnIdiom Phone=40, Default=60}" />
+    </Style>
+
+    <Style x:Key="Style.Syncfusion.SfButton.Icon.MaterialDesign" TargetType="buttons:SfButton" BasedOn="{StaticResource Style.Syncfusion.SfButton.Icon}">
+        <Setter Property="FontFamily" Value="{StaticResource MaterialDesignIcons}" />
+        <Setter Property="FontSize" Value="{OnIdiom Desktop=32, Tablet=26, Default=22}" />
+    </Style>
+
+    <Style x:Key="Style.Syncfusion.SfButton.IconRound.MaterialDesign" TargetType="buttons:SfButton">
+        <Setter Property="Background" Value="{StaticResource Transparent}" />
+        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray600}, Dark={StaticResource Gray400}}" />
+        <Setter Property="FontFamily" Value="{StaticResource MaterialDesignIcons}" />
+        <Setter Property="FontSize" Value="{OnIdiom Desktop=32, Tablet=32, Phone=22, Default=22}" />
+        <Setter Property="HorizontalTextAlignment" Value="Center" />
+        <Setter Property="VerticalTextAlignment" Value="Center" />
+        <Setter Property="HeightRequest" Value="{OnIdiom Phone=40, Default=60}" />
+        <Setter Property="WidthRequest" Value="{OnIdiom Phone=40, Default=60}" />
+        <Setter Property="CornerRadius" Value="{OnIdiom Phone=20, Default=30}" />
+    </Style>
+
+    <Style x:Key="Style.Syncfusion.SfButton.IconRound.EmergencyStop" TargetType="buttons:SfButton" BasedOn="{StaticResource Style.Syncfusion.SfButton.IconRound.MaterialDesign}">
+        <Setter Property="Text" Value="{x:Static iconsCore:MaterialIcons.HandBackRight}" />
+        <Setter Property="Background" Value="{StaticResource Red}" />
+        <Setter Property="TextColor" Value="{StaticResource White}" />
+        <Setter Property="Stroke" Value="{StaticResource Yellow}" />
+        <Setter Property="StrokeThickness" Value="3" />
+        <Setter Property="HeightRequest" Value="{OnIdiom Phone=50, Default=70}" />
+        <Setter Property="WidthRequest" Value="{OnIdiom Phone=50, Default=70}" />
+        <Setter Property="CornerRadius" Value="{OnIdiom Phone=25, Default=35}" />
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/Controls/SfSegmentedControl.xaml b/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/Controls/SfSegmentedControl.xaml
new file mode 100644
index 00000000..b543ce18
--- /dev/null
+++ b/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/Controls/SfSegmentedControl.xaml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<?xaml-comp compile="true" ?>
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    
+    xmlns:converters="clr-namespace:AndreasReitberger.Shared.Core.Converters;assembly=SharedMauiCoreLibrary"
+    xmlns:core="clr-namespace:Syncfusion.Maui.Core;assembly=Syncfusion.Maui.Core"
+    xmlns:buttons="clr-namespace:Syncfusion.Maui.Buttons;assembly=Syncfusion.Maui.Buttons"
+    xmlns:shared="clr-namespace:AndreasReitberger.Shared;assembly=SharedMauiXamlStylesLibrary"
+    >
+    <ResourceDictionary.MergedDictionaries>
+        <shared:Colors />
+        <shared:Fonts />
+        <ResourceDictionary Source="/Resources/Themes/SharedFonts.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <converters:BrushToBlackWhiteConverter x:Key="BrushToBlackWhiteConverter"/>
+
+    <!-- Docs: https://help.syncfusion.com/maui/segmented-control/overviews -->
+    <Style x:Key="Style.Syncfusion.SfSegmentedControl.Default" TargetType="buttons:SfSegmentedControl">
+        <Setter Property="TextStyle">
+            <Setter.Value>
+                <buttons:SegmentTextStyle
+                    FontSize="{OnIdiom Phone=14, Default=18}"
+                    FontFamily="{StaticResource MontserratBold}"
+                    TextColor="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}"   
+                    />
+            </Setter.Value>
+        </Setter>
+        <!--
+            Causes exception => Operation is not valid due to the current state of the object.
+            TextColor="{Binding Source={RelativeSource Self}, Path=Background, Converter={StaticResource BrushToBlackWhiteConverter}}"  
+        -->
+        <Setter Property="SelectionIndicatorSettings">
+            <Setter.Value>
+                <buttons:SelectionIndicatorSettings
+                    Background="{DynamicResource PrimaryColor}"
+                    TextColor="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}"
+                    />
+            </Setter.Value>
+        </Setter>
+        
+        <Setter Property="StrokeThickness" Value="2" />
+        <Setter Property="Stroke" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray800}}" />
+        <Setter Property="CornerRadius" Value="8" />
+        <Setter Property="SegmentCornerRadius" Value="0" />
+    </Style>
+
+    <Style x:Key="Style.Syncfusion.SfSegmentedControl.Printers" TargetType="buttons:SfSegmentedControl" BasedOn="{StaticResource Style.Syncfusion.SfSegmentedControl.Default}">
+        <Setter Property="SegmentBackground" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Black}}" />
+        <Setter Property="Stroke" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Black}}" />
+        <Setter Property="SegmentWidth" Value="48" />
+    </Style>
+
+    <Style x:Key="Style.Syncfusion.SfSegmentedControl.Borderless" TargetType="buttons:SfSegmentedControl" BasedOn="{StaticResource Style.Syncfusion.SfSegmentedControl.Default}">
+        <Setter Property="TextStyle">
+            <Setter.Value>
+                <buttons:SegmentTextStyle
+                    FontSize="{OnIdiom Phone=10, Default=14}"   
+                    FontFamily="{StaticResource MontserratBold}"
+                    TextColor="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}"   
+                    />    
+            </Setter.Value>
+        </Setter>
+        <!--
+            Causes exception => Operation is not valid due to the current state of the object.
+            TextColor="{Binding Source={RelativeSource Self}, Path=Background, Converter={StaticResource BrushToBlackWhiteConverter}}"  
+        -->
+        <Setter Property="SelectionIndicatorSettings">
+            <Setter.Value>
+                <buttons:SelectionIndicatorSettings
+                    Background="{DynamicResource PrimaryColor}"
+                    TextColor="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}"
+                    SelectionIndicatorPlacement="Border"
+                    />
+            </Setter.Value>
+        </Setter>
+        <Setter Property="StrokeThickness" Value="0" />
+        <Setter Property="SegmentWidth" Value="{OnIdiom Phone=32, Default=64}" />
+        <Setter Property="CornerRadius" Value="{OnIdiom Phone=16, Default=32}" />
+        <Setter Property="SegmentCornerRadius" Value="{OnIdiom Phone=16, Default=32}" />
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/Controls/SfTreeView.xaml b/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/Controls/SfTreeView.xaml
index 7a81d613..8472a5e1 100644
--- a/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/Controls/SfTreeView.xaml
+++ b/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/Controls/SfTreeView.xaml
@@ -15,7 +15,7 @@
 
     <Style x:Key="Style.Syncfusion.SfTreeView.Default" TargetType="treeView:SfTreeView">
         <Setter Property="SelectionForeground" Value="{DynamicResource PrimaryColor}"/>
-        <Setter Property="SelectionBackground" Value="{AppThemeBinding Light={StaticResource Gray100}, Dark={StaticResource Gray950}}" />
+        <Setter Property="SelectionBackground" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray800}}" />
         <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Black}}" />
     </Style>
 
diff --git a/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/DefaultTheme.xaml b/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/DefaultTheme.xaml
index 56915887..b6ad9ce6 100644
--- a/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/DefaultTheme.xaml
+++ b/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/DefaultTheme.xaml
@@ -10,6 +10,7 @@
         <shared:Colors />
         <shared:Fonts />
 
+        <ResourceDictionary Source="/Resources/Themes/SharedConverters.xaml" />
         <ResourceDictionary Source="/Resources/Themes/SharedFonts.xaml" />
         <!-- Templates must come for styles! -->
         <ResourceDictionary Source="/Resources/Themes/SharedTemplates.xaml" />
diff --git a/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/SharedConverters.xaml b/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/SharedConverters.xaml
new file mode 100644
index 00000000..e3b19584
--- /dev/null
+++ b/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/SharedConverters.xaml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    x:Class="AndreasReitberger.Shared.Syncfusion.SharedConverters"
+    
+    xmlns:converters="clr-namespace:AndreasReitberger.Shared.Syncfusion.Converters"
+    >
+    <!-- Syncfusion Converters -->
+    <converters:BooleanToBadgeIconConverter x:Key="BooleanToBadgeIconConverter" />
+    <converters:DictionaryToChartSeriesCollectionConverter x:Key="DictionaryToChartSeriesCollectionConverter" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/SharedConverters.xaml.cs b/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/SharedConverters.xaml.cs
new file mode 100644
index 00000000..9a36fb5a
--- /dev/null
+++ b/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/SharedConverters.xaml.cs
@@ -0,0 +1,9 @@
+namespace AndreasReitberger.Shared.Syncfusion;
+
+public partial class SharedConverters
+{
+    public SharedConverters()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/SharedStyles.xaml b/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/SharedStyles.xaml
index 4dde4b67..faf2d46b 100644
--- a/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/SharedStyles.xaml
+++ b/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/SharedStyles.xaml
@@ -11,6 +11,7 @@
         <ResourceDictionary Source="/Resources/Themes/Controls/SfAutoComplete.xaml" />
         <ResourceDictionary Source="/Resources/Themes/Controls/SfBadgeView.xaml" />
         <ResourceDictionary Source="/Resources/Themes/Controls/SfBusyIndicator.xaml" />
+        <ResourceDictionary Source="/Resources/Themes/Controls/SfButton.xaml" />
         <ResourceDictionary Source="/Resources/Themes/Controls/SfCartesianChart.xaml" />
         <ResourceDictionary Source="/Resources/Themes/Controls/SfChips.xaml" />
         <ResourceDictionary Source="/Resources/Themes/Controls/SfComboBox.xaml" />
@@ -20,9 +21,10 @@
         <ResourceDictionary Source="/Resources/Themes/Controls/SfNumericEntry.xaml" />
         <ResourceDictionary Source="/Resources/Themes/Controls/SfPicker.xaml" />
         <ResourceDictionary Source="/Resources/Themes/Controls/SfRadialGauge.xaml" />
-        <ResourceDictionary Source="/Resources/Themes/Controls/SfSlider.xaml" />
         <ResourceDictionary Source="/Resources/Themes/Controls/SfRating.xaml" />
         <ResourceDictionary Source="/Resources/Themes/Controls/SfRangeSlider.xaml" />
+        <ResourceDictionary Source="/Resources/Themes/Controls/SfSegmentedControl.xaml" />
+        <ResourceDictionary Source="/Resources/Themes/Controls/SfSlider.xaml" />
         <ResourceDictionary Source="/Resources/Themes/Controls/SfTabView.xaml" />
         <ResourceDictionary Source="/Resources/Themes/Controls/SfTextInputLayout.xaml" />
         <ResourceDictionary Source="/Resources/Themes/Controls/SfTreeView.xaml" />
diff --git a/src/SharedMauiXamlStylesLibrary.Syncfusion/SharedMauiXamlStylesLibrary.Syncfusion.csproj b/src/SharedMauiXamlStylesLibrary.Syncfusion/SharedMauiXamlStylesLibrary.Syncfusion.csproj
index f9f336d4..439f4b8b 100644
--- a/src/SharedMauiXamlStylesLibrary.Syncfusion/SharedMauiXamlStylesLibrary.Syncfusion.csproj
+++ b/src/SharedMauiXamlStylesLibrary.Syncfusion/SharedMauiXamlStylesLibrary.Syncfusion.csproj
@@ -55,22 +55,26 @@
 	
 	<ItemGroup>
 	  <ProjectReference Include="..\SharedMauiXamlStylesLibrary\SharedMauiXamlStylesLibrary.csproj" />
-	  <PackageReference Include="Syncfusion.Maui.Buttons" Version="24.2.3" />
-	  <PackageReference Include="Syncfusion.Maui.Charts" Version="24.2.3" />
-	  <PackageReference Include="Syncfusion.Maui.Core" Version="24.2.3" />
-	  <PackageReference Include="Syncfusion.Maui.DataGrid" Version="24.2.3" />
-	  <PackageReference Include="Syncfusion.Maui.Expander" Version="24.2.3" />
-	  <PackageReference Include="Syncfusion.Maui.Gauges" Version="24.2.3" />
-	  <PackageReference Include="Syncfusion.Maui.Inputs" Version="24.2.3" />
-	  <PackageReference Include="Syncfusion.Maui.ListView" Version="24.2.3" />
-	  <PackageReference Include="Syncfusion.Maui.Picker" Version="24.2.3" />
-	  <PackageReference Include="Syncfusion.Maui.Scheduler" Version="24.2.3" />
-	  <PackageReference Include="Syncfusion.Maui.Sliders" Version="24.2.3" />
-	  <PackageReference Include="Syncfusion.Maui.TabView" Version="24.2.3" />
-	  <PackageReference Include="Syncfusion.Maui.TreeView" Version="24.2.3" />
+	  <PackageReference Include="Syncfusion.Maui.Buttons" Version="24.2.4" />
+	  <PackageReference Include="Syncfusion.Maui.Charts" Version="24.2.4" />
+	  <PackageReference Include="Syncfusion.Maui.Core" Version="24.2.4" />
+	  <PackageReference Include="Syncfusion.Maui.DataGrid" Version="24.2.4" />
+	  <PackageReference Include="Syncfusion.Maui.Expander" Version="24.2.4" />
+	  <PackageReference Include="Syncfusion.Maui.Gauges" Version="24.2.4" />
+	  <PackageReference Include="Syncfusion.Maui.Inputs" Version="24.2.4" />
+	  <PackageReference Include="Syncfusion.Maui.ListView" Version="24.2.4" />
+	  <PackageReference Include="Syncfusion.Maui.Picker" Version="24.2.4" />
+	  <PackageReference Include="Syncfusion.Maui.Scheduler" Version="24.2.4" />
+	  <PackageReference Include="Syncfusion.Maui.Sliders" Version="24.2.4" />
+	  <PackageReference Include="Syncfusion.Maui.TabView" Version="24.2.4" />
+	  <PackageReference Include="Syncfusion.Maui.TreeView" Version="24.2.4" />
 	</ItemGroup>
 
 	<ItemGroup>
+	  <Compile Update="Resources\Themes\SharedConverters.xaml.cs">
+	    <SubType>Code</SubType>
+	    <DependentUpon>SharedConverters.xaml</DependentUpon>
+	  </Compile>
 	  <Compile Update="Resources\Themes\SyncfusionTheme.xaml.cs">
 	    <SubType>Code</SubType>
 	    <DependentUpon>SyncfusionTheme.xaml</DependentUpon>
@@ -107,12 +111,21 @@
 	</ItemGroup>
 
 	<ItemGroup>
+	  <MauiXaml Update="Resources\Themes\Controls\SfButton.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
+	  <MauiXaml Update="Resources\Themes\Controls\SfSegmentedControl.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Resources\Themes\Controls\SfPicker.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
 	  <MauiXaml Update="Resources\Themes\Controls\SfTreeView.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="Resources\Themes\SharedConverters.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Resources\Themes\SyncfusionTheme.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
diff --git a/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/Button.xaml b/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/Button.xaml
index a52df797..89d425d2 100644
--- a/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/Button.xaml
+++ b/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/Button.xaml
@@ -25,7 +25,6 @@
         <!-- Set Background before setting the TextColor due to the Converter -->
         <Setter Property="Background" Value="{DynamicResource PrimaryColor}"/>
         <Setter Property="TextColor" Value="{Binding Source={RelativeSource Self}, Path=Background, Converter={StaticResource BrushToBlackWhiteConverter}}" />
-        <!--<Setter Property="TextColor" Value="{Binding Source={RelativeSource Self}, Path=BackgroundColor, Converter={StaticResource ColorToBlackWhiteConverter}}" /> -->
         <Setter Property="FontFamily" Value="{StaticResource MontserratSemiBold}" />
         <Setter Property="FontSize" Value="Small" />
         <Setter Property="VisualStateManager.VisualStateGroups">
@@ -131,6 +130,12 @@
         <Setter Property="FontSize" Value="{OnIdiom Desktop=Medium, Default=Large}" />
     </Style>
 
+    <Style x:Key="Style.Core.Button.IconSmall.MaterialDesign" TargetType="Button" BasedOn="{StaticResource Style.Core.Button.Icon.MaterialDesign}">
+        <Setter Property="FontSize" Value="{OnIdiom Desktop=Small, Default=Default}" />
+        <Setter Property="HeightRequest" Value="{OnIdiom Desktop=48, Tablet=48, Default=40}" />
+        <Setter Property="WidthRequest" Value="{OnIdiom Desktop=48, Tablet=48, Default=40}" />
+    </Style>
+
     <Style x:Key="Style.Core.Button.IconPrimary.MaterialDesign" TargetType="Button" BasedOn="{StaticResource Style.Core.Button.Icon.MaterialDesign}">
         <Setter Property="Background" Value="{DynamicResource PrimaryColor}" />
         <Setter Property="TextColor" Value="{Binding Source={RelativeSource Self}, Path=Background, Converter={StaticResource BrushToBlackWhiteConverter}}" />
diff --git a/src/SharedMauiXamlStylesLibrary/Resources/Themes/DefaultTheme.xaml b/src/SharedMauiXamlStylesLibrary/Resources/Themes/DefaultTheme.xaml
index 82a17007..0611093d 100644
--- a/src/SharedMauiXamlStylesLibrary/Resources/Themes/DefaultTheme.xaml
+++ b/src/SharedMauiXamlStylesLibrary/Resources/Themes/DefaultTheme.xaml
@@ -5,6 +5,7 @@
     x:Class="AndreasReitberger.Shared.DefaultTheme"
     >
     <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="/Resources/Themes/SharedConverters.xaml" />
         <ResourceDictionary Source="/Resources/Themes/SharedColors.xaml" />
         <ResourceDictionary Source="/Resources/Themes/SharedFonts.xaml" />
         <!-- Templates must come for styles! -->
diff --git a/src/SharedMauiXamlStylesLibrary/Resources/Themes/SharedConverters.xaml b/src/SharedMauiXamlStylesLibrary/Resources/Themes/SharedConverters.xaml
new file mode 100644
index 00000000..ffe75035
--- /dev/null
+++ b/src/SharedMauiXamlStylesLibrary/Resources/Themes/SharedConverters.xaml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    x:Class="AndreasReitberger.Shared.SharedConverters"
+    xmlns:converters="clr-namespace:AndreasReitberger.Shared.Core.Converters;assembly=SharedMauiCoreLibrary"
+    >
+    <!-- Common Converters -->
+    <converters:BooleanVisibilityConverter x:Key="BooleanVisibilityConverter" />
+    <converters:BooleanReverseVisibilityConverter x:Key="BooleanReverseVisibilityConverter" />
+    <converters:ByteArrayToImageConverter x:Key="ByteArrayToImageConverter" />
+    <converters:DoubleHoursToTimeSpanConverter x:Key="DoubleHoursToTimeSpanConverter" />
+    <converters:DoubleSecondsToETAConverter x:Key="DoubleSecondsToETAConverter" />
+    <converters:UnixDoubleHoursToTimeSpanConverter x:Key="UnixDoubleHoursToTimeSpanConverter" />
+    <converters:LongToGigaByteConverter x:Key="LongToGigaByteConverter" />
+    <converters:LongToMegaByteConverter x:Key="LongToMegaByteConverter" />
+    <converters:StringToColorConverter x:Key="StringToColorConverter" />
+    <converters:ColorToBlackWhiteConverter x:Key="ColorToBlackWhiteConverter" />
+    <converters:BrushToBlackWhiteConverter x:Key="BrushToBlackWhiteConverter" />
+    <converters:UriToStringConverter x:Key="UriToStringConverter" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/SharedMauiXamlStylesLibrary/Resources/Themes/SharedConverters.xaml.cs b/src/SharedMauiXamlStylesLibrary/Resources/Themes/SharedConverters.xaml.cs
new file mode 100644
index 00000000..10946f93
--- /dev/null
+++ b/src/SharedMauiXamlStylesLibrary/Resources/Themes/SharedConverters.xaml.cs
@@ -0,0 +1,9 @@
+namespace AndreasReitberger.Shared;
+
+public partial class SharedConverters
+{
+    public SharedConverters()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/src/SharedMauiXamlStylesLibrary/SharedMauiXamlStylesLibrary.csproj b/src/SharedMauiXamlStylesLibrary/SharedMauiXamlStylesLibrary.csproj
index 7b0e216d..4b61c471 100644
--- a/src/SharedMauiXamlStylesLibrary/SharedMauiXamlStylesLibrary.csproj
+++ b/src/SharedMauiXamlStylesLibrary/SharedMauiXamlStylesLibrary.csproj
@@ -64,6 +64,10 @@
 	  <Compile Update="Resources\Themes\MinimalisticTheme.xaml.cs">
 		  <DependentUpon>MinimalisticTheme.xaml</DependentUpon>
 	  </Compile>
+	  <Compile Update="Resources\Themes\SharedConverters.xaml.cs">
+	    <SubType>Code</SubType>
+	    <DependentUpon>SharedConverters.xaml</DependentUpon>
+	  </Compile>
 	  <Compile Update="Resources\Themes\SharedTemplates.xaml.cs">
 	    <DependentUpon>SharedTemplates.xaml</DependentUpon>
 	  </Compile>
@@ -95,6 +99,12 @@
 	  </Compile>
 	</ItemGroup>
 	
+	<ItemGroup>
+	  <MauiXaml Update="Resources\Themes\SharedConverters.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
+	</ItemGroup>
+	
 	<ItemGroup>
 	  <PackageReference Update="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
 	  <PackageReference Update="Microsoft.Maui.Controls" Version="8.0.6" />