diff --git a/src/Ursa/Common/EventHelper.cs b/src/Ursa/Common/EventHelper.cs
deleted file mode 100644
index 4b1dd09..0000000
--- a/src/Ursa/Common/EventHelper.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Interactivity;
-
-namespace Ursa.Common;
-
-internal static class EventHelper
-{
-    public static void RegisterClickEvent(EventHandler<RoutedEventArgs> handler, params Button?[] buttons)
-    {
-        foreach (var button in buttons)
-        {
-            if(button is not null) button.Click += handler;
-        }
-    }
-    
-    public static void UnregisterClickEvent(EventHandler<RoutedEventArgs> handler, params Button?[] buttons)
-    {
-        foreach (var button in buttons)
-        {
-            if(button is not null) button.Click -= handler;
-        }
-    }
-    
-    public static void RegisterEvent<TArgs>(RoutedEvent<TArgs> routedEvent, EventHandler<TArgs> handler, params Button?[] controls)
-        where TArgs : RoutedEventArgs
-    {
-        foreach (var control in controls)
-        {
-            control?.AddHandler(routedEvent, handler);
-        }
-    }
-    
-    public static void UnregisterEvent<TArgs>(RoutedEvent<TArgs> routedEvent, EventHandler<TArgs> handler, params Button?[] controls)
-        where TArgs : RoutedEventArgs
-    {
-        foreach (var control in controls)
-        {
-            control?.RemoveHandler(routedEvent, handler);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Ursa/Common/PropertyHelper.cs b/src/Ursa/Common/PropertyHelper.cs
deleted file mode 100644
index c673e8b..0000000
--- a/src/Ursa/Common/PropertyHelper.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Avalonia;
-
-namespace Ursa.Common;
-
-public static class PropertyHelper
-{
-    public static void SetValue<TValue>(AvaloniaProperty<TValue> property, TValue value, params AvaloniaObject?[] elements)
-    {
-        foreach (var element in elements)
-        {
-            element?.SetValue(property, value);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/DefaultDialogControl.cs b/src/Ursa/Controls/Dialog/DefaultDialogControl.cs
index 0070925..ea21f32 100644
--- a/src/Ursa/Controls/Dialog/DefaultDialogControl.cs
+++ b/src/Ursa/Controls/Dialog/DefaultDialogControl.cs
@@ -4,6 +4,7 @@ using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Interactivity;
+using Irihi.Avalonia.Shared.Helpers;
 using Ursa.Common;
 using Ursa.EventArgs;
 
@@ -55,12 +56,12 @@ public class DefaultDialogControl: DialogControlBase
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
         base.OnApplyTemplate(e);
-        EventHelper.UnregisterClickEvent(DefaultButtonsClose, _okButton, _cancelButton, _yesButton, _noButton);
+        Button.ClickEvent.RemoveHandler(DefaultButtonsClose, _okButton, _cancelButton, _yesButton, _noButton);
         _okButton = e.NameScope.Find<Button>(PART_OKButton);
         _cancelButton = e.NameScope.Find<Button>(PART_CancelButton);
         _yesButton = e.NameScope.Find<Button>(PART_YesButton);
         _noButton = e.NameScope.Find<Button>(PART_NoButton);
-        EventHelper.RegisterClickEvent(DefaultButtonsClose, _yesButton, _noButton, _okButton, _cancelButton);
+        Button.ClickEvent.AddHandler(DefaultButtonsClose, _okButton, _cancelButton, _yesButton, _noButton);
         SetButtonVisibility();
     }
     
@@ -68,38 +69,27 @@ public class DefaultDialogControl: DialogControlBase
     private void SetButtonVisibility()
     {
         bool isCloseButtonVisible = DataContext is IDialogContext || Buttons != DialogButton.YesNo;
-        SetVisibility(_closeButton, isCloseButtonVisible);
+        Button.IsVisibleProperty.SetValue(isCloseButtonVisible, _closeButton);
         switch (Buttons)
         {
             case DialogButton.None:
-                SetVisibility(_okButton, false);
-                SetVisibility(_cancelButton, false);
-                SetVisibility(_yesButton, false);
-                SetVisibility(_noButton, false);
+                Button.IsVisibleProperty.SetValue(false, _okButton, _cancelButton, _yesButton, _noButton);
                 break;
             case DialogButton.OK:
-                SetVisibility(_okButton, true);
-                SetVisibility(_cancelButton, false);
-                SetVisibility(_yesButton, false);
-                SetVisibility(_noButton, false);
+                Button.IsVisibleProperty.SetValue(true, _okButton);
+                Button.IsVisibleProperty.SetValue(false, _cancelButton, _yesButton, _noButton);
                 break;
             case DialogButton.OKCancel:
-                SetVisibility(_okButton, true);
-                SetVisibility(_cancelButton, true);
-                SetVisibility(_yesButton, false);
-                SetVisibility(_noButton, false);
+                Button.IsVisibleProperty.SetValue(true, _okButton, _cancelButton);
+                Button.IsVisibleProperty.SetValue(false, _yesButton, _noButton);
                 break;
             case DialogButton.YesNo:
-                SetVisibility(_okButton, false);
-                SetVisibility(_cancelButton, false);
-                SetVisibility(_yesButton, true);
-                SetVisibility(_noButton, true);
+                Button.IsVisibleProperty.SetValue(false, _okButton, _cancelButton);
+                Button.IsVisibleProperty.SetValue(true, _yesButton, _noButton);
                 break;
             case DialogButton.YesNoCancel:
-                SetVisibility(_okButton, false);
-                SetVisibility(_cancelButton, true);
-                SetVisibility(_yesButton, true);
-                SetVisibility(_noButton, true);
+                Button.IsVisibleProperty.SetValue(false, _okButton);
+                Button.IsVisibleProperty.SetValue(true, _cancelButton, _yesButton, _noButton);
                 break;
         }
     }
diff --git a/src/Ursa/Controls/Dialog/DefaultDialogWindow.cs b/src/Ursa/Controls/Dialog/DefaultDialogWindow.cs
index 123affc..543eb1a 100644
--- a/src/Ursa/Controls/Dialog/DefaultDialogWindow.cs
+++ b/src/Ursa/Controls/Dialog/DefaultDialogWindow.cs
@@ -3,6 +3,7 @@ using Avalonia.Controls;
 using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
 using Avalonia.Interactivity;
+using Irihi.Avalonia.Shared.Helpers;
 using Ursa.Common;
 
 namespace Ursa.Controls;
@@ -46,14 +47,12 @@ public class DefaultDialogWindow: DialogWindow
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
         base.OnApplyTemplate(e);
-        EventHelper.UnregisterClickEvent(OnDefaultClose, _okButton, _cancelButton, _yesButton, _noButton);
-        
+        Button.ClickEvent.RemoveHandler(OnDefaultClose, _okButton, _cancelButton, _yesButton, _noButton);
         _okButton = e.NameScope.Find<Button>(PART_OKButton);
         _cancelButton = e.NameScope.Find<Button>(PART_CancelButton);
         _yesButton = e.NameScope.Find<Button>(PART_YesButton);
         _noButton = e.NameScope.Find<Button>(PART_NoButton);
-        
-        EventHelper.RegisterClickEvent(OnDefaultClose, _yesButton, _noButton, _okButton, _cancelButton);
+        Button.ClickEvent.AddHandler(OnDefaultClose, _okButton, _cancelButton, _yesButton, _noButton);
         SetButtonVisibility();
     }
 
diff --git a/src/Ursa/Controls/Dialog/DialogControlBase.cs b/src/Ursa/Controls/Dialog/DialogControlBase.cs
index 700a8ce..7e9cf5e 100644
--- a/src/Ursa/Controls/Dialog/DialogControlBase.cs
+++ b/src/Ursa/Controls/Dialog/DialogControlBase.cs
@@ -3,6 +3,7 @@ using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Interactivity;
+using Irihi.Avalonia.Shared.Helpers;
 using Ursa.Common;
 using Ursa.Controls.OverlayShared;
 using Ursa.EventArgs;
@@ -63,9 +64,9 @@ public abstract class DialogControlBase: OverlayFeedbackElement
         _titleArea?.AddHandler(PointerMovedEvent, OnTitlePointerMove, RoutingStrategies.Bubble);
         _titleArea?.AddHandler(PointerPressedEvent, OnTitlePointerPressed, RoutingStrategies.Bubble);
         _titleArea?.AddHandler(PointerReleasedEvent, OnTitlePointerRelease, RoutingStrategies.Bubble);
-        EventHelper.UnregisterClickEvent(OnCloseButtonClick, _closeButton);
+        Button.ClickEvent.AddHandler(OnCloseButtonClick, _closeButton);
         _closeButton = e.NameScope.Find<Button>(PART_CloseButton);
-        EventHelper.RegisterClickEvent(OnCloseButtonClick, _closeButton);
+        Button.ClickEvent.RemoveHandler(OnCloseButtonClick, _closeButton);
     }
     
     private void OnTitlePointerPressed(object sender, PointerPressedEventArgs e)
diff --git a/src/Ursa/Controls/Dialog/DialogWindow.cs b/src/Ursa/Controls/Dialog/DialogWindow.cs
index d8ffc9d..5b6ec90 100644
--- a/src/Ursa/Controls/Dialog/DialogWindow.cs
+++ b/src/Ursa/Controls/Dialog/DialogWindow.cs
@@ -4,6 +4,7 @@ using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Interactivity;
+using Irihi.Avalonia.Shared.Helpers;
 using Ursa.Common;
 
 namespace Ursa.Controls;
@@ -42,16 +43,14 @@ public class DialogWindow: Window
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
         base.OnApplyTemplate(e);
-        EventHelper.UnregisterClickEvent(OnCloseButtonClicked, _closeButton);
+        Button.ClickEvent.RemoveHandler(OnCloseButtonClicked, _closeButton);
         _titleArea?.RemoveHandler(PointerPressedEvent, OnTitlePointerPressed);
         _closeButton = e.NameScope.Find<Button>(PART_CloseButton);
-        if (_closeButton is not null)
-        {
-            _closeButton.IsVisible = IsCloseButtonVisible;
-        }
+        Button.IsVisibleProperty.SetValue(IsCloseButtonVisible, _closeButton);
+        Button.ClickEvent.AddHandler(OnCloseButtonClicked, _closeButton);
         _titleArea = e.NameScope.Find<Panel>(PART_TitleArea);
         _titleArea?.AddHandler(PointerPressedEvent, OnTitlePointerPressed, RoutingStrategies.Bubble);
-        EventHelper.RegisterClickEvent(OnCloseButtonClicked, _closeButton);
+
     }
 
     private void OnContextRequestClose(object? sender, object? args)
diff --git a/src/Ursa/Controls/Drawer/DefaultDrawerControl.cs b/src/Ursa/Controls/Drawer/DefaultDrawerControl.cs
index 9206c83..e262802 100644
--- a/src/Ursa/Controls/Drawer/DefaultDrawerControl.cs
+++ b/src/Ursa/Controls/Drawer/DefaultDrawerControl.cs
@@ -3,6 +3,7 @@ using Avalonia.Controls;
 using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
 using Avalonia.Interactivity;
+using Irihi.Avalonia.Shared.Helpers;
 using Ursa.Common;
 using Ursa.EventArgs;
 
@@ -54,50 +55,39 @@ public class DefaultDrawerControl: DrawerControlBase
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
         base.OnApplyTemplate(e);
-        EventHelper.UnregisterClickEvent(OnDefaultButtonClick, _yesButton, _noButton, _okButton, _cancelButton);
+        Button.ClickEvent.RemoveHandler(OnDefaultButtonClick, _yesButton, _noButton, _okButton, _cancelButton);
         _yesButton = e.NameScope.Find<Button>(PART_YesButton);
         _noButton = e.NameScope.Find<Button>(PART_NoButton);
         _okButton = e.NameScope.Find<Button>(PART_OKButton);
         _cancelButton = e.NameScope.Find<Button>(PART_CancelButton);
-        EventHelper.RegisterClickEvent(OnDefaultButtonClick, _yesButton, _noButton, _okButton, _cancelButton);
+        Button.ClickEvent.AddHandler(OnDefaultButtonClick, _yesButton, _noButton, _okButton, _cancelButton);
         SetButtonVisibility();
     }
     
     private void SetButtonVisibility()
     {
         bool isCloseButtonVisible = DataContext is IDialogContext || Buttons != DialogButton.YesNo;
-        SetVisibility(_closeButton, isCloseButtonVisible);
+        Button.IsVisibleProperty.SetValue(isCloseButtonVisible, _closeButton);
         switch (Buttons)
         {
             case DialogButton.None:
-                SetVisibility(_okButton, false);
-                SetVisibility(_cancelButton, false);
-                SetVisibility(_yesButton, false);
-                SetVisibility(_noButton, false);
+                Button.IsVisibleProperty.SetValue(false, _okButton, _cancelButton, _yesButton, _noButton);
                 break;
             case DialogButton.OK:
-                SetVisibility(_okButton, true);
-                SetVisibility(_cancelButton, false);
-                SetVisibility(_yesButton, false);
-                SetVisibility(_noButton, false);
+                Button.IsVisibleProperty.SetValue(true, _okButton);
+                Button.IsVisibleProperty.SetValue(false, _cancelButton, _yesButton, _noButton);
                 break;
             case DialogButton.OKCancel:
-                SetVisibility(_okButton, true);
-                SetVisibility(_cancelButton, true);
-                SetVisibility(_yesButton, false);
-                SetVisibility(_noButton, false);
+                Button.IsVisibleProperty.SetValue(true, _okButton, _cancelButton);
+                Button.IsVisibleProperty.SetValue(false, _yesButton, _noButton);
                 break;
             case DialogButton.YesNo:
-                SetVisibility(_okButton, false);
-                SetVisibility(_cancelButton, false);
-                SetVisibility(_yesButton, true);
-                SetVisibility(_noButton, true);
+                Button.IsVisibleProperty.SetValue(false, _okButton, _cancelButton);
+                Button.IsVisibleProperty.SetValue(true, _yesButton, _noButton);
                 break;
             case DialogButton.YesNoCancel:
-                SetVisibility(_okButton, false);
-                SetVisibility(_cancelButton, true);
-                SetVisibility(_yesButton, true);
-                SetVisibility(_noButton, true);
+                Button.IsVisibleProperty.SetValue(false, _okButton);
+                Button.IsVisibleProperty.SetValue(true, _cancelButton, _yesButton, _noButton);
                 break;
         }
     }
diff --git a/src/Ursa/Controls/Drawer/DrawerControlBase.cs b/src/Ursa/Controls/Drawer/DrawerControlBase.cs
index 294e8ce..37da681 100644
--- a/src/Ursa/Controls/Drawer/DrawerControlBase.cs
+++ b/src/Ursa/Controls/Drawer/DrawerControlBase.cs
@@ -4,6 +4,7 @@ using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
 using Avalonia.Interactivity;
 using Avalonia.Threading;
+using Irihi.Avalonia.Shared.Helpers;
 using Ursa.Common;
 using Ursa.Controls.OverlayShared;
 using Ursa.EventArgs;
@@ -59,9 +60,9 @@ public const string PART_CloseButton = "PART_CloseButton";
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
         base.OnApplyTemplate(e);
-        EventHelper.UnregisterClickEvent(OnCloseButtonClick, _closeButton);
+        Button.ClickEvent.RemoveHandler(OnCloseButtonClick, _closeButton);
         _closeButton = e.NameScope.Find<Button>(PART_CloseButton);
-        EventHelper.RegisterClickEvent(OnCloseButtonClick, _closeButton);
+        Button.ClickEvent.AddHandler(OnCloseButtonClick, _closeButton);
     }
 
     private void OnDataContextChange(AvaloniaPropertyChangedEventArgs<object?> args)
