diff --git a/src/Wpf.Ui/Controls/NumberBox/NumberBox.xaml b/src/Wpf.Ui/Controls/NumberBox/NumberBox.xaml
index b9788ab89..ecd0d2b64 100644
--- a/src/Wpf.Ui/Controls/NumberBox/NumberBox.xaml
+++ b/src/Wpf.Ui/Controls/NumberBox/NumberBox.xaml
@@ -54,10 +54,10 @@
                     <Grid HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}">
                         <Border
                             x:Name="ContentBorder"
-                            MinWidth="{TemplateBinding MinWidth}"
-                            MinHeight="{TemplateBinding MinHeight}"
                             Width="{TemplateBinding Width}"
                             Height="{TemplateBinding Height}"
+                            MinWidth="{TemplateBinding MinWidth}"
+                            MinHeight="{TemplateBinding MinHeight}"
                             Padding="0"
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Stretch"
@@ -82,8 +82,8 @@
                                     VerticalAlignment="Top"
                                     Content="{TemplateBinding Icon}"
                                     FontSize="16"
-                                    IsTabStop="False"
-                                    Foreground="{TemplateBinding Foreground}" />
+                                    Foreground="{TemplateBinding Foreground}"
+                                    IsTabStop="False" />
                                 <Grid Grid.Column="1" Margin="{TemplateBinding Padding}">
                                     <Decorator
                                         x:Name="PART_ContentHost"
@@ -116,8 +116,8 @@
                                     Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
                                     CommandParameter="clear"
                                     Cursor="Arrow"
-                                    IsTabStop="False"
-                                    Foreground="{DynamicResource TextControlButtonForeground}">
+                                    Foreground="{DynamicResource TextControlButtonForeground}"
+                                    IsTabStop="False">
                                     <controls:Button.Icon>
                                         <controls:SymbolIcon FontSize="{StaticResource NumberBoxButtonIconSize}" Symbol="Dismiss24" />
                                     </controls:Button.Icon>
@@ -179,8 +179,8 @@
                                     VerticalAlignment="Top"
                                     Content="{TemplateBinding Icon}"
                                     FontSize="16"
-                                    IsTabStop="False"
-                                    Foreground="{TemplateBinding Foreground}" />
+                                    Foreground="{TemplateBinding Foreground}"
+                                    IsTabStop="False" />
                             </Grid>
                         </Border>
                         <!--  The Accent Border is a separate element so that changes to the border thickness do not affect the position of the element  -->
diff --git a/src/Wpf.Ui/Controls/PasswordBox/PasswordBox.cs b/src/Wpf.Ui/Controls/PasswordBox/PasswordBox.cs
index e2bbbab26..bf72c1422 100644
--- a/src/Wpf.Ui/Controls/PasswordBox/PasswordBox.cs
+++ b/src/Wpf.Ui/Controls/PasswordBox/PasswordBox.cs
@@ -3,7 +3,9 @@
 // Copyright (C) Leszek Pomianowski and WPF UI Contributors.
 // All Rights Reserved.
 
+using System.Diagnostics;
 using System.Windows.Controls;
+#pragma warning disable SA1124
 
 // ReSharper disable once CheckNamespace
 namespace Wpf.Ui.Controls;
@@ -13,7 +15,7 @@ namespace Wpf.Ui.Controls;
 /**
  * TextProperty contains asterisks OR raw password if IsPasswordRevealed is set to true
  * PasswordProperty always contains raw password
- */
+ **/
 
 /// <summary>
 /// The modified password control.
