diff --git a/sample/Atc.Wpf.Sample/SamplesWpfControls/ButtonControls/AuthenticationButtonView.xaml b/sample/Atc.Wpf.Sample/SamplesWpfControls/ButtonControls/AuthenticationButtonView.xaml
new file mode 100644
index 00000000..5502a7c8
--- /dev/null
+++ b/sample/Atc.Wpf.Sample/SamplesWpfControls/ButtonControls/AuthenticationButtonView.xaml
@@ -0,0 +1,79 @@
+<UserControl
+    x:Class="Atc.Wpf.Sample.SamplesWpfControls.ButtonControls.AuthenticationButtonView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:atc="https://github.com/atc-net/atc-wpf/tree/main/schemas"
+    xmlns:atcValueConverters="https://github.com/atc-net/atc-wpf/tree/main/schemas/value-converters"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:fontIcons="clr-namespace:Atc.Wpf.FontIcons;assembly=Atc.Wpf.FontIcons"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+
+    <atc:AutoGrid Columns="*" Rows="Auto,*">
+
+        <GroupBox
+            Margin="0,0,0,10"
+            Padding="10"
+            Header="Features" />
+
+        <GroupBox Header="Usage">
+            <ScrollViewer>
+                <atc:GridEx Columns="*,10,*" ShowGridLines="True">
+                    <atc:UniformSpacingPanel
+                        Grid.Column="0"
+                        Margin="10"
+                        Orientation="Vertical"
+                        Spacing="10">
+
+                        <atc:UniformSpacingPanel
+                            ItemWidth="100"
+                            Orientation="Horizontal"
+                            Spacing="10">
+
+                            <atc:UniformSpacingPanel Orientation="Vertical" Spacing="10">
+
+                                <atc:AuthenticationButton
+                                    IsAuthenticated="{Binding Path=IsAuthenticated}"
+                                    IsBusy="{Binding Path=IsBusy}"
+                                    LoginCommand="{Binding Path=LoginCommand}"
+                                    LogoutCommand="{Binding Path=LogoutCommand}" />
+
+                                <atc:AuthenticationButton
+                                    IsAuthenticated="{Binding Path=IsAuthenticated}"
+                                    IsBusy="{Binding Path=IsBusy}"
+                                    LoginCommand="{Binding Path=LoginCommand}"
+                                    LoginContent="MyLogin"
+                                    LoginImageSource="{Binding Source={x:Static fontIcons:FontMaterialDesignType.Login}, Converter={x:Static atcValueConverters:FontIconImageSourceValueConverter.Instance}, ConverterParameter={StaticResource AtcApps.Brushes.ThemeForeground}}"
+                                    LogoutCommand="{Binding Path=LogoutCommand}"
+                                    LogoutContent="MyLogout"
+                                    LogoutImageSource="{Binding Source={x:Static fontIcons:FontMaterialDesignType.Logout}, Converter={x:Static atcValueConverters:FontIconImageSourceValueConverter.Instance}, ConverterParameter={StaticResource AtcApps.Brushes.Accent}}" />
+
+                            </atc:UniformSpacingPanel>
+
+                        </atc:UniformSpacingPanel>
+
+                    </atc:UniformSpacingPanel>
+                    <atc:UniformSpacingPanel
+                        Grid.Column="2"
+                        Margin="10"
+                        Orientation="Vertical"
+                        Spacing="10">
+
+                        <atc:UniformSpacingPanel
+                            ItemWidth="100"
+                            Orientation="Horizontal"
+                            Spacing="10">
+
+                            <atc:UniformSpacingPanel Orientation="Vertical" Spacing="10" />
+
+                        </atc:UniformSpacingPanel>
+
+                    </atc:UniformSpacingPanel>
+                </atc:GridEx>
+            </ScrollViewer>
+        </GroupBox>
+    </atc:AutoGrid>
+
+</UserControl>
diff --git a/sample/Atc.Wpf.Sample/SamplesWpfControls/ButtonControls/AuthenticationButtonView.xaml.cs b/sample/Atc.Wpf.Sample/SamplesWpfControls/ButtonControls/AuthenticationButtonView.xaml.cs
new file mode 100644
index 00000000..98528a99
--- /dev/null
+++ b/sample/Atc.Wpf.Sample/SamplesWpfControls/ButtonControls/AuthenticationButtonView.xaml.cs
@@ -0,0 +1,53 @@
+namespace Atc.Wpf.Sample.SamplesWpfControls.ButtonControls;
+
+public partial class AuthenticationButtonView
+{
+    public AuthenticationButtonView()
+    {
+        InitializeComponent();
+
+        DataContext = this;
+    }
+
+    [DependencyProperty]
+    private bool isBusy;
+
+    [DependencyProperty]
+    private bool isAuthenticated;
+
+    [RelayCommand]
+    private async Task Login()
+    {
+        IsBusy = true;
+
+        await Task
+            .Delay(2_000)
+            .ConfigureAwait(false);
+
+        await Application.Current.Dispatcher
+            .InvokeAsyncIfRequired(() =>
+            {
+                IsAuthenticated = true;
+                IsBusy = false;
+            })
+            .ConfigureAwait(false);
+    }
+
+    [RelayCommand]
+    private async Task Logout()
+    {
+        IsBusy = true;
+
+        await Task
+            .Delay(500)
+            .ConfigureAwait(false);
+
+        await Application.Current.Dispatcher
+            .InvokeAsyncIfRequired(() =>
+            {
+                IsAuthenticated = false;
+                IsBusy = false;
+            })
+            .ConfigureAwait(false);
+    }
+}
\ No newline at end of file
diff --git a/sample/Atc.Wpf.Sample/SamplesWpfControls/ButtonControls/ConnectivityButtonView.xaml b/sample/Atc.Wpf.Sample/SamplesWpfControls/ButtonControls/ConnectivityButtonView.xaml
new file mode 100644
index 00000000..a23bc43b
--- /dev/null
+++ b/sample/Atc.Wpf.Sample/SamplesWpfControls/ButtonControls/ConnectivityButtonView.xaml
@@ -0,0 +1,79 @@
+<UserControl
+    x:Class="Atc.Wpf.Sample.SamplesWpfControls.ButtonControls.ConnectivityButtonView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:atc="https://github.com/atc-net/atc-wpf/tree/main/schemas"
+    xmlns:atcValueConverters="https://github.com/atc-net/atc-wpf/tree/main/schemas/value-converters"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:fontIcons="clr-namespace:Atc.Wpf.FontIcons;assembly=Atc.Wpf.FontIcons"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+
+    <atc:AutoGrid Columns="*" Rows="Auto,*">
+
+        <GroupBox
+            Margin="0,0,0,10"
+            Padding="10"
+            Header="Features" />
+
+        <GroupBox Header="Usage">
+            <ScrollViewer>
+                <atc:GridEx Columns="*,10,*" ShowGridLines="True">
+                    <atc:UniformSpacingPanel
+                        Grid.Column="0"
+                        Margin="10"
+                        Orientation="Vertical"
+                        Spacing="10">
+
+                        <atc:UniformSpacingPanel
+                            ItemWidth="100"
+                            Orientation="Horizontal"
+                            Spacing="10">
+
+                            <atc:UniformSpacingPanel Orientation="Vertical" Spacing="10">
+
+                                <atc:ConnectivityButton
+                                    ConnectCommand="{Binding Path=ConnectCommand}"
+                                    DisconnectCommand="{Binding Path=DisconnectCommand}"
+                                    IsBusy="{Binding Path=IsBusy}"
+                                    IsConnected="{Binding Path=IsConnected}" />
+
+                                <atc:ConnectivityButton
+                                    ConnectCommand="{Binding Path=ConnectCommand}"
+                                    ConnectContent="MyConnect"
+                                    ConnectImageSource="{Binding Source={x:Static fontIcons:FontMaterialDesignType.Login}, Converter={x:Static atcValueConverters:FontIconImageSourceValueConverter.Instance}, ConverterParameter={StaticResource AtcApps.Brushes.ThemeForeground}}"
+                                    DisconnectCommand="{Binding Path=DisconnectCommand}"
+                                    DisconnectContent="MyDisconnect"
+                                    DisconnectImageSource="{Binding Source={x:Static fontIcons:FontMaterialDesignType.Logout}, Converter={x:Static atcValueConverters:FontIconImageSourceValueConverter.Instance}, ConverterParameter={StaticResource AtcApps.Brushes.Accent}}"
+                                    IsBusy="{Binding Path=IsBusy}"
+                                    IsConnected="{Binding Path=IsConnected}" />
+
+                            </atc:UniformSpacingPanel>
+
+                        </atc:UniformSpacingPanel>
+
+                    </atc:UniformSpacingPanel>
+                    <atc:UniformSpacingPanel
+                        Grid.Column="2"
+                        Margin="10"
+                        Orientation="Vertical"
+                        Spacing="10">
+
+                        <atc:UniformSpacingPanel
+                            ItemWidth="100"
+                            Orientation="Horizontal"
+                            Spacing="10">
+
+                            <atc:UniformSpacingPanel Orientation="Vertical" Spacing="10" />
+
+                        </atc:UniformSpacingPanel>
+
+                    </atc:UniformSpacingPanel>
+                </atc:GridEx>
+            </ScrollViewer>
+        </GroupBox>
+    </atc:AutoGrid>
+
+</UserControl>
diff --git a/sample/Atc.Wpf.Sample/SamplesWpfTheming/InputButton/ImageToggledButton.xaml.cs b/sample/Atc.Wpf.Sample/SamplesWpfControls/ButtonControls/ConnectivityButtonView.xaml.cs
similarity index 87%
rename from sample/Atc.Wpf.Sample/SamplesWpfTheming/InputButton/ImageToggledButton.xaml.cs
rename to sample/Atc.Wpf.Sample/SamplesWpfControls/ButtonControls/ConnectivityButtonView.xaml.cs
index 3274ca13..9ee3110e 100644
--- a/sample/Atc.Wpf.Sample/SamplesWpfTheming/InputButton/ImageToggledButton.xaml.cs
+++ b/sample/Atc.Wpf.Sample/SamplesWpfControls/ButtonControls/ConnectivityButtonView.xaml.cs
@@ -1,8 +1,8 @@
-namespace Atc.Wpf.Sample.SamplesWpfTheming.InputButton;
+namespace Atc.Wpf.Sample.SamplesWpfControls.ButtonControls;
 