diff --git a/src/Ursa/Controls/MessageBox/MessageBoxControl.cs b/src/Ursa/Controls/MessageBox/MessageBoxControl.cs
index c0226ea..7c1bdbf 100644
--- a/src/Ursa/Controls/MessageBox/MessageBoxControl.cs
+++ b/src/Ursa/Controls/MessageBox/MessageBoxControl.cs
@@ -6,6 +6,7 @@ using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Media;
 using Avalonia.Styling;
+using Irihi.Avalonia.Shared.Helpers;
 using Ursa.Common;
 
 namespace Ursa.Controls;
@@ -65,12 +66,12 @@ public class MessageBoxControl: DialogControlBase
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
         base.OnApplyTemplate(e);
-        EventHelper.UnregisterClickEvent(DefaultButtonsClose, _okButton, _cancelButton, _yesButton, _noButton);
+        Button.ClickEvent.RemoveHandler(DefaultButtonsClose, _okButton, _cancelButton, _yesButton, _noButton);
         _okButton = e.NameScope.Find<Button>(PART_OKButton);
         _cancelButton = e.NameScope.Find<Button>(PART_CancelButton);
         _yesButton = e.NameScope.Find<Button>(PART_YesButton);
         _noButton = e.NameScope.Find<Button>(PART_NoButton);