@@ -22,39 +24,33 @@ public class PasswordBox : Wpf.Ui.Controls.TextBox
 {
     private bool _lockUpdatingContents;
 
-    /// <summary>
-    /// Property for <see cref="Password"/>.
-    /// </summary>
+    #region Static Properties
+
+    /// <summary>Identifies the <see cref="Password"/> dependency property.</summary>
     public static readonly DependencyProperty PasswordProperty = DependencyProperty.Register(
         nameof(Password),
         typeof(string),
         typeof(PasswordBox),
-        new PropertyMetadata(String.Empty, OnPasswordPropertyChanged)
+        new PropertyMetadata(String.Empty, OnPasswordChanged)
     );
 
-    /// <summary>
-    /// Property for <see cref="PasswordChar"/>.
-    /// </summary>
+    /// <summary>Identifies the <see cref="PasswordChar"/> dependency property.</summary>
     public static readonly DependencyProperty PasswordCharProperty = DependencyProperty.Register(
         nameof(PasswordChar),
         typeof(char),
         typeof(PasswordBox),
-        new PropertyMetadata('*', OnPasswordCharPropertyChanged)
+        new PropertyMetadata('*', OnPasswordCharChanged)
     );
 
-    /// <summary>
-    /// Property for <see cref="IsPasswordRevealed"/>.
-    /// </summary>
+    /// <summary>Identifies the <see cref="IsPasswordRevealed"/> dependency property.</summary>
     public static readonly DependencyProperty IsPasswordRevealedProperty = DependencyProperty.Register(
         nameof(IsPasswordRevealed),
         typeof(bool),
         typeof(PasswordBox),
-        new PropertyMetadata(false, OnPasswordRevealModePropertyChanged)
+        new PropertyMetadata(false, OnIsPasswordRevealedChanged)
     );
 
-    /// <summary>
-    /// Property for <see cref="RevealButtonEnabled"/>.
-    /// </summary>
+    /// <summary>Identifies the <see cref="RevealButtonEnabled"/> dependency property.</summary>
     public static readonly DependencyProperty RevealButtonEnabledProperty = DependencyProperty.Register(
         nameof(RevealButtonEnabled),
         typeof(bool),
@@ -62,9 +58,7 @@ public class PasswordBox : Wpf.Ui.Controls.TextBox
         new PropertyMetadata(true)
     );
 
-    /// <summary>
-    /// Event for "Password has changed"
-    /// </summary>
+    /// <summary>Identifies the <see cref="PasswordChanged"/> routed event.</summary>
     public static readonly RoutedEvent PasswordChangedEvent = EventManager.RegisterRoutedEvent(
         nameof(PasswordChanged),
         RoutingStrategy.Bubble,
@@ -72,6 +66,55 @@ public class PasswordBox : Wpf.Ui.Controls.TextBox
         typeof(PasswordBox)
     );
 
+    /// <summary>
+    /// Called when <see cref="Password"/> is changed.
+    /// </summary>
+    private static void OnPasswordChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is not PasswordBox control)
+        {
+            return;
+        }
+
+        control.OnPasswordChanged();
+    }
+
+    /// <summary>
+    /// Called if the character is changed in the during the run.
+    /// </summary>
+    private static void OnPasswordCharChanged(
+        DependencyObject d,
+        DependencyPropertyChangedEventArgs e
+    )
+    {
+        if (d is not PasswordBox control)
+        {
+            return;
+        }
+
+        control.OnPasswordCharChanged();
+    }
+
+    /// <summary>
+    /// Called if the reveal mode is changed in the during the run.
+    /// </summary>
+    private static void OnIsPasswordRevealedChanged(
+        DependencyObject d,
+        DependencyPropertyChangedEventArgs e
+    )
+    {
+        if (d is not PasswordBox control)
+        {
+            return;
+        }
+
+        control.OnPasswordRevealModeChanged();
+    }
+
+    #endregion
+
+    #region Properties
+
     /// <summary>
     /// Gets or sets currently typed text represented by asterisks.
     /// </summary>
@@ -100,7 +143,7 @@ public bool IsPasswordRevealed
     }
 
     /// <summary>
-    /// Gets or sets a value deciding whether to display the reveal password button.
+    /// Gets or sets a value indicating whether to display the reveal password button.
     /// </summary>
     public bool RevealButtonEnabled
     {
@@ -108,6 +151,10 @@ public bool RevealButtonEnabled
         set => SetValue(RevealButtonEnabledProperty, value);
     }
 
+    #endregion
+
+    #region Public Events
+
     /// <summary>
     /// Event fired from this text box when its inner content
     /// has been changed.
@@ -121,10 +168,9 @@ public event RoutedEventHandler PasswordChanged
         remove => RemoveHandler(PasswordChangedEvent, value);
     }
 
-    public PasswordBox()
-    {
-        _lockUpdatingContents = false;
-    }
+    #endregion
+
+    #region Protected Methods
 
     /// <inheritdoc />
     protected override void OnTextChanged(TextChangedEventArgs e)