-public partial class ImageToggledButton
+public partial class ConnectivityButtonView
 {
-    public ImageToggledButton()
+    public ConnectivityButtonView()
     {
         InitializeComponent();
 
diff --git a/sample/Atc.Wpf.Sample/SamplesWpfControls/BaseControls/ImageButtonView.xaml b/sample/Atc.Wpf.Sample/SamplesWpfControls/ButtonControls/ImageButtonView.xaml
similarity index 96%
rename from sample/Atc.Wpf.Sample/SamplesWpfControls/BaseControls/ImageButtonView.xaml
rename to sample/Atc.Wpf.Sample/SamplesWpfControls/ButtonControls/ImageButtonView.xaml
index d3347455..a6e2c83c 100644
--- a/sample/Atc.Wpf.Sample/SamplesWpfControls/BaseControls/ImageButtonView.xaml
+++ b/sample/Atc.Wpf.Sample/SamplesWpfControls/ButtonControls/ImageButtonView.xaml
@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="Atc.Wpf.Sample.SamplesWpfControls.BaseControls.ImageButtonView"
+    x:Class="Atc.Wpf.Sample.SamplesWpfControls.ButtonControls.ImageButtonView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:atc="https://github.com/atc-net/atc-wpf/tree/main/schemas"
diff --git a/sample/Atc.Wpf.Sample/SamplesWpfControls/BaseControls/ImageButtonView.xaml.cs b/sample/Atc.Wpf.Sample/SamplesWpfControls/ButtonControls/ImageButtonView.xaml.cs
similarity index 65%
rename from sample/Atc.Wpf.Sample/SamplesWpfControls/BaseControls/ImageButtonView.xaml.cs
rename to sample/Atc.Wpf.Sample/SamplesWpfControls/ButtonControls/ImageButtonView.xaml.cs
index bf7dd931..a82b8fb2 100644
--- a/sample/Atc.Wpf.Sample/SamplesWpfControls/BaseControls/ImageButtonView.xaml.cs
+++ b/sample/Atc.Wpf.Sample/SamplesWpfControls/ButtonControls/ImageButtonView.xaml.cs
@@ -1,4 +1,4 @@
-namespace Atc.Wpf.Sample.SamplesWpfControls.BaseControls;
+namespace Atc.Wpf.Sample.SamplesWpfControls.ButtonControls;
 
 public partial class ImageButtonView
 {
diff --git a/sample/Atc.Wpf.Sample/SamplesWpfTheming/InputButton/ImageToggledButton.xaml b/sample/Atc.Wpf.Sample/SamplesWpfControls/ButtonControls/ImageToggledButtonView.xaml
similarity index 98%
rename from sample/Atc.Wpf.Sample/SamplesWpfTheming/InputButton/ImageToggledButton.xaml
rename to sample/Atc.Wpf.Sample/SamplesWpfControls/ButtonControls/ImageToggledButtonView.xaml
index 7f41bb17..94a6cfb8 100644
--- a/sample/Atc.Wpf.Sample/SamplesWpfTheming/InputButton/ImageToggledButton.xaml
+++ b/sample/Atc.Wpf.Sample/SamplesWpfControls/ButtonControls/ImageToggledButtonView.xaml
@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="Atc.Wpf.Sample.SamplesWpfTheming.InputButton.ImageToggledButton"
+    x:Class="Atc.Wpf.Sample.SamplesWpfControls.ButtonControls.ImageToggledButtonView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:atc="https://github.com/atc-net/atc-wpf/tree/main/schemas"
diff --git a/sample/Atc.Wpf.Sample/SamplesWpfControls/ButtonControls/ImageToggledButtonView.xaml.cs b/sample/Atc.Wpf.Sample/SamplesWpfControls/ButtonControls/ImageToggledButtonView.xaml.cs
new file mode 100644
index 00000000..b262f0fd
--- /dev/null
+++ b/sample/Atc.Wpf.Sample/SamplesWpfControls/ButtonControls/ImageToggledButtonView.xaml.cs
@@ -0,0 +1,53 @@
+namespace Atc.Wpf.Sample.SamplesWpfControls.ButtonControls;
+
+public partial class ImageToggledButtonView
+{
+    public ImageToggledButtonView()
+    {
+        InitializeComponent();
+
+        DataContext = this;
+    }
+
+    [DependencyProperty]
+    private bool isBusy;
+
+    [DependencyProperty]
+    private bool isConnected;
+
+    [RelayCommand]
+    private async Task Connect()
+    {
+        IsBusy = true;
+
+        await Task
+            .Delay(2_000)
+            .ConfigureAwait(false);
+
+        await Application.Current.Dispatcher
+            .InvokeAsyncIfRequired(() =>
+            {
+                IsConnected = true;
+                IsBusy = false;
+            })
+            .ConfigureAwait(false);
+    }
+
+    [RelayCommand]
+    private async Task Disconnect()
+    {
+        IsBusy = true;
+
+        await Task
+            .Delay(500)
+            .ConfigureAwait(false);
+
+        await Application.Current.Dispatcher
+            .InvokeAsyncIfRequired(() =>
+            {
+                IsConnected = false;
+                IsBusy = false;
+            })
+            .ConfigureAwait(false);
+    }
+}
\ No newline at end of file
diff --git a/sample/Atc.Wpf.Sample/SamplesWpfControlsTreeView.xaml b/sample/Atc.Wpf.Sample/SamplesWpfControlsTreeView.xaml
index 1becbff4..f9eb96be 100644
--- a/sample/Atc.Wpf.Sample/SamplesWpfControlsTreeView.xaml
+++ b/sample/Atc.Wpf.Sample/SamplesWpfControlsTreeView.xaml
@@ -15,6 +15,7 @@
             IsExpanded="True"
             SamplePath="DialogBoxes.StandardDialogBoxView" />
     </TreeViewItem>
+
     <TreeViewItem Header="Base Controls">
         <sample:SampleTreeViewItem
             Header="DecimalBox"
@@ -24,10 +25,6 @@
             Header="DecimalXyBox"
             IsExpanded="True"
             SamplePath="BaseControls.DecimalXyBoxView" />
-        <sample:SampleTreeViewItem
-            Header="ImageButton"
-            IsExpanded="True"
-            SamplePath="BaseControls.ImageButtonView" />
         <sample:SampleTreeViewItem
             Header="IntegerBox"
             IsExpanded="True"
@@ -66,6 +63,25 @@
             SamplePath="BaseControls.RichTextBoxExView" />
     </TreeViewItem>
 
+    <TreeViewItem Header="Button Controls">
+        <sample:SampleTreeViewItem
+            Header="AuthenticationButton"
+            IsExpanded="True"
+            SamplePath="ButtonControls.AuthenticationButtonView" />
+        <sample:SampleTreeViewItem
+            Header="ConnectivityButton"
+            IsExpanded="True"
+            SamplePath="ButtonControls.ConnectivityButtonView" />
+        <sample:SampleTreeViewItem
+            Header="ImageButton"
+            IsExpanded="True"
+            SamplePath="ButtonControls.ImageButtonView" />
+        <sample:SampleTreeViewItem
+            Header="ImageToggledButton"
+            IsExpanded="True"
+            SamplePath="ButtonControls.ImageToggledButtonView" />
+    </TreeViewItem>
+
     <TreeViewItem Header="Color Controls">
         <sample:SampleTreeViewItem
             Header="AdvancedColorPickerView"
diff --git a/sample/Atc.Wpf.Sample/SamplesWpfThemingTreeView.xaml b/sample/Atc.Wpf.Sample/SamplesWpfThemingTreeView.xaml
index 37c2e03a..afc9ecdd 100644
--- a/sample/Atc.Wpf.Sample/SamplesWpfThemingTreeView.xaml
+++ b/sample/Atc.Wpf.Sample/SamplesWpfThemingTreeView.xaml
@@ -29,10 +29,6 @@
             Header="ImageButton"
             IsExpanded="True"
             SamplePath="InputButton.ImageButtonView" />
-        <sample:SampleTreeViewItem
-            Header="ImageToggledButton"
-            IsExpanded="True"
-            SamplePath="InputButton.ImageToggledButton" />
         <TreeViewItem
             Header="ToggleButton"
             IsEnabled="False"
diff --git a/src/Atc.Wpf.Controls/AssemblyInfo.cs b/src/Atc.Wpf.Controls/AssemblyInfo.cs
index d90acec5..26fa7e46 100644
--- a/src/Atc.Wpf.Controls/AssemblyInfo.cs
+++ b/src/Atc.Wpf.Controls/AssemblyInfo.cs
@@ -4,6 +4,8 @@
 [assembly: XmlnsPrefix("https://github.com/atc-net/atc-wpf/tree/main/schemas", "atc")]
 [assembly: XmlnsDefinition("https://github.com/atc-net/atc-wpf/tree/main/schemas", "Atc.Wpf.Controls")]
 [assembly: XmlnsDefinition("https://github.com/atc-net/atc-wpf/tree/main/schemas", "Atc.Wpf.Controls.BaseControls")]
+[assembly: XmlnsDefinition("https://github.com/atc-net/atc-wpf/tree/main/schemas", "Atc.Wpf.Controls.ButtonControls")]
+[assembly: XmlnsDefinition("https://github.com/atc-net/atc-wpf/tree/main/schemas", "Atc.Wpf.Controls.ColorControls")]
 [assembly: XmlnsDefinition("https://github.com/atc-net/atc-wpf/tree/main/schemas", "Atc.Wpf.Controls.Dialogs")]
 [assembly: XmlnsDefinition("https://github.com/atc-net/atc-wpf/tree/main/schemas", "Atc.Wpf.Controls.LabelControls")]
 [assembly: XmlnsDefinition("https://github.com/atc-net/atc-wpf/tree/main/schemas", "Atc.Wpf.Controls.Layouts")]
diff --git a/src/Atc.Wpf.Controls/Atc.Wpf.Controls.csproj b/src/Atc.Wpf.Controls/Atc.Wpf.Controls.csproj
index f1a8b269..edfe7c82 100644
--- a/src/Atc.Wpf.Controls/Atc.Wpf.Controls.csproj
+++ b/src/Atc.Wpf.Controls/Atc.Wpf.Controls.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net9.0-windows</TargetFramework>
diff --git a/src/Atc.Wpf.Controls/BaseControls/ImageToggledButton.cs b/src/Atc.Wpf.Controls/BaseControls/ImageToggledButton.cs
deleted file mode 100644
index f3a0fdce..00000000
--- a/src/Atc.Wpf.Controls/BaseControls/ImageToggledButton.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-namespace Atc.Wpf.Controls.BaseControls;
-
-public sealed partial class ImageToggledButton : ImageButton
-{
-    [DependencyProperty(
-        DefaultValue = false,
-        PropertyChangedCallback = nameof(OnToggledChanged))]
-    private bool isToggled;
-
-    [DependencyProperty]
-    private object? onContent;
-
-    [DependencyProperty]
-    private object? offContent;
-
-    [DependencyProperty]
-    private ImageSource? onImageSource;
-
-    [DependencyProperty]
-    private ImageSource? offImageSource;
-
-    [DependencyProperty(DefaultValue = "")]
-    private string onSvgImageSource;
-
-    [DependencyProperty(DefaultValue = "")]
-    private string offSvgImageSource;
-
-    [DependencyProperty]
-    private Color? onSvgImageOverrideColor;
-
-    [DependencyProperty]
-    private Color? offSvgImageOverrideColor;
-
-    [DependencyProperty]
-    private ICommand? onCommand;
-
-    [DependencyProperty]
-    private ICommand? offCommand;
-
-    static ImageToggledButton()
-    {
-        DefaultStyleKeyProperty.OverrideMetadata(
-            typeof(ImageToggledButton),
-            new FrameworkPropertyMetadata(typeof(ImageButton)));
-    }
-
-    public ImageToggledButton()
-    {
-        // Initialise with the Off state visual when loaded.
-        Loaded += (_, _) => ApplyVisualState(IsToggled);
-    }
-
-    protected override void OnClick()
-    {
-        base.OnClick();
-
-        IsToggled = !IsToggled;
-
-        ExecuteCurrentCommand();
-    }
-
-    private static void OnToggledChanged(
-        DependencyObject d,
-        DependencyPropertyChangedEventArgs e)
-    {
-        var ctl = (ImageToggledButton)d;
-        ctl.ApplyVisualState((bool)e.NewValue);
-    }
-
-    private void ApplyVisualState(
-        bool toggled)
-    {
-        if (toggled)
-        {
-            // ON state
-            if (OnContent is not null)
-            {
-                SetCurrentValue(ContentProperty, OnContent);
-            }
-
-            if (OnImageSource is not null)
-            {
-                SetCurrentValue(ImageSourceProperty, OnImageSource);
-            }
-
-            if (!string.IsNullOrEmpty(OnSvgImageSource))
-            {
-                SetCurrentValue(SvgImageSourceProperty, OnSvgImageSource);
-            }
-
-            if (OnSvgImageOverrideColor is not null)
-            {
-                SetCurrentValue(SvgImageOverrideColorProperty, OnSvgImageOverrideColor);
-            }
-        }
-        else
-        {
-            // OFF state
-            if (OffContent is not null)
-            {
-                SetCurrentValue(ContentProperty, OffContent);
-            }
-
-            if (OffImageSource is not null)
-            {
-                SetCurrentValue(ImageSourceProperty, OffImageSource);
-            }
-
-            if (!string.IsNullOrEmpty(OffSvgImageSource))
-            {
-                SetCurrentValue(SvgImageSourceProperty, OffSvgImageSource);
-            }
-
-            if (OffSvgImageOverrideColor is not null)
-            {
-                SetCurrentValue(SvgImageOverrideColorProperty, OffSvgImageOverrideColor);
-            }
-        }
-    }
-
-    private void ExecuteCurrentCommand()
-    {
-        var cmd = IsToggled
-            ? OffCommand
-            : OnCommand;
-
-        if (cmd?.CanExecute(parameter: null) == true)
-        {
-            cmd.Execute(parameter: null);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Atc.Wpf.Controls/ButtonControls/AuthenticationButton.xaml b/src/Atc.Wpf.Controls/ButtonControls/AuthenticationButton.xaml
new file mode 100644
index 00000000..d746cbd4
--- /dev/null
+++ b/src/Atc.Wpf.Controls/ButtonControls/AuthenticationButton.xaml
@@ -0,0 +1,34 @@
+<UserControl
+    x:Class="Atc.Wpf.Controls.ButtonControls.AuthenticationButton"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:buttonControls="clr-namespace:Atc.Wpf.Controls.ButtonControls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    x:Name="Root"
+    d:DesignHeight="100"
+    d:DesignWidth="200"
+    mc:Ignorable="d">
+
+    <buttonControls:ImageToggledButton
+        Width="{Binding Path=Width, ElementName=Root}"
+        Height="{Binding Path=Height, ElementName=Root}"
+        ImageBorderSpacing="{Binding Path=ImageBorderSpacing, ElementName=Root}"
+        ImageContentSpacing="{Binding Path=ImageContentSpacing, ElementName=Root}"
+        ImageHeight="{Binding Path=ImageHeight, ElementName=Root}"
+        ImageLocation="{Binding Path=ImageLocation, ElementName=Root}"
+        ImageWidth="{Binding Path=ImageWidth, ElementName=Root}"
+        IsBusy="{Binding Path=IsBusy, ElementName=Root}"
+        IsToggled="{Binding Path=IsAuthenticated, ElementName=Root, Mode=TwoWay}"
+        OffCommand="{Binding Path=LoginCommand, ElementName=Root}"
+        OffContent="{Binding Path=LoginContent, ElementName=Root}"
+        OffImageSource="{Binding Path=LoginImageSource, ElementName=Root}"
+        OffSvgImageOverrideColor="{Binding Path=LoginSvgImageOverrideColor, ElementName=Root}"
+        OffSvgImageSource="{Binding Path=LoginSvgImageSource, ElementName=Root}"
+        OnCommand="{Binding Path=LogoutCommand, ElementName=Root}"
+        OnContent="{Binding Path=LogoutContent, ElementName=Root}"
+        OnImageSource="{Binding Path=LogoutImageSource, ElementName=Root}"
+        OnSvgImageOverrideColor="{Binding Path=LogoutSvgImageOverrideColor, ElementName=Root}"
+        OnSvgImageSource="{Binding Path=LogoutSvgImageSource, ElementName=Root}" />
+
+</UserControl>
\ No newline at end of file
diff --git a/src/Atc.Wpf.Controls/ButtonControls/AuthenticationButton.xaml.cs b/src/Atc.Wpf.Controls/ButtonControls/AuthenticationButton.xaml.cs
new file mode 100644
index 00000000..03de49ed
--- /dev/null
+++ b/src/Atc.Wpf.Controls/ButtonControls/AuthenticationButton.xaml.cs
@@ -0,0 +1,137 @@
+// ReSharper disable InvertIf
+namespace Atc.Wpf.Controls.ButtonControls;
+
+public partial class AuthenticationButton
+{
+    public event RoutedEventHandler? IsAuthenticatedChanged;
+
+    [DependencyProperty(DefaultValue = null)]
+    private ImageLocation? imageLocation;
+
+    [DependencyProperty(DefaultValue = 16)]
+    private int imageWidth;
+
+    [DependencyProperty(DefaultValue = 16)]
+    private int imageHeight;
+
+    [DependencyProperty(DefaultValue = 10d)]
+    private double imageContentSpacing;
+
+    [DependencyProperty(DefaultValue = 0d)]
+    private double imageBorderSpacing;
+
+    [DependencyProperty(DefaultValue = false)]
+    private bool isBusy;
+
+    [DependencyProperty(
+        DefaultValue = false,
+        PropertyChangedCallback = nameof(OnIsAuthenticatedChanged))]
+    private bool isAuthenticated;
+
+    [DependencyProperty]
+    private object? loginContent;
+
+    [DependencyProperty]
+    private object? logoutContent;
+
+    [DependencyProperty]
+    private ImageSource? loginImageSource;
+
+    [DependencyProperty]
+    private ImageSource? logoutImageSource;
+
+    [DependencyProperty(DefaultValue = "")]
+    private string loginSvgImageSource;
+
+    [DependencyProperty(DefaultValue = "")]
+    private string logoutSvgImageSource;
+
+    [DependencyProperty]
+    private Color? loginSvgImageOverrideColor;
+
+    [DependencyProperty]
+    private Color? logoutSvgImageOverrideColor;
+
+    [DependencyProperty]
+    private ICommand? loginCommand;
+
+    [DependencyProperty]
+    private ICommand? logoutCommand;
+
+    public AuthenticationButton()
+    {
+        InitializeComponent();
+
+        SetCurrentValue(ImageLocationProperty, Controls.ImageLocation.Left);
+
+        ThemeManager.Current.ThemeChanged += OnThemeChanged;
+    }
+
+    protected override void OnInitialized(
+        EventArgs e)
+    {
+        base.OnInitialized(e);
+
+        if (LoginContent is null or string { Length: 0 })
+        {
+            SetCurrentValue(LoginContentProperty, Word.Login);
+        }
+
+        if (LogoutContent is null or string { Length: 0 })
+        {
+            SetCurrentValue(LogoutContentProperty, Word.Logout);
+        }
+
+        if (LoginImageSource is null &&
+            string.IsNullOrWhiteSpace(LoginSvgImageSource))
+        {
+            var fgBrush = Application.Current.TryFindResource("AtcApps.Brushes.ThemeForeground");
+
+            var img = (ImageSource?)FontIconImageSourceValueConverter.Instance
+                .Convert(
+                    FontMaterialDesignType.Login,
+                    typeof(ImageSource),
+                    fgBrush,
+                    CultureInfo.CurrentUICulture);
+
+            if (img is not null)
+            {
+                SetCurrentValue(LoginImageSourceProperty, img);
+            }
+        }
+
+        if (LogoutImageSource is null &&
+            string.IsNullOrWhiteSpace(LogoutSvgImageSource))
+        {
+            var accentBrush = Application.Current.TryFindResource("AtcApps.Brushes.Accent");
+
+            var img = (ImageSource?)FontIconImageSourceValueConverter.Instance
+                .Convert(
+                    FontMaterialDesignType.Logout,
+                    typeof(ImageSource),
+                    accentBrush,
+                    CultureInfo.CurrentUICulture);
+
+            if (img is not null)
+            {
+                SetCurrentValue(LogoutImageSourceProperty, img);
+            }
+        }
+    }
+
+    private void OnThemeChanged(
+        object? sender,
+        ThemeChangedEventArgs e)
+    {
+        SetCurrentValue(LoginContentProperty, Word.Login);
+        SetCurrentValue(LogoutContentProperty, Word.Logout);
+    }
+
+    private static void OnIsAuthenticatedChanged(
+        DependencyObject d,
+        DependencyPropertyChangedEventArgs e)
+        => ((AuthenticationButton)d).RaiseIsAuthenticatedChanged();
+
+    private void RaiseIsAuthenticatedChanged()
+        => IsAuthenticatedChanged?.Invoke(this, new RoutedEventArgs());
+}
\ No newline at end of file
diff --git a/src/Atc.Wpf.Controls/ButtonControls/ConnectivityButton.xaml b/src/Atc.Wpf.Controls/ButtonControls/ConnectivityButton.xaml
new file mode 100644
index 00000000..8b7506c7
--- /dev/null
+++ b/src/Atc.Wpf.Controls/ButtonControls/ConnectivityButton.xaml
@@ -0,0 +1,34 @@
+<UserControl
+    x:Class="Atc.Wpf.Controls.ButtonControls.ConnectivityButton"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:buttonControls="clr-namespace:Atc.Wpf.Controls.ButtonControls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    x:Name="Root"
+    d:DesignHeight="100"
+    d:DesignWidth="200"
+    mc:Ignorable="d">
+
+    <buttonControls:ImageToggledButton
+        Width="{Binding Path=Width, ElementName=Root}"
+        Height="{Binding Path=Height, ElementName=Root}"
+        ImageBorderSpacing="{Binding Path=ImageBorderSpacing, ElementName=Root}"
+        ImageContentSpacing="{Binding Path=ImageContentSpacing, ElementName=Root}"
+        ImageHeight="{Binding Path=ImageHeight, ElementName=Root}"
+        ImageLocation="{Binding Path=ImageLocation, ElementName=Root}"
+        ImageWidth="{Binding Path=ImageWidth, ElementName=Root}"
+        IsBusy="{Binding Path=IsBusy, ElementName=Root}"
+        IsToggled="{Binding Path=IsConnected, ElementName=Root, Mode=TwoWay}"
+        OffCommand="{Binding Path=ConnectCommand, ElementName=Root}"
+        OffContent="{Binding Path=ConnectContent, ElementName=Root}"
+        OffImageSource="{Binding Path=ConnectImageSource, ElementName=Root}"
+        OffSvgImageOverrideColor="{Binding Path=ConnectSvgImageOverrideColor, ElementName=Root}"
+        OffSvgImageSource="{Binding Path=ConnectSvgImageSource, ElementName=Root}"
+        OnCommand="{Binding Path=DisconnectCommand, ElementName=Root}"
+        OnContent="{Binding Path=DisconnectContent, ElementName=Root}"
+        OnImageSource="{Binding Path=DisconnectImageSource, ElementName=Root}"
+        OnSvgImageOverrideColor="{Binding Path=DisconnectSvgImageOverrideColor, ElementName=Root}"
+        OnSvgImageSource="{Binding Path=DisconnectSvgImageSource, ElementName=Root}" />
+
+</UserControl>
\ No newline at end of file
diff --git a/src/Atc.Wpf.Controls/ButtonControls/ConnectivityButton.xaml.cs b/src/Atc.Wpf.Controls/ButtonControls/ConnectivityButton.xaml.cs
new file mode 100644
index 00000000..8f21d8f7
--- /dev/null
+++ b/src/Atc.Wpf.Controls/ButtonControls/ConnectivityButton.xaml.cs
@@ -0,0 +1,137 @@
+// ReSharper disable InvertIf
+namespace Atc.Wpf.Controls.ButtonControls;
+
+public partial class ConnectivityButton
+{
+    public event RoutedEventHandler? IsConnectedChanged;
+
+    [DependencyProperty(DefaultValue = null)]
+    private ImageLocation? imageLocation;
+
+    [DependencyProperty(DefaultValue = 16)]
+    private int imageWidth;
+
+    [DependencyProperty(DefaultValue = 16)]
+    private int imageHeight;
+
+    [DependencyProperty(DefaultValue = 10d)]
+    private double imageContentSpacing;
+
+    [DependencyProperty(DefaultValue = 0d)]
+    private double imageBorderSpacing;
+
+    [DependencyProperty(DefaultValue = false)]
+    private bool isBusy;
+
+    [DependencyProperty(
+        DefaultValue = false,
+        PropertyChangedCallback = nameof(OnIsConnectedChanged))]
+    private bool isConnected;
+
+    [DependencyProperty]
+    private object? connectContent;
+
+    [DependencyProperty]
+    private object? disconnectContent;
+
+    [DependencyProperty]
+    private ImageSource? connectImageSource;
+
+    [DependencyProperty]
+    private ImageSource? disconnectImageSource;
+
+    [DependencyProperty(DefaultValue = "")]
+    private string connectSvgImageSource;
+
+    [DependencyProperty(DefaultValue = "")]
+    private string disconnectSvgImageSource;
+
+    [DependencyProperty]
+    private Color? connectSvgImageOverrideColor;
+
+    [DependencyProperty]
+    private Color? disconnectSvgImageOverrideColor;
+
+    [DependencyProperty]
+    private ICommand? connectCommand;
+
+    [DependencyProperty]
+    private ICommand? disconnectCommand;
+
+    public ConnectivityButton()
+    {
+        InitializeComponent();
+
+        SetCurrentValue(ImageLocationProperty, Controls.ImageLocation.Left);
+
+        ThemeManager.Current.ThemeChanged += OnThemeChanged;
+    }
+
+    protected override void OnInitialized(
+        EventArgs e)
+    {
+        base.OnInitialized(e);
+
+        if (ConnectContent is null or string { Length: 0 })
+        {
+            SetCurrentValue(ConnectContentProperty, Word.Connect);
+        }
+
+        if (DisconnectContent is null or string { Length: 0 })
+        {
+            SetCurrentValue(DisconnectContentProperty, Word.Disconnect);
+        }
+
+        if (ConnectImageSource is null &&
+            string.IsNullOrWhiteSpace(ConnectSvgImageSource))
+        {
+            var fgBrush = Application.Current.TryFindResource("AtcApps.Brushes.ThemeForeground");
+
+            var img = (ImageSource?)FontIconImageSourceValueConverter.Instance
+                .Convert(
+                    FontMaterialDesignType.Login,
+                    typeof(ImageSource),
+                    fgBrush,
+                    CultureInfo.CurrentUICulture);
+
+            if (img is not null)
+            {
+                SetCurrentValue(ConnectImageSourceProperty, img);
+            }
+        }
+
+        if (DisconnectImageSource is null &&
+            string.IsNullOrWhiteSpace(DisconnectSvgImageSource))
+        {
+            var accentBrush = Application.Current.TryFindResource("AtcApps.Brushes.Accent");
+
+            var img = (ImageSource?)FontIconImageSourceValueConverter.Instance
+                .Convert(
+                    FontMaterialDesignType.Logout,
+                    typeof(ImageSource),
+                    accentBrush,
+                    CultureInfo.CurrentUICulture);
+
+            if (img is not null)
+            {
+                SetCurrentValue(DisconnectImageSourceProperty, img);
+            }
+        }
+    }
+
+    private void OnThemeChanged(
+        object? sender,
+        ThemeChangedEventArgs e)
+    {
+        SetCurrentValue(ConnectContentProperty, Word.Connect);
+        SetCurrentValue(DisconnectContentProperty, Word.Disconnect);
+    }
+
+    private static void OnIsConnectedChanged(
+        DependencyObject d,
+        DependencyPropertyChangedEventArgs e)
+        => ((ConnectivityButton)d).RaiseIsConnectedChanged();
+
+    private void RaiseIsConnectedChanged()
+        => IsConnectedChanged?.Invoke(this, new RoutedEventArgs());
+}
\ No newline at end of file
diff --git a/src/Atc.Wpf.Controls/BaseControls/ImageButton.cs b/src/Atc.Wpf.Controls/ButtonControls/ImageButton.cs
similarity index 98%
rename from src/Atc.Wpf.Controls/BaseControls/ImageButton.cs
rename to src/Atc.Wpf.Controls/ButtonControls/ImageButton.cs
index e7244e9c..1f162838 100644
--- a/src/Atc.Wpf.Controls/BaseControls/ImageButton.cs
+++ b/src/Atc.Wpf.Controls/ButtonControls/ImageButton.cs
@@ -1,4 +1,4 @@
-namespace Atc.Wpf.Controls.BaseControls;
+namespace Atc.Wpf.Controls.ButtonControls;
 
 public partial class ImageButton : Button
 {
diff --git a/src/Atc.Wpf.Controls/BaseControls/ImageButton.xaml b/src/Atc.Wpf.Controls/ButtonControls/ImageButton.xaml
similarity index 85%
rename from src/Atc.Wpf.Controls/BaseControls/ImageButton.xaml
rename to src/Atc.Wpf.Controls/ButtonControls/ImageButton.xaml
index 7d3bd52c..a14d16e4 100644
--- a/src/Atc.Wpf.Controls/BaseControls/ImageButton.xaml
+++ b/src/Atc.Wpf.Controls/ButtonControls/ImageButton.xaml
@@ -3,7 +3,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:atc="https://github.com/atc-net/atc-wpf/tree/main/schemas"
     xmlns:atcValueConverters="https://github.com/atc-net/atc-wpf/tree/main/schemas/value-converters"
-    xmlns:baseControls="clr-namespace:Atc.Wpf.Controls.BaseControls"
+    xmlns:buttonControls="clr-namespace:Atc.Wpf.Controls.ButtonControls"
     xmlns:progressing="clr-namespace:Atc.Wpf.Controls.Progressing"
     xmlns:valueConverters="clr-namespace:Atc.Wpf.Controls.BaseControls.Internal.ValueConverters">
 
@@ -18,7 +18,7 @@
     <Style
         x:Key="AtcApps.Styles.ImageButton"
         BasedOn="{StaticResource {x:Type Button}}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="ImageHeight" Value="16" />
@@ -29,58 +29,58 @@
                 <DataTemplate>
                     <atc:GridEx Columns="Auto,*,Auto" Rows="Auto,*,Auto">
                         <Grid
-                            Grid.Row="{Binding Path=RowIndex, RelativeSource={RelativeSource AncestorType=baseControls:ImageButton}}"
-                            Grid.Column="{Binding ColumnIndex, RelativeSource={RelativeSource AncestorType=baseControls:ImageButton}}"
+                            Grid.Row="{Binding Path=RowIndex, RelativeSource={RelativeSource AncestorType=buttonControls:ImageButton}}"
+                            Grid.Column="{Binding ColumnIndex, RelativeSource={RelativeSource AncestorType=buttonControls:ImageButton}}"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center">
 
                             <progressing:LoadingIndicator
                                 x:Name="PART_LoadingIndicator"
-                                Width="{Binding Path=ImageWidth, RelativeSource={RelativeSource AncestorType=baseControls:ImageButton}}"
-                                Height="{Binding Path=ImageHeight, RelativeSource={RelativeSource AncestorType=baseControls:ImageButton}}"
+                                Width="{Binding Path=ImageWidth, RelativeSource={RelativeSource AncestorType=buttonControls:ImageButton}}"
+                                Height="{Binding Path=ImageHeight, RelativeSource={RelativeSource AncestorType=buttonControls:ImageButton}}"
                                 Padding="2"
                                 IsActive="False"
-                                Mode="{Binding Path=LoadingIndicatorMode, RelativeSource={RelativeSource AncestorType=baseControls:ImageButton}}"
+                                Mode="{Binding Path=LoadingIndicatorMode, RelativeSource={RelativeSource AncestorType=buttonControls:ImageButton}}"
                                 Visibility="Collapsed">
                                 <progressing:LoadingIndicator.Margin>
                                     <MultiBinding Converter="{StaticResource ImageLocationToMarginMultiValueConverter}">
-                                        <Binding Path="ImageLocation" RelativeSource="{RelativeSource AncestorType=baseControls:ImageButton}" />
-                                        <Binding Path="ImageContentSpacing" RelativeSource="{RelativeSource AncestorType=baseControls:ImageButton}" />
-                                        <Binding Path="ImageBorderSpacing" RelativeSource="{RelativeSource AncestorType=baseControls:ImageButton}" />
+                                        <Binding Path="ImageLocation" RelativeSource="{RelativeSource AncestorType=buttonControls:ImageButton}" />
+                                        <Binding Path="ImageContentSpacing" RelativeSource="{RelativeSource AncestorType=buttonControls:ImageButton}" />
+                                        <Binding Path="ImageBorderSpacing" RelativeSource="{RelativeSource AncestorType=buttonControls:ImageButton}" />
                                     </MultiBinding>
                                 </progressing:LoadingIndicator.Margin>
                             </progressing:LoadingIndicator>
 
                             <atc:AutoGreyableImage
                                 x:Name="PART_Image"
-                                Width="{Binding Path=ImageWidth, RelativeSource={RelativeSource AncestorType=baseControls:ImageButton}}"
-                                Height="{Binding Path=ImageHeight, RelativeSource={RelativeSource AncestorType=baseControls:ImageButton}}"
-                                IsEnabled="{Binding Path=IsEnabled, RelativeSource={RelativeSource AncestorType=baseControls:ImageButton}}"
-                                Source="{Binding Path=ImageSource, RelativeSource={RelativeSource AncestorType=baseControls:ImageButton}}"
+                                Width="{Binding Path=ImageWidth, RelativeSource={RelativeSource AncestorType=buttonControls:ImageButton}}"
+                                Height="{Binding Path=ImageHeight, RelativeSource={RelativeSource AncestorType=buttonControls:ImageButton}}"
+                                IsEnabled="{Binding Path=IsEnabled, RelativeSource={RelativeSource AncestorType=buttonControls:ImageButton}}"
+                                Source="{Binding Path=ImageSource, RelativeSource={RelativeSource AncestorType=buttonControls:ImageButton}}"
                                 Visibility="Collapsed">
                                 <atc:AutoGreyableImage.Margin>
                                     <MultiBinding Converter="{StaticResource ImageLocationToMarginMultiValueConverter}">
-                                        <Binding Path="ImageLocation" RelativeSource="{RelativeSource AncestorType=baseControls:ImageButton}" />
-                                        <Binding Path="ImageContentSpacing" RelativeSource="{RelativeSource AncestorType=baseControls:ImageButton}" />
-                                        <Binding Path="ImageBorderSpacing" RelativeSource="{RelativeSource AncestorType=baseControls:ImageButton}" />
+                                        <Binding Path="ImageLocation" RelativeSource="{RelativeSource AncestorType=buttonControls:ImageButton}" />
+                                        <Binding Path="ImageContentSpacing" RelativeSource="{RelativeSource AncestorType=buttonControls:ImageButton}" />
+                                        <Binding Path="ImageBorderSpacing" RelativeSource="{RelativeSource AncestorType=buttonControls:ImageButton}" />
                                     </MultiBinding>
                                 </atc:AutoGreyableImage.Margin>
                             </atc:AutoGreyableImage>
 
                             <atc:SvgImage
                                 x:Name="PART_SvgImage"
-                                Width="{Binding Path=ImageWidth, RelativeSource={RelativeSource AncestorType=baseControls:ImageButton}}"
-                                Height="{Binding Path=ImageHeight, RelativeSource={RelativeSource AncestorType=baseControls:ImageButton}}"
+                                Width="{Binding Path=ImageWidth, RelativeSource={RelativeSource AncestorType=buttonControls:ImageButton}}"
+                                Height="{Binding Path=ImageHeight, RelativeSource={RelativeSource AncestorType=buttonControls:ImageButton}}"
                                 ControlSizeType="ContentToSizeNoStretch"
-                                IsEnabled="{Binding Path=IsEnabled, RelativeSource={RelativeSource AncestorType=baseControls:ImageButton}}"
-                                OverrideColor="{Binding Path=SvgImageOverrideColor, RelativeSource={RelativeSource AncestorType=baseControls:ImageButton}}"
-                                Source="{Binding Path=SvgImageSource, RelativeSource={RelativeSource AncestorType=baseControls:ImageButton}}"
+                                IsEnabled="{Binding Path=IsEnabled, RelativeSource={RelativeSource AncestorType=buttonControls:ImageButton}}"
+                                OverrideColor="{Binding Path=SvgImageOverrideColor, RelativeSource={RelativeSource AncestorType=buttonControls:ImageButton}}"
+                                Source="{Binding Path=SvgImageSource, RelativeSource={RelativeSource AncestorType=buttonControls:ImageButton}}"
                                 Visibility="Collapsed">
                                 <atc:SvgImage.Margin>
                                     <MultiBinding Converter="{StaticResource ImageLocationToMarginMultiValueConverter}">
-                                        <Binding Path="ImageLocation" RelativeSource="{RelativeSource AncestorType=baseControls:ImageButton}" />
-                                        <Binding Path="ImageContentSpacing" RelativeSource="{RelativeSource AncestorType=baseControls:ImageButton}" />
-                                        <Binding Path="ImageBorderSpacing" RelativeSource="{RelativeSource AncestorType=baseControls:ImageButton}" />
+                                        <Binding Path="ImageLocation" RelativeSource="{RelativeSource AncestorType=buttonControls:ImageButton}" />
+                                        <Binding Path="ImageContentSpacing" RelativeSource="{RelativeSource AncestorType=buttonControls:ImageButton}" />
+                                        <Binding Path="ImageBorderSpacing" RelativeSource="{RelativeSource AncestorType=buttonControls:ImageButton}" />
                                     </MultiBinding>
                                 </atc:SvgImage.Margin>
                             </atc:SvgImage>
@@ -98,7 +98,7 @@
                     <DataTemplate.Triggers>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding Path=IsBusy, RelativeSource={RelativeSource AncestorType=baseControls:ImageButton}}" Value="True" />
+                                <Condition Binding="{Binding Path=IsBusy, RelativeSource={RelativeSource AncestorType=buttonControls:ImageButton}}" Value="True" />
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="PART_LoadingIndicator" Property="Visibility" Value="Visible" />
                             <Setter TargetName="PART_LoadingIndicator" Property="IsActive" Value="True" />
@@ -108,8 +108,8 @@
                         </MultiDataTrigger>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding Path=IsBusy, RelativeSource={RelativeSource AncestorType=baseControls:ImageButton}}" Value="False" />
-                                <Condition Binding="{Binding Path=ImageSource, RelativeSource={RelativeSource AncestorType=baseControls:ImageButton}, Converter={x:Static atcValueConverters:StringNullOrEmptyToInverseBoolValueConverter.Instance}}" Value="True" />
+                                <Condition Binding="{Binding Path=IsBusy, RelativeSource={RelativeSource AncestorType=buttonControls:ImageButton}}" Value="False" />
+                                <Condition Binding="{Binding Path=ImageSource, RelativeSource={RelativeSource AncestorType=buttonControls:ImageButton}, Converter={x:Static atcValueConverters:StringNullOrEmptyToInverseBoolValueConverter.Instance}}" Value="True" />
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="PART_LoadingIndicator" Property="Visibility" Value="Collapsed" />
                             <Setter TargetName="PART_LoadingIndicator" Property="IsActive" Value="False" />
@@ -119,8 +119,8 @@
                         </MultiDataTrigger>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding Path=IsBusy, RelativeSource={RelativeSource AncestorType=baseControls:ImageButton}}" Value="False" />
-                                <Condition Binding="{Binding Path=SvgImageSource, RelativeSource={RelativeSource AncestorType=baseControls:ImageButton}, Converter={x:Static atcValueConverters:StringNullOrEmptyToInverseBoolValueConverter.Instance}}" Value="True" />
+                                <Condition Binding="{Binding Path=IsBusy, RelativeSource={RelativeSource AncestorType=buttonControls:ImageButton}}" Value="False" />
+                                <Condition Binding="{Binding Path=SvgImageSource, RelativeSource={RelativeSource AncestorType=buttonControls:ImageButton}, Converter={x:Static atcValueConverters:StringNullOrEmptyToInverseBoolValueConverter.Instance}}" Value="True" />
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="PART_LoadingIndicator" Property="Visibility" Value="Collapsed" />
                             <Setter TargetName="PART_LoadingIndicator" Property="IsActive" Value="False" />
@@ -142,7 +142,7 @@
     <Style
         x:Key="AtcApps.Styles.ImageButton.Small"
         BasedOn="{StaticResource AtcApps.Styles.ImageButton}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="MinHeight" Value="18" />
         <Setter Property="Padding" Value="2,0" />
     </Style>
@@ -150,7 +150,7 @@
     <Style
         x:Key="AtcApps.Styles.ImageButton.Large"
         BasedOn="{StaticResource AtcApps.Styles.ImageButton}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="FontSize" Value="{StaticResource AtcApps.Font.Size.Button.Large}" />
         <Setter Property="MinHeight" Value="40" />
         <Setter Property="ImageHeight" Value="32" />
@@ -161,12 +161,12 @@
     <Style
         x:Key="ImageButton.Small"
         BasedOn="{StaticResource AtcApps.Styles.ImageButton.Small}"
-        TargetType="{x:Type baseControls:ImageButton}" />
+        TargetType="{x:Type buttonControls:ImageButton}" />
 
     <Style
         x:Key="ImageButton.Large"
         BasedOn="{StaticResource AtcApps.Styles.ImageButton.Large}"
-        TargetType="{x:Type baseControls:ImageButton}" />
+        TargetType="{x:Type buttonControls:ImageButton}" />
 
     <!--  Chromeless - ControlTemplate  -->
     <ControlTemplate x:Key="AtcApps.Templates.ImageButton.Chromeless" TargetType="{x:Type ButtonBase}">
@@ -176,20 +176,20 @@
             Columns="Auto,*,Auto"
             Rows="Auto,*,Auto">
             <Grid
-                Grid.Row="{Binding RowIndex, RelativeSource={RelativeSource AncestorType=baseControls:ImageButton}}"
-                Grid.Column="{Binding ColumnIndex, RelativeSource={RelativeSource AncestorType=baseControls:ImageButton}}"
+                Grid.Row="{Binding RowIndex, RelativeSource={RelativeSource AncestorType=buttonControls:ImageButton}}"
+                Grid.Column="{Binding ColumnIndex, RelativeSource={RelativeSource AncestorType=buttonControls:ImageButton}}"
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center">
                 <atc:AutoGreyableImage
-                    Width="{Binding ImageWidth, RelativeSource={RelativeSource AncestorType=baseControls:ImageButton}}"
-                    Height="{Binding ImageHeight, RelativeSource={RelativeSource AncestorType=baseControls:ImageButton}}"
-                    IsEnabled="{Binding IsEnabled, RelativeSource={RelativeSource AncestorType=baseControls:ImageButton}}"
-                    Source="{Binding ImageSource, RelativeSource={RelativeSource AncestorType=baseControls:ImageButton}}">
+                    Width="{Binding ImageWidth, RelativeSource={RelativeSource AncestorType=buttonControls:ImageButton}}"
+                    Height="{Binding ImageHeight, RelativeSource={RelativeSource AncestorType=buttonControls:ImageButton}}"
+                    IsEnabled="{Binding IsEnabled, RelativeSource={RelativeSource AncestorType=buttonControls:ImageButton}}"
+                    Source="{Binding ImageSource, RelativeSource={RelativeSource AncestorType=buttonControls:ImageButton}}">
                     <atc:AutoGreyableImage.Margin>
                         <MultiBinding Converter="{StaticResource ImageLocationToMarginMultiValueConverter}">
-                            <Binding Path="ImageLocation" RelativeSource="{RelativeSource AncestorType=baseControls:ImageButton}" />
-                            <Binding Path="ImageContentSpacing" RelativeSource="{RelativeSource AncestorType=baseControls:ImageButton}" />
-                            <Binding Path="ImageBorderSpacing" RelativeSource="{RelativeSource AncestorType=baseControls:ImageButton}" />
+                            <Binding Path="ImageLocation" RelativeSource="{RelativeSource AncestorType=buttonControls:ImageButton}" />
+                            <Binding Path="ImageContentSpacing" RelativeSource="{RelativeSource AncestorType=buttonControls:ImageButton}" />
+                            <Binding Path="ImageBorderSpacing" RelativeSource="{RelativeSource AncestorType=buttonControls:ImageButton}" />
                         </MultiBinding>
                     </atc:AutoGreyableImage.Margin>
                 </atc:AutoGreyableImage>
@@ -216,7 +216,7 @@
     </ControlTemplate>
 
     <!--  Chromeless  -->
-    <Style x:Key="AtcApps.Styles.ImageButton.Chromeless" TargetType="{x:Type baseControls:ImageButton}">
+    <Style x:Key="AtcApps.Styles.ImageButton.Chromeless" TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="Background" Value="{DynamicResource AtcApps.Brushes.Transparent}" />
         <Setter Property="Foreground" Value="{DynamicResource AtcApps.Brushes.Text}" />
         <Setter Property="ImageHeight" Value="16" />
@@ -231,7 +231,7 @@
     <Style
         x:Key="AtcApps.Styles.ImageButton.Chromeless.Small"
         BasedOn="{StaticResource AtcApps.Styles.ImageButton.Chromeless}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="MinHeight" Value="18" />
         <Setter Property="Padding" Value="2,0" />
     </Style>
@@ -239,25 +239,25 @@
     <Style
         x:Key="ImageButtonChromeless"
         BasedOn="{StaticResource AtcApps.Styles.ImageButton.Chromeless}"
-        TargetType="{x:Type baseControls:ImageButton}" />
+        TargetType="{x:Type buttonControls:ImageButton}" />
 
     <Style
         x:Key="ImageButtonChromeless.Small"
         BasedOn="{StaticResource AtcApps.Styles.ImageButton.Chromeless.Small}"
-        TargetType="{x:Type baseControls:ImageButton}" />
+        TargetType="{x:Type buttonControls:ImageButton}" />
 
     <!--  Bootstrap  -->
     <Style
         x:Key="ImageButtonDefault"
         BasedOn="{StaticResource AtcApps.Styles.ImageButton}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="Background" Value="{DynamicResource AtcApps.Brushes.ThemeBackground}" />
     </Style>
 
     <Style
         x:Key="ImageButtonDefault.Small"
         BasedOn="{StaticResource AtcApps.Styles.ImageButton}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="MinHeight" Value="18" />
         <Setter Property="Padding" Value="2,0" />
     </Style>
@@ -265,7 +265,7 @@
     <Style
         x:Key="ImageButtonDefault.Large"
         BasedOn="{StaticResource AtcApps.Styles.ImageButton}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="FontSize" Value="{StaticResource AtcApps.Font.Size.Button.Large}" />
         <Setter Property="MinHeight" Value="40" />
         <Setter Property="ImageHeight" Value="32" />
@@ -276,14 +276,14 @@
     <Style
         x:Key="ImageButtonDefault.Outline"
         BasedOn="{StaticResource AtcApps.Styles.ImageButton}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="Background" Value="{DynamicResource AtcApps.Brushes.ThemeBackground}" />
     </Style>
 
     <Style
         x:Key="ImageButtonDefault.Outline.Small"
         BasedOn="{StaticResource ImageButtonDefault.Outline}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="MinHeight" Value="18" />
         <Setter Property="Padding" Value="2,0" />
     </Style>
@@ -291,7 +291,7 @@
     <Style
         x:Key="ImageButtonDefault.Outline.Large"
         BasedOn="{StaticResource ImageButtonDefault.Outline}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="FontSize" Value="{StaticResource AtcApps.Font.Size.Button.Large}" />
         <Setter Property="MinHeight" Value="40" />
         <Setter Property="ImageHeight" Value="32" />
@@ -302,7 +302,7 @@
     <Style
         x:Key="ImageButtonPrimary"
         BasedOn="{StaticResource AtcApps.Styles.ImageButton}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="Foreground" Value="{DynamicResource AtcApps.Brushes.Bootstrap.White}" />
         <Setter Property="Background" Value="{DynamicResource AtcApps.Brushes.Bootstrap.Blue500}" />
         <Setter Property="BorderBrush" Value="{DynamicResource AtcApps.Brushes.Bootstrap.Blue500}" />
@@ -317,7 +317,7 @@
     <Style
         x:Key="ImageButtonPrimary.Small"
         BasedOn="{StaticResource ImageButtonPrimary}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="MinHeight" Value="18" />
         <Setter Property="Padding" Value="2,0" />
     </Style>
@@ -325,7 +325,7 @@
     <Style
         x:Key="ImageButtonPrimary.Large"
         BasedOn="{StaticResource ImageButtonPrimary}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="FontSize" Value="{StaticResource AtcApps.Font.Size.Button.Large}" />
         <Setter Property="MinHeight" Value="40" />
         <Setter Property="ImageHeight" Value="32" />
@@ -336,7 +336,7 @@
     <Style
         x:Key="ImageButtonPrimary.Outline"
         BasedOn="{StaticResource AtcApps.Styles.ImageButton}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="Foreground" Value="{DynamicResource AtcApps.Brushes.Bootstrap.Blue500}" />
         <Setter Property="Background" Value="{DynamicResource AtcApps.Brushes.ThemeBackground}" />
         <Setter Property="BorderBrush" Value="{DynamicResource AtcApps.Brushes.Bootstrap.Blue500}" />
@@ -351,7 +351,7 @@
     <Style
         x:Key="ImageButtonPrimary.Outline.Small"
         BasedOn="{StaticResource ImageButtonPrimary.Outline}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="MinHeight" Value="18" />
         <Setter Property="Padding" Value="2,0" />
     </Style>
@@ -359,7 +359,7 @@
     <Style
         x:Key="ImageButtonPrimary.Outline.Large"
         BasedOn="{StaticResource ImageButtonPrimary.Outline}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="FontSize" Value="{StaticResource AtcApps.Font.Size.Button.Large}" />
         <Setter Property="MinHeight" Value="40" />
         <Setter Property="ImageHeight" Value="32" />
@@ -370,7 +370,7 @@
     <Style
         x:Key="ImageButtonSecondary"
         BasedOn="{StaticResource AtcApps.Styles.ImageButton}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="Foreground" Value="{DynamicResource AtcApps.Brushes.Bootstrap.White}" />
         <Setter Property="Background" Value="{DynamicResource AtcApps.Brushes.Bootstrap.Gray500}" />
         <Setter Property="BorderBrush" Value="{DynamicResource AtcApps.Brushes.Bootstrap.Gray500}" />
@@ -385,7 +385,7 @@
     <Style
         x:Key="ImageButtonSecondary.Small"
         BasedOn="{StaticResource ImageButtonSecondary}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="MinHeight" Value="18" />
         <Setter Property="Padding" Value="2,0" />
     </Style>
@@ -393,7 +393,7 @@
     <Style
         x:Key="ImageButtonSecondary.Large"
         BasedOn="{StaticResource ImageButtonSecondary}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="FontSize" Value="{StaticResource AtcApps.Font.Size.Button.Large}" />
         <Setter Property="MinHeight" Value="40" />
         <Setter Property="ImageHeight" Value="32" />
@@ -404,7 +404,7 @@
     <Style
         x:Key="ImageButtonSecondary.Outline"
         BasedOn="{StaticResource AtcApps.Styles.ImageButton}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="Foreground" Value="{DynamicResource AtcApps.Brushes.Bootstrap.Gray500}" />
         <Setter Property="Background" Value="{DynamicResource AtcApps.Brushes.ThemeBackground}" />
         <Setter Property="BorderBrush" Value="{DynamicResource AtcApps.Brushes.Bootstrap.Gray500}" />
@@ -419,7 +419,7 @@
     <Style
         x:Key="ImageButtonSecondary.Outline.Small"
         BasedOn="{StaticResource ImageButtonSecondary.Outline}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="MinHeight" Value="18" />
         <Setter Property="Padding" Value="2,0" />
     </Style>
@@ -427,7 +427,7 @@
     <Style
         x:Key="ImageButtonSecondary.Outline.Large"
         BasedOn="{StaticResource ImageButtonSecondary.Outline}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="FontSize" Value="{StaticResource AtcApps.Font.Size.Button.Large}" />
         <Setter Property="MinHeight" Value="40" />
         <Setter Property="ImageHeight" Value="32" />
@@ -438,7 +438,7 @@
     <Style
         x:Key="ImageButtonSuccess"
         BasedOn="{StaticResource AtcApps.Styles.ImageButton}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="Foreground" Value="{DynamicResource AtcApps.Brushes.Bootstrap.White}" />
         <Setter Property="Background" Value="{DynamicResource AtcApps.Brushes.Bootstrap.Green500}" />
         <Setter Property="BorderBrush" Value="{DynamicResource AtcApps.Brushes.Bootstrap.Green500}" />
@@ -453,7 +453,7 @@
     <Style
         x:Key="ImageButtonSuccess.Small"
         BasedOn="{StaticResource ImageButtonSuccess}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="MinHeight" Value="18" />
         <Setter Property="Padding" Value="2,0" />
     </Style>
@@ -461,7 +461,7 @@
     <Style
         x:Key="ImageButtonSuccess.Large"
         BasedOn="{StaticResource ImageButtonSuccess}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="FontSize" Value="{StaticResource AtcApps.Font.Size.Button.Large}" />
         <Setter Property="MinHeight" Value="40" />
         <Setter Property="ImageHeight" Value="32" />
@@ -472,7 +472,7 @@
     <Style
         x:Key="ImageButtonSuccess.Outline"
         BasedOn="{StaticResource AtcApps.Styles.ImageButton}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="Foreground" Value="{DynamicResource AtcApps.Brushes.Bootstrap.Green500}" />
         <Setter Property="Background" Value="{DynamicResource AtcApps.Brushes.ThemeBackground}" />
         <Setter Property="BorderBrush" Value="{DynamicResource AtcApps.Brushes.Bootstrap.Green500}" />
@@ -487,7 +487,7 @@
     <Style
         x:Key="ImageButtonSuccess.Outline.Small"
         BasedOn="{StaticResource ImageButtonSuccess.Outline}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="MinHeight" Value="18" />
         <Setter Property="Padding" Value="2,0" />
     </Style>
@@ -495,7 +495,7 @@
     <Style
         x:Key="ImageButtonSuccess.Outline.Large"
         BasedOn="{StaticResource ImageButtonSuccess.Outline}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="FontSize" Value="{StaticResource AtcApps.Font.Size.Button.Large}" />
         <Setter Property="MinHeight" Value="40" />
         <Setter Property="ImageHeight" Value="32" />
@@ -506,7 +506,7 @@
     <Style
         x:Key="ImageButtonDanger"
         BasedOn="{StaticResource AtcApps.Styles.ImageButton}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="Foreground" Value="{DynamicResource AtcApps.Brushes.Bootstrap.White}" />
         <Setter Property="Background" Value="{DynamicResource AtcApps.Brushes.Bootstrap.Red500}" />
         <Setter Property="BorderBrush" Value="{DynamicResource AtcApps.Brushes.Bootstrap.Red500}" />
@@ -521,7 +521,7 @@
     <Style
         x:Key="ImageButtonDanger.Small"
         BasedOn="{StaticResource ImageButtonDanger}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="MinHeight" Value="18" />
         <Setter Property="Padding" Value="2,0" />
     </Style>
@@ -529,7 +529,7 @@
     <Style
         x:Key="ImageButtonDanger.Large"
         BasedOn="{StaticResource ImageButtonDanger}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="FontSize" Value="{StaticResource AtcApps.Font.Size.Button.Large}" />
         <Setter Property="MinHeight" Value="40" />
         <Setter Property="ImageHeight" Value="32" />
@@ -540,7 +540,7 @@
     <Style
         x:Key="ImageButtonDanger.Outline"
         BasedOn="{StaticResource AtcApps.Styles.ImageButton}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="Foreground" Value="{DynamicResource AtcApps.Brushes.Bootstrap.Red500}" />
         <Setter Property="Background" Value="{DynamicResource AtcApps.Brushes.ThemeBackground}" />
         <Setter Property="BorderBrush" Value="{DynamicResource AtcApps.Brushes.Bootstrap.Red500}" />
@@ -555,7 +555,7 @@
     <Style
         x:Key="ImageButtonDanger.Outline.Small"
         BasedOn="{StaticResource ImageButtonDanger.Outline}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="MinHeight" Value="18" />
         <Setter Property="Padding" Value="2,0" />
     </Style>
@@ -563,7 +563,7 @@
     <Style
         x:Key="ImageButtonDanger.Outline.Large"
         BasedOn="{StaticResource ImageButtonDanger.Outline}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="FontSize" Value="{StaticResource AtcApps.Font.Size.Button.Large}" />
         <Setter Property="MinHeight" Value="40" />
         <Setter Property="ImageHeight" Value="32" />
@@ -574,7 +574,7 @@
     <Style
         x:Key="ImageButtonWarning"
         BasedOn="{StaticResource AtcApps.Styles.ImageButton}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="Foreground" Value="{DynamicResource AtcApps.Brushes.Bootstrap.White}" />
         <Setter Property="Background" Value="{DynamicResource AtcApps.Brushes.Bootstrap.Yellow500}" />
         <Setter Property="BorderBrush" Value="{DynamicResource AtcApps.Brushes.Bootstrap.Yellow500}" />
@@ -589,7 +589,7 @@
     <Style
         x:Key="ImageButtonWarning.Small"
         BasedOn="{StaticResource ImageButtonWarning}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="MinHeight" Value="18" />
         <Setter Property="Padding" Value="2,0" />
     </Style>
@@ -597,7 +597,7 @@
     <Style
         x:Key="ImageButtonWarning.Large"
         BasedOn="{StaticResource ImageButtonWarning}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="FontSize" Value="{StaticResource AtcApps.Font.Size.Button.Large}" />
         <Setter Property="MinHeight" Value="40" />
         <Setter Property="ImageHeight" Value="32" />
@@ -608,7 +608,7 @@
     <Style
         x:Key="ImageButtonWarning.Outline"
         BasedOn="{StaticResource AtcApps.Styles.ImageButton}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="Foreground" Value="{DynamicResource AtcApps.Brushes.Bootstrap.Yellow500}" />
         <Setter Property="Background" Value="{DynamicResource AtcApps.Brushes.ThemeBackground}" />
         <Setter Property="BorderBrush" Value="{DynamicResource AtcApps.Brushes.Bootstrap.Yellow500}" />
@@ -623,7 +623,7 @@
     <Style
         x:Key="ImageButtonWarning.Outline.Small"
         BasedOn="{StaticResource ImageButtonWarning.Outline}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="MinHeight" Value="18" />
         <Setter Property="Padding" Value="2,0" />
     </Style>
@@ -631,7 +631,7 @@
     <Style
         x:Key="ImageButtonWarning.Outline.Large"
         BasedOn="{StaticResource ImageButtonWarning.Outline}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="FontSize" Value="{StaticResource AtcApps.Font.Size.Button.Large}" />
         <Setter Property="MinHeight" Value="40" />
         <Setter Property="ImageHeight" Value="32" />
@@ -642,7 +642,7 @@
     <Style
         x:Key="ImageButtonInfo"
         BasedOn="{StaticResource AtcApps.Styles.ImageButton}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="Foreground" Value="{DynamicResource AtcApps.Brushes.Bootstrap.White}" />
         <Setter Property="Background" Value="{DynamicResource AtcApps.Brushes.Bootstrap.Cyan500}" />
         <Setter Property="BorderBrush" Value="{DynamicResource AtcApps.Brushes.Bootstrap.Cyan500}" />
@@ -657,7 +657,7 @@
     <Style
         x:Key="ImageButtonInfo.Small"
         BasedOn="{StaticResource ImageButtonInfo}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="MinHeight" Value="18" />
         <Setter Property="Padding" Value="2,0" />
     </Style>
@@ -665,7 +665,7 @@
     <Style
         x:Key="ImageButtonInfo.Large"
         BasedOn="{StaticResource ImageButtonInfo}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="FontSize" Value="{StaticResource AtcApps.Font.Size.Button.Large}" />
         <Setter Property="MinHeight" Value="40" />
         <Setter Property="ImageHeight" Value="32" />
@@ -676,7 +676,7 @@
     <Style
         x:Key="ImageButtonInfo.Outline"
         BasedOn="{StaticResource AtcApps.Styles.ImageButton}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="Foreground" Value="{DynamicResource AtcApps.Brushes.Bootstrap.Cyan500}" />
         <Setter Property="Background" Value="{DynamicResource AtcApps.Brushes.ThemeBackground}" />
         <Setter Property="BorderBrush" Value="{DynamicResource AtcApps.Brushes.Bootstrap.Cyan500}" />
@@ -691,7 +691,7 @@
     <Style
         x:Key="ImageButtonInfo.Outline.Small"
         BasedOn="{StaticResource ImageButtonInfo.Outline}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="MinHeight" Value="18" />
         <Setter Property="Padding" Value="2,0" />
     </Style>
@@ -699,7 +699,7 @@
     <Style
         x:Key="ImageButtonInfo.Outline.Large"
         BasedOn="{StaticResource ImageButtonInfo.Outline}"
-        TargetType="{x:Type baseControls:ImageButton}">
+        TargetType="{x:Type buttonControls:ImageButton}">
         <Setter Property="FontSize" Value="{StaticResource AtcApps.Font.Size.Button.Large}" />
         <Setter Property="MinHeight" Value="40" />
         <Setter Property="ImageHeight" Value="32" />
diff --git a/src/Atc.Wpf.Controls/ButtonControls/ImageToggledButton.xaml b/src/Atc.Wpf.Controls/ButtonControls/ImageToggledButton.xaml
new file mode 100644
index 00000000..64e20f13
--- /dev/null
+++ b/src/Atc.Wpf.Controls/ButtonControls/ImageToggledButton.xaml
@@ -0,0 +1,45 @@
+<UserControl
+    x:Class="Atc.Wpf.Controls.ButtonControls.ImageToggledButton"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:atcValueConverters="https://github.com/atc-net/atc-wpf/tree/main/schemas/value-converters"
+    xmlns:buttonControls="clr-namespace:Atc.Wpf.Controls.ButtonControls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    x:Name="Root"
+    mc:Ignorable="d">
+
+    <Grid>
+        <buttonControls:ImageButton
+            Width="{Binding ElementName=Root, Path=Width}"
+            Height="{Binding ElementName=Root, Path=Height}"
+            Command="{Binding ElementName=Root, Path=OffCommand}"
+            Content="{Binding ElementName=Root, Path=OffContent}"
+            ImageBorderSpacing="{Binding ElementName=Root, Path=ImageBorderSpacing}"
+            ImageContentSpacing="{Binding ElementName=Root, Path=ImageContentSpacing}"
+            ImageHeight="{Binding ElementName=Root, Path=ImageHeight}"
+            ImageLocation="{Binding ElementName=Root, Path=ImageLocation}"
+            ImageSource="{Binding ElementName=Root, Path=OffImageSource}"
+            ImageWidth="{Binding ElementName=Root, Path=ImageWidth}"
+            IsBusy="{Binding ElementName=Root, Path=IsBusy}"
+            SvgImageOverrideColor="{Binding ElementName=Root, Path=OffSvgImageOverrideColor}"
+            SvgImageSource="{Binding ElementName=Root, Path=OffSvgImageSource}"
+            Visibility="{Binding ElementName=Root, Path=IsToggled, Converter={x:Static atcValueConverters:BoolToVisibilityCollapsedValueConverter.Instance}}" />
+
+        <buttonControls:ImageButton
+            Width="{Binding ElementName=Root, Path=Width}"
+            Height="{Binding ElementName=Root, Path=Height}"
+            Command="{Binding ElementName=Root, Path=OnCommand}"
+            Content="{Binding ElementName=Root, Path=OnContent}"
+            ImageBorderSpacing="{Binding ElementName=Root, Path=ImageBorderSpacing}"
+            ImageContentSpacing="{Binding ElementName=Root, Path=ImageContentSpacing}"
+            ImageHeight="{Binding ElementName=Root, Path=ImageHeight}"
+            ImageLocation="{Binding ElementName=Root, Path=ImageLocation}"
+            ImageSource="{Binding ElementName=Root, Path=OnImageSource}"
+            ImageWidth="{Binding ElementName=Root, Path=ImageWidth}"
+            IsBusy="{Binding ElementName=Root, Path=IsBusy}"
+            SvgImageOverrideColor="{Binding ElementName=Root, Path=OnSvgImageOverrideColor}"
+            SvgImageSource="{Binding ElementName=Root, Path=OnSvgImageSource}"
+            Visibility="{Binding ElementName=Root, Path=IsToggled, Converter={x:Static atcValueConverters:BoolToVisibilityVisibleValueConverter.Instance}}" />
+    </Grid>
+</UserControl>
\ No newline at end of file
diff --git a/src/Atc.Wpf.Controls/ButtonControls/ImageToggledButton.xaml.cs b/src/Atc.Wpf.Controls/ButtonControls/ImageToggledButton.xaml.cs
new file mode 100644
index 00000000..d7b81357
--- /dev/null
+++ b/src/Atc.Wpf.Controls/ButtonControls/ImageToggledButton.xaml.cs
@@ -0,0 +1,74 @@
+namespace Atc.Wpf.Controls.ButtonControls;
+
+public partial class ImageToggledButton
+{
+    public event RoutedEventHandler? IsToggledChanged;
+
+    [DependencyProperty(DefaultValue = null)]
+    private ImageLocation? imageLocation;
+
+    [DependencyProperty(DefaultValue = 16)]
+    private int imageWidth;
+
+    [DependencyProperty(DefaultValue = 16)]
+    private int imageHeight;
+
+    [DependencyProperty(DefaultValue = 10d)]
+    private double imageContentSpacing;
+
+    [DependencyProperty(DefaultValue = 0d)]
+    private double imageBorderSpacing;
+
+    [DependencyProperty(DefaultValue = false)]
+    private bool isBusy;
+
+    [DependencyProperty(
+        DefaultValue = false,
+        PropertyChangedCallback = nameof(OnIsToggledChanged))]
+    private bool isToggled;
+
+    [DependencyProperty]
+    private object? onContent;
+
+    [DependencyProperty]
+    private object? offContent;
+
+    [DependencyProperty]
+    private ImageSource? onImageSource;
+
+    [DependencyProperty]
+    private ImageSource? offImageSource;
+
+    [DependencyProperty(DefaultValue = "")]
+    private string onSvgImageSource;
+
+    [DependencyProperty(DefaultValue = "")]
+    private string offSvgImageSource;
+
+    [DependencyProperty]
+    private Color? onSvgImageOverrideColor;
+
+    [DependencyProperty]
+    private Color? offSvgImageOverrideColor;
+
+    [DependencyProperty]
+    private ICommand? onCommand;
+
+    [DependencyProperty]
+    private ICommand? offCommand;
+
+    public ImageToggledButton()
+    {
+        InitializeComponent();
+
+        SetCurrentValue(ImageLocationProperty, Controls.ImageLocation.Left);
+    }
+
+    private static void OnIsToggledChanged(
+        DependencyObject d,
+        DependencyPropertyChangedEventArgs e)
+        => ((ImageToggledButton)d).RaiseIsToggledChanged();
+
+    private void RaiseIsToggledChanged()
+        => IsToggledChanged?.Invoke(this, new RoutedEventArgs());
+}
\ No newline at end of file
diff --git a/src/Atc.Wpf.Controls/GlobalUsings.cs b/src/Atc.Wpf.Controls/GlobalUsings.cs
index 25022486..c8242cda 100644
--- a/src/Atc.Wpf.Controls/GlobalUsings.cs
+++ b/src/Atc.Wpf.Controls/GlobalUsings.cs
@@ -67,6 +67,8 @@
 global using Atc.Wpf.Controls.ViewModels;
 global using Atc.Wpf.Data;
 global using Atc.Wpf.Data.Models;
+global using Atc.Wpf.FontIcons;
+global using Atc.Wpf.FontIcons.ValueConverters;
 global using Atc.Wpf.Helpers;
 global using Atc.Wpf.Serialization.JsonConverters;
 global using Atc.Wpf.Theming.Controls.Selectors;
diff --git a/src/Atc.Wpf.Controls/Resources/Word.Designer.cs b/src/Atc.Wpf.Controls/Resources/Word.Designer.cs
index 4348ed99..9aa1084d 100644
--- a/src/Atc.Wpf.Controls/Resources/Word.Designer.cs
+++ b/src/Atc.Wpf.Controls/Resources/Word.Designer.cs
@@ -249,6 +249,15 @@ public static string Components {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Connect.
+        /// </summary>
+        public static string Connect {
+            get {
+                return ResourceManager.GetString("Connect", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Copy.
         /// </summary>
@@ -375,6 +384,15 @@ public static string Details {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Disconnect.
+        /// </summary>
+        public static string Disconnect {
+            get {
+                return ResourceManager.GetString("Disconnect", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Distance.
         /// </summary>
@@ -591,6 +609,24 @@ public static string Locked {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Login.
+        /// </summary>
+        public static string Login {
+            get {
+                return ResourceManager.GetString("Login", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Logout.
+        /// </summary>
+        public static string Logout {
+            get {
+                return ResourceManager.GetString("Logout", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Machine.
         /// </summary>
diff --git a/src/Atc.Wpf.Controls/Resources/Word.da-DK.resx b/src/Atc.Wpf.Controls/Resources/Word.da-DK.resx
index 36f331dc..840438c5 100644
--- a/src/Atc.Wpf.Controls/Resources/Word.da-DK.resx
+++ b/src/Atc.Wpf.Controls/Resources/Word.da-DK.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -423,23 +423,23 @@
   <data name="Test" xml:space="preserve">
     <value>Test</value>
   </data>
-  <data name="Updating" xml:space="preserve">
-    <value>Opdatering</value>
-  </data>
-  <data name="Creating" xml:space="preserve">
-    <value>Oprettelse</value>
+  <data name="Create" xml:space="preserve">
+    <value>Opret</value>
   </data>
-  <data name="Updated" xml:space="preserve">
-    <value>Opdateret</value>
+  <data name="Created" xml:space="preserve">
+    <value>Oprettet</value>
   </data>
   <data name="Update" xml:space="preserve">
     <value>Opdatering</value>
   </data>
-  <data name="Create" xml:space="preserve">
-    <value>Opret</value>
+  <data name="Updated" xml:space="preserve">
+    <value>Opdateret</value>
   </data>
-  <data name="Created" xml:space="preserve">
-    <value>Oprettet</value>
+  <data name="Creating" xml:space="preserve">
+    <value>Oprettelse</value>
+  </data>
+  <data name="Updating" xml:space="preserve">
+    <value>Opdatering</value>
   </data>
   <data name="Search" xml:space="preserve">
     <value>Søg</value>
@@ -456,12 +456,12 @@
   <data name="Severity" xml:space="preserve">
     <value>Alvorlighed</value>
   </data>
-  <data name="SubArea" xml:space="preserve">
-    <value>Underområde</value>
-  </data>
   <data name="Area" xml:space="preserve">
     <value>Område</value>
   </data>
+  <data name="SubArea" xml:space="preserve">
+    <value>Underområde</value>
+  </data>
   <data name="Print" xml:space="preserve">
     <value>Udskriv</value>
   </data>
@@ -474,15 +474,15 @@
   <data name="Colors" xml:space="preserve">
     <value>Farver</value>
   </data>
-  <data name="Miscellaneous" xml:space="preserve">
-    <value>Diverse</value>
-  </data>
   <data name="Identifier" xml:space="preserve">
     <value>Identifikator</value>
   </data>
   <data name="Machine" xml:space="preserve">
     <value>Maskine</value>
   </data>
+  <data name="Miscellaneous" xml:space="preserve">
+    <value>Diverse</value>
+  </data>
   <data name="Network" xml:space="preserve">
     <value>Netværk</value>
   </data>
@@ -495,12 +495,12 @@
   <data name="Information" xml:space="preserve">
     <value>Information</value>
   </data>
-  <data name="Receiver" xml:space="preserve">
-    <value>Modtager</value>
-  </data>
   <data name="Sender" xml:space="preserve">
     <value>Afsender</value>
   </data>
+  <data name="Receiver" xml:space="preserve">
+    <value>Modtager</value>
+  </data>
   <data name="Timestamp" xml:space="preserve">
     <value>Tidsstempel</value>
   </data>
@@ -522,4 +522,16 @@
   <data name="Group" xml:space="preserve">
     <value>Gruppe</value>
   </data>
+  <data name="Connect" xml:space="preserve">
+    <value>Forbinde</value>
+  </data>
+  <data name="Disconnect" xml:space="preserve">
+    <value>Afbryde</value>
+  </data>
+  <data name="Login" xml:space="preserve">
+    <value>Log ind</value>
+  </data>
+  <data name="Logout" xml:space="preserve">
+    <value>Log ud</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Atc.Wpf.Controls/Resources/Word.de-DE.resx b/src/Atc.Wpf.Controls/Resources/Word.de-DE.resx
index c43777a1..6f194d50 100644
--- a/src/Atc.Wpf.Controls/Resources/Word.de-DE.resx
+++ b/src/Atc.Wpf.Controls/Resources/Word.de-DE.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -243,51 +243,6 @@
   <data name="Preferences" xml:space="preserve">
     <value>Einstellungen</value>
   </data>
-  <data name="Message" xml:space="preserve">
-    <value>Nachricht</value>
-  </data>
-  <data name="Count" xml:space="preserve">
-    <value>Zählen</value>
-  </data>
-  <data name="Lock" xml:space="preserve">
-    <value>Sperren</value>
-  </data>
-  <data name="Locked" xml:space="preserve">
-    <value>Verschlossen</value>
-  </data>
-  <data name="Mode" xml:space="preserve">
-    <value>Modu</value>
-  </data>
-  <data name="New" xml:space="preserve">
-    <value>Neu</value>
-  </data>
-  <data name="Clear" xml:space="preserve">
-    <value>Löschen</value>
-  </data>
-  <data name="Clipboard" xml:space="preserve">
-    <value>Clipboard</value>
-  </data>
-  <data name="Depth" xml:space="preserve">
-    <value>Höhe</value>
-  </data>
-  <data name="Height" xml:space="preserve">
-    <value>Höhe</value>
-  </data>
-  <data name="Messages" xml:space="preserve">
-    <value>Nachrichten</value>
-  </data>
-  <data name="Freetext" xml:space="preserve">
-    <value>Freitext</value>
-  </data>
-  <data name="Calculate" xml:space="preserve">
-    <value>Berechnen</value>
-  </data>
-  <data name="Help" xml:space="preserve">
-    <value>Hilfe</value>
-  </data>
-  <data name="Length" xml:space="preserve">
-    <value>Länge</value>
-  </data>
   <data name="Redo" xml:space="preserve">
     <value>Redo</value>
   </data>
@@ -345,9 +300,27 @@
   <data name="Yes" xml:space="preserve">
     <value>Ja</value>
   </data>
+  <data name="Message" xml:space="preserve">
+    <value>Nachricht</value>
+  </data>
+  <data name="Count" xml:space="preserve">
+    <value>Zählen</value>
+  </data>
+  <data name="Lock" xml:space="preserve">
+    <value>Sperren</value>
+  </data>
+  <data name="Locked" xml:space="preserve">
+    <value>Verschlossen</value>
+  </data>
+  <data name="Mode" xml:space="preserve">
+    <value>Modu</value>
+  </data>
   <data name="UnLocked" xml:space="preserve">
     <value>Freigesetzter</value>
   </data>
+  <data name="New" xml:space="preserve">
+    <value>Neu</value>
+  </data>
   <data name="Refresh" xml:space="preserve">
     <value>Erfrischen</value>
   </data>
@@ -360,6 +333,18 @@
   <data name="Rename" xml:space="preserve">
     <value>Umbenennen</value>
   </data>
+  <data name="Clear" xml:space="preserve">
+    <value>Löschen</value>
+  </data>
+  <data name="Clipboard" xml:space="preserve">
+    <value>Clipboard</value>
+  </data>
+  <data name="Depth" xml:space="preserve">
+    <value>Höhe</value>
+  </data>
+  <data name="Height" xml:space="preserve">
+    <value>Höhe</value>
+  </data>
   <data name="Show" xml:space="preserve">
     <value>Zeigen</value>
   </data>
@@ -381,6 +366,21 @@
   <data name="Size" xml:space="preserve">
     <value>Größe</value>
   </data>
+  <data name="Messages" xml:space="preserve">
+    <value>Nachrichten</value>
+  </data>
+  <data name="Freetext" xml:space="preserve">
+    <value>Freitext</value>
+  </data>
+  <data name="Calculate" xml:space="preserve">
+    <value>Berechnen</value>
+  </data>
+  <data name="Help" xml:space="preserve">
+    <value>Hilfe</value>
+  </data>
+  <data name="Length" xml:space="preserve">
+    <value>Länge</value>
+  </data>
   <data name="Product" xml:space="preserve">
     <value>Erzeugnis</value>
   </data>
@@ -423,23 +423,23 @@
   <data name="Test" xml:space="preserve">
     <value>Prüfung</value>
   </data>
-  <data name="Updating" xml:space="preserve">
-    <value>Aktualisierung</value>
-  </data>
-  <data name="Creating" xml:space="preserve">
+  <data name="Create" xml:space="preserve">
     <value>Erstellen</value>
   </data>
-  <data name="Updated" xml:space="preserve">
-    <value>Aktualisiert</value>
+  <data name="Created" xml:space="preserve">
+    <value>Erstellt</value>
   </data>
   <data name="Update" xml:space="preserve">
     <value>Aktualisieren</value>
   </data>
-  <data name="Create" xml:space="preserve">
+  <data name="Updated" xml:space="preserve">
+    <value>Aktualisiert</value>
+  </data>
+  <data name="Creating" xml:space="preserve">
     <value>Erstellen</value>
   </data>
-  <data name="Created" xml:space="preserve">
-    <value>Erstellt</value>
+  <data name="Updating" xml:space="preserve">
+    <value>Aktualisierung</value>
   </data>
   <data name="Search" xml:space="preserve">
     <value>Suche</value>
@@ -456,33 +456,33 @@
   <data name="Severity" xml:space="preserve">
     <value>Schwere</value>
   </data>
-  <data name="SubArea" xml:space="preserve">
-    <value>Teilbereich</value>
-  </data>
   <data name="Area" xml:space="preserve">
     <value>Bereich</value>
   </data>
-  <data name="Printing" xml:space="preserve">
-    <value>Drucken</value>
+  <data name="SubArea" xml:space="preserve">
+    <value>Teilbereich</value>
   </data>
   <data name="Print" xml:space="preserve">
     <value>Drucken</value>
   </data>
+  <data name="Printing" xml:space="preserve">
+    <value>Drucken</value>
+  </data>
   <data name="Appearance" xml:space="preserve">
     <value>Aussehen</value>
   </data>
   <data name="Colors" xml:space="preserve">
     <value>Farben</value>
   </data>
-  <data name="Miscellaneous" xml:space="preserve">
-    <value>Sonstig</value>
-  </data>
   <data name="Identifier" xml:space="preserve">
     <value>Kennung</value>
   </data>
   <data name="Machine" xml:space="preserve">
     <value>Maschine</value>
   </data>
+  <data name="Miscellaneous" xml:space="preserve">
+    <value>Sonstig</value>
+  </data>
   <data name="Network" xml:space="preserve">
     <value>Netzwerk</value>
   </data>
@@ -495,12 +495,12 @@
   <data name="Information" xml:space="preserve">
     <value>Information</value>
   </data>
-  <data name="Receiver" xml:space="preserve">
-    <value>Empfänger</value>
-  </data>
   <data name="Sender" xml:space="preserve">
     <value>Absender</value>
   </data>
+  <data name="Receiver" xml:space="preserve">
+    <value>Empfänger</value>
+  </data>
   <data name="Timestamp" xml:space="preserve">
     <value>Zeitstempel</value>
   </data>
@@ -522,4 +522,16 @@
   <data name="Group" xml:space="preserve">
     <value>Gruppe</value>
   </data>
+  <data name="Connect" xml:space="preserve">
+    <value>Verbinden</value>
+  </data>
+  <data name="Disconnect" xml:space="preserve">
+    <value>Trennen</value>
+  </data>
+  <data name="Login" xml:space="preserve">
+    <value>Login</value>
+  </data>
+  <data name="Logout" xml:space="preserve">
+    <value>Ausloggen</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Atc.Wpf.Controls/Resources/Word.resx b/src/Atc.Wpf.Controls/Resources/Word.resx
index dcb7dbc7..38136c12 100644
--- a/src/Atc.Wpf.Controls/Resources/Word.resx
+++ b/src/Atc.Wpf.Controls/Resources/Word.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -522,4 +522,16 @@
   <data name="Group" xml:space="preserve">
     <value>Group</value>
   </data>
+  <data name="Connect" xml:space="preserve">
+    <value>Connect</value>
+  </data>
+  <data name="Disconnect" xml:space="preserve">
+    <value>Disconnect</value>
+  </data>
+  <data name="Login" xml:space="preserve">
+    <value>Login</value>
+  </data>
+  <data name="Logout" xml:space="preserve">
+    <value>Logout</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Atc.Wpf.Controls/Styles/Controls.xaml b/src/Atc.Wpf.Controls/Styles/Controls.xaml
index b62ab283..1fe189de 100644
--- a/src/Atc.Wpf.Controls/Styles/Controls.xaml
+++ b/src/Atc.Wpf.Controls/Styles/Controls.xaml
@@ -2,23 +2,22 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:baseControls="clr-namespace:Atc.Wpf.Controls.BaseControls"
+    xmlns:buttonControls="clr-namespace:Atc.Wpf.Controls.ButtonControls"
     xmlns:layouts="clr-namespace:Atc.Wpf.Controls.Layouts"
     xmlns:notifications="clr-namespace:Atc.Wpf.Controls.Notifications"
     xmlns:progressing="clr-namespace:Atc.Wpf.Controls.Progressing">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/Atc.Wpf.Controls;component/BaseControls/NumericBox.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Atc.Wpf.Controls;component/BaseControls/ImageButton.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Atc.Wpf.Controls;component/BaseControls/ToggleSwitch.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Atc.Wpf.Controls;component/Layouts/Divider.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Atc.Wpf.Controls;component/Notifications/ToastNotification.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Atc.Wpf.Controls;component/Progressing/BusyOverlay.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Atc.Wpf.Controls;component/Progressing/LoadingIndicator.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/Atc.Wpf.Controls;component/ButtonControls/ImageButton.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
     <Style BasedOn="{StaticResource AtcApps.Styles.NumericBox}" TargetType="{x:Type baseControls:NumericBox}" />
-    <Style BasedOn="{StaticResource AtcApps.Styles.ImageButton}" TargetType="{x:Type baseControls:ImageButton}" />
-    <Style BasedOn="{StaticResource AtcApps.Styles.ImageButton}" TargetType="{x:Type baseControls:ImageToggledButton}" />
     <Style BasedOn="{StaticResource AtcApps.Styles.DecimalBox}" TargetType="{x:Type baseControls:DecimalBox}" />
     <Style BasedOn="{StaticResource AtcApps.Styles.IntegerBox}" TargetType="{x:Type baseControls:IntegerBox}" />
     <Style BasedOn="{StaticResource AtcApps.Styles.ToggleSwitch}" TargetType="{x:Type baseControls:ToggleSwitch}" />
@@ -27,5 +26,6 @@
     <Style BasedOn="{StaticResource AtcApps.Styles.ToastNotificationArea}" TargetType="{x:Type notifications:ToastNotificationArea}" />
     <Style BasedOn="{StaticResource AtcApps.Styles.BusyOverlay}" TargetType="{x:Type progressing:BusyOverlay}" />
     <Style BasedOn="{StaticResource AtcApps.Styles.LoadingIndicator}" TargetType="{x:Type progressing:LoadingIndicator}" />
+    <Style BasedOn="{StaticResource AtcApps.Styles.ImageButton}" TargetType="{x:Type buttonControls:ImageButton}" />
 
 </ResourceDictionary>
\ No newline at end of file