-        EventHelper.RegisterClickEvent(DefaultButtonsClose, _okButton, _cancelButton, _yesButton, _noButton);
+        Button.ClickEvent.AddHandler(DefaultButtonsClose, _okButton, _cancelButton, _yesButton, _noButton);
         SetButtonVisibility();
     }
 
@@ -102,28 +103,20 @@ public class MessageBoxControl: DialogControlBase
         switch (Buttons)
         {
             case MessageBoxButton.OK:
-                SetVisibility(_okButton, true);
-                SetVisibility(_cancelButton, false);
-                SetVisibility(_yesButton, false);
-                SetVisibility(_noButton, false);
+                Button.IsVisibleProperty.SetValue(true, _okButton);
+                Button.IsVisibleProperty.SetValue(false, _cancelButton, _yesButton, _noButton);
                 break;
             case MessageBoxButton.OKCancel:
-                SetVisibility(_okButton, true);
-                SetVisibility(_cancelButton, true);
-                SetVisibility(_yesButton, false);
-                SetVisibility(_noButton, false);
+                Button.IsVisibleProperty.SetValue(true, _okButton, _cancelButton);
+                Button.IsVisibleProperty.SetValue(false, _yesButton, _noButton);
                 break;
             case MessageBoxButton.YesNo:
-                SetVisibility(_okButton, false);
-                SetVisibility(_cancelButton, false);
-                SetVisibility(_yesButton, true);
-                SetVisibility(_noButton, true);
+                Button.IsVisibleProperty.SetValue(false, _okButton, _cancelButton);
+                Button.IsVisibleProperty.SetValue(true, _yesButton, _noButton);
                 break;
             case MessageBoxButton.YesNoCancel:
-                SetVisibility(_okButton, false);
-                SetVisibility(_cancelButton, true);
-                SetVisibility(_yesButton, true);
-                SetVisibility(_noButton, true);
+                Button.IsVisibleProperty.SetValue(false, _okButton);
+                Button.IsVisibleProperty.SetValue(true, _cancelButton, _yesButton, _noButton);
                 break;
         }
     }