@@ -137,11 +183,15 @@ protected override void OnTextChanged(TextChangedEventArgs e)
         }
         else
         {
-            if (PlaceholderEnabled && Text.Length > 0)
-                PlaceholderEnabled = false;
-
-            if (!PlaceholderEnabled && Text.Length < 1)
-                PlaceholderEnabled = true;
+            switch (PlaceholderEnabled)
+            {
+                case true when Text.Length > 0:
+                    SetCurrentValue(PlaceholderEnabledProperty, false);
+                    break;
+                case false when Text.Length < 1:
+                    SetCurrentValue(PlaceholderEnabledProperty, true);
+                    break;
+            }
 
             RevealClearButton();
         }
@@ -163,11 +213,13 @@ protected virtual void OnPasswordCharChanged()
         // If password is currently revealed,
         // do not replace displayed text with asterisks
         if (IsPasswordRevealed)
+        {
             return;
+        }
 
         _lockUpdatingContents = true;
 
-        Text = new String(PasswordChar, Password.Length);
+        SetCurrentValue(TextProperty, new string(PasswordChar, Password.Length));
 
         _lockUpdatingContents = false;
     }
@@ -176,7 +228,7 @@ protected virtual void OnPasswordRevealModeChanged()
     {
         _lockUpdatingContents = true;
 
-        Text = IsPasswordRevealed ? Password : new String(PasswordChar, Password.Length);
+        SetCurrentValue(TextProperty, IsPasswordRevealed ? Password : new string(PasswordChar, Password.Length));
 
         _lockUpdatingContents = false;
     }
@@ -184,9 +236,8 @@ protected virtual void OnPasswordRevealModeChanged()
     /// <summary>
     /// Triggered by clicking a button in the control template.
     /// </summary>
-    /// <param name="sender">Sender of the click event.</param>
     /// <param name="parameter">Additional parameters.</param>