diff --git a/src/Ursa/Controls/MessageBox/MessageBoxWindow.cs b/src/Ursa/Controls/MessageBox/MessageBoxWindow.cs
index 53913a8..f270916 100644
--- a/src/Ursa/Controls/MessageBox/MessageBoxWindow.cs
+++ b/src/Ursa/Controls/MessageBox/MessageBoxWindow.cs
@@ -5,6 +5,7 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Platform;
+using Irihi.Avalonia.Shared.Helpers;
 using Ursa.Common;
 
 namespace Ursa.Controls;
@@ -55,97 +56,38 @@ public class MessageBoxWindow : Window
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
         base.OnApplyTemplate(e);
-        if (_closeButton != null)
-        {
-            _closeButton.Click -= OnCloseButtonClick;
-        }
-
-        if (_yesButton != null)
-        {
-            _yesButton.Click -= OnYesButtonClick;
-        }
-
-        if (_noButton != null)
-        {
-            _noButton.Click -= OnNoButtonClick;
-        }
-
-        if (_okButton != null)
-        {
-            _okButton.Click -= OnOKButtonClick;
-        }
-
-        if (_cancelButton != null)
-        {
-            _cancelButton.Click -= OnCancelButtonClick;
-        }
-
+        Button.ClickEvent.RemoveHandler(OnDefaultButtonClick, _yesButton, _noButton, _okButton, _cancelButton);
+        Button.ClickEvent.RemoveHandler(OnCloseButtonClick, _closeButton);
         _yesButton = e.NameScope.Find<Button>(PART_YesButton);
         _noButton = e.NameScope.Find<Button>(PART_NoButton);
         _okButton = e.NameScope.Find<Button>(PART_OKButton);
         _cancelButton = e.NameScope.Find<Button>(PART_CancelButton);
         _closeButton = e.NameScope.Find<Button>(PART_CloseButton);