-    protected override void OnTemplateButtonClick(string parameter)
+    protected override void OnTemplateButtonClick(string? parameter)
     {
 #if DEBUG
         System.Diagnostics.Debug.WriteLine(
@@ -198,7 +249,7 @@ protected override void OnTemplateButtonClick(string parameter)
         switch (parameter)
         {
             case "reveal":
-                IsPasswordRevealed = !IsPasswordRevealed;
+                SetCurrentValue(IsPasswordRevealedProperty, !IsPasswordRevealed);
                 Focus();
                 CaretIndex = Text.Length;
                 break;
@@ -208,25 +259,33 @@ protected override void OnTemplateButtonClick(string parameter)
         }
     }
 
+    #endregion
+
+    #region Private Methods
+
     private void UpdateTextContents(bool isTriggeredByTextInput)
     {
         if (_lockUpdatingContents)
+        {
             return;
+        }
 
         if (IsPasswordRevealed)
         {
             if (Password == Text)
+            {
                 return;
+            }
 
             _lockUpdatingContents = true;
 
             if (isTriggeredByTextInput)
             {
-                Password = Text;
+                SetCurrentValue(PasswordProperty, Text);
             }
             else
             {
-                Text = Password;
+                SetCurrentValue(TextProperty, Password);
                 CaretIndex = Text.Length;
             }
 
@@ -248,10 +307,12 @@ private void UpdateTextContents(bool isTriggeredByTextInput)
             var newCharacters = currentText.Replace(PasswordChar.ToString(), String.Empty);
 
             if (currentText.Length < currentPassword.Length)
+            {
                 newPasswordValue = currentPassword.Remove(
                     selectionIndex,
                     currentPassword.Length - currentText.Length
                 );
+            }
 
             if (newCharacters.Length > 1)
             {
@@ -264,10 +325,12 @@ private void UpdateTextContents(bool isTriggeredByTextInput)
             }
             else
             {
-                for (int i = 0; i < currentText.Length; i++)
+                for (var i = 0; i < currentText.Length; i++)
                 {
                     if (currentText[i] == PasswordChar)
+                    {
                         continue;
+                    }
 
                     newPasswordValue =
                         currentText.Length == newPasswordValue.Length
@@ -279,8 +342,8 @@ private void UpdateTextContents(bool isTriggeredByTextInput)
 
         _lockUpdatingContents = true;
 
-        Text = new String(PasswordChar, newPasswordValue.Length);
-        Password = newPasswordValue;
+        SetCurrentValue(TextProperty, new string(PasswordChar, newPasswordValue.Length));
+        SetCurrentValue(PasswordProperty, newPasswordValue);
         CaretIndex = caretIndex;
 
         RaiseEvent(new RoutedEventArgs(PasswordChangedEvent));
@@ -288,42 +351,5 @@ private void UpdateTextContents(bool isTriggeredByTextInput)
         _lockUpdatingContents = false;
     }
 
-    /// <summary>
-    /// Called when <see cref="Password"/> is changed.
-    /// </summary>
-    private static void OnPasswordPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-    {
-        if (d is not PasswordBox control)
-            return;
-
-        control.OnPasswordChanged();
-    }
-
-    /// <summary>
-    /// Called if the character is changed in the during the run.
-    /// </summary>
-    private static void OnPasswordCharPropertyChanged(
-        DependencyObject d,
-        DependencyPropertyChangedEventArgs e
-    )
-    {
-        if (d is not PasswordBox control)
-            return;
-
-        control.OnPasswordCharChanged();
-    }
-
-    /// <summary>
-    /// Called if the reveal mode is changed in the during the run.
-    /// </summary>
-    private static void OnPasswordRevealModePropertyChanged(
-        DependencyObject d,
-        DependencyPropertyChangedEventArgs e
-    )
-    {
-        if (d is not PasswordBox control)
-            return;
-
-        control.OnPasswordRevealModeChanged();
-    }
+    #endregion
 }
diff --git a/src/Wpf.Ui/Controls/PasswordBox/PasswordBox.xaml b/src/Wpf.Ui/Controls/PasswordBox/PasswordBox.xaml
index 6d02f27e8..fdef43fec 100644
--- a/src/Wpf.Ui/Controls/PasswordBox/PasswordBox.xaml
+++ b/src/Wpf.Ui/Controls/PasswordBox/PasswordBox.xaml
@@ -23,6 +23,22 @@
     <system:Double x:Key="PasswordBoxButtonHeight">24</system:Double>
     <system:Double x:Key="PasswordBoxButtonIconSize">14</system:Double>
 
+    <Style x:Key="DefaultPasswordBoxScrollViewerStyle" TargetType="{x:Type ScrollViewer}">
+        <Setter Property="Margin" Value="0" />
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ScrollViewer}">
+                    <Grid>
+                        <ScrollContentPresenter Margin="0" CanContentScroll="{TemplateBinding CanContentScroll}" />
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
     <ContextMenu x:Key="DefaultPasswordBoxContextMenu">
         <MenuItem Command="ApplicationCommands.Paste" />
     </ContextMenu>
@@ -69,11 +85,16 @@
                                 Margin="{TemplateBinding Padding}"
                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                                <Decorator
+                                <controls:PassiveScrollViewer
                                     x:Name="PART_ContentHost"
-                                    Margin="0"
                                     VerticalAlignment="Center"
-                                    TextElement.Foreground="{TemplateBinding Foreground}" />
+                                    CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}"
+                                    HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                                    IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
+                                    IsTabStop="{TemplateBinding ScrollViewer.IsTabStop}"
+                                    Style="{StaticResource DefaultPasswordBoxScrollViewerStyle}"
+                                    TextElement.Foreground="{TemplateBinding Foreground}"
+                                    VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" />
                             </Grid>
                         </Border>
                         <!--  The Accent Border is a separate element so that changes to the border thickness do not affect the position of the element  -->
@@ -174,11 +195,16 @@
                                     TextElement.Foreground="{TemplateBinding Foreground}" />
 
                                 <Grid Grid.Column="1" Margin="{TemplateBinding Padding}">
-                                    <Decorator
+                                    <controls:PassiveScrollViewer
                                         x:Name="PART_ContentHost"
-                                        Margin="0"
                                         VerticalAlignment="Center"
-                                        TextElement.Foreground="{TemplateBinding Foreground}" />
+                                        CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}"
+                                        HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                                        IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
+                                        IsTabStop="{TemplateBinding ScrollViewer.IsTabStop}"
+                                        Style="{StaticResource DefaultPasswordBoxScrollViewerStyle}"
+                                        TextElement.Foreground="{TemplateBinding Foreground}"
+                                        VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" />
                                     <TextBlock
                                         x:Name="PlaceholderTextBox"
                                         Margin="0"
@@ -206,8 +232,8 @@
                                     Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
                                     CommandParameter="clear"
                                     Cursor="Arrow"
-                                    IsTabStop="False"
-                                    Foreground="{DynamicResource TextControlButtonForeground}">
+                                    Foreground="{DynamicResource TextControlButtonForeground}"
+                                    IsTabStop="False">
                                     <controls:Button.Icon>
                                         <controls:SymbolIcon FontSize="{StaticResource PasswordBoxButtonIconSize}" Symbol="Dismiss24" />
                                     </controls:Button.Icon>
@@ -230,8 +256,8 @@
                                     Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
                                     CommandParameter="reveal"
                                     Cursor="Arrow"
-                                    IsTabStop="False"
-                                    Foreground="{DynamicResource TextControlButtonForeground}">
+                                    Foreground="{DynamicResource TextControlButtonForeground}"
+                                    IsTabStop="False">
                                     <controls:Button.Icon>
                                         <controls:SymbolIcon FontSize="{StaticResource PasswordBoxButtonIconSize}" Symbol="Eye24" />
                                     </controls:Button.Icon>
diff --git a/src/Wpf.Ui/Controls/TextBox/TextBox.cs b/src/Wpf.Ui/Controls/TextBox/TextBox.cs
index c528942f4..18dc56d47 100644
--- a/src/Wpf.Ui/Controls/TextBox/TextBox.cs
+++ b/src/Wpf.Ui/Controls/TextBox/TextBox.cs
@@ -7,6 +7,7 @@
 using System.Windows.Controls;
 using Wpf.Ui.Converters;
 using Wpf.Ui.Input;
+#pragma warning disable SA1124
 
 // ReSharper disable once CheckNamespace
 namespace Wpf.Ui.Controls;