-        if (_closeButton is not null)
-        {
-            _closeButton.Click += OnCloseButtonClick;
-        }
-
-        if (_yesButton is not null)
-        {
-            _yesButton.Click += OnYesButtonClick;
-        }
-
-        if (_noButton is not null)
-        {
-            _noButton.Click += OnNoButtonClick;
-        }
-
-        if (_okButton is not null)
-        {
-            _okButton.Click += OnOKButtonClick;
-        }
-
-        if (_cancelButton is not null)
-        {
-            _cancelButton.Click += OnCancelButtonClick;
-        }
-
+        Button.ClickEvent.AddHandler(OnDefaultButtonClick, _yesButton, _noButton, _okButton, _cancelButton);
+        Button.ClickEvent.AddHandler(OnCloseButtonClick, _closeButton);
         SetButtonVisibility();
     }
 
     private void SetButtonVisibility()
     {
-        if (_buttonConfigs == MessageBoxButton.OK)
+        switch (_buttonConfigs)
         {
-            if (_closeButton != null) _closeButton.IsVisible = true;
-            if (_yesButton != null) _yesButton.IsVisible = false;
-            if (_noButton != null) _noButton.IsVisible = false;
-            if (_okButton != null) _okButton.IsVisible = true;
-            if (_cancelButton != null) _cancelButton.IsVisible = false;
-        }
-        else if (_buttonConfigs == MessageBoxButton.OKCancel)
-        {
-            if (_closeButton != null) _closeButton.IsVisible = true;
-            if (_yesButton != null) _yesButton.IsVisible = false;
-            if (_noButton != null) _noButton.IsVisible = false;
-            if (_okButton != null) _okButton.IsVisible = true;
-            if (_cancelButton != null) _cancelButton.IsVisible = true;
-        }
-        else if (_buttonConfigs == MessageBoxButton.YesNo)
-        {
-            if (_closeButton != null) _closeButton.IsVisible = false;
-            if (_yesButton != null) _yesButton.IsVisible = true;
-            if (_noButton != null) _noButton.IsVisible = true;
-            if (_okButton != null) _okButton.IsVisible = false;
-            if (_cancelButton != null) _cancelButton.IsVisible = false;
-        }
-        else if (_buttonConfigs == MessageBoxButton.YesNoCancel)
-        {
-            if (_closeButton != null) _closeButton.IsVisible = true;
-            if (_yesButton != null) _yesButton.IsVisible = true;
-            if (_noButton != null) _noButton.IsVisible = true;
-            if (_okButton != null) _okButton.IsVisible = false;
-            if (_cancelButton != null) _cancelButton.IsVisible = true;
+            case MessageBoxButton.OK:
+                Button.IsVisibleProperty.SetValue(true, _okButton);
+                Button.IsVisibleProperty.SetValue(false, _cancelButton, _yesButton, _noButton);
+                break;
+            case MessageBoxButton.OKCancel:
+                Button.IsVisibleProperty.SetValue(true, _okButton, _cancelButton);
+                Button.IsVisibleProperty.SetValue(false, _yesButton, _noButton);
+                break;
+            case MessageBoxButton.YesNo:
+                Button.IsVisibleProperty.SetValue(false, _okButton, _cancelButton);
+                Button.IsVisibleProperty.SetValue(true, _yesButton, _noButton);
+                break;
+            case MessageBoxButton.YesNoCancel:
+                Button.IsVisibleProperty.SetValue(false, _okButton);
+                Button.IsVisibleProperty.SetValue(true, _cancelButton, _yesButton, _noButton);
+                break;
         }
     }
 