@@ -18,9 +19,7 @@ public class TextBox : System.Windows.Controls.TextBox
 {
     #region Static properties
 
-    /// <summary>
-    /// Property for <see cref="Icon"/>.
-    /// </summary>
+    /// <summary>Identifies the <see cref="Icon"/> dependency property.</summary>
     public static readonly DependencyProperty IconProperty = DependencyProperty.Register(
         nameof(Icon),
         typeof(IconElement),
@@ -28,9 +27,7 @@ public class TextBox : System.Windows.Controls.TextBox
         new PropertyMetadata(null, null, IconSourceElementConverter.ConvertToIconElement)
     );
 
-    /// <summary>
-    /// Property for <see cref="IconPlacement"/>.
-    /// </summary>
+    /// <summary>Identifies the <see cref="IconPlacement"/> dependency property.</summary>
     public static readonly DependencyProperty IconPlacementProperty = DependencyProperty.Register(
         nameof(IconPlacement),
         typeof(ElementPlacement),
@@ -38,9 +35,7 @@ public class TextBox : System.Windows.Controls.TextBox
         new PropertyMetadata(ElementPlacement.Left)
     );
 
-    /// <summary>
-    /// Property for <see cref="PlaceholderText"/>.
-    /// </summary>
+    /// <summary>Identifies the <see cref="PlaceholderText"/> dependency property.</summary>
     public static readonly DependencyProperty PlaceholderTextProperty = DependencyProperty.Register(
         nameof(PlaceholderText),
         typeof(string),
@@ -48,9 +43,7 @@ public class TextBox : System.Windows.Controls.TextBox
         new PropertyMetadata(String.Empty)
     );
 
-    /// <summary>
-    /// Property for <see cref="PlaceholderEnabled"/>.
-    /// </summary>
+    /// <summary>Identifies the <see cref="PlaceholderEnabled"/> dependency property.</summary>
     public static readonly DependencyProperty PlaceholderEnabledProperty = DependencyProperty.Register(
         nameof(PlaceholderEnabled),
         typeof(bool),
@@ -58,9 +51,7 @@ public class TextBox : System.Windows.Controls.TextBox
         new PropertyMetadata(true)
     );
 
-    /// <summary>
-    /// Property for <see cref="ClearButtonEnabled"/>.
-    /// </summary>
+    /// <summary>Identifies the <see cref="ClearButtonEnabled"/> dependency property.</summary>
     public static readonly DependencyProperty ClearButtonEnabledProperty = DependencyProperty.Register(
         nameof(ClearButtonEnabled),
         typeof(bool),
@@ -68,9 +59,7 @@ public class TextBox : System.Windows.Controls.TextBox
         new PropertyMetadata(true)
     );
 
-    /// <summary>
-    /// Property for <see cref="ShowClearButton"/>.
-    /// </summary>
+    /// <summary>Identifies the <see cref="ShowClearButton"/> dependency property.</summary>
     public static readonly DependencyProperty ShowClearButtonProperty = DependencyProperty.Register(
         nameof(ShowClearButton),
         typeof(bool),
@@ -78,9 +67,7 @@ public class TextBox : System.Windows.Controls.TextBox
         new PropertyMetadata(false)
     );
 
-    /// <summary>
-    /// Property for <see cref="IsTextSelectionEnabledProperty"/>.
-    /// </summary>
+    /// <summary>Identifies the <see cref="IsTextSelectionEnabled"/> dependency property.</summary>
     public static readonly DependencyProperty IsTextSelectionEnabledProperty = DependencyProperty.Register(
         nameof(IsTextSelectionEnabled),
         typeof(bool),
@@ -88,9 +75,7 @@ public class TextBox : System.Windows.Controls.TextBox
         new PropertyMetadata(false)
     );
 
-    /// <summary>
-    /// Property for <see cref="TemplateButtonCommand"/>.
-    /// </summary>
+    /// <summary>Identifies the <see cref="TemplateButtonCommand"/> dependency property.</summary>
     public static readonly DependencyProperty TemplateButtonCommandProperty = DependencyProperty.Register(
         nameof(TemplateButtonCommand),
         typeof(IRelayCommand),
@@ -105,14 +90,14 @@ public class TextBox : System.Windows.Controls.TextBox
     /// <summary>
     /// Gets or sets displayed <see cref="IconElement"/>.
     /// </summary>
-    public IconElement Icon
+    public IconElement? Icon
     {
-        get => (IconElement)GetValue(IconProperty);
+        get => (IconElement?)GetValue(IconProperty);
         set => SetValue(IconProperty, value);
     }
 
     /// <summary>
-    /// Defines which side the icon should be placed on.
+    /// Gets or sets on which side the icon should be placed on.
     /// </summary>
     public ElementPlacement IconPlacement
     {
@@ -130,7 +115,7 @@ public string PlaceholderText
     }
 
     /// <summary>
-    /// Gets or sets a value determining whether to display the placeholder.
+    /// Gets or sets a value indicating whether to display the placeholder.
     /// </summary>
     public bool PlaceholderEnabled
     {
@@ -139,7 +124,7 @@ public bool PlaceholderEnabled
     }
 
     /// <summary>
-    /// Gets or sets a value determining whether to enable the clear button.
+    /// Gets or sets a value indicating whether to enable the clear button.
     /// </summary>
     public bool ClearButtonEnabled
     {
@@ -148,7 +133,7 @@ public bool ClearButtonEnabled
     }
 
     /// <summary>
-    /// Gets or sets a value determining whether to show the clear button when <see cref="TextBox"/> is focused.
+    /// Gets or sets a value indicating whether to show the clear button when <see cref="TextBox"/> is focused.
     /// </summary>
     public bool ShowClearButton
     {
@@ -157,7 +142,7 @@ public bool ShowClearButton
     }
 
     /// <summary>
-    /// TODO
+    /// Gets or sets a value indicating whether text selection is enabled.
     /// </summary>
     public bool IsTextSelectionEnabled
     {
@@ -172,24 +157,34 @@ public bool IsTextSelectionEnabled
 
     #endregion
 
+    #region Constructor
+
     /// <summary>
-    /// Creates a new instance and assigns default events.
+    /// Initializes a new instance of the <see cref="TextBox"/> class.
     /// </summary>
     public TextBox()
     {
         SetValue(TemplateButtonCommandProperty, new RelayCommand<string>(OnTemplateButtonClick));
     }
 
+    #endregion
+
+    #region Protected Methods
+
     /// <inheritdoc />
     protected override void OnTextChanged(TextChangedEventArgs e)
     {
         base.OnTextChanged(e);
 
-        if (PlaceholderEnabled && Text.Length > 0)
-            PlaceholderEnabled = false;
-
-        if (!PlaceholderEnabled && Text.Length < 1)
-            PlaceholderEnabled = true;
+        switch (PlaceholderEnabled)
+        {
+            case true when Text.Length > 0:
+                SetCurrentValue(PlaceholderEnabledProperty, false);
+                break;
+            case false when Text.Length < 1:
+                SetCurrentValue(PlaceholderEnabledProperty, true);
+                break;
+        }
 
         RevealClearButton();
     }
@@ -218,7 +213,9 @@ protected override void OnLostFocus(RoutedEventArgs e)
     protected void RevealClearButton()
     {
         if (ClearButtonEnabled && IsKeyboardFocusWithin)
-            ShowClearButton = Text.Length > 0;
+        {
+            SetCurrentValue(ShowClearButtonProperty, Text.Length > 0);
+        }
     }
 
     /// <summary>
@@ -227,7 +224,9 @@ protected void RevealClearButton()
     protected void HideClearButton()
     {
         if (ClearButtonEnabled && !IsKeyboardFocusWithin && ShowClearButton)
-            ShowClearButton = false;
+        {
+            SetCurrentValue(ShowClearButtonProperty, false);
+        }
     }
 
     /// <summary>
@@ -236,7 +235,9 @@ protected void HideClearButton()
     protected virtual void OnClearButtonClick()
     {
         if (Text.Length > 0)
-            Text = string.Empty;
+        {
+            SetCurrentValue(TextProperty, String.Empty);
+        }
     }
 
     /// <summary>
@@ -248,4 +249,6 @@ protected virtual void OnTemplateButtonClick(string? parameter)
 
         OnClearButtonClick();
     }
+
+    #endregion
 }
diff --git a/src/Wpf.Ui/Controls/TextBox/TextBox.xaml b/src/Wpf.Ui/Controls/TextBox/TextBox.xaml
index bbfc4cca1..19c607104 100644
--- a/src/Wpf.Ui/Controls/TextBox/TextBox.xaml
+++ b/src/Wpf.Ui/Controls/TextBox/TextBox.xaml
@@ -206,8 +206,8 @@
                         BorderBrush="Transparent"
                         Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
                         Cursor="Arrow"
-                        IsTabStop="False"
-                        Foreground="{DynamicResource TextControlButtonForeground}">
+                        Foreground="{DynamicResource TextControlButtonForeground}"
+                        IsTabStop="False">
                         <controls:Button.Icon>
                             <controls:SymbolIcon FontSize="{TemplateBinding FontSize}" Symbol="Dismiss24" />
                         </controls:Button.Icon>
diff --git a/src/Wpf.Ui/Controls/TitleBar/TitleBar.xaml b/src/Wpf.Ui/Controls/TitleBar/TitleBar.xaml
index 110a281b8..7fb5c9862 100644
--- a/src/Wpf.Ui/Controls/TitleBar/TitleBar.xaml
+++ b/src/Wpf.Ui/Controls/TitleBar/TitleBar.xaml
@@ -183,8 +183,8 @@
                                     x:Name="PART_CloseButton"
                                     Grid.Column="4"
                                     ButtonType="Close"
-                                    MouseOverButtonsForeground="White"
-                                    MouseOverBackground="{DynamicResource PaletteRedBrush}" />
+                                    MouseOverBackground="{DynamicResource PaletteRedBrush}"
+                                    MouseOverButtonsForeground="White" />
                             </Grid>
                         </Grid>
                     </Grid>
diff --git a/src/Wpf.Ui/Wpf.Ui.csproj.DotSettings b/src/Wpf.Ui/Wpf.Ui.csproj.DotSettings
new file mode 100644
index 000000000..40059e148
--- /dev/null
+++ b/src/Wpf.Ui/Wpf.Ui.csproj.DotSettings
@@ -0,0 +1,3 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=controls_005Ccardcolor/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=controls_005Ccardcontrol/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file