@@ -159,24 +101,24 @@ public class MessageBoxWindow : Window
         Close(MessageBoxResult.Cancel);
     }
 
-    private void OnYesButtonClick(object sender, RoutedEventArgs e)
+    private void OnDefaultButtonClick(object sender, RoutedEventArgs e)
     {
-        Close(MessageBoxResult.Yes);
-    }
-
-    private void OnNoButtonClick(object sender, RoutedEventArgs e)
-    {
-        Close(MessageBoxResult.No);
-    }
-
-    private void OnOKButtonClick(object sender, RoutedEventArgs e)
-    {
-        Close(MessageBoxResult.OK);
-    }
-
-    private void OnCancelButtonClick(object sender, RoutedEventArgs e)
-    {
-        Close(MessageBoxResult.Cancel);
+        if (sender == _okButton)
+        {
+            Close(MessageBoxResult.OK);
+        }
+        else if (sender == _cancelButton)
+        {
+            Close(MessageBoxResult.Cancel);
+        }
+        else if (sender == _yesButton)
+        {
+            Close(MessageBoxResult.Yes);
+        }
+        else if (sender == _noButton)
+        {
+            Close(MessageBoxResult.No);
+        }
     }
 
     protected override void OnKeyUp(KeyEventArgs e)
diff --git a/src/Ursa/Controls/OverlayShared/OverlayFeedbackElement.cs b/src/Ursa/Controls/OverlayShared/OverlayFeedbackElement.cs
index 1c569d6..42303aa 100644
--- a/src/Ursa/Controls/OverlayShared/OverlayFeedbackElement.cs
+++ b/src/Ursa/Controls/OverlayShared/OverlayFeedbackElement.cs
@@ -84,10 +84,5 @@ public abstract class OverlayFeedbackElement: ContentControl
         return tcs.Task;
     }
     
-    protected static void SetVisibility(Button? button, bool visible)
-    {
-        if (button is not null) button.IsVisible = visible;
-    }
-    
     public abstract void Close();
 }
\ No newline at end of file
diff --git a/src/Ursa/Controls/ThemeSelector/ThemeToggleButton.cs b/src/Ursa/Controls/ThemeSelector/ThemeToggleButton.cs
index 981eaa6..27503d3 100644
--- a/src/Ursa/Controls/ThemeSelector/ThemeToggleButton.cs
+++ b/src/Ursa/Controls/ThemeSelector/ThemeToggleButton.cs
@@ -4,6 +4,7 @@ using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
 using Avalonia.Interactivity;
 using Avalonia.Styling;
+using Irihi.Avalonia.Shared.Helpers;
 using Ursa.Common;
 
 namespace Ursa.Controls;
@@ -28,10 +29,10 @@ public class ThemeToggleButton: ThemeSelectorBase
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
         base.OnApplyTemplate(e);
-        EventHelper.UnregisterEvent(Button.ClickEvent, OnButtonClickedChanged, _button);
+        Button.ClickEvent.RemoveHandler(OnButtonClickedChanged, _button);
         _button = e.NameScope.Get<ToggleButton>(PART_ThemeToggleButton);
-        EventHelper.RegisterEvent(Button.ClickEvent, OnButtonClickedChanged, _button);
-        PropertyHelper.SetValue(ToggleButton.IsCheckedProperty, _currentTheme == ThemeVariant.Light, _button);
+        Button.ClickEvent.AddHandler(OnButtonClickedChanged, _button);
+        ToggleButton.IsCheckedProperty.SetValue(_currentTheme == ThemeVariant.Light, _button);
     }
 
     private void OnButtonClickedChanged(object sender, RoutedEventArgs e)
@@ -44,6 +45,6 @@ public class ThemeToggleButton: ThemeSelectorBase
     protected override void SyncThemeFromScope(ThemeVariant? theme)
     {
         base.SyncThemeFromScope(theme);
-        PropertyHelper.SetValue(ToggleButton.IsCheckedProperty, theme == ThemeVariant.Light, _button);
+        ToggleButton.IsCheckedProperty.SetValue(theme == ThemeVariant.Light, _button);
     }
 }
\ No newline at end of file
diff --git a/src/Ursa/Ursa.csproj b/src/Ursa/Ursa.csproj
index ccb0766..a0a7163 100644
--- a/src/Ursa/Ursa.csproj
+++ b/src/Ursa/Ursa.csproj
@@ -14,6 +14,7 @@
 
     <ItemGroup>
         <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
+        <PackageReference Include="Irihi.Avalonia.Shared" Version="0.1.1" />
     </ItemGroup>
 
 </Project>